marco/qmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small tweaks to keymap generation (#24240)

Browse Source
This commit is contained in:
Ryan 2024-08-04 21:28:40 +10:00 committed by GitHub
parent 5c10bd3d8c
commit 1f942bb17e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/python/qmk/keymap.py
View File

@ -40,7 +40,6 @@ __ENCODER_MAP_GOES_HERE__
#endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) #endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
__MACRO_OUTPUT_GOES_HERE__ __MACRO_OUTPUT_GOES_HERE__
""" """
@ -51,7 +50,7 @@ def _generate_keymap_table(keymap_json):
lines[-1] = lines[-1] + ',' lines[-1] = lines[-1] + ','
layer = map(_strip_any, layer) layer = map(_strip_any, layer)
layer_keys = ', '.join(layer) layer_keys = ', '.join(layer)
lines.append('\t[%s] = %s(%s)' % (layer_num, keymap_json['layout'], layer_keys)) lines.append(' [%s] = %s(%s)' % (layer_num, keymap_json['layout'], layer_keys))
return lines return lines
@ -61,7 +60,7 @@ def _generate_encodermap_table(keymap_json):
if layer_num != 0: if layer_num != 0:
lines[-1] = lines[-1] + ',' lines[-1] = lines[-1] + ','
encoder_keycode_txt = ', '.join([f'ENCODER_CCW_CW({_strip_any(e["ccw"])}, {_strip_any(e["cw"])})' for e in layer]) encoder_keycode_txt = ', '.join([f'ENCODER_CCW_CW({_strip_any(e["ccw"])}, {_strip_any(e["cw"])})' for e in layer])
lines.append('\t[%s] = {%s}' % (layer_num, encoder_keycode_txt)) lines.append(' [%s] = {%s}' % (layer_num, encoder_keycode_txt))
return lines return lines

6
lib/python/qmk/tests/test_cli_commands.py
View File

@ -156,7 +156,7 @@ def test_json2c():
* edit it directly. * edit it directly.
*/ */
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
\t[0] = LAYOUT_ortho_1x1(KC_A) [0] = LAYOUT_ortho_1x1(KC_A)
}; };
#if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
@ -168,7 +168,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
""" """
@ -195,7 +194,7 @@ def test_json2c_stdin():
* edit it directly. * edit it directly.
*/ */
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
\t[0] = LAYOUT_ortho_1x1(KC_A) [0] = LAYOUT_ortho_1x1(KC_A)
}; };
#if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
@ -207,7 +206,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
""" """

3
lib/python/qmk/tests/test_qmk_keymap.py
View File

@ -31,7 +31,7 @@ def test_generate_c_pytest_basic():
* edit it directly. * edit it directly.
*/ */
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
\t[0] = LAYOUT(KC_A) [0] = LAYOUT(KC_A)
}; };
#if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
@ -41,7 +41,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
#endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) #endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
""" """