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

auri.ee / qmk_firmware

fork atom

keyboard stuff

fork atom

QMK Bot 4 months ago d45b967c d383e935

+6 -7

4 changed files

expand all

.github

workflows

bootstrap_testing.yml

lib

python

qmk

cli

generate

keycodes.py

json_encoders.py

painter.py

-1

.github/workflows/bootstrap_testing.yml

··· 161 161 fail-fast: false 162 162 matrix: 163 163 os: 164 - - macos-13 # Intel x64 165 164 - macos-14 # Apple Silicon ARM64 166 165 - macos-15 # Apple Silicon ARM64 167 166 - macos-15-intel # Intel x64

+3 -3

lib/python/qmk/cli/generate/keycodes.py

··· 92 92 for group, codes in temp.items(): 93 93 lo = keycodes["keycodes"][f'0x{codes[0]:04X}']['key'] 94 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 97 lines.append('') 98 98 lines.append('// Switch statement Helpers') 99 99 for group, codes in temp.items(): 100 100 lo = keycodes["keycodes"][f'0x{codes[0]:04X}']['key'] 101 101 hi = keycodes["keycodes"][f'0x{codes[1]:04X}']['key'] 102 - name = f'{ _translate_group(group).upper() }_KEYCODE_RANGE' 103 - lines.append(f'#define { name.ljust(35) } {lo} ... {hi}') 102 + name = f'{_translate_group(group).upper()}_KEYCODE_RANGE' 103 + lines.append(f'#define {name.ljust(35)} {lo} ... {hi}') 104 104 105 105 106 106 def _generate_aliases(lines, keycodes):

+2 -2

lib/python/qmk/json_encoders.py

··· 178 178 else: 179 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 185 elif self.primitives_only(obj): 186 186 return "[" + ", ".join(self.encode(element) for element in obj) + "]"

+1 -1

lib/python/qmk/painter.py

··· 129 129 px = size["width"] * size["height"] 130 130 131 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 134 if deltas: 135 135 lines.append("// Areas on delta frames")