10 files changed, 532 insertions, 614 deletions

diff --git a/app/src/behaviors/behavior_bt.c b/app/src/behaviors/behavior_bt.c
index 3a5fbfb..09fadba 100644
--- a/app/src/behaviors/behavior_bt.c
+++ b/app/src/behaviors/behavior_bt.c
@@ -18,10 +18,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #include <zmk/ble.h>
 
-static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t command, u32_t arg)
-{
-    switch (command)
-    {
+static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t command, u32_t arg) {
+    switch (command) {
     case BT_CLR_CMD:
         return zmk_ble_clear_bonds();
     case BT_NXT_CMD:
@@ -37,13 +35,10 @@ static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t c
     return -ENOTSUP;
 }
 
-static int behavior_bt_init(struct device *dev)
-{
-    return 0;
-};
+static int behavior_bt_init(struct device *dev) { return 0; };
 
-static int on_keymap_binding_released(struct device *dev, u32_t position, u32_t command, u32_t arg)
-{
+static int on_keymap_binding_released(struct device *dev, u32_t position, u32_t command,
+                                      u32_t arg) {
     return 0;
 }
 
@@ -52,9 +47,5 @@ static const struct behavior_driver_api behavior_bt_driver_api = {
     .binding_released = on_keymap_binding_released,
 };
 
-DEVICE_AND_API_INIT(behavior_bt, DT_INST_LABEL(0),
-                    behavior_bt_init,
-                    NULL,
-                    NULL,
-                    APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
-                    &behavior_bt_driver_api);
+DEVICE_AND_API_INIT(behavior_bt, DT_INST_LABEL(0), behavior_bt_init, NULL, NULL, APPLICATION,
+                    CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &behavior_bt_driver_api);
diff --git a/app/src/behaviors/behavior_hold_tap.c b/app/src/behaviors/behavior_hold_tap.c
index dce724d..8f307a6 100644
--- a/app/src/behaviors/behavior_hold_tap.c
+++ b/app/src/behaviors/behavior_hold_tap.c
@@ -29,36 +29,35 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 // increase if you have keyboard with more keys.
 #define ZMK_BHV_HOLD_TAP_POSITION_NOT_USED 9999
 
-
 enum flavor {
-	ZMK_BHV_HOLD_TAP_FLAVOR_HOLD_PREFERRED = 0,
-	ZMK_BHV_HOLD_TAP_FLAVOR_BALANCED = 1,
-	ZMK_BHV_HOLD_TAP_FLAVOR_TAP_PREFERRED = 2,
+    ZMK_BHV_HOLD_TAP_FLAVOR_HOLD_PREFERRED = 0,
+    ZMK_BHV_HOLD_TAP_FLAVOR_BALANCED = 1,
+    ZMK_BHV_HOLD_TAP_FLAVOR_TAP_PREFERRED = 2,
 };
 
 struct behavior_hold_tap_behaviors {
-	struct zmk_behavior_binding tap;
-	struct zmk_behavior_binding hold;
+    struct zmk_behavior_binding tap;
+    struct zmk_behavior_binding hold;
 };
 
 typedef k_timeout_t (*timer_func)();
 
 struct behavior_hold_tap_config {
-	timer_func tapping_term_ms;
-	struct behavior_hold_tap_behaviors *behaviors;
-	enum flavor flavor;
+    timer_func tapping_term_ms;
+    struct behavior_hold_tap_behaviors *behaviors;
+    enum flavor flavor;
 };
 
 // this data is specific for each hold-tap
 struct active_hold_tap {
-	s32_t position;
-	u32_t param_hold;
-	u32_t param_tap;
-	bool is_decided;
-	bool is_hold;
-	const struct behavior_hold_tap_config *config;
-	struct k_delayed_work work;
-	bool work_is_cancelled;
+    s32_t position;
+    u32_t param_hold;
+    u32_t param_tap;
+    bool is_decided;
+    bool is_hold;
+    const struct behavior_hold_tap_config *config;
+    struct k_delayed_work work;
+    bool work_is_cancelled;
 };
 
 // The undecided hold tap is the hold tap that needs to be decided before
@@ -71,371 +70,366 @@ struct active_hold_tap active_hold_taps[ZMK_BHV_HOLD_TAP_MAX_HELD] = {};
 // We capture most position_state_changed events and some modifiers_state_changed events.
 const struct zmk_event_header *captured_events[ZMK_BHV_HOLD_TAP_MAX_CAPTURED_EVENTS] = {};
 
-static int capture_event(const struct zmk_event_header *event)
-{
-	for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_CAPTURED_EVENTS; i++) {
-		if (captured_events[i] == NULL) {
-			captured_events[i] = event;
-			return 0;
-		}
-	}
-	return -ENOMEM;
+static int capture_event(const struct zmk_event_header *event) {
+    for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_CAPTURED_EVENTS; i++) {
+        if (captured_events[i] == NULL) {
+            captured_events[i] = event;
+            return 0;
+        }
+    }
+    return -ENOMEM;
 }
 
-static struct position_state_changed *find_captured_keydown_event(u32_t position)
-{
-	struct position_state_changed *last_match = NULL;
-	for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_CAPTURED_EVENTS; i++) {
-		const struct zmk_event_header *eh = captured_events[i];
-		if (eh == NULL) {
-			return last_match;
-		}
-		if (!is_position_state_changed(eh)) {
-			continue;
-		}
-		struct position_state_changed *position_event = cast_position_state_changed(eh);
-		if (position_event->position == position && position_event->state) {
-			last_match = position_event;
-		}
-	}
-	return last_match;
+static struct position_state_changed *find_captured_keydown_event(u32_t position) {
+    struct position_state_changed *last_match = NULL;
+    for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_CAPTURED_EVENTS; i++) {
+        const struct zmk_event_header *eh = captured_events[i];
+        if (eh == NULL) {
+            return last_match;
+        }
+        if (!is_position_state_changed(eh)) {
+            continue;
+        }
+        struct position_state_changed *position_event = cast_position_state_changed(eh);
+        if (position_event->position == position && position_event->state) {
+            last_match = position_event;
+        }
+    }
+    return last_match;
 }
 
 const struct zmk_listener zmk_listener_behavior_hold_tap;
 
-static void release_captured_events()
-{
-	if (undecided_hold_tap != NULL) {
-		return;
-	}
-
-	// We use a trick to prevent copying the captured_events array.
-	//
-	// Events for different mod-tap instances are separated by a NULL pointer.
-	//
-	// The first event popped will never be catched by the next active hold-tap
-	// because to start capturing a mod-tap-key-down event must first completely
-	// go through the events queue.
-	//
-	// Example of this release process;
-	// [mt2_down, k1_down, k1_up, mt2_up, null, ...]
-	//  ^
-	// mt2_down position event isn't captured because no hold-tap is active.
-	// mt2_down behavior event is handled, now we have an undecided hold-tap
-	// [null, k1_down, k1_up, mt2_up, null, ...]
-	//        ^
-	// k1_down  is captured by the mt2 mod-tap
-	// !note that searches for find_captured_keydown_event by the mt2 behavior will stop at the first null encountered
-	// [mt1_down, null, k1_up, mt2_up, null, ...]
-	//                  ^
-	// k1_up event is captured by the new hold-tap:
-	// [k1_down, k1_up, null, mt2_up, null, ...]
-	//                        ^
-	// mt2_up event is not captured but causes release of mt2 behavior
-	// [k1_down, k1_up, null, null, null, ...]
-	// now mt2 will start releasing it's own captured positions.
-	for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_CAPTURED_EVENTS; i++) {
-		const struct zmk_event_header *captured_event = captured_events[i];
-		if (captured_event == NULL) {
-			return;
-		}
-		captured_events[i] = NULL;
-		if (undecided_hold_tap != NULL) {
-			k_msleep(10);
-		}
-		if (is_position_state_changed(captured_event)) {
-			struct position_state_changed *position_event = cast_position_state_changed(captured_event);
-			LOG_DBG("Releasing key position event for position %d %s", position_event->position, (position_event->state ? "pressed" : "released"));
-		} else {
-			struct keycode_state_changed *modifier_event = cast_keycode_state_changed(captured_event);
-			LOG_DBG("Releasing mods changed event 0x%02X %s", modifier_event->keycode, (modifier_event->state ? "pressed" : "released"));
-		}
-		ZMK_EVENT_RAISE_AT(captured_event, behavior_hold_tap);
-	}
+static void release_captured_events() {
+    if (undecided_hold_tap != NULL) {
+        return;
+    }
+
+    // We use a trick to prevent copying the captured_events array.
+    //
+    // Events for different mod-tap instances are separated by a NULL pointer.
+    //
+    // The first event popped will never be catched by the next active hold-tap
+    // because to start capturing a mod-tap-key-down event must first completely
+    // go through the events queue.
+    //
+    // Example of this release process;
+    // [mt2_down, k1_down, k1_up, mt2_up, null, ...]
+    //  ^
+    // mt2_down position event isn't captured because no hold-tap is active.
+    // mt2_down behavior event is handled, now we have an undecided hold-tap
+    // [null, k1_down, k1_up, mt2_up, null, ...]
+    //        ^
+    // k1_down  is captured by the mt2 mod-tap
+    // !note that searches for find_captured_keydown_event by the mt2 behavior will stop at the
+    // first null encountered [mt1_down, null, k1_up, mt2_up, null, ...]
+    //                  ^
+    // k1_up event is captured by the new hold-tap:
+    // [k1_down, k1_up, null, mt2_up, null, ...]
+    //                        ^
+    // mt2_up event is not captured but causes release of mt2 behavior
+    // [k1_down, k1_up, null, null, null, ...]
+    // now mt2 will start releasing it's own captured positions.
+    for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_CAPTURED_EVENTS; i++) {
+        const struct zmk_event_header *captured_event = captured_events[i];
+        if (captured_event == NULL) {
+            return;
+        }
+        captured_events[i] = NULL;
+        if (undecided_hold_tap != NULL) {
+            k_msleep(10);
+        }
+        if (is_position_state_changed(captured_event)) {
+            struct position_state_changed *position_event =
+                cast_position_state_changed(captured_event);
+            LOG_DBG("Releasing key position event for position %d %s", position_event->position,
+                    (position_event->state ? "pressed" : "released"));
+        } else {
+            struct keycode_state_changed *modifier_event =
+                cast_keycode_state_changed(captured_event);
+            LOG_DBG("Releasing mods changed event 0x%02X %s", modifier_event->keycode,
+                    (modifier_event->state ? "pressed" : "released"));
+        }
+        ZMK_EVENT_RAISE_AT(captured_event, behavior_hold_tap);
+    }
 }
 
-static struct active_hold_tap *find_hold_tap(u32_t position)
-{
-	for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_HELD; i++) {
-		if (active_hold_taps[i].position == position) {
-			return &active_hold_taps[i];
-		}
-	}
-	return NULL;
+static struct active_hold_tap *find_hold_tap(u32_t position) {
+    for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_HELD; i++) {
+        if (active_hold_taps[i].position == position) {
+            return &active_hold_taps[i];
+        }
+    }
+    return NULL;
 }
 
-static struct active_hold_tap *store_hold_tap(u32_t position, u32_t param_hold, u32_t param_tap, const struct behavior_hold_tap_config *config)
-{
-	for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_HELD; i++) {
-		if (active_hold_taps[i].position != ZMK_BHV_HOLD_TAP_POSITION_NOT_USED) {
-			continue;
-		}
-		active_hold_taps[i].position = position;
-		active_hold_taps[i].is_decided = false;
-		active_hold_taps[i].is_hold = false;
-		active_hold_taps[i].config = config;
-		active_hold_taps[i].param_hold = param_hold;
-		active_hold_taps[i].param_tap = param_tap;
-		return &active_hold_taps[i];
-	}
-	return NULL;
+static struct active_hold_tap *store_hold_tap(u32_t position, u32_t param_hold, u32_t param_tap,
+                                              const struct behavior_hold_tap_config *config) {
+    for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_HELD; i++) {
+        if (active_hold_taps[i].position != ZMK_BHV_HOLD_TAP_POSITION_NOT_USED) {
+            continue;
+        }
+        active_hold_taps[i].position = position;
+        active_hold_taps[i].is_decided = false;
+        active_hold_taps[i].is_hold = false;
+        active_hold_taps[i].config = config;
+        active_hold_taps[i].param_hold = param_hold;
+        active_hold_taps[i].param_tap = param_tap;
+        return &active_hold_taps[i];
+    }
+    return NULL;
 }
 
-static void clear_hold_tap(struct active_hold_tap *hold_tap)
-{
-	hold_tap->position = ZMK_BHV_HOLD_TAP_POSITION_NOT_USED;
-	hold_tap->is_decided = false;
-	hold_tap->is_hold = false;
-	hold_tap->work_is_cancelled = false;
+static void clear_hold_tap(struct active_hold_tap *hold_tap) {
+    hold_tap->position = ZMK_BHV_HOLD_TAP_POSITION_NOT_USED;
+    hold_tap->is_decided = false;
+    hold_tap->is_hold = false;
+    hold_tap->work_is_cancelled = false;
 }
 
 enum decision_moment {
-	HT_KEY_UP               = 0,
-	HT_OTHER_KEY_DOWN       = 1,
-	HT_OTHER_KEY_UP         = 2,
-	HT_TIMER_EVENT          = 3,
+    HT_KEY_UP = 0,
+    HT_OTHER_KEY_DOWN = 1,
+    HT_OTHER_KEY_UP = 2,
+    HT_TIMER_EVENT = 3,
 };
 
-static void decide_balanced(struct active_hold_tap *hold_tap, enum decision_moment event)
-{
-	switch (event) {
-	case HT_KEY_UP:
-		hold_tap->is_hold = 0;
-		hold_tap->is_decided = true;
-		break;
-	case HT_OTHER_KEY_UP:
-	case HT_TIMER_EVENT:
-		hold_tap->is_hold = 1;
-		hold_tap->is_decided = true;
-		break;
-	default: return;
-	}
+static void decide_balanced(struct active_hold_tap *hold_tap, enum decision_moment event) {
+    switch (event) {
+    case HT_KEY_UP:
+        hold_tap->is_hold = 0;
+        hold_tap->is_decided = true;
+        break;
+    case HT_OTHER_KEY_UP:
+    case HT_TIMER_EVENT:
+        hold_tap->is_hold = 1;
+        hold_tap->is_decided = true;
+        break;
+    default:
+        return;
+    }
 }
 
-static void decide_tap_preferred(struct active_hold_tap *hold_tap, enum decision_moment event)
-{
-	switch (event) {
-	case HT_KEY_UP:
-		hold_tap->is_hold = 0;
-		hold_tap->is_decided = true;
-		break;
-	case HT_TIMER_EVENT:
-		hold_tap->is_hold = 1;
-		hold_tap->is_decided = true;
-		break;
-	default: return;
-	}
+static void decide_tap_preferred(struct active_hold_tap *hold_tap, enum decision_moment event) {
+    switch (event) {
+    case HT_KEY_UP:
+        hold_tap->is_hold = 0;
+        hold_tap->is_decided = true;
+        break;
+    case HT_TIMER_EVENT:
+        hold_tap->is_hold = 1;
+        hold_tap->is_decided = true;
+        break;
+    default:
+        return;
+    }
 }
 
-static void decide_hold_preferred(struct active_hold_tap *hold_tap, enum decision_moment event)
-{
-	switch (event) {
-	case HT_KEY_UP:
-		hold_tap->is_hold = 0;
-		hold_tap->is_decided = true;
-		break;
-	case HT_OTHER_KEY_DOWN:
-	case HT_TIMER_EVENT:
-		hold_tap->is_hold = 1;
-		hold_tap->is_decided = true;
-		break;
-	default: return;
-	}
+static void decide_hold_preferred(struct active_hold_tap *hold_tap, enum decision_moment event) {
+    switch (event) {
+    case HT_KEY_UP:
+        hold_tap->is_hold = 0;
+        hold_tap->is_decided = true;
+        break;
+    case HT_OTHER_KEY_DOWN:
+    case HT_TIMER_EVENT:
+        hold_tap->is_hold = 1;
+        hold_tap->is_decided = true;
+        break;
+    default:
+        return;
+    }
 }
 
-static inline char* flavor_str(enum flavor flavor) {
-	switch(flavor) {
-	case ZMK_BHV_HOLD_TAP_FLAVOR_HOLD_PREFERRED:
-		return "hold-preferred";
-	case ZMK_BHV_HOLD_TAP_FLAVOR_BALANCED:
-		return "balanced";
-	case ZMK_BHV_HOLD_TAP_FLAVOR_TAP_PREFERRED:
-		return "tap-preferred";
-	}
-	return "UNKNOWN FLAVOR";
+static inline char *flavor_str(enum flavor flavor) {
+    switch (flavor) {
+    case ZMK_BHV_HOLD_TAP_FLAVOR_HOLD_PREFERRED:
+        return "hold-preferred";
+    case ZMK_BHV_HOLD_TAP_FLAVOR_BALANCED:
+        return "balanced";
+    case ZMK_BHV_HOLD_TAP_FLAVOR_TAP_PREFERRED:
+        return "tap-preferred";
+    }
+    return "UNKNOWN FLAVOR";
 }
 
-static void decide_hold_tap(struct active_hold_tap *hold_tap, enum decision_moment event)
-{
-	if (hold_tap->is_decided) {
-		return;
-	}
-
-	if (hold_tap != undecided_hold_tap) {
-		LOG_DBG("ERROR found undecided tap hold that is not the active tap hold");
-		return;
-	}
-
-	switch(hold_tap->config->flavor) {
-	case ZMK_BHV_HOLD_TAP_FLAVOR_HOLD_PREFERRED:
-		decide_hold_preferred(hold_tap, event);
-	case ZMK_BHV_HOLD_TAP_FLAVOR_BALANCED:
-		decide_balanced(hold_tap, event);
-	case ZMK_BHV_HOLD_TAP_FLAVOR_TAP_PREFERRED:
-		decide_tap_preferred(hold_tap, event);
-	}
-
-	if (!hold_tap->is_decided) {
-		return;
-	}
-
-	LOG_DBG("%d decided %s (%s event %d)", 
-		hold_tap->position, 
-		hold_tap->is_hold ? "hold" : "tap", 
-		flavor_str(hold_tap->config->flavor),
-		event);
-	undecided_hold_tap = NULL;
-
-	struct zmk_behavior_binding *behavior;
-	if (hold_tap->is_hold) {
-		behavior = &hold_tap->config->behaviors->hold;
-		struct device *behavior_device = device_get_binding(behavior->behavior_dev);
-		behavior_keymap_binding_pressed(behavior_device, hold_tap->position, hold_tap->param_hold, 0);
-	} else {
-		behavior = &hold_tap->config->behaviors->tap;
-		struct device *behavior_device = device_get_binding(behavior->behavior_dev);
-		behavior_keymap_binding_pressed(behavior_device, hold_tap->position, hold_tap->param_tap, 0);
-	}
-	release_captured_events();
+static void decide_hold_tap(struct active_hold_tap *hold_tap, enum decision_moment event) {
+    if (hold_tap->is_decided) {
+        return;
+    }
+
+    if (hold_tap != undecided_hold_tap) {
+        LOG_DBG("ERROR found undecided tap hold that is not the active tap hold");
+        return;
+    }
+
+    switch (hold_tap->config->flavor) {
+    case ZMK_BHV_HOLD_TAP_FLAVOR_HOLD_PREFERRED:
+        decide_hold_preferred(hold_tap, event);
+    case ZMK_BHV_HOLD_TAP_FLAVOR_BALANCED:
+        decide_balanced(hold_tap, event);
+    case ZMK_BHV_HOLD_TAP_FLAVOR_TAP_PREFERRED:
+        decide_tap_preferred(hold_tap, event);
+    }
+
+    if (!hold_tap->is_decided) {
+        return;
+    }
+
+    LOG_DBG("%d decided %s (%s event %d)", hold_tap->position, hold_tap->is_hold ? "hold" : "tap",
+            flavor_str(hold_tap->config->flavor), event);
+    undecided_hold_tap = NULL;
+
+    struct zmk_behavior_binding *behavior;
+    if (hold_tap->is_hold) {
+        behavior = &hold_tap->config->behaviors->hold;
+        struct device *behavior_device = device_get_binding(behavior->behavior_dev);
+        behavior_keymap_binding_pressed(behavior_device, hold_tap->position, hold_tap->param_hold,
+                                        0);
+    } else {
+        behavior = &hold_tap->config->behaviors->tap;
+        struct device *behavior_device = device_get_binding(behavior->behavior_dev);
+        behavior_keymap_binding_pressed(behavior_device, hold_tap->position, hold_tap->param_tap,
+                                        0);
+    }
+    release_captured_events();
 }
 
-static int on_hold_tap_binding_pressed(struct device *dev, u32_t position, u32_t param_hold, u32_t param_tap)
-{
-	const struct behavior_hold_tap_config *cfg = dev->config_info;
+static int on_hold_tap_binding_pressed(struct device *dev, u32_t position, u32_t param_hold,
+                                       u32_t param_tap) {
+    const struct behavior_hold_tap_config *cfg = dev->config_info;
 
-	if (undecided_hold_tap != NULL) {
-		LOG_DBG("ERROR another hold-tap behavior is undecided.");
-		// if this happens, make sure the behavior events occur AFTER other position events.
-		return 0;
-	}
+    if (undecided_hold_tap != NULL) {
+        LOG_DBG("ERROR another hold-tap behavior is undecided.");
+        // if this happens, make sure the behavior events occur AFTER other position events.
+        return 0;
+    }
 
-	struct active_hold_tap *hold_tap = store_hold_tap(position, param_hold, param_tap, cfg);
-	if (hold_tap == NULL) {
-		LOG_ERR("unable to store hold-tap info, did you press more than %d hold-taps?", ZMK_BHV_HOLD_TAP_MAX_HELD);
-		return 0;
-	}
+    struct active_hold_tap *hold_tap = store_hold_tap(position, param_hold, param_tap, cfg);
+    if (hold_tap == NULL) {
+        LOG_ERR("unable to store hold-tap info, did you press more than %d hold-taps?",
+                ZMK_BHV_HOLD_TAP_MAX_HELD);
+        return 0;
+    }
 
-	LOG_DBG("%d new undecided hold_tap", position);
-	undecided_hold_tap = hold_tap;
-	k_delayed_work_submit(&hold_tap->work, cfg->tapping_term_ms());
+    LOG_DBG("%d new undecided hold_tap", position);
+    undecided_hold_tap = hold_tap;
+    k_delayed_work_submit(&hold_tap->work, cfg->tapping_term_ms());
 
-	// todo: once we get timing info for keypresses, start the timer relative to the original keypress
-	// don't forget to simulate a timer-event before the event after that time was handled.
+    // todo: once we get timing info for keypresses, start the timer relative to the original
+    // keypress don't forget to simulate a timer-event before the event after that time was handled.
 
-	return 0;
+    return 0;
 }
 
-static int on_hold_tap_binding_released(struct device *dev, u32_t position, u32_t _, u32_t __)
-{
-	struct active_hold_tap *hold_tap = find_hold_tap(position);
-
-	if (hold_tap == NULL) {
-		LOG_ERR("ACTIVE_HOLD_TAP_CLEANED_UP_TOO_EARLY");
-		return 0;
-	}
-
-	int work_cancel_result = k_delayed_work_cancel(&hold_tap->work);
-	decide_hold_tap(hold_tap, HT_KEY_UP);
-
-	struct zmk_behavior_binding *behavior;
-	if (hold_tap->is_hold) {
-		behavior = &hold_tap->config->behaviors->hold;
-		struct device *behavior_device = device_get_binding(behavior->behavior_dev);
-		behavior_keymap_binding_released(behavior_device, hold_tap->position, hold_tap->param_hold, 0);
-	} else {
-		behavior = &hold_tap->config->behaviors->tap;
-		struct device *behavior_device = device_get_binding(behavior->behavior_dev);
-		behavior_keymap_binding_released(behavior_device, hold_tap->position, hold_tap->param_tap, 0);
-	}
-
-
-	if (work_cancel_result == -EINPROGRESS) {
-		// let the timer handler clean up
-		// if we'd clear now, the timer may call back for an uninitialized active_hold_tap.
-		LOG_DBG("%d hold-tap timer work in event queue", position);
-		hold_tap->work_is_cancelled = true;
-	} else {
-		LOG_DBG("%d cleaning up hold-tap", position);
-		clear_hold_tap(hold_tap);
-	}
-
-	return 0;
+static int on_hold_tap_binding_released(struct device *dev, u32_t position, u32_t _, u32_t __) {
+    struct active_hold_tap *hold_tap = find_hold_tap(position);
+
+    if (hold_tap == NULL) {
+        LOG_ERR("ACTIVE_HOLD_TAP_CLEANED_UP_TOO_EARLY");
+        return 0;
+    }
+
+    int work_cancel_result = k_delayed_work_cancel(&hold_tap->work);
+    decide_hold_tap(hold_tap, HT_KEY_UP);
+
+    struct zmk_behavior_binding *behavior;
+    if (hold_tap->is_hold) {
+        behavior = &hold_tap->config->behaviors->hold;
+        struct device *behavior_device = device_get_binding(behavior->behavior_dev);
+        behavior_keymap_binding_released(behavior_device, hold_tap->position, hold_tap->param_hold,
+                                         0);
+    } else {
+        behavior = &hold_tap->config->behaviors->tap;
+        struct device *behavior_device = device_get_binding(behavior->behavior_dev);
+        behavior_keymap_binding_released(behavior_device, hold_tap->position, hold_tap->param_tap,
+                                         0);
+    }
+
+    if (work_cancel_result == -EINPROGRESS) {
+        // let the timer handler clean up
+        // if we'd clear now, the timer may call back for an uninitialized active_hold_tap.
+        LOG_DBG("%d hold-tap timer work in event queue", position);
+        hold_tap->work_is_cancelled = true;
+    } else {
+        LOG_DBG("%d cleaning up hold-tap", position);
+        clear_hold_tap(hold_tap);
+    }
+
+    return 0;
 }
 
 static const struct behavior_driver_api behavior_hold_tap_driver_api = {
-	.binding_pressed = on_hold_tap_binding_pressed,
-	.binding_released = on_hold_tap_binding_released,
+    .binding_pressed = on_hold_tap_binding_pressed,
+    .binding_released = on_hold_tap_binding_released,
 };
 
-
-static int position_state_changed_listener(const struct zmk_event_header *eh)
-{
-	struct position_state_changed *ev = cast_position_state_changed(eh);
-
-	if (undecided_hold_tap == NULL) {
-		LOG_DBG("%d bubble (no undecided hold_tap active)", ev->position);
-		return 0;
-	}
-
-	if (undecided_hold_tap->position == ev->position) {
-		if (ev->state) { // keydown
-			LOG_ERR("hold-tap listener should be called before before most other listeners!");
-			return 0;
-		} else { // keyup
-			LOG_DBG("%d bubble undecided hold-tap keyrelease event", undecided_hold_tap->position);
-			return 0;
-		}
-	}
-
-	if (!ev->state && find_captured_keydown_event(ev->position) == NULL) {
-		// no keydown event has been captured, let it bubble.
-		// we'll catch modifiers later in modifier_state_changed_listener
-		LOG_DBG("%d bubbling %d %s event", undecided_hold_tap->position, ev->position, ev->state ? "down" : "up");
-		return 0;
-	}
-
-	LOG_DBG("%d capturing %d %s event", undecided_hold_tap->position, ev->position, ev->state ? "down" : "up");
-	capture_event(eh);
-	decide_hold_tap(undecided_hold_tap, ev->state ? HT_OTHER_KEY_DOWN : HT_OTHER_KEY_UP);
-	return ZMK_EV_EVENT_CAPTURED;
+static int position_state_changed_listener(const struct zmk_event_header *eh) {
+    struct position_state_changed *ev = cast_position_state_changed(eh);
+
+    if (undecided_hold_tap == NULL) {
+        LOG_DBG("%d bubble (no undecided hold_tap active)", ev->position);
+        return 0;
+    }
+
+    if (undecided_hold_tap->position == ev->position) {
+        if (ev->state) { // keydown
+            LOG_ERR("hold-tap listener should be called before before most other listeners!");
+            return 0;
+        } else { // keyup
+            LOG_DBG("%d bubble undecided hold-tap keyrelease event", undecided_hold_tap->position);
+            return 0;
+        }
+    }
+
+    if (!ev->state && find_captured_keydown_event(ev->position) == NULL) {
+        // no keydown event has been captured, let it bubble.
+        // we'll catch modifiers later in modifier_state_changed_listener
+        LOG_DBG("%d bubbling %d %s event", undecided_hold_tap->position, ev->position,
+                ev->state ? "down" : "up");
+        return 0;
+    }
+
+    LOG_DBG("%d capturing %d %s event", undecided_hold_tap->position, ev->position,
+            ev->state ? "down" : "up");
+    capture_event(eh);
+    decide_hold_tap(undecided_hold_tap, ev->state ? HT_OTHER_KEY_DOWN : HT_OTHER_KEY_UP);
+    return ZMK_EV_EVENT_CAPTURED;
 }
 
-static bool is_mod(struct keycode_state_changed *ev)
-{
-	return ev->usage_page == USAGE_KEYPAD && ev->keycode >= LCTL && ev->keycode <= RGUI;
+static bool is_mod(struct keycode_state_changed *ev) {
+    return ev->usage_page == USAGE_KEYPAD && ev->keycode >= LCTL && ev->keycode <= RGUI;
 }
 
-static int keycode_state_changed_listener(const struct zmk_event_header *eh)
-{
-	// we want to catch layer-up events too... how?
-	struct keycode_state_changed *ev = cast_keycode_state_changed(eh);
-
-	if (undecided_hold_tap == NULL) {
-		// LOG_DBG("0x%02X bubble (no undecided hold_tap active)", ev->keycode);
-		return 0;
-	}
-
-	if (!is_mod(ev)) {
-		// LOG_DBG("0x%02X bubble (not a mod)", ev->keycode);
-		return 0;
-	}
-
-	// only key-up events will bubble through position_state_changed_listener
-	// if a undecided_hold_tap is active.
-	LOG_DBG("%d capturing 0x%02X %s event", undecided_hold_tap->position, ev->keycode, ev->state ? "down" : "up");
-	capture_event(eh);
-	return ZMK_EV_EVENT_CAPTURED;
+static int keycode_state_changed_listener(const struct zmk_event_header *eh) {
+    // we want to catch layer-up events too... how?
+    struct keycode_state_changed *ev = cast_keycode_state_changed(eh);
+
+    if (undecided_hold_tap == NULL) {
+        // LOG_DBG("0x%02X bubble (no undecided hold_tap active)", ev->keycode);
+        return 0;
+    }
+
+    if (!is_mod(ev)) {
+        // LOG_DBG("0x%02X bubble (not a mod)", ev->keycode);
+        return 0;
+    }
+
+    // only key-up events will bubble through position_state_changed_listener
+    // if a undecided_hold_tap is active.
+    LOG_DBG("%d capturing 0x%02X %s event", undecided_hold_tap->position, ev->keycode,
+            ev->state ? "down" : "up");
+    capture_event(eh);
+    return ZMK_EV_EVENT_CAPTURED;
 }
 
-
-int behavior_hold_tap_listener(const struct zmk_event_header *eh)
-{
-	if (is_position_state_changed(eh)) {
-		return position_state_changed_listener(eh);
-	} else if (is_keycode_state_changed(eh)) {
-		return keycode_state_changed_listener(eh);
-	}
-	return 0;
+int behavior_hold_tap_listener(const struct zmk_event_header *eh) {
+    if (is_position_state_changed(eh)) {
+        return position_state_changed_listener(eh);
+    } else if (is_keycode_state_changed(eh)) {
+        return keycode_state_changed_listener(eh);
+    }
+    return 0;
 }
 
 ZMK_LISTENER(behavior_hold_tap, behavior_hold_tap_listener);
@@ -443,60 +437,56 @@ ZMK_SUBSCRIPTION(behavior_hold_tap, position_state_changed);
 // this should be modifiers_state_changed, but unfrotunately that's not implemented yet.
 ZMK_SUBSCRIPTION(behavior_hold_tap, keycode_state_changed);
 
-void behavior_hold_tap_timer_work_handler(struct k_work *item)
-{
-	struct active_hold_tap *hold_tap = CONTAINER_OF(item, struct active_hold_tap, work);
+void behavior_hold_tap_timer_work_handler(struct k_work *item) {
+    struct active_hold_tap *hold_tap = CONTAINER_OF(item, struct active_hold_tap, work);
 
-	if (hold_tap->work_is_cancelled) {
-		clear_hold_tap(hold_tap);
-	} else {
-		decide_hold_tap(hold_tap, HT_TIMER_EVENT);
-	}
+    if (hold_tap->work_is_cancelled) {
+        clear_hold_tap(hold_tap);
+    } else {
+        decide_hold_tap(hold_tap, HT_TIMER_EVENT);
+    }
 }
 
-static int behavior_hold_tap_init(struct device *dev)
-{
-	static bool init_first_run = true;
-
-	if (init_first_run) {
-		for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_HELD; i++) {
-			k_delayed_work_init(&active_hold_taps[i].work, behavior_hold_tap_timer_work_handler);
-			active_hold_taps[i].position = ZMK_BHV_HOLD_TAP_POSITION_NOT_USED;
-		}
-	}
-	init_first_run = false;
-	return 0;
+static int behavior_hold_tap_init(struct device *dev) {
+    static bool init_first_run = true;
+
+    if (init_first_run) {
+        for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_HELD; i++) {
+            k_delayed_work_init(&active_hold_taps[i].work, behavior_hold_tap_timer_work_handler);
+            active_hold_taps[i].position = ZMK_BHV_HOLD_TAP_POSITION_NOT_USED;
+        }
+    }
+    init_first_run = false;
+    return 0;
 }
 
 struct behavior_hold_tap_data {};
 static struct behavior_hold_tap_data behavior_hold_tap_data;
 
-#define _TRANSFORM_ENTRY(idx, node)														   \
-	{  \
-		.behavior_dev = DT_LABEL(DT_INST_PHANDLE_BY_IDX(node, bindings, idx)),								   \
-	    .param1 = COND_CODE_0(DT_INST_PHA_HAS_CELL_AT_IDX(node, bindings, idx, param1), (0), (DT_INST_PHA_BY_IDX(node, bindings, idx, param1))), \
-	    .param2 = COND_CODE_0(DT_INST_PHA_HAS_CELL_AT_IDX(node, bindings, idx, param2), (0), (DT_INST_PHA_BY_IDX(node, bindings, idx, param2))), \
-	},
-
-#define KP_INST(n)													 \
-	static k_timeout_t behavior_hold_tap_config_##n##_gettime() { return K_MSEC(DT_INST_PROP(n, tapping_term_ms)); } \
-	static struct behavior_hold_tap_behaviors behavior_hold_tap_behaviors_##n = {					 \
-		.hold = _TRANSFORM_ENTRY(0, n)										 \
-	  	.tap = _TRANSFORM_ENTRY(1, n)									 \
-	};														 \
-	static struct behavior_hold_tap_config behavior_hold_tap_config_##n = {						 \
-		.behaviors = &behavior_hold_tap_behaviors_##n,								 \
-		.tapping_term_ms = &behavior_hold_tap_config_##n##_gettime,						 \
-		.flavor = DT_ENUM_IDX(DT_DRV_INST(n), flavor),									 \
-	};														 \
-	DEVICE_AND_API_INIT( \
-		behavior_hold_tap_##n, DT_INST_LABEL(n), behavior_hold_tap_init,				 \
-			    &behavior_hold_tap_data,									 \
-			    &behavior_hold_tap_config_##n,								 \
-			    APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,						 \
-			    &behavior_hold_tap_driver_api);
+#define _TRANSFORM_ENTRY(idx, node)                                                                \
+    {                                                                                              \
+        .behavior_dev = DT_LABEL(DT_INST_PHANDLE_BY_IDX(node, bindings, idx)),                     \
+        .param1 = COND_CODE_0(DT_INST_PHA_HAS_CELL_AT_IDX(node, bindings, idx, param1), (0),       \
+                              (DT_INST_PHA_BY_IDX(node, bindings, idx, param1))),                  \
+        .param2 = COND_CODE_0(DT_INST_PHA_HAS_CELL_AT_IDX(node, bindings, idx, param2), (0),       \
+                              (DT_INST_PHA_BY_IDX(node, bindings, idx, param2))),                  \
+    },
+
+#define KP_INST(n)                                                                                 \
+    static k_timeout_t behavior_hold_tap_config_##n##_gettime() {                                  \
+        return K_MSEC(DT_INST_PROP(n, tapping_term_ms));                                           \
+    }                                                                                              \
+    static struct behavior_hold_tap_behaviors behavior_hold_tap_behaviors_##n = {                  \
+        .hold = _TRANSFORM_ENTRY(0, n).tap = _TRANSFORM_ENTRY(1, n)};                              \
+    static struct behavior_hold_tap_config behavior_hold_tap_config_##n = {                        \
+        .behaviors = &behavior_hold_tap_behaviors_##n,                                             \
+        .tapping_term_ms = &behavior_hold_tap_config_##n##_gettime,                                \
+        .flavor = DT_ENUM_IDX(DT_DRV_INST(n), flavor),                                             \
+    };                                                                                             \
+    DEVICE_AND_API_INIT(behavior_hold_tap_##n, DT_INST_LABEL(n), behavior_hold_tap_init,           \
+                        &behavior_hold_tap_data, &behavior_hold_tap_config_##n, APPLICATION,       \
+                        CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &behavior_hold_tap_driver_api);
 
 DT_INST_FOREACH_STATUS_OKAY(KP_INST)
 
-
 #endif
\ No newline at end of file
diff --git a/app/src/behaviors/behavior_key_press.c b/app/src/behaviors/behavior_key_press.c
index 42becf5..bbfbe36 100644
--- a/app/src/behaviors/behavior_key_press.c
+++ b/app/src/behaviors/behavior_key_press.c
@@ -16,45 +16,35 @@
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 struct behavior_key_press_config {
-  u8_t usage_page;
+    u8_t usage_page;
 };
-struct behavior_key_press_data { };
+struct behavior_key_press_data {};
 
-static int behavior_key_press_init(struct device *dev)
-{
-	return 0;
-};
+static int behavior_key_press_init(struct device *dev) { return 0; };
 
-static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t keycode, u32_t _)
-{
-  const struct behavior_key_press_config *cfg = dev->config_info;
-  LOG_DBG("position %d usage_page 0x%02X keycode 0x%02X", position, cfg->usage_page, keycode);
+static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t keycode, u32_t _) {
+    const struct behavior_key_press_config *cfg = dev->config_info;
+    LOG_DBG("position %d usage_page 0x%02X keycode 0x%02X", position, cfg->usage_page, keycode);
 
-  return ZMK_EVENT_RAISE(create_keycode_state_changed(cfg->usage_page, keycode, true));
+    return ZMK_EVENT_RAISE(create_keycode_state_changed(cfg->usage_page, keycode, true));
 }
 
-static int on_keymap_binding_released(struct device *dev, u32_t position, u32_t keycode, u32_t _)
-{
-  const struct behavior_key_press_config *cfg = dev->config_info;
-  LOG_DBG("position %d usage_page 0x%02X keycode 0x%02X", position, cfg->usage_page, keycode);
+static int on_keymap_binding_released(struct device *dev, u32_t position, u32_t keycode, u32_t _) {
+    const struct behavior_key_press_config *cfg = dev->config_info;
+    LOG_DBG("position %d usage_page 0x%02X keycode 0x%02X", position, cfg->usage_page, keycode);
 
-  return ZMK_EVENT_RAISE(create_keycode_state_changed(cfg->usage_page, keycode, false));
+    return ZMK_EVENT_RAISE(create_keycode_state_changed(cfg->usage_page, keycode, false));
 }
 
 static const struct behavior_driver_api behavior_key_press_driver_api = {
-  .binding_pressed = on_keymap_binding_pressed,
-  .binding_released = on_keymap_binding_released
-};
-
-#define KP_INST(n) \
-  static const struct behavior_key_press_config behavior_key_press_config_##n = { \
-    .usage_page = DT_INST_PROP(n, usage_page) \
-  }; \
-  static struct behavior_key_press_data behavior_key_press_data_##n; \
-  DEVICE_AND_API_INIT(behavior_key_press_##n, DT_INST_LABEL(n), behavior_key_press_init, \
-                      &behavior_key_press_data_##n, \
-                      &behavior_key_press_config_##n, \
-                      APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \
-                      &behavior_key_press_driver_api);
+    .binding_pressed = on_keymap_binding_pressed, .binding_released = on_keymap_binding_released};
+
+#define KP_INST(n)                                                                                 \
+    static const struct behavior_key_press_config behavior_key_press_config_##n = {                \
+        .usage_page = DT_INST_PROP(n, usage_page)};                                                \
+    static struct behavior_key_press_data behavior_key_press_data_##n;                             \
+    DEVICE_AND_API_INIT(behavior_key_press_##n, DT_INST_LABEL(n), behavior_key_press_init,         \
+                        &behavior_key_press_data_##n, &behavior_key_press_config_##n, APPLICATION, \
+                        CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &behavior_key_press_driver_api);
 
 DT_INST_FOREACH_STATUS_OKAY(KP_INST)
\ No newline at end of file
diff --git a/app/src/behaviors/behavior_momentary_layer.c b/app/src/behaviors/behavior_momentary_layer.c
index 7d65135..80b7165 100644
--- a/app/src/behaviors/behavior_momentary_layer.c
+++ b/app/src/behaviors/behavior_momentary_layer.c
@@ -14,41 +14,30 @@
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
-struct behavior_mo_config { };
-struct behavior_mo_data { };
+struct behavior_mo_config {};
+struct behavior_mo_data {};
 
-static int behavior_mo_init(struct device *dev)
-{
-	return 0;
-};
+static int behavior_mo_init(struct device *dev) { return 0; };
 
+static int mo_keymap_binding_pressed(struct device *dev, u32_t position, u32_t layer, u32_t _) {
+    LOG_DBG("position %d layer %d", position, layer);
 
-static int mo_keymap_binding_pressed(struct device *dev, u32_t position, u32_t layer, u32_t _)
-{
-  LOG_DBG("position %d layer %d", position, layer);
-
-  return zmk_keymap_layer_activate(layer);
+    return zmk_keymap_layer_activate(layer);
 }
 
-static int mo_keymap_binding_released(struct device *dev, u32_t position, u32_t layer, u32_t _)
-{
-  LOG_DBG("position %d layer %d", position, layer);
+static int mo_keymap_binding_released(struct device *dev, u32_t position, u32_t layer, u32_t _) {
+    LOG_DBG("position %d layer %d", position, layer);
 
-  return zmk_keymap_layer_deactivate(layer);
+    return zmk_keymap_layer_deactivate(layer);
 }
 
 static const struct behavior_driver_api behavior_mo_driver_api = {
-  .binding_pressed = mo_keymap_binding_pressed,
-  .binding_released = mo_keymap_binding_released
-};
-
+    .binding_pressed = mo_keymap_binding_pressed, .binding_released = mo_keymap_binding_released};
 
 static const struct behavior_mo_config behavior_mo_config = {};
 
 static struct behavior_mo_data behavior_mo_data;
 
-DEVICE_AND_API_INIT(behavior_mo, DT_INST_LABEL(0), behavior_mo_init,
-                    &behavior_mo_data,
-                    &behavior_mo_config,
-                    APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
+DEVICE_AND_API_INIT(behavior_mo, DT_INST_LABEL(0), behavior_mo_init, &behavior_mo_data,
+                    &behavior_mo_config, APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
                     &behavior_mo_driver_api);
diff --git a/app/src/behaviors/behavior_none.c b/app/src/behaviors/behavior_none.c
index c464988..b548e6f 100644
--- a/app/src/behaviors/behavior_none.c
+++ b/app/src/behaviors/behavior_none.c
@@ -13,36 +13,30 @@
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
-struct behavior_none_config { };
-struct behavior_none_data { };
+struct behavior_none_config {};
+struct behavior_none_data {};
 
-static int behavior_none_init(struct device *dev)
-{
-	return 0;
-};
+static int behavior_none_init(struct device *dev) { return 0; };
 
-static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t _param1, u32_t _param2)
-{
-  return 0;
+static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t _param1,
+                                     u32_t _param2) {
+    return 0;
 }
 
-static int on_keymap_binding_released(struct device *dev, u32_t position, u32_t _param1, u32_t _param2)
-{
-  return 0;
+static int on_keymap_binding_released(struct device *dev, u32_t position, u32_t _param1,
+                                      u32_t _param2) {
+    return 0;
 }
 
 static const struct behavior_driver_api behavior_none_driver_api = {
-  .binding_pressed = on_keymap_binding_pressed,
-  .binding_released = on_keymap_binding_released,
+    .binding_pressed = on_keymap_binding_pressed,
+    .binding_released = on_keymap_binding_released,
 };
 
-
 static const struct behavior_none_config behavior_none_config = {};
 
 static struct behavior_none_data behavior_none_data;
 
-DEVICE_AND_API_INIT(behavior_none, DT_INST_LABEL(0), behavior_none_init,
-                    &behavior_none_data,
-                    &behavior_none_config,
-                    APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
+DEVICE_AND_API_INIT(behavior_none, DT_INST_LABEL(0), behavior_none_init, &behavior_none_data,
+                    &behavior_none_config, APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
                     &behavior_none_driver_api);
\ No newline at end of file
diff --git a/app/src/behaviors/behavior_reset.c b/app/src/behaviors/behavior_reset.c
index b5692b5..90de20b 100644
--- a/app/src/behaviors/behavior_reset.c
+++ b/app/src/behaviors/behavior_reset.c
@@ -14,37 +14,31 @@
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 struct behavior_reset_config {
-  int type;
+    int type;
 };
 
-static int behavior_reset_init(struct device *dev)
-{
-	return 0;
-};
+static int behavior_reset_init(struct device *dev) { return 0; };
 
-static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t _param1, u32_t _param2)
-{
-  const struct behavior_reset_config *cfg = dev->config_info;
+static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t _param1,
+                                     u32_t _param2) {
+    const struct behavior_reset_config *cfg = dev->config_info;
 
-  // TODO: Correct magic code for going into DFU?
-  // See https://github.com/adafruit/Adafruit_nRF52_Bootloader/blob/d6b28e66053eea467166f44875e3c7ec741cb471/src/main.c#L107
-  sys_reboot(cfg->type);
-  return 0;
+    // TODO: Correct magic code for going into DFU?
+    // See
+    // https://github.com/adafruit/Adafruit_nRF52_Bootloader/blob/d6b28e66053eea467166f44875e3c7ec741cb471/src/main.c#L107
+    sys_reboot(cfg->type);
+    return 0;
 }
 
 static const struct behavior_driver_api behavior_reset_driver_api = {
-  .binding_pressed = on_keymap_binding_pressed,
+    .binding_pressed = on_keymap_binding_pressed,
 };
 
+#define RST_INST(n)                                                                                \
+    static const struct behavior_reset_config behavior_reset_config_##n = {                        \
+        .type = DT_INST_PROP(n, type)};                                                            \
+    DEVICE_AND_API_INIT(behavior_reset_##n, DT_INST_LABEL(n), behavior_reset_init, NULL,           \
+                        &behavior_reset_config_##n, APPLICATION,                                   \
+                        CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &behavior_reset_driver_api);
 
-#define RST_INST(n) \
-  static const struct behavior_reset_config behavior_reset_config_##n = { \
-    .type = DT_INST_PROP(n, type) \
-  }; \
-  DEVICE_AND_API_INIT(behavior_reset_##n, DT_INST_LABEL(n), behavior_reset_init, \
-                    NULL, \
-                    &behavior_reset_config_##n, \
-                    APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \
-                    &behavior_reset_driver_api);
-  
 DT_INST_FOREACH_STATUS_OKAY(RST_INST)
\ No newline at end of file
diff --git a/app/src/behaviors/behavior_rgb_underglow.c b/app/src/behaviors/behavior_rgb_underglow.c
index f0a35ef..621eab5 100644
--- a/app/src/behaviors/behavior_rgb_underglow.c
+++ b/app/src/behaviors/behavior_rgb_underglow.c
@@ -15,48 +15,41 @@
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
-static int behavior_rgb_underglow_init(struct device *dev)
-{
-  return 0;
-}
+static int behavior_rgb_underglow_init(struct device *dev) { return 0; }
 
-static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t action, u32_t _)
-{
-  switch (action)
-  {
+static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t action, u32_t _) {
+    switch (action) {
     case RGB_TOG:
-      return zmk_rgb_underglow_toggle();
+        return zmk_rgb_underglow_toggle();
     case RGB_HUI:
-      return zmk_rgb_underglow_change_hue(1);
+        return zmk_rgb_underglow_change_hue(1);
     case RGB_HUD:
-      return zmk_rgb_underglow_change_hue(-1);
+        return zmk_rgb_underglow_change_hue(-1);
     case RGB_SAI:
-      return zmk_rgb_underglow_change_sat(1);
+        return zmk_rgb_underglow_change_sat(1);
     case RGB_SAD:
-      return zmk_rgb_underglow_change_sat(-1);
+        return zmk_rgb_underglow_change_sat(-1);
     case RGB_BRI:
-      return zmk_rgb_underglow_change_brt(1);
+        return zmk_rgb_underglow_change_brt(1);
     case RGB_BRD:
-      return zmk_rgb_underglow_change_brt(-1);
+        return zmk_rgb_underglow_change_brt(-1);
     case RGB_SPI:
-      return zmk_rgb_underglow_change_spd(1);
+        return zmk_rgb_underglow_change_spd(1);
     case RGB_SPD:
-      return zmk_rgb_underglow_change_spd(-1);
+        return zmk_rgb_underglow_change_spd(-1);
     case RGB_EFF:
-      return zmk_rgb_underglow_cycle_effect(1);
+        return zmk_rgb_underglow_cycle_effect(1);
     case RGB_EFR:
-      return zmk_rgb_underglow_cycle_effect(-1);
-  }
+        return zmk_rgb_underglow_cycle_effect(-1);
+    }
 
-  return -ENOTSUP;
+    return -ENOTSUP;
 }
 
 static const struct behavior_driver_api behavior_rgb_underglow_driver_api = {
-  .binding_pressed = on_keymap_binding_pressed,
+    .binding_pressed = on_keymap_binding_pressed,
 };
 
-DEVICE_AND_API_INIT(behavior_rgb_underglow, DT_INST_LABEL(0), behavior_rgb_underglow_init,
-                    NULL,
-                    NULL,
-                    APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
+DEVICE_AND_API_INIT(behavior_rgb_underglow, DT_INST_LABEL(0), behavior_rgb_underglow_init, NULL,
+                    NULL, APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
                     &behavior_rgb_underglow_driver_api);
\ No newline at end of file
diff --git a/app/src/behaviors/behavior_sensor_rotate_key_press.c b/app/src/behaviors/behavior_sensor_rotate_key_press.c
index fa55575..1a0bf03 100644
--- a/app/src/behaviors/behavior_sensor_rotate_key_press.c
+++ b/app/src/behaviors/behavior_sensor_rotate_key_press.c
@@ -17,75 +17,69 @@
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 struct behavior_sensor_rotate_key_press_config {
-  u8_t usage_page;
-};
-struct behavior_sensor_rotate_key_press_data { };
-
-static int behavior_sensor_rotate_key_press_init(struct device *dev)
-{
-	return 0;
+    u8_t usage_page;
 };
+struct behavior_sensor_rotate_key_press_data {};
 
+static int behavior_sensor_rotate_key_press_init(struct device *dev) { return 0; };
 
-static int on_sensor_binding_triggered(struct device *dev, struct device *sensor, u32_t increment_keycode, u32_t decrement_keycode)
-{
-  const struct behavior_sensor_rotate_key_press_config *cfg = dev->config_info;
-  struct sensor_value value;
-  int err;
-  u32_t keycode;
-  struct keycode_state_changed *ev;
-  LOG_DBG("usage_page 0x%02X inc keycode 0x%02X dec keycode 0x%02X", cfg->usage_page, increment_keycode, decrement_keycode);
+static int on_sensor_binding_triggered(struct device *dev, struct device *sensor,
+                                       u32_t increment_keycode, u32_t decrement_keycode) {
+    const struct behavior_sensor_rotate_key_press_config *cfg = dev->config_info;
+    struct sensor_value value;
+    int err;
+    u32_t keycode;
+    struct keycode_state_changed *ev;
+    LOG_DBG("usage_page 0x%02X inc keycode 0x%02X dec keycode 0x%02X", cfg->usage_page,
+            increment_keycode, decrement_keycode);
 
-  err = sensor_channel_get(sensor, SENSOR_CHAN_ROTATION, &value);
+    err = sensor_channel_get(sensor, SENSOR_CHAN_ROTATION, &value);
 
-  if (err) {
-    LOG_WRN("Failed to ge sensor rotation value: %d", err);
-    return err;
-  }
+    if (err) {
+        LOG_WRN("Failed to ge sensor rotation value: %d", err);
+        return err;
+    }
 
-  switch (value.val1) {
+    switch (value.val1) {
     case 1:
-      keycode = increment_keycode;
-      break;
+        keycode = increment_keycode;
+        break;
     case -1:
-      keycode = decrement_keycode;
-      break;
+        keycode = decrement_keycode;
+        break;
     default:
-      return -ENOTSUP;
-  }
-
-  LOG_DBG("SEND %d", keycode);
+        return -ENOTSUP;
+    }
 
+    LOG_DBG("SEND %d", keycode);
 
-  ev = new_keycode_state_changed();
-  ev->usage_page = cfg->usage_page;
-  ev->keycode = keycode;
-  ev->state = true;
-  ZMK_EVENT_RAISE(ev);
+    ev = new_keycode_state_changed();
+    ev->usage_page = cfg->usage_page;
+    ev->keycode = keycode;
+    ev->state = true;
+    ZMK_EVENT_RAISE(ev);
 
-  // TODO: Better way to do this?
-  k_msleep(5);
+    // TODO: Better way to do this?
+    k_msleep(5);
 
-  ev = new_keycode_state_changed();
-  ev->usage_page = cfg->usage_page;
-  ev->keycode = keycode;
-  ev->state = false;
-  return ZMK_EVENT_RAISE(ev);
+    ev = new_keycode_state_changed();
+    ev->usage_page = cfg->usage_page;
+    ev->keycode = keycode;
+    ev->state = false;
+    return ZMK_EVENT_RAISE(ev);
 }
 
 static const struct behavior_driver_api behavior_sensor_rotate_key_press_driver_api = {
-  .sensor_binding_triggered = on_sensor_binding_triggered
-};
-
-#define KP_INST(n) \
-  static const struct behavior_sensor_rotate_key_press_config behavior_sensor_rotate_key_press_config_##n = { \
-    .usage_page = DT_INST_PROP(n, usage_page) \
-  }; \
-  static struct behavior_sensor_rotate_key_press_data behavior_sensor_rotate_key_press_data_##n; \
-  DEVICE_AND_API_INIT(behavior_sensor_rotate_key_press_##n, DT_INST_LABEL(n), behavior_sensor_rotate_key_press_init, \
-                      &behavior_sensor_rotate_key_press_data_##n, \
-                      &behavior_sensor_rotate_key_press_config_##n, \
-                      APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \
-                      &behavior_sensor_rotate_key_press_driver_api);
+    .sensor_binding_triggered = on_sensor_binding_triggered};
+
+#define KP_INST(n)                                                                                 \
+    static const struct behavior_sensor_rotate_key_press_config                                    \
+        behavior_sensor_rotate_key_press_config_##n = {.usage_page = DT_INST_PROP(n, usage_page)}; \
+    static struct behavior_sensor_rotate_key_press_data behavior_sensor_rotate_key_press_data_##n; \
+    DEVICE_AND_API_INIT(                                                                           \
+        behavior_sensor_rotate_key_press_##n, DT_INST_LABEL(n),                                    \
+        behavior_sensor_rotate_key_press_init, &behavior_sensor_rotate_key_press_data_##n,         \
+        &behavior_sensor_rotate_key_press_config_##n, APPLICATION,                                 \
+        CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &behavior_sensor_rotate_key_press_driver_api);
 
 DT_INST_FOREACH_STATUS_OKAY(KP_INST)
\ No newline at end of file
diff --git a/app/src/behaviors/behavior_toggle_layer.c b/app/src/behaviors/behavior_toggle_layer.c
index c6d5225..2819451 100644
--- a/app/src/behaviors/behavior_toggle_layer.c
+++ b/app/src/behaviors/behavior_toggle_layer.c
@@ -14,30 +14,21 @@
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
-struct behavior_tog_config
-{
-};
-struct behavior_tog_data
-{
-};
+struct behavior_tog_config {};
+struct behavior_tog_data {};
 
-static int behavior_tog_init(struct device *dev)
-{
-  return 0;
-};
+static int behavior_tog_init(struct device *dev) { return 0; };
 
-static int tog_keymap_binding_pressed(struct device *dev, u32_t position, u32_t layer, u32_t _)
-{
-  LOG_DBG("position %d layer %d", position, layer);
+static int tog_keymap_binding_pressed(struct device *dev, u32_t position, u32_t layer, u32_t _) {
+    LOG_DBG("position %d layer %d", position, layer);
 
-  return zmk_keymap_layer_toggle(layer);
+    return zmk_keymap_layer_toggle(layer);
 }
 
-static int tog_keymap_binding_released(struct device *dev, u32_t position, u32_t layer, u32_t _)
-{
-  LOG_DBG("position %d layer %d", position, layer);
+static int tog_keymap_binding_released(struct device *dev, u32_t position, u32_t layer, u32_t _) {
+    LOG_DBG("position %d layer %d", position, layer);
 
-  return 0;
+    return 0;
 }
 
 static const struct behavior_driver_api behavior_tog_driver_api = {
@@ -49,8 +40,6 @@ static const struct behavior_tog_config behavior_tog_config = {};
 
 static struct behavior_tog_data behavior_tog_data;
 
-DEVICE_AND_API_INIT(behavior_tog, DT_INST_LABEL(0), behavior_tog_init,
-                    &behavior_tog_data,
-                    &behavior_tog_config,
-                    APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
+DEVICE_AND_API_INIT(behavior_tog, DT_INST_LABEL(0), behavior_tog_init, &behavior_tog_data,
+                    &behavior_tog_config, APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
                     &behavior_tog_driver_api);
diff --git a/app/src/behaviors/behavior_transparent.c b/app/src/behaviors/behavior_transparent.c
index 51f682b..f7852f3 100644
--- a/app/src/behaviors/behavior_transparent.c
+++ b/app/src/behaviors/behavior_transparent.c
@@ -13,36 +13,30 @@
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
-struct behavior_transparent_config { };
-struct behavior_transparent_data { };
+struct behavior_transparent_config {};
+struct behavior_transparent_data {};
 
-static int behavior_transparent_init(struct device *dev)
-{
-	return 0;
-};
+static int behavior_transparent_init(struct device *dev) { return 0; };
 
-static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t _param1, u32_t _param2)
-{
-  return 1;
+static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t _param1,
+                                     u32_t _param2) {
+    return 1;
 }
 
-static int on_keymap_binding_released(struct device *dev, u32_t position, u32_t _param1, u32_t _param2)
-{
-  return 1;
+static int on_keymap_binding_released(struct device *dev, u32_t position, u32_t _param1,
+                                      u32_t _param2) {
+    return 1;
 }
 
 static const struct behavior_driver_api behavior_transparent_driver_api = {
-  .binding_pressed = on_keymap_binding_pressed,
-  .binding_released = on_keymap_binding_released,
+    .binding_pressed = on_keymap_binding_pressed,
+    .binding_released = on_keymap_binding_released,
 };
 
-
 static const struct behavior_transparent_config behavior_transparent_config = {};
 
 static struct behavior_transparent_data behavior_transparent_data;
 
 DEVICE_AND_API_INIT(behavior_transparent, DT_INST_LABEL(0), behavior_transparent_init,
-                    &behavior_transparent_data,
-                    &behavior_transparent_config,
-                    APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
-                    &behavior_transparent_driver_api);
\ No newline at end of file
+                    &behavior_transparent_data, &behavior_transparent_config, APPLICATION,
+                    CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &behavior_transparent_driver_api);
\ No newline at end of file