Fix consumer keys w/ refactored behaviors.

1 files changed, 21 insertions, 29 deletions

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