Migrate build target markers to keyboard.json - Keychron (#23593)

2024-04-23 16:33:39 +01:00 · 2024-04-23 16:33:39 +01:00 · d9740c9de1
commit d9740c9de1
parent 32136afe24
55 changed files with 13 additions and 11 deletions
--- a/keyboards/keychron/c2_pro/ansi/rgb/keyboard.json
+++ b/keyboards/keychron/c2_pro/ansi/rgb/keyboard.json
--- a/keyboards/keychron/c2_pro/ansi/rgb/rules.mk
+++ b/keyboards/keychron/c2_pro/ansi/rgb/rules.mk
@ -1,2 +1,2 @@
-# Build Options
+# custom matrix setup
 SRC += matrix.c
--- a/keyboards/keychron/c2_pro/ansi/white/keyboard.json
+++ b/keyboards/keychron/c2_pro/ansi/white/keyboard.json
--- a/keyboards/keychron/c2_pro/ansi/white/rules.mk
+++ b/keyboards/keychron/c2_pro/ansi/white/rules.mk
@ -1,2 +1,2 @@
-# Build Options
+# custom matrix setup
 SRC += matrix.c
--- a/keyboards/keychron/q10/ansi_encoder/keyboard.json
+++ b/keyboards/keychron/q10/ansi_encoder/keyboard.json
--- a/keyboards/keychron/q10/iso_encoder/keyboard.json
+++ b/keyboards/keychron/q10/iso_encoder/keyboard.json
--- a/keyboards/keychron/q11/ansi_encoder/keyboard.json
+++ b/keyboards/keychron/q11/ansi_encoder/keyboard.json
--- a/keyboards/keychron/q11/iso_encoder/keyboard.json
+++ b/keyboards/keychron/q11/iso_encoder/keyboard.json
--- a/keyboards/keychron/q11/iso_encoder/rules.mk
+++ b/keyboards/keychron/q11/iso_encoder/rules.mk
@ -1,4 +1 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 SERIAL_DRIVER = usart
--- a/keyboards/keychron/q12/ansi_encoder/keyboard.json
+++ b/keyboards/keychron/q12/ansi_encoder/keyboard.json
--- a/keyboards/keychron/q12/iso_encoder/keyboard.json
+++ b/keyboards/keychron/q12/iso_encoder/keyboard.json
--- a/keyboards/keychron/q12/iso_encoder/rules.mk
+++ b/keyboards/keychron/q12/iso_encoder/rules.mk
@ -1,5 +1,4 @@
 # custom matrix setup
 CUSTOM_MATRIX = lite

-VPATH ?= keyboards/keychron/common
 SRC += matrix.c
--- a/keyboards/keychron/q1v2/ansi/keyboard.json
+++ b/keyboards/keychron/q1v2/ansi/keyboard.json
--- a/keyboards/keychron/q1v2/ansi_encoder/keyboard.json
+++ b/keyboards/keychron/q1v2/ansi_encoder/keyboard.json
--- a/keyboards/keychron/q1v2/iso/keyboard.json
+++ b/keyboards/keychron/q1v2/iso/keyboard.json
--- a/keyboards/keychron/q1v2/iso_encoder/keyboard.json
+++ b/keyboards/keychron/q1v2/iso_encoder/keyboard.json
--- a/keyboards/keychron/q1v2/jis/keyboard.json
+++ b/keyboards/keychron/q1v2/jis/keyboard.json
--- a/keyboards/keychron/q1v2/jis_encoder/keyboard.json
+++ b/keyboards/keychron/q1v2/jis_encoder/keyboard.json
--- a/keyboards/keychron/q3/ansi_encoder/keyboard.json
+++ b/keyboards/keychron/q3/ansi_encoder/keyboard.json
--- a/keyboards/keychron/q3/iso_encoder/keyboard.json
+++ b/keyboards/keychron/q3/iso_encoder/keyboard.json
--- a/keyboards/keychron/q3/jis_encoder/keyboard.json
+++ b/keyboards/keychron/q3/jis_encoder/keyboard.json
--- a/keyboards/keychron/q4/ansi/info.json
+++ b/keyboards/keychron/q4/ansi/info.json
@ -1,7 +1,6 @@
 {
    "usb": {
-        "pid": "0x0140",
-        "device_version": "1.0.6"
+        "pid": "0x0140"
    },
    "rgb_matrix": {
        "layout": [
--- a/keyboards/keychron/q4/ansi/v1/keyboard.json
+++ b/keyboards/keychron/q4/ansi/v1/keyboard.json
@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "1.0.6"
+    }
+}
--- a/keyboards/keychron/q4/ansi/v1/rules.mk
+++ b/keyboards/keychron/q4/ansi/v1/rules.mk
@ -1 +0,0 @@
-# This file intentionally left blank
--- a/keyboards/keychron/q4/ansi/v2/keyboard.json
+++ b/keyboards/keychron/q4/ansi/v2/keyboard.json
@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "2.0.0"
+    }
+}
--- a/keyboards/keychron/q4/ansi/v2/rules.mk
+++ b/keyboards/keychron/q4/ansi/v2/rules.mk
@ -1 +0,0 @@
-# This file intentionally left blank
--- a/keyboards/keychron/q5/ansi/keyboard.json
+++ b/keyboards/keychron/q5/ansi/keyboard.json
--- a/keyboards/keychron/q5/ansi_encoder/keyboard.json
+++ b/keyboards/keychron/q5/ansi_encoder/keyboard.json
--- a/keyboards/keychron/q5/iso/keyboard.json
+++ b/keyboards/keychron/q5/iso/keyboard.json
--- a/keyboards/keychron/q5/iso_encoder/keyboard.json
+++ b/keyboards/keychron/q5/iso_encoder/keyboard.json
--- a/keyboards/keychron/q6/ansi/keyboard.json
+++ b/keyboards/keychron/q6/ansi/keyboard.json
--- a/keyboards/keychron/q6/ansi_encoder/keyboard.json
+++ b/keyboards/keychron/q6/ansi_encoder/keyboard.json
--- a/keyboards/keychron/q6/iso/keyboard.json
+++ b/keyboards/keychron/q6/iso/keyboard.json
--- a/keyboards/keychron/q6/iso_encoder/keyboard.json
+++ b/keyboards/keychron/q6/iso_encoder/keyboard.json
--- a/keyboards/keychron/q65/ansi_encoder/keyboard.json
+++ b/keyboards/keychron/q65/ansi_encoder/keyboard.json
--- a/keyboards/keychron/v1/ansi/keyboard.json
+++ b/keyboards/keychron/v1/ansi/keyboard.json
--- a/keyboards/keychron/v1/ansi_encoder/keyboard.json
+++ b/keyboards/keychron/v1/ansi_encoder/keyboard.json
--- a/keyboards/keychron/v1/iso/keyboard.json
+++ b/keyboards/keychron/v1/iso/keyboard.json
--- a/keyboards/keychron/v1/iso_encoder/keyboard.json
+++ b/keyboards/keychron/v1/iso_encoder/keyboard.json
--- a/keyboards/keychron/v1/jis/keyboard.json
+++ b/keyboards/keychron/v1/jis/keyboard.json
--- a/keyboards/keychron/v1/jis_encoder/keyboard.json
+++ b/keyboards/keychron/v1/jis_encoder/keyboard.json
--- a/keyboards/keychron/v10/ansi_encoder/keyboard.json
+++ b/keyboards/keychron/v10/ansi_encoder/keyboard.json
--- a/keyboards/keychron/v10/iso_encoder/keyboard.json
+++ b/keyboards/keychron/v10/iso_encoder/keyboard.json
--- a/keyboards/keychron/v3/ansi_encoder/keyboard.json
+++ b/keyboards/keychron/v3/ansi_encoder/keyboard.json
--- a/keyboards/keychron/v3/iso_encoder/keyboard.json
+++ b/keyboards/keychron/v3/iso_encoder/keyboard.json
--- a/keyboards/keychron/v3/jis_encoder/keyboard.json
+++ b/keyboards/keychron/v3/jis_encoder/keyboard.json
--- a/keyboards/keychron/v5/ansi/keyboard.json
+++ b/keyboards/keychron/v5/ansi/keyboard.json
--- a/keyboards/keychron/v5/ansi_encoder/keyboard.json
+++ b/keyboards/keychron/v5/ansi_encoder/keyboard.json
--- a/keyboards/keychron/v5/iso/keyboard.json
+++ b/keyboards/keychron/v5/iso/keyboard.json
--- a/keyboards/keychron/v5/iso_encoder/keyboard.json
+++ b/keyboards/keychron/v5/iso_encoder/keyboard.json
--- a/keyboards/keychron/v6/ansi/keyboard.json
+++ b/keyboards/keychron/v6/ansi/keyboard.json
--- a/keyboards/keychron/v6/ansi_encoder/keyboard.json
+++ b/keyboards/keychron/v6/ansi_encoder/keyboard.json
--- a/keyboards/keychron/v6/iso/keyboard.json
+++ b/keyboards/keychron/v6/iso/keyboard.json
--- a/keyboards/keychron/v6/iso_encoder/keyboard.json
+++ b/keyboards/keychron/v6/iso_encoder/keyboard.json
--- a/keyboards/keychron/v6/iso_encoder/rules.mk
+++ b/keyboards/keychron/v6/iso_encoder/rules.mk
@ -1,5 +1,4 @@
 # custom matrix setup
 CUSTOM_MATRIX = lite

-VPATH ?= keyboards/keychron/common
 SRC += matrix.c