aboutsummaryrefslogtreecommitdiff
path: root/common/layer_switch.c
diff options
context:
space:
mode:
Diffstat (limited to 'common/layer_switch.c')
-rw-r--r--common/layer_switch.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/common/layer_switch.c b/common/layer_switch.c
index 19e286f88..a5d426a89 100644
--- a/common/layer_switch.c
+++ b/common/layer_switch.c
@@ -24,6 +24,7 @@ void default_layer_set(uint8_t layer)
24} 24}
25 25
26 26
27#ifndef NO_ACTION_KEYMAP
27/* 28/*
28 * Keymap Layer (0-15) 29 * Keymap Layer (0-15)
29 */ 30 */
@@ -95,9 +96,11 @@ void keymap_debug(void)
95{ 96{
96 debug_hex16(keymap_stat); debug("("); debug_dec(keymap_get_layer()); debug(")"); 97 debug_hex16(keymap_stat); debug("("); debug_dec(keymap_get_layer()); debug(")");
97} 98}
99#endif
98 100
99 101
100 102
103#ifndef NO_ACTION_OVERLAY
101/* 104/*
102 * Overlay Layer (16-31 = 0-15|0x10) 105 * Overlay Layer (16-31 = 0-15|0x10)
103 */ 106 */
@@ -169,12 +172,14 @@ void overlay_debug(void)
169{ 172{
170 debug_hex16(overlay_stat); debug("("); debug_dec(overlay_get_layer()); debug(")"); 173 debug_hex16(overlay_stat); debug("("); debug_dec(overlay_get_layer()); debug(")");
171} 174}
175#endif
172 176
173action_t layer_switch_get_action(key_t key) 177action_t layer_switch_get_action(key_t key)
174{ 178{
175 action_t action; 179 action_t action;
176 action.code = ACTION_TRANSPARENT; 180 action.code = ACTION_TRANSPARENT;
177 181
182#ifndef NO_ACTION_OVERLAY
178 /* overlay: top layer first */ 183 /* overlay: top layer first */
179 for (int8_t i = 15; i >= 0; i--) { 184 for (int8_t i = 15; i >= 0; i--) {
180 if (overlay_stat & (1<<i)) { 185 if (overlay_stat & (1<<i)) {
@@ -184,7 +189,9 @@ action_t layer_switch_get_action(key_t key)
184 } 189 }
185 } 190 }
186 } 191 }
192#endif
187 193
194#ifndef NO_ACTION_KEYMAP
188 /* keymap: top layer first */ 195 /* keymap: top layer first */
189 for (int8_t i = 15; i >= 0; i--) { 196 for (int8_t i = 15; i >= 0; i--) {
190 if (keymap_stat & (1<<i)) { 197 if (keymap_stat & (1<<i)) {
@@ -194,6 +201,7 @@ action_t layer_switch_get_action(key_t key)
194 } 201 }
195 } 202 }
196 } 203 }
204#endif
197 205
198 /* default layer */ 206 /* default layer */
199 action = action_for_key(default_layer, key); 207 action = action_for_key(default_layer, key);