Move encoder config to data driven (#19923)

Co-authored-by: Nick Brassel <nick@tzarc.org>

14 files changed, 45 insertions, 71 deletions

diff --git a/keyboards/nightly_boards/adellein/config.h b/keyboards/nightly_boards/adellein/config.h
index 070224510c..e4e99106a3 100644
--- a/keyboards/nightly_boards/adellein/config.h
+++ b/keyboards/nightly_boards/adellein/config.h
@@ -51,12 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 /* Encoders */
-
-#define ENCODERS 1
-
-#define ENCODERS_PAD_A { C7 }
-#define ENCODERS_PAD_B { C6 }
-
 #define ENCODERS_CW_KEY  { { 3, 3 } }
 #define ENCODERS_CCW_KEY { { 1, 3 } }
 
diff --git a/keyboards/nightly_boards/adellein/encoder_action.c b/keyboards/nightly_boards/adellein/encoder_action.c
index 042a3871c9..6b553d3969 100644
--- a/keyboards/nightly_boards/adellein/encoder_action.c
+++ b/keyboards/nightly_boards/adellein/encoder_action.c
@@ -16,15 +16,12 @@
 
 #include "encoder_action.h"
 
-#ifdef ENCODERS
-static uint8_t encoder_state[ENCODERS] = {0};
-static keypos_t encoder_cw[ENCODERS] = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[ENCODERS] = ENCODERS_CCW_KEY;
-#endif
+static uint8_t encoder_state[NUM_ENCODERS] = {0};
+static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY;
+static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY;
 
 void encoder_action_unregister(void) {
-#ifdef ENCODERS
-    for (int index = 0; index < ENCODERS; ++index) {
+    for (int index = 0; index < NUM_ENCODERS; ++index) {
         if (encoder_state[index]) {
             keyevent_t encoder_event = (keyevent_t) {
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
@@ -35,11 +32,9 @@ void encoder_action_unregister(void) {
             action_exec(encoder_event);
         }
     }
-#endif
 }
 
 void encoder_action_register(uint8_t index, bool clockwise) {
-#ifdef ENCODERS
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
@@ -47,5 +42,4 @@ void encoder_action_register(uint8_t index, bool clockwise) {
     };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
-#endif
 }
diff --git a/keyboards/nightly_boards/adellein/info.json b/keyboards/nightly_boards/adellein/info.json
index 58b49b3290..7967cfc99b 100644
--- a/keyboards/nightly_boards/adellein/info.json
+++ b/keyboards/nightly_boards/adellein/info.json
@@ -8,6 +8,11 @@
     	"pid": "0x0010",
     	"device_version": "0.0.1"
     },
+    "encoder": {
+    	"rotary": [
+    		{"pin_a": "C7", "pin_b": "C6"}
+    	]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/nightly_boards/n40_o/config.h b/keyboards/nightly_boards/n40_o/config.h
index 3bd829623a..055aea6055 100644
--- a/keyboards/nightly_boards/n40_o/config.h
+++ b/keyboards/nightly_boards/n40_o/config.h
@@ -51,12 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 /* Encoders */
-
-#define ENCODERS 3
-
-#define ENCODERS_PAD_A { F6, F4 , B6 }
-#define ENCODERS_PAD_B { F7, F5 , C6 }
-
 #define ENCODERS_CW_KEY  { { 2, 4 },{ 4, 4 },{ 6, 4 } }
 #define ENCODERS_CCW_KEY { { 1, 4 },{ 3, 4 },{ 5, 4 } }
 
diff --git a/keyboards/nightly_boards/n40_o/encoder_action.c b/keyboards/nightly_boards/n40_o/encoder_action.c
index 042a3871c9..6b553d3969 100644
--- a/keyboards/nightly_boards/n40_o/encoder_action.c
+++ b/keyboards/nightly_boards/n40_o/encoder_action.c
@@ -16,15 +16,12 @@
 
 #include "encoder_action.h"
 
-#ifdef ENCODERS
-static uint8_t encoder_state[ENCODERS] = {0};
-static keypos_t encoder_cw[ENCODERS] = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[ENCODERS] = ENCODERS_CCW_KEY;
-#endif
+static uint8_t encoder_state[NUM_ENCODERS] = {0};
+static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY;
+static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY;
 
 void encoder_action_unregister(void) {
-#ifdef ENCODERS
-    for (int index = 0; index < ENCODERS; ++index) {
+    for (int index = 0; index < NUM_ENCODERS; ++index) {
         if (encoder_state[index]) {
             keyevent_t encoder_event = (keyevent_t) {
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
@@ -35,11 +32,9 @@ void encoder_action_unregister(void) {
             action_exec(encoder_event);
         }
     }
-#endif
 }
 
 void encoder_action_register(uint8_t index, bool clockwise) {
-#ifdef ENCODERS
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
@@ -47,5 +42,4 @@ void encoder_action_register(uint8_t index, bool clockwise) {
     };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
-#endif
 }
diff --git a/keyboards/nightly_boards/n40_o/info.json b/keyboards/nightly_boards/n40_o/info.json
index e2ccad4db3..f68bc89be3 100644
--- a/keyboards/nightly_boards/n40_o/info.json
+++ b/keyboards/nightly_boards/n40_o/info.json
@@ -8,6 +8,13 @@
     	"pid": "0x0009",
     	"device_version": "0.0.1"
     },
+    "encoder": {
+    	"rotary": [
+    		{"pin_a": "F6", "pin_b": "F7"},
+    		{"pin_a": "F4", "pin_b": "F5"},
+    		{"pin_a": "B6", "pin_b": "C6"}
+    	]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/nightly_boards/n60_s/config.h b/keyboards/nightly_boards/n60_s/config.h
index c892acd41a..7ec0b48079 100644
--- a/keyboards/nightly_boards/n60_s/config.h
+++ b/keyboards/nightly_boards/n60_s/config.h
@@ -35,12 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 
 /* Encoders */
-
-#define ENCODERS 1
-
-#define ENCODERS_PAD_A { D3 }
-#define ENCODERS_PAD_B { D5 }
-
 #define ENCODERS_CW_KEY  { { 1, 5 } }
 #define ENCODERS_CCW_KEY { { 0, 5 } }
 
diff --git a/keyboards/nightly_boards/n60_s/encoder_action.c b/keyboards/nightly_boards/n60_s/encoder_action.c
index 042a3871c9..6b553d3969 100644
--- a/keyboards/nightly_boards/n60_s/encoder_action.c
+++ b/keyboards/nightly_boards/n60_s/encoder_action.c
@@ -16,15 +16,12 @@
 
 #include "encoder_action.h"
 
-#ifdef ENCODERS
-static uint8_t encoder_state[ENCODERS] = {0};
-static keypos_t encoder_cw[ENCODERS] = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[ENCODERS] = ENCODERS_CCW_KEY;
-#endif
+static uint8_t encoder_state[NUM_ENCODERS] = {0};
+static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY;
+static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY;
 
 void encoder_action_unregister(void) {
-#ifdef ENCODERS
-    for (int index = 0; index < ENCODERS; ++index) {
+    for (int index = 0; index < NUM_ENCODERS; ++index) {
         if (encoder_state[index]) {
             keyevent_t encoder_event = (keyevent_t) {
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
@@ -35,11 +32,9 @@ void encoder_action_unregister(void) {
             action_exec(encoder_event);
         }
     }
-#endif
 }
 
 void encoder_action_register(uint8_t index, bool clockwise) {
-#ifdef ENCODERS
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
@@ -47,5 +42,4 @@ void encoder_action_register(uint8_t index, bool clockwise) {
     };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
-#endif
 }
diff --git a/keyboards/nightly_boards/n60_s/info.json b/keyboards/nightly_boards/n60_s/info.json
index 37a0d3895c..519f31cf28 100644
--- a/keyboards/nightly_boards/n60_s/info.json
+++ b/keyboards/nightly_boards/n60_s/info.json
@@ -8,6 +8,11 @@
     	"pid": "0x0007",
     	"device_version": "0.0.1"
     },
+    "encoder": {
+    	"rotary": [
+    		{"pin_a": "D3", "pin_b": "D5"}
+    	]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/nightly_boards/octopad/config.h b/keyboards/nightly_boards/octopad/config.h
index e5e87f04dc..44868adff6 100644
--- a/keyboards/nightly_boards/octopad/config.h
+++ b/keyboards/nightly_boards/octopad/config.h
@@ -51,12 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 /* Encoders */
-
-#define ENCODERS 2
-
-#define ENCODERS_PAD_A { C7, F4 }
-#define ENCODERS_PAD_B { C6, F5 }
-
 #define ENCODERS_CW_KEY  { { 3, 2 },{ 1, 2 } }
 #define ENCODERS_CCW_KEY { { 2, 2 },{ 0, 2 } }
 
diff --git a/keyboards/nightly_boards/octopad/encoder_action.c b/keyboards/nightly_boards/octopad/encoder_action.c
index 042a3871c9..6b553d3969 100644
--- a/keyboards/nightly_boards/octopad/encoder_action.c
+++ b/keyboards/nightly_boards/octopad/encoder_action.c
@@ -16,15 +16,12 @@
 
 #include "encoder_action.h"
 
-#ifdef ENCODERS
-static uint8_t encoder_state[ENCODERS] = {0};
-static keypos_t encoder_cw[ENCODERS] = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[ENCODERS] = ENCODERS_CCW_KEY;
-#endif
+static uint8_t encoder_state[NUM_ENCODERS] = {0};
+static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY;
+static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY;
 
 void encoder_action_unregister(void) {
-#ifdef ENCODERS
-    for (int index = 0; index < ENCODERS; ++index) {
+    for (int index = 0; index < NUM_ENCODERS; ++index) {
         if (encoder_state[index]) {
             keyevent_t encoder_event = (keyevent_t) {
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
@@ -35,11 +32,9 @@ void encoder_action_unregister(void) {
             action_exec(encoder_event);
         }
     }
-#endif
 }
 
 void encoder_action_register(uint8_t index, bool clockwise) {
-#ifdef ENCODERS
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
@@ -47,5 +42,4 @@ void encoder_action_register(uint8_t index, bool clockwise) {
     };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
-#endif
 }
diff --git a/keyboards/nightly_boards/octopad/info.json b/keyboards/nightly_boards/octopad/info.json
index ce794f28a8..d6dfc74805 100644
--- a/keyboards/nightly_boards/octopad/info.json
+++ b/keyboards/nightly_boards/octopad/info.json
@@ -8,6 +8,12 @@
     	"pid": "0x0004",
     	"device_version": "0.0.1"
     },
+    "encoder": {
+    	"rotary": [
+    		{"pin_a": "C7", "pin_b": "C6"},
+    		{"pin_a": "F4", "pin_b": "F5"}
+    	]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/nightly_boards/octopadplus/config.h b/keyboards/nightly_boards/octopadplus/config.h
index dc61f0a039..5936e812c8 100644
--- a/keyboards/nightly_boards/octopadplus/config.h
+++ b/keyboards/nightly_boards/octopadplus/config.h
@@ -34,14 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-
-/* Encoders */
-
-#define ENCODERS 2
-#define ENCODERS_PAD_A { F0, D1 }
-#define ENCODERS_PAD_B { F1, D0 }
 #define TAP_CODE_DELAY 10
-#define ENCODER_RESOLUTION 5
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/nightly_boards/octopadplus/info.json b/keyboards/nightly_boards/octopadplus/info.json
index 8f0d6766e0..0dbd1dee70 100644
--- a/keyboards/nightly_boards/octopadplus/info.json
+++ b/keyboards/nightly_boards/octopadplus/info.json
@@ -8,6 +8,12 @@
     	"pid": "0x0014",
     	"device_version": "0.0.1"
 	},
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F0", "pin_b": "F1", "resolution": 5},
+            {"pin_a": "D1", "pin_b": "D0", "resolution": 5}
+        ]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
 	    "rgblight": {