diff options
Diffstat (limited to 'tmk_core')
-rw-r--r-- | tmk_core/common/action.c | 2 | ||||
-rw-r--r-- | tmk_core/common/action.h | 2 | ||||
-rw-r--r-- | tmk_core/common/action_layer.c | 4 | ||||
-rw-r--r-- | tmk_core/common/action_layer.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c index ae0864749..76d02bc9d 100644 --- a/tmk_core/common/action.c +++ b/tmk_core/common/action.c | |||
@@ -120,7 +120,7 @@ void process_hand_swap(keyevent_t *event) { | |||
120 | } | 120 | } |
121 | #endif | 121 | #endif |
122 | 122 | ||
123 | #if !defined(NO_ACTION_LAYER) && defined(PREVENT_STUCK_MODIFIERS) | 123 | #if !defined(NO_ACTION_LAYER) && !defined(STRICT_LAYER_RELEASE) |
124 | bool disable_action_cache = false; | 124 | bool disable_action_cache = false; |
125 | 125 | ||
126 | void process_record_nocache(keyrecord_t *record) | 126 | void process_record_nocache(keyrecord_t *record) |
diff --git a/tmk_core/common/action.h b/tmk_core/common/action.h index acc55c7d3..0322c73ed 100644 --- a/tmk_core/common/action.h +++ b/tmk_core/common/action.h | |||
@@ -62,7 +62,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt); | |||
62 | bool process_record_quantum(keyrecord_t *record); | 62 | bool process_record_quantum(keyrecord_t *record); |
63 | 63 | ||
64 | /* Utilities for actions. */ | 64 | /* Utilities for actions. */ |
65 | #if !defined(NO_ACTION_LAYER) && defined(PREVENT_STUCK_MODIFIERS) | 65 | #if !defined(NO_ACTION_LAYER) && !defined(STRICT_LAYER_RELEASE) |
66 | extern bool disable_action_cache; | 66 | extern bool disable_action_cache; |
67 | #endif | 67 | #endif |
68 | 68 | ||
diff --git a/tmk_core/common/action_layer.c b/tmk_core/common/action_layer.c index f3cd381ab..62375dfbf 100644 --- a/tmk_core/common/action_layer.c +++ b/tmk_core/common/action_layer.c | |||
@@ -219,7 +219,7 @@ void layer_debug(void) | |||
219 | } | 219 | } |
220 | #endif | 220 | #endif |
221 | 221 | ||
222 | #if !defined(NO_ACTION_LAYER) && defined(PREVENT_STUCK_MODIFIERS) | 222 | #if !defined(NO_ACTION_LAYER) && !defined(STRICT_LAYER_RELEASE) |
223 | uint8_t source_layers_cache[(MATRIX_ROWS * MATRIX_COLS + 7) / 8][MAX_LAYER_BITS] = {{0}}; | 223 | uint8_t source_layers_cache[(MATRIX_ROWS * MATRIX_COLS + 7) / 8][MAX_LAYER_BITS] = {{0}}; |
224 | 224 | ||
225 | void update_source_layers_cache(keypos_t key, uint8_t layer) | 225 | void update_source_layers_cache(keypos_t key, uint8_t layer) |
@@ -263,7 +263,7 @@ uint8_t read_source_layers_cache(keypos_t key) | |||
263 | */ | 263 | */ |
264 | action_t store_or_get_action(bool pressed, keypos_t key) | 264 | action_t store_or_get_action(bool pressed, keypos_t key) |
265 | { | 265 | { |
266 | #if !defined(NO_ACTION_LAYER) && defined(PREVENT_STUCK_MODIFIERS) | 266 | #if !defined(NO_ACTION_LAYER) && !defined(STRICT_LAYER_RELEASE) |
267 | if (disable_action_cache) { | 267 | if (disable_action_cache) { |
268 | return layer_switch_get_action(key); | 268 | return layer_switch_get_action(key); |
269 | } | 269 | } |
diff --git a/tmk_core/common/action_layer.h b/tmk_core/common/action_layer.h index 72a6bd8f6..7bf116be2 100644 --- a/tmk_core/common/action_layer.h +++ b/tmk_core/common/action_layer.h | |||
@@ -88,7 +88,7 @@ uint32_t layer_state_set_kb(uint32_t state); | |||
88 | #endif | 88 | #endif |
89 | 89 | ||
90 | /* pressed actions cache */ | 90 | /* pressed actions cache */ |
91 | #if !defined(NO_ACTION_LAYER) && defined(PREVENT_STUCK_MODIFIERS) | 91 | #if !defined(NO_ACTION_LAYER) && !defined(STRICT_LAYER_RELEASE) |
92 | /* The number of bits needed to represent the layer number: log2(32). */ | 92 | /* The number of bits needed to represent the layer number: log2(32). */ |
93 | #define MAX_LAYER_BITS 5 | 93 | #define MAX_LAYER_BITS 5 |
94 | void update_source_layers_cache(keypos_t key, uint8_t layer); | 94 | void update_source_layers_cache(keypos_t key, uint8_t layer); |