masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rgbkb/sol/rev2 build issues (#17601)

This commit is contained in:
Joel Challis 2022-07-08 22:48:48 +01:00 committed by GitHub
parent b0c3d61c17
commit 81d317aa87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/python/qmk/c_parse.py
View File

@ -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))

11
lib/python/qmk/cli/generate/config_h.py
View File

@ -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):