From ac810bf18a2daf35b9246e408cbdee145a2fb0d8 Mon Sep 17 00:00:00 2001
From: Codetector <codetector@codetector.cn>
Date: Mon, 13 Jul 2020 18:43:05 -0400
Subject: [PATCH] keyboard/annepro2: Bluetooth path

---
 keyboards/annepro2/annepro2.c               | 20 ++++----------------
 keyboards/annepro2/annepro2.h               | 12 ++++--------
 keyboards/annepro2/annepro2_ble.c           |  4 ++--
 keyboards/annepro2/keymaps/default/keymap.c |  4 ++--
 4 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/keyboards/annepro2/annepro2.c b/keyboards/annepro2/annepro2.c
index 2ec26834cf1c..fe3819ae9dda 100644
--- a/keyboards/annepro2/annepro2.c
+++ b/keyboards/annepro2/annepro2.c
@@ -79,30 +79,18 @@ bool OVERRIDE led_update_kb(led_t status) {
 bool OVERRIDE process_record_kb(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
         switch (keycode) {
-            case KC_AP2_BT_SCAN1:
+            case KC_AP2_BT1:
                 annepro2_ble_broadcast(0);
                 return false;
-            case KC_AP2_BT_SCAN2:
+            case KC_AP2_BT2:
                 annepro2_ble_broadcast(1);
                 return false;
-            case KC_AP2_BT_SCAN3:
+            case KC_AP2_BT3:
                 annepro2_ble_broadcast(2);
                 return false;
-            case KC_AP2_BT_SCAN4:
+            case KC_AP2_BT4:
                 annepro2_ble_broadcast(3);
                 return false;
-            case KC_AP2_BT_CONN1:
-                annepro2_ble_connect(0);
-                return false;
-            case KC_AP2_BT_CONN2:
-                annepro2_ble_connect(1);
-                return false;
-            case KC_AP2_BT_CONN3:
-                annepro2_ble_connect(2);
-                return false;
-            case KC_AP2_BT_CONN4:
-                annepro2_ble_connect(3);
-                return false;
             case KC_AP2_USB:
                 annepro2_ble_disconnect();
                 return false;
diff --git a/keyboards/annepro2/annepro2.h b/keyboards/annepro2/annepro2.h
index 4f6e3821f387..3e562d93af26 100644
--- a/keyboards/annepro2/annepro2.h
+++ b/keyboards/annepro2/annepro2.h
@@ -24,14 +24,10 @@
 extern uint16_t annepro2LedMatrix[MATRIX_ROWS * MATRIX_COLS];
 
 enum AP2KeyCodes {
-    KC_AP2_BT_SCAN1 = SAFE_RANGE,
-    KC_AP2_BT_SCAN2,
-    KC_AP2_BT_SCAN3,
-    KC_AP2_BT_SCAN4,
-    KC_AP2_BT_CONN1,
-    KC_AP2_BT_CONN2,
-    KC_AP2_BT_CONN3,
-    KC_AP2_BT_CONN4,
+    KC_AP2_BT1 = SAFE_RANGE,
+    KC_AP2_BT2,
+    KC_AP2_BT3,
+    KC_AP2_BT4,
     KC_AP2_BT_UNPAIR,
     KC_AP2_USB,
     AP2_SAFE_RANGE,
diff --git a/keyboards/annepro2/annepro2_ble.c b/keyboards/annepro2/annepro2_ble.c
index 57d38efc2f49..fbd435370cab 100644
--- a/keyboards/annepro2/annepro2_ble.c
+++ b/keyboards/annepro2/annepro2_ble.c
@@ -72,13 +72,13 @@ void annepro2_ble_broadcast(uint8_t port) {
     sdPut(&SD1, 0x00);
     sdWrite(&SD1, bleMcuStartBroadcast, 10);
     sdPut(&SD1, port);
+    annepro2_ble_connect(port);
 }
 
 void annepro2_ble_connect(uint8_t port) {
     if (port > 3) {
         port = 3;
     }
-    sdPut(&SD1, 0x00);
     sdWrite(&SD1, bleMcuConnect, 10);
     sdPut(&SD1, port);
     ap2_ble_swtich_ble_driver();
@@ -111,8 +111,8 @@ static void ap2_ble_swtich_ble_driver(void) {
     lastHostDriver = host_get_driver();
 #ifdef NKRO_ENABLE
     lastNkroStatus = keymap_config.nkro;
-    keymap_config.nkro = false;
 #endif
+    keymap_config.nkro = false;
     host_set_driver(&ap2_ble_driver);
 }
 
diff --git a/keyboards/annepro2/keymaps/default/keymap.c b/keyboards/annepro2/keymaps/default/keymap.c
index 1592bc23797b..6a07a94584df 100644
--- a/keyboards/annepro2/keymaps/default/keymap.c
+++ b/keyboards/annepro2/keymaps/default/keymap.c
@@ -69,7 +69,7 @@ enum custom_keys {
   /*
   * Layer _FN2_LAYER
   * ,-----------------------------------------------------------------------------------------.
-  * |  ~  |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |LEDOF|LEDON| F10 | F11 | F12 |    Bksp   |
+  * |  ~  | BT1 | BT2 | BT3 | BT4 |  F5 |  F6 |  F7 |LEDOF|LEDON| F10 | F11 | F12 |    Bksp   |
   * |-----------------------------------------------------------------------------------------+
   * | Tab    |  q  | UP  |  e  |  r  |  t  |  y  |  u  |  i  |  o  | PS | HOME | END |   \    |
   * |-----------------------------------------------------------------------------------------+
@@ -82,7 +82,7 @@ enum custom_keys {
   *
   */
  [_FN2_LAYER] = KEYMAP( /* Base */
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AP_LED_OFF, KC_AP_LED_ON, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, KC_TRNS, KC_TRNS, KC_TRNS, KC_AP_LED_OFF, KC_AP_LED_ON, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     MO(_FN2_LAYER), KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_HOME, KC_END, KC_TRNS,
     KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_DEL, KC_TRNS,