Wekuz/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2025-12-01 01:46:53 +00:00
commit d45b967cf2
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/bootstrap_testing.yml vendored
View file

@ -161,7 +161,6 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os: os:
- macos-13 # Intel x64
- macos-14 # Apple Silicon ARM64 - macos-14 # Apple Silicon ARM64
- macos-15 # Apple Silicon ARM64 - macos-15 # Apple Silicon ARM64
- macos-15-intel # Intel x64 - macos-15-intel # Intel x64

6
lib/python/qmk/cli/generate/keycodes.py
View file

@ -92,15 +92,15 @@ def _generate_helpers(lines, keycodes):
for group, codes in temp.items(): for group, codes in temp.items():
lo = keycodes["keycodes"][f'0x{codes[0]:04X}']['key'] lo = keycodes["keycodes"][f'0x{codes[0]:04X}']['key']
hi = keycodes["keycodes"][f'0x{codes[1]: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('')
lines.append('// Switch statement Helpers') lines.append('// Switch statement Helpers')
for group, codes in temp.items(): for group, codes in temp.items():
lo = keycodes["keycodes"][f'0x{codes[0]:04X}']['key'] lo = keycodes["keycodes"][f'0x{codes[0]:04X}']['key']
hi = keycodes["keycodes"][f'0x{codes[1]:04X}']['key'] hi = keycodes["keycodes"][f'0x{codes[1]:04X}']['key']
name = f'{ _translate_group(group).upper() }_KEYCODE_RANGE' name = f'{_translate_group(group).upper()}_KEYCODE_RANGE'
lines.append(f'#define { name.ljust(35) } {lo} ... {hi}') lines.append(f'#define {name.ljust(35)} {lo} ... {hi}')
def _generate_aliases(lines, keycodes): def _generate_aliases(lines, keycodes):

4
lib/python/qmk/json_encoders.py
View file

@ -178,9 +178,9 @@ class KeymapJSONEncoder(QMKJSONEncoder):
else: else:
layer[-1].append(f'"{key}"') 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): elif self.primitives_only(obj):
return "[" + ", ".join(self.encode(element) for element in obj) + "]" return "[" + ", ".join(self.encode(element) for element in obj) + "]"

2
lib/python/qmk/painter.py
View file

@ -129,7 +129,7 @@ def _render_image_metadata(metadata):
px = size["width"] * size["height"] px = size["width"] * size["height"]
# FIXME: May need need more chars here too # 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: if deltas:
lines.append("// Areas on delta frames") lines.append("// Areas on delta frames")