diff --git a/keyboards/keychron/c2_pro/ansi/rgb/info.json b/keyboards/keychron/c2_pro/ansi/rgb/keyboard.json similarity index 100% rename from keyboards/keychron/c2_pro/ansi/rgb/info.json rename to keyboards/keychron/c2_pro/ansi/rgb/keyboard.json diff --git a/keyboards/keychron/c2_pro/ansi/rgb/rules.mk b/keyboards/keychron/c2_pro/ansi/rgb/rules.mk index dab1551049..9760649931 100644 --- 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 diff --git a/keyboards/keychron/c2_pro/ansi/white/info.json b/keyboards/keychron/c2_pro/ansi/white/keyboard.json similarity index 100% rename from keyboards/keychron/c2_pro/ansi/white/info.json rename to keyboards/keychron/c2_pro/ansi/white/keyboard.json diff --git a/keyboards/keychron/c2_pro/ansi/white/rules.mk b/keyboards/keychron/c2_pro/ansi/white/rules.mk index dab1551049..9760649931 100644 --- 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 diff --git a/keyboards/keychron/q10/ansi_encoder/info.json b/keyboards/keychron/q10/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q10/ansi_encoder/info.json rename to keyboards/keychron/q10/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q10/iso_encoder/info.json b/keyboards/keychron/q10/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q10/iso_encoder/info.json rename to keyboards/keychron/q10/iso_encoder/keyboard.json diff --git a/keyboards/keychron/q11/ansi_encoder/info.json b/keyboards/keychron/q11/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q11/ansi_encoder/info.json rename to keyboards/keychron/q11/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q11/iso_encoder/info.json b/keyboards/keychron/q11/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q11/iso_encoder/info.json rename to keyboards/keychron/q11/iso_encoder/keyboard.json diff --git a/keyboards/keychron/q11/iso_encoder/rules.mk b/keyboards/keychron/q11/iso_encoder/rules.mk index ac78b227d6..c6e2988321 100755 --- 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 diff --git a/keyboards/keychron/q12/ansi_encoder/info.json b/keyboards/keychron/q12/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q12/ansi_encoder/info.json rename to keyboards/keychron/q12/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q12/iso_encoder/info.json b/keyboards/keychron/q12/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q12/iso_encoder/info.json rename to keyboards/keychron/q12/iso_encoder/keyboard.json diff --git a/keyboards/keychron/q12/iso_encoder/rules.mk b/keyboards/keychron/q12/iso_encoder/rules.mk index 2d3e529c97..3652da4b69 100644 --- 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 diff --git a/keyboards/keychron/q1v2/ansi/info.json b/keyboards/keychron/q1v2/ansi/keyboard.json similarity index 100% rename from keyboards/keychron/q1v2/ansi/info.json rename to keyboards/keychron/q1v2/ansi/keyboard.json diff --git a/keyboards/keychron/q1v2/ansi_encoder/info.json b/keyboards/keychron/q1v2/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q1v2/ansi_encoder/info.json rename to keyboards/keychron/q1v2/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q1v2/iso/info.json b/keyboards/keychron/q1v2/iso/keyboard.json similarity index 100% rename from keyboards/keychron/q1v2/iso/info.json rename to keyboards/keychron/q1v2/iso/keyboard.json diff --git a/keyboards/keychron/q1v2/iso_encoder/info.json b/keyboards/keychron/q1v2/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q1v2/iso_encoder/info.json rename to keyboards/keychron/q1v2/iso_encoder/keyboard.json diff --git a/keyboards/keychron/q1v2/jis/info.json b/keyboards/keychron/q1v2/jis/keyboard.json similarity index 100% rename from keyboards/keychron/q1v2/jis/info.json rename to keyboards/keychron/q1v2/jis/keyboard.json diff --git a/keyboards/keychron/q1v2/jis_encoder/info.json b/keyboards/keychron/q1v2/jis_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q1v2/jis_encoder/info.json rename to keyboards/keychron/q1v2/jis_encoder/keyboard.json diff --git a/keyboards/keychron/q3/ansi_encoder/info.json b/keyboards/keychron/q3/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q3/ansi_encoder/info.json rename to keyboards/keychron/q3/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q3/iso_encoder/info.json b/keyboards/keychron/q3/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q3/iso_encoder/info.json rename to keyboards/keychron/q3/iso_encoder/keyboard.json diff --git a/keyboards/keychron/q3/jis_encoder/info.json b/keyboards/keychron/q3/jis_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q3/jis_encoder/info.json rename to keyboards/keychron/q3/jis_encoder/keyboard.json diff --git a/keyboards/keychron/q4/ansi/info.json b/keyboards/keychron/q4/ansi/info.json index 392ef8fc45..2f99641b25 100644 --- 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 new file mode 100644 index 0000000000..00eef71278 --- /dev/null +++ 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 deleted file mode 100644 index 7ff128fa69..0000000000 --- a/keyboards/keychron/q4/ansi/v1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/keychron/q4/ansi/v2/keyboard.json b/keyboards/keychron/q4/ansi/v2/keyboard.json new file mode 100644 index 0000000000..3bdd63ee28 --- /dev/null +++ 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 deleted file mode 100644 index 7ff128fa69..0000000000 --- a/keyboards/keychron/q4/ansi/v2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/keychron/q5/ansi/info.json b/keyboards/keychron/q5/ansi/keyboard.json similarity index 100% rename from keyboards/keychron/q5/ansi/info.json rename to keyboards/keychron/q5/ansi/keyboard.json diff --git a/keyboards/keychron/q5/ansi_encoder/info.json b/keyboards/keychron/q5/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q5/ansi_encoder/info.json rename to keyboards/keychron/q5/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q5/iso/info.json b/keyboards/keychron/q5/iso/keyboard.json similarity index 100% rename from keyboards/keychron/q5/iso/info.json rename to keyboards/keychron/q5/iso/keyboard.json diff --git a/keyboards/keychron/q5/iso_encoder/info.json b/keyboards/keychron/q5/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q5/iso_encoder/info.json rename to keyboards/keychron/q5/iso_encoder/keyboard.json diff --git a/keyboards/keychron/q6/ansi/info.json b/keyboards/keychron/q6/ansi/keyboard.json similarity index 100% rename from keyboards/keychron/q6/ansi/info.json rename to keyboards/keychron/q6/ansi/keyboard.json diff --git a/keyboards/keychron/q6/ansi_encoder/info.json b/keyboards/keychron/q6/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q6/ansi_encoder/info.json rename to keyboards/keychron/q6/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q6/iso/info.json b/keyboards/keychron/q6/iso/keyboard.json similarity index 100% rename from keyboards/keychron/q6/iso/info.json rename to keyboards/keychron/q6/iso/keyboard.json diff --git a/keyboards/keychron/q6/iso_encoder/info.json b/keyboards/keychron/q6/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q6/iso_encoder/info.json rename to keyboards/keychron/q6/iso_encoder/keyboard.json diff --git a/keyboards/keychron/q65/ansi_encoder/info.json b/keyboards/keychron/q65/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q65/ansi_encoder/info.json rename to keyboards/keychron/q65/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/v1/ansi/info.json b/keyboards/keychron/v1/ansi/keyboard.json similarity index 100% rename from keyboards/keychron/v1/ansi/info.json rename to keyboards/keychron/v1/ansi/keyboard.json diff --git a/keyboards/keychron/v1/ansi_encoder/info.json b/keyboards/keychron/v1/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v1/ansi_encoder/info.json rename to keyboards/keychron/v1/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/v1/iso/info.json b/keyboards/keychron/v1/iso/keyboard.json similarity index 100% rename from keyboards/keychron/v1/iso/info.json rename to keyboards/keychron/v1/iso/keyboard.json diff --git a/keyboards/keychron/v1/iso_encoder/info.json b/keyboards/keychron/v1/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v1/iso_encoder/info.json rename to keyboards/keychron/v1/iso_encoder/keyboard.json diff --git a/keyboards/keychron/v1/jis/info.json b/keyboards/keychron/v1/jis/keyboard.json similarity index 100% rename from keyboards/keychron/v1/jis/info.json rename to keyboards/keychron/v1/jis/keyboard.json diff --git a/keyboards/keychron/v1/jis_encoder/info.json b/keyboards/keychron/v1/jis_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v1/jis_encoder/info.json rename to keyboards/keychron/v1/jis_encoder/keyboard.json diff --git a/keyboards/keychron/v10/ansi_encoder/info.json b/keyboards/keychron/v10/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v10/ansi_encoder/info.json rename to keyboards/keychron/v10/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/v10/iso_encoder/info.json b/keyboards/keychron/v10/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v10/iso_encoder/info.json rename to keyboards/keychron/v10/iso_encoder/keyboard.json diff --git a/keyboards/keychron/v3/ansi_encoder/info.json b/keyboards/keychron/v3/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v3/ansi_encoder/info.json rename to keyboards/keychron/v3/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/v3/iso_encoder/info.json b/keyboards/keychron/v3/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v3/iso_encoder/info.json rename to keyboards/keychron/v3/iso_encoder/keyboard.json diff --git a/keyboards/keychron/v3/jis_encoder/info.json b/keyboards/keychron/v3/jis_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v3/jis_encoder/info.json rename to keyboards/keychron/v3/jis_encoder/keyboard.json diff --git a/keyboards/keychron/v5/ansi/info.json b/keyboards/keychron/v5/ansi/keyboard.json similarity index 100% rename from keyboards/keychron/v5/ansi/info.json rename to keyboards/keychron/v5/ansi/keyboard.json diff --git a/keyboards/keychron/v5/ansi_encoder/info.json b/keyboards/keychron/v5/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v5/ansi_encoder/info.json rename to keyboards/keychron/v5/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/v5/iso/info.json b/keyboards/keychron/v5/iso/keyboard.json similarity index 100% rename from keyboards/keychron/v5/iso/info.json rename to keyboards/keychron/v5/iso/keyboard.json diff --git a/keyboards/keychron/v5/iso_encoder/info.json b/keyboards/keychron/v5/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v5/iso_encoder/info.json rename to keyboards/keychron/v5/iso_encoder/keyboard.json diff --git a/keyboards/keychron/v6/ansi/info.json b/keyboards/keychron/v6/ansi/keyboard.json similarity index 100% rename from keyboards/keychron/v6/ansi/info.json rename to keyboards/keychron/v6/ansi/keyboard.json diff --git a/keyboards/keychron/v6/ansi_encoder/info.json b/keyboards/keychron/v6/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v6/ansi_encoder/info.json rename to keyboards/keychron/v6/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/v6/iso/info.json b/keyboards/keychron/v6/iso/keyboard.json similarity index 100% rename from keyboards/keychron/v6/iso/info.json rename to keyboards/keychron/v6/iso/keyboard.json diff --git a/keyboards/keychron/v6/iso_encoder/info.json b/keyboards/keychron/v6/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v6/iso_encoder/info.json rename to keyboards/keychron/v6/iso_encoder/keyboard.json diff --git a/keyboards/keychron/v6/iso_encoder/rules.mk b/keyboards/keychron/v6/iso_encoder/rules.mk index 2d3e529c97..3652da4b69 100644 --- 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