aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/common/magic.c
diff options
context:
space:
mode:
authorWilliam Chang <[email protected]>2019-11-20 22:17:07 -0800
committerWilliam Chang <[email protected]>2019-11-20 22:17:07 -0800
commite7f4d56592b3975c38af329e77b4efd9108495e8 (patch)
tree0a416bccbf70bfdbdb9ffcdb3bf136b47378c014 /tmk_core/common/magic.c
parent71493b2f9bbd5f3d18373c518fa14ccafcbf48fc (diff)
parent8416a94ad27b3ff058576f09f35f0704a8b39ff3 (diff)
downloadqmk_firmware-e7f4d56592b3975c38af329e77b4efd9108495e8.tar.gz
qmk_firmware-e7f4d56592b3975c38af329e77b4efd9108495e8.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/common/magic.c')
-rw-r--r--tmk_core/common/magic.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/tmk_core/common/magic.c b/tmk_core/common/magic.c
index 2b1a6a6ad2..d8ab525735 100644
--- a/tmk_core/common/magic.c
+++ b/tmk_core/common/magic.c
@@ -1,7 +1,7 @@
#include <stdint.h>
#include <stdbool.h>
#if defined(__AVR__)
-#include <util/delay.h>
+# include <util/delay.h>
#endif
#include "matrix.h"
#include "bootloader.h"
@@ -18,8 +18,7 @@ keymap_config_t keymap_config;
*
* FIXME: Needs doc
*/
-void magic(void)
-{
+void magic(void) {
/* check signature */
if (!eeconfig_is_enabled()) {
eeconfig_init();
@@ -32,7 +31,6 @@ void magic(void)
keymap_config.raw = eeconfig_read_keymap();
uint8_t default_layer = 0;
- default_layer = eeconfig_read_default_layer();
+ default_layer = eeconfig_read_default_layer();
default_layer_set((layer_state_t)default_layer);
-
}