Merge remote-tracking branch 'upstream/develop' into xap

data/templates/api/readme.md

@@ -0,0 +1,5 @@
+# QMK Keyboard Metadata
+
+This directory contains machine parsable data about keyboards supported by QMK. The latest version is always available online at <https://keyboards.qmk.fm>.
+
+Do not edit anything here by hand. It is generated with the `qmk generate-api` command.

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

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",
@@ -11,14 +12,14 @@
     "usb": {
         "vid": "0xFEED",
         "pid": "0x0000",
-        "device_ver": "0x0001"
+        "device_version": "1.0.0"
     },
     "features": {
-        "bootmagic_lite": true,
+        "bootmagic": true,
         "command": false,
         "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": true
     }
-}
+}