summaryrefslogtreecommitdiff
path: root/tmk_core/common/bootmagic.c
diff options
context:
space:
mode:
authorAlex Ong <the.onga@gmail.com>2019-05-18 06:47:50 +1000
committerFlorian Didron <fdidron@users.noreply.github.com>2019-07-27 11:25:58 +0900
commit8253427f12bea961443bb0cb1c22171a4ccd8db0 (patch)
treec99a59f1691b86e6aa8622f6e9dc57236c7e750a /tmk_core/common/bootmagic.c
parentaa482e2e4ffbb9747a18b0d5e6e6b2e610619484 (diff)
Typedef'ed layer_state_t to uint32_t (#3637)
* Typedef'ed layer_state_t to uint32_t. This enables future work with layer_state_t to uint8_t for optimization purposes. * Removed accidental xeal60 commit * Revert to egyptian brackets, added sizeof(layer_state_t) so when layer_state_t is redefined it will automagically work. * Add additional typedefs * Add checks for setting layer state * Update tmk_core/common/action_layer.h Co-Authored-By: alex-ong <the.onga@gmail.com> * Revert commit.
Diffstat (limited to 'tmk_core/common/bootmagic.c')
-rw-r--r--tmk_core/common/bootmagic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/common/bootmagic.c b/tmk_core/common/bootmagic.c
index 9f79fb8eed..cc780d17ab 100644
--- a/tmk_core/common/bootmagic.c
+++ b/tmk_core/common/bootmagic.c
@@ -99,10 +99,10 @@ void bootmagic(void)
if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_7)) { default_layer |= (1<<7); }
if (default_layer) {
eeconfig_update_default_layer(default_layer);
- default_layer_set((uint32_t)default_layer);
+ default_layer_set((layer_state_t)default_layer);
} else {
default_layer = eeconfig_read_default_layer();
- default_layer_set((uint32_t)default_layer);
+ default_layer_set((layer_state_t)default_layer);
}
}