Browse Source

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

Joel Challis 2 years ago
parent
commit
d9740c9de1
55 changed files with 13 additions and 11 deletions
  1. 0 0
      keyboards/keychron/c2_pro/ansi/rgb/keyboard.json
  2. 1 1
      keyboards/keychron/c2_pro/ansi/rgb/rules.mk
  3. 0 0
      keyboards/keychron/c2_pro/ansi/white/keyboard.json
  4. 1 1
      keyboards/keychron/c2_pro/ansi/white/rules.mk
  5. 0 0
      keyboards/keychron/q10/ansi_encoder/keyboard.json
  6. 0 0
      keyboards/keychron/q10/iso_encoder/keyboard.json
  7. 0 0
      keyboards/keychron/q11/ansi_encoder/keyboard.json
  8. 0 0
      keyboards/keychron/q11/iso_encoder/keyboard.json
  9. 0 3
      keyboards/keychron/q11/iso_encoder/rules.mk
  10. 0 0
      keyboards/keychron/q12/ansi_encoder/keyboard.json
  11. 0 0
      keyboards/keychron/q12/iso_encoder/keyboard.json
  12. 0 1
      keyboards/keychron/q12/iso_encoder/rules.mk
  13. 0 0
      keyboards/keychron/q1v2/ansi/keyboard.json
  14. 0 0
      keyboards/keychron/q1v2/ansi_encoder/keyboard.json
  15. 0 0
      keyboards/keychron/q1v2/iso/keyboard.json
  16. 0 0
      keyboards/keychron/q1v2/iso_encoder/keyboard.json
  17. 0 0
      keyboards/keychron/q1v2/jis/keyboard.json
  18. 0 0
      keyboards/keychron/q1v2/jis_encoder/keyboard.json
  19. 0 0
      keyboards/keychron/q3/ansi_encoder/keyboard.json
  20. 0 0
      keyboards/keychron/q3/iso_encoder/keyboard.json
  21. 0 0
      keyboards/keychron/q3/jis_encoder/keyboard.json
  22. 1 2
      keyboards/keychron/q4/ansi/info.json
  23. 5 0
      keyboards/keychron/q4/ansi/v1/keyboard.json
  24. 0 1
      keyboards/keychron/q4/ansi/v1/rules.mk
  25. 5 0
      keyboards/keychron/q4/ansi/v2/keyboard.json
  26. 0 1
      keyboards/keychron/q4/ansi/v2/rules.mk
  27. 0 0
      keyboards/keychron/q5/ansi/keyboard.json
  28. 0 0
      keyboards/keychron/q5/ansi_encoder/keyboard.json
  29. 0 0
      keyboards/keychron/q5/iso/keyboard.json
  30. 0 0
      keyboards/keychron/q5/iso_encoder/keyboard.json
  31. 0 0
      keyboards/keychron/q6/ansi/keyboard.json
  32. 0 0
      keyboards/keychron/q6/ansi_encoder/keyboard.json
  33. 0 0
      keyboards/keychron/q6/iso/keyboard.json
  34. 0 0
      keyboards/keychron/q6/iso_encoder/keyboard.json
  35. 0 0
      keyboards/keychron/q65/ansi_encoder/keyboard.json
  36. 0 0
      keyboards/keychron/v1/ansi/keyboard.json
  37. 0 0
      keyboards/keychron/v1/ansi_encoder/keyboard.json
  38. 0 0
      keyboards/keychron/v1/iso/keyboard.json
  39. 0 0
      keyboards/keychron/v1/iso_encoder/keyboard.json
  40. 0 0
      keyboards/keychron/v1/jis/keyboard.json
  41. 0 0
      keyboards/keychron/v1/jis_encoder/keyboard.json
  42. 0 0
      keyboards/keychron/v10/ansi_encoder/keyboard.json
  43. 0 0
      keyboards/keychron/v10/iso_encoder/keyboard.json
  44. 0 0
      keyboards/keychron/v3/ansi_encoder/keyboard.json
  45. 0 0
      keyboards/keychron/v3/iso_encoder/keyboard.json
  46. 0 0
      keyboards/keychron/v3/jis_encoder/keyboard.json
  47. 0 0
      keyboards/keychron/v5/ansi/keyboard.json
  48. 0 0
      keyboards/keychron/v5/ansi_encoder/keyboard.json
  49. 0 0
      keyboards/keychron/v5/iso/keyboard.json
  50. 0 0
      keyboards/keychron/v5/iso_encoder/keyboard.json
  51. 0 0
      keyboards/keychron/v6/ansi/keyboard.json
  52. 0 0
      keyboards/keychron/v6/ansi_encoder/keyboard.json
  53. 0 0
      keyboards/keychron/v6/iso/keyboard.json
  54. 0 0
      keyboards/keychron/v6/iso_encoder/keyboard.json
  55. 0 1
      keyboards/keychron/v6/iso_encoder/rules.mk

+ 0 - 0
keyboards/keychron/c2_pro/ansi/rgb/info.json → keyboards/keychron/c2_pro/ansi/rgb/keyboard.json


+ 1 - 1
keyboards/keychron/c2_pro/ansi/rgb/rules.mk

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

+ 0 - 0
keyboards/keychron/c2_pro/ansi/white/info.json → keyboards/keychron/c2_pro/ansi/white/keyboard.json


+ 1 - 1
keyboards/keychron/c2_pro/ansi/white/rules.mk

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

+ 0 - 0
keyboards/keychron/q10/ansi_encoder/info.json → keyboards/keychron/q10/ansi_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/q10/iso_encoder/info.json → keyboards/keychron/q10/iso_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/q11/ansi_encoder/info.json → keyboards/keychron/q11/ansi_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/q11/iso_encoder/info.json → keyboards/keychron/q11/iso_encoder/keyboard.json


+ 0 - 3
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

+ 0 - 0
keyboards/keychron/q12/ansi_encoder/info.json → keyboards/keychron/q12/ansi_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/q12/iso_encoder/info.json → keyboards/keychron/q12/iso_encoder/keyboard.json


+ 0 - 1
keyboards/keychron/q12/iso_encoder/rules.mk

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

+ 0 - 0
keyboards/keychron/q1v2/ansi/info.json → keyboards/keychron/q1v2/ansi/keyboard.json


+ 0 - 0
keyboards/keychron/q1v2/ansi_encoder/info.json → keyboards/keychron/q1v2/ansi_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/q1v2/iso/info.json → keyboards/keychron/q1v2/iso/keyboard.json


+ 0 - 0
keyboards/keychron/q1v2/iso_encoder/info.json → keyboards/keychron/q1v2/iso_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/q1v2/jis/info.json → keyboards/keychron/q1v2/jis/keyboard.json


+ 0 - 0
keyboards/keychron/q1v2/jis_encoder/info.json → keyboards/keychron/q1v2/jis_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/q3/ansi_encoder/info.json → keyboards/keychron/q3/ansi_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/q3/iso_encoder/info.json → keyboards/keychron/q3/iso_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/q3/jis_encoder/info.json → keyboards/keychron/q3/jis_encoder/keyboard.json


+ 1 - 2
keyboards/keychron/q4/ansi/info.json

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

+ 5 - 0
keyboards/keychron/q4/ansi/v1/keyboard.json

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

+ 0 - 1
keyboards/keychron/q4/ansi/v1/rules.mk

@@ -1 +0,0 @@
-# This file intentionally left blank

+ 5 - 0
keyboards/keychron/q4/ansi/v2/keyboard.json

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

+ 0 - 1
keyboards/keychron/q4/ansi/v2/rules.mk

@@ -1 +0,0 @@
-# This file intentionally left blank

+ 0 - 0
keyboards/keychron/q5/ansi/info.json → keyboards/keychron/q5/ansi/keyboard.json


+ 0 - 0
keyboards/keychron/q5/ansi_encoder/info.json → keyboards/keychron/q5/ansi_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/q5/iso/info.json → keyboards/keychron/q5/iso/keyboard.json


+ 0 - 0
keyboards/keychron/q5/iso_encoder/info.json → keyboards/keychron/q5/iso_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/q6/ansi/info.json → keyboards/keychron/q6/ansi/keyboard.json


+ 0 - 0
keyboards/keychron/q6/ansi_encoder/info.json → keyboards/keychron/q6/ansi_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/q6/iso/info.json → keyboards/keychron/q6/iso/keyboard.json


+ 0 - 0
keyboards/keychron/q6/iso_encoder/info.json → keyboards/keychron/q6/iso_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/q65/ansi_encoder/info.json → keyboards/keychron/q65/ansi_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/v1/ansi/info.json → keyboards/keychron/v1/ansi/keyboard.json


+ 0 - 0
keyboards/keychron/v1/ansi_encoder/info.json → keyboards/keychron/v1/ansi_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/v1/iso/info.json → keyboards/keychron/v1/iso/keyboard.json


+ 0 - 0
keyboards/keychron/v1/iso_encoder/info.json → keyboards/keychron/v1/iso_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/v1/jis/info.json → keyboards/keychron/v1/jis/keyboard.json


+ 0 - 0
keyboards/keychron/v1/jis_encoder/info.json → keyboards/keychron/v1/jis_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/v10/ansi_encoder/info.json → keyboards/keychron/v10/ansi_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/v10/iso_encoder/info.json → keyboards/keychron/v10/iso_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/v3/ansi_encoder/info.json → keyboards/keychron/v3/ansi_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/v3/iso_encoder/info.json → keyboards/keychron/v3/iso_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/v3/jis_encoder/info.json → keyboards/keychron/v3/jis_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/v5/ansi/info.json → keyboards/keychron/v5/ansi/keyboard.json


+ 0 - 0
keyboards/keychron/v5/ansi_encoder/info.json → keyboards/keychron/v5/ansi_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/v5/iso/info.json → keyboards/keychron/v5/iso/keyboard.json


+ 0 - 0
keyboards/keychron/v5/iso_encoder/info.json → keyboards/keychron/v5/iso_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/v6/ansi/info.json → keyboards/keychron/v6/ansi/keyboard.json


+ 0 - 0
keyboards/keychron/v6/ansi_encoder/info.json → keyboards/keychron/v6/ansi_encoder/keyboard.json


+ 0 - 0
keyboards/keychron/v6/iso/info.json → keyboards/keychron/v6/iso/keyboard.json


+ 0 - 0
keyboards/keychron/v6/iso_encoder/info.json → keyboards/keychron/v6/iso_encoder/keyboard.json


+ 0 - 1
keyboards/keychron/v6/iso_encoder/rules.mk

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