diff options
author | QMK Bot <hello@qmk.fm> | 2021-12-17 07:52:39 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-12-17 07:52:39 +0000 |
commit | 4219508b42f42c9f692a82dabf1cd8a26e0b31ae (patch) | |
tree | 4d13c2a8dbd54087938b213f669b1a816877c7e2 /keyboards | |
parent | 1b29f98d99d6865b6082ac0aab737519bf3eb9e7 (diff) | |
parent | 23d48039887131878413b92477509e07934edb9f (diff) | |
download | qmk_firmware-4219508b42f42c9f692a82dabf1cd8a26e0b31ae.tar.gz qmk_firmware-4219508b42f42c9f692a82dabf1cd8a26e0b31ae.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r-- | keyboards/ferris/sweep/config.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/keyboards/ferris/sweep/config.h b/keyboards/ferris/sweep/config.h index 702f31a895..4d4d7d309f 100644 --- a/keyboards/ferris/sweep/config.h +++ b/keyboards/ferris/sweep/config.h @@ -1,4 +1,7 @@ -/* Copyright 2018-2020 ENDO Katsuhiro <ka2hiro@curlybracket.co.jp> David Philip Barr <@davidphilipbarr> Pierre Chevalier <pierrechevalier83@gmail.com> +/* Copyright 2018-2020 +ENDO Katsuhiro <ka2hiro@curlybracket.co.jp> +David Philip Barr <@davidphilipbarr> +Pierre Chevalier <pierrechevalier83@gmail.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -61,11 +64,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* 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 */ @@ -74,8 +72,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 |