Small tweaks to keymap generation (#24240)
This commit is contained in:
parent
5c10bd3d8c
commit
1f942bb17e
3 changed files with 5 additions and 9 deletions
|
@ -40,7 +40,6 @@ __ENCODER_MAP_GOES_HERE__
|
|||
#endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
|
||||
|
||||
__MACRO_OUTPUT_GOES_HERE__
|
||||
|
||||
"""
|
||||
|
||||
|
||||
|
@ -51,7 +50,7 @@ def _generate_keymap_table(keymap_json):
|
|||
lines[-1] = lines[-1] + ','
|
||||
layer = map(_strip_any, 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
|
||||
|
||||
|
||||
|
@ -61,7 +60,7 @@ def _generate_encodermap_table(keymap_json):
|
|||
if layer_num != 0:
|
||||
lines[-1] = lines[-1] + ','
|
||||
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
|
||||
|
||||
|
||||
|
|
|
@ -156,7 +156,7 @@ def test_json2c():
|
|||
* edit it directly.
|
||||
*/
|
||||
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)
|
||||
|
@ -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.
|
||||
*/
|
||||
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)
|
||||
|
@ -207,7 +206,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
|
|||
|
||||
|
||||
|
||||
|
||||
"""
|
||||
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ def test_generate_c_pytest_basic():
|
|||
* edit it directly.
|
||||
*/
|
||||
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)
|
||||
|
@ -41,7 +41,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
|
|||
#endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
|
||||
|
||||
|
||||
|
||||
"""
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue