qmk · adophoxia · Jun 29, 2023 · Jun 30, 2023 · Jul 2, 2023 · Jul 2, 2023
diff --git a/keyboards/keychron/q0/config.h b/keyboards/keychron/q0/config.h
@@ -25,5 +25,8 @@
 #define WEAR_LEVELING_LOGICAL_SIZE 2048
 #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
 
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+// 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
diff --git a/keyboards/keychron/q0/info.json b/keyboards/keychron/q0/info.json
@@ -0,0 +1,50 @@
+{
+    "manufacturer": "Keychron",
+    "maintainer": "lalalademaxiya1",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "audio": false,
+        "backlight": false,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "rgblight": false
+    },
+    "processor": "STM32L432",
+    "rgb_matrix": {
+        "animations": {
+            "band_spiral_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_simple": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "driver": "CKLED2001"
+    },
+    "url": "https://github.com/Keychron",
+    "usb": {
+        "force_nkro": true,
+        "vid": "0x3434"
+    }
+}
diff --git a/keyboards/keychron/q0/readme.md b/keyboards/keychron/q0/readme.md
@@ -1,18 +1,22 @@
 # Keychron Q0
 
+![Keychron Q0](https://i.imgur.com/cLbEiZ0h.jpg)
+
 A customizable number keypad.
 
 * Keyboard Maintainer: [Keychron](https://github.com/keychron)
 * Hardware Supported: Keychron Q0
-* Hardware Availability: [Keychron](https://www.keychron.com)
+* Hardware Availability: [Keychron Q0 QMK Custom Number Pad](https://www.keychron.com/products/keychron-q0-qmk-custom-number-pad)
 
 Make example for this keyboard (after setting up your build environment):
 
     make keychron/q0/rev_0130:default
+    make keychron/q0/rev_0131:default
 
 Flashing example for this keyboard:
 
     make keychron/q0/rev_0130:default:flash
+    make keychron/q0/rev_0131:default:flash
 
 **Reset Key**: Hold down the key located at *K00*, commonly programmed as *Esc* while plugging in the keyboard.
 

diff --git a/keyboards/keychron/q0/rev_0130/config.h b/keyboards/keychron/q0/rev_0130/config.h
@@ -21,8 +21,7 @@
 #define DRIVER_ADDR_1 0b1110100
 
 /* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 21
-#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
+#define RGB_MATRIX_LED_COUNT 21
 
 /* Enable num-lock LED */
 #define NUM_LOCK_LED_INDEX 4
diff --git a/keyboards/keychron/q0/rev_0130/info.json b/keyboards/keychron/q0/rev_0130/info.json
@@ -1,58 +1,10 @@
 {
     "keyboard_name": "Q0",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0130",
-        "device_version": "1.0.2",
-        "force_nkro": true
-    },
     "matrix_pins": {
         "cols": ["A5", "A6", "A7", "B0"],
         "rows": ["B5", "B4", "B3", "A15", "A14", "A13"]
     },
-    "features": {
-        "audio": false,
-        "backlight": false,
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "rgb_matrix": true,
-        "rgblight": false
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
     "rgb_matrix": {
-        "driver": "CKLED2001",
-        "animations": {
-            "band_spiral_val": true,
-            "breathing": 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
-        },
         "center_point": [56, 16],
         "layout": [
             {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0},
@@ -83,6 +35,10 @@
             {"flags": 1, "matrix": [4, 3], "x": 112, "y": 29}
         ]
     },
+    "usb": {
+        "device_version": "1.0.2",
+        "pid": "0x0130"
+    },
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [
@@ -115,4 +71,4 @@
             ]
         }
     }
-}
+}
diff --git a/keyboards/keychron/q0/rev_0130/rev_0130.c b/keyboards/keychron/q0/rev_0130/rev_0130.c
@@ -54,4 +54,5 @@ const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
     {0, L_1,    J_1,    K_1}, // 19
     {0, C_2,    A_2,    B_2}, // 20
 };
+
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q0/rev_0130/rules.mk b/keyboards/keychron/q0/rev_0130/rules.mk
@@ -1,3 +1 @@
-EEPROM_DRIVER = wear_leveling
-WEAR_LEVELING_DRIVER = embedded_flash
-
+# This file intentionally left blank
diff --git a/keyboards/keychron/q0/rev_0131/config.h b/keyboards/keychron/q0/rev_0131/config.h
@@ -21,14 +21,13 @@
 #define DRIVER_ADDR_1 0b1110111
 
 /* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 26
-#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
+#define RGB_MATRIX_LED_COUNT 26
+
+/* Encoder Configuration*/
+#define ENCODER_DEFAULT_POS 0x3
 
 /* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in CKLED2001.h) */
 #define PHASE_CHANNEL MSKPHASE_9CHANNEL
 
 /* Enable num-lock LED */
 #define NUM_LOCK_LED_INDEX 5
-
-/* Encoder Configuration */
-#define ENCODER_DEFAULT_POS 0x3
diff --git a/keyboards/keychron/q0/rev_0131/info.json b/keyboards/keychron/q0/rev_0131/info.json
@@ -1,67 +1,19 @@
 {
     "keyboard_name": "Keychron Q0 Plus",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0131",
-        "device_version": "1.0.0",
-        "force_nkro": true
-    },
-    "matrix_pins": {
-        "cols": ["C14", "C15", "A0", "A1", "A2"],
-        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"]
-    },
-    "features": {
-        "audio": false,
-        "backlight": false,
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "encoder": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "rgb_matrix": true,
-        "rgblight": false
+    "bootmagic": {
+        "matrix": [0, 1]
     },
-    "diode_direction": "ROW2COL",
     "encoder": {
+        "enabled": true,
         "rotary": [
             {"pin_a": "A3", "pin_b": "A4"}
         ]
     },
-    "bootmagic": {
-        "matrix": [0, 1]
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2"],
+        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"]
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
     "rgb_matrix": {
-        "driver": "CKLED2001",
-        "animations": {
-            "band_spiral_val": true,
-            "breathing": 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
-        },
         "layout": [
             {"flags": 1, "matrix": [0, 1], "x": 56, "y": 0},
             {"flags": 1, "matrix": [0, 2], "x": 112, "y": 0},
@@ -96,6 +48,10 @@
             {"flags": 1, "matrix": [5, 3], "x": 168, "y": 64}
         ]
     },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0131"
+    },
     "layouts": {
         "LAYOUT_numpad_6x5": {
             "layout": [
@@ -134,4 +90,4 @@
             ]
         }
     }
-}
+}
diff --git a/keyboards/keychron/q0/rev_0131/readme.md b/keyboards/keychron/q0/rev_0131/readme.md
@@ -1,6 +1,12 @@
-# The enhanced version with encoder of the Keychron Q0
+# Keychron Q0 Plus
 
-- The name of this keyboard is "Q0 Plus"
-- Enable EC11 rotary encoder
-- Turn clockwise to increase volume and turn anti-clockwise to decrease volume
-- Press the knob button to mute
+![Keychron Q0 Plus](https://i.imgur.com/EDbfVVOh.jpg)
+
+* Keyboard Maintainer: [Keychron](https://github.com/keychron)
+* Hardware Supported: Keychron Q0 Plus
+* Hardware Availability: [Keychron Q0 Plus QMK Custom Number Pad](https://www.keychron.com/products/keychron-q0-plus-qmk-custom-number-pad)
+
+1. The name of this keyboard is "Keychron Q0 Plus"
+2. Enable EC11 rotary encoder
+3. Turn clockwise to increase volume and turn anti-clockwise to decrease volume
+4. Press the knob button to mute
diff --git a/keyboards/keychron/q0/rev_0131/rev_0131.c b/keyboards/keychron/q0/rev_0131/rev_0131.c
@@ -59,4 +59,5 @@ const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
     {0, F_7,    D_7,    E_7},
     {0, F_9,    D_9,    E_9},
 };
+
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q0/rev_0131/rules.mk b/keyboards/keychron/q0/rev_0131/rules.mk
@@ -1,3 +1 @@
-EEPROM_DRIVER = wear_leveling
-WEAR_LEVELING_DRIVER = embedded_flash
-
+# This file intentionally left blank