fix keyboards with apostrophes in their names

This commit is contained in:
Zach White 2021-01-03 15:45:06 -08:00 committed by Zach White
parent 5b2feecdf3
commit 6daa204363
2 changed files with 3 additions and 3 deletions

View file

@ -45,7 +45,7 @@ def keyboard_name(keyboard_name):
#ifndef PRODUCT #ifndef PRODUCT
# define PRODUCT %s # define PRODUCT %s
#endif // PRODUCT #endif // PRODUCT
""" % (keyboard_name, keyboard_name) """ % (keyboard_name.replace("'", ""), keyboard_name.replace("'", ""))
def manufacturer(manufacturer): def manufacturer(manufacturer):
@ -55,7 +55,7 @@ def manufacturer(manufacturer):
#ifndef MANUFACTURER #ifndef MANUFACTURER
# define MANUFACTURER %s # define MANUFACTURER %s
#endif // MANUFACTURER #endif // MANUFACTURER
""" % (manufacturer) """ % (manufacturer.replace("'", ""))
def direct_pins(direct_pins): def direct_pins(direct_pins):

View file

@ -345,7 +345,7 @@ def _merge_layouts(info_data, new_info_data):
else: else:
# Pull in layouts that have matrix data # Pull in layouts that have matrix data
missing_matrix = False missing_matrix = False
for key in layout_json['layout']: for key in layout_json.get('layout', {}):
if 'matrix' not in key: if 'matrix' not in key:
missing_matrix = True missing_matrix = True