Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Correctly handle json keymaps with ANY()

Browse source
This commit is contained in:
skullY 2020-04-05 19:51:38 -07:00 committed by skullydazed
parent f4b67cde8a
commit b4ef72423e
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/python/qmk/keymap.py
View file

@ -11,7 +11,7 @@ DEFAULT_KEYMAP_C = """#include QMK_KEYBOARD_H
/* THIS FILE WAS GENERATED! /* THIS FILE WAS GENERATED!
* *
* This file was generated by qmk-compile-json. You may or may not want to * This file was generated by qmk json2c. You may or may not want to
* edit it directly. * edit it directly.
*/ */
@ -39,6 +39,15 @@ def template(keyboard):
return DEFAULT_KEYMAP_C return DEFAULT_KEYMAP_C
def _strip_any(keycode):
"""Remove ANY() from a keycode.
"""
if keycode.startswith('ANY(') and keycode.endswith(')'):
keycode = keycode[4:-1]
return keycode
def generate(keyboard, layout, layers): def generate(keyboard, layout, layers):
"""Returns a keymap.c for the specified keyboard, layout, and layers. """Returns a keymap.c for the specified keyboard, layout, and layers.
@ -53,9 +62,12 @@ def generate(keyboard, layout, layers):
An array of arrays describing the keymap. Each item in the inner array should be a string that is a valid QMK keycode. An array of arrays describing the keymap. Each item in the inner array should be a string that is a valid QMK keycode.
""" """
layer_txt = [] layer_txt = []
for layer_num, layer in enumerate(layers): for layer_num, layer in enumerate(layers):
if layer_num != 0: if layer_num != 0:
layer_txt[-1] = layer_txt[-1] + ',' layer_txt[-1] = layer_txt[-1] + ','
layer = map(_strip_any, layer)
layer_keys = ', '.join(layer) layer_keys = ', '.join(layer)
layer_txt.append('\t[%s] = %s(%s)' % (layer_num, layout, layer_keys)) layer_txt.append('\t[%s] = %s(%s)' % (layer_num, layout, layer_keys))