From 7ed30c5de4ea187d3027ea6fe4a1928fad26b0e5 Mon Sep 17 00:00:00 2001 From: Zach White Date: Sun, 3 Jan 2021 15:34:04 -0800 Subject: [PATCH 1/3] fix clueboards --- keyboards/clueboard/2x1800/2019/info.json | 2 +- keyboards/clueboard/66_hotswap/gen1/rules.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/clueboard/2x1800/2019/info.json b/keyboards/clueboard/2x1800/2019/info.json index 1d6d8c6ba044..96af671a8bb0 100644 --- a/keyboards/clueboard/2x1800/2019/info.json +++ b/keyboards/clueboard/2x1800/2019/info.json @@ -16,7 +16,7 @@ "midi": false, "mousekey": true, "nkro": true, - "rgblight": true, + "rgblight": false, "unicode": false }, "matrix_pins": { diff --git a/keyboards/clueboard/66_hotswap/gen1/rules.mk b/keyboards/clueboard/66_hotswap/gen1/rules.mk index 7e85acec6552..f298df1677ca 100644 --- a/keyboards/clueboard/66_hotswap/gen1/rules.mk +++ b/keyboards/clueboard/66_hotswap/gen1/rules.mk @@ -1,6 +1,7 @@ # MCU name MCU = STM32F303 BOARD = QMK_PROTON_C +LED_MATRIX_DRIVER = IS31FL3731 # project specific files SRC = led.c From cdf66b159d6e840d34a539a0e03b40e03d4e6c6a Mon Sep 17 00:00:00 2001 From: Zach White Date: Sun, 3 Jan 2021 15:44:50 -0800 Subject: [PATCH 2/3] fix lizard_trick/tenkey_plusplus/info.json --- keyboards/lizard_trick/tenkey_plusplus/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/lizard_trick/tenkey_plusplus/info.json b/keyboards/lizard_trick/tenkey_plusplus/info.json index b81f83763c7b..cad5dd75db0a 100644 --- a/keyboards/lizard_trick/tenkey_plusplus/info.json +++ b/keyboards/lizard_trick/tenkey_plusplus/info.json @@ -5,8 +5,8 @@ "width": 4, "height": 5, "layouts": { - "default": { - "LAYOUT": [ + "LAYOUT": { + "layout": [ {"label": "Mute", "x": 0, "y": 0, "w": 1.3}, {"label": "MDPL", "x": 1.3, "y": 0, "w": 1.4}, {"label": "MDNX", "x": 2.7, "y": 0, "w": 1.3}, From 7d6a7f4bb8fffce8833c1db40967542a410e6289 Mon Sep 17 00:00:00 2001 From: Zach White Date: Sun, 3 Jan 2021 15:45:06 -0800 Subject: [PATCH 3/3] fix keyboards with apostrophes in their names --- lib/python/qmk/cli/generate/config_h.py | 4 ++-- lib/python/qmk/info.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py index e160ffea83cb..09aa0041f4df 100755 --- a/lib/python/qmk/cli/generate/config_h.py +++ b/lib/python/qmk/cli/generate/config_h.py @@ -45,7 +45,7 @@ def keyboard_name(keyboard_name): #ifndef PRODUCT # define PRODUCT %s #endif // PRODUCT -""" % (keyboard_name, keyboard_name) +""" % (keyboard_name.replace("'", ""), keyboard_name.replace("'", "")) def manufacturer(manufacturer): @@ -55,7 +55,7 @@ def manufacturer(manufacturer): #ifndef MANUFACTURER # define MANUFACTURER %s #endif // MANUFACTURER -""" % (manufacturer) +""" % (manufacturer.replace("'", "")) def direct_pins(direct_pins): diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index 2954a17e09b8..4611874e85ce 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -345,7 +345,7 @@ def _merge_layouts(info_data, new_info_data): else: # Pull in layouts that have matrix data missing_matrix = False - for key in layout_json['layout']: + for key in layout_json.get('layout', {}): if 'matrix' not in key: missing_matrix = True