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/40percentclub/25/info.json | 1 + keyboards/40percentclub/25/rules.mk | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'keyboards/40percentclub/25') diff --git a/keyboards/40percentclub/25/info.json b/keyboards/40percentclub/25/info.json index 15995f8479..262dff3476 100644 --- a/keyboards/40percentclub/25/info.json +++ b/keyboards/40percentclub/25/info.json @@ -8,6 +8,7 @@ "pid": "0x0F25", "device_version": "1.0.0" }, + "community_layouts": ["ortho_5x5", "ortho_5x10"], "layouts": { "LAYOUT_ortho_5x5": { "layout": [ diff --git a/keyboards/40percentclub/25/rules.mk b/keyboards/40percentclub/25/rules.mk index 8e6f2001fb..d2e5d56c07 100644 --- a/keyboards/40percentclub/25/rules.mk +++ b/keyboards/40percentclub/25/rules.mk @@ -19,5 +19,3 @@ AUDIO_ENABLE = no # Audio output # Enable generic behavior for split boards SPLIT_KEYBOARD = yes - -LAYOUTS = ortho_5x5 ortho_5x10 -- 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/40percentclub/25/config.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'keyboards/40percentclub/25') diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h index 4176a18b91..b8a4f29e9a 100644 --- a/keyboards/40percentclub/25/config.h +++ b/keyboards/40percentclub/25/config.h @@ -47,10 +47,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -// #define BACKLIGHT_PIN B7 -// #define BACKLIGHT_BREATHING -// #define BACKLIGHT_LEVELS 3 - // #define RGB_DI_PIN E2 // #ifdef RGB_DI_PIN // #define RGBLED_NUM 16 @@ -65,8 +61,6 @@ /* 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 */ -- 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/40percentclub/25/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/40percentclub/25') diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h index b8a4f29e9a..e6370e87d9 100644 --- a/keyboards/40percentclub/25/config.h +++ b/keyboards/40percentclub/25/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* serial.c configuration for split keyboard */ #define SOFT_SERIAL_PIN D0 -- 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/40percentclub/25/config.h | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'keyboards/40percentclub/25') diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h index e6370e87d9..c490845591 100644 --- a/keyboards/40percentclub/25/config.h +++ b/keyboards/40percentclub/25/config.h @@ -70,27 +70,6 @@ */ // #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/40percentclub/25/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/40percentclub/25') diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h index c490845591..23d7f7f537 100644 --- a/keyboards/40percentclub/25/config.h +++ b/keyboards/40percentclub/25/config.h @@ -57,9 +57,6 @@ /* 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/40percentclub/25/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/40percentclub/25') diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h index 23d7f7f537..956d6c6c38 100644 --- a/keyboards/40percentclub/25/config.h +++ b/keyboards/40percentclub/25/config.h @@ -54,9 +54,6 @@ // #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 */ -- 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/40percentclub/25/config.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'keyboards/40percentclub/25') diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h index 956d6c6c38..90daf83501 100644 --- a/keyboards/40percentclub/25/config.h +++ b/keyboards/40percentclub/25/config.h @@ -59,11 +59,6 @@ /* 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 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/40percentclub/25/info.json | 2 ++ keyboards/40percentclub/25/rules.mk | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'keyboards/40percentclub/25') diff --git a/keyboards/40percentclub/25/info.json b/keyboards/40percentclub/25/info.json index 262dff3476..4d7a239cd0 100644 --- a/keyboards/40percentclub/25/info.json +++ b/keyboards/40percentclub/25/info.json @@ -8,6 +8,8 @@ "pid": "0x0F25", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_5x5", "ortho_5x10"], "layouts": { "LAYOUT_ortho_5x5": { diff --git a/keyboards/40percentclub/25/rules.mk b/keyboards/40percentclub/25/rules.mk index d2e5d56c07..25d4c40051 100644 --- a/keyboards/40percentclub/25/rules.mk +++ b/keyboards/40percentclub/25/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/40percentclub/25/config.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'keyboards/40percentclub/25') diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h index 90daf83501..2436d0520b 100644 --- a/keyboards/40percentclub/25/config.h +++ b/keyboards/40percentclub/25/config.h @@ -46,14 +46,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -// #define RGB_DI_PIN E2 -// #ifdef RGB_DI_PIN -// #define RGBLED_NUM 16 -// #define RGBLIGHT_HUE_STEP 8 -// #define RGBLIGHT_SAT_STEP 8 -// #define RGBLIGHT_VAL_STEP 8 -// #endif - /* 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 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/40percentclub/25/config.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'keyboards/40percentclub/25') diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h index 2436d0520b..8e65230529 100644 --- a/keyboards/40percentclub/25/config.h +++ b/keyboards/40percentclub/25/config.h @@ -25,11 +25,6 @@ //#define MASTER_RIGHT //#define EE_HANDS -/* key matrix size */ -// Rows are doubled-up -#define MATRIX_ROWS 5*2 -#define MATRIX_COLS 5 - /* * Keyboard Matrix Assignments * -- cgit v1.2.3 From 8f6c228adbfec98828f0411f62bab07f96e5c020 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 16:40:49 +1100 Subject: Move `SOFT_SERIAL_PIN` to data driven (#19863) --- keyboards/40percentclub/25/config.h | 4 ---- keyboards/40percentclub/25/info.json | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'keyboards/40percentclub/25') diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h index 8e65230529..86d1f0b90f 100644 --- a/keyboards/40percentclub/25/config.h +++ b/keyboards/40percentclub/25/config.h @@ -16,10 +16,6 @@ #pragma once - -/* serial.c configuration for split keyboard */ -#define SOFT_SERIAL_PIN D0 - /* Select hand configuration */ #define MASTER_LEFT //#define MASTER_RIGHT diff --git a/keyboards/40percentclub/25/info.json b/keyboards/40percentclub/25/info.json index 4d7a239cd0..d0544f9a2e 100644 --- a/keyboards/40percentclub/25/info.json +++ b/keyboards/40percentclub/25/info.json @@ -8,6 +8,9 @@ "pid": "0x0F25", "device_version": "1.0.0" }, + "split": { + "soft_serial_pin": "D0" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_5x5", "ortho_5x10"], -- cgit v1.2.3