55 files changed, 13 insertions(+), 11 deletions(-)

R keyboards/keychron/c2_pro/ansi/rgb/{info.json => keyboard.json}
M keyboards/keychron/c2_pro/ansi/rgb/rules.mk
R keyboards/keychron/c2_pro/ansi/white/{info.json => keyboard.json}
M keyboards/keychron/c2_pro/ansi/white/rules.mk
R keyboards/keychron/q10/ansi_encoder/{info.json => keyboard.json}
R keyboards/keychron/q10/iso_encoder/{info.json => keyboard.json}
R keyboards/keychron/q11/ansi_encoder/{info.json => keyboard.json}
R keyboards/keychron/q11/iso_encoder/{info.json => keyboard.json}
M keyboards/keychron/q11/iso_encoder/rules.mk
R keyboards/keychron/q12/ansi_encoder/{info.json => keyboard.json}
R keyboards/keychron/q12/iso_encoder/{info.json => keyboard.json}
M keyboards/keychron/q12/iso_encoder/rules.mk
R keyboards/keychron/q1v2/ansi/{info.json => keyboard.json}
R keyboards/keychron/q1v2/ansi_encoder/{info.json => keyboard.json}
R keyboards/keychron/q1v2/iso/{info.json => keyboard.json}
R keyboards/keychron/q1v2/iso_encoder/{info.json => keyboard.json}
R keyboards/keychron/q1v2/jis/{info.json => keyboard.json}
R keyboards/keychron/q1v2/jis_encoder/{info.json => keyboard.json}
R keyboards/keychron/q3/ansi_encoder/{info.json => keyboard.json}
R keyboards/keychron/q3/iso_encoder/{info.json => keyboard.json}
R keyboards/keychron/q3/jis_encoder/{info.json => keyboard.json}
M keyboards/keychron/q4/ansi/info.json
A keyboards/keychron/q4/ansi/v1/keyboard.json
D keyboards/keychron/q4/ansi/v1/rules.mk
A keyboards/keychron/q4/ansi/v2/keyboard.json
D keyboards/keychron/q4/ansi/v2/rules.mk
R keyboards/keychron/q5/ansi/{info.json => keyboard.json}
R keyboards/keychron/q5/ansi_encoder/{info.json => keyboard.json}
R keyboards/keychron/q5/iso/{info.json => keyboard.json}
R keyboards/keychron/q5/iso_encoder/{info.json => keyboard.json}
R keyboards/keychron/q6/ansi/{info.json => keyboard.json}
R keyboards/keychron/q6/ansi_encoder/{info.json => keyboard.json}
R keyboards/keychron/q6/iso/{info.json => keyboard.json}
R keyboards/keychron/q6/iso_encoder/{info.json => keyboard.json}
R keyboards/keychron/q65/ansi_encoder/{info.json => keyboard.json}
R keyboards/keychron/v1/ansi/{info.json => keyboard.json}
R keyboards/keychron/v1/ansi_encoder/{info.json => keyboard.json}
R keyboards/keychron/v1/iso/{info.json => keyboard.json}
R keyboards/keychron/v1/iso_encoder/{info.json => keyboard.json}
R keyboards/keychron/v1/jis/{info.json => keyboard.json}
R keyboards/keychron/v1/jis_encoder/{info.json => keyboard.json}
R keyboards/keychron/v10/ansi_encoder/{info.json => keyboard.json}
R keyboards/keychron/v10/iso_encoder/{info.json => keyboard.json}
R keyboards/keychron/v3/ansi_encoder/{info.json => keyboard.json}
R keyboards/keychron/v3/iso_encoder/{info.json => keyboard.json}
R keyboards/keychron/v3/jis_encoder/{info.json => keyboard.json}
R keyboards/keychron/v5/ansi/{info.json => keyboard.json}
R keyboards/keychron/v5/ansi_encoder/{info.json => keyboard.json}
R keyboards/keychron/v5/iso/{info.json => keyboard.json}
R keyboards/keychron/v5/iso_encoder/{info.json => keyboard.json}
R keyboards/keychron/v6/ansi/{info.json => keyboard.json}
R keyboards/keychron/v6/ansi_encoder/{info.json => keyboard.json}
R keyboards/keychron/v6/iso/{info.json => keyboard.json}
R keyboards/keychron/v6/iso_encoder/{info.json => keyboard.json}
M keyboards/keychron/v6/iso_encoder/rules.mk

@@ 1,2 1,2 @@
-# Build Options
+# custom matrix setup
 SRC += matrix.c

@@ 1,2 1,2 @@
-# Build Options
+# custom matrix setup
 SRC += matrix.c

@@ 1,4 1,1 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 SERIAL_DRIVER = usart

@@ 1,5 1,4 @@
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
-VPATH ?= keyboards/keychron/common
 SRC += matrix.c

@@ 1,7 1,6 @@
 {
     "usb": {
-        "pid": "0x0140",
-        "device_version": "1.0.6"
+        "pid": "0x0140"
     },
     "rgb_matrix": {
         "layout": [

@@ 0,0 1,5 @@
+{
+    "usb": {
+        "device_version": "1.0.6"
+    }
+}

@@ 1,1 0,0 @@
-# This file intentionally left blank>
\ No newline at end of file

@@ 0,0 1,5 @@
+{
+    "usb": {
+        "device_version": "2.0.0"
+    }
+}

@@ 1,1 0,0 @@
-# This file intentionally left blank>
\ No newline at end of file

@@ 1,5 1,4 @@
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
-VPATH ?= keyboards/keychron/common
 SRC += matrix.c