From 7e0299117b389b1c7fcdfa2f20891ba2287ea771 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 26 Feb 2023 09:45:12 +1100 Subject: Move encoder config to data driven (#19923) Co-authored-by: Nick Brassel --- keyboards/work_louder/loop/config.h | 3 --- keyboards/work_louder/loop/info.json | 7 +++++++ keyboards/work_louder/micro/config.h | 5 ----- keyboards/work_louder/micro/info.json | 6 ++++++ keyboards/work_louder/nano/config.h | 5 ----- keyboards/work_louder/nano/info.json | 5 +++++ keyboards/work_louder/work_board/config.h | 5 ----- keyboards/work_louder/work_board/info.json | 5 +++++ 8 files changed, 23 insertions(+), 18 deletions(-) (limited to 'keyboards/work_louder') diff --git a/keyboards/work_louder/loop/config.h b/keyboards/work_louder/loop/config.h index 6b00a7f6c7..1e17946cef 100644 --- a/keyboards/work_louder/loop/config.h +++ b/keyboards/work_louder/loop/config.h @@ -130,6 +130,3 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -#define ENCODERS_PAD_A { D0, D2, D5 } -#define ENCODERS_PAD_B { D1, D3, D4 } diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json index 25641426d1..df4a5c1be0 100644 --- a/keyboards/work_louder/loop/info.json +++ b/keyboards/work_louder/loop/info.json @@ -7,6 +7,13 @@ "vid": "0x574C", "pid": "0x1DF9" }, + "encoder": { + "rotary": [ + {"pin_a": "D0", "pin_b": "D1"}, + {"pin_a": "D2", "pin_b": "D3"}, + {"pin_a": "D5", "pin_b": "D4"} + ] + }, "bootmagic": { "matrix": [0, 11] }, diff --git a/keyboards/work_louder/micro/config.h b/keyboards/work_louder/micro/config.h index a874f21761..bfe04592ac 100644 --- a/keyboards/work_louder/micro/config.h +++ b/keyboards/work_louder/micro/config.h @@ -80,11 +80,6 @@ //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -#define ENCODERS_PAD_A \ - { D4, B0 } -#define ENCODERS_PAD_B \ - { D6, B1 } - #define WORK_LOUDER_LED_PIN_1 B6 #define WORK_LOUDER_LED_PIN_2 B7 #define WORK_LOUDER_LED_PIN_3 B5 diff --git a/keyboards/work_louder/micro/info.json b/keyboards/work_louder/micro/info.json index b3bfcd6a13..3627122102 100644 --- a/keyboards/work_louder/micro/info.json +++ b/keyboards/work_louder/micro/info.json @@ -45,6 +45,12 @@ "pid": "0xE6E3", "vid": "0x574C" }, + "encoder": { + "rotary": [ + {"pin_a": "D4", "pin_b": "D6"}, + {"pin_a": "B0", "pin_b": "B1"} + ] + }, "build": { "lto": true }, diff --git a/keyboards/work_louder/nano/config.h b/keyboards/work_louder/nano/config.h index 770da02bfe..9148cf1abf 100644 --- a/keyboards/work_louder/nano/config.h +++ b/keyboards/work_louder/nano/config.h @@ -130,8 +130,3 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -#define ENCODERS_PAD_A \ - { D7 } -#define ENCODERS_PAD_B \ - { B4 } diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json index 1f33088a7c..3eb050b92a 100644 --- a/keyboards/work_louder/nano/info.json +++ b/keyboards/work_louder/nano/info.json @@ -8,6 +8,11 @@ "pid": "0xE6F0", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "D7", "pin_b": "B4"} + ] + }, "bootmagic": { "matrix": [0, 2] }, diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h index 47bb15d1be..d9da63eb50 100644 --- a/keyboards/work_louder/work_board/config.h +++ b/keyboards/work_louder/work_board/config.h @@ -134,9 +134,4 @@ along with this program. If not, see . //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -#define ENCODERS_PAD_A \ - { B0 } -#define ENCODERS_PAD_B \ - { B1 } - #define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x1 diff --git a/keyboards/work_louder/work_board/info.json b/keyboards/work_louder/work_board/info.json index e354390d83..5e934e90e0 100644 --- a/keyboards/work_louder/work_board/info.json +++ b/keyboards/work_louder/work_board/info.json @@ -7,6 +7,11 @@ "vid": "0x574C", "pid": "0xDCD1" }, + "encoder": { + "rotary": [ + {"pin_a": "B0", "pin_b": "B1"} + ] + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { -- cgit v1.2.3