aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/common/action_layer.h
diff options
context:
space:
mode:
Diffstat (limited to 'tmk_core/common/action_layer.h')
-rw-r--r--tmk_core/common/action_layer.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/tmk_core/common/action_layer.h b/tmk_core/common/action_layer.h
index 16922c1ff..f9f686112 100644
--- a/tmk_core/common/action_layer.h
+++ b/tmk_core/common/action_layer.h
@@ -82,9 +82,11 @@ void layer_on(uint8_t layer);
82void layer_off(uint8_t layer); 82void layer_off(uint8_t layer);
83void layer_invert(uint8_t layer); 83void layer_invert(uint8_t layer);
84/* bitwise operation */ 84/* bitwise operation */
85void layer_or(layer_state_t state); 85void layer_or(layer_state_t state);
86void layer_and(layer_state_t state); 86void layer_and(layer_state_t state);
87void layer_xor(layer_state_t state); 87void layer_xor(layer_state_t state);
88layer_state_t layer_state_set_user(layer_state_t state);
89layer_state_t layer_state_set_kb(layer_state_t state);
88#else 90#else
89# define layer_state 0 91# define layer_state 0
90 92
@@ -101,11 +103,10 @@ void layer_xor(layer_state_t state);
101# define layer_or(state) (void)state 103# define layer_or(state) (void)state
102# define layer_and(state) (void)state 104# define layer_and(state) (void)state
103# define layer_xor(state) (void)state 105# define layer_xor(state) (void)state
106# define layer_state_set_kb(state) (void)state
107# define layer_state_set_user(state) (void)state
104#endif 108#endif
105 109
106layer_state_t layer_state_set_user(layer_state_t state);
107layer_state_t layer_state_set_kb(layer_state_t state);
108
109/* pressed actions cache */ 110/* pressed actions cache */
110#if !defined(NO_ACTION_LAYER) && !defined(STRICT_LAYER_RELEASE) 111#if !defined(NO_ACTION_LAYER) && !defined(STRICT_LAYER_RELEASE)
111 112