From 56555c61e1396a0b1f85105abe78f0a2b3a7c4f3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 10 Jan 2023 13:48:20 +1100 Subject: Migrate `LAYOUTS` to data driven (#19541) * Migrate `LAYOUTS` to data driven, 0-9 * Migrate `LAYOUTS` to data driven, A * Migrate `LAYOUTS` to data driven, B * Migrate `LAYOUTS` to data driven, C * Migrate `LAYOUTS` to data driven, D * Migrate `LAYOUTS` to data driven, E * Migrate `LAYOUTS` to data driven, F * Migrate `LAYOUTS` to data driven, G * Migrate `LAYOUTS` to data driven, H * Migrate `LAYOUTS` to data driven, handwired * Migrate `LAYOUTS` to data driven, I * Migrate `LAYOUTS` to data driven, J * Migrate `LAYOUTS` to data driven, K * Migrate `LAYOUTS` to data driven, L * Migrate `LAYOUTS` to data driven, M * Migrate `LAYOUTS` to data driven, N * Migrate `LAYOUTS` to data driven, O * Migrate `LAYOUTS` to data driven, P * Migrate `LAYOUTS` to data driven, Q * Migrate `LAYOUTS` to data driven, R * Migrate `LAYOUTS` to data driven, S * Migrate `LAYOUTS` to data driven, T * Migrate `LAYOUTS` to data driven, U * Migrate `LAYOUTS` to data driven, V * Migrate `LAYOUTS` to data driven, W * Migrate `LAYOUTS` to data driven, X * Migrate `LAYOUTS` to data driven, Y * Migrate `LAYOUTS` to data driven, Z --- keyboards/nightly_boards/alter/rev1/info.json | 1 + keyboards/nightly_boards/alter/rev1/rules.mk | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'keyboards/nightly_boards') diff --git a/keyboards/nightly_boards/alter/rev1/info.json b/keyboards/nightly_boards/alter/rev1/info.json index 7cad90c889..287d366096 100644 --- a/keyboards/nightly_boards/alter/rev1/info.json +++ b/keyboards/nightly_boards/alter/rev1/info.json @@ -8,6 +8,7 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "community_layouts": ["alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { "layout": [ diff --git a/keyboards/nightly_boards/alter/rev1/rules.mk b/keyboards/nightly_boards/alter/rev1/rules.mk index c16796046c..4df0b46807 100644 --- a/keyboards/nightly_boards/alter/rev1/rules.mk +++ b/keyboards/nightly_boards/alter/rev1/rules.mk @@ -16,5 +16,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output - -LAYOUTS = alice_split_bs -- cgit v1.2.3 From b7274343913eb3e019f0dc08fa8f7774165e787d Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 29 Jan 2023 02:42:44 +1100 Subject: Remove commented out backlight config & stray "backlight levels" (#19703) --- keyboards/nightly_boards/alter/rev1/config.h | 4 ---- keyboards/nightly_boards/n2/config.h | 4 ---- keyboards/nightly_boards/n87/config.h | 4 ---- keyboards/nightly_boards/n9/config.h | 4 ---- 4 files changed, 16 deletions(-) (limited to 'keyboards/nightly_boards') diff --git a/keyboards/nightly_boards/alter/rev1/config.h b/keyboards/nightly_boards/alter/rev1/config.h index b3b0c39feb..2e7e7f5c85 100644 --- a/keyboards/nightly_boards/alter/rev1/config.h +++ b/keyboards/nightly_boards/alter/rev1/config.h @@ -40,10 +40,6 @@ along with this program. If not, see . #define LED_CAPS_LOCK_PIN D6 #define LED_SCROLL_LOCK_PIN B4 -// #define BACKLIGHT_PIN F1 -// #define BACKLIGHT_BREATHING -// #define BACKLIGHT_LEVELS 3 - #define RGB_DI_PIN F1 #ifdef RGB_DI_PIN #define RGBLED_NUM 18 diff --git a/keyboards/nightly_boards/n2/config.h b/keyboards/nightly_boards/n2/config.h index 263305787b..fbf76ecb48 100644 --- a/keyboards/nightly_boards/n2/config.h +++ b/keyboards/nightly_boards/n2/config.h @@ -36,10 +36,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -// #define BACKLIGHT_PIN F1 -// #define BACKLIGHT_BREATHING -// #define BACKLIGHT_LEVELS 3 - #define RGB_DI_PIN D4 #ifdef RGB_DI_PIN #define RGBLED_NUM 2 diff --git a/keyboards/nightly_boards/n87/config.h b/keyboards/nightly_boards/n87/config.h index 344779ce2b..ed9a3e4932 100644 --- a/keyboards/nightly_boards/n87/config.h +++ b/keyboards/nightly_boards/n87/config.h @@ -44,10 +44,6 @@ along with this program. If not, see . */ // #define SOFT_SERIAL_PIN // or D1, D2, D3, E6 -// #define BACKLIGHT_PIN B7 -// #define BACKLIGHT_BREATHING -// #define BACKLIGHT_LEVELS 3 - #define RGB_DI_PIN D0 #ifdef RGB_DI_PIN #define RGBLED_NUM 16 diff --git a/keyboards/nightly_boards/n9/config.h b/keyboards/nightly_boards/n9/config.h index dd4b85b6f7..f729796fe6 100644 --- a/keyboards/nightly_boards/n9/config.h +++ b/keyboards/nightly_boards/n9/config.h @@ -36,10 +36,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -// #define BACKLIGHT_PIN F1 -// #define BACKLIGHT_BREATHING -// #define BACKLIGHT_LEVELS 3 - #define RGB_DI_PIN F5 #ifdef RGB_DI_PIN #define RGBLED_NUM 8 -- cgit v1.2.3 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/nightly_boards/adellein/config.h | 1 - keyboards/nightly_boards/alter/rev1/config.h | 1 - keyboards/nightly_boards/alter_lite/config.h | 1 - keyboards/nightly_boards/conde60/config.h | 1 - keyboards/nightly_boards/daily60/config.h | 1 - keyboards/nightly_boards/jisoo/config.h | 1 - keyboards/nightly_boards/n2/config.h | 1 - keyboards/nightly_boards/n40_o/config.h | 1 - keyboards/nightly_boards/n60_s/config.h | 1 - keyboards/nightly_boards/n87/config.h | 1 - keyboards/nightly_boards/n9/config.h | 1 - keyboards/nightly_boards/octopad/config.h | 1 - keyboards/nightly_boards/octopadplus/config.h | 1 - keyboards/nightly_boards/paraluman/config.h | 1 - keyboards/nightly_boards/ph_arisu/config.h | 1 - 15 files changed, 15 deletions(-) (limited to 'keyboards/nightly_boards') diff --git a/keyboards/nightly_boards/adellein/config.h b/keyboards/nightly_boards/adellein/config.h index 006a1031cd..f27c0837f8 100644 --- a/keyboards/nightly_boards/adellein/config.h +++ b/keyboards/nightly_boards/adellein/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 4 diff --git a/keyboards/nightly_boards/alter/rev1/config.h b/keyboards/nightly_boards/alter/rev1/config.h index 2e7e7f5c85..ec7b8f441e 100644 --- a/keyboards/nightly_boards/alter/rev1/config.h +++ b/keyboards/nightly_boards/alter/rev1/config.h @@ -14,7 +14,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 10 diff --git a/keyboards/nightly_boards/alter_lite/config.h b/keyboards/nightly_boards/alter_lite/config.h index 35f10a53e1..e542c41d4c 100644 --- a/keyboards/nightly_boards/alter_lite/config.h +++ b/keyboards/nightly_boards/alter_lite/config.h @@ -14,7 +14,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/nightly_boards/conde60/config.h b/keyboards/nightly_boards/conde60/config.h index 88b55deedf..b890a3f871 100644 --- a/keyboards/nightly_boards/conde60/config.h +++ b/keyboards/nightly_boards/conde60/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/nightly_boards/daily60/config.h b/keyboards/nightly_boards/daily60/config.h index 3b4187bca5..b99ce86cd8 100644 --- a/keyboards/nightly_boards/daily60/config.h +++ b/keyboards/nightly_boards/daily60/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/nightly_boards/jisoo/config.h b/keyboards/nightly_boards/jisoo/config.h index 3c60ac72f9..ae501d06ab 100644 --- a/keyboards/nightly_boards/jisoo/config.h +++ b/keyboards/nightly_boards/jisoo/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 6 diff --git a/keyboards/nightly_boards/n2/config.h b/keyboards/nightly_boards/n2/config.h index fbf76ecb48..94e334e758 100644 --- a/keyboards/nightly_boards/n2/config.h +++ b/keyboards/nightly_boards/n2/config.h @@ -14,7 +14,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 2 diff --git a/keyboards/nightly_boards/n40_o/config.h b/keyboards/nightly_boards/n40_o/config.h index c74db49836..99792e2c40 100644 --- a/keyboards/nightly_boards/n40_o/config.h +++ b/keyboards/nightly_boards/n40_o/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/nightly_boards/n60_s/config.h b/keyboards/nightly_boards/n60_s/config.h index d71fe7733e..e084bda659 100644 --- a/keyboards/nightly_boards/n60_s/config.h +++ b/keyboards/nightly_boards/n60_s/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 6 diff --git a/keyboards/nightly_boards/n87/config.h b/keyboards/nightly_boards/n87/config.h index ed9a3e4932..229ad8066b 100644 --- a/keyboards/nightly_boards/n87/config.h +++ b/keyboards/nightly_boards/n87/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 12 diff --git a/keyboards/nightly_boards/n9/config.h b/keyboards/nightly_boards/n9/config.h index f729796fe6..0eb944dd20 100644 --- a/keyboards/nightly_boards/n9/config.h +++ b/keyboards/nightly_boards/n9/config.h @@ -14,7 +14,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 3 diff --git a/keyboards/nightly_boards/octopad/config.h b/keyboards/nightly_boards/octopad/config.h index 0ab6c11b35..eb9acb9cb2 100644 --- a/keyboards/nightly_boards/octopad/config.h +++ b/keyboards/nightly_boards/octopad/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 3 diff --git a/keyboards/nightly_boards/octopadplus/config.h b/keyboards/nightly_boards/octopadplus/config.h index 3b2a7cea1a..14c9c4f2cf 100644 --- a/keyboards/nightly_boards/octopadplus/config.h +++ b/keyboards/nightly_boards/octopadplus/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 2 diff --git a/keyboards/nightly_boards/paraluman/config.h b/keyboards/nightly_boards/paraluman/config.h index 7d3101d116..d2db25ebe5 100644 --- a/keyboards/nightly_boards/paraluman/config.h +++ b/keyboards/nightly_boards/paraluman/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/nightly_boards/ph_arisu/config.h b/keyboards/nightly_boards/ph_arisu/config.h index 1173bca779..d49a5a0fd9 100644 --- a/keyboards/nightly_boards/ph_arisu/config.h +++ b/keyboards/nightly_boards/ph_arisu/config.h @@ -1,6 +1,5 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 10 -- cgit v1.2.3 From b867522f8cf90aef6f4531e669e35aba5ec0bf1c Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 31 Jan 2023 07:45:41 +1100 Subject: Clean up Force NKRO in config.h (#19718) --- keyboards/nightly_boards/n87/config.h | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'keyboards/nightly_boards') diff --git a/keyboards/nightly_boards/n87/config.h b/keyboards/nightly_boards/n87/config.h index 229ad8066b..d5a7ed70b0 100644 --- a/keyboards/nightly_boards/n87/config.h +++ b/keyboards/nightly_boards/n87/config.h @@ -91,27 +91,6 @@ along with this program. If not, see . */ // #define GRAVE_ESC_CTRL_OVERRIDE -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - /* * Feature disable options * These options are also useful to firmware size reduction. -- cgit v1.2.3 From f20a05440ed38bb3de754b2193e56d3e41a939a1 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 3 Feb 2023 11:04:10 +1100 Subject: Remove unused `MATRIX_HAS_GHOST` from config.h (#19726) --- keyboards/nightly_boards/adellein/config.h | 3 --- keyboards/nightly_boards/alter/rev1/config.h | 3 --- keyboards/nightly_boards/alter_lite/config.h | 3 --- keyboards/nightly_boards/conde60/config.h | 3 --- keyboards/nightly_boards/daily60/config.h | 3 --- keyboards/nightly_boards/jisoo/config.h | 3 --- keyboards/nightly_boards/n2/config.h | 3 --- keyboards/nightly_boards/n40_o/config.h | 3 --- keyboards/nightly_boards/n60_s/config.h | 3 --- keyboards/nightly_boards/n87/config.h | 3 --- keyboards/nightly_boards/n9/config.h | 3 --- keyboards/nightly_boards/octopad/config.h | 3 --- keyboards/nightly_boards/octopadplus/config.h | 3 --- keyboards/nightly_boards/paraluman/config.h | 3 --- 14 files changed, 42 deletions(-) (limited to 'keyboards/nightly_boards') diff --git a/keyboards/nightly_boards/adellein/config.h b/keyboards/nightly_boards/adellein/config.h index f27c0837f8..4c6b9324b5 100644 --- a/keyboards/nightly_boards/adellein/config.h +++ b/keyboards/nightly_boards/adellein/config.h @@ -67,9 +67,6 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/alter/rev1/config.h b/keyboards/nightly_boards/alter/rev1/config.h index ec7b8f441e..51b304bc5d 100644 --- a/keyboards/nightly_boards/alter/rev1/config.h +++ b/keyboards/nightly_boards/alter/rev1/config.h @@ -68,9 +68,6 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/alter_lite/config.h b/keyboards/nightly_boards/alter_lite/config.h index e542c41d4c..ac7b7ec1cf 100644 --- a/keyboards/nightly_boards/alter_lite/config.h +++ b/keyboards/nightly_boards/alter_lite/config.h @@ -43,9 +43,6 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/conde60/config.h b/keyboards/nightly_boards/conde60/config.h index b890a3f871..69e74687b8 100644 --- a/keyboards/nightly_boards/conde60/config.h +++ b/keyboards/nightly_boards/conde60/config.h @@ -57,9 +57,6 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/daily60/config.h b/keyboards/nightly_boards/daily60/config.h index b99ce86cd8..3876535413 100644 --- a/keyboards/nightly_boards/daily60/config.h +++ b/keyboards/nightly_boards/daily60/config.h @@ -41,9 +41,6 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/jisoo/config.h b/keyboards/nightly_boards/jisoo/config.h index ae501d06ab..1a1b08c26d 100644 --- a/keyboards/nightly_boards/jisoo/config.h +++ b/keyboards/nightly_boards/jisoo/config.h @@ -41,9 +41,6 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/n2/config.h b/keyboards/nightly_boards/n2/config.h index 94e334e758..b5a567478c 100644 --- a/keyboards/nightly_boards/n2/config.h +++ b/keyboards/nightly_boards/n2/config.h @@ -64,9 +64,6 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/n40_o/config.h b/keyboards/nightly_boards/n40_o/config.h index 99792e2c40..17a664f00b 100644 --- a/keyboards/nightly_boards/n40_o/config.h +++ b/keyboards/nightly_boards/n40_o/config.h @@ -73,9 +73,6 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/n60_s/config.h b/keyboards/nightly_boards/n60_s/config.h index e084bda659..390c304263 100644 --- a/keyboards/nightly_boards/n60_s/config.h +++ b/keyboards/nightly_boards/n60_s/config.h @@ -78,9 +78,6 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/n87/config.h b/keyboards/nightly_boards/n87/config.h index d5a7ed70b0..ea21111bb6 100644 --- a/keyboards/nightly_boards/n87/config.h +++ b/keyboards/nightly_boards/n87/config.h @@ -78,9 +78,6 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/n9/config.h b/keyboards/nightly_boards/n9/config.h index 0eb944dd20..41ea316622 100644 --- a/keyboards/nightly_boards/n9/config.h +++ b/keyboards/nightly_boards/n9/config.h @@ -64,9 +64,6 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/octopad/config.h b/keyboards/nightly_boards/octopad/config.h index eb9acb9cb2..68f0046735 100644 --- a/keyboards/nightly_boards/octopad/config.h +++ b/keyboards/nightly_boards/octopad/config.h @@ -74,9 +74,6 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/octopadplus/config.h b/keyboards/nightly_boards/octopadplus/config.h index 14c9c4f2cf..97da7d684c 100644 --- a/keyboards/nightly_boards/octopadplus/config.h +++ b/keyboards/nightly_boards/octopadplus/config.h @@ -50,9 +50,6 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/paraluman/config.h b/keyboards/nightly_boards/paraluman/config.h index d2db25ebe5..d5f3db69ac 100644 --- a/keyboards/nightly_boards/paraluman/config.h +++ b/keyboards/nightly_boards/paraluman/config.h @@ -41,9 +41,6 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ -- 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/nightly_boards/adellein/config.h | 3 --- keyboards/nightly_boards/alter/rev1/config.h | 3 --- keyboards/nightly_boards/alter_lite/config.h | 3 --- keyboards/nightly_boards/conde60/config.h | 3 --- keyboards/nightly_boards/daily60/config.h | 3 --- keyboards/nightly_boards/jisoo/config.h | 3 --- keyboards/nightly_boards/n2/config.h | 3 --- keyboards/nightly_boards/n40_o/config.h | 3 --- keyboards/nightly_boards/n60_s/config.h | 3 --- keyboards/nightly_boards/n87/config.h | 3 --- keyboards/nightly_boards/n9/config.h | 3 --- keyboards/nightly_boards/octopad/config.h | 3 --- keyboards/nightly_boards/octopadplus/config.h | 3 --- keyboards/nightly_boards/paraluman/config.h | 3 --- keyboards/nightly_boards/ph_arisu/config.h | 3 --- 15 files changed, 45 deletions(-) (limited to 'keyboards/nightly_boards') diff --git a/keyboards/nightly_boards/adellein/config.h b/keyboards/nightly_boards/adellein/config.h index 4c6b9324b5..77cbe4d54c 100644 --- a/keyboards/nightly_boards/adellein/config.h +++ b/keyboards/nightly_boards/adellein/config.h @@ -64,9 +64,6 @@ along with this program. If not, see . #define ENCODERS_CW_KEY { { 3, 3 } } #define ENCODERS_CCW_KEY { { 1, 3 } } -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/alter/rev1/config.h b/keyboards/nightly_boards/alter/rev1/config.h index 51b304bc5d..b545953fa0 100644 --- a/keyboards/nightly_boards/alter/rev1/config.h +++ b/keyboards/nightly_boards/alter/rev1/config.h @@ -65,9 +65,6 @@ along with this program. If not, see . // #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #endif -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/alter_lite/config.h b/keyboards/nightly_boards/alter_lite/config.h index ac7b7ec1cf..9c70ef3501 100644 --- a/keyboards/nightly_boards/alter_lite/config.h +++ b/keyboards/nightly_boards/alter_lite/config.h @@ -40,9 +40,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/conde60/config.h b/keyboards/nightly_boards/conde60/config.h index 69e74687b8..2a612a6305 100644 --- a/keyboards/nightly_boards/conde60/config.h +++ b/keyboards/nightly_boards/conde60/config.h @@ -54,9 +54,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/daily60/config.h b/keyboards/nightly_boards/daily60/config.h index 3876535413..aacba91cb7 100644 --- a/keyboards/nightly_boards/daily60/config.h +++ b/keyboards/nightly_boards/daily60/config.h @@ -38,9 +38,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/jisoo/config.h b/keyboards/nightly_boards/jisoo/config.h index 1a1b08c26d..12d08e94e6 100644 --- a/keyboards/nightly_boards/jisoo/config.h +++ b/keyboards/nightly_boards/jisoo/config.h @@ -38,9 +38,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/n2/config.h b/keyboards/nightly_boards/n2/config.h index b5a567478c..9c754f278b 100644 --- a/keyboards/nightly_boards/n2/config.h +++ b/keyboards/nightly_boards/n2/config.h @@ -61,9 +61,6 @@ along with this program. If not, see . // #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #endif -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/n40_o/config.h b/keyboards/nightly_boards/n40_o/config.h index 17a664f00b..ad5cae3f78 100644 --- a/keyboards/nightly_boards/n40_o/config.h +++ b/keyboards/nightly_boards/n40_o/config.h @@ -70,9 +70,6 @@ along with this program. If not, see . #define AUDIO_CLICKY -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/n60_s/config.h b/keyboards/nightly_boards/n60_s/config.h index 390c304263..14b3372bf2 100644 --- a/keyboards/nightly_boards/n60_s/config.h +++ b/keyboards/nightly_boards/n60_s/config.h @@ -75,9 +75,6 @@ along with this program. If not, see . #endif -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/n87/config.h b/keyboards/nightly_boards/n87/config.h index ea21111bb6..e51ba24aeb 100644 --- a/keyboards/nightly_boards/n87/config.h +++ b/keyboards/nightly_boards/n87/config.h @@ -75,9 +75,6 @@ along with this program. If not, see . #define NO_MUSIC_MODE -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/n9/config.h b/keyboards/nightly_boards/n9/config.h index 41ea316622..12f9e9715c 100644 --- a/keyboards/nightly_boards/n9/config.h +++ b/keyboards/nightly_boards/n9/config.h @@ -61,9 +61,6 @@ along with this program. If not, see . // #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #endif -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/octopad/config.h b/keyboards/nightly_boards/octopad/config.h index 68f0046735..31faf2f1ad 100644 --- a/keyboards/nightly_boards/octopad/config.h +++ b/keyboards/nightly_boards/octopad/config.h @@ -71,9 +71,6 @@ along with this program. If not, see . #define AUDIO_CLICKY #define NO_MUSIC_MODE -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/octopadplus/config.h b/keyboards/nightly_boards/octopadplus/config.h index 97da7d684c..f7b4dc918f 100644 --- a/keyboards/nightly_boards/octopadplus/config.h +++ b/keyboards/nightly_boards/octopadplus/config.h @@ -47,9 +47,6 @@ along with this program. If not, see . #define TAP_CODE_DELAY 10 #define ENCODER_RESOLUTION 5 -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/paraluman/config.h b/keyboards/nightly_boards/paraluman/config.h index d5f3db69ac..e555b680f5 100644 --- a/keyboards/nightly_boards/paraluman/config.h +++ b/keyboards/nightly_boards/paraluman/config.h @@ -38,9 +38,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/ph_arisu/config.h b/keyboards/nightly_boards/ph_arisu/config.h index d49a5a0fd9..209e3ed275 100644 --- a/keyboards/nightly_boards/ph_arisu/config.h +++ b/keyboards/nightly_boards/ph_arisu/config.h @@ -12,9 +12,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 a988f8a169112e31b21ff7c61870ab483c396cf3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 6 Feb 2023 13:40:23 +1100 Subject: Remove unused `GRAVE_ESC_CTRL_OVERRIDE` from config.h (#19752) --- keyboards/nightly_boards/n87/config.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'keyboards/nightly_boards') diff --git a/keyboards/nightly_boards/n87/config.h b/keyboards/nightly_boards/n87/config.h index e51ba24aeb..bfd089a423 100644 --- a/keyboards/nightly_boards/n87/config.h +++ b/keyboards/nightly_boards/n87/config.h @@ -80,11 +80,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is userful for the Windows task manager shortcut (ctrl+shift+esc). - */ -// #define GRAVE_ESC_CTRL_OVERRIDE - /* * Feature disable options * These options are also useful to firmware size reduction. -- cgit v1.2.3 From 11b6bb8179ce93c5954c96e24ef6dd09c497a131 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 7 Feb 2023 11:05:37 +1100 Subject: Remove unused Bootmagic row/col defines from config.h (#19761) --- keyboards/nightly_boards/n87/config.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'keyboards/nightly_boards') diff --git a/keyboards/nightly_boards/n87/config.h b/keyboards/nightly_boards/n87/config.h index bfd089a423..9432e2421a 100644 --- a/keyboards/nightly_boards/n87/config.h +++ b/keyboards/nightly_boards/n87/config.h @@ -95,7 +95,3 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -/* Bootmagic Lite key configuration */ -// #define BOOTMAGIC_LITE_ROW 0 -// #define BOOTMAGIC_LITE_COLUMN 0 -- cgit v1.2.3 From 8d6bf19fc78fe372cd42486718d753f342895d2f Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 8 Feb 2023 01:46:51 +1100 Subject: Remove unused `SOFT_SERIAL_PIN` from config.h (#19768) --- keyboards/nightly_boards/n87/config.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'keyboards/nightly_boards') diff --git a/keyboards/nightly_boards/n87/config.h b/keyboards/nightly_boards/n87/config.h index 9432e2421a..bbaacce192 100644 --- a/keyboards/nightly_boards/n87/config.h +++ b/keyboards/nightly_boards/n87/config.h @@ -38,11 +38,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* - * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. - */ -// #define SOFT_SERIAL_PIN // or D1, D2, D3, E6 - #define RGB_DI_PIN D0 #ifdef RGB_DI_PIN #define RGBLED_NUM 16 -- 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/nightly_boards/adellein/info.json | 2 ++ keyboards/nightly_boards/adellein/rules.mk | 6 ------ keyboards/nightly_boards/alter/rev1/info.json | 2 ++ keyboards/nightly_boards/alter/rev1/rules.mk | 6 ------ keyboards/nightly_boards/alter_lite/info.json | 2 ++ keyboards/nightly_boards/alter_lite/rules.mk | 6 ------ keyboards/nightly_boards/conde60/info.json | 2 ++ keyboards/nightly_boards/conde60/rules.mk | 6 ------ keyboards/nightly_boards/daily60/info.json | 2 ++ keyboards/nightly_boards/daily60/rules.mk | 6 ------ keyboards/nightly_boards/jisoo/info.json | 2 ++ keyboards/nightly_boards/jisoo/rules.mk | 6 ------ keyboards/nightly_boards/n2/info.json | 2 ++ keyboards/nightly_boards/n2/rules.mk | 6 ------ keyboards/nightly_boards/n40_o/info.json | 2 ++ keyboards/nightly_boards/n40_o/rules.mk | 6 ------ keyboards/nightly_boards/n60_s/info.json | 2 ++ keyboards/nightly_boards/n60_s/rules.mk | 6 ------ keyboards/nightly_boards/n87/info.json | 2 ++ keyboards/nightly_boards/n87/rules.mk | 6 ------ keyboards/nightly_boards/n9/info.json | 2 ++ keyboards/nightly_boards/n9/rules.mk | 6 ------ keyboards/nightly_boards/octopad/info.json | 2 ++ keyboards/nightly_boards/octopad/rules.mk | 6 ------ keyboards/nightly_boards/octopadplus/info.json | 2 ++ keyboards/nightly_boards/octopadplus/rules.mk | 6 ------ keyboards/nightly_boards/paraluman/info.json | 2 ++ keyboards/nightly_boards/paraluman/rules.mk | 6 ------ keyboards/nightly_boards/ph_arisu/info.json | 2 ++ keyboards/nightly_boards/ph_arisu/rules.mk | 6 ------ 30 files changed, 30 insertions(+), 90 deletions(-) (limited to 'keyboards/nightly_boards') diff --git a/keyboards/nightly_boards/adellein/info.json b/keyboards/nightly_boards/adellein/info.json index 08a0eeb040..58b49b3290 100644 --- a/keyboards/nightly_boards/adellein/info.json +++ b/keyboards/nightly_boards/adellein/info.json @@ -8,6 +8,8 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_40ergo_split_ent": { "layout": [ diff --git a/keyboards/nightly_boards/adellein/rules.mk b/keyboards/nightly_boards/adellein/rules.mk index 84d2a87564..8daf6a353a 100644 --- a/keyboards/nightly_boards/adellein/rules.mk +++ b/keyboards/nightly_boards/adellein/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/nightly_boards/alter/rev1/info.json b/keyboards/nightly_boards/alter/rev1/info.json index 287d366096..122f7fb38f 100644 --- a/keyboards/nightly_boards/alter/rev1/info.json +++ b/keyboards/nightly_boards/alter/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { diff --git a/keyboards/nightly_boards/alter/rev1/rules.mk b/keyboards/nightly_boards/alter/rev1/rules.mk index 4df0b46807..178b634fcb 100644 --- a/keyboards/nightly_boards/alter/rev1/rules.mk +++ b/keyboards/nightly_boards/alter/rev1/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/nightly_boards/alter_lite/info.json b/keyboards/nightly_boards/alter_lite/info.json index 2f4d6b8343..72fea11f33 100644 --- a/keyboards/nightly_boards/alter_lite/info.json +++ b/keyboards/nightly_boards/alter_lite/info.json @@ -8,6 +8,8 @@ "pid": "0x0013", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nightly_boards/alter_lite/rules.mk b/keyboards/nightly_boards/alter_lite/rules.mk index 334299a9eb..1576a6efb6 100644 --- a/keyboards/nightly_boards/alter_lite/rules.mk +++ b/keyboards/nightly_boards/alter_lite/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/nightly_boards/conde60/info.json b/keyboards/nightly_boards/conde60/info.json index 97c10ca29c..67c415381c 100644 --- a/keyboards/nightly_boards/conde60/info.json +++ b/keyboards/nightly_boards/conde60/info.json @@ -8,6 +8,8 @@ "pid": "0x0015", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nightly_boards/conde60/rules.mk b/keyboards/nightly_boards/conde60/rules.mk index 806f708f99..4bbc6892bc 100644 --- a/keyboards/nightly_boards/conde60/rules.mk +++ b/keyboards/nightly_boards/conde60/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/nightly_boards/daily60/info.json b/keyboards/nightly_boards/daily60/info.json index cc89e20d54..afb674faf4 100644 --- a/keyboards/nightly_boards/daily60/info.json +++ b/keyboards/nightly_boards/daily60/info.json @@ -7,6 +7,8 @@ "pid": "0x0024", "device_version": "0.0.1" }, + "processor": "RP2040", + "bootloader": "rp2040", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/nightly_boards/daily60/rules.mk b/keyboards/nightly_boards/daily60/rules.mk index 659b7fede0..0cd6926a62 100644 --- a/keyboards/nightly_boards/daily60/rules.mk +++ b/keyboards/nightly_boards/daily60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # Build Options # change yes to no to disable # diff --git a/keyboards/nightly_boards/jisoo/info.json b/keyboards/nightly_boards/jisoo/info.json index f70aa8c7ab..a2a4418541 100644 --- a/keyboards/nightly_boards/jisoo/info.json +++ b/keyboards/nightly_boards/jisoo/info.json @@ -7,6 +7,8 @@ "pid": "0x0025", "device_version": "0.0.1" }, + "processor": "RP2040", + "bootloader": "rp2040", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nightly_boards/jisoo/rules.mk b/keyboards/nightly_boards/jisoo/rules.mk index 659b7fede0..0cd6926a62 100644 --- a/keyboards/nightly_boards/jisoo/rules.mk +++ b/keyboards/nightly_boards/jisoo/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # Build Options # change yes to no to disable # diff --git a/keyboards/nightly_boards/n2/info.json b/keyboards/nightly_boards/n2/info.json index e5cd739223..8339bedc87 100644 --- a/keyboards/nightly_boards/n2/info.json +++ b/keyboards/nightly_boards/n2/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":0, "y":1}] diff --git a/keyboards/nightly_boards/n2/rules.mk b/keyboards/nightly_boards/n2/rules.mk index a0a1e94e36..a927de843c 100644 --- a/keyboards/nightly_boards/n2/rules.mk +++ b/keyboards/nightly_boards/n2/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/nightly_boards/n40_o/info.json b/keyboards/nightly_boards/n40_o/info.json index 6f1748a7ab..e2ccad4db3 100644 --- a/keyboards/nightly_boards/n40_o/info.json +++ b/keyboards/nightly_boards/n40_o/info.json @@ -8,6 +8,8 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_4x13_encoders": { "layout": [ diff --git a/keyboards/nightly_boards/n40_o/rules.mk b/keyboards/nightly_boards/n40_o/rules.mk index e8d7ea59ba..f1189a87d2 100644 --- a/keyboards/nightly_boards/n40_o/rules.mk +++ b/keyboards/nightly_boards/n40_o/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/nightly_boards/n60_s/info.json b/keyboards/nightly_boards/n60_s/info.json index 473dd14122..37a0d3895c 100644 --- a/keyboards/nightly_boards/n60_s/info.json +++ b/keyboards/nightly_boards/n60_s/info.json @@ -8,6 +8,8 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ diff --git a/keyboards/nightly_boards/n60_s/rules.mk b/keyboards/nightly_boards/n60_s/rules.mk index 8bdff099b2..a37378959e 100644 --- a/keyboards/nightly_boards/n60_s/rules.mk +++ b/keyboards/nightly_boards/n60_s/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/nightly_boards/n87/info.json b/keyboards/nightly_boards/n87/info.json index 8eb020d29c..a45c8333fc 100644 --- a/keyboards/nightly_boards/n87/info.json +++ b/keyboards/nightly_boards/n87/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_tkl_ansi_split_bs_rshift": { "layout": [ diff --git a/keyboards/nightly_boards/n87/rules.mk b/keyboards/nightly_boards/n87/rules.mk index f0d05967ab..a32639a0b5 100644 --- a/keyboards/nightly_boards/n87/rules.mk +++ b/keyboards/nightly_boards/n87/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/nightly_boards/n9/info.json b/keyboards/nightly_boards/n9/info.json index afaee7244c..3b93fbdac1 100644 --- a/keyboards/nightly_boards/n9/info.json +++ b/keyboards/nightly_boards/n9/info.json @@ -8,6 +8,8 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nightly_boards/n9/rules.mk b/keyboards/nightly_boards/n9/rules.mk index 051e6296bc..c2fee55827 100644 --- a/keyboards/nightly_boards/n9/rules.mk +++ b/keyboards/nightly_boards/n9/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/nightly_boards/octopad/info.json b/keyboards/nightly_boards/octopad/info.json index c4668da903..ce794f28a8 100644 --- a/keyboards/nightly_boards/octopad/info.json +++ b/keyboards/nightly_boards/octopad/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nightly_boards/octopad/rules.mk b/keyboards/nightly_boards/octopad/rules.mk index 357a293a8c..d36fbdc860 100644 --- a/keyboards/nightly_boards/octopad/rules.mk +++ b/keyboards/nightly_boards/octopad/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/nightly_boards/octopadplus/info.json b/keyboards/nightly_boards/octopadplus/info.json index c4ae8b5200..8f0d6766e0 100644 --- a/keyboards/nightly_boards/octopadplus/info.json +++ b/keyboards/nightly_boards/octopadplus/info.json @@ -8,6 +8,8 @@ "pid": "0x0014", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "rgblight": { "animations": { "alternating": true, diff --git a/keyboards/nightly_boards/octopadplus/rules.mk b/keyboards/nightly_boards/octopadplus/rules.mk index 08b58953c2..89c0d63d8b 100644 --- a/keyboards/nightly_boards/octopadplus/rules.mk +++ b/keyboards/nightly_boards/octopadplus/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/nightly_boards/paraluman/info.json b/keyboards/nightly_boards/paraluman/info.json index a71adb315f..5d7238faaa 100644 --- a/keyboards/nightly_boards/paraluman/info.json +++ b/keyboards/nightly_boards/paraluman/info.json @@ -8,6 +8,8 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ diff --git a/keyboards/nightly_boards/paraluman/rules.mk b/keyboards/nightly_boards/paraluman/rules.mk index 3e6c2b2ea3..1e3ad1484c 100644 --- a/keyboards/nightly_boards/paraluman/rules.mk +++ b/keyboards/nightly_boards/paraluman/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/nightly_boards/ph_arisu/info.json b/keyboards/nightly_boards/ph_arisu/info.json index ba1e981144..ddf9469f36 100644 --- a/keyboards/nightly_boards/ph_arisu/info.json +++ b/keyboards/nightly_boards/ph_arisu/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"1,0", "x":1, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"1,1", "x":3, "y":0}, {"label":"0,2", "x":4, "y":0}, {"label":"1,2", "x":5, "y":0}, {"label":"0,3", "x":6, "y":0}, {"label":"1,3", "x":8.5, "y":0}, {"label":"0,4", "x":9.5, "y":0}, {"label":"1,4", "x":10.5, "y":0}, {"label":"0,5", "x":11.5, "y":0}, {"label":"1,5", "x":12.5, "y":0}, {"label":"0,6", "x":13.5, "y":0}, {"label":"1,6", "x":14.5, "y":0}, {"label":"0,7", "x":15.5, "y":0}, {"label":"2,7", "x":16.8, "y":0}, {"label":"2,0", "x":0, "y":1, "w":1.5}, {"label":"3,0", "x":1.5, "y":1}, {"label":"2,1", "x":2.5, "y":1}, {"label":"3,1", "x":3.5, "y":1}, {"label":"2,2", "x":4.5, "y":1}, {"label":"3,2", "x":5.5, "y":1}, {"label":"2,3", "x":8, "y":1}, {"label":"3,3", "x":9, "y":1}, {"label":"2,4", "x":10, "y":1}, {"label":"3,4", "x":11, "y":1}, {"label":"2,5", "x":12, "y":1}, {"label":"3,5", "x":13, "y":1}, {"label":"2,6", "x":14, "y":1}, {"label":"3,6", "x":15, "y":1, "w":1.5}, {"label":"4,7", "x":16.8, "y":1}, {"label":"4,0", "x":0, "y":2, "w":1.75}, {"label":"5,0", "x":1.75, "y":2}, {"label":"4,1", "x":2.75, "y":2}, {"label":"5,1", "x":3.75, "y":2}, {"label":"4,2", "x":4.75, "y":2}, {"label":"5,2", "x":5.75, "y":2}, {"label":"4,3", "x":8.25, "y":2}, {"label":"5,3", "x":9.25, "y":2}, {"label":"4,4", "x":10.25, "y":2}, {"label":"5,4", "x":11.25, "y":2}, {"label":"4,5", "x":12.25, "y":2}, {"label":"5,5", "x":13.25, "y":2}, {"label":"4,6", "x":14.25, "y":2, "w":2.25}, {"label":"6,7", "x":16.8, "y":2}, {"label":"6,0", "x":0, "y":3, "w":2.25}, {"label":"7,0", "x":2.25, "y":3}, {"label":"6,1", "x":3.25, "y":3}, {"label":"7,1", "x":4.25, "y":3}, {"label":"6,2", "x":5.25, "y":3}, {"label":"7,2", "x":6.25, "y":3}, {"label":"6,3", "x":8.75, "y":3}, {"label":"7,3", "x":9.75, "y":3}, {"label":"6,4", "x":10.75, "y":3}, {"label":"7,4", "x":11.75, "y":3}, {"label":"6,5", "x":12.75, "y":3}, {"label":"7,5", "x":13.75, "y":3, "w":1.75}, {"label":"7,6", "x":15.75, "y":3.25}, {"label":"8,0", "x":0, "y":4, "w":1.5}, {"label":"8,1", "x":2.75, "y":4, "w":1.5}, {"label":"8,2", "x":4.25, "y":4, "w":2}, {"label":"9,2", "x":6.25, "y":4, "w":1.25}, {"label":"9,3", "x":8.25, "y":4, "w":2.75}, {"label":"9,4", "x":11, "y":4, "w":1.5}, {"label":"8,6", "x":14.75, "y":4.25}, {"label":"9,6", "x":15.75, "y":4.25}, {"label":"8,7", "x":16.75, "y":4.25}] diff --git a/keyboards/nightly_boards/ph_arisu/rules.mk b/keyboards/nightly_boards/ph_arisu/rules.mk index 7dae3a8423..3b6a1809db 100644 --- a/keyboards/nightly_boards/ph_arisu/rules.mk +++ b/keyboards/nightly_boards/ph_arisu/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # -- cgit v1.2.3 From 7fad94ba2d5092abe451d0bbc95caaa37fec95bc Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 08:13:41 +1100 Subject: Remove unused RGBLight defines from config.h (#19859) --- keyboards/nightly_boards/alter/rev1/config.h | 6 ------ keyboards/nightly_boards/n2/config.h | 6 ------ keyboards/nightly_boards/n87/config.h | 6 ------ keyboards/nightly_boards/n9/config.h | 6 ------ 4 files changed, 24 deletions(-) (limited to 'keyboards/nightly_boards') diff --git a/keyboards/nightly_boards/alter/rev1/config.h b/keyboards/nightly_boards/alter/rev1/config.h index b545953fa0..c6fd463ddb 100644 --- a/keyboards/nightly_boards/alter/rev1/config.h +++ b/keyboards/nightly_boards/alter/rev1/config.h @@ -57,12 +57,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -// /*== customize breathing effect ==*/ -// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -// /*==== use exp() and sin() ====*/ -// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/nightly_boards/n2/config.h b/keyboards/nightly_boards/n2/config.h index 9c754f278b..a02f3e4bd6 100644 --- a/keyboards/nightly_boards/n2/config.h +++ b/keyboards/nightly_boards/n2/config.h @@ -53,12 +53,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -// /*== customize breathing effect ==*/ -// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -// /*==== use exp() and sin() ====*/ -// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/nightly_boards/n87/config.h b/keyboards/nightly_boards/n87/config.h index bbaacce192..3dffd7407c 100644 --- a/keyboards/nightly_boards/n87/config.h +++ b/keyboards/nightly_boards/n87/config.h @@ -56,12 +56,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -// /*== customize breathing effect ==*/ -// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -// /*==== use exp() and sin() ====*/ -// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #endif #define AUDIO_PIN B7 diff --git a/keyboards/nightly_boards/n9/config.h b/keyboards/nightly_boards/n9/config.h index 12f9e9715c..476913647b 100644 --- a/keyboards/nightly_boards/n9/config.h +++ b/keyboards/nightly_boards/n9/config.h @@ -53,12 +53,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -// /*== customize breathing effect ==*/ -// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -// /*==== use exp() and sin() ====*/ -// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -- 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/nightly_boards/alter/rev1/config.h | 4 ---- keyboards/nightly_boards/alter/rev1/info.json | 5 +++++ keyboards/nightly_boards/alter_lite/config.h | 5 ----- keyboards/nightly_boards/alter_lite/info.json | 6 ++++++ 4 files changed, 11 insertions(+), 9 deletions(-) (limited to 'keyboards/nightly_boards') diff --git a/keyboards/nightly_boards/alter/rev1/config.h b/keyboards/nightly_boards/alter/rev1/config.h index c6fd463ddb..e410706776 100644 --- a/keyboards/nightly_boards/alter/rev1/config.h +++ b/keyboards/nightly_boards/alter/rev1/config.h @@ -35,10 +35,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define LED_NUM_LOCK_PIN D7 -#define LED_CAPS_LOCK_PIN D6 -#define LED_SCROLL_LOCK_PIN B4 - #define RGB_DI_PIN F1 #ifdef RGB_DI_PIN #define RGBLED_NUM 18 diff --git a/keyboards/nightly_boards/alter/rev1/info.json b/keyboards/nightly_boards/alter/rev1/info.json index 122f7fb38f..21efb61c29 100644 --- a/keyboards/nightly_boards/alter/rev1/info.json +++ b/keyboards/nightly_boards/alter/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "D6", + "num_lock": "D7", + "scroll_lock": "B4" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["alice_split_bs"], diff --git a/keyboards/nightly_boards/alter_lite/config.h b/keyboards/nightly_boards/alter_lite/config.h index 9c70ef3501..8e6af9d62b 100644 --- a/keyboards/nightly_boards/alter_lite/config.h +++ b/keyboards/nightly_boards/alter_lite/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #define MATRIX_ROWS 5 #define MATRIX_COLS 16 -#define LED_NUM_LOCK_PIN D6 -#define LED_CAPS_LOCK_PIN D7 -#define LED_SCROLL_LOCK_PIN D4 -#define LED_PIN_ON_STATE 0 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/nightly_boards/alter_lite/info.json b/keyboards/nightly_boards/alter_lite/info.json index 72fea11f33..d76a278a75 100644 --- a/keyboards/nightly_boards/alter_lite/info.json +++ b/keyboards/nightly_boards/alter_lite/info.json @@ -8,6 +8,12 @@ "pid": "0x0013", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "D7", + "num_lock": "D6", + "scroll_lock": "D4", + "on_state": 0 + }, "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/nightly_boards/adellein/config.h | 4 ---- keyboards/nightly_boards/alter/rev1/config.h | 4 ---- keyboards/nightly_boards/alter_lite/config.h | 5 ----- keyboards/nightly_boards/conde60/config.h | 4 ---- keyboards/nightly_boards/daily60/config.h | 4 ---- keyboards/nightly_boards/jisoo/config.h | 4 ---- keyboards/nightly_boards/n2/config.h | 4 ---- keyboards/nightly_boards/n40_o/config.h | 4 ---- keyboards/nightly_boards/n60_s/config.h | 4 ---- keyboards/nightly_boards/n87/config.h | 4 ---- keyboards/nightly_boards/n9/config.h | 4 ---- keyboards/nightly_boards/octopad/config.h | 4 ---- keyboards/nightly_boards/octopadplus/config.h | 4 ---- keyboards/nightly_boards/paraluman/config.h | 4 ---- keyboards/nightly_boards/ph_arisu/config.h | 4 ---- 15 files changed, 61 deletions(-) (limited to 'keyboards/nightly_boards') diff --git a/keyboards/nightly_boards/adellein/config.h b/keyboards/nightly_boards/adellein/config.h index 77cbe4d54c..070224510c 100644 --- a/keyboards/nightly_boards/adellein/config.h +++ b/keyboards/nightly_boards/adellein/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 4 -#define MATRIX_COLS 13 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/nightly_boards/alter/rev1/config.h b/keyboards/nightly_boards/alter/rev1/config.h index e410706776..acd477fa71 100644 --- a/keyboards/nightly_boards/alter/rev1/config.h +++ b/keyboards/nightly_boards/alter/rev1/config.h @@ -15,10 +15,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 10 -#define MATRIX_COLS 8 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/nightly_boards/alter_lite/config.h b/keyboards/nightly_boards/alter_lite/config.h index 8e6af9d62b..ee04e0a75e 100644 --- a/keyboards/nightly_boards/alter_lite/config.h +++ b/keyboards/nightly_boards/alter_lite/config.h @@ -14,11 +14,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 16 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/nightly_boards/conde60/config.h b/keyboards/nightly_boards/conde60/config.h index 2a612a6305..9cad75e7b6 100644 --- a/keyboards/nightly_boards/conde60/config.h +++ b/keyboards/nightly_boards/conde60/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/nightly_boards/daily60/config.h b/keyboards/nightly_boards/daily60/config.h index aacba91cb7..719e0b4a9c 100644 --- a/keyboards/nightly_boards/daily60/config.h +++ b/keyboards/nightly_boards/daily60/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/nightly_boards/jisoo/config.h b/keyboards/nightly_boards/jisoo/config.h index 12d08e94e6..0e55d4ed66 100644 --- a/keyboards/nightly_boards/jisoo/config.h +++ b/keyboards/nightly_boards/jisoo/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 16 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/nightly_boards/n2/config.h b/keyboards/nightly_boards/n2/config.h index a02f3e4bd6..a59197bcf9 100644 --- a/keyboards/nightly_boards/n2/config.h +++ b/keyboards/nightly_boards/n2/config.h @@ -15,10 +15,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 2 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/nightly_boards/n40_o/config.h b/keyboards/nightly_boards/n40_o/config.h index ad5cae3f78..3bd829623a 100644 --- a/keyboards/nightly_boards/n40_o/config.h +++ b/keyboards/nightly_boards/n40_o/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 13 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/nightly_boards/n60_s/config.h b/keyboards/nightly_boards/n60_s/config.h index 14b3372bf2..c892acd41a 100644 --- a/keyboards/nightly_boards/n60_s/config.h +++ b/keyboards/nightly_boards/n60_s/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 14 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/nightly_boards/n87/config.h b/keyboards/nightly_boards/n87/config.h index 3dffd7407c..5191be1d84 100644 --- a/keyboards/nightly_boards/n87/config.h +++ b/keyboards/nightly_boards/n87/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 12 -#define MATRIX_COLS 9 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/nightly_boards/n9/config.h b/keyboards/nightly_boards/n9/config.h index 476913647b..e889ad4c4d 100644 --- a/keyboards/nightly_boards/n9/config.h +++ b/keyboards/nightly_boards/n9/config.h @@ -15,10 +15,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 3 -#define MATRIX_COLS 3 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/nightly_boards/octopad/config.h b/keyboards/nightly_boards/octopad/config.h index 31faf2f1ad..e5e87f04dc 100644 --- a/keyboards/nightly_boards/octopad/config.h +++ b/keyboards/nightly_boards/octopad/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 3 -#define MATRIX_COLS 5 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/nightly_boards/octopadplus/config.h b/keyboards/nightly_boards/octopadplus/config.h index f7b4dc918f..dc61f0a039 100644 --- a/keyboards/nightly_boards/octopadplus/config.h +++ b/keyboards/nightly_boards/octopadplus/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 6 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/nightly_boards/paraluman/config.h b/keyboards/nightly_boards/paraluman/config.h index e555b680f5..5afc485007 100644 --- a/keyboards/nightly_boards/paraluman/config.h +++ b/keyboards/nightly_boards/paraluman/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/nightly_boards/ph_arisu/config.h b/keyboards/nightly_boards/ph_arisu/config.h index 209e3ed275..11ab2707a2 100644 --- a/keyboards/nightly_boards/ph_arisu/config.h +++ b/keyboards/nightly_boards/ph_arisu/config.h @@ -1,10 +1,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 10 -#define MATRIX_COLS 8 - /* key matrix pins */ #define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 } #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 } -- cgit v1.2.3 From 499fc3b85e99de725535eb73f653d77a71339e3f Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 22 Feb 2023 02:55:23 +1100 Subject: Add some missing `#pragma once`s (#19902) --- keyboards/nightly_boards/adellein/encoder_action.h | 2 ++ keyboards/nightly_boards/n40_o/encoder_action.h | 2 ++ keyboards/nightly_boards/n60_s/encoder_action.h | 2 ++ keyboards/nightly_boards/octopad/encoder_action.h | 2 ++ 4 files changed, 8 insertions(+) (limited to 'keyboards/nightly_boards') diff --git a/keyboards/nightly_boards/adellein/encoder_action.h b/keyboards/nightly_boards/adellein/encoder_action.h index 098210d40c..fb22632632 100644 --- a/keyboards/nightly_boards/adellein/encoder_action.h +++ b/keyboards/nightly_boards/adellein/encoder_action.h @@ -14,6 +14,8 @@ * along with this program. If not, see . */ +#pragma once + #include "quantum.h" void encoder_action_unregister(void); diff --git a/keyboards/nightly_boards/n40_o/encoder_action.h b/keyboards/nightly_boards/n40_o/encoder_action.h index 098210d40c..fb22632632 100644 --- a/keyboards/nightly_boards/n40_o/encoder_action.h +++ b/keyboards/nightly_boards/n40_o/encoder_action.h @@ -14,6 +14,8 @@ * along with this program. If not, see . */ +#pragma once + #include "quantum.h" void encoder_action_unregister(void); diff --git a/keyboards/nightly_boards/n60_s/encoder_action.h b/keyboards/nightly_boards/n60_s/encoder_action.h index 098210d40c..fb22632632 100644 --- a/keyboards/nightly_boards/n60_s/encoder_action.h +++ b/keyboards/nightly_boards/n60_s/encoder_action.h @@ -14,6 +14,8 @@ * along with this program. If not, see . */ +#pragma once + #include "quantum.h" void encoder_action_unregister(void); diff --git a/keyboards/nightly_boards/octopad/encoder_action.h b/keyboards/nightly_boards/octopad/encoder_action.h index 098210d40c..fb22632632 100644 --- a/keyboards/nightly_boards/octopad/encoder_action.h +++ b/keyboards/nightly_boards/octopad/encoder_action.h @@ -14,6 +14,8 @@ * along with this program. If not, see . */ +#pragma once + #include "quantum.h" void encoder_action_unregister(void); -- 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/nightly_boards/adellein/config.h | 6 ------ keyboards/nightly_boards/adellein/encoder_action.c | 14 ++++---------- keyboards/nightly_boards/adellein/info.json | 5 +++++ keyboards/nightly_boards/n40_o/config.h | 6 ------ keyboards/nightly_boards/n40_o/encoder_action.c | 14 ++++---------- keyboards/nightly_boards/n40_o/info.json | 7 +++++++ keyboards/nightly_boards/n60_s/config.h | 6 ------ keyboards/nightly_boards/n60_s/encoder_action.c | 14 ++++---------- keyboards/nightly_boards/n60_s/info.json | 5 +++++ keyboards/nightly_boards/octopad/config.h | 6 ------ keyboards/nightly_boards/octopad/encoder_action.c | 14 ++++---------- keyboards/nightly_boards/octopad/info.json | 6 ++++++ keyboards/nightly_boards/octopadplus/config.h | 7 ------- keyboards/nightly_boards/octopadplus/info.json | 6 ++++++ 14 files changed, 45 insertions(+), 71 deletions(-) (limited to 'keyboards/nightly_boards') 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 . #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 . #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 . #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 . #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 . /* 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": { -- cgit v1.2.3