3 files changed, 13 insertions, 14 deletions
diff --git a/keyboards/annepro2/annepro2_ble.c b/keyboards/annepro2/annepro2_ble.c
index 0336d6a76c..c75de6720c 100644
--- a/keyboards/annepro2/annepro2_ble.c
+++ b/keyboards/annepro2/annepro2_ble.c
@@ -24,15 +24,14 @@
 /* -------------------- Static Function Prototypes -------------------------- */
 static uint8_t ap2_ble_leds(void);
 static void    ap2_ble_mouse(report_mouse_t *report);
-static void    ap2_ble_system(uint16_t data);
-static void    ap2_ble_consumer(uint16_t data);
+static void    ap2_ble_extra(uint8_t report_id, uint16_t data);
 static void    ap2_ble_keyboard(report_keyboard_t *report);
 
 static void ap2_ble_swtich_ble_driver(void);
 
 /* -------------------- Static Local Variables ------------------------------ */
 static host_driver_t ap2_ble_driver = {
-    ap2_ble_leds, ap2_ble_keyboard, ap2_ble_mouse, ap2_ble_system, ap2_ble_consumer,
+    ap2_ble_leds, ap2_ble_keyboard, ap2_ble_mouse, ap2_ble_extra
 };
 
 static uint8_t ble_mcu_wakeup[11] = {0x7b, 0x12, 0x53, 0x00, 0x03, 0x00, 0x01, 0x7d, 0x02, 0x01, 0x02};
@@ -131,8 +130,6 @@ static uint8_t ap2_ble_leds(void) {
 
 static void ap2_ble_mouse(report_mouse_t *report) {}
 
-static void ap2_ble_system(uint16_t data) {}
-
 static inline uint16_t CONSUMER2AP2(uint16_t usage) {
     switch (usage) {
         case AUDIO_VOL_DOWN:
@@ -152,12 +149,14 @@ static inline uint16_t CONSUMER2AP2(uint16_t usage) {
     }
 }
 
-static void ap2_ble_consumer(uint16_t data) {
-    sdPut(&SD1, 0x0);
-    sdWrite(&SD1, ble_mcu_send_consumer_report, sizeof(ble_mcu_send_consumer_report));
-    sdPut(&SD1, CONSUMER2AP2(data));
-    static const uint8_t dummy[3] = {0};
-    sdWrite(&SD1, dummy, sizeof(dummy));
+static void ap2_ble_extra(uint8_t report_id, uint16_t data) {
+    if (report_id == REPORT_ID_CONSUMER) {
+        sdPut(&SD1, 0x0);
+        sdWrite(&SD1, ble_mcu_send_consumer_report, sizeof(ble_mcu_send_consumer_report));
+        sdPut(&SD1, CONSUMER2AP2(data));
+        static const uint8_t dummy[3] = {0};
+        sdWrite(&SD1, dummy, sizeof(dummy));
+    }
 }
 
 /*!
diff --git a/keyboards/annepro2/config_led.h b/keyboards/annepro2/config_led.h
index 19a1dd4baa..e6d4dc35fb 100644
--- a/keyboards/annepro2/config_led.h
+++ b/keyboards/annepro2/config_led.h
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-#define DRIVER_LED_TOTAL 61
+#define RGB_MATRIX_LED_COUNT 61
 
 /* Limit animations to 62.5 FPS to avoid tearing. (1/.016 = 62.5 FPS). */
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16
diff --git a/keyboards/annepro2/rgb_driver.c b/keyboards/annepro2/rgb_driver.c
index 1040e89f98..f1d2a3cd13 100644
--- a/keyboards/annepro2/rgb_driver.c
+++ b/keyboards/annepro2/rgb_driver.c
@@ -19,7 +19,7 @@
 #include "rgb_matrix.h"
 #include "ap2_led.h"
 
-uint8_t led_pos[DRIVER_LED_TOTAL];
+uint8_t led_pos[RGB_MATRIX_LED_COUNT];
 
 void init(void) {
     unsigned int i = 0;
@@ -52,7 +52,7 @@ void set_color(int index, uint8_t r, uint8_t g, uint8_t b) {
 }
 
 void set_color_all(uint8_t r, uint8_t g, uint8_t b) {
-    for (int i=0; i<DRIVER_LED_TOTAL; i++)
+    for (int i=0; i<RGB_MATRIX_LED_COUNT; i++)
         set_color(i, r, g, b);
 }