Skip to content

Commit 7e02991

Browse files
fauxparktzarc
andauthored
Move encoder config to data driven (#19923)
Co-authored-by: Nick Brassel <[email protected]>
1 parent 314f6c1 commit 7e02991

File tree

972 files changed

+2898
-2569
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

972 files changed

+2898
-2569
lines changed

keyboards/0xcb/1337/config.h

-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
// clang-format off
2020

2121
#define TAP_CODE_DELAY 10
22-
#define ENCODER_RESOLUTION 4
23-
#define ENCODERS_PAD_A { F6 }
24-
#define ENCODERS_PAD_B { F5 }
2522

2623
#define RGB_DI_PIN D3
2724
#ifdef RGB_DI_PIN

keyboards/0xcb/1337/info.json

+5
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
"levels": 7,
1414
"breathing": true
1515
},
16+
"encoder": {
17+
"rotary": [
18+
{"pin_a": "F6", "pin_b": "F5"}
19+
]
20+
},
1621
"qmk_lufa_bootloader": {
1722
"led": "B0"
1823
},

keyboards/0xcb/static/config.h

-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
3535
#define DIODE_DIRECTION COL2ROW
3636

3737
#define TAP_CODE_DELAY 10
38-
#define ENCODER_RESOLUTION 4
39-
#define ENCODERS_PAD_A { D0 }
40-
#define ENCODERS_PAD_B { D1 }
4138
// clang-format on
4239

4340
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */

keyboards/0xcb/static/info.json

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0xA455",
99
"device_version": "0.0.1"
1010
},
11+
"encoder": {
12+
"rotary": [
13+
{"pin_a": "D0", "pin_b": "D1"}
14+
]
15+
},
1116
"processor": "atmega328p",
1217
"bootloader": "usbasploader",
1318
"layout_aliases": {

keyboards/10bleoledhub/config.h

-5
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/
4040

4141

4242
#define OLED_FONT_H "./lib/glcdfont.c"
43-
44-
#define ENCODERS_PAD_A { C7 }
45-
#define ENCODERS_PAD_B { F7 }
46-
47-
#define ENCODER_RESOLUTION 4

keyboards/10bleoledhub/info.json

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0x7C99",
99
"device_version": "0.0.1"
1010
},
11+
"encoder": {
12+
"rotary": [
13+
{"pin_a": "C7", "pin_b": "F7"}
14+
]
15+
},
1116
"processor": "atmega32u4",
1217
"bootloader": "caterina",
1318
"layouts": {

keyboards/1upkeyboards/pi40/config.h

-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
#define MATRIX_ROW_PINS { GP21, GP20, GP19, GP18 }
2121
#define MATRIX_COL_PINS { GP1, GP2, GP3, GP4, GP5, GP6, GP7, GP8, GP9, GP10, GP11, GP12 }
2222

23-
#define ENCODERS_PAD_A { GP14 }
24-
#define ENCODERS_PAD_B { GP13 }
25-
2623
#define RGB_DI_PIN GP0
2724
#define RGB_MATRIX_LED_COUNT 47
2825
#define RGBLED_NUM 47

keyboards/1upkeyboards/pi40/info.json

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
"pid": "0x5600",
77
"device_version": "0.0.1"
88
},
9+
"encoder": {
10+
"rotary": [
11+
{"pin_a": "GP14", "pin_b": "GP13"}
12+
]
13+
},
914
"processor": "RP2040",
1015
"bootloader": "rp2040",
1116
"board": "GENERIC_RP_RP2040",

keyboards/1upkeyboards/super16v2/config.h

-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@
3434
#define MATRIX_ROW_PINS { D1, D2, D3, D4 }
3535
#define MATRIX_COL_PINS { D5, D6, C2, D0 }
3636

37-
#define ENCODERS_PAD_A { B1, B3 }
38-
#define ENCODERS_PAD_B { B2, B4 }
39-
40-
4137
/* COL2ROW, ROW2COL */
4238
#define DIODE_DIRECTION COL2ROW
4339

keyboards/1upkeyboards/super16v2/info.json

+6
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
"pid": "0x5517",
99
"device_version": "0.0.1"
1010
},
11+
"encoder": {
12+
"rotary": [
13+
{"pin_a": "B1", "pin_b": "B2"},
14+
{"pin_a": "B3", "pin_b": "B4"}
15+
]
16+
},
1117
"processor": "atmega32u2",
1218
"bootloader": "atmel-dfu",
1319
"layouts": {

keyboards/25keys/aleth42/rev0/config.h

-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2525
/* COL2ROW, ROW2COL*/
2626
#define DIODE_DIRECTION COL2ROW
2727

28-
#define ENCODERS_PAD_A { B6, B5 } // located @ upper left
29-
#define ENCODERS_PAD_B { B7, B4 } // located @ bottom left
30-
3128
#define RGB_DI_PIN C7
3229
#ifdef RGB_DI_PIN
3330
#define RGBLED_NUM 6

keyboards/25keys/aleth42/rev0/info.json

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
"usb": {
33
"device_version": "0.0.0"
44
},
5+
"encoder": {
6+
"rotary": [
7+
{"pin_a": "B6", "pin_b": "B7"},
8+
{"pin_a": "B5", "pin_b": "B4"}
9+
]
10+
},
511
"processor": "atmega32u2",
612
"bootloader": "atmel-dfu"
713
}

keyboards/25keys/aleth42/rev1/config.h

-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2525
/* COL2ROW, ROW2COL*/
2626
#define DIODE_DIRECTION COL2ROW
2727

28-
#define ENCODERS_PAD_A { B5, F5 }
29-
#define ENCODERS_PAD_B { B6, F6 }
30-
3128
#define RGB_DI_PIN B3
3229
#ifdef RGB_DI_PIN
3330
#define RGBLED_NUM 8

keyboards/25keys/aleth42/rev1/info.json

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
"usb": {
33
"device_version": "0.0.1"
44
},
5+
"encoder": {
6+
"rotary": [
7+
{"pin_a": "B5", "pin_b": "B6"},
8+
{"pin_a": "F5", "pin_b": "F6"}
9+
]
10+
},
511
"backlight": {
612
"pin": "C6",
713
"levels": 8,

keyboards/25keys/cassette42/config.h

-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

1818
#pragma once
1919

20-
#define ENCODERS_PAD_A { B6, B3 }
21-
#define ENCODERS_PAD_B { B2, B1 }
22-
#define ENCODER_RESOLUTION 4
23-
2420
#define RGB_DI_PIN D3
2521
#ifdef RGB_DI_PIN
2622
# define RGBLED_NUM 5

keyboards/25keys/cassette42/info.json

+6
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
"pid": "0xCA42",
99
"device_version": "0.0.1"
1010
},
11+
"encoder": {
12+
"rotary": [
13+
{"pin_a": "B6", "pin_b": "B2"},
14+
{"pin_a": "B3", "pin_b": "B1"}
15+
]
16+
},
1117
"processor": "atmega32u4",
1218
"bootloader": "caterina",
1319
"matrix_pins": {

keyboards/2key2crawl/config.h

-5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
#define MATRIX_ROW_PINS { C4, C5 }
66
#define MATRIX_COL_PINS { B3, B4, B5, B6, B7, C7, B2 }
77

8-
9-
#define ENCODERS_PAD_A { D0 }
10-
#define ENCODERS_PAD_B { D1 }
11-
#define ENCODER_RESOLUTION 1
12-
138
/* COL2ROW or ROW2COL */
149
#define DIODE_DIRECTION COL2ROW
1510

keyboards/2key2crawl/info.json

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0x6090",
99
"device_version": "0.0.2"
1010
},
11+
"encoder": {
12+
"rotary": [
13+
{"pin_a": "D0", "pin_b": "D1", "resolution": 1}
14+
]
15+
},
1116
"processor": "atmega32u2",
1217
"bootloader": "atmel-dfu",
1318
"layouts": {

keyboards/45_ats/config.h

-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818

1919
#pragma once
2020

21-
22-
#define ENCODERS_PAD_A { B4 }
23-
#define ENCODERS_PAD_B { B5 }
24-
2521
/* key matrix pins */
2622
#define MATRIX_ROW_PINS { D3, D5, D7, D6 }
2723
#define MATRIX_COL_PINS { E6, B0, B1, B2, B3, B7, F6, F5, F4, C7, F7, C6, B6, D4 }

keyboards/45_ats/info.json

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0x4511",
99
"device_version": "0.0.1"
1010
},
11+
"encoder": {
12+
"rotary": [
13+
{"pin_a": "B4", "pin_b": "B5"}
14+
]
15+
},
1116
"processor": "atmega32u4",
1217
"bootloader": "atmel-dfu",
1318
"layouts": {

keyboards/7c8/framework/config.h

-3
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@
1818

1919
#define MATRIX_ROW_PINS { B0, B1, D7, B2, D6, B3, D5, B4, D4, B5 }
2020
#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5 }
21-
#define ENCODERS_PAD_A { D0 }
22-
#define ENCODERS_PAD_B { D1 }
2321

24-
#define ENCODER_RESOLUTION 4
2522
#define TAP_CODE_DELAY 16
2623
#define DIODE_DIRECTION COL2ROW
2724

keyboards/7c8/framework/info.json

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0x0001",
99
"device_version": "0.0.1"
1010
},
11+
"encoder": {
12+
"rotary": [
13+
{"pin_a": "D0", "pin_b": "D1"}
14+
]
15+
},
1116
"processor": "atmega328p",
1217
"bootloader": "usbasploader",
1318
"layouts": {

keyboards/abacus/config.h

-4
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
3333

3434
#define DIP_SWITCH_PINS { D0 }
3535

36-
#define ENCODERS_PAD_A { F1 }
37-
#define ENCODERS_PAD_B { F0 }
38-
#define ENCODER_RESOLUTION 4
39-
4036
/* COL2ROW, ROW2COL*/
4137
#define DIODE_DIRECTION COL2ROW
4238
#define RGB_DI_PIN D1

keyboards/abacus/info.json

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0x0000",
99
"device_version": "0.0.1"
1010
},
11+
"encoder": {
12+
"rotary": [
13+
{"pin_a": "F1", "pin_b": "F0"}
14+
]
15+
},
1116
"processor": "atmega32u4",
1217
"bootloader": "atmel-dfu",
1318
"layouts": {

keyboards/abstract/ellipse/rev1/config.h

-4
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
6464
//#define NO_ACTION_LAYER
6565
//#define NO_ACTION_TAPPING
6666
//#define NO_ACTION_ONESHOT
67-
68-
#define ENCODERS_PAD_A { B2, B3, D5 }
69-
#define ENCODERS_PAD_B { B1, B7, B4 }
70-
#define ENCODER_RESOLUTION 2

keyboards/abstract/ellipse/rev1/info.json

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
{
2-
"keyboard_name": "Ellipse",
2+
"keyboard_name": "Ellipse",
33
"manufacturer": "AbstractKB",
4-
"url": "https://abstractkb.tk/product/ellipse-rev1",
5-
"maintainer": "AbstractKB",
4+
"url": "https://abstractkb.tk/product/ellipse-rev1",
5+
"maintainer": "AbstractKB",
66
"usb": {
77
"vid": "0xFEED",
88
"pid": "0x0001",
99
"device_version": "0.0.1"
1010
},
11+
"encoder": {
12+
"rotary": [
13+
{"pin_a": "B2", "pin_b": "B1", "resolution": 2},
14+
{"pin_a": "B3", "pin_b": "B7", "resolution": 2},
15+
{"pin_a": "D5", "pin_b": "B4", "resolution": 2}
16+
]
17+
},
1118
"backlight": {
1219
"pin": "C6",
1320
"levels": 15

keyboards/acheron/shark/alpha/config.h

-5
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

1818
#pragma once
1919

20-
21-
/* encoder pads */
22-
#define ENCODERS_PAD_A { B6 }
23-
#define ENCODERS_PAD_B { B7 }
24-
2520
/*
2621
* Keyboard Matrix Assignments
2722
*

keyboards/acheron/shark/alpha/info.json

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
"pid": "0x5368",
77
"device_version": "0.0.1"
88
},
9+
"encoder": {
10+
"rotary": [
11+
{"pin_a": "B6", "pin_b": "B7"}
12+
]
13+
},
914
"backlight": {
1015
"pin": "B0"
1116
},

keyboards/acheron/shark/beta/config.h

-3
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
4949
#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
5050
#define WS2812_DMA_CHANNEL 6
5151

52-
#define ENCODERS_PAD_A { C15 }
53-
#define ENCODERS_PAD_B { C14 }
54-
5552
#define EEPROM_I2C_24LC256

keyboards/acheron/shark/beta/info.json

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
"pid": "0x5369",
55
"device_version": "0.0.2"
66
},
7+
"encoder": {
8+
"rotary": [
9+
{"pin_a": "C15", "pin_b": "C14"}
10+
]
11+
},
712
"backlight": {
813
"pin": "A6",
914
"levels": 20,

keyboards/adafruit/macropad/config.h

-4
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@
3737
#define SPI_MOSI_PIN GP27
3838
#define SPI_MISO_PIN GP28
3939

40-
/* Encoders */
41-
#define ENCODERS_PAD_A { GP18 }
42-
#define ENCODERS_PAD_B { GP17 }
43-
4440
/* Double tap the side button to enter bootloader */
4541
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
4642
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP13

keyboards/adafruit/macropad/info.json

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0x0108",
99
"device_version": "0.0.1"
1010
},
11+
"encoder": {
12+
"rotary": [
13+
{"pin_a": "GP18", "pin_b": "GP17"}
14+
]
15+
},
1116
"bootmagic": {
1217
"matrix": [1, 2]
1318
},

keyboards/adpenrose/akemipad/config.h

-6
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@
2020
/* COL2ROW, ROW2COL */
2121
#define DIODE_DIRECTION COL2ROW
2222

23-
/*Rotary encoder - set the resolution fitting your encoder.
24-
Most will need a value of 4. If 1 encoder click results in 2 keycodes sent
25-
increase the value. If you need 2 clicks for 1 keycode, decrease*/
26-
#define ENCODER_RESOLUTION 4
27-
#define ENCODERS_PAD_A { B1 }
28-
#define ENCODERS_PAD_B { B3 }
2923
#define TAP_CODE_DELAY 10
3024

3125
/* Audio functionality */

keyboards/adpenrose/akemipad/info.json

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
"pid": "0x0004",
88
"vid": "0x4450"
99
},
10+
"encoder": {
11+
"rotary": [
12+
{"pin_a": "B1", "pin_b": "B3"}
13+
]
14+
},
1015
"processor": "atmega32u4",
1116
"bootloader": "caterina",
1217
"layouts": {

0 commit comments

Comments
 (0)