4 files changed, 18 insertions, 47 deletions
diff --git a/keyboards/rmi_kb/squishytkl/config.h b/keyboards/rmi_kb/squishytkl/config.h
index 20e98b3d53..69522b8362 100644
--- a/keyboards/rmi_kb/squishytkl/config.h
+++ b/keyboards/rmi_kb/squishytkl/config.h
@@ -17,26 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B3, B4, B5, C13, B9, B8, A0, A1, A9, A8, B11, A6, A5, C0 }
-#define MATRIX_COL_PINS { A15, C10, C11, C12, D2, A7, C4, C5, B0, B1, B2, B10, B12, B13, B14, B15, C6, C9, C7, C8, A10, A4, C14, A3, A2, C3 }
-
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN C15
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 16
 //#    define RGBLIGHT_HUE_STEP 8
 //#    define RGBLIGHT_SAT_STEP 8
@@ -53,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
@@ -78,4 +57,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* QoL improvements */
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/rmi_kb/squishytkl/info.json b/keyboards/rmi_kb/squishytkl/info.json
index 17236053ca..aa49ed4af3 100644
--- a/keyboards/rmi_kb/squishytkl/info.json
+++ b/keyboards/rmi_kb/squishytkl/info.json
@@ -8,6 +8,14 @@
         "pid": "0x00B1",
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "C15"
+    },
+    "matrix_pins": {
+        "cols": ["A15", "C10", "C11", "C12", "D2", "A7", "C4", "C5", "B0", "B1", "B2", "B10", "B12", "B13", "B14", "B15", "C6", "C9", "C7", "C8", "A10", "A4", "C14", "A3", "A2", "C3"],
+        "rows": ["B3", "B4", "B5", "C13", "B9", "B8", "A0", "A1", "A9", "A8", "B11", "A6", "A5", "C0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B6", "pin_b": "B7", "resolution": 1}
diff --git a/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c b/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c
index 7bd524f9d9..2c33b4869c 100644
--- a/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c
@@ -29,24 +29,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 keyevent_t encoder_ccw = {
     .key = (keypos_t){.row = 13, .col = 0},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 keyevent_t encoder_cw = {
     .key = (keypos_t){.row = 13, .col = 1},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 void matrix_scan_user(void) {
-    if (IS_PRESSED(encoder_ccw)) {
+    if (encoder_ccw.pressed) {
         encoder_ccw.pressed = false;
-        encoder_ccw.time = (timer_read() | 1);
+        encoder_ccw.time = timer_read();
         action_exec(encoder_ccw);
     }
 
-    if (IS_PRESSED(encoder_cw)) {
+    if (encoder_cw.pressed) {
         encoder_cw.pressed = false;
-        encoder_cw.time = (timer_read() | 1);
+        encoder_cw.time = timer_read();
         action_exec(encoder_cw);
     }
 }
@@ -54,11 +56,11 @@ void matrix_scan_user(void) {
 bool encoder_update_user(uint8_t index, bool clockwise) {
     if (clockwise) {
         encoder_cw.pressed = true;
-        encoder_cw.time = (timer_read() | 1);
+        encoder_cw.time = timer_read();
         action_exec(encoder_cw);
     } else {
         encoder_ccw.pressed = true;
-        encoder_ccw.time = (timer_read() | 1);
+        encoder_ccw.time = timer_read();
         action_exec(encoder_ccw);
     }
     return true;
diff --git a/keyboards/rmi_kb/squishytkl/squishytkl.c b/keyboards/rmi_kb/squishytkl/squishytkl.c
deleted file mode 100644
index 9a63c81364..0000000000
--- a/keyboards/rmi_kb/squishytkl/squishytkl.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "squishytkl.h"