Made rollover behavior for space cadet optional

This commit is contained in:
Smilliam 2016-07-10 19:04:01 -07:00
parent 6b0c9cc905
commit b12fe6abb2
4 changed files with 26 additions and 10 deletions

View File

@ -53,11 +53,11 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #
BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration(+1000) BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700)
EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450)
CONSOLE_ENABLE ?= yes # Console for debug(+400) CONSOLE_ENABLE ?= yes # Console for debug(+400)
COMMAND_ENABLE ?= yes # Commands for debug and configuration COMMAND_ENABLE ?= no # Commands for debug and configuration
KEYBOARD_LOCK_ENABLE ?= yes # Allow locking of keyboard via magic key KEYBOARD_LOCK_ENABLE ?= yes # Allow locking of keyboard via magic key
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend

View File

@ -107,6 +107,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
) )
/* Prevent stuck modifiers when switching between FN layers */
#define PREVENT_STUCK_MODIFIERS
/* Enable opposite shift key to cancel space cadet state */
#define DISABLE_SPACE_CADET_ROLLOVER
/* control how magic key switches layers */ /* control how magic key switches layers */
//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true
//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true

View File

@ -162,10 +162,12 @@ bool process_record_quantum(keyrecord_t *record) {
register_mods(MOD_BIT(KC_LSFT)); register_mods(MOD_BIT(KC_LSFT));
} }
else { else {
if (get_mods() & MOD_BIT(KC_RSFT)) { #ifdef DISABLE_SPACE_CADET_ROLLOVER
shift_interrupted[0] = true; if (get_mods() & MOD_BIT(KC_RSFT)) {
shift_interrupted[1] = true; shift_interrupted[0] = true;
} shift_interrupted[1] = true;
}
#endif
if (!shift_interrupted[0]) { if (!shift_interrupted[0]) {
register_code(LSPO_KEY); register_code(LSPO_KEY);
unregister_code(LSPO_KEY); unregister_code(LSPO_KEY);
@ -182,10 +184,12 @@ bool process_record_quantum(keyrecord_t *record) {
register_mods(MOD_BIT(KC_RSFT)); register_mods(MOD_BIT(KC_RSFT));
} }
else { else {
if (get_mods() & MOD_BIT(KC_LSFT)) { #ifdef DISABLE_SPACE_CADET_ROLLOVER
shift_interrupted[0] = true; if (get_mods() & MOD_BIT(KC_LSFT)) {
shift_interrupted[1] = true; shift_interrupted[0] = true;
} shift_interrupted[1] = true;
}
#endif
if (!shift_interrupted[1]) { if (!shift_interrupted[1]) {
register_code(RSPC_KEY); register_code(RSPC_KEY);
unregister_code(RSPC_KEY); unregister_code(RSPC_KEY);

View File

@ -309,6 +309,12 @@ It's defaulted to work on US keyboards, but if your layout uses different keys f
#define LSPO_KEY KC_9 #define LSPO_KEY KC_9
#define RSPC_KEY KC_0 #define RSPC_KEY KC_0
You can also choose between different rollover behaviors of the shift keys by defining:
#define DISABLE_SPACE_CADET_ROLLOVER
in your `config.h`. Disabling rollover allows you to use the opposite shift key to cancel the space cadet state in the event of an erroneous press instead of emitting a pair of parentheses when the keys are released.
The only other thing you're going to want to do is create a `Makefile` in your keymap directory and set the following: The only other thing you're going to want to do is create a `Makefile` in your keymap directory and set the following:
``` ```