summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2022-11-08 12:05:08 +1100
committerGitHub <noreply@github.com>2022-11-08 01:05:08 +0000
commit479d8de622674b6667295bda344145a69aa042bd (patch)
treefedd0a796937a6be3fe8dffe07ef107eeb943411 /lib
parentce80a3ad46b951e6c7021b43e43e63074d8234f8 (diff)
Format DD mappings and schemas (#18924)
Diffstat (limited to 'lib')
-rwxr-xr-xlib/python/qmk/cli/generate/api.py2
-rwxr-xr-xlib/python/qmk/cli/generate/config_h.py2
-rwxr-xr-xlib/python/qmk/cli/generate/rules_mk.py2
-rw-r--r--lib/python/qmk/cli/new/keyboard.py2
-rw-r--r--lib/python/qmk/commands.py2
-rw-r--r--lib/python/qmk/info.py6
-rw-r--r--lib/python/qmk/keyboard.py2
7 files changed, 9 insertions, 9 deletions
diff --git a/lib/python/qmk/cli/generate/api.py b/lib/python/qmk/cli/generate/api.py
index 0f29cd2327..ddb3a0772e 100755
--- a/lib/python/qmk/cli/generate/api.py
+++ b/lib/python/qmk/cli/generate/api.py
@@ -98,7 +98,7 @@ def generate_api(cli):
# Generate data for the global files
keyboard_list = sorted(kb_all)
- keyboard_aliases = json_load(Path('data/mappings/keyboard_aliases.json'))
+ keyboard_aliases = json_load(Path('data/mappings/keyboard_aliases.hjson'))
keyboard_metadata = {
'last_updated': current_datetime(),
'keyboards': keyboard_list,
diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index f64daba134..31b8d70635 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -70,7 +70,7 @@ def generate_matrix_size(kb_info_json, config_h_lines):
def generate_config_items(kb_info_json, config_h_lines):
"""Iterate through the info_config map to generate basic config values.
"""
- info_config_map = json_load(Path('data/mappings/info_config.json'))
+ info_config_map = json_load(Path('data/mappings/info_config.hjson'))
for config_key, info_dict in info_config_map.items():
info_key = info_dict['info_key']
diff --git a/lib/python/qmk/cli/generate/rules_mk.py b/lib/python/qmk/cli/generate/rules_mk.py
index 1d708f371e..fc272da6c6 100755
--- a/lib/python/qmk/cli/generate/rules_mk.py
+++ b/lib/python/qmk/cli/generate/rules_mk.py
@@ -62,7 +62,7 @@ def generate_rules_mk(cli):
cli.subcommands['generate-rules-mk'].print_help()
return False
- info_rules_map = json_load(Path('data/mappings/info_rules.json'))
+ info_rules_map = json_load(Path('data/mappings/info_rules.hjson'))
rules_mk_lines = [GPL2_HEADER_SH_LIKE, GENERATED_HEADER_SH_LIKE]
# Iterate through the info_rules map to generate basic rules
diff --git a/lib/python/qmk/cli/new/keyboard.py b/lib/python/qmk/cli/new/keyboard.py
index 8d4def1bef..251ad919dd 100644
--- a/lib/python/qmk/cli/new/keyboard.py
+++ b/lib/python/qmk/cli/new/keyboard.py
@@ -210,7 +210,7 @@ def new_keyboard(cli):
# Preprocess any development_board presets
if mcu in dev_boards:
- defaults_map = json_load(Path('data/mappings/defaults.json'))
+ defaults_map = json_load(Path('data/mappings/defaults.hjson'))
board = defaults_map['development_board'][mcu]
mcu = board['processor']
diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py
index 07826a4866..5561a354c5 100644
--- a/lib/python/qmk/commands.py
+++ b/lib/python/qmk/commands.py
@@ -214,7 +214,7 @@ def parse_configurator_json(configurator_file):
exit(1)
orig_keyboard = user_keymap['keyboard']
- aliases = json_load(Path('data/mappings/keyboard_aliases.json'))
+ aliases = json_load(Path('data/mappings/keyboard_aliases.hjson'))
if orig_keyboard in aliases:
if 'target' in aliases[orig_keyboard]:
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 5ca282b2d3..5dc8b9c5fe 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -483,7 +483,7 @@ def _extract_config_h(info_data, config_c):
"""
# Pull in data from the json map
dotty_info = dotty(info_data)
- info_config_map = json_load(Path('data/mappings/info_config.json'))
+ info_config_map = json_load(Path('data/mappings/info_config.hjson'))
for config_key, info_dict in info_config_map.items():
info_key = info_dict['info_key']
@@ -529,7 +529,7 @@ def _extract_config_h(info_data, config_c):
def _process_defaults(info_data):
"""Process any additional defaults based on currently discovered information
"""
- defaults_map = json_load(Path('data/mappings/defaults.json'))
+ defaults_map = json_load(Path('data/mappings/defaults.hjson'))
for default_type in defaults_map.keys():
thing_map = defaults_map[default_type]
if default_type in info_data:
@@ -555,7 +555,7 @@ def _extract_rules_mk(info_data, rules):
# Pull in data from the json map
dotty_info = dotty(info_data)
- info_rules_map = json_load(Path('data/mappings/info_rules.json'))
+ info_rules_map = json_load(Path('data/mappings/info_rules.hjson'))
for rules_key, info_dict in info_rules_map.items():
info_key = info_dict['info_key']
diff --git a/lib/python/qmk/keyboard.py b/lib/python/qmk/keyboard.py
index 686d4fc403..6ddbba8fa5 100644
--- a/lib/python/qmk/keyboard.py
+++ b/lib/python/qmk/keyboard.py
@@ -69,7 +69,7 @@ def keyboard_folder(keyboard):
This checks aliases and DEFAULT_FOLDER to resolve the actual path for a keyboard.
"""
- aliases = json_load(Path('data/mappings/keyboard_aliases.json'))
+ aliases = json_load(Path('data/mappings/keyboard_aliases.hjson'))
if keyboard in aliases:
keyboard = aliases[keyboard].get('target', keyboard)