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

More DD encoder fixes (#17615)

master
Joel Challis 2022-07-11 10:51:39 +01:00 committed by GitHub
parent 0bee7cbebe
commit 35d78aa8a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,7 +142,7 @@ def generate_encoder_config(encoder_json, config_h_lines, postfix=''):
for encoder in encoder_json.get("rotary", []): for encoder in encoder_json.get("rotary", []):
a_pads.append(encoder["pin_a"]) a_pads.append(encoder["pin_a"])
b_pads.append(encoder["pin_b"]) b_pads.append(encoder["pin_b"])
resolutions.append(str(encoder.get("resolution", 4))) resolutions.append(encoder.get("resolution", None))
config_h_lines.append(f'#ifndef ENCODERS_PAD_A{postfix}') config_h_lines.append(f'#ifndef ENCODERS_PAD_A{postfix}')
config_h_lines.append(f'# define ENCODERS_PAD_A{postfix} {{ { ", ".join(a_pads) } }}') config_h_lines.append(f'# define ENCODERS_PAD_A{postfix} {{ { ", ".join(a_pads) } }}')
@ -152,13 +152,15 @@ 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}')
if len(set(resolutions)) == 1: if None in resolutions:
cli.log.debug("Unable to generate ENCODER_RESOLUTION configuration")
elif len(set(resolutions)) == 1:
config_h_lines.append(f'#ifndef ENCODER_RESOLUTION{postfix}') config_h_lines.append(f'#ifndef ENCODER_RESOLUTION{postfix}')
config_h_lines.append(f'# define ENCODER_RESOLUTION{postfix} { resolutions[0] }') config_h_lines.append(f'# define ENCODER_RESOLUTION{postfix} { resolutions[0] }')
config_h_lines.append(f'#endif // ENCODER_RESOLUTION{postfix}') config_h_lines.append(f'#endif // ENCODER_RESOLUTION{postfix}')
else: else:
config_h_lines.append(f'#ifndef ENCODER_RESOLUTIONS{postfix}') 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'# define ENCODER_RESOLUTIONS{postfix} {{ { ", ".join(map(str,resolutions)) } }}')
config_h_lines.append(f'#endif // ENCODER_RESOLUTIONS{postfix}') config_h_lines.append(f'#endif // ENCODER_RESOLUTIONS{postfix}')

10
lib/python/qmk/info.py
View File

@ -225,17 +225,21 @@ def _extract_encoders_values(config_c, postfix=''):
b_pad = config_c.get(f'ENCODERS_PAD_B{postfix}', '').replace(' ', '')[1:-1] b_pad = config_c.get(f'ENCODERS_PAD_B{postfix}', '').replace(' ', '')[1:-1]
resolutions = config_c.get(f'ENCODER_RESOLUTIONS{postfix}', '').replace(' ', '')[1:-1] resolutions = config_c.get(f'ENCODER_RESOLUTIONS{postfix}', '').replace(' ', '')[1:-1]
default_resolution = config_c.get('ENCODER_RESOLUTION', '4') default_resolution = config_c.get('ENCODER_RESOLUTION', None)
if a_pad and b_pad: if a_pad and b_pad:
a_pad = list(filter(None, a_pad.split(','))) a_pad = list(filter(None, a_pad.split(',')))
b_pad = list(filter(None, b_pad.split(','))) b_pad = list(filter(None, b_pad.split(',')))
resolutions = list(filter(None, resolutions.split(','))) resolutions = list(filter(None, resolutions.split(',')))
resolutions += [default_resolution] * (len(a_pad) - len(resolutions)) if default_resolution:
resolutions += [default_resolution] * (len(a_pad) - len(resolutions))
encoders = [] encoders = []
for index in range(len(a_pad)): for index in range(len(a_pad)):
encoders.append({'pin_a': a_pad[index], 'pin_b': b_pad[index], "resolution": int(resolutions[index])}) encoder = {'pin_a': a_pad[index], 'pin_b': b_pad[index]}
if index < len(resolutions):
encoder['resolution'] = int(resolutions[index])
encoders.append(encoder)
return encoders return encoders