Updated q5 pro

13 files changed, 21 insertions, 19 deletions

diff --git a/keyboards/keychron/q5_pro/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q5_pro/ansi_encoder/ansi_encoder.c
index c323cad5bc..ec0e1d0a9c 100755
--- a/keyboards/keychron/q5_pro/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q5_pro/ansi_encoder/ansi_encoder.c
@@ -42,6 +42,7 @@ const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
     {0, L_5,    J_5,    K_5},
     {0, L_6,    J_6,    K_6},
     {0, L_7,    J_7,    K_7},
+    // {0, L_8,    J_8,    K_8}, // Knob
 
     {0, C_1,    A_1,    B_1},
     {0, C_2,    A_2,    B_2},
diff --git a/keyboards/keychron/q5_pro/ansi_encoder/config.h b/keyboards/keychron/q5_pro/ansi_encoder/config.h
index e971fb17f3..9a99efabdb 100755
--- a/keyboards/keychron/q5_pro/ansi_encoder/config.h
+++ b/keyboards/keychron/q5_pro/ansi_encoder/config.h
@@ -21,6 +21,8 @@
 #    define DRIVER_COUNT 2
 #    define DRIVER_ADDR_1 0b1110111
 #    define DRIVER_ADDR_2 0b1110100
+
+/* RGB Matrix Configuration */
 #    define DRIVER_1_LED_TOTAL 55
 #    define DRIVER_2_LED_TOTAL 46
 #    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
@@ -34,16 +36,18 @@
 /* Turn off backllit if brightness value is low */
 #    define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48
 
-/* Indication led */
+/* Indication led index */
 #    define NUM_LOCK_INDEX 32
 #    define CAPS_LOCK_INDEX 55
 #    define LOW_BAT_IND_INDEX 92
 
+// 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
 
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
-        { 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 }
-
+        { 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30 }
 #endif
diff --git a/keyboards/keychron/q5_pro/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q5_pro/ansi_encoder/keymaps/default/keymap.c
index 0a788d3623..23ba5c3678 100755
--- a/keyboards/keychron/q5_pro/ansi_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q5_pro/ansi_encoder/keymaps/default/keymap.c
@@ -16,7 +16,6 @@
 
 #include QMK_KEYBOARD_H
 
-// clang-format off
 enum layers{
   MAC_BASE,
   MAC_FN,
@@ -24,6 +23,7 @@ enum layers{
   WIN_FN,
 };
 
+// clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_102_ansi(
         KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,            KC_DEL,   KC_F13,   KC_F14,   KC_F15,     KC_MUTE,
diff --git a/keyboards/keychron/q5_pro/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q5_pro/ansi_encoder/keymaps/via/keymap.c
index 0a788d3623..23ba5c3678 100755
--- a/keyboards/keychron/q5_pro/ansi_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q5_pro/ansi_encoder/keymaps/via/keymap.c
@@ -16,7 +16,6 @@
 
 #include QMK_KEYBOARD_H
 
-// clang-format off
 enum layers{
   MAC_BASE,
   MAC_FN,
@@ -24,6 +23,7 @@ enum layers{
   WIN_FN,
 };
 
+// clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_102_ansi(
         KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,            KC_DEL,   KC_F13,   KC_F14,   KC_F15,     KC_MUTE,
diff --git a/keyboards/keychron/q5_pro/config.h b/keyboards/keychron/q5_pro/config.h
index f9e54e9a4c..87236a1247 100755
--- a/keyboards/keychron/q5_pro/config.h
+++ b/keyboards/keychron/q5_pro/config.h
@@ -80,9 +80,6 @@
 #define FEE_DENSITY_BYTES FEE_PAGE_SIZE
 #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
 
-/* Old default behavior of mod-taps */
-#define HOLD_ON_OTHER_KEY_PRESS
-
 /* Factory test keys */
 #define FN_KEY1 MO(1)
 #define FN_KEY2 MO(3)
diff --git a/keyboards/keychron/q5_pro/iso_encoder/config.h b/keyboards/keychron/q5_pro/iso_encoder/config.h
index 53360a5e33..5a1edc3bd8 100755
--- a/keyboards/keychron/q5_pro/iso_encoder/config.h
+++ b/keyboards/keychron/q5_pro/iso_encoder/config.h
@@ -21,6 +21,8 @@
 #    define DRIVER_COUNT 2
 #    define DRIVER_ADDR_1 0b1110111
 #    define DRIVER_ADDR_2 0b1110100
+
+/* RGB Matrix Configuration */
 #    define DRIVER_1_LED_TOTAL 55
 #    define DRIVER_2_LED_TOTAL 47
 #    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
@@ -34,16 +36,18 @@
 /* Turn off backllit if brightness value is low */
 #    define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48
 
-/* Indication led */
+/* Indication led index */
 #    define NUM_LOCK_INDEX 32
 #    define CAPS_LOCK_INDEX 54
 #    define LOW_BAT_IND_INDEX 93
 
+// 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
 
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
-        { 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 }
-
+        { 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30 }
 #endif
diff --git a/keyboards/keychron/q5_pro/iso_encoder/iso_encoder.c b/keyboards/keychron/q5_pro/iso_encoder/iso_encoder.c
index 134bc54ce2..fc24e29a54 100755
--- a/keyboards/keychron/q5_pro/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q5_pro/iso_encoder/iso_encoder.c
@@ -42,6 +42,7 @@ const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
     {0, L_5,    J_5,    K_5},
     {0, L_6,    J_6,    K_6},
     {0, L_7,    J_7,    K_7},
+    // {0, L_8,    J_8,    K_8}, // Knob
 
     {0, C_1,    A_1,    B_1},
     {0, C_2,    A_2,    B_2},
diff --git a/keyboards/keychron/q5_pro/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q5_pro/iso_encoder/keymaps/default/keymap.c
index 5e6999aa95..b72f63536a 100755
--- a/keyboards/keychron/q5_pro/iso_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q5_pro/iso_encoder/keymaps/default/keymap.c
@@ -16,7 +16,6 @@
 
 #include QMK_KEYBOARD_H
 
-// clang-format off
 enum layers{
   MAC_BASE,
   MAC_FN,
@@ -24,6 +23,7 @@ enum layers{
   WIN_FN,
 };
 
+// clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_103_iso(
         KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,            KC_DEL,   KC_F13,   KC_F14,   KC_F15,     KC_MUTE,
diff --git a/keyboards/keychron/q5_pro/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q5_pro/iso_encoder/keymaps/via/keymap.c
index 895d4d1e85..88e16e042b 100755
--- a/keyboards/keychron/q5_pro/iso_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q5_pro/iso_encoder/keymaps/via/keymap.c
@@ -16,7 +16,6 @@
 
 #include QMK_KEYBOARD_H
 
-// clang-format off
 enum layers{
   MAC_BASE,
   MAC_FN,
@@ -24,6 +23,7 @@ enum layers{
   WIN_FN,
 };
 
+// clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_103_iso(
         KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,            KC_DEL,   KC_F13,   KC_F14,   KC_F15,     KC_MUTE,
diff --git a/keyboards/keychron/q5_pro/mcuconf.h b/keyboards/keychron/q5_pro/mcuconf.h
index 692e2f064d..882d6bd568 100755
--- a/keyboards/keychron/q5_pro/mcuconf.h
+++ b/keyboards/keychron/q5_pro/mcuconf.h
@@ -30,7 +30,6 @@
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
 
-
 #ifdef KC_BLUETOOTH_ENABLE
 #    undef STM32_SERIAL_USE_USART2
 #    define STM32_SERIAL_USE_USART2 TRUE
diff --git a/keyboards/keychron/q5_pro/q5_pro.c b/keyboards/keychron/q5_pro/q5_pro.c
index 9c20de3058..28c94399d1 100755
--- a/keyboards/keychron/q5_pro/q5_pro.c
+++ b/keyboards/keychron/q5_pro/q5_pro.c
@@ -145,7 +145,6 @@ void keyboard_post_init_kb(void) {
 
 #ifdef KC_BLUETOOTH_ENABLE
     /* Currently we don't use this reset pin */
-    // palSetLineMode(CKBT51_RESET_PIN, PAL_MODE_UNCONNECTED);
     palSetLineMode(CKBT51_RESET_PIN, PAL_MODE_OUTPUT_PUSHPULL);
     palWriteLine(CKBT51_RESET_PIN, PAL_HIGH);
 
@@ -198,7 +197,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/q5_pro/q5_pro.h b/keyboards/keychron/q5_pro/q5_pro.h
index 9cc6693d4d..cd0954d579 100755
--- a/keyboards/keychron/q5_pro/q5_pro.h
+++ b/keyboards/keychron/q5_pro/q5_pro.h
@@ -51,5 +51,5 @@ enum {
     BT_HST3 = KC_TRNS,
     BAT_LVL = KC_TRNS,
 #endif
-    NEW_SAFE_RANGE
+	NEW_SAFE_RANGE
 };
diff --git a/keyboards/keychron/q5_pro/rules.mk b/keyboards/keychron/q5_pro/rules.mk
index 98cf5c564b..6df2ef9e32 100755
--- a/keyboards/keychron/q5_pro/rules.mk
+++ b/keyboards/keychron/q5_pro/rules.mk
@@ -1,5 +1,3 @@
-# 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