Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix broken keyboards on develop #11427

Merged
merged 3 commits into from
Jan 4, 2021
Merged

Fix broken keyboards on develop #11427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ed30c5
fix clueboards
skullydazed Jan 3, 2021
cdf66b1
fix lizard_trick/tenkey_plusplus/info.json
skullydazed Jan 3, 2021
7d6a7f4
fix keyboards with apostrophes in their names
skullydazed Jan 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion keyboards/clueboard/2x1800/2019/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"midi": false,
"mousekey": true,
"nkro": true,
"rgblight": true,
"rgblight": false,
"unicode": false
},
"matrix_pins": {
Expand Down
1 change: 1 addition & 0 deletions keyboards/clueboard/66_hotswap/gen1/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# MCU name
MCU = STM32F303
BOARD = QMK_PROTON_C
LED_MATRIX_DRIVER = IS31FL3731

# project specific files
SRC = led.c
4 changes: 2 additions & 2 deletions keyboards/lizard_trick/tenkey_plusplus/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
4 changes: 2 additions & 2 deletions lib/python/qmk/cli/generate/config_h.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -55,7 +55,7 @@ def manufacturer(manufacturer):
#ifndef MANUFACTURER
# define MANUFACTURER %s
#endif // MANUFACTURER
""" % (manufacturer)
""" % (manufacturer.replace("'", ""))


def direct_pins(direct_pins):
Expand Down
2 changes: 1 addition & 1 deletion lib/python/qmk/info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down