diff options
author | QMK Bot <hello@qmk.fm> | 2022-06-02 18:30:44 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-06-02 18:30:44 +0000 |
commit | 267f39223780d37fe9a328ea092c967121291e9d (patch) | |
tree | 70e696d5c52a3d996566e56a25dfa27288858172 | |
parent | b94baa8bc380e8d7c73d063e95da3f37e91287e5 (diff) | |
parent | 5bcfc273ce2699913454408a0f266112c665d425 (diff) | |
download | qmk_firmware-267f39223780d37fe9a328ea092c967121291e9d.tar.gz qmk_firmware-267f39223780d37fe9a328ea092c967121291e9d.zip |
Merge remote-tracking branch 'origin/master' into develop
-rwxr-xr-x | keyboards/fallacy/config.h | 4 | ||||
-rw-r--r-- | keyboards/handwired/brain/config.h | 1 | ||||
-rw-r--r-- | keyboards/handwired/d48/config.h | 3 | ||||
-rw-r--r-- | keyboards/kapcave/paladinpad/config.h | 5 | ||||
-rw-r--r-- | keyboards/shiro/config.h | 2 |
5 files changed, 1 insertions, 14 deletions
diff --git a/keyboards/fallacy/config.h b/keyboards/fallacy/config.h index 379d25d9db..c99653f2c5 100755 --- a/keyboards/fallacy/config.h +++ b/keyboards/fallacy/config.h @@ -59,10 +59,6 @@ */ #define LOCKING_RESYNC_ENABLE -/* prevent stuck modifiers - */ -#define PREVENT_STUCK_MODIFIERS - #define RGB_DI_PIN D2 #define RGBLIGHT_ANIMATIONS #define RGBLED_NUM 14 diff --git a/keyboards/handwired/brain/config.h b/keyboards/handwired/brain/config.h index 87aec1a299..6b9e650bcf 100644 --- a/keyboards/handwired/brain/config.h +++ b/keyboards/handwired/brain/config.h @@ -97,7 +97,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -//#define PREVENT_STUCK_MODIFIERS //#define TAPPING_TERM 150 //#define IGNORE_MOD_TAP_INTERRUPT //#define TAPPING_FORCE_HOLD diff --git a/keyboards/handwired/d48/config.h b/keyboards/handwired/d48/config.h index 9c23442997..83ca9b2247 100644 --- a/keyboards/handwired/d48/config.h +++ b/keyboards/handwired/d48/config.h @@ -31,9 +31,6 @@ /* Locking resynchronize hack */ // #define LOCKING_RESYNC_ENABLE -/* prevent stuck modifiers */ -// #define PREVENT_STUCK_MODIFIERS - /* RGB Underglow */ #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN A15 diff --git a/keyboards/kapcave/paladinpad/config.h b/keyboards/kapcave/paladinpad/config.h index 9b3c9a4ca0..2b7d6e363a 100644 --- a/keyboards/kapcave/paladinpad/config.h +++ b/keyboards/kapcave/paladinpad/config.h @@ -39,8 +39,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 - -/* prevent stuck modifiers */ -#define PREVENT_STUCK_MODIFIERS - - diff --git a/keyboards/shiro/config.h b/keyboards/shiro/config.h index 0e7ac54f97..80243234e7 100644 --- a/keyboards/shiro/config.h +++ b/keyboards/shiro/config.h @@ -85,7 +85,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #endif /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCING_DELAY 5 +#define DEBOUNCE 5 /* define if matrix has ghost (lacks anti-ghosting diodes) */ //#define MATRIX_HAS_GHOST |