From 801d2ff940a5f19ee4fa7df992e86d1fd1daf610 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 30 Dec 2022 11:48:05 +1100 Subject: Remove useless line continuations (#19399) --- .../nightmare/keymaps/brandonschlack/keymap.c | 80 +++++++++++----------- 1 file changed, 40 insertions(+), 40 deletions(-) (limited to 'keyboards/nightmare') diff --git a/keyboards/nightmare/keymaps/brandonschlack/keymap.c b/keyboards/nightmare/keymaps/brandonschlack/keymap.c index 29b7bd1c67..0ed81cf053 100644 --- a/keyboards/nightmare/keymaps/brandonschlack/keymap.c +++ b/keyboards/nightmare/keymaps/brandonschlack/keymap.c @@ -46,11 +46,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │End││││││││Opt│Cmd │                           │ Cmd│Ctl││││││ * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘ */ -[_BASE] = LAYOUT_default( \ - KC_HOME, KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ - KC_PGUP, HY_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ - KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, PLY_FN1, \ - KC_END, KC_LOPT, KC_LCMD, SPC_RAI, KC_RCMD, KC_RCTL \ +[_BASE] = LAYOUT_default( + KC_HOME, KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, + KC_PGUP, HY_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, PLY_FN1, + KC_END, KC_LOPT, KC_LCMD, SPC_RAI, KC_RCMD, KC_RCTL ), /** @@ -66,11 +66,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘ */ -[_REEDER] = LAYOUT_default( \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______ \ +[_REEDER] = LAYOUT_default( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), /** @@ -85,11 +85,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ ← ││││││││   │    │                           │    │   ││││││ * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘ */ -[_NAV] = LAYOUT_default( \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______ \ +[_NAV] = LAYOUT_default( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), /** @@ -104,11 +104,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │WhD││││││││   │    │                           │    │   ││││││ * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘ */ -[_MOUSE] = LAYOUT_default( \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______ \ +[_MOUSE] = LAYOUT_default( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), /** @@ -123,11 +123,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │Prv││││││││   │    │                           │    │   ││││││ * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘ */ -[_LOWER] = LAYOUT_default( \ - KC_MNXT, KC_DEL, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, KC_UP, KC_MUTE, MC_SLPD, \ - KC_VOLU, _______, _______, _______, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, _______, _______, KC_LEFT, KC_RGHT, KC_MPLY, \ - KC_VOLD, SF_CAPS, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, KC_DOWN, _______, _______, \ - KC_MPRV, _______, _______, _______, _______, _______ \ +[_LOWER] = LAYOUT_default( + KC_MNXT, KC_DEL, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, KC_UP, KC_MUTE, MC_SLPD, + KC_VOLU, _______, _______, _______, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, _______, _______, KC_LEFT, KC_RGHT, KC_MPLY, + KC_VOLD, SF_CAPS, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, KC_DOWN, _______, _______, + KC_MPRV, _______, _______, _______, _______, _______ ), /** @@ -142,11 +142,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │Prv││││││││   │    │                           │    │   ││││││ * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘ */ -[_RAISE] = LAYOUT_default( \ - KC_MNXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, _______, \ - KC_VOLU, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, _______, _______, _______, _______, \ - KC_VOLD, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, KC_BSLS, _______, _______, \ - KC_MPRV, _______, _______, _______, _______, _______ \ +[_RAISE] = LAYOUT_default( + KC_MNXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, _______, + KC_VOLU, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, _______, _______, _______, _______, + KC_VOLD, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, KC_BSLS, _______, _______, + KC_MPRV, _______, _______, _______, _______, _______ ), /** @@ -161,11 +161,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │Mse││││││││   │    │                           │    │   ││││││ * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘ */ -[_ADJUST] = LAYOUT_default( \ - TG_BASE, QM_MAKE, _______, _______, EE_CLR, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - TG_REDR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - TG_NAV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - TG_MOUS, _______, _______, _______, _______, _______ \ +[_ADJUST] = LAYOUT_default( + TG_BASE, QM_MAKE, _______, _______, EE_CLR, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + TG_REDR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + TG_NAV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + TG_MOUS, _______, _______, _______, _______, _______ ), /** @@ -181,11 +181,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘ */ /* -[] = LAYOUT_default( \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______ \ +[] = LAYOUT_default( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), */ }; -- 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/nightmare/config.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'keyboards/nightmare') diff --git a/keyboards/nightmare/config.h b/keyboards/nightmare/config.h index affebef0c8..7488372eaf 100644 --- a/keyboards/nightmare/config.h +++ b/keyboards/nightmare/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 -- 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/nightmare/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/nightmare') diff --git a/keyboards/nightmare/config.h b/keyboards/nightmare/config.h index 7488372eaf..9ba8375594 100644 --- a/keyboards/nightmare/config.h +++ b/keyboards/nightmare/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 -- 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/nightmare/config.h | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'keyboards/nightmare') diff --git a/keyboards/nightmare/config.h b/keyboards/nightmare/config.h index 9ba8375594..1d53dfad43 100644 --- a/keyboards/nightmare/config.h +++ b/keyboards/nightmare/config.h @@ -75,27 +75,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/nightmare/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/nightmare') diff --git a/keyboards/nightmare/config.h b/keyboards/nightmare/config.h index 1d53dfad43..a21b3bbde0 100644 --- a/keyboards/nightmare/config.h +++ b/keyboards/nightmare/config.h @@ -62,9 +62,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/nightmare/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/nightmare') diff --git a/keyboards/nightmare/config.h b/keyboards/nightmare/config.h index a21b3bbde0..35d79a9d7f 100644 --- a/keyboards/nightmare/config.h +++ b/keyboards/nightmare/config.h @@ -59,9 +59,6 @@ along with this program. If not, see . // #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 // #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/nightmare/config.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'keyboards/nightmare') diff --git a/keyboards/nightmare/config.h b/keyboards/nightmare/config.h index 35d79a9d7f..f74305fa4d 100644 --- a/keyboards/nightmare/config.h +++ b/keyboards/nightmare/config.h @@ -64,11 +64,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/nightmare/info.json | 2 ++ keyboards/nightmare/rules.mk | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'keyboards/nightmare') diff --git a/keyboards/nightmare/info.json b/keyboards/nightmare/info.json index 858bb5d8ab..30cdf63114 100644 --- a/keyboards/nightmare/info.json +++ b/keyboards/nightmare/info.json @@ -8,6 +8,8 @@ "pid": "0x4E49", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/nightmare/rules.mk b/keyboards/nightmare/rules.mk index 354f194ca2..309e55c9f4 100644 --- a/keyboards/nightmare/rules.mk +++ b/keyboards/nightmare/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 ccb6c908dd71fac3dfa89f2d8baa8196eac9994f Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 9 Feb 2023 10:57:42 +1100 Subject: Remove `SOFT_SERIAL_PIN` for non-split boards (#19774) * Remove `SOFT_SERIAL_PIN` for non-split boards * Delete more empty config.h --- keyboards/nightmare/config.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'keyboards/nightmare') diff --git a/keyboards/nightmare/config.h b/keyboards/nightmare/config.h index f74305fa4d..97595c2a74 100644 --- a/keyboards/nightmare/config.h +++ b/keyboards/nightmare/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 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/nightmare/config.h | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'keyboards/nightmare') diff --git a/keyboards/nightmare/config.h b/keyboards/nightmare/config.h index 97595c2a74..3e1e066cea 100644 --- a/keyboards/nightmare/config.h +++ b/keyboards/nightmare/config.h @@ -38,22 +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 */ -// /*== customize breathing effect ==*/ -// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -// /*==== use exp() and sin() ====*/ -// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 -// #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 d784f78bd0a034c1d6085379615014fd701536ab Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 08:49:49 +1100 Subject: Move Bootmagic config to data driven (#19860) --- keyboards/nightmare/config.h | 4 ---- keyboards/nightmare/info.json | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'keyboards/nightmare') diff --git a/keyboards/nightmare/config.h b/keyboards/nightmare/config.h index 3e1e066cea..4d955a597d 100644 --- a/keyboards/nightmare/config.h +++ b/keyboards/nightmare/config.h @@ -58,7 +58,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 1 diff --git a/keyboards/nightmare/info.json b/keyboards/nightmare/info.json index 30cdf63114..0e349f1a15 100644 --- a/keyboards/nightmare/info.json +++ b/keyboards/nightmare/info.json @@ -8,6 +8,9 @@ "pid": "0x4E49", "device_version": "0.0.1" }, + "bootmagic": { + "matrix": [0, 1] + }, "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/nightmare/config.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'keyboards/nightmare') diff --git a/keyboards/nightmare/config.h b/keyboards/nightmare/config.h index 4d955a597d..bb1f16afc4 100644 --- a/keyboards/nightmare/config.h +++ b/keyboards/nightmare/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 14 - /* * Keyboard Matrix Assignments * -- cgit v1.2.3