commit: d9740c9de11d41493149bee2e712aee536d40b25 parent 32136afe242c82f4b0f430eadc6914ca83dd8239 Author: Joel Challis <git@zvecr.com> Date: Tue, 23 Apr 2024 16:33:39 +0100 Migrate build target markers to keyboard.json - Keychron (#23593)Diffstat:
55 files changed, 13 insertions(+), 13 deletions(-)diff --git a/keyboards/keychron/c2_pro/ansi/rgb/info.json b/keyboards/keychron/c2_pro/ansi/rgb/keyboard.jsondiff --git 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.cdiff --git a/keyboards/keychron/c2_pro/ansi/white/info.json b/keyboards/keychron/c2_pro/ansi/white/keyboard.jsondiff --git 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.cdiff --git a/keyboards/keychron/q10/ansi_encoder/info.json b/keyboards/keychron/q10/ansi_encoder/keyboard.jsondiff --git a/keyboards/keychron/q10/iso_encoder/info.json b/keyboards/keychron/q10/iso_encoder/keyboard.jsondiff --git a/keyboards/keychron/q11/ansi_encoder/info.json b/keyboards/keychron/q11/ansi_encoder/keyboard.jsondiff --git a/keyboards/keychron/q11/iso_encoder/info.json b/keyboards/keychron/q11/iso_encoder/keyboard.jsondiff --git 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 = usartdiff --git a/keyboards/keychron/q12/ansi_encoder/info.json b/keyboards/keychron/q12/ansi_encoder/keyboard.jsondiff --git a/keyboards/keychron/q12/iso_encoder/info.json b/keyboards/keychron/q12/iso_encoder/keyboard.jsondiff --git 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.cdiff --git a/keyboards/keychron/q1v2/ansi/info.json b/keyboards/keychron/q1v2/ansi/keyboard.jsondiff --git a/keyboards/keychron/q1v2/ansi_encoder/info.json b/keyboards/keychron/q1v2/ansi_encoder/keyboard.jsondiff --git a/keyboards/keychron/q1v2/iso/info.json b/keyboards/keychron/q1v2/iso/keyboard.jsondiff --git a/keyboards/keychron/q1v2/iso_encoder/info.json b/keyboards/keychron/q1v2/iso_encoder/keyboard.jsondiff --git a/keyboards/keychron/q1v2/jis/info.json b/keyboards/keychron/q1v2/jis/keyboard.jsondiff --git a/keyboards/keychron/q1v2/jis_encoder/info.json b/keyboards/keychron/q1v2/jis_encoder/keyboard.jsondiff --git a/keyboards/keychron/q3/ansi_encoder/info.json b/keyboards/keychron/q3/ansi_encoder/keyboard.jsondiff --git a/keyboards/keychron/q3/iso_encoder/info.json b/keyboards/keychron/q3/iso_encoder/keyboard.jsondiff --git a/keyboards/keychron/q3/jis_encoder/info.json b/keyboards/keychron/q3/jis_encoder/keyboard.jsondiff --git 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": [diff --git 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" + } +}diff --git a/keyboards/keychron/q4/ansi/v1/rules.mk b/keyboards/keychron/q4/ansi/v1/rules.mk@@ -1 +0,0 @@ -# This file intentionally left blank -\ No newline at end of filediff --git 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" + } +}diff --git a/keyboards/keychron/q4/ansi/v2/rules.mk b/keyboards/keychron/q4/ansi/v2/rules.mk@@ -1 +0,0 @@ -# This file intentionally left blank -\ No newline at end of filediff --git a/keyboards/keychron/q5/ansi/info.json b/keyboards/keychron/q5/ansi/keyboard.jsondiff --git a/keyboards/keychron/q5/ansi_encoder/info.json b/keyboards/keychron/q5/ansi_encoder/keyboard.jsondiff --git a/keyboards/keychron/q5/iso/info.json b/keyboards/keychron/q5/iso/keyboard.jsondiff --git a/keyboards/keychron/q5/iso_encoder/info.json b/keyboards/keychron/q5/iso_encoder/keyboard.jsondiff --git a/keyboards/keychron/q6/ansi/info.json b/keyboards/keychron/q6/ansi/keyboard.jsondiff --git a/keyboards/keychron/q6/ansi_encoder/info.json b/keyboards/keychron/q6/ansi_encoder/keyboard.jsondiff --git a/keyboards/keychron/q6/iso/info.json b/keyboards/keychron/q6/iso/keyboard.jsondiff --git a/keyboards/keychron/q6/iso_encoder/info.json b/keyboards/keychron/q6/iso_encoder/keyboard.jsondiff --git a/keyboards/keychron/q65/ansi_encoder/info.json b/keyboards/keychron/q65/ansi_encoder/keyboard.jsondiff --git a/keyboards/keychron/v1/ansi/info.json b/keyboards/keychron/v1/ansi/keyboard.jsondiff --git a/keyboards/keychron/v1/ansi_encoder/info.json b/keyboards/keychron/v1/ansi_encoder/keyboard.jsondiff --git a/keyboards/keychron/v1/iso/info.json b/keyboards/keychron/v1/iso/keyboard.jsondiff --git a/keyboards/keychron/v1/iso_encoder/info.json b/keyboards/keychron/v1/iso_encoder/keyboard.jsondiff --git a/keyboards/keychron/v1/jis/info.json b/keyboards/keychron/v1/jis/keyboard.jsondiff --git a/keyboards/keychron/v1/jis_encoder/info.json b/keyboards/keychron/v1/jis_encoder/keyboard.jsondiff --git a/keyboards/keychron/v10/ansi_encoder/info.json b/keyboards/keychron/v10/ansi_encoder/keyboard.jsondiff --git a/keyboards/keychron/v10/iso_encoder/info.json b/keyboards/keychron/v10/iso_encoder/keyboard.jsondiff --git a/keyboards/keychron/v3/ansi_encoder/info.json b/keyboards/keychron/v3/ansi_encoder/keyboard.jsondiff --git a/keyboards/keychron/v3/iso_encoder/info.json b/keyboards/keychron/v3/iso_encoder/keyboard.jsondiff --git a/keyboards/keychron/v3/jis_encoder/info.json b/keyboards/keychron/v3/jis_encoder/keyboard.jsondiff --git a/keyboards/keychron/v5/ansi/info.json b/keyboards/keychron/v5/ansi/keyboard.jsondiff --git a/keyboards/keychron/v5/ansi_encoder/info.json b/keyboards/keychron/v5/ansi_encoder/keyboard.jsondiff --git a/keyboards/keychron/v5/iso/info.json b/keyboards/keychron/v5/iso/keyboard.jsondiff --git a/keyboards/keychron/v5/iso_encoder/info.json b/keyboards/keychron/v5/iso_encoder/keyboard.jsondiff --git a/keyboards/keychron/v6/ansi/info.json b/keyboards/keychron/v6/ansi/keyboard.jsondiff --git a/keyboards/keychron/v6/ansi_encoder/info.json b/keyboards/keychron/v6/ansi_encoder/keyboard.jsondiff --git a/keyboards/keychron/v6/iso/info.json b/keyboards/keychron/v6/iso/keyboard.jsondiff --git a/keyboards/keychron/v6/iso_encoder/info.json b/keyboards/keychron/v6/iso_encoder/keyboard.jsondiff --git 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