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/alf/dc60/config.h | 2 -- keyboards/alf/x11/config.h | 2 -- keyboards/alf/x2/config.h | 1 - 3 files changed, 5 deletions(-) (limited to 'keyboards/alf') diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h index e9bfd4c5db..1b44059565 100644 --- a/keyboards/alf/dc60/config.h +++ b/keyboards/alf/dc60/config.h @@ -70,8 +70,6 @@ along with this program. If not, see . /* define if matrix has ghost (lacks anti-ghosting diodes) */ //#define MATRIX_HAS_GHOST -/* number of backlight levels */ - /* 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/alf/x11/config.h b/keyboards/alf/x11/config.h index e7fc2a6911..548116a1de 100644 --- a/keyboards/alf/x11/config.h +++ b/keyboards/alf/x11/config.h @@ -74,8 +74,6 @@ along with this program. If not, see . /* define if matrix has ghost (lacks anti-ghosting diodes) */ //#define MATRIX_HAS_GHOST -/* number of backlight levels */ - /* 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/alf/x2/config.h b/keyboards/alf/x2/config.h index dc1ebcb539..ffee4ecbd4 100644 --- a/keyboards/alf/x2/config.h +++ b/keyboards/alf/x2/config.h @@ -34,7 +34,6 @@ #define LED_CAPS_LOCK_PIN B2 #define LED_PIN_ON_STATE 0 -/* number of backlight levels */ #define BACKLIGHT_PIN B6 #ifdef BACKLIGHT_PIN # define BACKLIGHT_LEVELS 3 -- 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/alf/dc60/config.h | 1 - keyboards/alf/x11/config.h | 1 - keyboards/alf/x2/config.h | 1 - 3 files changed, 3 deletions(-) (limited to 'keyboards/alf') diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h index 1b44059565..aa1d8547de 100644 --- a/keyboards/alf/dc60/config.h +++ b/keyboards/alf/dc60/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/alf/x11/config.h b/keyboards/alf/x11/config.h index 548116a1de..924d006654 100644 --- a/keyboards/alf/x11/config.h +++ b/keyboards/alf/x11/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 7 diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h index ffee4ecbd4..004135261a 100644 --- a/keyboards/alf/x2/config.h +++ b/keyboards/alf/x2/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 -- 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/alf/dc60/config.h | 21 --------------------- keyboards/alf/x11/config.h | 21 --------------------- 2 files changed, 42 deletions(-) (limited to 'keyboards/alf') diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h index aa1d8547de..715e8dae0b 100644 --- a/keyboards/alf/dc60/config.h +++ b/keyboards/alf/dc60/config.h @@ -79,27 +79,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. diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h index 924d006654..e31e4d0941 100644 --- a/keyboards/alf/x11/config.h +++ b/keyboards/alf/x11/config.h @@ -83,27 +83,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/alf/dc60/config.h | 3 --- keyboards/alf/x11/config.h | 3 --- 2 files changed, 6 deletions(-) (limited to 'keyboards/alf') diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h index 715e8dae0b..44ee0e774e 100644 --- a/keyboards/alf/dc60/config.h +++ b/keyboards/alf/dc60/config.h @@ -66,9 +66,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/alf/x11/config.h b/keyboards/alf/x11/config.h index e31e4d0941..0bf399f989 100644 --- a/keyboards/alf/x11/config.h +++ b/keyboards/alf/x11/config.h @@ -70,9 +70,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/alf/dc60/config.h | 3 --- keyboards/alf/x11/config.h | 3 --- keyboards/alf/x2/config.h | 3 --- 3 files changed, 9 deletions(-) (limited to 'keyboards/alf') diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h index 44ee0e774e..0351df80f4 100644 --- a/keyboards/alf/dc60/config.h +++ b/keyboards/alf/dc60/config.h @@ -63,9 +63,6 @@ along with this program. If not, see . #define RGBLIGHT_VAL_STEP 8 #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/alf/x11/config.h b/keyboards/alf/x11/config.h index 0bf399f989..3a8d69e389 100644 --- a/keyboards/alf/x11/config.h +++ b/keyboards/alf/x11/config.h @@ -67,9 +67,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_TWINKLE #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/alf/x2/config.h b/keyboards/alf/x2/config.h index 004135261a..5469603656 100644 --- a/keyboards/alf/x2/config.h +++ b/keyboards/alf/x2/config.h @@ -38,9 +38,6 @@ # define BACKLIGHT_LEVELS 3 #endif -/* 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/alf/dc60/config.h | 5 ----- keyboards/alf/x11/config.h | 5 ----- 2 files changed, 10 deletions(-) (limited to 'keyboards/alf') diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h index 0351df80f4..c5bb808dfe 100644 --- a/keyboards/alf/dc60/config.h +++ b/keyboards/alf/dc60/config.h @@ -68,11 +68,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. diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h index 3a8d69e389..df7e5fba4b 100644 --- a/keyboards/alf/x11/config.h +++ b/keyboards/alf/x11/config.h @@ -72,11 +72,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/alf/x11/config.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'keyboards/alf') diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h index df7e5fba4b..645ec11be0 100644 --- a/keyboards/alf/x11/config.h +++ b/keyboards/alf/x11/config.h @@ -87,7 +87,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 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/alf/dc60/info.json | 2 ++ keyboards/alf/dc60/rules.mk | 6 ------ keyboards/alf/x11/info.json | 2 ++ keyboards/alf/x11/rules.mk | 6 ------ keyboards/alf/x2/info.json | 2 ++ keyboards/alf/x2/rules.mk | 6 ------ 6 files changed, 6 insertions(+), 18 deletions(-) (limited to 'keyboards/alf') diff --git a/keyboards/alf/dc60/info.json b/keyboards/alf/dc60/info.json index 81b8613e5b..f95b2f3892 100644 --- a/keyboards/alf/dc60/info.json +++ b/keyboards/alf/dc60/info.json @@ -7,6 +7,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}] diff --git a/keyboards/alf/dc60/rules.mk b/keyboards/alf/dc60/rules.mk index 8434db38dd..16be45209b 100644 --- a/keyboards/alf/dc60/rules.mk +++ b/keyboards/alf/dc60/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/alf/x11/info.json b/keyboards/alf/x11/info.json index eb78204fc7..28275c4684 100644 --- a/keyboards/alf/x11/info.json +++ b/keyboards/alf/x11/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/alf/x11/rules.mk b/keyboards/alf/x11/rules.mk index d1f8584cb9..2eed748d1f 100644 --- a/keyboards/alf/x11/rules.mk +++ b/keyboards/alf/x11/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/alf/x2/info.json b/keyboards/alf/x2/info.json index 7bb69d15e6..2dbf4dcdc8 100644 --- a/keyboards/alf/x2/info.json +++ b/keyboards/alf/x2/info.json @@ -8,6 +8,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/alf/x2/rules.mk b/keyboards/alf/x2/rules.mk index b27013f863..3d5cb57ad5 100644 --- a/keyboards/alf/x2/rules.mk +++ b/keyboards/alf/x2/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/alf/dc60/config.h | 3 --- keyboards/alf/dc60/info.json | 4 ++++ keyboards/alf/x11/config.h | 5 ----- keyboards/alf/x11/info.json | 6 ++++++ keyboards/alf/x2/config.h | 3 --- keyboards/alf/x2/info.json | 4 ++++ 6 files changed, 14 insertions(+), 11 deletions(-) (limited to 'keyboards/alf') diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h index c5bb808dfe..2bb959c37c 100644 --- a/keyboards/alf/dc60/config.h +++ b/keyboards/alf/dc60/config.h @@ -38,9 +38,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define LED_CAPS_LOCK_PIN B7 -#define LED_PIN_ON_STATE 0 - #define BACKLIGHT_PIN B6 #define BACKLIGHT_BREATHING #define BACKLIGHT_LEVELS 5 diff --git a/keyboards/alf/dc60/info.json b/keyboards/alf/dc60/info.json index f95b2f3892..a93d76a38d 100644 --- a/keyboards/alf/dc60/info.json +++ b/keyboards/alf/dc60/info.json @@ -7,6 +7,10 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "B7", + "on_state": 0 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h index 645ec11be0..aec8cb1270 100644 --- a/keyboards/alf/x11/config.h +++ b/keyboards/alf/x11/config.h @@ -38,11 +38,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define LED_NUM_LOCK_PIN E6 -#define LED_CAPS_LOCK_PIN C6 -#define LED_SCROLL_LOCK_PIN C7 -#define LED_PIN_ON_STATE 0 - #define BACKLIGHT_PIN B7 #define BACKLIGHT_BREATHING #define BACKLIGHT_LEVELS 3 diff --git a/keyboards/alf/x11/info.json b/keyboards/alf/x11/info.json index 28275c4684..5d4fdc69a6 100644 --- a/keyboards/alf/x11/info.json +++ b/keyboards/alf/x11/info.json @@ -8,6 +8,12 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "C6", + "num_lock": "E6", + "scroll_lock": "C7", + "on_state": 0 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h index 5469603656..980007dadf 100644 --- a/keyboards/alf/x2/config.h +++ b/keyboards/alf/x2/config.h @@ -30,9 +30,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define LED_CAPS_LOCK_PIN B2 -#define LED_PIN_ON_STATE 0 - #define BACKLIGHT_PIN B6 #ifdef BACKLIGHT_PIN # define BACKLIGHT_LEVELS 3 diff --git a/keyboards/alf/x2/info.json b/keyboards/alf/x2/info.json index 2dbf4dcdc8..30630b3188 100644 --- a/keyboards/alf/x2/info.json +++ b/keyboards/alf/x2/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "B2", + "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/alf/dc60/config.h | 4 ---- keyboards/alf/x11/config.h | 4 ---- keyboards/alf/x2/config.h | 4 ---- 3 files changed, 12 deletions(-) (limited to 'keyboards/alf') diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h index 2bb959c37c..4ae0863425 100644 --- a/keyboards/alf/dc60/config.h +++ b/keyboards/alf/dc60/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 15 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h index aec8cb1270..84da2e7ce9 100644 --- a/keyboards/alf/x11/config.h +++ b/keyboards/alf/x11/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 7 -#define MATRIX_COLS 13 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h index 980007dadf..1ce6375d8e 100644 --- a/keyboards/alf/x2/config.h +++ b/keyboards/alf/x2/config.h @@ -17,10 +17,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 - /* key matrix pins */ #define MATRIX_ROW_PINS \ { D0, D1, D2, D3, D5 } -- cgit v1.2.3 From 26854f59402f3f4b7ca5cfe0f3dd665a680715f5 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 22 Feb 2023 12:12:42 +1100 Subject: Remove default and unused `BACKLIGHT_LEVELS` (#19898) --- keyboards/alf/x11/config.h | 1 - keyboards/alf/x2/config.h | 3 --- 2 files changed, 4 deletions(-) (limited to 'keyboards/alf') diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h index 84da2e7ce9..cbf4338da4 100644 --- a/keyboards/alf/x11/config.h +++ b/keyboards/alf/x11/config.h @@ -36,7 +36,6 @@ along with this program. If not, see . #define BACKLIGHT_PIN B7 #define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 3 #define RGB_DI_PIN F7 #ifdef RGB_DI_PIN diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h index 1ce6375d8e..00524ace43 100644 --- a/keyboards/alf/x2/config.h +++ b/keyboards/alf/x2/config.h @@ -27,9 +27,6 @@ #define DIODE_DIRECTION COL2ROW #define BACKLIGHT_PIN B6 -#ifdef BACKLIGHT_PIN -# define BACKLIGHT_LEVELS 3 -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE -- 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/alf/dc60/config.h | 4 ---- keyboards/alf/dc60/info.json | 5 +++++ keyboards/alf/x11/config.h | 3 --- keyboards/alf/x11/info.json | 4 ++++ keyboards/alf/x2/config.h | 2 -- keyboards/alf/x2/info.json | 3 +++ 6 files changed, 12 insertions(+), 9 deletions(-) (limited to 'keyboards/alf') diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h index 4ae0863425..e81b6a2010 100644 --- a/keyboards/alf/dc60/config.h +++ b/keyboards/alf/dc60/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/alf/dc60/info.json b/keyboards/alf/dc60/info.json index a93d76a38d..faf199d8a0 100644 --- a/keyboards/alf/dc60/info.json +++ b/keyboards/alf/dc60/info.json @@ -7,6 +7,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 5, + "breathing": true + }, "indicators": { "caps_lock": "B7", "on_state": 0 diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h index cbf4338da4..04ebe0c657 100644 --- a/keyboards/alf/x11/config.h +++ b/keyboards/alf/x11/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN F7 #ifdef RGB_DI_PIN #define RGBLED_NUM 28 diff --git a/keyboards/alf/x11/info.json b/keyboards/alf/x11/info.json index 5d4fdc69a6..8b3ae6f2ba 100644 --- a/keyboards/alf/x11/info.json +++ b/keyboards/alf/x11/info.json @@ -8,6 +8,10 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "indicators": { "caps_lock": "C6", "num_lock": "E6", diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h index 00524ace43..374873d5d5 100644 --- a/keyboards/alf/x2/config.h +++ b/keyboards/alf/x2/config.h @@ -26,8 +26,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/alf/x2/info.json b/keyboards/alf/x2/info.json index 30630b3188..5e0b3087a8 100644 --- a/keyboards/alf/x2/info.json +++ b/keyboards/alf/x2/info.json @@ -12,6 +12,9 @@ "caps_lock": "B2", "on_state": 0 }, + "backlight": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { -- cgit v1.2.3