From ac561b9473559b7880bcf2510ae5a0ac5cabde7a Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sat, 31 Dec 2022 16:55:14 -0800 Subject: [Bug] Prevent dynamic keymaps from processing layers that don't exist (#19225) --- keyboards/dm9records/tartan/keymaps/via/keymap.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'keyboards/dm9records') diff --git a/keyboards/dm9records/tartan/keymaps/via/keymap.c b/keyboards/dm9records/tartan/keymaps/via/keymap.c index e98b8385c9..6ea5c328a0 100644 --- a/keyboards/dm9records/tartan/keymaps/via/keymap.c +++ b/keyboards/dm9records/tartan/keymaps/via/keymap.c @@ -19,7 +19,6 @@ enum tartan_via_layers { _QWERTY, _FN, - _L2, _L3, _L4, _L5, @@ -42,13 +41,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_L2] = LAYOUT_60_ansi( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______ - ), [_L3] = LAYOUT_60_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, -- cgit v1.2.3 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/dm9records/plaid/info.json | 1 + keyboards/dm9records/plaid/rules.mk | 1 - keyboards/dm9records/tartan/info.json | 1 + keyboards/dm9records/tartan/rules.mk | 1 - 4 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/dm9records') diff --git a/keyboards/dm9records/plaid/info.json b/keyboards/dm9records/plaid/info.json index f4c6ae5281..485ddfc005 100644 --- a/keyboards/dm9records/plaid/info.json +++ b/keyboards/dm9records/plaid/info.json @@ -8,6 +8,7 @@ "pid": "0x27DB", "device_version": "0.0.2" }, + "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_plaid_mit": { "layout": [ diff --git a/keyboards/dm9records/plaid/rules.mk b/keyboards/dm9records/plaid/rules.mk index 5c416cf40f..0fa5688ca4 100644 --- a/keyboards/dm9records/plaid/rules.mk +++ b/keyboards/dm9records/plaid/rules.mk @@ -17,7 +17,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -LAYOUTS = ortho_4x12 planck_mit LAYOUTS_HAS_RGB = no # Disable unsupported hardware diff --git a/keyboards/dm9records/tartan/info.json b/keyboards/dm9records/tartan/info.json index e2c64b943f..75045935be 100644 --- a/keyboards/dm9records/tartan/info.json +++ b/keyboards/dm9records/tartan/info.json @@ -8,6 +8,7 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"], "layouts": { "LAYOUT_60_ansi": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/dm9records/tartan/rules.mk b/keyboards/dm9records/tartan/rules.mk index 0c65bd1692..a90a23a553 100644 --- a/keyboards/dm9records/tartan/rules.mk +++ b/keyboards/dm9records/tartan/rules.mk @@ -17,7 +17,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -LAYOUTS = 60_ansi 60_ansi_split_bs_rshift 60_iso 60_iso_split_bs_rshift LAYOUTS_HAS_RGB = no # Disable unsupported hardware -- 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/dm9records/ergoinu/config.h | 3 --- keyboards/dm9records/plaid/config.h | 6 ------ keyboards/dm9records/tartan/config.h | 6 ------ 3 files changed, 15 deletions(-) (limited to 'keyboards/dm9records') diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h index 2171f37241..6ce6462959 100644 --- a/keyboards/dm9records/ergoinu/config.h +++ b/keyboards/dm9records/ergoinu/config.h @@ -44,9 +44,6 @@ along with this program. If not, see . /* define if matrix has ghost */ //#define MATRIX_HAS_GHOST -/* number of backlight levels */ -// #define BACKLIGHT_LEVELS 3 - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 diff --git a/keyboards/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h index d59afdbf40..dba99e6af1 100644 --- a/keyboards/dm9records/plaid/config.h +++ b/keyboards/dm9records/plaid/config.h @@ -46,10 +46,6 @@ along with this program. If not, see . */ // #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 -// #define BACKLIGHT_PIN B7 -// #define BACKLIGHT_BREATHING -// #define BACKLIGHT_LEVELS 3 - // #define RGB_DI_PIN E2 // #ifdef RGB_DI_PIN // #define RGBLED_NUM 16 @@ -66,8 +62,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/dm9records/tartan/config.h b/keyboards/dm9records/tartan/config.h index 8fa5635341..bb0aa9db87 100644 --- a/keyboards/dm9records/tartan/config.h +++ b/keyboards/dm9records/tartan/config.h @@ -44,10 +44,6 @@ along with this program. If not, see . */ // #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 -// #define BACKLIGHT_PIN B7 -// #define BACKLIGHT_BREATHING -// #define BACKLIGHT_LEVELS 3 - // #define RGB_DI_PIN E2 // #ifdef RGB_DI_PIN // #define RGBLED_NUM 16 @@ -64,8 +60,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/dm9records/ergoinu/config.h | 1 - keyboards/dm9records/lain/config.h | 1 - keyboards/dm9records/plaid/config.h | 1 - keyboards/dm9records/tartan/config.h | 1 - 4 files changed, 4 deletions(-) (limited to 'keyboards/dm9records') diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h index 6ce6462959..6561295192 100644 --- a/keyboards/dm9records/ergoinu/config.h +++ b/keyboards/dm9records/ergoinu/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* serial.c configuration for split keyboard */ #define SOFT_SERIAL_PIN D2 diff --git a/keyboards/dm9records/lain/config.h b/keyboards/dm9records/lain/config.h index 592b517ed2..7f8e5daf86 100644 --- a/keyboards/dm9records/lain/config.h +++ b/keyboards/dm9records/lain/config.h @@ -3,7 +3,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 4 diff --git a/keyboards/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h index dba99e6af1..58d1d0fa99 100644 --- a/keyboards/dm9records/plaid/config.h +++ b/keyboards/dm9records/plaid/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/dm9records/tartan/config.h b/keyboards/dm9records/tartan/config.h index bb0aa9db87..86f1848090 100644 --- a/keyboards/dm9records/tartan/config.h +++ b/keyboards/dm9records/tartan/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 -- 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/dm9records/plaid/config.h | 21 --------------------- keyboards/dm9records/tartan/config.h | 21 --------------------- 2 files changed, 42 deletions(-) (limited to 'keyboards/dm9records') diff --git a/keyboards/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h index 58d1d0fa99..5a3cdf2ca8 100644 --- a/keyboards/dm9records/plaid/config.h +++ b/keyboards/dm9records/plaid/config.h @@ -71,27 +71,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/dm9records/tartan/config.h b/keyboards/dm9records/tartan/config.h index 86f1848090..35806d725b 100644 --- a/keyboards/dm9records/tartan/config.h +++ b/keyboards/dm9records/tartan/config.h @@ -69,27 +69,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/dm9records/ergoinu/config.h | 3 --- keyboards/dm9records/plaid/config.h | 3 --- keyboards/dm9records/tartan/config.h | 3 --- 3 files changed, 9 deletions(-) (limited to 'keyboards/dm9records') diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h index 6561295192..ee9565a764 100644 --- a/keyboards/dm9records/ergoinu/config.h +++ b/keyboards/dm9records/ergoinu/config.h @@ -40,9 +40,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #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/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h index 5a3cdf2ca8..591cf57da5 100644 --- a/keyboards/dm9records/plaid/config.h +++ b/keyboards/dm9records/plaid/config.h @@ -58,9 +58,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/dm9records/tartan/config.h b/keyboards/dm9records/tartan/config.h index 35806d725b..89b8846dae 100644 --- a/keyboards/dm9records/tartan/config.h +++ b/keyboards/dm9records/tartan/config.h @@ -56,9 +56,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/dm9records/ergoinu/config.h | 3 --- keyboards/dm9records/lain/config.h | 3 --- keyboards/dm9records/plaid/config.h | 3 --- keyboards/dm9records/tartan/config.h | 3 --- 4 files changed, 12 deletions(-) (limited to 'keyboards/dm9records') diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h index ee9565a764..df6a8328fe 100644 --- a/keyboards/dm9records/ergoinu/config.h +++ b/keyboards/dm9records/ergoinu/config.h @@ -40,9 +40,6 @@ along with this program. If not, see . /* COL2ROW, 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 /* Locking resynchronize hack */ diff --git a/keyboards/dm9records/lain/config.h b/keyboards/dm9records/lain/config.h index 7f8e5daf86..6f199bcbaa 100644 --- a/keyboards/dm9records/lain/config.h +++ b/keyboards/dm9records/lain/config.h @@ -24,9 +24,6 @@ #define LED_PINS \ { B6, B5, B4 } -/* 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/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h index 591cf57da5..5b68d37cb3 100644 --- a/keyboards/dm9records/plaid/config.h +++ b/keyboards/dm9records/plaid/config.h @@ -55,9 +55,6 @@ along with this program. If not, see . // #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ // #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/dm9records/tartan/config.h b/keyboards/dm9records/tartan/config.h index 89b8846dae..6b23e8bbbc 100644 --- a/keyboards/dm9records/tartan/config.h +++ b/keyboards/dm9records/tartan/config.h @@ -53,9 +53,6 @@ along with this program. If not, see . // #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ // #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 53b7dbe671813808ea3a7f36c9eb5ca3c59bf16c Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 6 Feb 2023 07:26:45 +1100 Subject: Remove unused `LOCKING_SUPPORT_ENABLE` from config.h (#19748) --- keyboards/dm9records/ergoinu/config.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'keyboards/dm9records') diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h index df6a8328fe..a679167cb8 100644 --- a/keyboards/dm9records/ergoinu/config.h +++ b/keyboards/dm9records/ergoinu/config.h @@ -40,11 +40,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -//#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -//#define LOCKING_RESYNC_ENABLE - /* ws2812 RGB LED */ #define RGB_DI_PIN B6 -- 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/dm9records/plaid/config.h | 5 ----- keyboards/dm9records/tartan/config.h | 5 ----- 2 files changed, 10 deletions(-) (limited to 'keyboards/dm9records') diff --git a/keyboards/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h index 5b68d37cb3..0209ce8b27 100644 --- a/keyboards/dm9records/plaid/config.h +++ b/keyboards/dm9records/plaid/config.h @@ -60,11 +60,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/dm9records/tartan/config.h b/keyboards/dm9records/tartan/config.h index 6b23e8bbbc..ebafe80e58 100644 --- a/keyboards/dm9records/tartan/config.h +++ b/keyboards/dm9records/tartan/config.h @@ -58,11 +58,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/dm9records/plaid/config.h | 4 ---- keyboards/dm9records/tartan/config.h | 4 ---- 2 files changed, 8 deletions(-) (limited to 'keyboards/dm9records') diff --git a/keyboards/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h index 0209ce8b27..a90229dda3 100644 --- a/keyboards/dm9records/plaid/config.h +++ b/keyboards/dm9records/plaid/config.h @@ -75,7 +75,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 diff --git a/keyboards/dm9records/tartan/config.h b/keyboards/dm9records/tartan/config.h index ebafe80e58..d7a094790f 100644 --- a/keyboards/dm9records/tartan/config.h +++ b/keyboards/dm9records/tartan/config.h @@ -73,7 +73,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/dm9records/plaid/config.h | 5 ----- keyboards/dm9records/tartan/config.h | 5 ----- 2 files changed, 10 deletions(-) (limited to 'keyboards/dm9records') diff --git a/keyboards/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h index a90229dda3..510eec241c 100644 --- a/keyboards/dm9records/plaid/config.h +++ b/keyboards/dm9records/plaid/config.h @@ -40,11 +40,6 @@ along with this program. If not, see . #define USB_MAX_POWER_CONSUMPTION 100 -/* - * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. - */ -// #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 - // #define RGB_DI_PIN E2 // #ifdef RGB_DI_PIN // #define RGBLED_NUM 16 diff --git a/keyboards/dm9records/tartan/config.h b/keyboards/dm9records/tartan/config.h index d7a094790f..5c412e4b1e 100644 --- a/keyboards/dm9records/tartan/config.h +++ b/keyboards/dm9records/tartan/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 D0 // or D1, D2, D3, E6 - // #define RGB_DI_PIN E2 // #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/dm9records/ergoinu/info.json | 2 ++ keyboards/dm9records/ergoinu/rules.mk | 6 ------ keyboards/dm9records/lain/info.json | 2 ++ keyboards/dm9records/lain/rules.mk | 6 ------ keyboards/dm9records/plaid/info.json | 2 ++ keyboards/dm9records/plaid/rules.mk | 6 ------ keyboards/dm9records/tartan/info.json | 2 ++ keyboards/dm9records/tartan/rules.mk | 6 ------ 8 files changed, 8 insertions(+), 24 deletions(-) (limited to 'keyboards/dm9records') diff --git a/keyboards/dm9records/ergoinu/info.json b/keyboards/dm9records/ergoinu/info.json index 10f67b05ac..24dbc2b744 100644 --- a/keyboards/dm9records/ergoinu/info.json +++ b/keyboards/dm9records/ergoinu/info.json @@ -8,6 +8,8 @@ "pid": "0xEE60", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dm9records/ergoinu/rules.mk b/keyboards/dm9records/ergoinu/rules.mk index aba3644c9e..a876de5b53 100644 --- a/keyboards/dm9records/ergoinu/rules.mk +++ b/keyboards/dm9records/ergoinu/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/dm9records/lain/info.json b/keyboards/dm9records/lain/info.json index fd39c977fd..6ef0d21391 100644 --- a/keyboards/dm9records/lain/info.json +++ b/keyboards/dm9records/lain/info.json @@ -8,6 +8,8 @@ "pid": "0xE8F4", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dm9records/lain/rules.mk b/keyboards/dm9records/lain/rules.mk index 476cf49f27..3b6a1809db 100644 --- a/keyboards/dm9records/lain/rules.mk +++ b/keyboards/dm9records/lain/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/dm9records/plaid/info.json b/keyboards/dm9records/plaid/info.json index d8e4f57e08..f0e3577e5f 100644 --- a/keyboards/dm9records/plaid/info.json +++ b/keyboards/dm9records/plaid/info.json @@ -8,6 +8,8 @@ "pid": "0x27DB", "device_version": "0.0.2" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_planck_mit": { diff --git a/keyboards/dm9records/plaid/rules.mk b/keyboards/dm9records/plaid/rules.mk index 0fa5688ca4..c8391483dd 100644 --- a/keyboards/dm9records/plaid/rules.mk +++ b/keyboards/dm9records/plaid/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/dm9records/tartan/info.json b/keyboards/dm9records/tartan/info.json index 75045935be..24fad8a9ff 100644 --- a/keyboards/dm9records/tartan/info.json +++ b/keyboards/dm9records/tartan/info.json @@ -8,6 +8,8 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/dm9records/tartan/rules.mk b/keyboards/dm9records/tartan/rules.mk index a90a23a553..66ded37adf 100644 --- a/keyboards/dm9records/tartan/rules.mk +++ b/keyboards/dm9records/tartan/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # 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/dm9records/plaid/config.h | 10 ---------- keyboards/dm9records/tartan/config.h | 10 ---------- 2 files changed, 20 deletions(-) (limited to 'keyboards/dm9records') diff --git a/keyboards/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h index 510eec241c..9801c73e2c 100644 --- a/keyboards/dm9records/plaid/config.h +++ b/keyboards/dm9records/plaid/config.h @@ -40,16 +40,6 @@ along with this program. If not, see . #define USB_MAX_POWER_CONSUMPTION 100 -// #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 -// #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -// #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -// #endif - /* 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/dm9records/tartan/config.h b/keyboards/dm9records/tartan/config.h index 5c412e4b1e..69d2d7bec9 100644 --- a/keyboards/dm9records/tartan/config.h +++ b/keyboards/dm9records/tartan/config.h @@ -38,16 +38,6 @@ along with this program. If not, see . /* 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 -// #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -// #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -// #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/dm9records/ergoinu/config.h | 4 ---- keyboards/dm9records/lain/config.h | 4 ---- keyboards/dm9records/plaid/config.h | 4 ---- keyboards/dm9records/tartan/config.h | 4 ---- 4 files changed, 16 deletions(-) (limited to 'keyboards/dm9records') diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h index a679167cb8..9516c339f0 100644 --- a/keyboards/dm9records/ergoinu/config.h +++ b/keyboards/dm9records/ergoinu/config.h @@ -28,13 +28,9 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -/* key matrix size */ -// Rows are doubled-up -#define MATRIX_ROWS 10 #define MATRIX_ROW_PINS { F6, F7, B1, B3, B2 } // wiring of each half -#define MATRIX_COLS 7 #define MATRIX_COL_PINS { B4, E6, D7, C6, D4, F5, F4 } /* COL2ROW, ROW2COL */ diff --git a/keyboards/dm9records/lain/config.h b/keyboards/dm9records/lain/config.h index 6f199bcbaa..bf9fce0889 100644 --- a/keyboards/dm9records/lain/config.h +++ b/keyboards/dm9records/lain/config.h @@ -4,10 +4,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 4 -#define MATRIX_COLS 13 - /* * Keyboard Matrix Assignments */ diff --git a/keyboards/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h index 9801c73e2c..e808946006 100644 --- a/keyboards/dm9records/plaid/config.h +++ b/keyboards/dm9records/plaid/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 12 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/dm9records/tartan/config.h b/keyboards/dm9records/tartan/config.h index 69d2d7bec9..53f1566252 100644 --- a/keyboards/dm9records/tartan/config.h +++ b/keyboards/dm9records/tartan/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 * -- 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/dm9records/ergoinu/config.h | 4 ---- keyboards/dm9records/ergoinu/info.json | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'keyboards/dm9records') diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h index 9516c339f0..43e53608e9 100644 --- a/keyboards/dm9records/ergoinu/config.h +++ b/keyboards/dm9records/ergoinu/config.h @@ -19,10 +19,6 @@ along with this program. If not, see . #pragma once - -/* serial.c configuration for split keyboard */ -#define SOFT_SERIAL_PIN D2 - /* Select hand configuration */ #define MASTER_LEFT // #define MASTER_RIGHT diff --git a/keyboards/dm9records/ergoinu/info.json b/keyboards/dm9records/ergoinu/info.json index 24dbc2b744..38f18f0cc1 100644 --- a/keyboards/dm9records/ergoinu/info.json +++ b/keyboards/dm9records/ergoinu/info.json @@ -8,6 +8,9 @@ "pid": "0xEE60", "device_version": "0.0.1" }, + "split": { + "soft_serial_pin": "D2" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { -- cgit v1.2.3 From 7f805cc7799deb0ca75f751cebd32c6640058af9 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Thu, 23 Feb 2023 09:19:00 +1100 Subject: VIA Protocol 12 + fixes (#19916) Co-authored-by: Wilba Co-authored-by: zvecr --- keyboards/dm9records/lain/keymaps/via/keymap.c | 8 ++++---- keyboards/dm9records/lain/keymaps/via/readme.md | 2 +- keyboards/dm9records/plaid/keymaps/via/keymap.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'keyboards/dm9records') diff --git a/keyboards/dm9records/lain/keymaps/via/keymap.c b/keyboards/dm9records/lain/keymaps/via/keymap.c index f6d49cc553..d900ffb3a2 100644 --- a/keyboards/dm9records/lain/keymaps/via/keymap.c +++ b/keyboards/dm9records/lain/keymaps/via/keymap.c @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_RBRC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_INS, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, - KC_LCTL, KC_LALT, KC_LGUI, FN_MO13, KC_SPC, KC_ENT, FN_MO23, KC_RALT, KC_MENU, KC_RCTL, KC_RSFT + KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_ENT, TL_UPPR, KC_RALT, KC_MENU, KC_RCTL, KC_RSFT ), [NUM] = LAYOUT( KC_DEL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [CONF] = LAYOUT( QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - USER00, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + QK_USER_0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ), @@ -50,8 +50,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case USER00: - // via user keycode USER00 : toggle leds enable + case QK_USER_0: + // via user keycode QK_USER : toggle leds enable if (record->event.pressed) { lain_enable_leds_toggle(); } diff --git a/keyboards/dm9records/lain/keymaps/via/readme.md b/keyboards/dm9records/lain/keymaps/via/readme.md index efde27cb47..d2192ae4d1 100644 --- a/keyboards/dm9records/lain/keymaps/via/readme.md +++ b/keyboards/dm9records/lain/keymaps/via/readme.md @@ -5,4 +5,4 @@ 2-3: Layor indicator ## Via user keycode -USER00 : toggle leds enable +USER(0) : toggle leds enable diff --git a/keyboards/dm9records/plaid/keymaps/via/keymap.c b/keyboards/dm9records/plaid/keymaps/via/keymap.c index d326bac8ed..f54c5b9008 100644 --- a/keyboards/dm9records/plaid/keymaps/via/keymap.c +++ b/keyboards/dm9records/plaid/keymaps/via/keymap.c @@ -16,8 +16,8 @@ #include QMK_KEYBOARD_H -#define LOWER FN_MO13 -#define RAISE FN_MO23 +#define LOWER TL_LOWR +#define RAISE TL_UPPR const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -- cgit v1.2.3