Merge upstream master

10 files changed, 116 insertions, 118 deletions

diff --git a/keyboards/keychron/k8_pro/ansi/rgb/config.h b/keyboards/keychron/k8_pro/ansi/rgb/config.h
index f8e36e4649..3821e4ba9f 100644
--- a/keyboards/keychron/k8_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/k8_pro/ansi/rgb/config.h
@@ -22,10 +22,10 @@
 #    define DRIVER_ADDR_2 0b1110100
 #    define DRIVER_1_LED_TOTAL 47
 #    define DRIVER_2_LED_TOTAL 40
-#    define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 /* Set to infinit, which is use in USB mode by default */
-#define RGB_DISABLE_TIMEOUT RGB_DISABLE_TIME_INFINITE
+#define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
 /* Allow shutdown of led driver to save power */
 #    define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE
 /* Turn off backlight on low brightness to save power */
diff --git a/keyboards/keychron/k8_pro/ansi/rgb/info.json b/keyboards/keychron/k8_pro/ansi/rgb/info.json
index c01c3c1b1e..303ec1bf57 100644
--- a/keyboards/keychron/k8_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/k8_pro/ansi/rgb/info.json
@@ -1,5 +1,6 @@
 {
     "keyboard_name": "Keychron K8 Pro",
+    "manufacturer": "Keychron",
     "url": "https://github.com/Keychron",
     "maintainer": "lokher",
     "usb": {
@@ -10,98 +11,98 @@
     "layouts": {
         "LAYOUT_ansi_87": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F5", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print", "x":15.25, "y":0},
-                {"label":"Cortana", "x":16.25, "y":0},
-                {"label":"Light", "x":17.25, "y":0},
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":2, "y":0},
+                {"matrix":[0, 2], "x":3, "y":0},
+                {"matrix":[0, 3], "x":4, "y":0},
+                {"matrix":[0, 4], "x":5, "y":0},
+                {"matrix":[0, 5], "x":6.5, "y":0},
+                {"matrix":[0, 6], "x":7.5, "y":0},
+                {"matrix":[0, 7], "x":8.5, "y":0},
+                {"matrix":[0, 8], "x":9.5, "y":0},
+                {"matrix":[0, 9], "x":11, "y":0},
+                {"matrix":[0,10], "x":12, "y":0},
+                {"matrix":[0,11], "x":13, "y":0},
+                {"matrix":[0,12], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+                {"matrix":[0,15], "x":16.25, "y":0},
+                {"matrix":[0,16], "x":17.25, "y":0},
 
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"matrix":[1, 3], "x":3, "y":1.25},
+                {"matrix":[1, 4], "x":4, "y":1.25},
+                {"matrix":[1, 5], "x":5, "y":1.25},
+                {"matrix":[1, 6], "x":6, "y":1.25},
+                {"matrix":[1, 7], "x":7, "y":1.25},
+                {"matrix":[1, 8], "x":8, "y":1.25},
+                {"matrix":[1, 9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+                {"matrix":[1,15], "x":16.25, "y":1.25},
+                {"matrix":[1,16], "x":17.25, "y":1.25},
 
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"matrix":[2, 3], "x":3.5, "y":2.25},
+                {"matrix":[2, 4], "x":4.5, "y":2.25},
+                {"matrix":[2, 5], "x":5.5, "y":2.25},
+                {"matrix":[2, 6], "x":6.5, "y":2.25},
+                {"matrix":[2, 7], "x":7.5, "y":2.25},
+                {"matrix":[2, 8], "x":8.5, "y":2.25},
+                {"matrix":[2, 9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+                {"matrix":[2,15], "x":16.25, "y":2.25},
+                {"matrix":[2,16], "x":17.25, "y":2.25},
 
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3.25},
+                {"matrix":[3, 2], "x":2.75, "y":3.25},
+                {"matrix":[3, 3], "x":3.75, "y":3.25},
+                {"matrix":[3, 4], "x":4.75, "y":3.25},
+                {"matrix":[3, 5], "x":5.75, "y":3.25},
+                {"matrix":[3, 6], "x":6.75, "y":3.25},
+                {"matrix":[3, 7], "x":7.75, "y":3.25},
+                {"matrix":[3, 8], "x":8.75, "y":3.25},
+                {"matrix":[3, 9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
 
-                {"label":"Left Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Right Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"Up", "x":16.25, "y":4.25},
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
+                {"matrix":[4,15], "x":16.25, "y":4.25},
 
-                {"label":"Left Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Left Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Left Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Right Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Right Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Right Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"Left", "x":15.25, "y":5.25},
-                {"label":"Down", "x":16.25, "y":5.25},
-                {"label":"Right", "x":17.25, "y":5.25}
+                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
+                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
+                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
+                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":15.25, "y":5.25},
+                {"matrix":[5,15], "x":16.25, "y":5.25},
+                {"matrix":[5,16], "x":17.25, "y":5.25}
             ]
         }
     }
diff --git a/keyboards/keychron/k8_pro/ansi/rgb/rgb.c b/keyboards/keychron/k8_pro/ansi/rgb/rgb.c
index a89d1e7f95..52265fd639 100644
--- a/keyboards/keychron/k8_pro/ansi/rgb/rgb.c
+++ b/keyboards/keychron/k8_pro/ansi/rgb/rgb.c
@@ -13,12 +13,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- 
+
 #include "quantum.h"
 
 // clang-format off
 #ifdef RGB_MATRIX_ENABLE
-const ckled2001_led g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -41,7 +41,7 @@ const ckled2001_led g_ckled2001_leds[DRIVER_LED_TOTAL] = {
     {0, H_15,   I_15,   G_15},
     {0, I_16,   G_16,   H_16},
     {1, A_2,    B_2,    C_2,},
-    
+
     {0, C_1,    A_1,    B_1},
     {0, A_2,    B_2,    C_2},
     {0, B_3,    C_3,    A_3},
@@ -140,9 +140,9 @@ led_config_t g_led_config = {
         4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,          4,    4,    4,
         4,    8,    8,    8,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
         4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,          4,         
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,          4,
         4,          4,    4,    4,    4,    4,    4,    4,    4,    4,    4,          4,          4,
         4,    4,    4,                      4,                      4,    4,    4,    4,    4,    4,    4
 	}
 };
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/keychron/k8_pro/ansi/white/config.h b/keyboards/keychron/k8_pro/ansi/white/config.h
index a7848f29f9..b139c3a878 100644
--- a/keyboards/keychron/k8_pro/ansi/white/config.h
+++ b/keyboards/keychron/k8_pro/ansi/white/config.h
@@ -21,7 +21,7 @@
 #    define DRIVER_LED_TOTAL 87
 
 /* Set to infinit, which is use in USB mode by default */
-#    define LED_DISABLE_TIMEOUT LED_DISABLE_TIME_INFINITE
+#    define LED_MATRIX_TIMEOUT LED_DISABLE_TIME_INFINITE
 /* Allow shutdown of led driver to save power */
 #    define LED_MATRIX_DRIVER_SHUTDOWN_ENABLE
 /* Turn off backlight on low brightness to save power */
diff --git a/keyboards/keychron/k8_pro/config.h b/keyboards/keychron/k8_pro/config.h
index dbfe1d1bb4..129f359164 100644
--- a/keyboards/keychron/k8_pro/config.h
+++ b/keyboards/keychron/k8_pro/config.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define MANUFACTURER Keychron
-#define PRODUCT Keychron K8 Pro
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17
@@ -47,7 +43,7 @@
 #define LED_CAPS_LOCK_PIN A7
 #define LED_PIN_ON_STATE 1
 
-#ifdef BLUETOOTH_ENABLE
+#ifdef KC_BLUETOOTH_ENABLE
 /* Hardware configuration */
 #    define USB_BT_MODE_SELECT_PIN A10
 
diff --git a/keyboards/keychron/k8_pro/halconf.h b/keyboards/keychron/k8_pro/halconf.h
index 5c817659f8..577334a345 100644
--- a/keyboards/keychron/k8_pro/halconf.h
+++ b/keyboards/keychron/k8_pro/halconf.h
@@ -18,7 +18,7 @@
 
 #define HAL_USE_I2C TRUE
 
-#ifdef BLUETOOTH_ENABLE
+#ifdef KC_BLUETOOTH_ENABLE
 #    define PAL_USE_CALLBACKS TRUE
 #    define HAL_USE_SERIAL TRUE
 #endif
diff --git a/keyboards/keychron/k8_pro/k8_pro.c b/keyboards/keychron/k8_pro/k8_pro.c
index 19852b0c06..05df78e167 100644
--- a/keyboards/keychron/k8_pro/k8_pro.c
+++ b/keyboards/keychron/k8_pro/k8_pro.c
@@ -15,7 +15,7 @@
  */
 
 #include "k8_pro.h"
-#ifdef BLUETOOTH_ENABLE
+#ifdef KC_BLUETOOTH_ENABLE
 #    include "ckbt51.h"
 #    include "bluetooth.h"
 #    include "indicator.h"
@@ -47,7 +47,7 @@ key_combination_t key_comb_list[4] = {
     {2, {KC_LWIN, KC_C}}           // Cortana (win)
 };
 
-#ifdef BLUETOOTH_ENABLE
+#ifdef KC_BLUETOOTH_ENABLE
 bool firstDisconnect = true;
 bool                   bt_factory_reset = false;
 static virtual_timer_t pairing_key_timer;
@@ -67,7 +67,7 @@ bool dip_switch_update_kb(uint8_t index, bool active) {
     return true;
 }
 
-#ifdef BLUETOOTH_ENABLE
+#ifdef KC_BLUETOOTH_ENABLE
 bool process_record_kb_bt(uint16_t keycode, keyrecord_t *record) {
 #else
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
@@ -112,7 +112,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
                 siri_timer_buffer = sync_timer_read32() | 1;
             }
             return false; // Skip all further processing of this key
-#ifdef BLUETOOTH_ENABLE
+#ifdef KC_BLUETOOTH_ENABLE
         case BT_HST1 ... BT_HST3:
             if (get_transport() == TRANSPORT_BLUETOOTH) {
                 if (record->event.pressed) {
@@ -143,7 +143,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 void keyboard_post_init_kb(void) {
     dip_switch_read(true);
 
-#ifdef BLUETOOTH_ENABLE
+#ifdef KC_BLUETOOTH_ENABLE
     /* Currently we don't use this reset pin */
     palSetLineMode(CKBT51_RESET_PIN, PAL_MODE_UNCONNECTED);
 
@@ -159,7 +159,7 @@ void keyboard_post_init_kb(void) {
     power_on_indicator_timer_buffer = sync_timer_read32() | 1;
     writePin(BAT_LOW_LED_PIN, BAT_LOW_LED_PIN_ON_STATE);
     writePin(LED_CAPS_LOCK_PIN, LED_PIN_ON_STATE);
-#ifdef BLUETOOTH_ENABLE
+#ifdef KC_BLUETOOTH_ENABLE
     writePin(H3, HOST_LED_PIN_ON_STATE);
 #    endif
 
@@ -193,7 +193,7 @@ void matrix_scan_kb(void) {
     matrix_scan_user();
 }
 
-#ifdef BLUETOOTH_ENABLE
+#ifdef KC_BLUETOOTH_ENABLE
 static void ckbt51_param_init(void) {
     /* Set bluetooth device name */
     ckbt51_set_local_name(STR(PRODUCT));
@@ -262,7 +262,7 @@ void battery_calculte_voltage(uint16_t value) {
             for (uint8_t j = 0; j < 192; j++)
                 totalBuf += g_pwm_buffer[i][j];
         /* We assumpt it is linear relationship*/
-        voltage += (30 * totalBuf / DRIVER_LED_TOTAL / 255);
+        voltage += (30 * totalBuf / LED_MATRIX_LED_COUNT / 255);
     }
 #endif
 #ifdef RGB_MATRIX_ENABLE
@@ -273,16 +273,16 @@ void battery_calculte_voltage(uint16_t value) {
             for (uint8_t j = 0; j < 192; j++)
                 totalBuf += g_pwm_buffer[i][j];
         /* We assumpt it is linear relationship*/
-        uint32_t compensation = 60 * totalBuf / DRIVER_LED_TOTAL / 255 / 3;
+        uint32_t compensation = 60 * totalBuf / RGB_MATRIX_LED_COUNT / 255 / 3;
         voltage += compensation;
     }
 #endif
     battery_set_voltage(voltage);
 }
 
-void raw_hid_receive_kb(uint8_t *data, uint8_t length) {
+void via_command_kb(uint8_t *data, uint8_t length) {
     switch (data[0]) {
-#ifdef BLUETOOTH_ENABLE
+#ifdef KC_BLUETOOTH_ENABLE
         case 0xAA:
             ckbt51_dfu_rx(data, length);
             break;
diff --git a/keyboards/keychron/k8_pro/k8_pro.h b/keyboards/keychron/k8_pro/k8_pro.h
index 371b49110f..868fcdb2a3 100644
--- a/keyboards/keychron/k8_pro/k8_pro.h
+++ b/keyboards/keychron/k8_pro/k8_pro.h
@@ -42,7 +42,7 @@ enum {
     KC_SNAP,
     KC_CTANA,
     KC_SIRI,
-#ifdef BLUETOOTH_ENABLE
+#ifdef KC_BLUETOOTH_ENABLE
     BT_HST1,
     BT_HST2,
     BT_HST3,
diff --git a/keyboards/keychron/k8_pro/mcuconf.h b/keyboards/keychron/k8_pro/mcuconf.h
index 7cb0bde3c5..72d4f6795f 100644
--- a/keyboards/keychron/k8_pro/mcuconf.h
+++ b/keyboards/keychron/k8_pro/mcuconf.h
@@ -19,8 +19,8 @@
 
 #include_next <mcuconf.h>
 
-/* Set HCLK to 48 MHz as tradeoff of USB lowest clockand and 
- * lower power comsumption for bluetooth. Will use dynamic 
+/* Set HCLK to 48 MHz as tradeoff of USB lowest clockand and
+ * lower power comsumption for bluetooth. Will use dynamic
  * clock when STM32L4 is supported in ChibiOS */
 #undef STM32_PLLM_VALUE
 #define STM32_PLLM_VALUE 2
@@ -31,7 +31,7 @@
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
 
-#ifdef BLUETOOTH_ENABLE
+#ifdef KC_BLUETOOTH_ENABLE
 #    undef STM32_SERIAL_USE_USART2
 #    define STM32_SERIAL_USE_USART2 TRUE
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/keychron/k8_pro/rules.mk b/keyboards/keychron/k8_pro/rules.mk
index 366bd8cc12..7244d12fd2 100644
--- a/keyboards/keychron/k8_pro/rules.mk
+++ b/keyboards/keychron/k8_pro/rules.mk
@@ -18,7 +18,7 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes           # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = yes       # Enable Bluetooth with
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with
 BLUETOOTH_DRIVER = custom
 AUDIO_ENABLE = no           # Audio output on port C6
 DIP_SWITCH_ENABLE = yes
@@ -27,6 +27,7 @@ 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