3 files changed, 17 insertions, 10 deletions
diff --git a/app/src/behaviors/behavior_mod_tap.c b/app/src/behaviors/behavior_mod_tap.c
index 6151f7e..5a2f60e 100644
--- a/app/src/behaviors/behavior_mod_tap.c
+++ b/app/src/behaviors/behavior_mod_tap.c
@@ -193,8 +193,8 @@ static int on_keymap_binding_released(struct device *dev, u32_t position, u32_t
           }
 
           struct keycode_state_changed *ev = data->captured_keycode_events[j].event;
-          data->captured_keycode_events[i].event = NULL;
-          data->captured_keycode_events[i].active_mods = 0;
+          data->captured_keycode_events[j].event = NULL;
+          data->captured_keycode_events[j].active_mods = 0;
           LOG_DBG("Re-sending latched key press for usage page 0x%02X keycode 0x%02X state %s", ev->usage_page, ev->keycode, (ev->state ? "pressed" : "released"));
           ZMK_EVENT_RELEASE(ev);
           k_msleep(10);
diff --git a/app/src/behaviors/behavior_none.c b/app/src/behaviors/behavior_none.c
index 7e77e54..e822d5e 100644
--- a/app/src/behaviors/behavior_none.c
+++ b/app/src/behaviors/behavior_none.c
@@ -23,12 +23,12 @@ static int behavior_none_init(struct device *dev)
 
 static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t _param1, u32_t _param2)
 {
-  return 1;
+  return 0;
 }
 
 static int on_keymap_binding_released(struct device *dev, u32_t position, u32_t _param1, u32_t _param2)
 {
-  return 1;
+  return 0;
 }
 
 static const struct behavior_driver_api behavior_none_driver_api = {
diff --git a/app/src/behaviors/behavior_toggle_layer.c b/app/src/behaviors/behavior_toggle_layer.c
index 13f4a29..02a76d2 100644
--- a/app/src/behaviors/behavior_toggle_layer.c
+++ b/app/src/behaviors/behavior_toggle_layer.c
@@ -14,28 +14,35 @@
 
 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;
+  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);
+
   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);
+
   return 0;
 }
 
 static const struct behavior_driver_api behavior_tog_driver_api = {
-  .binding_pressed = tog_keymap_binding_pressed,
-  .binding_released = tog_keymap_binding_released,
+    .binding_pressed = tog_keymap_binding_pressed,
+    .binding_released = tog_keymap_binding_released,
 };
 
 static const struct behavior_tog_config behavior_tog_config = {};