Преглед изворни кода

Migrate RGB Matrix config to info.json (#22998)

Joel Challis пре 2 година
родитељ
комит
974e98ce59
100 измењених фајлова са 213 додато и 739 уклоњено
  1. 0 14
      keyboards/keychron/c1_pro/ansi/rgb/config.h
  2. 2 1
      keyboards/keychron/c1_pro/ansi/rgb/info.json
  3. 0 14
      keyboards/keychron/c2_pro/ansi/rgb/config.h
  4. 2 1
      keyboards/keychron/c2_pro/ansi/rgb/info.json
  5. 0 3
      keyboards/keychron/q0/base/config.h
  6. 0 6
      keyboards/keychron/q0/config.h
  7. 2 1
      keyboards/keychron/q0/info.json
  8. 0 3
      keyboards/keychron/q0/plus/config.h
  9. 0 5
      keyboards/keychron/q10/ansi_encoder/config.h
  10. 0 3
      keyboards/keychron/q10/ansi_encoder/info.json
  11. 0 55
      keyboards/keychron/q10/config.h
  12. 27 0
      keyboards/keychron/q10/info.json
  13. 0 5
      keyboards/keychron/q10/iso_encoder/config.h
  14. 0 3
      keyboards/keychron/q10/iso_encoder/info.json
  15. 0 3
      keyboards/keychron/q11/ansi_encoder/config.h
  16. 0 9
      keyboards/keychron/q11/config.h
  17. 2 1
      keyboards/keychron/q11/info.json
  18. 0 3
      keyboards/keychron/q11/iso_encoder/config.h
  19. 0 5
      keyboards/keychron/q12/ansi_encoder/config.h
  20. 0 3
      keyboards/keychron/q12/ansi_encoder/info.json
  21. 0 59
      keyboards/keychron/q12/config.h
  22. 27 0
      keyboards/keychron/q12/info.json
  23. 0 5
      keyboards/keychron/q12/iso_encoder/config.h
  24. 0 3
      keyboards/keychron/q12/iso_encoder/info.json
  25. 0 3
      keyboards/keychron/q1v1/ansi/config.h
  26. 0 3
      keyboards/keychron/q1v1/ansi_encoder/config.h
  27. 0 6
      keyboards/keychron/q1v1/config.h
  28. 2 1
      keyboards/keychron/q1v1/info.json
  29. 0 3
      keyboards/keychron/q1v1/iso/config.h
  30. 0 3
      keyboards/keychron/q1v1/iso_encoder/config.h
  31. 0 5
      keyboards/keychron/q1v2/ansi/config.h
  32. 0 5
      keyboards/keychron/q1v2/ansi_encoder/config.h
  33. 0 9
      keyboards/keychron/q1v2/config.h
  34. 2 1
      keyboards/keychron/q1v2/info.json
  35. 0 5
      keyboards/keychron/q1v2/iso/config.h
  36. 0 5
      keyboards/keychron/q1v2/iso_encoder/config.h
  37. 0 5
      keyboards/keychron/q1v2/jis/config.h
  38. 0 5
      keyboards/keychron/q1v2/jis_encoder/config.h
  39. 0 3
      keyboards/keychron/q2/ansi/config.h
  40. 0 3
      keyboards/keychron/q2/ansi_encoder/config.h
  41. 0 6
      keyboards/keychron/q2/config.h
  42. 2 1
      keyboards/keychron/q2/info.json
  43. 0 3
      keyboards/keychron/q2/iso/config.h
  44. 0 3
      keyboards/keychron/q2/iso_encoder/config.h
  45. 0 3
      keyboards/keychron/q3/ansi/config.h
  46. 0 3
      keyboards/keychron/q3/ansi_encoder/config.h
  47. 0 6
      keyboards/keychron/q3/config.h
  48. 2 1
      keyboards/keychron/q3/info.json
  49. 0 3
      keyboards/keychron/q3/iso/config.h
  50. 0 3
      keyboards/keychron/q3/iso_encoder/config.h
  51. 0 3
      keyboards/keychron/q3/jis/config.h
  52. 0 3
      keyboards/keychron/q3/jis_encoder/config.h
  53. 0 3
      keyboards/keychron/q4/ansi/v1/config.h
  54. 0 3
      keyboards/keychron/q4/ansi/v2/config.h
  55. 0 6
      keyboards/keychron/q4/config.h
  56. 2 1
      keyboards/keychron/q4/info.json
  57. 0 3
      keyboards/keychron/q4/iso/config.h
  58. 0 3
      keyboards/keychron/q5/config.h
  59. 2 1
      keyboards/keychron/q5/info.json
  60. 0 5
      keyboards/keychron/q6/ansi/config.h
  61. 0 3
      keyboards/keychron/q6/ansi/info.json
  62. 0 5
      keyboards/keychron/q6/ansi_encoder/config.h
  63. 0 3
      keyboards/keychron/q6/ansi_encoder/info.json
  64. 0 55
      keyboards/keychron/q6/config.h
  65. 27 0
      keyboards/keychron/q6/info.json
  66. 0 5
      keyboards/keychron/q6/iso/config.h
  67. 0 3
      keyboards/keychron/q6/iso/info.json
  68. 0 5
      keyboards/keychron/q6/iso_encoder/config.h
  69. 0 3
      keyboards/keychron/q6/iso_encoder/info.json
  70. 0 20
      keyboards/keychron/q60/ansi/config.h
  71. 0 3
      keyboards/keychron/q60/ansi/info.json
  72. 0 55
      keyboards/keychron/q60/config.h
  73. 27 0
      keyboards/keychron/q60/info.json
  74. 0 5
      keyboards/keychron/q65/ansi_encoder/config.h
  75. 0 3
      keyboards/keychron/q65/ansi_encoder/info.json
  76. 0 55
      keyboards/keychron/q65/config.h
  77. 27 0
      keyboards/keychron/q65/info.json
  78. 0 3
      keyboards/keychron/q8/config.h
  79. 2 1
      keyboards/keychron/q8/info.json
  80. 0 3
      keyboards/keychron/q9/config.h
  81. 2 1
      keyboards/keychron/q9/info.json
  82. 0 3
      keyboards/keychron/q9_plus/ansi_encoder/config.h
  83. 0 9
      keyboards/keychron/q9_plus/config.h
  84. 2 1
      keyboards/keychron/q9_plus/info.json
  85. 0 58
      keyboards/keychron/s1/ansi/rgb/config.h
  86. 25 1
      keyboards/keychron/s1/ansi/rgb/info.json
  87. 0 5
      keyboards/keychron/v1/ansi/config.h
  88. 0 3
      keyboards/keychron/v1/ansi/info.json
  89. 0 5
      keyboards/keychron/v1/ansi_encoder/config.h
  90. 0 3
      keyboards/keychron/v1/ansi_encoder/info.json
  91. 0 55
      keyboards/keychron/v1/config.h
  92. 27 0
      keyboards/keychron/v1/info.json
  93. 0 5
      keyboards/keychron/v1/iso/config.h
  94. 0 3
      keyboards/keychron/v1/iso/info.json
  95. 0 5
      keyboards/keychron/v1/iso_encoder/config.h
  96. 0 3
      keyboards/keychron/v1/iso_encoder/info.json
  97. 0 5
      keyboards/keychron/v1/jis/config.h
  98. 0 3
      keyboards/keychron/v1/jis/info.json
  99. 0 5
      keyboards/keychron/v1/jis_encoder/config.h
  100. 0 3
      keyboards/keychron/v1/jis_encoder/info.json

+ 0 - 14
keyboards/keychron/c1_pro/ansi/rgb/config.h

@@ -23,24 +23,10 @@
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
 #define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 49
-#define DRIVER_2_LED_TOTAL 39
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
 /* Set led driver current */
 #define SNLED27351_CURRENT_TUNE \
     { 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44 }
 
-/* turn off effects when suspended */
-#define RGB_MATRIX_SLEEP
-
 /* Enable caps_lock, win os and mac os indicator */
 #define CAPS_MAC_WIN_LED_INDEX 63
-
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES

+ 2 - 1
keyboards/keychron/c1_pro/ansi/rgb/info.json

@@ -224,6 +224,7 @@
             {"matrix":[5, 14], "flags":1, "x":198, "y":64},
             {"matrix":[5, 15], "flags":1, "x":211, "y":64},
             {"matrix":[4, 14], "flags":1, "x":224, "y":64}
-        ]
+        ],
+        "sleep": true
     }
 }

+ 0 - 14
keyboards/keychron/c2_pro/ansi/rgb/config.h

@@ -24,22 +24,8 @@
 #define SNLED27351_CURRENT_TUNE \
     { 0xAA, 0xAA, 0x56, 0xAA, 0xAA, 0x56, 0xAA, 0xAA, 0x56, 0xAA, 0xAA, 0x56 }
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 60
-#define DRIVER_2_LED_TOTAL 48
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable indicator LED*/
 #define NUM_LED_INDEX 16
 #define CAPS_LED_INDEX 17
 #define MAC_LED_INDEX 18
 #define WIN_LED_INDEX 19
-
-/* turn off effects when suspended */
-#define RGB_MATRIX_SLEEP
-
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES

+ 2 - 1
keyboards/keychron/c2_pro/ansi/rgb/info.json

@@ -261,6 +261,7 @@
             {"matrix":[5, 16], "flags":1, "x":180, "y":64},
             {"matrix":[5, 17], "flags":4, "x":198, "y":64},
             {"matrix":[5, 18], "flags":4, "x":214, "y":64}
-        ]
+        ],
+        "sleep": true
     }
 }

+ 0 - 3
keyboards/keychron/q0/base/config.h

@@ -19,8 +19,5 @@
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 21
-
 /* Enable num-lock LED */
 #define NUM_LOCK_LED_INDEX 4

+ 0 - 6
keyboards/keychron/q0/config.h

@@ -17,9 +17,3 @@
 #pragma once
 
 #define SNLED27351_CURRENT_TUNE { 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70 }
-
-/* turn off effects when suspended */
-#define RGB_MATRIX_SLEEP
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

+ 2 - 1
keyboards/keychron/q0/info.json

@@ -42,7 +42,8 @@
             "splash": true,
             "typing_heatmap": true
         },
-        "driver": "snled27351"
+        "driver": "snled27351",
+        "sleep": true
     },
     "url": "https://github.com/Keychron",
     "usb": {

+ 0 - 3
keyboards/keychron/q0/plus/config.h

@@ -19,9 +19,6 @@
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 26
-
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
 
 /* Encoder Configuration*/

+ 0 - 5
keyboards/keychron/q10/ansi_encoder/config.h

@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 47
-#define DRIVER_2_LED_TOTAL 41
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 

+ 0 - 3
keyboards/keychron/q10/ansi_encoder/info.json

@@ -8,9 +8,6 @@
         "pid": "0x01A1",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}

+ 0 - 55
keyboards/keychron/q10/config.h

@@ -44,61 +44,6 @@
 #define SNLED27351_CURRENT_TUNE \
     { 0x98, 0x98, 0x4A, 0x98, 0x98, 0x4A, 0x98, 0x98, 0x4A, 0x98, 0x98, 0x4A }
 
-/* Disable RGB lighting when PC is in suspend */
-#define RGB_MATRIX_SLEEP
-
 /* EEPROM Driver Configuration */
 #define WEAR_LEVELING_LOGICAL_SIZE 2048
 #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-// #define ENABLE_RGB_MATRIX_BAND_SAT
-// #define ENABLE_RGB_MATRIX_BAND_VAL
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#define ENABLE_RGB_MATRIX_CYCLE_ALL
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#define ENABLE_RGB_MATRIX_DUAL_BEACON
-#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-// #define ENABLE_RGB_MATRIX_RAINDROPS
-#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-// #define ENABLE_RGB_MATRIX_HUE_BREATHING
-// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
-// #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-// #define ENABLE_RGB_MATRIX_PIXEL_FLOW
-// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#define ENABLE_RGB_MATRIX_SPLASH
-// #define ENABLE_RGB_MATRIX_MULTISPLASH
-#define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES

+ 27 - 0
keyboards/keychron/q10/info.json

@@ -1,5 +1,32 @@
 {
     "dip_switch": {
         "matrix_grid": [ [5, 5] ]
+    },
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "snled27351",
+        "sleep": true
     }
 }

+ 0 - 5
keyboards/keychron/q10/iso_encoder/config.h

@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 47
-#define DRIVER_2_LED_TOTAL 42
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 

+ 0 - 3
keyboards/keychron/q10/iso_encoder/info.json

@@ -8,9 +8,6 @@
         "pid": "0x01A3",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}

+ 0 - 3
keyboards/keychron/q11/ansi_encoder/config.h

@@ -16,8 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 89
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 23

+ 0 - 9
keyboards/keychron/q11/config.h

@@ -39,15 +39,6 @@
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
-/* Disable RGB lighting when PC is in suspend */
-#define RGB_MATRIX_SLEEP
-
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-
 // Needed as the master side could enter slave state during poweron
 // of host, due to missing VUSB detection.
 #define SPLIT_WATCHDOG_ENABLE

+ 2 - 1
keyboards/keychron/q11/info.json

@@ -90,7 +90,8 @@
             "solid_reactive_multinexus": true,
             "splash": true,
             "solid_splash": true
-        }
+        },
+        "sleep": true
     },
     "layouts": {
         "LAYOUT_91_ansi": {

+ 0 - 3
keyboards/keychron/q11/iso_encoder/config.h

@@ -16,8 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 90
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 23

+ 0 - 5
keyboards/keychron/q12/ansi_encoder/config.h

@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 56
-#define DRIVER_2_LED_TOTAL 46
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define ENCODER_DEFAULT_POS 0x3
 
 /* Enable caps-lock LED */

+ 0 - 3
keyboards/keychron/q12/ansi_encoder/info.json

@@ -8,9 +8,6 @@
         "pid": "0x01D1",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "A2", "pin_b": "C14"}

+ 0 - 59
keyboards/keychron/q12/config.h

@@ -40,62 +40,3 @@
     { 0xAD, 0xAD, 0x55, 0xAD, 0xAD, 0x55, 0xAD, 0xAD, 0x55, 0xAD, 0xAD, 0x55 }
 
 #define SCAN_COUNT_MAX 100
-
-/* turn off effects when suspended */
-#define RGB_MATRIX_SLEEP
-
-/* EEPROM Driver Configuration */
-// #define WEAR_LEVELING_LOGICAL_SIZE 2048 // default
-// #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2) // default
-
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-// #define ENABLE_RGB_MATRIX_BAND_SAT
-// #define ENABLE_RGB_MATRIX_BAND_VAL
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#define ENABLE_RGB_MATRIX_CYCLE_ALL
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#define ENABLE_RGB_MATRIX_DUAL_BEACON
-#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-// #define ENABLE_RGB_MATRIX_RAINDROPS
-#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-// #define ENABLE_RGB_MATRIX_HUE_BREATHING
-// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
-// #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-// #define ENABLE_RGB_MATRIX_PIXEL_FLOW
-// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#define ENABLE_RGB_MATRIX_SPLASH
-// #define ENABLE_RGB_MATRIX_MULTISPLASH
-#define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES

+ 27 - 0
keyboards/keychron/q12/info.json

@@ -1,5 +1,32 @@
 {
     "dip_switch": {
         "matrix_grid": [ [5, 4] ]
+    },
+    "rgb_matrix": {
+        "animations":{
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "snled27351",
+        "sleep": true
     }
 }

+ 0 - 5
keyboards/keychron/q12/iso_encoder/config.h

@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 56
-#define DRIVER_2_LED_TOTAL 47
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define ENCODER_DEFAULT_POS 0x3
 
 /* Enable caps-lock LED */

+ 0 - 3
keyboards/keychron/q12/iso_encoder/info.json

@@ -8,9 +8,6 @@
         "pid": "0x01D3",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "A2", "pin_b": "C14"}

+ 0 - 3
keyboards/keychron/q1v1/ansi/config.h

@@ -16,8 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 82
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 45

+ 0 - 3
keyboards/keychron/q1v1/ansi_encoder/config.h

@@ -16,8 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 82
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 45

+ 0 - 6
keyboards/keychron/q1v1/config.h

@@ -22,9 +22,3 @@
 
 /* Encoder Configuration*/
 #define ENCODER_DEFAULT_POS 0x3
-
-/* Disable RGB lighting when PC is in suspend */
-#define RGB_MATRIX_SLEEP
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

+ 2 - 1
keyboards/keychron/q1v1/info.json

@@ -49,7 +49,8 @@
             "splash": true,
             "typing_heatmap": true
         },
-        "driver": "is31fl3733"
+        "driver": "is31fl3733",
+        "sleep": true
     },
     "url": "https://github.com/Keychron",
     "usb": {

+ 0 - 3
keyboards/keychron/q1v1/iso/config.h

@@ -16,8 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 83
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 44

+ 0 - 3
keyboards/keychron/q1v1/iso_encoder/config.h

@@ -16,8 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 83
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 44

+ 0 - 5
keyboards/keychron/q1v2/ansi/config.h

@@ -16,10 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 45
-#define DRIVER_2_LED_TOTAL 37
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 45

+ 0 - 5
keyboards/keychron/q1v2/ansi_encoder/config.h

@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 45
-#define DRIVER_2_LED_TOTAL 37
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 

+ 0 - 9
keyboards/keychron/q1v2/config.h

@@ -27,9 +27,6 @@
 #define I2C1_TIMINGR_SCLH 15U
 #define I2C1_TIMINGR_SCLL 51U
 
-/* Disable RGB lighting when PC is in suspend */
-#define RGB_MATRIX_SLEEP
-
 /* EEPROM Driver Configuration */
 #define WEAR_LEVELING_LOGICAL_SIZE 2048
 #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
@@ -39,10 +36,4 @@
 #define SNLED27351_CURRENT_TUNE \
     { 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50 }
 
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-
 #define HOLD_ON_OTHER_KEY_PRESS // Old default behavior of mod-taps

+ 2 - 1
keyboards/keychron/q1v2/info.json

@@ -56,6 +56,7 @@
             "solid_reactive_multinexus": true,
             "splash": true,
             "solid_splash": true
-        }
+        },
+        "sleep": true
     }
 }

+ 0 - 5
keyboards/keychron/q1v2/iso/config.h

@@ -16,10 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 45
-#define DRIVER_2_LED_TOTAL 38
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 44

+ 0 - 5
keyboards/keychron/q1v2/iso_encoder/config.h

@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 45
-#define DRIVER_2_LED_TOTAL 38
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 

+ 0 - 5
keyboards/keychron/q1v2/jis/config.h

@@ -16,10 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 46
-#define DRIVER_2_LED_TOTAL 40
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 45

+ 0 - 5
keyboards/keychron/q1v2/jis_encoder/config.h

@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 46
-#define DRIVER_2_LED_TOTAL 40
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 

+ 0 - 3
keyboards/keychron/q2/ansi/config.h

@@ -16,8 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 67
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 30

+ 0 - 3
keyboards/keychron/q2/ansi_encoder/config.h

@@ -16,8 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 67
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 30

+ 0 - 6
keyboards/keychron/q2/config.h

@@ -24,11 +24,5 @@
 
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
 
-/* turn off effects when suspended */
-#define RGB_MATRIX_SLEEP
-
 /* Encoder Configuration*/
 #define ENCODER_DEFAULT_POS 0x3
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

+ 2 - 1
keyboards/keychron/q2/info.json

@@ -54,7 +54,8 @@
             "splash": true,
             "typing_heatmap": true
         },
-        "driver": "snled27351"
+        "driver": "snled27351",
+        "sleep": true
     },
     "url": "https://github.com/Keychron",
     "usb": {

+ 0 - 3
keyboards/keychron/q2/iso/config.h

@@ -16,8 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 68
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 29

+ 0 - 3
keyboards/keychron/q2/iso_encoder/config.h

@@ -16,8 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 68
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 29

+ 0 - 3
keyboards/keychron/q3/ansi/config.h

@@ -19,9 +19,6 @@
 /* We use a pin with a stronger pull resistor than the internal MCU pins */
 // #define MATRIX_UNSELECT_DRIVE_HIGH
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 87
-
 #define SNLED27351_CURRENT_TUNE \
     { 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44 }
 

+ 0 - 3
keyboards/keychron/q3/ansi_encoder/config.h

@@ -20,9 +20,6 @@
 #define MATRIX_ROW_PINS { B5, B4, B3, A15, A14, A13 }
 #define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 87
-
 #define SNLED27351_CURRENT_TUNE \
     { 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44 }
 

+ 0 - 6
keyboards/keychron/q3/config.h

@@ -31,9 +31,3 @@
 
 /* Encoder Configuration*/
 #define ENCODER_DEFAULT_POS 0x3
-
-/* turn off effects when suspended */
-#define RGB_MATRIX_SLEEP
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

+ 2 - 1
keyboards/keychron/q3/info.json

@@ -46,7 +46,8 @@
             "splash": true,
             "typing_heatmap": true
         },
-        "driver": "snled27351"
+        "driver": "snled27351",
+        "sleep": true
     },
     "url": "https://github.com/Keychron",
     "usb": {

+ 0 - 3
keyboards/keychron/q3/iso/config.h

@@ -19,9 +19,6 @@
 /* We use a pin with a stronger pull resistor than the internal MCU pins */
 // #define MATRIX_UNSELECT_DRIVE_HIGH
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 88
-
 #define SNLED27351_CURRENT_TUNE \
     { 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44 }
 

+ 0 - 3
keyboards/keychron/q3/iso_encoder/config.h

@@ -20,9 +20,6 @@
 #define MATRIX_ROW_PINS { B5, B4, B3, A15, A14, A13 }
 #define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 88
-
 #define SNLED27351_CURRENT_TUNE \
     { 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44 }
 

+ 0 - 3
keyboards/keychron/q3/jis/config.h

@@ -19,9 +19,6 @@
 /* If PH3 used with a stronger pull resistor then the following definition needs be included */
 // #define MATRIX_UNSELECT_DRIVE_HIGH
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 91
-
 #define SNLED27351_CURRENT_TUNE \
     { 0x94, 0x94, 0x44, 0x94, 0x94, 0x44, 0x94, 0x94, 0x44, 0x94, 0x94, 0x44 }
 

+ 0 - 3
keyboards/keychron/q3/jis_encoder/config.h

@@ -20,9 +20,6 @@
 #define MATRIX_ROW_PINS { B5, B4, B3, A15, A14, A13 }
 #define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 92
-
 #define SNLED27351_CURRENT_TUNE \
     { 0x94, 0x94, 0x44, 0x94, 0x94, 0x44, 0x94, 0x94, 0x44, 0x94, 0x94, 0x44 }
 

+ 0 - 3
keyboards/keychron/q4/ansi/v1/config.h

@@ -20,7 +20,4 @@
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
 #define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 61
-
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL

+ 0 - 3
keyboards/keychron/q4/ansi/v2/config.h

@@ -18,6 +18,3 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
-
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 61

+ 0 - 6
keyboards/keychron/q4/config.h

@@ -16,11 +16,5 @@
 
 #pragma once
 
-/* turn off effects when suspended */
-#define RGB_MATRIX_SLEEP
-
 #define SNLED27351_CURRENT_TUNE \
     { 0xCA, 0xCA, 0x60, 0xCA, 0xCA, 0x60, 0xCA, 0xCA, 0x60, 0xCA, 0xCA, 0x60 }
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

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

@@ -56,7 +56,8 @@
             "splash": true,
             "typing_heatmap": true
         },
-        "driver": "snled27351"
+        "driver": "snled27351",
+        "sleep": true
     },
     "url": "https://github.com/Keychron",
     "usb": {

+ 0 - 3
keyboards/keychron/q4/iso/config.h

@@ -19,8 +19,5 @@
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 62
-
 /* Enable CapsLcok LED*/
 #define CAPS_LOCK_LED_INDEX 27

+ 0 - 3
keyboards/keychron/q5/config.h

@@ -33,8 +33,5 @@
 #define SNLED27351_CURRENT_TUNE \
     { 0xB6, 0xB6, 0x56, 0xB6, 0xB6, 0x56, 0xB6, 0xB6, 0x56, 0xB6, 0xB6, 0x56 }
 
-/* turn off effects when suspended */
-#define RGB_MATRIX_SLEEP
-
 /* Encoder Configuration*/
 #define ENCODER_DEFAULT_POS 0x3

+ 2 - 1
keyboards/keychron/q5/info.json

@@ -47,7 +47,8 @@
             "splash": true,
             "typing_heatmap": true
         },
-        "driver": "snled27351"
+        "driver": "snled27351",
+        "sleep": true
     },
     "url": "https://github.com/Keychron",
     "usb": {

+ 0 - 5
keyboards/keychron/q6/ansi/config.h

@@ -24,11 +24,6 @@
 #define NO_PIN_START 11
 #define NO_PIN_OFFSET 1
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 60
-#define DRIVER_2_LED_TOTAL 48
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED*/
 #define CAPS_LOCK_LED_INDEX 61
 

+ 0 - 3
keyboards/keychron/q6/ansi/info.json

@@ -8,9 +8,6 @@
         "pid": "0x0160",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {

+ 0 - 5
keyboards/keychron/q6/ansi_encoder/config.h

@@ -25,11 +25,6 @@
 #define NO_PIN_NUM 10
 #define CLR_REG_VAL 0x3FF
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 60
-#define DRIVER_2_LED_TOTAL 48
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 

+ 0 - 3
keyboards/keychron/q6/ansi_encoder/info.json

@@ -8,9 +8,6 @@
         "pid": "0x0161",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "C14", "pin_b": "A2"}

+ 0 - 55
keyboards/keychron/q6/config.h

@@ -30,61 +30,6 @@
 #define SNLED27351_CURRENT_TUNE \
     { 0xA4, 0xA4, 0x52, 0xA4, 0xA4, 0x52, 0xA4, 0xA4, 0x52, 0xA4, 0xA4, 0x52 }
 
-/* turn off effects when suspended */
-#define RGB_MATRIX_SLEEP
-
 /* EEPROM Driver Configuration */
 #define WEAR_LEVELING_LOGICAL_SIZE 2048
 #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-// #define ENABLE_RGB_MATRIX_BAND_SAT
-// #define ENABLE_RGB_MATRIX_BAND_VAL
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#define ENABLE_RGB_MATRIX_CYCLE_ALL
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#define ENABLE_RGB_MATRIX_DUAL_BEACON
-#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-// #define ENABLE_RGB_MATRIX_RAINDROPS
-#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-// #define ENABLE_RGB_MATRIX_HUE_BREATHING
-// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
-// #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-// #define ENABLE_RGB_MATRIX_PIXEL_FLOW
-// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#define ENABLE_RGB_MATRIX_SPLASH
-// #define ENABLE_RGB_MATRIX_MULTISPLASH
-#define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES

+ 27 - 0
keyboards/keychron/q6/info.json

@@ -1,5 +1,32 @@
 {
     "dip_switch": {
         "matrix_grid": [ [5, 4] ]
+    },
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "snled27351",
+        "sleep": true
     }
 }

+ 0 - 5
keyboards/keychron/q6/iso/config.h

@@ -24,11 +24,6 @@
 #define NO_PIN_START 11
 #define NO_PIN_OFFSET 1
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 60
-#define DRIVER_2_LED_TOTAL 49
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED*/
 #define CAPS_LOCK_LED_INDEX 60
 

+ 0 - 3
keyboards/keychron/q6/iso/info.json

@@ -8,9 +8,6 @@
         "pid": "0x0162",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {

+ 0 - 5
keyboards/keychron/q6/iso_encoder/config.h

@@ -25,11 +25,6 @@
 #define NO_PIN_NUM 10
 #define CLR_REG_VAL 0x3FF
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 60
-#define DRIVER_2_LED_TOTAL 49
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 

+ 0 - 3
keyboards/keychron/q6/iso_encoder/info.json

@@ -8,9 +8,6 @@
         "pid": "0x0163",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "C14", "pin_b": "A2"}

+ 0 - 20
keyboards/keychron/q60/ansi/config.h

@@ -1,20 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 60

+ 0 - 3
keyboards/keychron/q60/ansi/info.json

@@ -8,9 +8,6 @@
         "pid": "0x01C0",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
         "rows": ["B4", "B3", "A15", "A14", "A13"]

+ 0 - 55
keyboards/keychron/q60/config.h

@@ -29,63 +29,8 @@
 #define SNLED27351_CURRENT_TUNE \
     { 0xD8, 0xD8, 0x60, 0xD8, 0xD8, 0x60, 0xD8, 0xD8, 0x60, 0xD8, 0xD8, 0x60 }
 
-/* turn off effects when suspended */
-#define RGB_MATRIX_SLEEP
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 6
 
 /* EEPROM Driver Configuration */
 #define WEAR_LEVELING_LOGICAL_SIZE 2048
 #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-// #define ENABLE_RGB_MATRIX_BAND_SAT
-// #define ENABLE_RGB_MATRIX_BAND_VAL
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#define ENABLE_RGB_MATRIX_CYCLE_ALL
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#define ENABLE_RGB_MATRIX_DUAL_BEACON
-#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-// #define ENABLE_RGB_MATRIX_RAINDROPS
-#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-// #define ENABLE_RGB_MATRIX_HUE_BREATHING
-// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
-// #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-// #define ENABLE_RGB_MATRIX_PIXEL_FLOW
-// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#define ENABLE_RGB_MATRIX_SPLASH
-// #define ENABLE_RGB_MATRIX_MULTISPLASH
-#define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES

+ 27 - 0
keyboards/keychron/q60/info.json

@@ -1,5 +1,32 @@
 {
     "dip_switch": {
         "matrix_grid": [ [4, 4] ]
+    },
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "snled27351",
+        "sleep": true
     }
 }

+ 0 - 5
keyboards/keychron/q65/ansi_encoder/config.h

@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 31
-#define DRIVER_2_LED_TOTAL 41
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 

+ 0 - 3
keyboards/keychron/q65/ansi_encoder/info.json

@@ -8,9 +8,6 @@
         "pid": "0x01B1",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}

+ 0 - 55
keyboards/keychron/q65/config.h

@@ -40,63 +40,8 @@
 #define SNLED27351_CURRENT_TUNE \
     { 0xB8, 0xB8, 0x58, 0xB8, 0xB8, 0x58, 0xB8, 0xB8, 0x58, 0xB8, 0xB8, 0x58 }
 
-/* Turn off effects when suspended */
-#define RGB_MATRIX_SLEEP
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 5
 
 /* EEPROM Driver Configuration */
 #define WEAR_LEVELING_LOGICAL_SIZE 2048
 #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-// #define ENABLE_RGB_MATRIX_BAND_SAT
-// #define ENABLE_RGB_MATRIX_BAND_VAL
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#define ENABLE_RGB_MATRIX_CYCLE_ALL
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#define ENABLE_RGB_MATRIX_DUAL_BEACON
-#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-// #define ENABLE_RGB_MATRIX_RAINDROPS
-#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-// #define ENABLE_RGB_MATRIX_HUE_BREATHING
-// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
-// #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-// #define ENABLE_RGB_MATRIX_PIXEL_FLOW
-// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#define ENABLE_RGB_MATRIX_SPLASH
-// #define ENABLE_RGB_MATRIX_MULTISPLASH
-#define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES

+ 27 - 0
keyboards/keychron/q65/info.json

@@ -1,5 +1,32 @@
 {
     "dip_switch": {
         "matrix_grid": [ [4, 4] ]
+    },
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "snled27351",
+        "sleep": true
     }
 }

+ 0 - 3
keyboards/keychron/q8/config.h

@@ -36,6 +36,3 @@
 
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
-
-/* Turn off effects when suspended */
-#define RGB_MATRIX_SLEEP

+ 2 - 1
keyboards/keychron/q8/info.json

@@ -54,7 +54,8 @@
             "splash": true,
             "typing_heatmap": true
         },
-        "driver": "snled27351"
+        "driver": "snled27351",
+        "sleep": true
     },
     "url": "https://github.com/Keychron",
     "usb": {

+ 0 - 3
keyboards/keychron/q9/config.h

@@ -29,8 +29,5 @@
 #define SNLED27351_CURRENT_TUNE \
     { 0xF8, 0xF8, 0x70, 0xF8, 0xF8, 0x70, 0xF8, 0xF8, 0x70, 0xF8, 0xF8, 0x70 }
 
-/* turn off effects when suspended */
-#define RGB_MATRIX_SLEEP
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3

+ 2 - 1
keyboards/keychron/q9/info.json

@@ -54,7 +54,8 @@
             "splash": true,
             "typing_heatmap": true
         },
-        "driver": "snled27351"
+        "driver": "snled27351",
+        "sleep": true
     },
     "url": "https://github.com/Keychron",
     "usb": {

+ 0 - 3
keyboards/keychron/q9_plus/ansi_encoder/config.h

@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 53
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 

+ 0 - 9
keyboards/keychron/q9_plus/config.h

@@ -30,18 +30,9 @@
 #define SNLED27351_CURRENT_TUNE \
     { 0xF8, 0xF8, 0x70, 0xF8, 0xF8, 0x70, 0xF8, 0xF8, 0x70, 0xF8, 0xF8, 0x70 }
 
-/* turn off effects when suspended */
-#define RGB_MATRIX_SLEEP
-
 /* EEPROM Driver Configuration */
 #define WEAR_LEVELING_LOGICAL_SIZE 2048
 #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
 
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-
 /* Old default behavior of mod-taps */
 #define HOLD_ON_OTHER_KEY_PRESS

+ 2 - 1
keyboards/keychron/q9_plus/info.json

@@ -122,6 +122,7 @@
             "solid_reactive_multinexus": true,
             "splash": true,
             "solid_splash": true
-        }
+        },
+        "sleep": true
     }
 }

+ 0 - 58
keyboards/keychron/s1/ansi/rgb/config.h

@@ -19,68 +19,10 @@
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
 #define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
-#define DRIVER_1_LED_TOTAL 46
-#define DRIVER_2_LED_TOTAL 38
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
 #define SNLED27351_CURRENT_TUNE \
     { 0xA0, 0xA0, 0x48, 0xA0, 0xA0, 0x48, 0xA0, 0xA0, 0x48, 0xA0, 0xA0, 0x48 }
 
-/* Disable RGB lighting when PC is in suspend */
-#define RGB_MATRIX_SLEEP
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 46
-
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-// #define ENABLE_RGB_MATRIX_BAND_SAT
-// #define ENABLE_RGB_MATRIX_BAND_VAL
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#define ENABLE_RGB_MATRIX_CYCLE_ALL
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#define ENABLE_RGB_MATRIX_DUAL_BEACON
-#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-// #define ENABLE_RGB_MATRIX_RAINDROPS
-#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-// #define ENABLE_RGB_MATRIX_HUE_BREATHING
-// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
-// #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-// #define ENABLE_RGB_MATRIX_PIXEL_FLOW
-// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#define ENABLE_RGB_MATRIX_SPLASH
-// #define ENABLE_RGB_MATRIX_MULTISPLASH
-#define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

+ 25 - 1
keyboards/keychron/s1/ansi/rgb/info.json

@@ -9,7 +9,31 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "snled27351"
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "snled27351",
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],

+ 0 - 5
keyboards/keychron/v1/ansi/config.h

@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 45
-#define DRIVER_2_LED_TOTAL 37
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define SNLED27351_CURRENT_TUNE \
     { 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50 }
 

+ 0 - 3
keyboards/keychron/v1/ansi/info.json

@@ -8,9 +8,6 @@
         "pid": "0x0310",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {

+ 0 - 5
keyboards/keychron/v1/ansi_encoder/config.h

@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 45
-#define DRIVER_2_LED_TOTAL 37
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define SNLED27351_CURRENT_TUNE \
     { 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50 }
 

+ 0 - 3
keyboards/keychron/v1/ansi_encoder/info.json

@@ -8,9 +8,6 @@
         "pid": "0x0311",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}

+ 0 - 55
keyboards/keychron/v1/config.h

@@ -38,61 +38,6 @@
 
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
 
-/* turn off effects when suspended */
-#define RGB_MATRIX_SLEEP
-
 /* EEPROM Driver Configuration */
 #define WEAR_LEVELING_LOGICAL_SIZE 2048
 #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-// #define ENABLE_RGB_MATRIX_BAND_SAT
-// #define ENABLE_RGB_MATRIX_BAND_VAL
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#define ENABLE_RGB_MATRIX_CYCLE_ALL
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#define ENABLE_RGB_MATRIX_DUAL_BEACON
-#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-// #define ENABLE_RGB_MATRIX_RAINDROPS
-#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-// #define ENABLE_RGB_MATRIX_HUE_BREATHING
-// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
-// #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-// #define ENABLE_RGB_MATRIX_PIXEL_FLOW
-// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#define ENABLE_RGB_MATRIX_SPLASH
-// #define ENABLE_RGB_MATRIX_MULTISPLASH
-#define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

+ 27 - 0
keyboards/keychron/v1/info.json

@@ -1,5 +1,32 @@
 {
     "dip_switch": {
         "matrix_grid": [ [5, 4] ]
+    },
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "snled27351",
+        "sleep": true
     }
 }

+ 0 - 5
keyboards/keychron/v1/iso/config.h

@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 45
-#define DRIVER_2_LED_TOTAL 38
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define SNLED27351_CURRENT_TUNE \
     { 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50 }
 

+ 0 - 3
keyboards/keychron/v1/iso/info.json

@@ -8,9 +8,6 @@
         "pid": "0x0312",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {

+ 0 - 5
keyboards/keychron/v1/iso_encoder/config.h

@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 45
-#define DRIVER_2_LED_TOTAL 38
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define SNLED27351_CURRENT_TUNE \
     { 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50 }
 

+ 0 - 3
keyboards/keychron/v1/iso_encoder/info.json

@@ -8,9 +8,6 @@
         "pid": "0x0313",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}

+ 0 - 5
keyboards/keychron/v1/jis/config.h

@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 46
-#define DRIVER_2_LED_TOTAL 40
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define SNLED27351_CURRENT_TUNE \
     { 0xA0, 0xA0, 0x4D, 0xA0, 0xA0, 0x4D, 0xA0, 0xA0, 0x4D, 0xA0, 0xA0, 0x4D }
 

+ 0 - 3
keyboards/keychron/v1/jis/info.json

@@ -8,9 +8,6 @@
         "pid": "0x0314",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {

+ 0 - 5
keyboards/keychron/v1/jis_encoder/config.h

@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 46
-#define DRIVER_2_LED_TOTAL 40
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define SNLED27351_CURRENT_TUNE \
     { 0xA0, 0xA0, 0x4D, 0xA0, 0xA0, 0x4D, 0xA0, 0xA0, 0x4D, 0xA0, 0xA0, 0x4D }
 

+ 0 - 3
keyboards/keychron/v1/jis_encoder/info.json

@@ -8,9 +8,6 @@
         "pid": "0x0315",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}

Неке датотеке нису приказане због велике количине промена