Merge remote-tracking branch 'origin/master' into develop

4 files changed, 2 insertions, 7 deletions

diff --git a/keyboards/annepro2/annepro2.c b/keyboards/annepro2/annepro2.c
index e1292b3517..170eb8c175 100644
--- a/keyboards/annepro2/annepro2.c
+++ b/keyboards/annepro2/annepro2.c
@@ -101,11 +101,9 @@ void keyboard_post_init_kb(void) {
     // loop to clear out receive buffer from ble wakeup
     while (!sdGetWouldBlock(&SD1)) sdGet(&SD1);
 
-    ap2_led_get_status();
-
     #ifdef RGB_MATRIX_ENABLE
-    ap2_led_enable();
     ap2_led_set_manual_control(1);
+    ap2_led_enable();
     #endif
 
     keyboard_post_init_user();
diff --git a/keyboards/annepro2/ap2_led.c b/keyboards/annepro2/ap2_led.c
index c1d7c8166e..70585a511f 100644
--- a/keyboards/annepro2/ap2_led.c
+++ b/keyboards/annepro2/ap2_led.c
@@ -60,8 +60,6 @@ void ap2_led_enable(void) { proto_tx(CMD_LED_ON, NULL, 0, 3); }
 
 void ap2_led_set_profile(uint8_t prof) { proto_tx(CMD_LED_SET_PROFILE, &prof, sizeof(prof), 3); }
 
-void ap2_led_get_status(void) { proto_tx(CMD_LED_GET_STATUS, NULL, 0, 3); }
-
 void ap2_led_next_profile(void) { proto_tx(CMD_LED_NEXT_PROFILE, NULL, 0, 3); }
 
 void ap2_led_next_intensity(void) { proto_tx(CMD_LED_NEXT_INTENSITY, NULL, 0, 3); }
diff --git a/keyboards/annepro2/ap2_led.h b/keyboards/annepro2/ap2_led.h
index ff2a05aff5..494ada54ec 100644
--- a/keyboards/annepro2/ap2_led.h
+++ b/keyboards/annepro2/ap2_led.h
@@ -49,7 +49,6 @@ void ap2_set_IAP(void);
 void ap2_led_disable(void);
 void ap2_led_enable(void);
 void ap2_led_set_profile(uint8_t prof);
-void ap2_led_get_status(void);
 void ap2_led_next_profile(void);
 void ap2_led_prev_profile(void);
 void ap2_led_next_intensity(void);
diff --git a/keyboards/annepro2/protocol.h b/keyboards/annepro2/protocol.h
index d38fd0a66e..0211ccefc4 100644
--- a/keyboards/annepro2/protocol.h
+++ b/keyboards/annepro2/protocol.h
@@ -36,7 +36,7 @@ enum {
     CMD_LED_MASK_SET_MONO = 0x12,
 
     /* Reactive / status */
-    CMD_LED_GET_STATUS = 0x20,
+    CMD_LED_GET_STATUS = 0x20, /* unused */
     CMD_LED_KEY_BLINK  = 0x21,
     CMD_LED_KEY_DOWN   = 0x22,
     CMD_LED_KEY_UP     = 0x23, /* TODO */