6 files changed, 14 insertions, 19 deletions
diff --git a/keyboards/pica40/keymaps/zzeneg/config.h b/keyboards/pica40/keymaps/zzeneg/config.h
index ec422c4d8e..f29f5ba1a7 100644
--- a/keyboards/pica40/keymaps/zzeneg/config.h
+++ b/keyboards/pica40/keymaps/zzeneg/config.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_FORCE_HOLD
 #define TAPPING_FORCE_HOLD_PER_KEY
 #define TAPPING_TERM 150
diff --git a/keyboards/pica40/keymaps/zzeneg/keymap.c b/keyboards/pica40/keymaps/zzeneg/keymap.c
index 6cff7cfa27..ea73ef0e21 100644
--- a/keyboards/pica40/keymaps/zzeneg/keymap.c
+++ b/keyboards/pica40/keymaps/zzeneg/keymap.c
@@ -128,7 +128,7 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
 }
 
 #ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_QWERTY] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [_GAME] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
     [_NAV] =  { ENCODER_CCW_CW(KC_MPRV, KC_MNXT)  },
diff --git a/keyboards/pica40/rev1/info.json b/keyboards/pica40/rev1/info.json
index 8e4e64618d..fdb4cb09b3 100644
--- a/keyboards/pica40/rev1/info.json
+++ b/keyboards/pica40/rev1/info.json
@@ -19,14 +19,18 @@
     },
     "rgblight": {
         "led_count": 1,
-        "pin": "D3",
         "layers": {
             "enabled": true,
             "max": 3
         }
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "encoder": {
-        "rotary": [{ "pin_a": "C6", "pin_b": "D4" }]
+        "rotary": [
+            {"pin_a": "C6", "pin_b": "D4"}
+        ]
     },
     "usb": {
         "device_version": "1.0.0",
diff --git a/keyboards/pica40/rev1/rev1.c b/keyboards/pica40/rev1/rev1.c
index f008e4857a..f8a03dde3b 100644
--- a/keyboards/pica40/rev1/rev1.c
+++ b/keyboards/pica40/rev1/rev1.c
@@ -77,15 +77,3 @@ bool oled_task_kb(void) {
 }
 
 #endif // OLED_ENABLE
-
-#ifdef ENCODER_ENABLE
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-
-    tap_code(clockwise ? KC_VOLU : KC_VOLD);
-
-    return false;
-}
-
-#endif // ENCODER_ENABLE
diff --git a/keyboards/pica40/rev2/info.json b/keyboards/pica40/rev2/info.json
index dbef8254ef..630d6da467 100644
--- a/keyboards/pica40/rev2/info.json
+++ b/keyboards/pica40/rev2/info.json
@@ -24,13 +24,16 @@
     },
     "rgblight": {
         "led_count": 1,
-        "pin": "GP12",
         "split": true,
         "layers": {
             "enabled": true,
             "max": 3
         }
     },
+    "ws2812": {
+        "pin": "GP12",
+        "driver": "vendor"
+    },
     "split": {
         "enabled": true,
         "encoder": {
@@ -40,7 +43,9 @@
         }
     },
     "encoder": {
-        "rotary": [{ "pin_a": "GP7", "pin_b": "GP7", "resolution": 4 }]
+        "rotary": [
+            {"pin_a": "GP7", "pin_b": "GP7", "resolution": 4}
+        ]
     },
     "usb": {
         "device_version": "1.0.0",
diff --git a/keyboards/pica40/rev2/rules.mk b/keyboards/pica40/rev2/rules.mk
index 8fb51ec82d..161ec22b16 100644
--- a/keyboards/pica40/rev2/rules.mk
+++ b/keyboards/pica40/rev2/rules.mk
@@ -1,2 +1 @@
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor