diff options
| author | QMK Bot <hello@qmk.fm> | 2021-12-17 07:52:16 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-12-17 07:52:16 +0000 |
| commit | 1b29f98d99d6865b6082ac0aab737519bf3eb9e7 (patch) | |
| tree | 61ba3b3ec6362965f0dec35903ad55a2ecb82046 | |
| parent | 4b185a52bc8ca1d25df05860f4b914a3e85115a0 (diff) | |
| parent | 0703e5398c967e11c3afa3aec21f76bfc1067939 (diff) | |
| download | qmk_firmware-1b29f98d99d6865b6082ac0aab737519bf3eb9e7.tar.gz qmk_firmware-1b29f98d99d6865b6082ac0aab737519bf3eb9e7.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/cradio/config.h | 10 | ||||
| -rw-r--r-- | keyboards/macro3/config.h | 6 |
2 files changed, 3 insertions, 13 deletions
diff --git a/keyboards/cradio/config.h b/keyboards/cradio/config.h index 2d76de6a8e..37c329a244 100644 --- a/keyboards/cradio/config.h +++ b/keyboards/cradio/config.h @@ -62,11 +62,6 @@ /* 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 */ -#define LOCKING_RESYNC_ENABLE - /* Serial settings */ #define USE_SERIAL /* serial.c configuration for split keyboard */ @@ -76,8 +71,9 @@ #define EE_HANDS /* Top left key on left half */ -#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_ROW 0 #define BOOTMAGIC_LITE_COLUMN 0 /* Top right key on right half */ -#define BOOTMAGIC_LITE_ROW_RIGHT 4 +#define BOOTMAGIC_LITE_ROW_RIGHT 4 #define BOOTMAGIC_LITE_COLUMN_RIGHT 4 + diff --git a/keyboards/macro3/config.h b/keyboards/macro3/config.h index 84f8c8fd9d..722cdf319f 100644 --- a/keyboards/macro3/config.h +++ b/keyboards/macro3/config.h @@ -31,9 +31,3 @@ /* 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 */ -#define LOCKING_RESYNC_ENABLE - |