6 files changed, 6 insertions, 21 deletions
diff --git a/keyboards/atlantis/ps17/config.h b/keyboards/atlantis/ps17/config.h
index 5638e334bd..a41720aeb5 100644
--- a/keyboards/atlantis/ps17/config.h
+++ b/keyboards/atlantis/ps17/config.h
@@ -9,7 +9,6 @@
 #define LED_INDICATOR_2_PIN D4
 
 /* RGB matrix */
-#define RGB_DI_PIN B7
 #define RGB_MATRIX_LED_COUNT 28
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/atlantis/ps17/info.json b/keyboards/atlantis/ps17/info.json
index 5b025c83f7..a4c505ce5a 100644
--- a/keyboards/atlantis/ps17/info.json
+++ b/keyboards/atlantis/ps17/info.json
@@ -26,6 +26,9 @@
         "cols": ["F6", "F7", "D3", "D6"],
         "rows": ["F0", "B4", "B5", "B6", "C6", "C7", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN"]
     },
+    "ws2812": {
+        "pin": "B7"
+    },
     "encoder": {
         "rotary": [{
             "pin_a": "D2",
diff --git a/keyboards/atlantis/ps17/keymaps/default/keymap.c b/keyboards/atlantis/ps17/keymaps/default/keymap.c
index b5d36f02a7..36042fbb18 100644
--- a/keyboards/atlantis/ps17/keymaps/default/keymap.c
+++ b/keyboards/atlantis/ps17/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) },
     [1] = { ENCODER_CCW_CW(RGB_HUI, RGB_HUD) },
     [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
diff --git a/keyboards/atlantis/ps17/keymaps/multimedia/keymap.c b/keyboards/atlantis/ps17/keymaps/multimedia/keymap.c
index 32d20ef86c..8546cfb71f 100644
--- a/keyboards/atlantis/ps17/keymaps/multimedia/keymap.c
+++ b/keyboards/atlantis/ps17/keymaps/multimedia/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) },
     [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [2] = { ENCODER_CCW_CW(RGB_HUI, RGB_HUD) },
diff --git a/keyboards/atlantis/ps17/keymaps/via/keymap.c b/keyboards/atlantis/ps17/keymaps/via/keymap.c
index 93a158172d..ff4bfdb336 100644
--- a/keyboards/atlantis/ps17/keymaps/via/keymap.c
+++ b/keyboards/atlantis/ps17/keymaps/via/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) },
     [1] = { ENCODER_CCW_CW(RGB_HUI, RGB_HUD) },
     [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
diff --git a/keyboards/atlantis/ps17/ps17.c b/keyboards/atlantis/ps17/ps17.c
index ccac1ce923..d660bdee6a 100644
--- a/keyboards/atlantis/ps17/ps17.c
+++ b/keyboards/atlantis/ps17/ps17.c
@@ -19,23 +19,6 @@ void keyboard_pre_init_kb(void) {
     keyboard_pre_init_user();
 }
 
-#if defined(ENCODER_ENABLE)
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        /* Don't process further events if user function exists and returns false */
-        return false;
-    }
-
-    /* Ignore index - only one encoder on this board */
-    if (clockwise) {
-        tap_code_delay(KC_VOLU, 10);
-    } else {
-        tap_code_delay(KC_VOLD, 10);
-    }
-    return false;
-}
-#endif
-
 #ifdef RGB_MATRIX_ENABLE
 void suspend_power_down_kb(void) {
     /* Disable indicator LEDs when going to sleep */