Replace preprocessor guards for ENCODER_MAP_ENABLE with !ENCODER_CALLBACKS_ENABLE.

Remove any instances of rules.mk which only enabled encoder map.
- Command executed: find keyboards -name rules.mk | while read f ; do if [ "$(cat $f | grep -v ENCODER_MAP_ENABLE | sed -e 's@#.*@@g')" = "" ]; then echo $f ; fi; done | while read f ; do git rm -rf $f ; done
2025-06-03 10:06:52 +10:00 · 2025-06-03 10:01:45 +10:00 · 2025-06-03 09:59:22 +10:00 · 2025-05-28 06:06:21 +00:00 · 2025-05-28 00:47:37 +00:00 · 2025-05-27 22:24:59 +00:00
418 changed files with 455 additions and 689 deletions
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -929,7 +929,10 @@ ifeq ($(strip $(ENCODER_ENABLE)), yes)
        SRC += encoder_$(strip $(ENCODER_DRIVER)).c
    endif

-    ifeq ($(strip $(ENCODER_MAP_ENABLE)), yes)
+    # Encoder callbacks are now opt-in, default is encoder map
+    ifeq ($(strip $(ENCODER_CALLBACKS_ENABLE)), yes)
+        OPT_DEFS += -DENCODER_CALLBACKS_ENABLE
+    else
        OPT_DEFS += -DENCODER_MAP_ENABLE
    endif
 endif
--- a/builddefs/show_options.mk
+++ b/builddefs/show_options.mk
@@ -55,7 +55,7 @@ OTHER_OPTION_NAMES = \
  HELIX ZINC \
  AUTOLOG_ENABLE \
  DEBUG_ENABLE \
-  ENCODER_MAP_ENABLE \
+  ENCODER_CALLBACKS_ENABLE \
  ENCODER_ENABLE_CUSTOM \
  GERMAN_ENABLE \
  HAPTIC_ENABLE \
--- a/docs/ChangeLog/20250525.md
+++ b/docs/ChangeLog/20250525.md
@@ -153,7 +153,7 @@ enum {
 Add the keycodes to a new encoder map (optionally with transparent layers above, if you want identical functionality of layer-independence):

 ```c
-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = { ENCODER_CCW_CW(MY_ENCODER_LEFT, MY_ENCODER_RIGHT) }, // [!code focus]
    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, // [!code focus]
--- a/docs/features/encoders.md
+++ b/docs/features/encoders.md
@@ -73,16 +73,12 @@ Keep in mind that whenver you change the encoder resolution, you will need to re

 ## Encoder map {#encoder-map}

-Encoder mapping may be added to your `keymap.c`, which replicates the normal keyswitch layer handling functionality, but with encoders. Add this to your keymap's `rules.mk`:
+Encoder mapping may be added to your `keymap.c`, which replicates the normal keyswitch layer handling functionality, but with encoders.

-```make
-ENCODER_MAP_ENABLE = yes
-```
-
-Your `keymap.c` will then need an encoder mapping defined (for four layers and two encoders):
+Your `keymap.c` will then need an encoder mapping defined (in this example, for four layers and two encoders):

 ```c
-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = { ENCODER_CCW_CW(MS_WHLU, MS_WHLD),  ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
    [1] = { ENCODER_CCW_CW(UG_HUED, UG_HUEU),  ENCODER_CCW_CW(UG_SATD, UG_SATU)  },
@@ -92,10 +88,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
 #endif
 ```

-::: tip
-This should only be enabled at the keymap level.
-:::
-
 Using encoder mapping pumps events through the normal QMK keycode processing pipeline, resulting in a _keydown/keyup_ combination pushed through `process_record_xxxxx()`. To configure the amount of time between the encoder "keyup" and "keydown", you can add the following to your `config.h`:

 ```c
@@ -108,13 +100,30 @@ By default, the encoder map delay matches the value of `TAP_CODE_DELAY`.

 ## Callbacks

+::: warning
+Encoder callbacks were the initial method of using encoders with QMK. This strategy has been deprecated, and should not be used going forward as it is slated for removal.
+:::
+
+To enable encoder callbacks, add the following to your `rules.mk` file:
+
+```mk
+ENCODER_CALLBACKS_ENABLE = yes
+```
+
+This will disable any use of encoder map.
+
+::: tip
+This should only be enabled at the keymap level.
+:::
+
 ::: tip
 [**Default Behaviour**](https://github.com/qmk/qmk_firmware/blob/master/quantum/encoder.c#L79-): all encoders installed will function as volume up (`KC_VOLU`) on clockwise rotation and volume down (`KC_VOLD`) on counter-clockwise rotation. If you do not wish to override this, no further configuration is necessary.
 :::

-If you would like the alter the default behaviour, and are not using `ENCODER_MAP_ENABLE = yes`, the callback functions can be inserted into your `<keyboard>.c`:
+If you would like the alter the default behaviour, the callback functions can be inserted into your `<keyboard>.c`:

 ```c
+#if defined(ENCODER_CALLBACKS_ENABLE)
 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 */
@@ -134,11 +143,13 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
    }
    return true;
 }
+#endif
 ```

 or `keymap.c`:

 ```c
+#if defined(ENCODER_CALLBACKS_ENABLE)
 bool encoder_update_user(uint8_t index, bool clockwise) {
    if (index == 0) { /* First encoder */
        if (clockwise) {
@@ -155,6 +166,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
    }
    return false;
 }
+#endif
 ```

 ::: warning
--- a/docs/features/swap_hands.md
+++ b/docs/features/swap_hands.md
@@ -40,7 +40,7 @@ Encoder indexes are defined as left-to-right, and the extent of the array needs

 As an example, if a split keyboard has a single encoder per side, you can swap the order by using the following code in your keymap:
 ```c
-#if defined(SWAP_HANDS_ENABLE) && defined(ENCODER_MAP_ENABLE)
+#if defined(SWAP_HANDS_ENABLE) && !defined(ENCODER_CALLBACKS_ENABLE)
 const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = { 1, 0 };
 #endif
 ```
--- a/docs/pr_checklist.md
+++ b/docs/pr_checklist.md
@@ -106,7 +106,7 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
    - no re-definitions of the default MCU parameters if same value, when compared to the equivalent MCU in [mcu_selection.mk](https://github.com/qmk/qmk_firmware/blob/master/builddefs/mcu_selection.mk)
    - no "keymap only" features enabled
      - `COMBO_ENABLE`
-      - `ENCODER_MAP_ENABLE`
+      - `ENCODER_CALLBACKS_ENABLE`
 - keyboard `config.h`
    - no `#define DESCRIPTION`
    - no Magic Key Options, MIDI Options or HD44780 configuration
--- a/keyboards/0xcb/splaytoraid/keymaps/default/rules.mk
+++ b/keyboards/0xcb/splaytoraid/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/1upkeyboards/1upocarina/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/1upocarina/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}
--- a/keyboards/1upkeyboards/1upocarina/keymaps/default/rules.mk
+++ b/keyboards/1upkeyboards/1upocarina/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] =  { ENCODER_CCW_CW(RM_PREV, RM_NEXT)}
 };
--- a/keyboards/1upkeyboards/1upslider8/keymaps/default/rules.mk
+++ b/keyboards/1upkeyboards/1upslider8/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/1upkeyboards/1upsuper16v3/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/1upsuper16v3/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_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_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
--- a/keyboards/1upkeyboards/1upsuper16v3/keymaps/default/rules.mk
+++ b/keyboards/1upkeyboards/1upsuper16v3/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /* Qwerty
    *                                                                              ╱⎺⎺⎺⎺╲
    *                                                                             |RGBTOG|
-    *                                                                              ╲⎽⎽⎽⎽╱ 
+    *                                                                              ╲⎽⎽⎽⎽╱
    * ,-----------------------------------------------------------------------------------.
    * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
    * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /* Lower
    *                                                                              ╱⎺⎺⎺⎺╲
    *                                                                             | MUTE |
-    *                                                                              ╲⎽⎽⎽⎽╱ 
+    *                                                                              ╲⎽⎽⎽⎽╱
    * ,-----------------------------------------------------------------------------------.
    * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
    * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /* Raise
    *                                                                              ╱⎺⎺⎺⎺╲
    *                                                                             | MUTE |
-    *                                                                              ╲⎽⎽⎽⎽╱ 
+    *                                                                              ╲⎽⎽⎽⎽╱
    * ,-----------------------------------------------------------------------------------.
    * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
    * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -94,10 +94,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /* Adjust (Lower + Raise)
    *                                                                              ╱⎺⎺⎺⎺╲
    *                                                                             | MUTE |
-    *                       v-----------------------RGB CONTROL------------------v ╲⎽⎽⎽⎽╱ 
+    *                       v-----------------------RGB CONTROL------------------v ╲⎽⎽⎽⎽╱
    * ,-----------------------------------------------------------------------------------.
    * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
-    * |------+------+------+------+------+------+------+------+------+------+------+------| 
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
    * |      |      |      |      |      |      |      |      |      |      |      |      |
    * |------+------+------+------+------+------+------+------+------+------+------+------|
    * |      |      |      |      |      |      |      |      |      |      |      |      |
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [_ONE]   =  { ENCODER_CCW_CW(RM_PREV,  RM_NEXT) },
    [_TWO]   =  { ENCODER_CCW_CW(KC_VOLD,  KC_VOLU) },
--- a/keyboards/1upkeyboards/pi40/keymaps/default/rules.mk
+++ b/keyboards/1upkeyboards/pi40/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/1upkeyboards/pi50/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/pi50/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /* Qwerty
    *                                                                              ╱⎺⎺⎺⎺╲
    *                                                                             |RGBTOG|
-    *                                                                              ╲⎽⎽⎽⎽╱ 
+    *                                                                              ╲⎽⎽⎽⎽╱
    * ,-----------------------------------------------------------------------------------.
    * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
    * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /* Lower
    *                                                                              ╱⎺⎺⎺⎺╲
    *                                                                             | MUTE |
-    *                                                                              ╲⎽⎽⎽⎽╱ 
+    *                                                                              ╲⎽⎽⎽⎽╱
    * ,-----------------------------------------------------------------------------------.
    * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
    * |------+------+------+------+------+-------------+------+------+------+------+------|
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /* Raise
    *                                                                              ╱⎺⎺⎺⎺╲
    *                                                                             | MUTE |
-    *                                                                              ╲⎽⎽⎽⎽╱ 
+    *                                                                              ╲⎽⎽⎽⎽╱
    * ,-----------------------------------------------------------------------------------.
    * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
    * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /* Adjust (Lower + Raise)
    *                                                                              ╱⎺⎺⎺⎺╲
    *                                                                             | MUTE |
-    *                       v-----------------------RGB CONTROL------------------v ╲⎽⎽⎽⎽╱ 
+    *                       v-----------------------RGB CONTROL------------------v ╲⎽⎽⎽⎽╱
    * ,-----------------------------------------------------------------------------------.
    * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
    * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -126,7 +126,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [_ONE]   =  { ENCODER_CCW_CW(RM_PREV,  RM_NEXT) },
    [_TWO]   =  { ENCODER_CCW_CW(KC_VOLD,  KC_VOLU) },
--- a/keyboards/1upkeyboards/pi50/keymaps/default/rules.mk
+++ b/keyboards/1upkeyboards/pi50/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/1upkeyboards/pi60/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/pi60/keymaps/default/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_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_VOLD, KC_VOLU)  },
    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS),      ENCODER_CCW_CW(KC_TRNS, KC_TRNS),      ENCODER_CCW_CW(KC_TRNS, KC_TRNS)  },
--- a/keyboards/1upkeyboards/pi60/keymaps/default/rules.mk
+++ b/keyboards/1upkeyboards/pi60/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c
@@ -33,9 +33,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };


-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU),      ENCODER_CCW_CW(RM_VALD, RM_VALU)  },
    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS),      ENCODER_CCW_CW(KC_TRNS, KC_TRNS)  }
 };
-#endif
+#endif
--- a/keyboards/4pplet/waffling60/rev_e/keymaps/6u_ansi/keymap.c
+++ b/keyboards/4pplet/waffling60/rev_e/keymaps/6u_ansi/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,
  KC_TRNS,  KC_TRNS,  KC_TRNS,                                  KC_TRNS,              KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS)
 };
-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }
--- a/keyboards/4pplet/waffling60/rev_e/keymaps/6u_ansi/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_e/keymaps/6u_ansi/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/4pplet/waffling60/rev_e/keymaps/6u_ansi_split_bs_rshift/keymap.c
+++ b/keyboards/4pplet/waffling60/rev_e/keymaps/6u_ansi_split_bs_rshift/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,
  KC_TRNS,  KC_TRNS,  KC_TRNS,                                  KC_TRNS,              KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS)
 };
-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }
--- a/keyboards/4pplet/waffling60/rev_e/keymaps/6u_ansi_split_bs_rshift/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_e/keymaps/6u_ansi_split_bs_rshift/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/4pplet/waffling60/rev_e/keymaps/6u_iso/keymap.c
+++ b/keyboards/4pplet/waffling60/rev_e/keymaps/6u_iso/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,
  KC_TRNS,  KC_TRNS,  KC_TRNS,                                  KC_TRNS,                         KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS)
 };
-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }
--- a/keyboards/4pplet/waffling60/rev_e/keymaps/6u_iso/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_e/keymaps/6u_iso/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/4pplet/waffling60/rev_e/keymaps/6u_iso_split_bs_rshift/keymap.c
+++ b/keyboards/4pplet/waffling60/rev_e/keymaps/6u_iso_split_bs_rshift/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
  KC_TRNS,  KC_TRNS,  KC_TRNS,                                  KC_TRNS,              KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS)
 };
-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }
--- a/keyboards/4pplet/waffling60/rev_e/keymaps/6u_iso_split_bs_rshift/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_e/keymaps/6u_iso_split_bs_rshift/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/4pplet/waffling60/rev_e/keymaps/default/keymap.c
+++ b/keyboards/4pplet/waffling60/rev_e/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS)
 };
-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }
--- a/keyboards/4pplet/waffling60/rev_e/keymaps/default/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_e/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/default/keymap.c
+++ b/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,                        KC_TRNS,  KC_TRNS, KC_TRNS)
 };
-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }
--- a/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/default/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/4pplet/waffling60/rev_e_iso/keymaps/default/keymap.c
+++ b/keyboards/4pplet/waffling60/rev_e_iso/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS)
 };
-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }
--- a/keyboards/4pplet/waffling60/rev_e_iso/keymaps/default/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_e_iso/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/a_jazz/akc084/keymaps/default/keymap.c
+++ b/keyboards/a_jazz/akc084/keymaps/default/keymap.c
@@ -15,7 +15,7 @@
 */
 #include QMK_KEYBOARD_H

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
    [1] =  { ENCODER_CCW_CW(_______, _______)  }
@@ -40,4 +40,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        _______,   _______,   _______,    _______,   _______,   _______,    _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,
        _______,   GU_TOGG,   _______,                          _______,               _______,   _______,   _______,   _______,   _______,  _______
    )
-};
+};
--- a/keyboards/adafruit/macropad/keymaps/default/rules.mk
+++ b/keyboards/adafruit/macropad/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/adpenrose/akemipad/keymaps/default/keymap.c
+++ b/keyboards/adpenrose/akemipad/keymaps/default/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_P7,    KC_P8,     KC_P9,     KC_PPLS,
                  KC_P4,    KC_P5,     KC_P6,     KC_PPLS,
                  KC_P1,    KC_P2,     KC_P3,     KC_PENT,
-        KC_MUTE,  KC_P0,    KC_P0,     KC_PDOT,   KC_PENT 
+        KC_MUTE,  KC_P0,    KC_P0,     KC_PDOT,   KC_PENT
    ),
    [1] = LAYOUT_all(
                  KC_TRNS,  CK_DOWN,   CK_UP,     CK_RST,
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
                  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
                  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
-        CK_TOGG,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS 
+        CK_TOGG,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS
    ),
    [2] = LAYOUT_all(
                  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
                  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
                  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS 
+        KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS
    ),
    [3] = LAYOUT_all(
                  QK_BOOT,  KC_TRNS,   KC_TRNS,   KC_TRNS,
@@ -35,11 +35,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
                  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
                  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS 
+        KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [1] = { ENCODER_CCW_CW(RM_HUED, RM_HUEU) },
--- a/keyboards/adpenrose/akemipad/keymaps/default/rules.mk
+++ b/keyboards/adpenrose/akemipad/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/adpenrose/akemipad/keymaps/default_numpad/keymap.c
+++ b/keyboards/adpenrose/akemipad/keymaps/default_numpad/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [1] = { ENCODER_CCW_CW(RM_HUED, RM_HUEU) },
--- a/keyboards/adpenrose/akemipad/keymaps/default_numpad/rules.mk
+++ b/keyboards/adpenrose/akemipad/keymaps/default_numpad/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/adpenrose/kintsugi/keymaps/default/keymap.c
+++ b/keyboards/adpenrose/kintsugi/keymaps/default/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    ),
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
--- a/keyboards/adpenrose/kintsugi/keymaps/default/rules.mk
+++ b/keyboards/adpenrose/kintsugi/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/adpenrose/mine/keymaps/default/keymap.c
+++ b/keyboards/adpenrose/mine/keymaps/default/keymap.c
@@ -6,28 +6,28 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_1800_alice_ansi(
                                                                                                                                                                                              KC_MUTE,
-        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_HOME,   KC_END,         KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 
+        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_HOME,   KC_END,         KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
        KC_GRV,    KC_1,    KC_2,     KC_3,     KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,                   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_P4,  KC_P5,   KC_P6,
        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_P1,  KC_P2,   KC_P3,   KC_PENT,
-        KC_LSFT,   KC_Z,    KC_X,     KC_C,     KC_V,    KC_B,                 KC_B,    KC_N,    KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,           KC_UP,          KC_P0,   KC_PDOT, 
-        KC_LCTL,   KC_LGUI,                     KC_LALT, KC_SPC,               KC_SPC,  KC_RALT, KC_RGUI,  KC_RCTL,                                KC_LEFT, KC_DOWN,  KC_RIGHT  
+        KC_LSFT,   KC_Z,    KC_X,     KC_C,     KC_V,    KC_B,                 KC_B,    KC_N,    KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,           KC_UP,          KC_P0,   KC_PDOT,
+        KC_LCTL,   KC_LGUI,                     KC_LALT, KC_SPC,               KC_SPC,  KC_RALT, KC_RGUI,  KC_RCTL,                                KC_LEFT, KC_DOWN,  KC_RIGHT
    ),

    [1] = LAYOUT_1800_alice_ansi(
                                                                                                                                                                                                                             KC_TRNS,
-        QK_BOOT,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,       KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS, 
+        QK_BOOT,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,       KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,       KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,                        KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,              KC_TRNS,  KC_TRNS,   KC_TRNS,
        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,             KC_TRNS,              KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
-        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,             KC_TRNS,             KC_TRNS,  KC_TRNS, 
-        KC_TRNS,   KC_TRNS,                           KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,                                    KC_TRNS, KC_TRNS,  KC_TRNS 
+        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,             KC_TRNS,             KC_TRNS,  KC_TRNS,
+        KC_TRNS,   KC_TRNS,                           KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,                                    KC_TRNS, KC_TRNS,  KC_TRNS
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
 };
-#endif
+#endif
--- a/keyboards/adpenrose/mine/keymaps/default/rules.mk
+++ b/keyboards/adpenrose/mine/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes	# Encoder mapping functionality
--- a/keyboards/adpenrose/mine/keymaps/iso/keymap.c
+++ b/keyboards/adpenrose/mine/keymaps/iso/keymap.c
@@ -6,28 +6,28 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_1800_alice_iso(
                                                                                                                                                                                              KC_MUTE,
-        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_HOME,   KC_END,         KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 
+        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_HOME,   KC_END,         KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
        KC_GRV,    KC_1,    KC_2,     KC_3,     KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,                   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_P4,  KC_P5,   KC_P6,
        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_NUHS, KC_ENT,           KC_P1,  KC_P2,   KC_P3,   KC_PENT,
-        KC_LSFT,   MO(1), KC_Z,     KC_X,     KC_C,    KC_V,    KC_B,        KC_B,    KC_N,    KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,            KC_UP,         KC_P0,   KC_PDOT, 
-        KC_LCTL,   KC_LGUI,                     KC_LALT, KC_SPC,               KC_SPC,  KC_RALT, KC_RGUI,  KC_RCTL,                                KC_LEFT, KC_DOWN,  KC_RIGHT  
+        KC_LSFT,   MO(1), KC_Z,     KC_X,     KC_C,    KC_V,    KC_B,        KC_B,    KC_N,    KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,            KC_UP,         KC_P0,   KC_PDOT,
+        KC_LCTL,   KC_LGUI,                     KC_LALT, KC_SPC,               KC_SPC,  KC_RALT, KC_RGUI,  KC_RCTL,                                KC_LEFT, KC_DOWN,  KC_RIGHT
    ),

    [1] = LAYOUT_1800_alice_iso(
                                                                                                                                                                                                                             KC_TRNS,
-        QK_BOOT,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,       KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_PSCR,  KC_DEL,               KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS, 
+        QK_BOOT,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,       KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_PSCR,  KC_DEL,               KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,       KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,                        KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,                        KC_TRNS,  KC_TRNS,   KC_TRNS,
        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,              KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
-        KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,     KC_TRNS,   KC_TRNS,   KC_TRNS,       KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,             KC_TRNS,             KC_TRNS,  KC_TRNS, 
-        KC_TRNS,   KC_TRNS,                           KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,                                    KC_TRNS, KC_TRNS,  KC_TRNS 
+        KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,     KC_TRNS,   KC_TRNS,   KC_TRNS,       KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,             KC_TRNS,             KC_TRNS,  KC_TRNS,
+        KC_TRNS,   KC_TRNS,                           KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,                                    KC_TRNS, KC_TRNS,  KC_TRNS
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
 };
-#endif
+#endif
--- a/keyboards/adpenrose/mine/keymaps/iso/rules.mk
+++ b/keyboards/adpenrose/mine/keymaps/iso/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes	# Encoder mapping functionality
--- a/keyboards/adpenrose/obi/keymaps/default/keymap.c
+++ b/keyboards/adpenrose/obi/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
--- a/keyboards/adpenrose/obi/keymaps/default/rules.mk
+++ b/keyboards/adpenrose/obi/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/adpenrose/obi/keymaps/default_625u_space/keymap.c
+++ b/keyboards/adpenrose/obi/keymaps/default_625u_space/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
--- a/keyboards/adpenrose/obi/keymaps/default_625u_space/rules.mk
+++ b/keyboards/adpenrose/obi/keymaps/default_625u_space/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c
+++ b/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c
@@ -42,11 +42,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [_MAIN] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [_LEFT] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [_RIGHT] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [_TAB] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
 };
-#endif
+#endif
--- a/keyboards/aidansmithdotdev/fine40/keymaps/default/rules.mk
+++ b/keyboards/aidansmithdotdev/fine40/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/default/rules.mk
+++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/arrayperipherals/vector/keymaps/default/keymap.c
+++ b/keyboards/arrayperipherals/vector/keymaps/default/keymap.c
@@ -18,7 +18,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(
     KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, TG(1)
   ),
@@ -28,9 +28,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  ),
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
    [1] = {ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
 };
-#endif // ENCODER_MAP_ENABLE
+#endif // ENCODER_MAP_ENABLE
--- a/keyboards/arrayperipherals/vector/keymaps/default/rules.mk
+++ b/keyboards/arrayperipherals/vector/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/arrowmechanics/wings/keymaps/default/keymap.c
+++ b/keyboards/arrowmechanics/wings/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [BASE] =   { ENCODER_CCW_CW(RM_HUEU, RM_HUED), ENCODER_CCW_CW(KC_WH_U, KC_WH_D) },
 };
--- a/keyboards/arrowmechanics/wings/keymaps/default/rules.mk
+++ b/keyboards/arrowmechanics/wings/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/artemis/paragon/keymaps/default/keymap.c
+++ b/keyboards/artemis/paragon/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }
 };
--- a/keyboards/artemis/paragon/keymaps/default/rules.mk
+++ b/keyboards/artemis/paragon/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/ashwing66/keymaps/default/keymap.c
+++ b/keyboards/ashwing66/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [_LAYERA] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
    [_LAYERB] =  { ENCODER_CCW_CW(RM_HUED, RM_HUEU)},
--- a/keyboards/ashwing66/keymaps/default/rules.mk
+++ b/keyboards/ashwing66/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/atlantis/ps17/keymaps/default/keymap.c
+++ b/keyboards/atlantis/ps17/keymaps/default/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    ),
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [1] = { ENCODER_CCW_CW(RM_HUEU, RM_HUED) },
--- a/keyboards/bandominedoni/keymaps/default/keymap.c
+++ b/keyboards/bandominedoni/keymaps/default/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [_OPEN]     = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [_CLOSE]    = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
--- a/keyboards/bandominedoni/keymaps/default/rules.mk
+++ b/keyboards/bandominedoni/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.
--- a/keyboards/binepad/bnk9/keymaps/default/keymap.c
+++ b/keyboards/binepad/bnk9/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)

 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
--- a/keyboards/binepad/bnk9/keymaps/default/rules.mk
+++ b/keyboards/binepad/bnk9/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/binepad/bnr1/keymaps/default/keymap.c
+++ b/keyboards/binepad/bnr1/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)

 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [_L0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
--- a/keyboards/binepad/bnr1/keymaps/default/rules.mk
+++ b/keyboards/binepad/bnr1/keymaps/default/rules.mk
@@ -1,4 +0,0 @@
-# Copyright 2022 Binepad (@binpad)
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/binepad/pixie/keymaps/default/keymap.c
+++ b/keyboards/binepad/pixie/keymaps/default/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)

 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = {
--- a/keyboards/binepad/pixie/keymaps/default/rules.mk
+++ b/keyboards/binepad/pixie/keymaps/default/rules.mk
@@ -1,2 +0,0 @@
-
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/cannonkeys/ortho48v2/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/ortho48v2/keymaps/default/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [_BASE] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
    [_LOWER] =  { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN)  },
--- a/keyboards/cannonkeys/ortho48v2/keymaps/default/rules.mk
+++ b/keyboards/cannonkeys/ortho48v2/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/cannonkeys/sagittarius/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/sagittarius/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(UG_HUED, UG_HUEU), ENCODER_CCW_CW(UG_SATD, UG_SATU)  },
    [1] = { ENCODER_CCW_CW(UG_VALD, UG_VALU),           ENCODER_CCW_CW(UG_SPDD, UG_SPDU), ENCODER_CCW_CW(UG_PREV, UG_NEXT), ENCODER_CCW_CW(KC_RIGHT, KC_LEFT) },
--- a/keyboards/chosfox/cf81/keymaps/default/keymap.c
+++ b/keyboards/chosfox/cf81/keymaps/default/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        _______, _______, _______,                   EE_CLR,                             _______, _______, _______,          RM_HUED,  RM_VALD, RM_HUEU)
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
    [WIN_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
--- a/keyboards/chosfox/cf81/keymaps/default/rules.mk
+++ b/keyboards/chosfox/cf81/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/chromatonemini/keymaps/default/keymap.c
+++ b/keyboards/chromatonemini/keymaps/default/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [_BASE]    = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
    [_RESERVE] = { ENCODER_CCW_CW(_______, _______)  },
--- a/keyboards/chromatonemini/keymaps/default/rules.mk
+++ b/keyboards/chromatonemini/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.
--- a/keyboards/coban/pad12a/keymaps/default/keymap.c
+++ b/keyboards/coban/pad12a/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };


-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
 };
--- a/keyboards/coban/pad12a/keymaps/default/rules.mk
+++ b/keyboards/coban/pad12a/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/coban/pad3a/keymaps/default/keymap.c
+++ b/keyboards/coban/pad3a/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT(KC_MUTE, KC_MNXT, KC_MPLY),
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
 };
--- a/keyboards/coban/pad3a/keymaps/default/rules.mk
+++ b/keyboards/coban/pad3a/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/coban/pad9a/keymaps/default/keymap.c
+++ b/keyboards/coban/pad9a/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    ),
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_WH_U, KC_WH_D) },
 };
--- a/keyboards/coban/pad9a/keymaps/default/rules.mk
+++ b/keyboards/coban/pad9a/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/custommk/elysian/keymaps/default/keymap.c
+++ b/keyboards/custommk/elysian/keymaps/default/keymap.c
@@ -7,13 +7,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT(
        KC_ESC, KC_ENT,
        KC_Y,   KC_U,   KC_I,     KC_O,   KC_P,
-        KC_H,   KC_J,   KC_K,     KC_L,   KC_SCLN,  
+        KC_H,   KC_J,   KC_K,     KC_L,   KC_SCLN,
        KC_N,   KC_M,   KC_COMMA, KC_DOT, KC_SLASH
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_WH_D, KC_WH_U) }
 };
-#endif
+#endif
--- a/keyboards/custommk/elysian/keymaps/default/rules.mk
+++ b/keyboards/custommk/elysian/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/custommk/ergostrafer/keymaps/default/keymap.c
+++ b/keyboards/custommk/ergostrafer/keymaps/default/keymap.c
@@ -14,8 +14,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_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_VOLD, KC_VOLU) }
 };
-#endif
+#endif
--- a/keyboards/custommk/ergostrafer/keymaps/default/rules.mk
+++ b/keyboards/custommk/ergostrafer/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/custommk/ergostrafer_rgb/keymaps/default/keymap.c
+++ b/keyboards/custommk/ergostrafer_rgb/keymaps/default/keymap.c
@@ -14,8 +14,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_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_VOLD, KC_VOLU) }
 };
-#endif
+#endif
--- a/keyboards/custommk/ergostrafer_rgb/keymaps/default/rules.mk
+++ b/keyboards/custommk/ergostrafer_rgb/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/custommk/evo70_r2/keymaps/default/keymap.c
+++ b/keyboards/custommk/evo70_r2/keymaps/default/keymap.c
@@ -19,15 +19,15 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

 	[0] = LAYOUT_all(
-			KC_ESC,	      KC_ESC, KC_1,    KC_2,    KC_3,    KC_4,     KC_5,    KC_6,     KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL, 
-						  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_PGUP, 
-		KC_F1,   KC_F2,   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_PGDN, 
-	    KC_F3,   KC_F4,	  KC_LSFT, KC_NUBS, 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_END, 
+			KC_ESC,	      KC_ESC, KC_1,    KC_2,    KC_3,    KC_4,     KC_5,    KC_6,     KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+						  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_PGUP,
+		KC_F1,   KC_F2,   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_PGDN,
+	    KC_F3,   KC_F4,	  KC_LSFT, KC_NUBS, 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_END,
 		KC_F5,   KC_F6,   KC_LCTL, KC_LWIN,          KC_LALT,                    KC_SPACE,                   KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT),
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU),
 };
-#endif
+#endif
--- a/keyboards/cxt_studio/12e3/keymaps/default/keymap.c
+++ b/keyboards/cxt_studio/12e3/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    ),
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    // Encoders: Left, Right, Big
    [_BASE] = {
--- a/keyboards/cxt_studio/12e3/keymaps/default/rules.mk
+++ b/keyboards/cxt_studio/12e3/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/darkproject/kd83a_bfg_edition/keymaps/default/keymap.c
+++ b/keyboards/darkproject/kd83a_bfg_edition/keymaps/default/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_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) },
--- a/keyboards/darkproject/kd83a_bfg_edition/keymaps/default/rules.mk
+++ b/keyboards/darkproject/kd83a_bfg_edition/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/dcpedit/redherring/keymaps/default/keymap.c
+++ b/keyboards/dcpedit/redherring/keymaps/default/keymap.c
@@ -21,9 +21,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
               KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS )
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [1] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
 };
-#endif
+#endif
--- a/keyboards/dcpedit/redherring/keymaps/default/rules.mk
+++ b/keyboards/dcpedit/redherring/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/decent/tkl/keymaps/default/keymap.c
+++ b/keyboards/decent/tkl/keymaps/default/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    ),
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [1] = { ENCODER_CCW_CW(RM_VALD, RM_VALU) }
--- a/keyboards/deemen17/de80/keymaps/default/keymap.c
+++ b/keyboards/deemen17/de80/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_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) },
--- a/keyboards/deemen17/de80/keymaps/default/rules.mk
+++ b/keyboards/deemen17/de80/keymaps/default/rules.mk
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
--- a/keyboards/dnlnm/cloak/keymaps/default/keymap.c
+++ b/keyboards/dnlnm/cloak/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        _______, _______, _______,                            _______,                            _______, _______, _______, _______),
 };

-#if defined(ENCODER_MAP_ENABLE)
+#if !defined(ENCODER_CALLBACKS_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = {ENCODER_CCW_CW(MS_WHLU, MS_WHLD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
    [1] = {ENCODER_CCW_CW(UG_HUED, UG_HUEU), ENCODER_CCW_CW(UG_SATD, UG_SATU)},
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Nick Brassel	5b3508b9b5	Replace preprocessor guards for `ENCODER_MAP_ENABLE` with `!ENCODER_CALLBACKS_ENABLE`.	2025-06-03 10:06:52 +10:00
Nick Brassel	b2b6afffcb	Remove any instances of `rules.mk` which only enabled encoder map. - Command executed: find keyboards -name rules.mk \| while read f ; do if [ "$(cat $f \| grep -v ENCODER_MAP_ENABLE \| sed -e 's@#.*@@g')" = "" ]; then echo $f ; fi; done \| while read f ; do git rm -rf $f ; done	2025-06-03 10:01:45 +10:00
Nick Brassel	75adcf4da9	Invert logic for encoder map, enabling by default. - Removes `ENCODER_MAP_ENABLE=yes` as it's now the default behaviour. - Adds `ENCODER_CALLBACKS_ENABLE=yes` to restore historical behaviour. - Docs updated to reflect the new logic.	2025-06-03 09:59:22 +10:00
QMK Bot	820202cd53	Merge remote-tracking branch 'origin/master' into develop	2025-05-28 06:06:21 +00:00
QMK Bot	4c773971a7	Merge remote-tracking branch 'origin/master' into develop	2025-05-28 00:47:37 +00:00
QMK Bot	9e8e9af485	Merge remote-tracking branch 'origin/master' into develop	2025-05-27 22:24:59 +00:00
QMK Bot	4f60946513	Merge remote-tracking branch 'origin/master' into develop	2025-05-27 17:08:00 +00:00
QMK Bot	ac9318c78f	Merge remote-tracking branch 'origin/master' into develop	2025-05-27 13:23:36 +00:00
Nick Brassel	76cf8dff93	Branch point for 2025-05-25 Breaking Change	2025-05-26 21:43:45 +10:00
				`@@ -1 +0,0 @@`
				`ENCODER_MAP_ENABLE = yes # Encoder mapping functionality`
				`@@ -1 +0,0 @@`
				`ENCODER_MAP_ENABLE = yes # replacing ENCODERS_CW_KEY method to this on 2022/08/31.`