Merge remote-tracking branch 'upstream/develop'

4 files changed, 12 insertions, 9 deletions

diff --git a/keyboards/xbows/numpad/config.h b/keyboards/xbows/numpad/config.h
index 7eb56caea7..8adae138df 100644
--- a/keyboards/xbows/numpad/config.h
+++ b/keyboards/xbows/numpad/config.h
@@ -27,7 +27,6 @@
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 18
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16
-#    define RGB_DISABLE_AFTER_TIMEOUT 0          // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED       // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
@@ -37,7 +36,7 @@
 // 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_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
 #    define ENABLE_RGB_MATRIX_BREATHING           // Single hue brightness cycling animation
 #    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL     // Single hue spinning spiral fades brightness
 #    define ENABLE_RGB_MATRIX_CYCLE_ALL           // Full keyboard solid hue cycling through full gradient
@@ -59,5 +58,5 @@
 
 #    define DRIVER_ADDR_1 0b1110111
 #    define DRIVER_COUNT 1
-#    define DRIVER_LED_TOTAL 22
+#    define RGB_MATRIX_LED_COUNT 22
 #endif
diff --git a/keyboards/xbows/numpad/keymaps/default/keymap.c b/keyboards/xbows/numpad/keymaps/default/keymap.c
index 9d657a33cc..177478ef9f 100644
--- a/keyboards/xbows/numpad/keymaps/default/keymap.c
+++ b/keyboards/xbows/numpad/keymaps/default/keymap.c
@@ -34,13 +34,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [0] = LAYOUT(
     KC_ESC ,  KC_TAB,   KC_BSPC,  MO(1),
-    KC_NLCK,  KC_PSLS,  KC_PAST,  KC_EQL,
+    KC_NUM,   KC_PSLS,  KC_PAST,  KC_EQL,
     KC_P7,    KC_P8,    KC_P9,    KC_PMNS,
     KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
     KC_P1,    KC_P2,    KC_P3,    KC_PENT,
          KC_P0,       KC_PDOT),
   [1] = LAYOUT(
-    QK_BOOT,     EEP_RST,   KC_TRNS,   KC_TRNS,
+    QK_BOOT,   EE_CLR,    KC_TRNS,   KC_TRNS,
     KC_CALC,   KC_MYCM,   KC_MSEL,   KC_MAIL,
     RGB_MOD,   RGB_VAI,   RGB_HUI,   KC_VOLD,
     RGB_SPD,   RGB_TOG,   RGB_SPI,   KC_VOLU,
diff --git a/keyboards/xbows/numpad/keymaps/via/keymap.c b/keyboards/xbows/numpad/keymaps/via/keymap.c
index 36b91961c8..3fa5b77674 100644
--- a/keyboards/xbows/numpad/keymaps/via/keymap.c
+++ b/keyboards/xbows/numpad/keymaps/via/keymap.c
@@ -34,13 +34,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [0] = LAYOUT(
     KC_ESC ,  KC_TAB,   KC_BSPC,  MO(1),
-    KC_NLCK,  KC_PSLS,  KC_PAST,  KC_EQL,
+    KC_NUM,   KC_PSLS,  KC_PAST,  KC_EQL,
     KC_P7,    KC_P8,    KC_P9,    KC_PMNS,
     KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
     KC_P1,    KC_P2,    KC_P3,    KC_PENT,
          KC_P0,       KC_PDOT),
   [1] = LAYOUT(
-    QK_BOOT,     EEP_RST,   KC_TRNS,   KC_TRNS,
+    QK_BOOT,   EE_CLR,    KC_TRNS,   KC_TRNS,
     KC_CALC,   KC_MYCM,   KC_MSEL,   KC_MAIL,
     RGB_MOD,   RGB_VAI,   RGB_HUI,   KC_VOLD,
     RGB_SPD,   RGB_TOG,   RGB_SPI,   KC_VOLU,
diff --git a/keyboards/xbows/numpad/numpad.c b/keyboards/xbows/numpad/numpad.c
index bbc2a1e98a..4d6c256981 100644
--- a/keyboards/xbows/numpad/numpad.c
+++ b/keyboards/xbows/numpad/numpad.c
@@ -15,7 +15,7 @@
  */
  #include "numpad.h"
  #ifdef RGB_MATRIX_ENABLE
- const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
   {0, C3_3,  C2_3, C1_3},   // L01
   {0, C3_4,  C2_4, C1_4},   // L02
@@ -71,10 +71,14 @@
  } };
 
 
- __attribute__ ((weak)) void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().num_lock) {
         rgb_matrix_set_color(4, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 
 #endif