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

`qmk info`: account for ISO enter when calculating layout X offset (#20325)

This commit is contained in:
Ryan 2023-04-04 10:15:35 +10:00 committed by GitHub
parent 1dd2d1df20
commit 81f321d331
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,11 @@ def _valid_community_layout(layout):
return (Path('layouts/default') / layout).exists() return (Path('layouts/default') / layout).exists()
def _get_key_left_position(key):
# Special case for ISO enter
return key['x'] - 0.25 if key.get('h', 1) == 2 and key.get('w', 1) == 1.25 else key['x']
def _additional_validation(keyboard, info_data): def _additional_validation(keyboard, info_data):
"""Non schema checks """Non schema checks
""" """
@ -64,7 +69,7 @@ def _additional_validation(keyboard, info_data):
# Warn if physical positions are offset (at least one key should be at x=0, and at least one key at y=0) # Warn if physical positions are offset (at least one key should be at x=0, and at least one key at y=0)
for layout_name, layout_data in layouts.items(): for layout_name, layout_data in layouts.items():
offset_x = min([k['x'] for k in layout_data['layout']]) offset_x = min([_get_key_left_position(k) for k in layout_data['layout']])
if offset_x > 0: if offset_x > 0:
_log_warning(info_data, f'Layout "{layout_name}" is offset on X axis by {offset_x}') _log_warning(info_data, f'Layout "{layout_name}" is offset on X axis by {offset_x}')