summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2019-11-09 02:23:26 +0000
committerDrashna Jaelre <drashna@live.com>2019-11-08 18:23:26 -0800
commitc1970e284d9718a62a973442ec9f0801365cff60 (patch)
treedecd82321b3137faf26d2a11de2dfcd9940b8a32
parent20753706337630c6be4757e322b7da90f5f030cf (diff)
Fix LAYER_STATE_8BIT compile issues (#7304)
-rw-r--r--tmk_core/common/action_layer.c2
-rw-r--r--tmk_core/common/action_layer.h2
-rw-r--r--tmk_core/common/eeconfig.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/tmk_core/common/action_layer.c b/tmk_core/common/action_layer.c
index 07d78c56d4..4c7d15cd50 100644
--- a/tmk_core/common/action_layer.c
+++ b/tmk_core/common/action_layer.c
@@ -268,7 +268,7 @@ uint8_t layer_switch_get_layer(keypos_t key) {
/* fall back to layer 0 */
return 0;
#else
- return biton32(default_layer_state);
+ return get_highest_layer(default_layer_state);
#endif
}
diff --git a/tmk_core/common/action_layer.h b/tmk_core/common/action_layer.h
index fee9b244df..b8562f5a46 100644
--- a/tmk_core/common/action_layer.h
+++ b/tmk_core/common/action_layer.h
@@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#if defined(LAYER_STATE_8BIT)
typedef uint8_t layer_state_t;
-# define get_highest_layer(state) biton8(state)
+# define get_highest_layer(state) biton(state)
#elif defined(LAYER_STATE_16BIT)
typedef uint16_t layer_state_t;
# define get_highest_layer(state) biton16(state)
diff --git a/tmk_core/common/eeconfig.c b/tmk_core/common/eeconfig.c
index 4cf4ca3ace..72f198d6ce 100644
--- a/tmk_core/common/eeconfig.c
+++ b/tmk_core/common/eeconfig.c
@@ -2,13 +2,13 @@
#include <stdbool.h>
#include "eeprom.h"
#include "eeconfig.h"
+#include "action_layer.h"
#ifdef STM32_EEPROM_ENABLE
# include "hal.h"
# include "eeprom_stm32.h"
#endif
-extern uint32_t default_layer_state;
/** \brief eeconfig enable
*
* FIXME: needs doc