Fix consumer keys w/ refactored behaviors.

4 files changed, 71 insertions, 49 deletions

diff --git a/app/src/behaviors/behavior_hid.c b/app/src/behaviors/behavior_hid.c
index 0aeade5..1ac7404 100644
--- a/app/src/behaviors/behavior_hid.c
+++ b/app/src/behaviors/behavior_hid.c
@@ -24,22 +24,53 @@ static int behavior_hid_init(struct device *dev)
 	return 0;
 };
 
-static int on_keycode_pressed(struct device *dev, u32_t keycode)
+static int on_keycode_pressed(struct device *dev, u8_t usage_page, u32_t keycode)
 {
-  enum zmk_hid_report_changes changes;
+  int err;
   LOG_DBG("keycode %d", keycode);
   
-  changes = zmk_hid_press_key(keycode);
-  return zmk_endpoints_send_report(changes);
+  switch (usage_page) {
+  case USAGE_KEYPAD:
+    err = zmk_hid_keypad_press(keycode);
+    if (err) {
+      LOG_ERR("Unable to press keycode");
+      return err;
+    }
+    break;
+  case USAGE_CONSUMER:
+    err = zmk_hid_consumer_press(keycode);
+    if (err) {
+      LOG_ERR("Unable to press keycode");
+      return err;
+    }
+    break;
+  }
+
+  return zmk_endpoints_send_report(usage_page);
 }
 
-static int on_keycode_released(struct device *dev, u32_t keycode)
+static int on_keycode_released(struct device *dev, u8_t usage_page, u32_t keycode)
 {
-  enum zmk_hid_report_changes changes;
+  int err;
   LOG_DBG("keycode %d", keycode);
   
-  changes = zmk_hid_release_key(keycode);
-  return zmk_endpoints_send_report(changes);
+  switch (usage_page) {
+  case USAGE_KEYPAD:
+    err = zmk_hid_keypad_release(keycode);
+    if (err) {
+      LOG_ERR("Unable to press keycode");
+      return err;
+    }
+    break;
+  case USAGE_CONSUMER:
+    err = zmk_hid_consumer_release(keycode);
+    if (err) {
+      LOG_ERR("Unable to press keycode");
+      return err;
+    }
+    break;
+  }
+  return zmk_endpoints_send_report(usage_page);
 }
 
 static int on_modifiers_pressed(struct device *dev, zmk_mod_flags modifiers)
@@ -47,7 +78,7 @@ static int on_modifiers_pressed(struct device *dev, zmk_mod_flags modifiers)
   LOG_DBG("modifiers %d", modifiers);
   
   zmk_hid_register_mods(modifiers);
-  return zmk_endpoints_send_report(Keypad);
+  return zmk_endpoints_send_report(USAGE_KEYPAD);
 }
 
 static int on_modifiers_released(struct device *dev, zmk_mod_flags modifiers)
@@ -55,7 +86,7 @@ static int on_modifiers_released(struct device *dev, zmk_mod_flags modifiers)
   LOG_DBG("modifiers %d", modifiers);
   
   zmk_hid_unregister_mods(modifiers);
-  return zmk_endpoints_send_report(Keypad);
+  return zmk_endpoints_send_report(USAGE_KEYPAD);
 }
 
 static const struct behavior_driver_api behavior_hid_driver_api = {
diff --git a/app/src/behaviors/behavior_key_press.c b/app/src/behaviors/behavior_key_press.c
index 1b3e670..7213b3c 100644
--- a/app/src/behaviors/behavior_key_press.c
+++ b/app/src/behaviors/behavior_key_press.c
@@ -14,7 +14,9 @@
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
-struct behavior_key_press_config { };
+struct behavior_key_press_config {
+  u8_t usage_page;
+};
 struct behavior_key_press_data { };
 
 static int behavior_key_press_init(struct device *dev)
@@ -22,44 +24,34 @@ static int behavior_key_press_init(struct device *dev)
 	return 0;
 };
 
-
-// They keycode is passed by the "keymap" based on the parameter created as part of the assignment.
-// Other drivers instead might activate a layer, update the consumer page state, or update the RGB state, etc.
-// Returns:
-//  * > 0 -  indicate successful processing, and halt further handling,
-//  * 0 - Indicate successful processing, and continue propagation.
-//  * < 0 - Indicate error processing, report and halt further propagation.
 static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t keycode, u32_t _)
 {
-  LOG_DBG("position %d keycode %d", position, keycode);
-  return zmk_events_keycode_pressed(keycode);
+  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_events_keycode_pressed(cfg->usage_page, keycode);
 }
 
-
-// They keycode is passed by the "keymap" based on the parameter created as part of the assignment.
 static int on_keymap_binding_released(struct device *dev, u32_t position, u32_t keycode, u32_t _)
 {
-  LOG_DBG("position %d keycode %d", position, keycode);
-  return zmk_events_keycode_released(keycode);
+  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_events_keycode_released(cfg->usage_page, keycode);
 }
 
 static const struct behavior_driver_api behavior_key_press_driver_api = {
-  // These callbacks are all optional, and define which kinds of events the behavior can handle.
-  // They can reference local functions defined here, or shared event handlers.
   .binding_pressed = on_keymap_binding_pressed,
   .binding_released = on_keymap_binding_released
-  // Other optional callbacks a behavior can implement
-  // .on_mouse_moved
-  // .on_sensor_data - Any behaviour that wants to be linked to a censor can implement this behavior
 };
 
-
-static const struct behavior_key_press_config behavior_key_press_config = {};
-
-static struct behavior_key_press_data behavior_key_press_data;
-
-DEVICE_AND_API_INIT(behavior_key_press, DT_INST_LABEL(0), behavior_key_press_init,
-                    &behavior_key_press_data,
-                    &behavior_key_press_config,
-                    APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
-                    &behavior_key_press_driver_api);
+#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_mod_tap.c b/app/src/behaviors/behavior_mod_tap.c
index 7684c29..2e6e339 100644
--- a/app/src/behaviors/behavior_mod_tap.c
+++ b/app/src/behaviors/behavior_mod_tap.c
@@ -40,17 +40,17 @@ static int on_keymap_binding_released(struct device *dev, u32_t position, u32_t
   struct behavior_mod_tap_data *data = dev->driver_data;
   LOG_DBG("mods: %d, keycode: %d", mods, keycode);
   
-  zmk_events_modifiers_released(mods);
+zmk_events_modifiers_released(mods);
   if (data->pending_press_positions & BIT(position)) {
-    zmk_events_keycode_pressed(keycode);
+    zmk_events_keycode_pressed(USAGE_KEYPAD, keycode);
     k_msleep(10);
-    zmk_events_keycode_released(keycode);
+    zmk_events_keycode_released(USAGE_KEYPAD, keycode);
   }
 
   return 0;
 }
 
-static int on_keycode_pressed(struct device *dev, u32_t keycode)
+static int on_keycode_pressed(struct device *dev, u8_t usage_page, u32_t keycode)
 {
   struct behavior_mod_tap_data *data = dev->driver_data;
   data->pending_press_positions = 0;
@@ -58,8 +58,7 @@ static int on_keycode_pressed(struct device *dev, u32_t keycode)
   return 0;
 }
 
-
-static int on_keycode_released(struct device *dev, u32_t keycode)
+static int on_keycode_released(struct device *dev, u8_t usage_page, u32_t keycode)
 {
   LOG_DBG("releasing: %d", keycode);
   return 0;
diff --git a/app/src/behaviors/behavior_momentary_layer.c b/app/src/behaviors/behavior_momentary_layer.c
index f85d33d..904051e 100644
--- a/app/src/behaviors/behavior_momentary_layer.c
+++ b/app/src/behaviors/behavior_momentary_layer.c
@@ -24,14 +24,14 @@ static int behavior_mo_init(struct device *dev)
 };
 
 
-static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t layer, u32_t _)
+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);
 }
 
-static int on_keymap_binding_released(struct device *dev, u32_t position, u32_t layer, u32_t _)
+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);
 
@@ -39,8 +39,8 @@ static int on_keymap_binding_released(struct device *dev, u32_t position, u32_t
 }
 
 static const struct behavior_driver_api behavior_mo_driver_api = {
-  .binding_pressed = on_keymap_binding_pressed,
-  .binding_released = on_keymap_binding_released
+  .binding_pressed = mo_keymap_binding_pressed,
+  .binding_released = mo_keymap_binding_released
 };