Merge branch 'keychron_q8_pro' of https://github.com/lalalademaxiya1/qmk_firmware into keychron_q8_pro

7 files changed, 4 insertions, 11 deletions

diff --git a/keyboards/keychron/q8_pro/ansi_encoder/config.h b/keyboards/keychron/q8_pro/ansi_encoder/config.h
index f537b52c76..98446227c4 100755
--- a/keyboards/keychron/q8_pro/ansi_encoder/config.h
+++ b/keyboards/keychron/q8_pro/ansi_encoder/config.h
@@ -38,9 +38,7 @@
 #    define CAPS_LOCK_INDEX 29
 #    define LOW_BAT_IND_INDEX 60
 
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+/* Enable Reactive Animation */
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #    define RGB_MATRIX_KEYPRESSES
 
diff --git a/keyboards/keychron/q8_pro/halconf.h b/keyboards/keychron/q8_pro/halconf.h
index b0ca1150f6..8d8e138e4e 100755
--- a/keyboards/keychron/q8_pro/halconf.h
+++ b/keyboards/keychron/q8_pro/halconf.h
@@ -19,7 +19,6 @@
 #define _CHIBIOS_HAL_CONF_VER_8_0_
 
 #define HAL_USE_I2C TRUE
-#define HAL_USE_SPI TRUE
 
 #ifdef KC_BLUETOOTH_ENABLE
 #    define PAL_USE_CALLBACKS TRUE
diff --git a/keyboards/keychron/q8_pro/info.json b/keyboards/keychron/q8_pro/info.json
index 49bd577449..81105559ad 100755
--- a/keyboards/keychron/q8_pro/info.json
+++ b/keyboards/keychron/q8_pro/info.json
@@ -17,7 +17,6 @@
         "nkro": true,
         "rgb_matrix": true,
         "dip_switch": true,
-        "bluetooth": false,
         "encoder": true,
         "raw": true
     },
@@ -52,6 +51,8 @@
         "rows": ["B4", "B3", "A15", "A14", "A13"],
         "custom": true,
         "custom_lite": true
+       "custom": true,
+        "custom_lite": true
     },
     "diode_direction": "ROW2COL",
     "encoder": {
diff --git a/keyboards/keychron/q8_pro/mcuconf.h b/keyboards/keychron/q8_pro/mcuconf.h
index 87dd1ba2b9..882d6bd568 100755
--- a/keyboards/keychron/q8_pro/mcuconf.h
+++ b/keyboards/keychron/q8_pro/mcuconf.h
@@ -30,9 +30,6 @@
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
 
-#undef STM32_SPI_USE_SPI1
-#define STM32_SPI_USE_SPI1 TRUE
-
 #ifdef KC_BLUETOOTH_ENABLE
 #    undef STM32_SERIAL_USE_USART2
 #    define STM32_SERIAL_USE_USART2 TRUE
diff --git a/keyboards/keychron/q8_pro/q8_pro.c b/keyboards/keychron/q8_pro/q8_pro.c
index 97e2ed1f6d..eade1dce33 100755
--- a/keyboards/keychron/q8_pro/q8_pro.c
+++ b/keyboards/keychron/q8_pro/q8_pro.c
@@ -198,7 +198,6 @@ void matrix_scan_kb(void) {
 #ifdef KC_BLUETOOTH_ENABLE
 static void ckbt51_param_init(void) {
     /* Set bluetooth device name */
-    // ckbt51_set_local_name(STR(PRODUCT));
     ckbt51_set_local_name(PRODUCT);
     wait_ms(10);
     /* Set bluetooth parameters */
diff --git a/keyboards/keychron/q8_pro/readme.md b/keyboards/keychron/q8_pro/readme.md
index f3ac8e65c7..62631503d5 100755
--- a/keyboards/keychron/q8_pro/readme.md
+++ b/keyboards/keychron/q8_pro/readme.md
@@ -18,6 +18,6 @@ Flashing example for this keyboard:
     make keychron/q8_pro/ansi_encoder:default:flash
     make keychron/q8_pro/iso_encoder:default:flash
 
-**Reset Key**: Connect the USB cable, toggle mode switch to "Off", hold down the *Esc* key or reset button underneath space bar, then toggle then switch to "Cable".
+**Reset Key**: Connect the USB cable, toggle mode switch to "Off", hold down the *Esc* key or reset button underneath space bar, then toggle the switch to "Cable".
 
 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).
diff --git a/keyboards/keychron/q8_pro/rules.mk b/keyboards/keychron/q8_pro/rules.mk
index 98cf5c564b..1f9fc1ab58 100755
--- a/keyboards/keychron/q8_pro/rules.mk
+++ b/keyboards/keychron/q8_pro/rules.mk
@@ -1,7 +1,6 @@
 # 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
 
 SRC += matrix.c