From 743449472e58651ec8111e6f70811103fb0a28bd Mon Sep 17 00:00:00 2001
From: Joe Wasson <jwasson+github@gmail.com>
Date: Mon, 17 Sep 2018 10:48:02 -0700
Subject: Make `PREVENT_STUCK_MODIFIERS` the default (#3107)

* Remove chording as it is not documented, not used, and needs work.

* Make Leader Key an optional feature.

* Switch from `PREVENT_STUCK_MODIFIERS` to `STRICT_LAYER_RELEASE`

* Remove `#define PREVENT_STUCK_MODIFIERS` from keymaps.
---
 keyboards/planck/keymaps/ajp10304/config.h       |  8 --------
 keyboards/planck/keymaps/altgr/config.h          |  3 ---
 keyboards/planck/keymaps/am/config.h             |  3 ---
 keyboards/planck/keymaps/andylikescandy/config.h |  3 ---
 keyboards/planck/keymaps/bone2planck/config.h    |  8 --------
 keyboards/planck/keymaps/davidrambo/config.h     |  5 ++---
 keyboards/planck/keymaps/dshields/config.h       |  1 -
 keyboards/planck/keymaps/espynn/keymap.c         |  1 -
 keyboards/planck/keymaps/experimental/config.h   |  2 --
 keyboards/planck/keymaps/experimental/rules.mk   |  3 ++-
 keyboards/planck/keymaps/hiea/config.h           |  3 ---
 keyboards/planck/keymaps/hieax/config.h          |  3 ---
 keyboards/planck/keymaps/ishtob/config.h         |  2 --
 keyboards/planck/keymaps/jarred/config.h         |  4 +---
 keyboards/planck/keymaps/jeremy-dev/keymap.c     |  1 -
 keyboards/planck/keymaps/kmontag42/rules.mk      |  1 +
 keyboards/planck/keymaps/lae3/config.h           |  8 --------
 keyboards/planck/keymaps/mitch/config.h          |  3 +--
 keyboards/planck/keymaps/mitch/readme.md         |  4 ----
 keyboards/planck/keymaps/narze/config.h          |  3 +--
 keyboards/planck/keymaps/neo2planck/config.h     |  8 --------
 keyboards/planck/keymaps/priyadi/config.h        |  2 --
 keyboards/planck/keymaps/sdothum/config.h        |  3 ---
 keyboards/planck/keymaps/steno/config.h          |  4 +---
 keyboards/planck/keymaps/tehwalris/config.h      |  4 +---
 keyboards/planck/keymaps/vifon/config.h          |  3 ---
 keyboards/planck/keymaps/yale/config.h           | 11 -----------
 keyboards/planck/keymaps/zach/config.h           |  1 -
 keyboards/planck/rev6/config.h                   |  3 ---
 29 files changed, 10 insertions(+), 98 deletions(-)
 delete mode 100644 keyboards/planck/keymaps/ajp10304/config.h
 delete mode 100644 keyboards/planck/keymaps/bone2planck/config.h
 delete mode 100644 keyboards/planck/keymaps/lae3/config.h
 delete mode 100644 keyboards/planck/keymaps/neo2planck/config.h
 delete mode 100644 keyboards/planck/keymaps/yale/config.h

(limited to 'keyboards/planck')

diff --git a/keyboards/planck/keymaps/ajp10304/config.h b/keyboards/planck/keymaps/ajp10304/config.h
deleted file mode 100644
index 11cafbefcb..0000000000
--- a/keyboards/planck/keymaps/ajp10304/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define PREVENT_STUCK_MODIFIERS
-
-#endif
diff --git a/keyboards/planck/keymaps/altgr/config.h b/keyboards/planck/keymaps/altgr/config.h
index d55258c02b..e517a8b24b 100644
--- a/keyboards/planck/keymaps/altgr/config.h
+++ b/keyboards/planck/keymaps/altgr/config.h
@@ -3,9 +3,6 @@
 
 #include "../../config.h"
 
-// required because lower/raise modifiers are redefined by colemak-dh
-#define PREVENT_STUCK_MODIFIERS
-
 // tap dance key press termination interval
 #define TAPPING_TERM 250
 
diff --git a/keyboards/planck/keymaps/am/config.h b/keyboards/planck/keymaps/am/config.h
index b2b87045b8..1ae457e3b8 100644
--- a/keyboards/planck/keymaps/am/config.h
+++ b/keyboards/planck/keymaps/am/config.h
@@ -1,8 +1,5 @@
 #pragma once
 
-/* Prevent stuck modifiers */
-#define PREVENT_STUCK_MODIFIERS
-
 #ifdef AUDIO_ENABLE
     #define STARTUP_SONG SONG(PLANCK_SOUND)
 
diff --git a/keyboards/planck/keymaps/andylikescandy/config.h b/keyboards/planck/keymaps/andylikescandy/config.h
index 0de5f3db0c..01169db2aa 100644
--- a/keyboards/planck/keymaps/andylikescandy/config.h
+++ b/keyboards/planck/keymaps/andylikescandy/config.h
@@ -17,9 +17,6 @@
 
 #define PERMISSIVE_HOLD
 
-#define PREVENT_STUCK_MODIFIERS
-
-
 /*
  * MIDI options
  */
diff --git a/keyboards/planck/keymaps/bone2planck/config.h b/keyboards/planck/keymaps/bone2planck/config.h
deleted file mode 100644
index 3e9e692d3c..0000000000
--- a/keyboards/planck/keymaps/bone2planck/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define PREVENT_STUCK_MODIFIERS
-
-#endif
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/davidrambo/config.h b/keyboards/planck/keymaps/davidrambo/config.h
index c3bebf5799..2decb3dc8d 100644
--- a/keyboards/planck/keymaps/davidrambo/config.h
+++ b/keyboards/planck/keymaps/davidrambo/config.h
@@ -3,7 +3,6 @@
 #define CONFIG_USER_H
 #define TAPPING_TERM 200
 #include "../../config.h"
-#define PERMISSIVE_HOLD 
-#define PREVENT_STUCK_MODIFIERS
+#define PERMISSIVE_HOLD
 
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/planck/keymaps/dshields/config.h b/keyboards/planck/keymaps/dshields/config.h
index 480ba453a2..9ba854ef04 100644
--- a/keyboards/planck/keymaps/dshields/config.h
+++ b/keyboards/planck/keymaps/dshields/config.h
@@ -10,7 +10,6 @@
 
 #define _______ KC_TRNS
 #define XXXXXXX KC_NO
-#define PREVENT_STUCK_MODIFIERS
 
 #define USB_MAX_POWER_CONSUMPTION 100
 #define ONESHOT_TAP_TOGGLE        2
diff --git a/keyboards/planck/keymaps/espynn/keymap.c b/keyboards/planck/keymaps/espynn/keymap.c
index 9cf508af6d..5615a78bf7 100644
--- a/keyboards/planck/keymaps/espynn/keymap.c
+++ b/keyboards/planck/keymaps/espynn/keymap.c
@@ -5,7 +5,6 @@
 #ifdef BACKLIGHT_ENABLE
   #include "backlight.h"
 #endif
-#define PREVENT_STUCK_MODIFIERS
 extern keymap_config_t keymap_config;
 
 // Symbolic names for macro IDs.
diff --git a/keyboards/planck/keymaps/experimental/config.h b/keyboards/planck/keymaps/experimental/config.h
index 0864b5fbc9..86cc4760bb 100644
--- a/keyboards/planck/keymaps/experimental/config.h
+++ b/keyboards/planck/keymaps/experimental/config.h
@@ -5,8 +5,6 @@
 
 #define LEADER_TIMEOUT 300
 #define BACKLIGHT_BREATHING
-#define PREVENT_STUCK_MODIFIERS
-
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN B1
diff --git a/keyboards/planck/keymaps/experimental/rules.mk b/keyboards/planck/keymaps/experimental/rules.mk
index b135dfca01..168d3cb9f0 100644
--- a/keyboards/planck/keymaps/experimental/rules.mk
+++ b/keyboards/planck/keymaps/experimental/rules.mk
@@ -18,10 +18,11 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
 SWAP_HANDS_ENABLE = yes        # Enable one-hand typing
 STENO_ENABLE = yes					# Enable TX Bolt protocol for Stenography, requires VIRTSER and may not work with mouse keys
+LEADER_ENABLE = yes
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 ifndef QUANTUM_DIR
 	include ../../../../Makefile
-endif
\ No newline at end of file
+endif
diff --git a/keyboards/planck/keymaps/hiea/config.h b/keyboards/planck/keymaps/hiea/config.h
index 9bb5e08735..655cdf5db3 100644
--- a/keyboards/planck/keymaps/hiea/config.h
+++ b/keyboards/planck/keymaps/hiea/config.h
@@ -3,9 +3,6 @@
 
 #include "../../config.h"
 
-// required because lower/raise modifiers are redefined by colemak-dh
-#define PREVENT_STUCK_MODIFIERS
-
 // tap dance key press termination interval
 #define TAPPING_TERM 250
 
diff --git a/keyboards/planck/keymaps/hieax/config.h b/keyboards/planck/keymaps/hieax/config.h
index 9bb5e08735..655cdf5db3 100644
--- a/keyboards/planck/keymaps/hieax/config.h
+++ b/keyboards/planck/keymaps/hieax/config.h
@@ -3,9 +3,6 @@
 
 #include "../../config.h"
 
-// required because lower/raise modifiers are redefined by colemak-dh
-#define PREVENT_STUCK_MODIFIERS
-
 // tap dance key press termination interval
 #define TAPPING_TERM 250
 
diff --git a/keyboards/planck/keymaps/ishtob/config.h b/keyboards/planck/keymaps/ishtob/config.h
index e58ade0b0f..688607634c 100755
--- a/keyboards/planck/keymaps/ishtob/config.h
+++ b/keyboards/planck/keymaps/ishtob/config.h
@@ -2,7 +2,6 @@
 #ifndef USERSPACE_CONFIG_H
 #define USERSPACE_CONFIG_H
 
-
 #ifdef AUDIO_ENABLE
 
 // #define STARTUP_SONG SONG(E1M1_DOOM)
@@ -24,7 +23,6 @@
 #define FORCE_NKRO
 
 #define LEADER_TIMEOUT 300
-#define PREVENT_STUCK_MODIFIERS
 
 #undef DEBOUNCE
 #define DEBOUNCE 0
diff --git a/keyboards/planck/keymaps/jarred/config.h b/keyboards/planck/keymaps/jarred/config.h
index f98b8935e2..9e8f404c15 100644
--- a/keyboards/planck/keymaps/jarred/config.h
+++ b/keyboards/planck/keymaps/jarred/config.h
@@ -19,8 +19,6 @@
 
 #include "config_common.h"
 
-#define PREVENT_STUCK_MODIFIERS
-
 #ifdef AUDIO_ENABLE
     #define STARTUP_SONG SONG(PLANCK_SOUND)
 #endif
@@ -34,6 +32,6 @@
 
 #define MOUSEKEY_WHEEL_DELAY 0
 #define MOUSEKEY_WHEEL_MAX_SPEED   4
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 255	
+#define MOUSEKEY_WHEEL_TIME_TO_MAX 255
 
 #endif
diff --git a/keyboards/planck/keymaps/jeremy-dev/keymap.c b/keyboards/planck/keymaps/jeremy-dev/keymap.c
index 5aea443290..89b7e6b84a 100644
--- a/keyboards/planck/keymaps/jeremy-dev/keymap.c
+++ b/keyboards/planck/keymaps/jeremy-dev/keymap.c
@@ -1,7 +1,6 @@
 // This is the personal keymap of Jeremy Cowgar (@jcowgar). It is written for the programmer.
 
 // Configuration options
-#define PREVENT_STUCK_MODIFIERS
 
 #pragma message "You may need to add LAYOUT_planck_grid to your keymap layers - see default for an example"
 #include "planck.h"
diff --git a/keyboards/planck/keymaps/kmontag42/rules.mk b/keyboards/planck/keymaps/kmontag42/rules.mk
index b9f73934aa..0c100076be 100644
--- a/keyboards/planck/keymaps/kmontag42/rules.mk
+++ b/keyboards/planck/keymaps/kmontag42/rules.mk
@@ -1,4 +1,5 @@
 UNICODE_ENABLE = yes
+LEADER_ENABLE = yes
 
 ifndef QUANTUM_DIR
 	include ../../../../Makefile
diff --git a/keyboards/planck/keymaps/lae3/config.h b/keyboards/planck/keymaps/lae3/config.h
deleted file mode 100644
index a28634e696..0000000000
--- a/keyboards/planck/keymaps/lae3/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef LAE3_KEYMAP_H
-#define LAE3_KEYMAP_H
-
-#include "../../config.h"
-
-#define PREVENT_STUCK_MODIFIERS
-
-#endif
diff --git a/keyboards/planck/keymaps/mitch/config.h b/keyboards/planck/keymaps/mitch/config.h
index 10591b3c8c..bb7989d90d 100644
--- a/keyboards/planck/keymaps/mitch/config.h
+++ b/keyboards/planck/keymaps/mitch/config.h
@@ -1,6 +1,5 @@
 #include "../../config.h"
-#define PREVENT_STUCK_MODIFIERS
 
 // for the broken board
 #undef MATRIX_COL_PINS
-#define MATRIX_COL_PINS { F1, F0, B0, B2, F4, F5, F6, F7, D4, D6, B4, D7 }
\ No newline at end of file
+#define MATRIX_COL_PINS { F1, F0, B0, B2, F4, F5, F6, F7, D4, D6, B4, D7 }
diff --git a/keyboards/planck/keymaps/mitch/readme.md b/keyboards/planck/keymaps/mitch/readme.md
index 3869304f44..9ed1133ef9 100644
--- a/keyboards/planck/keymaps/mitch/readme.md
+++ b/keyboards/planck/keymaps/mitch/readme.md
@@ -20,7 +20,3 @@ rest of the symbols, mostly mapped with the ten key numbers.
 
 The normal right shift key uses the `MT` macro to trigger Enter on tap and right
 shift when held.
-
-This keymap sets the `PREVENT_STUCK_MODIFIERS` flag to avoid the occasional WTF
-moments when using a modifier keys and accidentally releasing them after moving
-to a new layer.
diff --git a/keyboards/planck/keymaps/narze/config.h b/keyboards/planck/keymaps/narze/config.h
index e081a93b53..19d784b2be 100644
--- a/keyboards/planck/keymaps/narze/config.h
+++ b/keyboards/planck/keymaps/narze/config.h
@@ -33,10 +33,9 @@
 
 #define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
-#define PREVENT_STUCK_MODIFIERS
 
 #define SUPER_DUPER_SOUND S__NOTE(_B1)
 
 #define MOUSEKEY_DELAY 100
 
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/planck/keymaps/neo2planck/config.h b/keyboards/planck/keymaps/neo2planck/config.h
deleted file mode 100644
index 3e9e692d3c..0000000000
--- a/keyboards/planck/keymaps/neo2planck/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define PREVENT_STUCK_MODIFIERS
-
-#endif
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/priyadi/config.h b/keyboards/planck/keymaps/priyadi/config.h
index 448ae3b908..876d057bf2 100644
--- a/keyboards/planck/keymaps/priyadi/config.h
+++ b/keyboards/planck/keymaps/priyadi/config.h
@@ -11,8 +11,6 @@
 /* skip bootmagic and eeconfig */
 #define BOOTMAGIC_KEY_SKIP              KC_SPACE
 
-#define PREVENT_STUCK_MODIFIERS
-
 #define UNICODE_TYPE_DELAY 0
 
 #define LAYOUT_DVORAK
diff --git a/keyboards/planck/keymaps/sdothum/config.h b/keyboards/planck/keymaps/sdothum/config.h
index 4b2cdeece1..8bed79e6f7 100644
--- a/keyboards/planck/keymaps/sdothum/config.h
+++ b/keyboards/planck/keymaps/sdothum/config.h
@@ -3,9 +3,6 @@
 
 #include "../../config.h"
 
-// required because lower/raise modifiers are redefined by colemak-dh
-#define PREVENT_STUCK_MODIFIERS
-
 // tap dance key press termination interval
 #define TAPPING_TERM 250
 
diff --git a/keyboards/planck/keymaps/steno/config.h b/keyboards/planck/keymaps/steno/config.h
index 1879ab007f..4f99c7eb81 100644
--- a/keyboards/planck/keymaps/steno/config.h
+++ b/keyboards/planck/keymaps/steno/config.h
@@ -15,8 +15,6 @@
 
 #define MUSIC_MASK (keycode != KC_NO)
 
-#define PREVENT_STUCK_MODIFIERS
-
 /*
  * MIDI options
  */
@@ -41,4 +39,4 @@
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 2
 
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/planck/keymaps/tehwalris/config.h b/keyboards/planck/keymaps/tehwalris/config.h
index 4725e1426d..c5d55b9693 100644
--- a/keyboards/planck/keymaps/tehwalris/config.h
+++ b/keyboards/planck/keymaps/tehwalris/config.h
@@ -3,8 +3,6 @@
 
 #include "../../config.h"
 
-#define PREVENT_STUCK_MODIFIERS
-
 #ifdef AUDIO_ENABLE
     // #define STARTUP_SONG SONG(PLANCK_SOUND)
     #define STARTUP_SONG SONG(NO_SOUND)
@@ -27,7 +25,7 @@
 /* enable basic MIDI features:
    - MIDI notes can be sent when in Music mode is on
 */
-                                
+
 #define MIDI_BASIC
 
 /* enable advanced MIDI features:
diff --git a/keyboards/planck/keymaps/vifon/config.h b/keyboards/planck/keymaps/vifon/config.h
index 4cb4a1235a..be395faad3 100644
--- a/keyboards/planck/keymaps/vifon/config.h
+++ b/keyboards/planck/keymaps/vifon/config.h
@@ -26,9 +26,6 @@
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 2
 
-/* prevent the modifiers from being stuck, sacrificing some memory */
-#define PREVENT_STUCK_MODIFIERS
-
 /* A larger buffer for the dynamic macros as this keymap is not taking
  * up that much memory.
  */
diff --git a/keyboards/planck/keymaps/yale/config.h b/keyboards/planck/keymaps/yale/config.h
deleted file mode 100644
index 8a916bbd09..0000000000
--- a/keyboards/planck/keymaps/yale/config.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define PREVENT_STUCK_MODIFIERS
-
-#endif
-
-
-
diff --git a/keyboards/planck/keymaps/zach/config.h b/keyboards/planck/keymaps/zach/config.h
index 19a3856a39..dc79bad064 100644
--- a/keyboards/planck/keymaps/zach/config.h
+++ b/keyboards/planck/keymaps/zach/config.h
@@ -55,7 +55,6 @@
 //#define NO_ACTION_ONESHOT
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
-#define PREVENT_STUCK_MODIFIERS
 //#define DYNAMIC_MACRO_ENABLE    // Enable if you need to use the macro functionality
 //#define SPACE_CADET             // Parenthesis on L/R shift
 
diff --git a/keyboards/planck/rev6/config.h b/keyboards/planck/rev6/config.h
index 0e462180bd..afd69f7d84 100644
--- a/keyboards/planck/rev6/config.h
+++ b/keyboards/planck/rev6/config.h
@@ -50,9 +50,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 6
 
-/* Prevent modifiers from being stuck on after layer changes. */
-#define PREVENT_STUCK_MODIFIERS
-
 /* 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