5 files changed, 18 insertions, 24 deletions
diff --git a/keyboards/gkeyboard/gpad8_2r/config.h b/keyboards/gkeyboard/gpad8_2r/config.h
index e3a0340f19..0691d106b7 100644
--- a/keyboards/gkeyboard/gpad8_2r/config.h
+++ b/keyboards/gkeyboard/gpad8_2r/config.h
@@ -5,7 +5,6 @@
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
 
-#define RGB_DI_PIN GP19
 #define RGB_MATRIX_LED_COUNT 16
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/gkeyboard/gpad8_2r/info.json b/keyboards/gkeyboard/gpad8_2r/info.json
index fcc900a35f..1f14083218 100644
--- a/keyboards/gkeyboard/gpad8_2r/info.json
+++ b/keyboards/gkeyboard/gpad8_2r/info.json
@@ -28,16 +28,8 @@
     "encoder": {
         "enabled": true,
         "rotary": [
-            {
-                "pin_a": "GP29",
-                "pin_b": "GP28",
-                "resolution": 4
-            },
-            {
-                "pin_a": "GP2",
-                "pin_b": "GP3",
-                "resolution": 4
-            }
+            {"pin_a": "GP29", "pin_b": "GP28", "resolution": 4},
+            {"pin_a": "GP2", "pin_b": "GP3", "resolution": 4}
         ]
     },
     "rgb_matrix": {
@@ -61,19 +53,23 @@
             { "flags": 2, "x": 196, "y": 60 }
         ]
     },
+    "ws2812": {
+        "pin": "GP19",
+        "driver": "vendor"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "matrix": [2, 0], "x": 0.0, "y": 2.25 },
-                { "matrix": [2, 1], "x": 1.0, "y": 2.25 },
-                { "matrix": [2, 2], "x": 2.0, "y": 2.25 },
-                { "matrix": [2, 3], "x": 3.0, "y": 2.25 }
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "matrix": [2, 0], "x": 0, "y": 2.25 },
+                { "matrix": [2, 1], "x": 1, "y": 2.25 },
+                { "matrix": [2, 2], "x": 2, "y": 2.25 },
+                { "matrix": [2, 3], "x": 3, "y": 2.25 }
             ]
         }
     }
diff --git a/keyboards/gkeyboard/gpad8_2r/keymaps/default/keymap.c b/keyboards/gkeyboard/gpad8_2r/keymaps/default/keymap.c
index 41b505336d..536a1ee7d8 100644
--- a/keyboards/gkeyboard/gpad8_2r/keymaps/default/keymap.c
+++ b/keyboards/gkeyboard/gpad8_2r/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-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),      ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) },
     [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS),      ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
     [2] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS),      ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
diff --git a/keyboards/gkeyboard/gpad8_2r/keymaps/via/keymap.c b/keyboards/gkeyboard/gpad8_2r/keymaps/via/keymap.c
index 589a1b1539..ec81153d2b 100644
--- a/keyboards/gkeyboard/gpad8_2r/keymaps/via/keymap.c
+++ b/keyboards/gkeyboard/gpad8_2r/keymaps/via/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-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),      ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) },
     [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS),      ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
     [2] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS),      ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
diff --git a/keyboards/gkeyboard/gpad8_2r/rules.mk b/keyboards/gkeyboard/gpad8_2r/rules.mk
index 997fce7e65..e69de29bb2 100644
--- a/keyboards/gkeyboard/gpad8_2r/rules.mk
+++ b/keyboards/gkeyboard/gpad8_2r/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor