From c4a67d3f3302f3096bb6b15921c9587643164ba9 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Mon, 19 Jun 2023 09:46:27 -0600
Subject: Remove encoder in-matrix workaround code (#20389)

---
 keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c | 49 +++++----------------------
 keyboards/rmi_kb/wete/v2/keymaps/via/rules.mk |  1 +
 2 files changed, 9 insertions(+), 41 deletions(-)

(limited to 'keyboards/rmi_kb/wete/v2/keymaps')

diff --git a/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c b/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c
index 05df87fc94..6a3847cd34 100644
--- a/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include QMK_KEYBOARD_H
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
         KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
@@ -21,8 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_P7,   KC_P8,   KC_P9,   KC_PPLS, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
         KC_P4,   KC_P5,   KC_P6,   KC_NO,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGUP,
         KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_LSFT, KC_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
-        KC_P0,   KC_NO,   KC_PDOT, KC_NO,   KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT, KC_RCTL, KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT,
-        KC_VOLD, KC_VOLU
+        KC_P0,   KC_NO,   KC_PDOT, KC_NO,   KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT, KC_RCTL, KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_all(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -30,49 +30,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______, _______, _______,
-        _______, _______
+        _______, _______, _______, _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______, _______, _______
     ),
 };
 
-keyevent_t encoder_ccw = {
-    .key = (keypos_t){.row = 12, .col = 0},
-    .pressed = false,
-    .type = KEY_EVENT
-};
-
-keyevent_t encoder_cw = {
-    .key = (keypos_t){.row = 12, .col = 1},
-    .pressed = false,
-    .type = KEY_EVENT
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(_______, _______) }
 };
-
-void matrix_scan_user(void) {
-    if (encoder_ccw.pressed) {
-        encoder_ccw.pressed = false;
-        encoder_ccw.time = timer_read();
-        action_exec(encoder_ccw);
-    }
-
-    if (encoder_cw.pressed) {
-        encoder_cw.pressed = false;
-        encoder_cw.time = timer_read();
-        action_exec(encoder_cw);
-    }
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-        encoder_cw.pressed = true;
-        encoder_cw.time = timer_read();
-        action_exec(encoder_cw);
-    } else {
-        encoder_ccw.pressed = true;
-        encoder_ccw.time = timer_read();
-        action_exec(encoder_ccw);
-    }
-    return true;
-}
+#endif
 
 #ifdef RGBLIGHT_ENABLE
 // Can probably still be optimized, but I like it as is for clarity
diff --git a/keyboards/rmi_kb/wete/v2/keymaps/via/rules.mk b/keyboards/rmi_kb/wete/v2/keymaps/via/rules.mk
index 1e5b99807c..f1adcab005 100644
--- a/keyboards/rmi_kb/wete/v2/keymaps/via/rules.mk
+++ b/keyboards/rmi_kb/wete/v2/keymaps/via/rules.mk
@@ -1 +1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
-- 
cgit v1.2.3