summaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2025-12-01 01:46:53 +0000
committerQMK Bot <hello@qmk.fm>2025-12-01 01:46:53 +0000
commitd45b967cf2f9ccddebcfa1f53e99460b69b7fed3 (patch)
tree62db4daeb423395272c70879068226e9d1d36ca8 /lib/python
parentd383e93526630cf59b8ab2faac7a66b2101ee5c3 (diff)
parente2bf515df4c51c4d2e3b442d23e52d6d43f7f726 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/qmk/cli/generate/keycodes.py6
-rwxr-xr-xlib/python/qmk/json_encoders.py4
-rw-r--r--lib/python/qmk/painter.py2
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):
92 for group, codes in temp.items(): 92 for group, codes in temp.items():
93 lo = keycodes["keycodes"][f'0x{codes[0]:04X}']['key'] 93 lo = keycodes["keycodes"][f'0x{codes[0]:04X}']['key']
94 hi = keycodes["keycodes"][f'0x{codes[1]:04X}']['key'] 94 hi = keycodes["keycodes"][f'0x{codes[1]:04X}']['key']
95 lines.append(f'#define IS_{ _translate_group(group).upper() }_KEYCODE(code) ((code) >= {lo} && (code) <= {hi})') 95 lines.append(f'#define IS_{_translate_group(group).upper()}_KEYCODE(code) ((code) >= {lo} && (code) <= {hi})')
96 96
97 lines.append('') 97 lines.append('')
98 lines.append('// Switch statement Helpers') 98 lines.append('// Switch statement Helpers')
99 for group, codes in temp.items(): 99 for group, codes in temp.items():
100 lo = keycodes["keycodes"][f'0x{codes[0]:04X}']['key'] 100 lo = keycodes["keycodes"][f'0x{codes[0]:04X}']['key']
101 hi = keycodes["keycodes"][f'0x{codes[1]:04X}']['key'] 101 hi = keycodes["keycodes"][f'0x{codes[1]:04X}']['key']
102 name = f'{ _translate_group(group).upper() }_KEYCODE_RANGE' 102 name = f'{_translate_group(group).upper()}_KEYCODE_RANGE'
103 lines.append(f'#define { name.ljust(35) } {lo} ... {hi}') 103 lines.append(f'#define {name.ljust(35)} {lo} ... {hi}')
104 104
105 105
106def _generate_aliases(lines, keycodes): 106def _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):
178 else: 178 else:
179 layer[-1].append(f'"{key}"') 179 layer[-1].append(f'"{key}"')
180 180
181 layer = [f"{self.indent_str*indent_level}{', '.join(row)}" for row in layer] 181 layer = [f"{self.indent_str * indent_level}{', '.join(row)}" for row in layer]
182 182
183 return f"{self.indent_str}[\n{newline.join(layer)}\n{self.indent_str*self.indentation_level}]" 183 return f"{self.indent_str}[\n{newline.join(layer)}\n{self.indent_str * self.indentation_level}]"
184 184
185 elif self.primitives_only(obj): 185 elif self.primitives_only(obj):
186 return "[" + ", ".join(self.encode(element) for element in obj) + "]" 186 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):
129 px = size["width"] * size["height"] 129 px = size["width"] * size["height"]
130 130
131 # FIXME: May need need more chars here too 131 # FIXME: May need need more chars here too
132 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}%)") 132 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}%)")
133 133
134 if deltas: 134 if deltas:
135 lines.append("// Areas on delta frames") 135 lines.append("// Areas on delta frames")