summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2022-02-15 01:42:58 +0000
committerGitHub <noreply@github.com>2022-02-15 01:42:58 +0000
commitb0621223bc53f634a28243b874379e8e157878fd (patch)
tree25849db31989959bd72181621da23346ad3fd4bf
parentc9f192bae88ba4190d2e7f0bd560563b377f394d (diff)
Various fixes for new-keyboard (#16358)
-rw-r--r--data/templates/keyboard/config.h20
-rw-r--r--data/templates/keyboard/info.json1
-rw-r--r--lib/python/qmk/cli/new/keyboard.py10
-rw-r--r--lib/python/qmk/info.py1
4 files changed, 31 insertions, 1 deletions
diff --git a/data/templates/keyboard/config.h b/data/templates/keyboard/config.h
new file mode 100644
index 0000000000..b15c8d31f1
--- /dev/null
+++ b/data/templates/keyboard/config.h
@@ -0,0 +1,20 @@
+// Copyright %YEAR% %REAL_NAME% (@%USER_NAME%)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/*
+ * Feature disable options
+ * These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
diff --git a/data/templates/keyboard/info.json b/data/templates/keyboard/info.json
index 92718faf3a..41bc691313 100644
--- a/data/templates/keyboard/info.json
+++ b/data/templates/keyboard/info.json
@@ -1,6 +1,7 @@
{
"keyboard_name": "%KEYBOARD%",
"maintainer": "%USER_NAME%",
+ "manufacturer": "%REAL_NAME%",
"processor": "%MCU%",
"bootloader": "%BOOTLOADER%",
"diode_direction": "COL2ROW",
diff --git a/lib/python/qmk/cli/new/keyboard.py b/lib/python/qmk/cli/new/keyboard.py
index 8596994d38..6fa9ad5b2c 100644
--- a/lib/python/qmk/cli/new/keyboard.py
+++ b/lib/python/qmk/cli/new/keyboard.py
@@ -208,7 +208,15 @@ def new_keyboard(cli):
cli.log.error(f'Keyboard {{fg_cyan}}{kb_name}{{fg_reset}} already exists! Please choose a different name.')
return 1
- tokens = {'YEAR': str(date.today().year), 'KEYBOARD': kb_name, 'USER_NAME': user_name, 'REAL_NAME': real_name, 'LAYOUT': default_layout, 'MCU': mcu, 'BOOTLOADER': bootloader}
+ tokens = { # Comment here is to force multiline formatting
+ 'YEAR': str(date.today().year),
+ 'KEYBOARD': kb_name,
+ 'USER_NAME': user_name,
+ 'REAL_NAME': real_name,
+ 'LAYOUT': default_layout,
+ 'MCU': mcu,
+ 'BOOTLOADER': bootloader
+ }
if cli.config.general.verbose:
cli.log.info("Creating keyboard with:")
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 905f10ecc2..7e6f531f9c 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -49,6 +49,7 @@ def info_json(keyboard):
'parse_errors': [],
'parse_warnings': [],
'maintainer': 'qmk',
+ 'manufacturer': 'qmk',
}
# Populate the list of JSON keymaps