[Keyboard] Update Keychron Q9 (#22579)

Co-authored-by: Ryan <fauxpark@gmail.com>

keyboards/keychron/q9/ansi/ansi.c

@@ -84,30 +84,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {0, C_4,    A_4,    B_4}
 };
 
-#define __ NO_LED
-
-led_config_t g_led_config = {
-     {
-        // Key Matrix to LED Index
-        {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14 },
-        { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 51, 27, 28 },
-        { 29, __, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, __, 40, 41 },
-        { 42, 43, 44, __, __, __, 45, __, __, __, 46, 47, 48, 49, 50 },
-    },
-    {
-        // LED Index to Physical Position
-        {2,0},  {20,0},  {35,0},  {50,0},  {65,0},  {80,0},  {94,0},  {109,0},  {124,0},  {139,0},  {154,0},  {168,0},  {183,0},  {202,0},            {224,0},
-        {4,21}, {24,21}, {39,21}, {54,21}, {68,21}, {83,21}, {98,21}, {113,21}, {128,21}, {142,21}, {157,21}, {172,21},           {196,21},           {224,27},
-        {7,43},          {31,43}, {46,43}, {61,43}, {76,43}, {91,43}, {105,43}, {120,43}, {135,43}, {150,43}, {165,43},           {185,43}, {205,43},
-        {0,64}, {18,64}, {37,64},                            {92,64},                               {146,64}, {161,64}, {176,64}, {190,64}, {205,64}, {220,64},
-    },
-    {
-        // RGB LED Index to Flag
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,
-        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1,
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE

keyboards/keychron/q9/ansi/config.h

@@ -16,9 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 52
-#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 15

keyboards/keychron/q9/ansi/info.json

@@ -1,23 +1,67 @@
 {
-    "keyboard_name": "Keychron Q9",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0190",
-        "device_version": "1.0.0"
-    },
     "rgb_matrix": {
-        "driver": "snled27351"
+        "layout": [
+            {"matrix": [0, 0], "x": 2, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 35, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 50, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 65, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 94, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 109, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 124, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 139, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 154, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 168, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 183, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 202, "y": 0, "flags": 4},
+            {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 4, "y": 21, "flags": 8},
+            {"matrix": [1, 1], "x": 24, "y": 21, "flags": 4},
+            {"matrix": [1, 2], "x": 39, "y": 21, "flags": 4},
+            {"matrix": [1, 3], "x": 54, "y": 21, "flags": 4},
+            {"matrix": [1, 4], "x": 68, "y": 21, "flags": 4},
+            {"matrix": [1, 5], "x": 83, "y": 21, "flags": 4},
+            {"matrix": [1, 6], "x": 98, "y": 21, "flags": 4},
+            {"matrix": [1, 7], "x": 113, "y": 21, "flags": 4},
+            {"matrix": [1, 8], "x": 128, "y": 21, "flags": 4},
+            {"matrix": [1, 9], "x": 142, "y": 21, "flags": 4},
+            {"matrix": [1, 10], "x": 157, "y": 21, "flags": 4},
+            {"matrix": [1, 11], "x": 172, "y": 21, "flags": 4},
+            {"matrix": [1, 13], "x": 196, "y": 21, "flags": 1},
+            {"matrix": [1, 14], "x": 224, "y": 27, "flags": 1},
+
+            {"matrix": [2, 0], "x": 7, "y": 43, "flags": 1},
+            {"matrix": [2, 2], "x": 31, "y": 43, "flags": 4},
+            {"matrix": [2, 3], "x": 46, "y": 43, "flags": 4},
+            {"matrix": [2, 4], "x": 61, "y": 43, "flags": 4},
+            {"matrix": [2, 5], "x": 76, "y": 43, "flags": 4},
+            {"matrix": [2, 6], "x": 91, "y": 43, "flags": 4},
+            {"matrix": [2, 7], "x": 105, "y": 43, "flags": 4},
+            {"matrix": [2, 8], "x": 120, "y": 43, "flags": 4},
+            {"matrix": [2, 9], "x": 135, "y": 43, "flags": 4},
+            {"matrix": [2, 10], "x": 150, "y": 43, "flags": 4},
+            {"matrix": [2, 11], "x": 165, "y": 43, "flags": 4},
+            {"matrix": [2, 13], "x": 185, "y": 43, "flags": 1},
+            {"matrix": [2, 14], "x": 205, "y": 43, "flags": 1},
+
+            {"matrix": [3, 0], "x": 0, "y": 64, "flags": 1},
+            {"matrix": [3, 1], "x": 18, "y": 64, "flags": 1},
+            {"matrix": [3, 2], "x": 37, "y": 64, "flags": 1},
+            {"matrix": [3, 6], "x": 92, "y": 64, "flags": 4},
+            {"matrix": [3, 10], "x": 146, "y": 64, "flags": 1},
+            {"matrix": [3, 11], "x": 161, "y": 64, "flags": 1},
+            {"matrix": [3, 12], "x": 176, "y": 64, "flags": 1},
+            {"matrix": [3, 13], "x": 190, "y": 64, "flags": 1},
+            {"matrix": [3, 14], "x": 205, "y": 64, "flags": 1},
+            {"matrix": [1, 12], "x": 220, "y": 64, "flags": 1}
+        ]
     },
-    "matrix_pins": {
-        "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
-        "rows": ["B3", "A15", "A14", "A13"]
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0190"
     },
-    "diode_direction": "ROW2COL",
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_ansi_52": {
             "layout": [
@@ -65,7 +109,6 @@
                 {"matrix": [2, 11], "x": 11.25, "y": 2.25},
                 {"matrix": [2, 13], "x": 12.25, "y": 2.25, "w": 1.75},
                 {"matrix": [2, 14], "x": 14.25, "y": 2.5},
-
                 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
                 {"matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.25},
                 {"matrix": [3, 2], "x": 2.5, "y": 3.25, "w": 1.25},
@@ -79,4 +122,4 @@
             ]
         }
     }
-}
+}

keyboards/keychron/q9/ansi/rules.mk

@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
+# This file intentionally left blank

keyboards/keychron/q9/ansi_encoder/ansi_encoder.c

@@ -84,30 +84,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {0, C_4,    A_4,    B_4}
 };
 
-#define __ NO_LED
-
-led_config_t g_led_config = {
-     {
-        // Key Matrix to LED Index
-        {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14 },
-        { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 51, 27, 28 },
-        { 29, __, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, __, 40, 41 },
-        { 42, 43, 44, __, __, __, 45, __, __, __, 46, 47, 48, 49, 50 },
-    },
-    {
-        // LED Index to Physical Position
-        {2,0},  {20,0},  {35,0},  {50,0},  {65,0},  {80,0},  {94,0},  {109,0},  {124,0},  {139,0},  {154,0},  {168,0},  {183,0},  {202,0},            {224,0},
-        {4,21}, {24,21}, {39,21}, {54,21}, {68,21}, {83,21}, {98,21}, {113,21}, {128,21}, {142,21}, {157,21}, {172,21},           {196,21},           {224,27},
-        {7,43},          {31,43}, {46,43}, {61,43}, {76,43}, {91,43}, {105,43}, {120,43}, {135,43}, {150,43}, {165,43},           {185,43}, {205,43},
-        {0,64}, {18,64}, {37,64},                            {92,64},                               {146,64}, {161,64}, {176,64}, {190,64}, {205,64}, {220,64},
-    },
-    {
-        // RGB LED Index to Flag
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,
-        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1,
-        1, 1, 1,          1,          1, 1, 1, 1, 1, 1,
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE

keyboards/keychron/q9/ansi_encoder/config.h

@@ -16,12 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 52
-#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
-
-/* Encoder Configuration */
-#define ENCODER_DEFAULT_POS 0x3
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 15

keyboards/keychron/q9/ansi_encoder/info.json

@@ -1,28 +1,70 @@
 {
-    "keyboard_name": "Keychron Q9",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0191",
-        "device_version": "1.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
-    "matrix_pins": {
-        "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
-        "rows": ["B3", "A15", "A14", "A13"]
-    },
-    "diode_direction": "ROW2COL",
     "encoder": {
+        "enabled": true,
         "rotary": [
             {"pin_a": "B4", "pin_b": "B5"}
         ]
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 2, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 35, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 50, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 65, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 94, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 109, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 124, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 139, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 154, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 168, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 183, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 202, "y": 0, "flags": 4},
+            {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 4, "y": 21, "flags": 8},
+            {"matrix": [1, 1], "x": 24, "y": 21, "flags": 4},
+            {"matrix": [1, 2], "x": 39, "y": 21, "flags": 4},
+            {"matrix": [1, 3], "x": 54, "y": 21, "flags": 4},
+            {"matrix": [1, 4], "x": 68, "y": 21, "flags": 4},
+            {"matrix": [1, 5], "x": 83, "y": 21, "flags": 4},
+            {"matrix": [1, 6], "x": 98, "y": 21, "flags": 4},
+            {"matrix": [1, 7], "x": 113, "y": 21, "flags": 4},
+            {"matrix": [1, 8], "x": 128, "y": 21, "flags": 4},
+            {"matrix": [1, 9], "x": 142, "y": 21, "flags": 4},
+            {"matrix": [1, 10], "x": 157, "y": 21, "flags": 4},
+            {"matrix": [1, 11], "x": 172, "y": 21, "flags": 4},
+            {"matrix": [1, 13], "x": 196, "y": 21, "flags": 1},
+            {"matrix": [1, 14], "x": 224, "y": 27, "flags": 1},
+            {"matrix": [2, 0], "x": 7, "y": 43, "flags": 1},
+            {"matrix": [2, 2], "x": 31, "y": 43, "flags": 4},
+            {"matrix": [2, 3], "x": 46, "y": 43, "flags": 4},
+            {"matrix": [2, 4], "x": 61, "y": 43, "flags": 4},
+            {"matrix": [2, 5], "x": 76, "y": 43, "flags": 4},
+            {"matrix": [2, 6], "x": 91, "y": 43, "flags": 4},
+            {"matrix": [2, 7], "x": 105, "y": 43, "flags": 4},
+            {"matrix": [2, 8], "x": 120, "y": 43, "flags": 4},
+            {"matrix": [2, 9], "x": 135, "y": 43, "flags": 4},
+            {"matrix": [2, 10], "x": 150, "y": 43, "flags": 4},
+            {"matrix": [2, 11], "x": 165, "y": 43, "flags": 4},
+            {"matrix": [2, 13], "x": 185, "y": 43, "flags": 1},
+            {"matrix": [2, 14], "x": 205, "y": 43, "flags": 1},
+            {"matrix": [3, 0], "x": 0, "y": 64, "flags": 1},
+            {"matrix": [3, 1], "x": 18, "y": 64, "flags": 1},
+            {"matrix": [3, 2], "x": 37, "y": 64, "flags": 1},
+            {"matrix": [3, 6], "x": 92, "y": 64, "flags": 1},
+            {"matrix": [3, 10], "x": 146, "y": 64, "flags": 1},
+            {"matrix": [3, 11], "x": 161, "y": 64, "flags": 1},
+            {"matrix": [3, 12], "x": 176, "y": 64, "flags": 1},
+            {"matrix": [3, 13], "x": 190, "y": 64, "flags": 1},
+            {"matrix": [3, 14], "x": 205, "y": 64, "flags": 1},
+            {"matrix": [1, 12], "x": 220, "y": 64, "flags": 1}
+        ]
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0191"
+    },
     "layouts": {
         "LAYOUT_ansi_52": {
             "layout": [
@@ -41,7 +83,6 @@
                 {"matrix": [0, 12], "x": 12.5, "y": 0.25},
                 {"matrix": [0, 13], "x": 13.5, "y": 0.25, "w": 1.5},
                 {"matrix": [0, 14], "x": 15.25, "y": 0},
-
                 {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.75},
                 {"matrix": [1, 1], "x": 1.75, "y": 1.25},
                 {"matrix": [1, 2], "x": 2.75, "y": 1.25},
@@ -56,7 +97,6 @@
                 {"matrix": [1, 11], "x": 11.75, "y": 1.25},
                 {"matrix": [1, 13], "x": 12.75, "y": 1.25, "w": 2.25},
                 {"matrix": [1, 14], "x": 15.25, "y": 1.25},
-
                 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 2.25},
                 {"matrix": [2, 2], "x": 2.25, "y": 2.25},
                 {"matrix": [2, 3], "x": 3.25, "y": 2.25},
@@ -70,7 +110,6 @@
                 {"matrix": [2, 11], "x": 11.25, "y": 2.25},
                 {"matrix": [2, 13], "x": 12.25, "y": 2.25, "w": 1.75},
                 {"matrix": [2, 14], "x": 14.25, "y": 2.5},
-
                 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
                 {"matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.25},
                 {"matrix": [3, 2], "x": 2.5, "y": 3.25, "w": 1.25},
@@ -84,4 +123,4 @@
             ]
         }
     }
-}
+}

keyboards/keychron/q9/ansi_encoder/rules.mk

@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-ENCODER_MAP_ENBALE = no
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
+# This file intentionally left blank

keyboards/keychron/q9/config.h

@@ -38,60 +38,5 @@
 /* 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
+/* Encoder Configuration */
+#define ENCODER_DEFAULT_POS 0x3

keyboards/keychron/q9/info.json

@@ -0,0 +1,60 @@
+{
+    "manufacturer": "Keychron",
+    "keyboard_name": "Keychron Q9",
+    "maintainer": "lalalademaxiya1",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "dynamic_keymap": {
+        "layer_count": 5
+    },
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        } 
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "dip_switch": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
+        "rows": ["B3", "A15", "A14", "A13"]
+    },
+    "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": "snled27351"
+    },
+    "url": "https://github.com/Keychron",
+    "usb": {
+        "vid": "0x3434"
+    }
+}

keyboards/keychron/q9/iso/config.h

@@ -16,9 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 53
-#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 14

keyboards/keychron/q9/iso/info.json

@@ -1,23 +1,68 @@
 {
-    "keyboard_name": "Keychron Q9",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0192",
-        "device_version": "1.0.0"
-    },
     "rgb_matrix": {
-        "driver": "snled27351"
+        "layout": [
+            {"matrix": [0, 0], "x": 2, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 35, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 50, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 65, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 94, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 109, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 124, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 139, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 154, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 168, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 183, "y": 0, "flags": 4},
+            {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 4, "y": 21, "flags": 8},
+            {"matrix": [1, 1], "x": 24, "y": 21, "flags": 4},
+            {"matrix": [1, 2], "x": 39, "y": 21, "flags": 4},
+            {"matrix": [1, 3], "x": 54, "y": 21, "flags": 4},
+            {"matrix": [1, 4], "x": 68, "y": 21, "flags": 4},
+            {"matrix": [1, 5], "x": 83, "y": 21, "flags": 4},
+            {"matrix": [1, 6], "x": 98, "y": 21, "flags": 4},
+            {"matrix": [1, 7], "x": 113, "y": 21, "flags": 4},
+            {"matrix": [1, 8], "x": 128, "y": 21, "flags": 4},
+            {"matrix": [1, 9], "x": 142, "y": 21, "flags": 4},
+            {"matrix": [1, 10], "x": 157, "y": 21, "flags": 4},
+            {"matrix": [1, 11], "x": 172, "y": 21, "flags": 4},
+            {"matrix": [1, 13], "x": 187, "y": 21, "flags": 4},
+            {"matrix": [0, 13], "x": 207, "y": 14, "flags": 1},
+            {"matrix": [1, 14], "x": 224, "y": 27, "flags": 1},
+
+            {"matrix": [2, 0], "x": 0, "y": 43, "flags": 1},
+            {"matrix": [2, 1], "x": 17, "y": 43, "flags": 4},
+            {"matrix": [2, 2], "x": 31, "y": 43, "flags": 4},
+            {"matrix": [2, 3], "x": 46, "y": 43, "flags": 4},
+            {"matrix": [2, 4], "x": 61, "y": 43, "flags": 4},
+            {"matrix": [2, 5], "x": 76, "y": 43, "flags": 4},
+            {"matrix": [2, 6], "x": 91, "y": 43, "flags": 4},
+            {"matrix": [2, 7], "x": 105, "y": 43, "flags": 4},
+            {"matrix": [2, 8], "x": 120, "y": 43, "flags": 4},
+            {"matrix": [2, 9], "x": 135, "y": 43, "flags": 4},
+            {"matrix": [2, 10], "x": 150, "y": 43, "flags": 4},
+            {"matrix": [2, 11], "x": 165, "y": 43, "flags": 4},
+            {"matrix": [2, 13], "x": 185, "y": 43, "flags": 1},
+            {"matrix": [2, 14], "x": 205, "y": 43, "flags": 1},
+
+            {"matrix": [3, 0], "x": 0, "y": 64, "flags": 1},
+            {"matrix": [3, 1], "x": 18, "y": 64, "flags": 1},
+            {"matrix": [3, 2], "x": 37, "y": 64, "flags": 1},
+            {"matrix": [3, 6], "x": 92, "y": 64, "flags": 4},
+            {"matrix": [3, 10], "x": 146, "y": 64, "flags": 1},
+            {"matrix": [3, 11], "x": 161, "y": 64, "flags": 1},
+            {"matrix": [3, 12], "x": 176, "y": 64, "flags": 1},
+            {"matrix": [3, 13], "x": 190, "y": 64, "flags": 1},
+            {"matrix": [3, 14], "x": 205, "y": 64, "flags": 1},
+            {"matrix": [1, 12], "x": 220, "y": 64, "flags": 1}
+        ]
     },
-    "matrix_pins": {
-        "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
-        "rows": ["B3", "A15", "A14", "A13"]
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0192"
     },
-    "diode_direction": "ROW2COL",
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_iso_53": {
             "layout": [
@@ -66,7 +111,6 @@
                 {"matrix": [2, 11], "x": 11.25, "y": 2},
                 {"matrix": [2, 13], "x": 12.25, "y": 2, "w": 1.75},
                 {"matrix": [2, 14], "x": 14, "y": 2},
-
                 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
                 {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
                 {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
@@ -80,4 +124,4 @@
             ]
         }
     }
-}
+}

keyboards/keychron/q9/iso/iso.c

@@ -85,30 +85,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {0, C_4,  A_4,  B_4}   // Right
 };
 
-#define __ NO_LED
-
-led_config_t g_led_config = {
-     {
-        // Key Matrix to LED Index
-        {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 27, 13 },
-        { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 52, 26, 28 },
-        { 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, __, 41, 42 },
-        { 43, 44, 45, __, __, __, 46, __, __, __, 47, 48, 49, 50, 51 },
-    },
-    {
-        // LED Index to Physical Position
-        {2,0},  {20,0},  {35,0},  {50,0},  {65,0},  {80,0},  {94,0},  {109,0},  {124,0},  {139,0},  {154,0},  {168,0},  {183,0},                      {224,0},
-        {4,21}, {24,21}, {39,21}, {54,21}, {68,21}, {83,21}, {98,21}, {113,21}, {128,21}, {142,21}, {157,21}, {172,21}, {187,21}, {207,14},           {224,27},
-        {0,43}, {17,43}, {31,43}, {46,43}, {61,43}, {76,43}, {91,43}, {105,43}, {120,43}, {135,43}, {150,43}, {165,43},           {185,43}, {205,43},
-        {0,64}, {18,64}, {37,64},                            {92,64},                               {146,64}, {161,64}, {176,64}, {190,64}, {205,64}, {220,64},
-    },
-    {
-        // RGB LED Index to Flag
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       1,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1,
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE

keyboards/keychron/q9/iso/rules.mk

@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
+# This file intentionally left blank

keyboards/keychron/q9/iso_encoder/config.h

@@ -16,12 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 52
-#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
-
-/* Encoder Configuration */
-#define ENCODER_DEFAULT_POS 0x3
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 13

keyboards/keychron/q9/iso_encoder/info.json

@@ -1,28 +1,73 @@
 {
-    "keyboard_name": "Keychron Q9",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0193",
-        "device_version": "1.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
-    "matrix_pins": {
-        "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
-        "rows": ["B3", "A15", "A14", "A13"]
-    },
-    "diode_direction": "ROW2COL",
     "encoder": {
+        "enabled": true,
         "rotary": [
             {"pin_a": "B4", "pin_b": "B5"}
         ]
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 2, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 35, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 50, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 65, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 94, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 109, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 124, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 139, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 154, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 168, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 183, "y": 0, "flags": 4},
+
+            {"matrix": [1, 0], "x": 4, "y": 21, "flags": 8},
+            {"matrix": [1, 1], "x": 24, "y": 21, "flags": 4},
+            {"matrix": [1, 2], "x": 39, "y": 21, "flags": 4},
+            {"matrix": [1, 3], "x": 54, "y": 21, "flags": 4},
+            {"matrix": [1, 4], "x": 68, "y": 21, "flags": 4},
+            {"matrix": [1, 5], "x": 83, "y": 21, "flags": 4},
+            {"matrix": [1, 6], "x": 98, "y": 21, "flags": 4},
+            {"matrix": [1, 7], "x": 113, "y": 21, "flags": 4},
+            {"matrix": [1, 8], "x": 128, "y": 21, "flags": 4},
+            {"matrix": [1, 9], "x": 142, "y": 21, "flags": 4},
+            {"matrix": [1, 10], "x": 157, "y": 21, "flags": 4},
+            {"matrix": [1, 11], "x": 172, "y": 21, "flags": 4},
+            {"matrix": [1, 13], "x": 187, "y": 21, "flags": 4},
+            {"matrix": [0, 13], "x": 207, "y": 14, "flags": 1},
+            {"matrix": [1, 14], "x": 224, "y": 27, "flags": 1},
+
+            {"matrix": [2, 0], "x": 0, "y": 43, "flags": 1},
+            {"matrix": [2, 1], "x": 17, "y": 43, "flags": 4},
+            {"matrix": [2, 2], "x": 31, "y": 43, "flags": 4},
+            {"matrix": [2, 3], "x": 46, "y": 43, "flags": 4},
+            {"matrix": [2, 4], "x": 61, "y": 43, "flags": 4},
+            {"matrix": [2, 5], "x": 76, "y": 43, "flags": 4},
+            {"matrix": [2, 6], "x": 91, "y": 43, "flags": 4},
+            {"matrix": [2, 7], "x": 105, "y": 43, "flags": 4},
+            {"matrix": [2, 8], "x": 120, "y": 43, "flags": 4},
+            {"matrix": [2, 9], "x": 135, "y": 43, "flags": 4},
+            {"matrix": [2, 10], "x": 150, "y": 43, "flags": 4},
+            {"matrix": [2, 11], "x": 165, "y": 43, "flags": 4},
+            {"matrix": [2, 13], "x": 185, "y": 43, "flags": 1},
+            {"matrix": [2, 14], "x": 205, "y": 43, "flags": 1},
+            
+            {"matrix": [3, 0], "x": 0, "y": 64, "flags": 1},
+            {"matrix": [3, 1], "x": 18, "y": 64, "flags": 1},
+            {"matrix": [3, 2], "x": 37, "y": 64, "flags": 1},
+            {"matrix": [3, 6], "x": 92, "y": 64, "flags": 4},
+            {"matrix": [3, 10], "x": 146, "y": 64, "flags": 1},
+            {"matrix": [3, 11], "x": 161, "y": 64, "flags": 1},
+            {"matrix": [3, 12], "x": 176, "y": 64, "flags": 1},
+            {"matrix": [3, 13], "x": 190, "y": 64, "flags": 1},
+            {"matrix": [3, 14], "x": 205, "y": 64, "flags": 1},
+            {"matrix": [1, 12], "x": 220, "y": 64, "flags": 1}
+        ]
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0193"
+    },
     "layouts": {
         "LAYOUT_iso_53": {
             "layout": [
@@ -40,7 +85,6 @@
                 {"matrix": [0, 11], "x": 11.5, "y": 0},
                 {"matrix": [0, 12], "x": 12.5, "y": 0},
                 {"matrix": [0, 14], "x": 15.25, "y": 0},
-
                 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
                 {"matrix": [1, 1], "x": 1.75, "y": 1},
                 {"matrix": [1, 2], "x": 2.75, "y": 1},
@@ -56,7 +100,6 @@
                 {"matrix": [1, 13], "x": 12.75, "y": 1},
                 {"matrix": [0, 13], "x": 13.75, "y": 0, "w": 1.25, "h": 2},
                 {"matrix": [1, 14], "x": 15.25, "y": 1.25},
-
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
                 {"matrix": [2, 1], "x": 1.25, "y": 2},
                 {"matrix": [2, 2], "x": 2.25, "y": 2},
@@ -71,7 +114,6 @@
                 {"matrix": [2, 11], "x": 11.25, "y": 2},
                 {"matrix": [2, 13], "x": 12.25, "y": 2, "w": 1.75},
                 {"matrix": [2, 14], "x": 14, "y": 2},
-
                 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
                 {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
                 {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
@@ -85,4 +127,4 @@
             ]
         }
     }
-}
+}

keyboards/keychron/q9/iso_encoder/iso_encoder.c

@@ -85,30 +85,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {0, C_4,  A_4,  B_4}   // Right
 };
 
-#define __ NO_LED
-
-led_config_t g_led_config = {
-     {
-        // Key Matrix to LED Index
-        {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 26, __ },
-        { 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 51, 25, 27 },
-        { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, __, 40, 41 },
-        { 42, 43, 44, __, __, __, 45, __, __, __, 46, 47, 48, 49, 50 },
-    },
-    {
-        // LED Index to Physical Position
-        {2,0},  {20,0},  {35,0},  {50,0},  {65,0},  {80,0},  {94,0},  {109,0},  {124,0},  {139,0},  {154,0},  {168,0},  {183,0},
-        {4,21}, {24,21}, {39,21}, {54,21}, {68,21}, {83,21}, {98,21}, {113,21}, {128,21}, {142,21}, {157,21}, {172,21}, {187,21}, {207,14},           {224,27},
-        {0,43}, {17,43}, {31,43}, {46,43}, {61,43}, {76,43}, {91,43}, {105,43}, {120,43}, {135,43}, {150,43}, {165,43},           {185,43}, {205,43},
-        {0,64}, {18,64}, {37,64},                            {92,64},                               {146,64}, {161,64}, {176,64}, {190,64}, {205,64}, {220,64},
-    },
-    {
-        // RGB LED Index to Flag
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1,
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE

keyboards/keychron/q9/iso_encoder/rules.mk

@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-ENCODER_MAP_ENBALE = no
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
+# This file intentionally left blank

keyboards/keychron/q9/readme.md

@@ -1,19 +1,27 @@
 # Keychron Q9
 
+![Keychron Q9](https://i.imgur.com/G8xJ4TRh.jpg)
+
 A customizable 40% keyboard.
 
 * Keyboard Maintainer: [Keychron](https://github.com/keychron)
 * Hardware Supported: Keychron Q9
-* Hardware Availability: [Keychron](https://www.keychron.com)
+* Hardware Availability: [Keychron Q9 QMK Custom Mechanical Keyboard](https://www.keychron.com/products/keychron-q9-qmk-custom-mechanical-keyboard)
 
 Make example for this keyboard (after setting up your build environment):
 
     make keychron/q9/ansi:default
+    make keychron/q9/ansi_encoder:default
+    make keychron/q9/iso:default
+    make keychron/q9/iso_enocder:default
 
-Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
+Flashing example for this keyboard:
 
     make keychron/q9/ansi:default:flash
+    make keychron/q9/ansi_encoder:default:flash
+    make keychron/q9/iso:default:flash
+    make keychron/q9/iso_encoder:default:flash
 
-**Reset Key**: Hold down the key located at *K00*, which programmed as *Tab* while plugging in the keyboard.
+**Reset Key**: Hold down the key located at *K00*, commonly programmed as *Esc* while plugging in the keyboard.
 
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).