From f6dd8dea2e493dc549a60fee99de871c4088d09a Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Tue, 31 Jan 2023 06:03:30 +1100 Subject: Remove usages of config_common.h from config.h files. (#19714) --- keyboards/nopunin10did/jabberwocky/v1/config.h | 1 - keyboards/nopunin10did/jabberwocky/v2/config.h | 1 - keyboards/nopunin10did/kastenwagen1840/config.h | 1 - keyboards/nopunin10did/kastenwagen48/config.h | 1 - keyboards/nopunin10did/railroad/rev0/config.h | 1 - 5 files changed, 5 deletions(-) (limited to 'keyboards/nopunin10did') diff --git a/keyboards/nopunin10did/jabberwocky/v1/config.h b/keyboards/nopunin10did/jabberwocky/v1/config.h index cb4f238852..8a444b28cc 100644 --- a/keyboards/nopunin10did/jabberwocky/v1/config.h +++ b/keyboards/nopunin10did/jabberwocky/v1/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 12 diff --git a/keyboards/nopunin10did/jabberwocky/v2/config.h b/keyboards/nopunin10did/jabberwocky/v2/config.h index b339209402..9f186bd0dd 100644 --- a/keyboards/nopunin10did/jabberwocky/v2/config.h +++ b/keyboards/nopunin10did/jabberwocky/v2/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 12 diff --git a/keyboards/nopunin10did/kastenwagen1840/config.h b/keyboards/nopunin10did/kastenwagen1840/config.h index 714bed1b0e..66d8c57132 100644 --- a/keyboards/nopunin10did/kastenwagen1840/config.h +++ b/keyboards/nopunin10did/kastenwagen1840/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 8 diff --git a/keyboards/nopunin10did/kastenwagen48/config.h b/keyboards/nopunin10did/kastenwagen48/config.h index 1ced831ad9..3f0506c83f 100644 --- a/keyboards/nopunin10did/kastenwagen48/config.h +++ b/keyboards/nopunin10did/kastenwagen48/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 8 diff --git a/keyboards/nopunin10did/railroad/rev0/config.h b/keyboards/nopunin10did/railroad/rev0/config.h index b092687229..6f36d0be91 100644 --- a/keyboards/nopunin10did/railroad/rev0/config.h +++ b/keyboards/nopunin10did/railroad/rev0/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 10 -- cgit v1.2.3 From ebb512db827e84619e7151fcf76e3daf9328fe59 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 4 Feb 2023 06:19:58 +1100 Subject: Debounce defines cleanup (#19742) * Clean up `DEBOUNCE` in config.h, 0-9 * Clean up `DEBOUNCE` in config.h, A * Clean up `DEBOUNCE` in config.h, B * Clean up `DEBOUNCE` in config.h, C * Clean up `DEBOUNCE` in config.h, D * Clean up `DEBOUNCE` in config.h, E * Clean up `DEBOUNCE` in config.h, F * Clean up `DEBOUNCE` in config.h, G * Clean up `DEBOUNCE` in config.h, H * Clean up `DEBOUNCE` in config.h, handwired * Clean up `DEBOUNCE` in config.h, I * Clean up `DEBOUNCE` in config.h, J * Clean up `DEBOUNCE` in config.h, K * Clean up `DEBOUNCE` in config.h, L * Clean up `DEBOUNCE` in config.h, M * Clean up `DEBOUNCE` in config.h, N * Clean up `DEBOUNCE` in config.h, O * Clean up `DEBOUNCE` in config.h, P * Clean up `DEBOUNCE` in config.h, Q * Clean up `DEBOUNCE` in config.h, R * Clean up `DEBOUNCE` in config.h, S * Clean up `DEBOUNCE` in config.h, T * Clean up `DEBOUNCE` in config.h, U * Clean up `DEBOUNCE` in config.h, V * Clean up `DEBOUNCE` in config.h, W * Clean up `DEBOUNCE` in config.h, X * Clean up `DEBOUNCE` in config.h, Y * Clean up `DEBOUNCE` in config.h, Z * Remove default debounce from info.json * Migrate non-default debounce to info.json --- keyboards/nopunin10did/jabberwocky/v1/config.h | 3 --- keyboards/nopunin10did/jabberwocky/v2/config.h | 3 --- keyboards/nopunin10did/kastenwagen1840/config.h | 3 --- keyboards/nopunin10did/kastenwagen48/config.h | 3 --- keyboards/nopunin10did/railroad/rev0/config.h | 3 --- 5 files changed, 15 deletions(-) (limited to 'keyboards/nopunin10did') diff --git a/keyboards/nopunin10did/jabberwocky/v1/config.h b/keyboards/nopunin10did/jabberwocky/v1/config.h index 8a444b28cc..cb9c63ac85 100644 --- a/keyboards/nopunin10did/jabberwocky/v1/config.h +++ b/keyboards/nopunin10did/jabberwocky/v1/config.h @@ -32,9 +32,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/nopunin10did/jabberwocky/v2/config.h b/keyboards/nopunin10did/jabberwocky/v2/config.h index 9f186bd0dd..0b36fcb8bb 100644 --- a/keyboards/nopunin10did/jabberwocky/v2/config.h +++ b/keyboards/nopunin10did/jabberwocky/v2/config.h @@ -36,9 +36,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/nopunin10did/kastenwagen1840/config.h b/keyboards/nopunin10did/kastenwagen1840/config.h index 66d8c57132..bb6ab49a3a 100644 --- a/keyboards/nopunin10did/kastenwagen1840/config.h +++ b/keyboards/nopunin10did/kastenwagen1840/config.h @@ -37,6 +37,3 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 diff --git a/keyboards/nopunin10did/kastenwagen48/config.h b/keyboards/nopunin10did/kastenwagen48/config.h index 3f0506c83f..62677bbc56 100644 --- a/keyboards/nopunin10did/kastenwagen48/config.h +++ b/keyboards/nopunin10did/kastenwagen48/config.h @@ -37,6 +37,3 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 diff --git a/keyboards/nopunin10did/railroad/rev0/config.h b/keyboards/nopunin10did/railroad/rev0/config.h index 6f36d0be91..3844a1d33a 100644 --- a/keyboards/nopunin10did/railroad/rev0/config.h +++ b/keyboards/nopunin10did/railroad/rev0/config.h @@ -28,9 +28,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE -- cgit v1.2.3 From f9aeea64c1f85d388485503e52035b5f7533ed26 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 8 Feb 2023 18:41:46 +1100 Subject: Migrate `MCU` and `BOOTLOADER` to data-driven (#19529) --- keyboards/nopunin10did/jabberwocky/v1/info.json | 2 ++ keyboards/nopunin10did/jabberwocky/v1/rules.mk | 6 ------ keyboards/nopunin10did/jabberwocky/v2/info.json | 2 ++ keyboards/nopunin10did/jabberwocky/v2/rules.mk | 6 ------ keyboards/nopunin10did/kastenwagen1840/info.json | 2 ++ keyboards/nopunin10did/kastenwagen1840/rules.mk | 6 ------ keyboards/nopunin10did/kastenwagen48/info.json | 2 ++ keyboards/nopunin10did/kastenwagen48/rules.mk | 6 ------ keyboards/nopunin10did/railroad/rev0/info.json | 2 ++ keyboards/nopunin10did/railroad/rev0/rules.mk | 6 ------ 10 files changed, 10 insertions(+), 30 deletions(-) (limited to 'keyboards/nopunin10did') diff --git a/keyboards/nopunin10did/jabberwocky/v1/info.json b/keyboards/nopunin10did/jabberwocky/v1/info.json index 8145f282d7..bc6fbd9d64 100644 --- a/keyboards/nopunin10did/jabberwocky/v1/info.json +++ b/keyboards/nopunin10did/jabberwocky/v1/info.json @@ -8,6 +8,8 @@ "pid": "0x4A57", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_rh": { "layout": [ diff --git a/keyboards/nopunin10did/jabberwocky/v1/rules.mk b/keyboards/nopunin10did/jabberwocky/v1/rules.mk index 476cf49f27..3b6a1809db 100644 --- a/keyboards/nopunin10did/jabberwocky/v1/rules.mk +++ b/keyboards/nopunin10did/jabberwocky/v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nopunin10did/jabberwocky/v2/info.json b/keyboards/nopunin10did/jabberwocky/v2/info.json index 6cccff491b..d189f18126 100644 --- a/keyboards/nopunin10did/jabberwocky/v2/info.json +++ b/keyboards/nopunin10did/jabberwocky/v2/info.json @@ -8,6 +8,8 @@ "pid": "0x4A58", "device_version": "0.2.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_lh": { "layout": [ diff --git a/keyboards/nopunin10did/jabberwocky/v2/rules.mk b/keyboards/nopunin10did/jabberwocky/v2/rules.mk index 9d065177d4..ae0d08d802 100644 --- a/keyboards/nopunin10did/jabberwocky/v2/rules.mk +++ b/keyboards/nopunin10did/jabberwocky/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nopunin10did/kastenwagen1840/info.json b/keyboards/nopunin10did/kastenwagen1840/info.json index 1ca9e7a5a5..07a1ce0a10 100644 --- a/keyboards/nopunin10did/kastenwagen1840/info.json +++ b/keyboards/nopunin10did/kastenwagen1840/info.json @@ -8,6 +8,8 @@ "pid": "0x4B57", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/nopunin10did/kastenwagen1840/rules.mk b/keyboards/nopunin10did/kastenwagen1840/rules.mk index 61eb7eafb0..0cf05c09d1 100644 --- a/keyboards/nopunin10did/kastenwagen1840/rules.mk +++ b/keyboards/nopunin10did/kastenwagen1840/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nopunin10did/kastenwagen48/info.json b/keyboards/nopunin10did/kastenwagen48/info.json index d2acb89eff..a1333c1c5e 100644 --- a/keyboards/nopunin10did/kastenwagen48/info.json +++ b/keyboards/nopunin10did/kastenwagen48/info.json @@ -8,6 +8,8 @@ "pid": "0x4B30", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/nopunin10did/kastenwagen48/rules.mk b/keyboards/nopunin10did/kastenwagen48/rules.mk index 61eb7eafb0..0cf05c09d1 100644 --- a/keyboards/nopunin10did/kastenwagen48/rules.mk +++ b/keyboards/nopunin10did/kastenwagen48/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nopunin10did/railroad/rev0/info.json b/keyboards/nopunin10did/railroad/rev0/info.json index ef82004a79..8a89b6c287 100644 --- a/keyboards/nopunin10did/railroad/rev0/info.json +++ b/keyboards/nopunin10did/railroad/rev0/info.json @@ -8,6 +8,8 @@ "pid": "0x9111", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nopunin10did/railroad/rev0/rules.mk b/keyboards/nopunin10did/railroad/rev0/rules.mk index 476cf49f27..3b6a1809db 100644 --- a/keyboards/nopunin10did/railroad/rev0/rules.mk +++ b/keyboards/nopunin10did/railroad/rev0/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # -- cgit v1.2.3 From f4ba17c4a0ee59603c167b04f2d6f6eee8b2cf1b Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 13:14:29 +1100 Subject: Move LED indicator config to data driven (#19800) --- keyboards/nopunin10did/jabberwocky/v1/config.h | 4 ---- keyboards/nopunin10did/jabberwocky/v1/info.json | 4 ++++ keyboards/nopunin10did/jabberwocky/v2/config.h | 3 --- keyboards/nopunin10did/jabberwocky/v2/info.json | 4 ++++ 4 files changed, 8 insertions(+), 7 deletions(-) (limited to 'keyboards/nopunin10did') diff --git a/keyboards/nopunin10did/jabberwocky/v1/config.h b/keyboards/nopunin10did/jabberwocky/v1/config.h index cb9c63ac85..9c761afdcd 100644 --- a/keyboards/nopunin10did/jabberwocky/v1/config.h +++ b/keyboards/nopunin10did/jabberwocky/v1/config.h @@ -25,10 +25,6 @@ #define MATRIX_ROW_PINS { E6, B4, B5, B7, D5, C7, F1, F0, B1, B3, B2, B6 } #define MATRIX_COL_PINS { F4, F5, F6, F7, D7, C6, D4, D0, D2, D3 } -/* Indicator LEDs */ -#define LED_NUM_LOCK_PIN D1 -#define LED_CAPS_LOCK_PIN B0 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/nopunin10did/jabberwocky/v1/info.json b/keyboards/nopunin10did/jabberwocky/v1/info.json index bc6fbd9d64..bbf52486b9 100644 --- a/keyboards/nopunin10did/jabberwocky/v1/info.json +++ b/keyboards/nopunin10did/jabberwocky/v1/info.json @@ -8,6 +8,10 @@ "pid": "0x4A57", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "B0", + "num_lock": "D1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/nopunin10did/jabberwocky/v2/config.h b/keyboards/nopunin10did/jabberwocky/v2/config.h index 0b36fcb8bb..72c6e87eb9 100644 --- a/keyboards/nopunin10did/jabberwocky/v2/config.h +++ b/keyboards/nopunin10did/jabberwocky/v2/config.h @@ -27,9 +27,6 @@ /* LED Configuration */ #define BACKLIGHT_PINS {D6} -// To have all lights shine uniformly, add C6 and B7 to the list above, then undefine the constants below. -#define LED_NUM_LOCK_PIN C6 -#define LED_CAPS_LOCK_PIN B7 #define BACKLIGHT_LEVELS 6 diff --git a/keyboards/nopunin10did/jabberwocky/v2/info.json b/keyboards/nopunin10did/jabberwocky/v2/info.json index d189f18126..f577c96ddb 100644 --- a/keyboards/nopunin10did/jabberwocky/v2/info.json +++ b/keyboards/nopunin10did/jabberwocky/v2/info.json @@ -8,6 +8,10 @@ "pid": "0x4A58", "device_version": "0.2.0" }, + "indicators": { + "caps_lock": "B7", + "num_lock": "C6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { -- cgit v1.2.3 From 2da0827d4ffbcba161126d6001f370e97d0172a8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 16:08:25 +1100 Subject: Remove matrix size defines (#19581) --- keyboards/nopunin10did/jabberwocky/v1/config.h | 4 ---- keyboards/nopunin10did/jabberwocky/v2/config.h | 4 ---- keyboards/nopunin10did/kastenwagen1840/config.h | 4 ---- keyboards/nopunin10did/kastenwagen48/config.h | 4 ---- keyboards/nopunin10did/railroad/rev0/config.h | 4 ---- 5 files changed, 20 deletions(-) (limited to 'keyboards/nopunin10did') diff --git a/keyboards/nopunin10did/jabberwocky/v1/config.h b/keyboards/nopunin10did/jabberwocky/v1/config.h index 9c761afdcd..bec3df0189 100644 --- a/keyboards/nopunin10did/jabberwocky/v1/config.h +++ b/keyboards/nopunin10did/jabberwocky/v1/config.h @@ -17,10 +17,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 12 -#define MATRIX_COLS 10 - /* key matrix pins */ #define MATRIX_ROW_PINS { E6, B4, B5, B7, D5, C7, F1, F0, B1, B3, B2, B6 } #define MATRIX_COL_PINS { F4, F5, F6, F7, D7, C6, D4, D0, D2, D3 } diff --git a/keyboards/nopunin10did/jabberwocky/v2/config.h b/keyboards/nopunin10did/jabberwocky/v2/config.h index 72c6e87eb9..9e3df3181f 100644 --- a/keyboards/nopunin10did/jabberwocky/v2/config.h +++ b/keyboards/nopunin10did/jabberwocky/v2/config.h @@ -17,10 +17,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 12 -#define MATRIX_COLS 10 - /* key matrix pins */ #define MATRIX_ROW_PINS { B2, B3, B1, D4, B4, D1, E6, B0, F0, F1, F4, F5 } #define MATRIX_COL_PINS { D0, D2, D3, D5, B5, D7, F6, F7, C7, B6 } diff --git a/keyboards/nopunin10did/kastenwagen1840/config.h b/keyboards/nopunin10did/kastenwagen1840/config.h index bb6ab49a3a..4f154d3c69 100644 --- a/keyboards/nopunin10did/kastenwagen1840/config.h +++ b/keyboards/nopunin10did/kastenwagen1840/config.h @@ -17,10 +17,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 8 -#define MATRIX_COLS 9 - /* key matrix pins */ #define MATRIX_ROW_PINS { B4, B5, B7, D5, C7, F1, F0, B6 } #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, E6, D7 } diff --git a/keyboards/nopunin10did/kastenwagen48/config.h b/keyboards/nopunin10did/kastenwagen48/config.h index 62677bbc56..92a82ab267 100644 --- a/keyboards/nopunin10did/kastenwagen48/config.h +++ b/keyboards/nopunin10did/kastenwagen48/config.h @@ -17,10 +17,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 8 -#define MATRIX_COLS 8 - /* key matrix pins */ #define MATRIX_ROW_PINS { B4, B5, B7, D5, C7, F1, F0, B6 } #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, E6 } diff --git a/keyboards/nopunin10did/railroad/rev0/config.h b/keyboards/nopunin10did/railroad/rev0/config.h index 3844a1d33a..114cec9e0f 100644 --- a/keyboards/nopunin10did/railroad/rev0/config.h +++ b/keyboards/nopunin10did/railroad/rev0/config.h @@ -17,10 +17,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 10 -#define MATRIX_COLS 11 - /* key matrix pins */ #define MATRIX_ROW_PINS { D2, D3, D5, C6, C7, F6, F5, F4, F1, F0 } #define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D4, D6, D7, B4, B5, B6 } -- cgit v1.2.3 From 9c0ce80d7e7d266cfd2d8fb0d92889db06ea95ff Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 21 Feb 2023 12:05:40 +1100 Subject: Move backlight config to data driven, part 1 (#19887) --- keyboards/nopunin10did/jabberwocky/v2/config.h | 3 --- keyboards/nopunin10did/jabberwocky/v2/info.json | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/nopunin10did') diff --git a/keyboards/nopunin10did/jabberwocky/v2/config.h b/keyboards/nopunin10did/jabberwocky/v2/config.h index 9e3df3181f..367603694c 100644 --- a/keyboards/nopunin10did/jabberwocky/v2/config.h +++ b/keyboards/nopunin10did/jabberwocky/v2/config.h @@ -21,9 +21,6 @@ #define MATRIX_ROW_PINS { B2, B3, B1, D4, B4, D1, E6, B0, F0, F1, F4, F5 } #define MATRIX_COL_PINS { D0, D2, D3, D5, B5, D7, F6, F7, C7, B6 } -/* LED Configuration */ -#define BACKLIGHT_PINS {D6} - #define BACKLIGHT_LEVELS 6 /* COL2ROW or ROW2COL */ diff --git a/keyboards/nopunin10did/jabberwocky/v2/info.json b/keyboards/nopunin10did/jabberwocky/v2/info.json index f577c96ddb..ea7f59ed8d 100644 --- a/keyboards/nopunin10did/jabberwocky/v2/info.json +++ b/keyboards/nopunin10did/jabberwocky/v2/info.json @@ -8,6 +8,9 @@ "pid": "0x4A58", "device_version": "0.2.0" }, + "backlight": { + "pins": ["D6"] + }, "indicators": { "caps_lock": "B7", "num_lock": "C6" -- cgit v1.2.3 From 314f6c1ddba09851b33e4f3b4bd43bdbc55f9628 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 26 Feb 2023 08:37:57 +1100 Subject: Move backlight config to data driven (#19910) --- keyboards/nopunin10did/jabberwocky/v2/config.h | 2 -- keyboards/nopunin10did/jabberwocky/v2/info.json | 4 +++- keyboards/nopunin10did/jabberwocky/v2/rules.mk | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'keyboards/nopunin10did') diff --git a/keyboards/nopunin10did/jabberwocky/v2/config.h b/keyboards/nopunin10did/jabberwocky/v2/config.h index 367603694c..0a91a41444 100644 --- a/keyboards/nopunin10did/jabberwocky/v2/config.h +++ b/keyboards/nopunin10did/jabberwocky/v2/config.h @@ -21,8 +21,6 @@ #define MATRIX_ROW_PINS { B2, B3, B1, D4, B4, D1, E6, B0, F0, F1, F4, F5 } #define MATRIX_COL_PINS { D0, D2, D3, D5, B5, D7, F6, F7, C7, B6 } -#define BACKLIGHT_LEVELS 6 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/nopunin10did/jabberwocky/v2/info.json b/keyboards/nopunin10did/jabberwocky/v2/info.json index ea7f59ed8d..a2b9d5a02c 100644 --- a/keyboards/nopunin10did/jabberwocky/v2/info.json +++ b/keyboards/nopunin10did/jabberwocky/v2/info.json @@ -9,7 +9,9 @@ "device_version": "0.2.0" }, "backlight": { - "pins": ["D6"] + "driver": "software", + "pins": ["D6"], + "levels": 6 }, "indicators": { "caps_lock": "B7", diff --git a/keyboards/nopunin10did/jabberwocky/v2/rules.mk b/keyboards/nopunin10did/jabberwocky/v2/rules.mk index ae0d08d802..b325f3f0c7 100644 --- a/keyboards/nopunin10did/jabberwocky/v2/rules.mk +++ b/keyboards/nopunin10did/jabberwocky/v2/rules.mk @@ -8,6 +8,5 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = software # Software-driven backlight driver RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -- cgit v1.2.3 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/nopunin10did/kastenwagen1840/config.h | 5 ----- keyboards/nopunin10did/kastenwagen1840/info.json | 6 ++++++ keyboards/nopunin10did/kastenwagen48/config.h | 5 ----- keyboards/nopunin10did/kastenwagen48/info.json | 6 ++++++ 4 files changed, 12 insertions(+), 10 deletions(-) (limited to 'keyboards/nopunin10did') diff --git a/keyboards/nopunin10did/kastenwagen1840/config.h b/keyboards/nopunin10did/kastenwagen1840/config.h index 4f154d3c69..80a7793edb 100644 --- a/keyboards/nopunin10did/kastenwagen1840/config.h +++ b/keyboards/nopunin10did/kastenwagen1840/config.h @@ -26,10 +26,5 @@ #define LED_INDICATOR_MID D4 #define LED_INDICATOR_BOT C6 -/* Rotary encoder rotation pins */ -#define ENCODERS_PAD_A { D0, D3 } -#define ENCODERS_PAD_B { D1, D2 } - - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/nopunin10did/kastenwagen1840/info.json b/keyboards/nopunin10did/kastenwagen1840/info.json index 07a1ce0a10..bf6b9234b0 100644 --- a/keyboards/nopunin10did/kastenwagen1840/info.json +++ b/keyboards/nopunin10did/kastenwagen1840/info.json @@ -8,6 +8,12 @@ "pid": "0x4B57", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "D0", "pin_b": "D1"}, + {"pin_a": "D3", "pin_b": "D2"} + ] + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/nopunin10did/kastenwagen48/config.h b/keyboards/nopunin10did/kastenwagen48/config.h index 92a82ab267..555a0c488f 100644 --- a/keyboards/nopunin10did/kastenwagen48/config.h +++ b/keyboards/nopunin10did/kastenwagen48/config.h @@ -26,10 +26,5 @@ #define LED_INDICATOR_MID D4 #define LED_INDICATOR_BOT C6 -/* Rotary encoder rotation pins */ -#define ENCODERS_PAD_A { D0, D3 } -#define ENCODERS_PAD_B { D1, D2 } - - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/nopunin10did/kastenwagen48/info.json b/keyboards/nopunin10did/kastenwagen48/info.json index a1333c1c5e..00fe51e381 100644 --- a/keyboards/nopunin10did/kastenwagen48/info.json +++ b/keyboards/nopunin10did/kastenwagen48/info.json @@ -8,6 +8,12 @@ "pid": "0x4B30", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "D0", "pin_b": "D1"}, + {"pin_a": "D3", "pin_b": "D2"} + ] + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { -- cgit v1.2.3