4 files changed, 5 insertions, 17 deletions
diff --git a/keyboards/gmmk/numpad/info.json b/keyboards/gmmk/numpad/info.json
index d5ea534b67..4df94d45ee 100644
--- a/keyboards/gmmk/numpad/info.json
+++ b/keyboards/gmmk/numpad/info.json
@@ -13,6 +13,9 @@
             {"pin_a": "A2", "pin_b": "A1"}
         ]
     },
+    "rgb_matrix": {
+        "driver": "AW20216"
+    },
     "processor": "WB32F3G71",
     "bootloader": "wb32-dfu",
     "diode_direction": "ROW2COL",
@@ -27,7 +30,7 @@
                 {"label": "/", "matrix": [0, 1], "x": 1, "y": 0},
                 {"label": "*", "matrix": [0, 2], "x": 2, "y": 0},
                 {"label": "-", "matrix": [0, 3], "x": 3, "y": 0},
-                
+
                 {"label": "7", "matrix": [1, 0], "x": 0, "y": 1},
                 {"label": "8", "matrix": [1, 1], "x": 1, "y": 1},
                 {"label": "9", "matrix": [1, 2], "x": 2, "y": 1},
diff --git a/keyboards/gmmk/numpad/keymaps/via/keymap.c b/keyboards/gmmk/numpad/keymaps/via/keymap.c
index aa7730acdd..12f124894d 100644
--- a/keyboards/gmmk/numpad/keymaps/via/keymap.c
+++ b/keyboards/gmmk/numpad/keymaps/via/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 // clang-format on
 
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/gmmk/numpad/numpad.c b/keyboards/gmmk/numpad/numpad.c
index ed4fed2667..f1a46170fd 100644
--- a/keyboards/gmmk/numpad/numpad.c
+++ b/keyboards/gmmk/numpad/numpad.c
@@ -120,17 +120,3 @@ void keyboard_pre_init_user(void) {
 #    endif
 
 #endif
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        return false;
-    }
-    if (clockwise) {
-        tap_code_delay(KC_VOLU, 10);
-    } else {
-        tap_code_delay(KC_VOLD, 10);
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/gmmk/numpad/rules.mk b/keyboards/gmmk/numpad/rules.mk
index 4d23ffbfaf..5a0d3e34f8 100644
--- a/keyboards/gmmk/numpad/rules.mk
+++ b/keyboards/gmmk/numpad/rules.mk
@@ -15,7 +15,6 @@ KEYBOARD_SHARED_EP = yes
 MIDI_ENABLE = yes
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = AW20216
 
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = spi_flash