From c87055ed55f2cd079072351294c934ddc7052be0 Mon Sep 17 00:00:00 2001
From: VeyPatch <126267034+VeyPatch@users.noreply.github.com>
Date: Tue, 1 Apr 2025 20:52:52 +0200
Subject: [PATCH] [fix] add encoder map

---
 .../elora/keymaps/default_hlc/keymap.c        | 12 +++++
 .../elora/keymaps/default_hlc/rules.mk        |  4 +-
 .../kyria/keymaps/default_hlc/keymap.c        | 44 +++++--------------
 .../kyria/keymaps/default_hlc/rules.mk        |  2 +
 4 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/keyboards/splitkb/halcyon/elora/keymaps/default_hlc/keymap.c b/keyboards/splitkb/halcyon/elora/keymaps/default_hlc/keymap.c
index 1cbc5f20..5b3b7306 100644
--- a/keyboards/splitkb/halcyon/elora/keymaps/default_hlc/keymap.c
+++ b/keyboards/splitkb/halcyon/elora/keymaps/default_hlc/keymap.c
@@ -259,3 +259,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //     ),
 //
 };
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU),  ENCODER_CCW_CW(KC_VOLD, KC_VOLU),  ENCODER_CCW_CW(KC_PGUP, KC_PGDN),  ENCODER_CCW_CW(KC_PGUP, KC_PGDN)  },
+    [1] = { ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______)  },
+    [2] = { ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______)  },
+    [3] = { ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______)  },
+    [4] = { ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______)  },
+    [5] = { ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______)  },
+    [6] = { ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______)  },
+};
+#endif
diff --git a/keyboards/splitkb/halcyon/elora/keymaps/default_hlc/rules.mk b/keyboards/splitkb/halcyon/elora/keymaps/default_hlc/rules.mk
index 70ffc544..48e34911 100644
--- a/keyboards/splitkb/halcyon/elora/keymaps/default_hlc/rules.mk
+++ b/keyboards/splitkb/halcyon/elora/keymaps/default_hlc/rules.mk
@@ -1,2 +1,4 @@
+ENCODER_MAP_ENABLE = yes
+
 # This adds module functionality to your keyboard (files found in users/halcyon_modules)
-USER_NAME := halcyon_modules
\ No newline at end of file
+USER_NAME := halcyon_modules
diff --git a/keyboards/splitkb/halcyon/kyria/keymaps/default_hlc/keymap.c b/keyboards/splitkb/halcyon/kyria/keymaps/default_hlc/keymap.c
index 1bd72291..93e47af0 100644
--- a/keyboards/splitkb/halcyon/kyria/keymaps/default_hlc/keymap.c
+++ b/keyboards/splitkb/halcyon/kyria/keymaps/default_hlc/keymap.c
@@ -237,38 +237,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //     ),
 };
 
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-
-    if (index == 0) {
-        // Volume control
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } else if (index == 1) {
-        // Volume control
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } else if (index == 2) {
-        // Page up/Page down
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    } else if (index == 3) {
-        // Page up/Page down
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    }
-    return false;
-}
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU),  ENCODER_CCW_CW(KC_VOLD, KC_VOLU),  ENCODER_CCW_CW(KC_PGUP, KC_PGDN),  ENCODER_CCW_CW(KC_PGUP, KC_PGDN)  },
+    [1] = { ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______)  },
+    [2] = { ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______)  },
+    [3] = { ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______)  },
+    [4] = { ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______)  },
+    [5] = { ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______)  },
+    [6] = { ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______),  ENCODER_CCW_CW(_______, _______)  },
+};
 #endif
diff --git a/keyboards/splitkb/halcyon/kyria/keymaps/default_hlc/rules.mk b/keyboards/splitkb/halcyon/kyria/keymaps/default_hlc/rules.mk
index 54a02a4c..48e34911 100644
--- a/keyboards/splitkb/halcyon/kyria/keymaps/default_hlc/rules.mk
+++ b/keyboards/splitkb/halcyon/kyria/keymaps/default_hlc/rules.mk
@@ -1,2 +1,4 @@
+ENCODER_MAP_ENABLE = yes
+
 # This adds module functionality to your keyboard (files found in users/halcyon_modules)
 USER_NAME := halcyon_modules