aboutsummaryrefslogtreecommitdiff
path: root/lib/python/qmk/cli/generate
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-09-27 17:03:42 +0000
committerQMK Bot <hello@qmk.fm>2021-09-27 17:03:42 +0000
commitbca7a99e7aad2ff0a4aaed2d0e755e2d6bd7cee6 (patch)
tree764b035dc6beebd5ced279f02d10b5b0e0720894 /lib/python/qmk/cli/generate
parenta311514f43de7cf7bde758a691419a95367cebe2 (diff)
parentfce9cb933845bf0b74d322eba02de3b76daaeb84 (diff)
downloadqmk_firmware-bca7a99e7aad2ff0a4aaed2d0e755e2d6bd7cee6.tar.gz
qmk_firmware-bca7a99e7aad2ff0a4aaed2d0e755e2d6bd7cee6.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python/qmk/cli/generate')
-rwxr-xr-xlib/python/qmk/cli/generate/config_h.py2
-rw-r--r--lib/python/qmk/cli/generate/dfu_header.py2
-rwxr-xr-xlib/python/qmk/cli/generate/keyboard_h.py2
-rwxr-xr-xlib/python/qmk/cli/generate/layouts.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index ca7e14fe6..f16dca1de 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -173,7 +173,7 @@ def generate_config_h(cli):
173 kb_info_json = dotty(info_json(cli.args.keyboard)) 173 kb_info_json = dotty(info_json(cli.args.keyboard))
174 174
175 # Build the info_config.h file. 175 # Build the info_config.h file.
176 config_h_lines = ['/* This file was generated by `qmk generate-config-h`. Do not edit or copy.' ' */', '', '#pragma once'] 176 config_h_lines = ['/* This file was generated by `qmk generate-config-h`. Do not edit or copy.', ' */', '', '#pragma once']
177 177
178 generate_config_items(kb_info_json, config_h_lines) 178 generate_config_items(kb_info_json, config_h_lines)
179 179
diff --git a/lib/python/qmk/cli/generate/dfu_header.py b/lib/python/qmk/cli/generate/dfu_header.py
index 211ed9991..5a1b109f1 100644
--- a/lib/python/qmk/cli/generate/dfu_header.py
+++ b/lib/python/qmk/cli/generate/dfu_header.py
@@ -30,7 +30,7 @@ def generate_dfu_header(cli):
30 # Build the Keyboard.h file. 30 # Build the Keyboard.h file.
31 kb_info_json = dotty(info_json(cli.config.generate_dfu_header.keyboard)) 31 kb_info_json = dotty(info_json(cli.config.generate_dfu_header.keyboard))
32 32
33 keyboard_h_lines = ['/* This file was generated by `qmk generate-dfu-header`. Do not edit or copy.' ' */', '', '#pragma once'] 33 keyboard_h_lines = ['/* This file was generated by `qmk generate-dfu-header`. Do not edit or copy.', ' */', '', '#pragma once']
34 keyboard_h_lines.append(f'#define MANUFACTURER {kb_info_json["manufacturer"]}') 34 keyboard_h_lines.append(f'#define MANUFACTURER {kb_info_json["manufacturer"]}')
35 keyboard_h_lines.append(f'#define PRODUCT {cli.config.generate_dfu_header.keyboard} Bootloader') 35 keyboard_h_lines.append(f'#define PRODUCT {cli.config.generate_dfu_header.keyboard} Bootloader')
36 36
diff --git a/lib/python/qmk/cli/generate/keyboard_h.py b/lib/python/qmk/cli/generate/keyboard_h.py
index c9d7f549b..f05178ced 100755
--- a/lib/python/qmk/cli/generate/keyboard_h.py
+++ b/lib/python/qmk/cli/generate/keyboard_h.py
@@ -36,7 +36,7 @@ def generate_keyboard_h(cli):
36 has_layout_h = would_populate_layout_h(cli.args.keyboard) 36 has_layout_h = would_populate_layout_h(cli.args.keyboard)
37 37
38 # Build the layouts.h file. 38 # Build the layouts.h file.
39 keyboard_h_lines = ['/* This file was generated by `qmk generate-keyboard-h`. Do not edit or copy.' ' */', '', '#pragma once', '#include "quantum.h"'] 39 keyboard_h_lines = ['/* This file was generated by `qmk generate-keyboard-h`. Do not edit or copy.', ' */', '', '#pragma once', '#include "quantum.h"']
40 40
41 if not has_layout_h: 41 if not has_layout_h:
42 keyboard_h_lines.append('#pragma error("<keyboard>.h is only optional for data driven keyboards - kb.h == bad times")') 42 keyboard_h_lines.append('#pragma error("<keyboard>.h is only optional for data driven keyboards - kb.h == bad times")')
diff --git a/lib/python/qmk/cli/generate/layouts.py b/lib/python/qmk/cli/generate/layouts.py
index 4de982f82..e44266e1c 100755
--- a/lib/python/qmk/cli/generate/layouts.py
+++ b/lib/python/qmk/cli/generate/layouts.py
@@ -38,7 +38,7 @@ def generate_layouts(cli):
38 kb_info_json = info_json(cli.config.generate_layouts.keyboard) 38 kb_info_json = info_json(cli.config.generate_layouts.keyboard)
39 39
40 # Build the layouts.h file. 40 # Build the layouts.h file.
41 layouts_h_lines = ['/* This file was generated by `qmk generate-layouts`. Do not edit or copy.' ' */', '', '#pragma once'] 41 layouts_h_lines = ['/* This file was generated by `qmk generate-layouts`. Do not edit or copy.', ' */', '', '#pragma once']
42 42
43 if 'matrix_pins' in kb_info_json: 43 if 'matrix_pins' in kb_info_json:
44 if 'direct' in kb_info_json['matrix_pins']: 44 if 'direct' in kb_info_json['matrix_pins']: