From 15a1df6734a2956ec484e177d2cf6e0421f8913d Mon Sep 17 00:00:00 2001
From: "Ricardo (XenGi) Band" <email@ricardo.band>
Date: Wed, 27 Aug 2025 23:17:33 +0200
Subject: [PATCH] switch to new encoder logic

---
 keyboards/noisy_cricket/config.h                 |  2 ++
 keyboards/noisy_cricket/keyboard.json            |  3 ++-
 keyboards/noisy_cricket/keymaps/default/keymap.c | 11 ++++++++++-
 keyboards/noisy_cricket/noisy_cricket.c          | 14 --------------
 keyboards/noisy_cricket/rules.mk                 |  1 -
 5 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/keyboards/noisy_cricket/config.h b/keyboards/noisy_cricket/config.h
index 441c168d0a..eac1de1cae 100644
--- a/keyboards/noisy_cricket/config.h
+++ b/keyboards/noisy_cricket/config.h
@@ -10,3 +10,5 @@
 // RGB configuration
 #define RGBLIGHT_LED_COUNT 23
 
+#define ENCODER_MAP_KEY_DELAY 10
+
diff --git a/keyboards/noisy_cricket/keyboard.json b/keyboards/noisy_cricket/keyboard.json
index aed3edaa07..c26122a9a1 100644
--- a/keyboards/noisy_cricket/keyboard.json
+++ b/keyboards/noisy_cricket/keyboard.json
@@ -13,7 +13,8 @@
         "mousekey": true,
         "nkro": true,
         "rgb_matrix": true,
-        "rgblight": false
+        "rgblight": false,
+        "encoder": true
     },
     "dynamic_keymap": { "layer_count": 4 },
     "bootmagic": {
diff --git a/keyboards/noisy_cricket/keymaps/default/keymap.c b/keyboards/noisy_cricket/keymaps/default/keymap.c
index 18e59509aa..3353088dd7 100644
--- a/keyboards/noisy_cricket/keymaps/default/keymap.c
+++ b/keyboards/noisy_cricket/keymaps/default/keymap.c
@@ -16,7 +16,6 @@
     { k30, k31, k32, k33, k34, k35 } \
 }
 
-
 #ifndef MAGIC_ENABLE
 uint16_t keycode_config(uint16_t keycode) {
     return keycode;
@@ -29,6 +28,15 @@ uint8_t mod_config(uint8_t mod) {
 }
 #endif
 
+#if defined(ENCODER_MAP_ENABLE)
+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(KC_VOLD, KC_VOLU) },
+    [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+};
+#endif
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /*
      * ╔═══╤═══╤═══╤═══╤═══╤═══╤═══╗
@@ -67,3 +75,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, RGB_RMOD, RGB_MOD, _______, _______
     )
 };
+
diff --git a/keyboards/noisy_cricket/noisy_cricket.c b/keyboards/noisy_cricket/noisy_cricket.c
index 9f21975f73..e58f037911 100644
--- a/keyboards/noisy_cricket/noisy_cricket.c
+++ b/keyboards/noisy_cricket/noisy_cricket.c
@@ -15,17 +15,3 @@ led_config_t g_led_config = {
     }
 };
 
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    //if (!encoder_update_user(index, clockwise)) {
-    //  return false; /* Don't process further events if user function exists and returns false */
-    //}
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-
diff --git a/keyboards/noisy_cricket/rules.mk b/keyboards/noisy_cricket/rules.mk
index 683996821f..5c6ac51755 100644
--- a/keyboards/noisy_cricket/rules.mk
+++ b/keyboards/noisy_cricket/rules.mk
@@ -23,4 +23,3 @@ MUSIC_ENABLE = no
 SPACE_CADET_ENABLE = no
 GRAVE_ESC_ENABLE = no
 AVR_USE_MINIMAL_PRINTF = yes
-ENCODER_ENABLE = yes