max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core: Fix for build option NO_ACTION_LAYER

Browse source
This commit is contained in:
tmk 2017-09-14 12:58:06 +09:00
parent 956f806644
commit 45f6e5cb97
2 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tmk_core/common/action_layer.c
View file

@ -122,9 +122,8 @@ void layer_debug(void)
/* return layer effective for key at this time */ /* return layer effective for key at this time */
static uint8_t current_layer_for_key(keypos_t key) static uint8_t current_layer_for_key(keypos_t key)
{ {
action_t action = ACTION_TRANSPARENT;
#ifndef NO_ACTION_LAYER #ifndef NO_ACTION_LAYER
action_t action = ACTION_TRANSPARENT;
uint32_t layers = layer_state | default_layer_state; uint32_t layers = layer_state | default_layer_state;
/* check top layer first */ /* check top layer first */
for (int8_t i = 31; i >= 0; i--) { for (int8_t i = 31; i >= 0; i--) {

16
tmk_core/common/action_layer.h
View file

@ -34,10 +34,6 @@ void default_layer_set(uint32_t state);
void default_layer_or(uint32_t state); void default_layer_or(uint32_t state);
void default_layer_and(uint32_t state); void default_layer_and(uint32_t state);
void default_layer_xor(uint32_t state); void default_layer_xor(uint32_t state);
#else
#define default_layer_or(state)
#define default_layer_and(state)
#define default_layer_xor(state)
#endif #endif
@ -56,18 +52,6 @@ void layer_invert(uint8_t layer);
void layer_or(uint32_t state); void layer_or(uint32_t state);
void layer_and(uint32_t state); void layer_and(uint32_t state);
void layer_xor(uint32_t state); void layer_xor(uint32_t state);
#else
#define layer_state 0
#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()
#endif #endif