forked from mirrors/qmk_firmware
Fix rgbkb/sol/rev2 build issues (#17601)
This commit is contained in:
parent
b0c3d61c17
commit
81d317aa87
2 changed files with 11 additions and 3 deletions
|
@ -258,6 +258,9 @@ def _parse_led_config(file, matrix_cols, matrix_rows):
|
||||||
position_raw.append(_coerce_led_token(_type, value))
|
position_raw.append(_coerce_led_token(_type, value))
|
||||||
if section == 3 and bracket_count == 2:
|
if section == 3 and bracket_count == 2:
|
||||||
flags.append(_coerce_led_token(_type, value))
|
flags.append(_coerce_led_token(_type, value))
|
||||||
|
elif _type in [Token.Comment.Preproc]:
|
||||||
|
# TODO: Promote to error
|
||||||
|
return None
|
||||||
|
|
||||||
# Slightly better intrim format
|
# Slightly better intrim format
|
||||||
matrix = list(_get_chunks(matrix_raw, matrix_cols))
|
matrix = list(_get_chunks(matrix_raw, matrix_cols))
|
||||||
|
|
|
@ -152,9 +152,14 @@ def generate_encoder_config(encoder_json, config_h_lines, postfix=''):
|
||||||
config_h_lines.append(f'# define ENCODERS_PAD_B{postfix} {{ { ", ".join(b_pads) } }}')
|
config_h_lines.append(f'# define ENCODERS_PAD_B{postfix} {{ { ", ".join(b_pads) } }}')
|
||||||
config_h_lines.append(f'#endif // ENCODERS_PAD_B{postfix}')
|
config_h_lines.append(f'#endif // ENCODERS_PAD_B{postfix}')
|
||||||
|
|
||||||
config_h_lines.append(f'#ifndef ENCODER_RESOLUTIONS{postfix}')
|
if len(set(resolutions)) == 1:
|
||||||
config_h_lines.append(f'# define ENCODER_RESOLUTIONS{postfix} {{ { ", ".join(resolutions) } }}')
|
config_h_lines.append(f'#ifndef ENCODER_RESOLUTION{postfix}')
|
||||||
config_h_lines.append(f'#endif // ENCODER_RESOLUTIONS{postfix}')
|
config_h_lines.append(f'# define ENCODER_RESOLUTION{postfix} { resolutions[0] }')
|
||||||
|
config_h_lines.append(f'#endif // ENCODER_RESOLUTION{postfix}')
|
||||||
|
else:
|
||||||
|
config_h_lines.append(f'#ifndef ENCODER_RESOLUTIONS{postfix}')
|
||||||
|
config_h_lines.append(f'# define ENCODER_RESOLUTIONS{postfix} {{ { ", ".join(resolutions) } }}')
|
||||||
|
config_h_lines.append(f'#endif // ENCODER_RESOLUTIONS{postfix}')
|
||||||
|
|
||||||
|
|
||||||
def generate_split_config(kb_info_json, config_h_lines):
|
def generate_split_config(kb_info_json, config_h_lines):
|
||||||
|
|
Loading…
Reference in a new issue