diff options
| author | QMK Bot | 2025-12-01 02:46:53 +0100 |
|---|---|---|
| committer | QMK Bot | 2025-12-01 02:46:53 +0100 |
| commit | d45b967cf2f9ccddebcfa1f53e99460b69b7fed3 (patch) | |
| tree | 62db4daeb423395272c70879068226e9d1d36ca8 /lib | |
| parent | d383e93526630cf59b8ab2faac7a66b2101ee5c3 (diff) | |
| parent | e2bf515df4c51c4d2e3b442d23e52d6d43f7f726 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/python/qmk/cli/generate/keycodes.py | 6 | ||||
| -rwxr-xr-x | lib/python/qmk/json_encoders.py | 4 | ||||
| -rw-r--r-- | lib/python/qmk/painter.py | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/python/qmk/cli/generate/keycodes.py b/lib/python/qmk/cli/generate/keycodes.py index d686935fa8..d694202aec 100644 --- a/lib/python/qmk/cli/generate/keycodes.py +++ b/lib/python/qmk/cli/generate/keycodes.py @@ -92,15 +92,15 @@ def _generate_helpers(lines, keycodes): for group, codes in temp.items(): lo = keycodes["keycodes"][f'0x{codes[0]:04X}']['key'] hi = keycodes["keycodes"][f'0x{codes[1]:04X}']['key'] - lines.append(f'#define IS_{ _translate_group(group).upper() }_KEYCODE(code) ((code) >= {lo} && (code) <= {hi})') + lines.append(f'#define IS_{_translate_group(group).upper()}_KEYCODE(code) ((code) >= {lo} && (code) <= {hi})') lines.append('') lines.append('// Switch statement Helpers') for group, codes in temp.items(): lo = keycodes["keycodes"][f'0x{codes[0]:04X}']['key'] hi = keycodes["keycodes"][f'0x{codes[1]:04X}']['key'] - name = f'{ _translate_group(group).upper() }_KEYCODE_RANGE' - lines.append(f'#define { name.ljust(35) } {lo} ... {hi}') + name = f'{_translate_group(group).upper()}_KEYCODE_RANGE' + lines.append(f'#define {name.ljust(35)} {lo} ... {hi}') def _generate_aliases(lines, keycodes): diff --git a/lib/python/qmk/json_encoders.py b/lib/python/qmk/json_encoders.py index e8bcf48996..6bad820a76 100755 --- a/lib/python/qmk/json_encoders.py +++ b/lib/python/qmk/json_encoders.py @@ -178,9 +178,9 @@ class KeymapJSONEncoder(QMKJSONEncoder): else: layer[-1].append(f'"{key}"') - layer = [f"{self.indent_str*indent_level}{', '.join(row)}" for row in layer] + layer = [f"{self.indent_str * indent_level}{', '.join(row)}" for row in layer] - return f"{self.indent_str}[\n{newline.join(layer)}\n{self.indent_str*self.indentation_level}]" + return f"{self.indent_str}[\n{newline.join(layer)}\n{self.indent_str * self.indentation_level}]" elif self.primitives_only(obj): return "[" + ", ".join(self.encode(element) for element in obj) + "]" diff --git a/lib/python/qmk/painter.py b/lib/python/qmk/painter.py index ed0372c163..1a07f7442c 100644 --- a/lib/python/qmk/painter.py +++ b/lib/python/qmk/painter.py @@ -129,7 +129,7 @@ def _render_image_metadata(metadata): px = size["width"] * size["height"] # FIXME: May need need more chars here too - deltas.append(f"// Frame {i:3d}: ({l:3d}, {t:3d}) - ({r:3d}, {b:3d}) >> {delta_px:4d}/{px:4d} pixels ({100*delta_px/px:.2f}%)") + deltas.append(f"// Frame {i:3d}: ({l:3d}, {t:3d}) - ({r:3d}, {b:3d}) >> {delta_px:4d}/{px:4d} pixels ({100 * delta_px / px:.2f}%)") if deltas: lines.append("// Areas on delta frames") |