]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
make 'layer_state_set' visible to user code
authorColin T.A. Gray <colinta@gmail.com>
Mon, 11 Dec 2017 18:54:57 +0000 (11:54 -0700)
committerJack Humbert <jack.humb@gmail.com>
Fri, 15 Dec 2017 18:23:30 +0000 (13:23 -0500)
tmk_core/common/action_layer.c
tmk_core/common/action_layer.h

index 9dfbba9daadaa49b4776d171e5c6b248089b55ea..22331376aab744d56a5556e5f276f37685e834f4 100644 (file)
@@ -73,7 +73,7 @@ uint32_t layer_state_set_kb(uint32_t state) {
     return layer_state_set_user(state);
 }
 
-static void layer_state_set(uint32_t state)
+void layer_state_set(uint32_t state)
 {
     state = layer_state_set_kb(state);
     dprint("layer_state: ");
index 5fad18cbd6e34b16d0e13342c4dbbf571f8ad26e..72a6bd8f684c13a717806065a71b3f37f2fc08e8 100644 (file)
@@ -49,10 +49,13 @@ void default_layer_xor(uint32_t state);
  */
 #ifndef NO_ACTION_LAYER
 extern uint32_t layer_state;
-void layer_debug(void);
-void layer_clear(void);
+
+void layer_state_set(uint32_t state);
 bool layer_state_is(uint8_t layer);
 bool layer_state_cmp(uint32_t layer1, uint8_t layer2);
+
+void layer_debug(void);
+void layer_clear(void);
 void layer_move(uint8_t layer);
 void layer_on(uint8_t layer);
 void layer_off(uint8_t layer);
@@ -62,17 +65,21 @@ void layer_or(uint32_t state);
 void layer_and(uint32_t state);
 void layer_xor(uint32_t state);
 #else
-#define layer_state             0
+#define layer_state                    0
+
+#define layer_state_set(layer)
+#define layer_state_is(layer)          (layer == 0)
+#define layer_state_cmp(state, layer)  (state == 0 ? layer == 0 : (state & 1UL << layer) != 0)
+
+#define layer_debug()
 #define layer_clear()
 #define layer_move(layer)
 #define layer_on(layer)
 #define layer_off(layer)
 #define layer_invert(layer)
-
 #define layer_or(state)
 #define layer_and(state)
 #define layer_xor(state)
-#define layer_debug()
 
 __attribute__((weak))
 uint32_t layer_state_set_user(uint32_t state);