DD-configuration for Q Pro series

5 files changed, 64 insertions, 41 deletions

diff --git a/keyboards/keychron/q3_pro/ansi_encoder/info.json b/keyboards/keychron/q3_pro/ansi_encoder/info.json
index 6184fc2b1a..cd5b596a17 100644
--- a/keyboards/keychron/q3_pro/ansi_encoder/info.json
+++ b/keyboards/keychron/q3_pro/ansi_encoder/info.json
@@ -1,20 +1,9 @@
 {
-    "keyboard_name": "Keychron Q3 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
     "usb": {
     	"vid": "0x3434",
     	"pid": "0x0630",
     	"device_version": "1.0.0"
     },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A10", "pin_b": "A0"}
-        ]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_ansi_92": {
             "layout": [
diff --git a/keyboards/keychron/q3_pro/ansi_encoder/rules.mk b/keyboards/keychron/q3_pro/ansi_encoder/rules.mk
index 7af34ccd60..f886ea2e8e 100644
--- a/keyboards/keychron/q3_pro/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q3_pro/ansi_encoder/rules.mk
@@ -1,2 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/q3_pro/config.h b/keyboards/keychron/q3_pro/config.h
index 4be8751f2d..dde2580aec 100644
--- a/keyboards/keychron/q3_pro/config.h
+++ b/keyboards/keychron/q3_pro/config.h
@@ -16,22 +16,10 @@
 
 #pragma once
 
-/* Key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B5, B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* turn off effects when suspended */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define LED_DISABLE_WHEN_USB_SUSPENDED
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* DIP switch for Mac/win OS switch */
 #define DIP_SWITCH_PINS \
     { A8 }
diff --git a/keyboards/keychron/q3_pro/info.json b/keyboards/keychron/q3_pro/info.json
new file mode 100644
index 0000000000..492fdf42c2
--- /dev/null
+++ b/keyboards/keychron/q3_pro/info.json
@@ -0,0 +1,63 @@
+{
+    "keyboard_name": "Keychron Q3 Pro",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lokher",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "A0", "resolution": 4}
+        ]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "dip_switch": true,
+        "raw": true,
+        "encoder": true,
+        "encoder_map": true,
+        "rgb_matrix": true
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_size": {
+        "rows": 6,
+        "cols": 18
+    },
+    "matrix_pins": {
+        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"],
+        "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+        "custom_lite": true 
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "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
+        }
+    },
+    "bluetooth": {
+        "driver": "custom"
+    } 
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q3_pro/rules.mk b/keyboards/keychron/q3_pro/rules.mk
index 5f5fafa281..98cf5c564b 100644
--- a/keyboards/keychron/q3_pro/rules.mk
+++ b/keyboards/keychron/q3_pro/rules.mk
@@ -1,24 +1,8 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable boot magic
-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           # USB Nkey Rollover
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-BLUETOOTH_ENABLE = no
-BLUETOOTH_DRIVER = custom
-RAW_ENABLE = yes
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
 OPT_DEFS += -DKC_BLUETOOTH_ENABLE
 
-CUSTOM_MATRIX = lite
 SRC += matrix.c
 
 include keyboards/keychron/bluetooth/bluetooth.mk