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/mode/m80v1/config.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'keyboards/mode') diff --git a/keyboards/mode/m80v1/config.h b/keyboards/mode/m80v1/config.h index 675cc3385d..0a0382d62e 100644 --- a/keyboards/mode/m80v1/config.h +++ b/keyboards/mode/m80v1/config.h @@ -43,8 +43,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 */ -- 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/mode/m80v1/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/mode') diff --git a/keyboards/mode/m80v1/config.h b/keyboards/mode/m80v1/config.h index 0a0382d62e..2afb68ec5b 100644 --- a/keyboards/mode/m80v1/config.h +++ b/keyboards/mode/m80v1/config.h @@ -14,7 +14,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 6 -- 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/mode/m80v1/config.h | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'keyboards/mode') diff --git a/keyboards/mode/m80v1/config.h b/keyboards/mode/m80v1/config.h index 2afb68ec5b..20e3c9fc19 100644 --- a/keyboards/mode/m80v1/config.h +++ b/keyboards/mode/m80v1/config.h @@ -52,27 +52,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/mode/m65ha_alpha/config.h | 3 --- keyboards/mode/m65hi_alpha/config.h | 3 --- keyboards/mode/m65s/config.h | 3 --- keyboards/mode/m75h/config.h | 3 --- keyboards/mode/m75s/config.h | 3 --- keyboards/mode/m80v1/config.h | 3 --- keyboards/mode/m80v2/config.h | 3 --- 7 files changed, 21 deletions(-) (limited to 'keyboards/mode') diff --git a/keyboards/mode/m65ha_alpha/config.h b/keyboards/mode/m65ha_alpha/config.h index b8edfeee82..04242c3718 100644 --- a/keyboards/mode/m65ha_alpha/config.h +++ b/keyboards/mode/m65ha_alpha/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { A7 , A10, D2 , C12, B1 , C11 } #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 diff --git a/keyboards/mode/m65hi_alpha/config.h b/keyboards/mode/m65hi_alpha/config.h index 3886755cb3..c3e72ca4be 100644 --- a/keyboards/mode/m65hi_alpha/config.h +++ b/keyboards/mode/m65hi_alpha/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { A7 , A10, D2 , C12, B1 , C11 } #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 diff --git a/keyboards/mode/m65s/config.h b/keyboards/mode/m65s/config.h index 4459e37145..20b87bbf4d 100644 --- a/keyboards/mode/m65s/config.h +++ b/keyboards/mode/m65s/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { A3 , B14, B15, C9 , C6 , C11 } #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 diff --git a/keyboards/mode/m75h/config.h b/keyboards/mode/m75h/config.h index 0dff69fac9..8c70333888 100644 --- a/keyboards/mode/m75h/config.h +++ b/keyboards/mode/m75h/config.h @@ -26,9 +26,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { C5, B0, B14, B15, A8 , C9 , A15} #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 diff --git a/keyboards/mode/m75s/config.h b/keyboards/mode/m75s/config.h index 5da8543e95..d585790f26 100644 --- a/keyboards/mode/m75s/config.h +++ b/keyboards/mode/m75s/config.h @@ -26,9 +26,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { C5, B0, B14, B15, C7 , C9 , A15} #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 diff --git a/keyboards/mode/m80v1/config.h b/keyboards/mode/m80v1/config.h index 20e3c9fc19..a0af8ef6f3 100644 --- a/keyboards/mode/m80v1/config.h +++ b/keyboards/mode/m80v1/config.h @@ -39,9 +39,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/mode/m80v2/config.h b/keyboards/mode/m80v2/config.h index 6a8864fdb9..a048333ef5 100644 --- a/keyboards/mode/m80v2/config.h +++ b/keyboards/mode/m80v2/config.h @@ -26,9 +26,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 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/mode/m65ha_alpha/config.h | 3 --- keyboards/mode/m65hi_alpha/config.h | 3 --- keyboards/mode/m65s/config.h | 3 --- keyboards/mode/m75h/config.h | 3 --- keyboards/mode/m75s/config.h | 3 --- keyboards/mode/m80v1/config.h | 3 --- keyboards/mode/m80v2/config.h | 3 --- 7 files changed, 21 deletions(-) (limited to 'keyboards/mode') diff --git a/keyboards/mode/m65ha_alpha/config.h b/keyboards/mode/m65ha_alpha/config.h index 04242c3718..0901b701e4 100644 --- a/keyboards/mode/m65ha_alpha/config.h +++ b/keyboards/mode/m65ha_alpha/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { A7 , A10, D2 , C12, B1 , C11 } #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 /* Locking resynchronize hack */ diff --git a/keyboards/mode/m65hi_alpha/config.h b/keyboards/mode/m65hi_alpha/config.h index c3e72ca4be..f7f3c78e41 100644 --- a/keyboards/mode/m65hi_alpha/config.h +++ b/keyboards/mode/m65hi_alpha/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { A7 , A10, D2 , C12, B1 , C11 } #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 /* Locking resynchronize hack */ diff --git a/keyboards/mode/m65s/config.h b/keyboards/mode/m65s/config.h index 20b87bbf4d..caa263cf80 100644 --- a/keyboards/mode/m65s/config.h +++ b/keyboards/mode/m65s/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { A3 , B14, B15, C9 , C6 , C11 } #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 /* Locking resynchronize hack */ diff --git a/keyboards/mode/m75h/config.h b/keyboards/mode/m75h/config.h index 8c70333888..ee61ff4b82 100644 --- a/keyboards/mode/m75h/config.h +++ b/keyboards/mode/m75h/config.h @@ -26,9 +26,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { C5, B0, B14, B15, A8 , C9 , A15} #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 /* Locking resynchronize hack */ diff --git a/keyboards/mode/m75s/config.h b/keyboards/mode/m75s/config.h index d585790f26..7e3915b616 100644 --- a/keyboards/mode/m75s/config.h +++ b/keyboards/mode/m75s/config.h @@ -26,9 +26,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { C5, B0, B14, B15, C7 , C9 , A15} #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 /* Locking resynchronize hack */ diff --git a/keyboards/mode/m80v1/config.h b/keyboards/mode/m80v1/config.h index a0af8ef6f3..ad33c8f65a 100644 --- a/keyboards/mode/m80v1/config.h +++ b/keyboards/mode/m80v1/config.h @@ -36,9 +36,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/mode/m80v2/config.h b/keyboards/mode/m80v2/config.h index a048333ef5..e78b490b31 100644 --- a/keyboards/mode/m80v2/config.h +++ b/keyboards/mode/m80v2/config.h @@ -26,9 +26,6 @@ along with this program. If not, see . #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 /* 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/mode/m80v1/config.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'keyboards/mode') diff --git a/keyboards/mode/m80v1/config.h b/keyboards/mode/m80v1/config.h index ad33c8f65a..f7101f36ca 100644 --- a/keyboards/mode/m80v1/config.h +++ b/keyboards/mode/m80v1/config.h @@ -41,11 +41,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 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/mode/m65ha_alpha/info.json | 2 ++ keyboards/mode/m65ha_alpha/rules.mk | 7 ------- keyboards/mode/m65hi_alpha/info.json | 2 ++ keyboards/mode/m65hi_alpha/rules.mk | 7 ------- keyboards/mode/m65s/info.json | 2 ++ keyboards/mode/m65s/rules.mk | 7 ------- keyboards/mode/m75h/info.json | 2 ++ keyboards/mode/m75h/rules.mk | 7 ------- keyboards/mode/m75s/info.json | 2 ++ keyboards/mode/m75s/rules.mk | 7 ------- keyboards/mode/m80v1/m80h/info.json | 2 ++ keyboards/mode/m80v1/m80h/rules.mk | 6 ------ keyboards/mode/m80v1/m80s/info.json | 2 ++ keyboards/mode/m80v1/m80s/rules.mk | 6 ------ keyboards/mode/m80v2/m80v2h/info.json | 2 ++ keyboards/mode/m80v2/m80v2h/rules.mk | 6 ------ keyboards/mode/m80v2/m80v2s/info.json | 2 ++ keyboards/mode/m80v2/m80v2s/rules.mk | 6 ------ 18 files changed, 18 insertions(+), 59 deletions(-) (limited to 'keyboards/mode') diff --git a/keyboards/mode/m65ha_alpha/info.json b/keyboards/mode/m65ha_alpha/info.json index 63cafbbd26..e856d0a7b6 100644 --- a/keyboards/mode/m65ha_alpha/info.json +++ b/keyboards/mode/m65ha_alpha/info.json @@ -8,6 +8,8 @@ "pid": "0x6566", "device_version": "0.6.5" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layout_aliases": { "LAYOUT_all": "LAYOUT_65_ansi_blocker" }, diff --git a/keyboards/mode/m65ha_alpha/rules.mk b/keyboards/mode/m65ha_alpha/rules.mk index 091e076bd0..71de5b0a9f 100644 --- a/keyboards/mode/m65ha_alpha/rules.mk +++ b/keyboards/mode/m65ha_alpha/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mode/m65hi_alpha/info.json b/keyboards/mode/m65hi_alpha/info.json index 7869008f8d..3adafce6f0 100644 --- a/keyboards/mode/m65hi_alpha/info.json +++ b/keyboards/mode/m65hi_alpha/info.json @@ -8,6 +8,8 @@ "pid": "0x6574", "device_version": "0.6.5" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layout_aliases": { "LAYOUT_all": "LAYOUT_65_iso_blocker" }, diff --git a/keyboards/mode/m65hi_alpha/rules.mk b/keyboards/mode/m65hi_alpha/rules.mk index 091e076bd0..71de5b0a9f 100644 --- a/keyboards/mode/m65hi_alpha/rules.mk +++ b/keyboards/mode/m65hi_alpha/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mode/m65s/info.json b/keyboards/mode/m65s/info.json index 511a05bf8f..60ee66db88 100644 --- a/keyboards/mode/m65s/info.json +++ b/keyboards/mode/m65s/info.json @@ -8,6 +8,8 @@ "pid": "0x6583", "device_version": "0.0.1" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mode/m65s/rules.mk b/keyboards/mode/m65s/rules.mk index 91f94bfa10..91bc99f944 100644 --- a/keyboards/mode/m65s/rules.mk +++ b/keyboards/mode/m65s/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mode/m75h/info.json b/keyboards/mode/m75h/info.json index e3b5c6d64b..f7d265707e 100644 --- a/keyboards/mode/m75h/info.json +++ b/keyboards/mode/m75h/info.json @@ -8,6 +8,8 @@ "pid": "0x7572", "device_version": "0.0.1" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mode/m75h/rules.mk b/keyboards/mode/m75h/rules.mk index 76752ec1b3..ee752a964b 100644 --- a/keyboards/mode/m75h/rules.mk +++ b/keyboards/mode/m75h/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mode/m75s/info.json b/keyboards/mode/m75s/info.json index 2b58f194fb..58768a1063 100644 --- a/keyboards/mode/m75s/info.json +++ b/keyboards/mode/m75s/info.json @@ -8,6 +8,8 @@ "pid": "0x7583", "device_version": "0.0.1" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mode/m75s/rules.mk b/keyboards/mode/m75s/rules.mk index 76752ec1b3..ee752a964b 100644 --- a/keyboards/mode/m75s/rules.mk +++ b/keyboards/mode/m75s/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mode/m80v1/m80h/info.json b/keyboards/mode/m80v1/m80h/info.json index a5e18224ae..e7558244ce 100644 --- a/keyboards/mode/m80v1/m80h/info.json +++ b/keyboards/mode/m80v1/m80h/info.json @@ -8,6 +8,8 @@ "pid": "0x0081", "device_version": "0.7.2" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": [ "tkl_ansi" ], "layout_aliases": { "LAYOUT_eighty_m80h": "LAYOUT_tkl_ansi" diff --git a/keyboards/mode/m80v1/m80h/rules.mk b/keyboards/mode/m80v1/m80h/rules.mk index 56294f95fd..8c9d2aea96 100644 --- a/keyboards/mode/m80v1/m80h/rules.mk +++ b/keyboards/mode/m80v1/m80h/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mode/m80v1/m80s/info.json b/keyboards/mode/m80v1/m80s/info.json index 7b72eb256f..a94585c926 100644 --- a/keyboards/mode/m80v1/m80s/info.json +++ b/keyboards/mode/m80v1/m80s/info.json @@ -8,6 +8,8 @@ "pid": "0x0080", "device_version": "0.8.3" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_eighty_m80s": { "layout": [ diff --git a/keyboards/mode/m80v1/m80s/rules.mk b/keyboards/mode/m80v1/m80s/rules.mk index 56294f95fd..8c9d2aea96 100644 --- a/keyboards/mode/m80v1/m80s/rules.mk +++ b/keyboards/mode/m80v1/m80s/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mode/m80v2/m80v2h/info.json b/keyboards/mode/m80v2/m80v2h/info.json index 04f3577bf6..fdbd5c88d1 100644 --- a/keyboards/mode/m80v2/m80v2h/info.json +++ b/keyboards/mode/m80v2/m80v2h/info.json @@ -8,6 +8,8 @@ "pid": "0x0083", "device_version": "0.0.2" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": [ "tkl_ansi" ], "layout_aliases": { "LAYOUT_m80v2h": "LAYOUT_tkl_ansi" diff --git a/keyboards/mode/m80v2/m80v2h/rules.mk b/keyboards/mode/m80v2/m80v2h/rules.mk index 5422160c87..113eb5ade8 100644 --- a/keyboards/mode/m80v2/m80v2h/rules.mk +++ b/keyboards/mode/m80v2/m80v2h/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mode/m80v2/m80v2s/info.json b/keyboards/mode/m80v2/m80v2s/info.json index 4e2a4fc6f5..06c106ecdc 100644 --- a/keyboards/mode/m80v2/m80v2s/info.json +++ b/keyboards/mode/m80v2/m80v2s/info.json @@ -8,6 +8,8 @@ "pid": "0x0082", "device_version": "0.0.2" }, + "processor": "F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_m80v2s": { "layout": [ diff --git a/keyboards/mode/m80v2/m80v2s/rules.mk b/keyboards/mode/m80v2/m80v2s/rules.mk index 5422160c87..113eb5ade8 100644 --- a/keyboards/mode/m80v2/m80v2s/rules.mk +++ b/keyboards/mode/m80v2/m80v2s/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # -- cgit v1.2.3 From c67285587c812a3dffb20113c8a270b596156d0e Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 9 Feb 2023 14:34:21 +1100 Subject: Fix errors flagged by generate-api (#19784) --- keyboards/mode/m80v2/m80v2s/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/mode') diff --git a/keyboards/mode/m80v2/m80v2s/info.json b/keyboards/mode/m80v2/m80v2s/info.json index 06c106ecdc..0304354325 100644 --- a/keyboards/mode/m80v2/m80v2s/info.json +++ b/keyboards/mode/m80v2/m80v2s/info.json @@ -8,7 +8,7 @@ "pid": "0x0082", "device_version": "0.0.2" }, - "processor": "F072", + "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { "LAYOUT_m80v2s": { -- 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/mode/m65ha_alpha/config.h | 1 - keyboards/mode/m65ha_alpha/info.json | 3 +++ keyboards/mode/m65hi_alpha/config.h | 1 - keyboards/mode/m65hi_alpha/info.json | 3 +++ keyboards/mode/m65s/config.h | 1 - keyboards/mode/m65s/info.json | 3 +++ keyboards/mode/m80v2/config.h | 3 --- keyboards/mode/m80v2/m80v2h/info.json | 4 ++++ keyboards/mode/m80v2/m80v2s/info.json | 4 ++++ 9 files changed, 17 insertions(+), 6 deletions(-) (limited to 'keyboards/mode') diff --git a/keyboards/mode/m65ha_alpha/config.h b/keyboards/mode/m65ha_alpha/config.h index 0901b701e4..8bc75d0616 100644 --- a/keyboards/mode/m65ha_alpha/config.h +++ b/keyboards/mode/m65ha_alpha/config.h @@ -37,7 +37,6 @@ along with this program. If not, see . #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE #define OPENDRAIN_INDICATORS -#define LED_CAPS_LOCK_PIN A6 /* * Feature disable options diff --git a/keyboards/mode/m65ha_alpha/info.json b/keyboards/mode/m65ha_alpha/info.json index e856d0a7b6..4d27f46223 100644 --- a/keyboards/mode/m65ha_alpha/info.json +++ b/keyboards/mode/m65ha_alpha/info.json @@ -8,6 +8,9 @@ "pid": "0x6566", "device_version": "0.6.5" }, + "indicators": { + "caps_lock": "A6" + }, "processor": "STM32F401", "bootloader": "stm32-dfu", "layout_aliases": { diff --git a/keyboards/mode/m65hi_alpha/config.h b/keyboards/mode/m65hi_alpha/config.h index f7f3c78e41..aab8942456 100644 --- a/keyboards/mode/m65hi_alpha/config.h +++ b/keyboards/mode/m65hi_alpha/config.h @@ -37,7 +37,6 @@ along with this program. If not, see . #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE #define OPENDRAIN_INDICATORS -#define LED_CAPS_LOCK_PIN A6 /* * Feature disable options diff --git a/keyboards/mode/m65hi_alpha/info.json b/keyboards/mode/m65hi_alpha/info.json index 3adafce6f0..c6ea41bee0 100644 --- a/keyboards/mode/m65hi_alpha/info.json +++ b/keyboards/mode/m65hi_alpha/info.json @@ -8,6 +8,9 @@ "pid": "0x6574", "device_version": "0.6.5" }, + "indicators": { + "caps_lock": "A6" + }, "processor": "STM32F401", "bootloader": "stm32-dfu", "layout_aliases": { diff --git a/keyboards/mode/m65s/config.h b/keyboards/mode/m65s/config.h index caa263cf80..a00b5d7e82 100644 --- a/keyboards/mode/m65s/config.h +++ b/keyboards/mode/m65s/config.h @@ -37,7 +37,6 @@ along with this program. If not, see . #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE #define OPENDRAIN_INDICATORS -#define LED_CAPS_LOCK_PIN C8 /* * Feature disable options diff --git a/keyboards/mode/m65s/info.json b/keyboards/mode/m65s/info.json index 60ee66db88..53c7ccace4 100644 --- a/keyboards/mode/m65s/info.json +++ b/keyboards/mode/m65s/info.json @@ -8,6 +8,9 @@ "pid": "0x6583", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "C8" + }, "processor": "STM32F401", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/mode/m80v2/config.h b/keyboards/mode/m80v2/config.h index e78b490b31..def4e84ab5 100644 --- a/keyboards/mode/m80v2/config.h +++ b/keyboards/mode/m80v2/config.h @@ -30,6 +30,3 @@ along with this program. If not, see . #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#define LED_CAPS_LOCK_PIN A0 -#define LED_PIN_ON_STATE 0 diff --git a/keyboards/mode/m80v2/m80v2h/info.json b/keyboards/mode/m80v2/m80v2h/info.json index fdbd5c88d1..51788340ca 100644 --- a/keyboards/mode/m80v2/m80v2h/info.json +++ b/keyboards/mode/m80v2/m80v2h/info.json @@ -8,6 +8,10 @@ "pid": "0x0083", "device_version": "0.0.2" }, + "indicators": { + "caps_lock": "A0", + "on_state": 0 + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "community_layouts": [ "tkl_ansi" ], diff --git a/keyboards/mode/m80v2/m80v2s/info.json b/keyboards/mode/m80v2/m80v2s/info.json index 0304354325..d7f5dd663b 100644 --- a/keyboards/mode/m80v2/m80v2s/info.json +++ b/keyboards/mode/m80v2/m80v2s/info.json @@ -8,6 +8,10 @@ "pid": "0x0082", "device_version": "0.0.2" }, + "indicators": { + "caps_lock": "A0", + "on_state": 0 + }, "processor": "STM32F072", "bootloader": "stm32-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/mode/m65ha_alpha/config.h | 4 ---- keyboards/mode/m65hi_alpha/config.h | 4 ---- keyboards/mode/m65s/config.h | 4 ---- keyboards/mode/m75h/config.h | 3 --- keyboards/mode/m75s/config.h | 3 --- keyboards/mode/m80v1/config.h | 4 ---- keyboards/mode/m80v2/config.h | 4 ---- 7 files changed, 26 deletions(-) (limited to 'keyboards/mode') diff --git a/keyboards/mode/m65ha_alpha/config.h b/keyboards/mode/m65ha_alpha/config.h index 8bc75d0616..da995299e4 100644 --- a/keyboards/mode/m65ha_alpha/config.h +++ b/keyboards/mode/m65ha_alpha/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 15 - #define MATRIX_COL_PINS { B10, B12, C8 , C4 , C5 , B0 , C10, B13, B14, B15, A15, C6 , C7 , A8 , C9} #define MATRIX_ROW_PINS { A7 , A10, D2 , C12, B1 , C11 } #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mode/m65hi_alpha/config.h b/keyboards/mode/m65hi_alpha/config.h index aab8942456..62faefd168 100644 --- a/keyboards/mode/m65hi_alpha/config.h +++ b/keyboards/mode/m65hi_alpha/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 15 - #define MATRIX_COL_PINS { B10, B12, C8 , C4 , C5 , B0 , C10, B13, B14, B15, A15, C6 , C7 , A8 , C9 } #define MATRIX_ROW_PINS { A7 , A10, D2 , C12, B1 , C11 } #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mode/m65s/config.h b/keyboards/mode/m65s/config.h index a00b5d7e82..173c679f1f 100644 --- a/keyboards/mode/m65s/config.h +++ b/keyboards/mode/m65s/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 16 - #define MATRIX_COL_PINS { C7 , A8 , A10, A4 , A5 , A6 , C10, A7, C4 , C5 , A15, B0 , B1 , B12, B10, B13 } #define MATRIX_ROW_PINS { A3 , B14, B15, C9 , C6 , C11 } #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mode/m75h/config.h b/keyboards/mode/m75h/config.h index ee61ff4b82..2b0b122a6b 100644 --- a/keyboards/mode/m75h/config.h +++ b/keyboards/mode/m75h/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 7 -#define MATRIX_COLS 16 //C0, C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, C15 #define MATRIX_COL_PINS { C8, C7, A10, B13, B12, B10, B1, C10, C11, D2, C12, B3, B4, B5, B8, B9 } //R0, R1, R2, R3, R4, R5 , R6 diff --git a/keyboards/mode/m75s/config.h b/keyboards/mode/m75s/config.h index 7e3915b616..7bbeb8c937 100644 --- a/keyboards/mode/m75s/config.h +++ b/keyboards/mode/m75s/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 7 -#define MATRIX_COLS 16 //C0, C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, C15 #define MATRIX_COL_PINS { C8, A8, A10, B13, B12, B10, B1, C10, C11, D2, C12, B3, B4, B5, B8, B9 } //R0, R1, R2, R3, R4, R5 , R6 diff --git a/keyboards/mode/m80v1/config.h b/keyboards/mode/m80v1/config.h index f7101f36ca..c50628ca54 100644 --- a/keyboards/mode/m80v1/config.h +++ b/keyboards/mode/m80v1/config.h @@ -15,10 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 16 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/mode/m80v2/config.h b/keyboards/mode/m80v2/config.h index def4e84ab5..dcfd8d1614 100644 --- a/keyboards/mode/m80v2/config.h +++ b/keyboards/mode/m80v2/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 17 - #define MATRIX_ROW_PINS { B12, B13, B14, B3, B4, B9 } #define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, B0, B1, B10, A8, A10, B15, A15, B5, B8, C13 } -- 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/mode/m80v1/config.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'keyboards/mode') diff --git a/keyboards/mode/m80v1/config.h b/keyboards/mode/m80v1/config.h index c50628ca54..6b59fc9872 100644 --- a/keyboards/mode/m80v1/config.h +++ b/keyboards/mode/m80v1/config.h @@ -15,6 +15,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +#pragma once + /* * Keyboard Matrix Assignments * -- 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/mode/m75s/config.h | 3 --- keyboards/mode/m75s/info.json | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'keyboards/mode') diff --git a/keyboards/mode/m75s/config.h b/keyboards/mode/m75s/config.h index 09e9b7bc73..6c90b66be5 100644 --- a/keyboards/mode/m75s/config.h +++ b/keyboards/mode/m75s/config.h @@ -28,9 +28,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define BACKLIGHT_PIN C6 -#define BACKLIGHT_LEVELS 20 -#define BACKLIGHT_CAPS_LOCK #define BACKLIGHT_DEFAULT_LEVEL 20 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 diff --git a/keyboards/mode/m75s/info.json b/keyboards/mode/m75s/info.json index 58768a1063..f046a8dffd 100644 --- a/keyboards/mode/m75s/info.json +++ b/keyboards/mode/m75s/info.json @@ -8,6 +8,11 @@ "pid": "0x7583", "device_version": "0.0.1" }, + "backlight": { + "pin": "C6", + "levels": 20, + "as_caps_lock": true + }, "processor": "STM32F401", "bootloader": "stm32-dfu", "layouts": { -- cgit v1.2.3