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/neson_design/n6/info.json | 1 + keyboards/neson_design/n6/rules.mk | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/neson_design') diff --git a/keyboards/neson_design/n6/info.json b/keyboards/neson_design/n6/info.json index 1fe847a3d7..3d124e9ae0 100644 --- a/keyboards/neson_design/n6/info.json +++ b/keyboards/neson_design/n6/info.json @@ -11,6 +11,7 @@ "layout_aliases": { "LAYOUT_65_ansi_blocker_splitbs": "LAYOUT_65_ansi_blocker_split_bs" }, + "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs"], "layouts": { "LAYOUT_65_ansi_blocker": { "layout": [ diff --git a/keyboards/neson_design/n6/rules.mk b/keyboards/neson_design/n6/rules.mk index 7567521f7e..86bab73f55 100644 --- a/keyboards/neson_design/n6/rules.mk +++ b/keyboards/neson_design/n6/rules.mk @@ -17,4 +17,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow QUANTUM_LIB_SRC += i2c_master.c drivers/led/issi/is31fl3731.c -LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs -- 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/neson_design/700e/config.h | 1 - keyboards/neson_design/n6/config.h | 1 - 2 files changed, 2 deletions(-) (limited to 'keyboards/neson_design') diff --git a/keyboards/neson_design/700e/config.h b/keyboards/neson_design/700e/config.h index 54863ce815..d4a03fdf49 100644 --- a/keyboards/neson_design/700e/config.h +++ b/keyboards/neson_design/700e/config.h @@ -18,7 +18,6 @@ */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h index fe5bd7fc2a..f831c8a42d 100644 --- a/keyboards/neson_design/n6/config.h +++ b/keyboards/neson_design/n6/config.h @@ -18,7 +18,6 @@ */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 -- 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/neson_design/700e/config.h | 3 --- keyboards/neson_design/n6/config.h | 3 --- 2 files changed, 6 deletions(-) (limited to 'keyboards/neson_design') diff --git a/keyboards/neson_design/700e/config.h b/keyboards/neson_design/700e/config.h index d4a03fdf49..5d9390b573 100644 --- a/keyboards/neson_design/700e/config.h +++ b/keyboards/neson_design/700e/config.h @@ -26,9 +26,6 @@ #define MATRIX_COL_PINS { F7, B0, B3, B1, B2, F4, C7, C6, B6, B5, B4, D7, D3, D2, D6, D4} #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h index f831c8a42d..bb447ece39 100644 --- a/keyboards/neson_design/n6/config.h +++ b/keyboards/neson_design/n6/config.h @@ -26,9 +26,6 @@ #define MATRIX_COL_PINS { F7, B0, E6, C7, C6, B6, B5, B4, D7, D6, D4, D5, B2, D3, D2 } #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* * Feature disable options * These options are also useful to firmware size reduction. -- cgit v1.2.3 From f0618a1d53a50a6ed6a6b050daf31365599bef4b Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 6 Feb 2023 13:36:09 +1100 Subject: Remove `IS_HOST_LED_ON` and migrate usages (#19753) --- keyboards/neson_design/700e/700e.c | 2 +- keyboards/neson_design/n6/n6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/neson_design') diff --git a/keyboards/neson_design/700e/700e.c b/keyboards/neson_design/700e/700e.c index 89c5e84efd..e677193ea6 100644 --- a/keyboards/neson_design/700e/700e.c +++ b/keyboards/neson_design/700e/700e.c @@ -183,7 +183,7 @@ static void self_testing(void) if (rgb_state.duration) { rgb_state.duration--; } else { - if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) { + if (host_keyboard_led_state().caps_lock) { rgb_state.state = CAPS_ALERT; } else { rgb_state.state = NORMAL; diff --git a/keyboards/neson_design/n6/n6.c b/keyboards/neson_design/n6/n6.c index a606e93c8f..45affc1b03 100644 --- a/keyboards/neson_design/n6/n6.c +++ b/keyboards/neson_design/n6/n6.c @@ -187,7 +187,7 @@ static void self_testing(void) if (rgb_state.duration) { rgb_state.duration--; } else { - if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) { + if (host_keyboard_led_state().caps_lock) { rgb_state.state = CAPS_ALERT; } else { rgb_state.state = NORMAL; -- 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/neson_design/700e/info.json | 2 ++ keyboards/neson_design/700e/rules.mk | 6 ------ keyboards/neson_design/n6/info.json | 2 ++ keyboards/neson_design/n6/rules.mk | 6 ------ 4 files changed, 4 insertions(+), 12 deletions(-) (limited to 'keyboards/neson_design') diff --git a/keyboards/neson_design/700e/info.json b/keyboards/neson_design/700e/info.json index 43b5382d7e..2c2a3126c6 100644 --- a/keyboards/neson_design/700e/info.json +++ b/keyboards/neson_design/700e/info.json @@ -8,6 +8,8 @@ "pid": "0x700E", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/neson_design/700e/rules.mk b/keyboards/neson_design/700e/rules.mk index aca054eabd..6e1439f1f5 100644 --- a/keyboards/neson_design/700e/rules.mk +++ b/keyboards/neson_design/700e/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/neson_design/n6/info.json b/keyboards/neson_design/n6/info.json index 3d124e9ae0..c916f1f4c0 100644 --- a/keyboards/neson_design/n6/info.json +++ b/keyboards/neson_design/n6/info.json @@ -8,6 +8,8 @@ "pid": "0x4E36", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_65_ansi_blocker_splitbs": "LAYOUT_65_ansi_blocker_split_bs" }, diff --git a/keyboards/neson_design/n6/rules.mk b/keyboards/neson_design/n6/rules.mk index 86bab73f55..5d8397653e 100644 --- a/keyboards/neson_design/n6/rules.mk +++ b/keyboards/neson_design/n6/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/neson_design/700e/config.h | 2 -- keyboards/neson_design/700e/info.json | 3 +++ keyboards/neson_design/n6/config.h | 2 -- keyboards/neson_design/n6/info.json | 3 +++ 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'keyboards/neson_design') diff --git a/keyboards/neson_design/700e/config.h b/keyboards/neson_design/700e/config.h index 5d9390b573..ef638a7f92 100644 --- a/keyboards/neson_design/700e/config.h +++ b/keyboards/neson_design/700e/config.h @@ -45,8 +45,6 @@ #define DRIVER_COUNT 2 #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL) -#define LED_CAPS_LOCK_PIN F5 - //rgb light setting #define RGBLED_NUM 68 #define RGB_DI_PIN D5 diff --git a/keyboards/neson_design/700e/info.json b/keyboards/neson_design/700e/info.json index 2c2a3126c6..29f5c0c2f4 100644 --- a/keyboards/neson_design/700e/info.json +++ b/keyboards/neson_design/700e/info.json @@ -8,6 +8,9 @@ "pid": "0x700E", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "F5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h index bb447ece39..ec8bfa5115 100644 --- a/keyboards/neson_design/n6/config.h +++ b/keyboards/neson_design/n6/config.h @@ -45,8 +45,6 @@ #define DRIVER_COUNT 2 #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL) -#define LED_CAPS_LOCK_PIN F5 - //rgb light setting #define RGBLED_NUM 65 #define RGB_DI_PIN B3 diff --git a/keyboards/neson_design/n6/info.json b/keyboards/neson_design/n6/info.json index c916f1f4c0..19de748afb 100644 --- a/keyboards/neson_design/n6/info.json +++ b/keyboards/neson_design/n6/info.json @@ -8,6 +8,9 @@ "pid": "0x4E36", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "F5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { -- 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/neson_design/700e/config.h | 3 --- keyboards/neson_design/n6/config.h | 3 --- 2 files changed, 6 deletions(-) (limited to 'keyboards/neson_design') diff --git a/keyboards/neson_design/700e/config.h b/keyboards/neson_design/700e/config.h index ef638a7f92..2c1b62448e 100644 --- a/keyboards/neson_design/700e/config.h +++ b/keyboards/neson_design/700e/config.h @@ -19,9 +19,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 16 #define MATRIX_ROW_PINS { E6, B7, F6, F1, F0} #define MATRIX_COL_PINS { F7, B0, B3, B1, B2, F4, C7, C6, B6, B5, B4, D7, D3, D2, D6, D4} #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h index ec8bfa5115..b98385f836 100644 --- a/keyboards/neson_design/n6/config.h +++ b/keyboards/neson_design/n6/config.h @@ -19,9 +19,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 #define MATRIX_ROW_PINS { F0, B1, F6, F4, F1} #define MATRIX_COL_PINS { F7, B0, E6, C7, C6, B6, B5, B4, D7, D6, D4, D5, B2, D3, D2 } #define DIODE_DIRECTION COL2ROW -- cgit v1.2.3