aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/common/action_layer.h
diff options
context:
space:
mode:
authorXyverz <xyverz@gmail.com>2017-02-20 23:54:09 -0800
committerXyverz <xyverz@gmail.com>2017-02-20 23:54:09 -0800
commitbf6f7a623dbe4e3bba4bcc6d86ac28b842226825 (patch)
tree59ce47b0d4b21a2606e1f6d367317af8bdbd06ae /tmk_core/common/action_layer.h
parentca1ec7b121c973fae614e69093f40ee9ba25e629 (diff)
parent7ff41df32c29bca4e3a6efc3047b8fa93bb99b92 (diff)
downloadqmk_firmware-bf6f7a623dbe4e3bba4bcc6d86ac28b842226825.tar.gz
qmk_firmware-bf6f7a623dbe4e3bba4bcc6d86ac28b842226825.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/common/action_layer.h')
-rw-r--r--tmk_core/common/action_layer.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/tmk_core/common/action_layer.h b/tmk_core/common/action_layer.h
index 025cf5420..d89ed6e5c 100644
--- a/tmk_core/common/action_layer.h
+++ b/tmk_core/common/action_layer.h
@@ -29,6 +29,9 @@ extern uint32_t default_layer_state;
29void default_layer_debug(void); 29void default_layer_debug(void);
30void default_layer_set(uint32_t state); 30void default_layer_set(uint32_t state);
31 31
32__attribute__((weak))
33uint32_t default_layer_state_set_kb(uint32_t state);
34
32#ifndef NO_ACTION_LAYER 35#ifndef NO_ACTION_LAYER
33/* bitwise operation */ 36/* bitwise operation */
34void default_layer_or(uint32_t state); 37void default_layer_or(uint32_t state);
@@ -69,6 +72,8 @@ void layer_xor(uint32_t state);
69#define layer_xor(state) 72#define layer_xor(state)
70#define layer_debug() 73#define layer_debug()
71 74
75__attribute__((weak))
76uint32_t layer_state_set_kb(uint32_t state);
72#endif 77#endif
73 78
74/* pressed actions cache */ 79/* pressed actions cache */