summaryrefslogtreecommitdiff
path: root/app/src/behaviors
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/behaviors')
-rw-r--r--app/src/behaviors/behavior_hid.c108
-rw-r--r--app/src/behaviors/behavior_key_press.c19
-rw-r--r--app/src/behaviors/behavior_keymap.c50
-rw-r--r--app/src/behaviors/behavior_mod_tap.c55
-rw-r--r--app/src/behaviors/behavior_momentary_layer.c1
5 files changed, 41 insertions, 192 deletions
diff --git a/app/src/behaviors/behavior_hid.c b/app/src/behaviors/behavior_hid.c
deleted file mode 100644
index 1ac7404..0000000
--- a/app/src/behaviors/behavior_hid.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
- *
- * SPDX-License-Identifier: MIT
- */
-
-#define DT_DRV_COMPAT zmk_behavior_hid
-
-#include <device.h>
-#include <power/reboot.h>
-#include <drivers/behavior.h>
-#include <logging/log.h>
-
-LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
-
-#include <zmk/hid.h>
-#include <zmk/endpoints.h>
-
-struct behavior_hid_config { };
-struct behavior_hid_data { };
-
-static int behavior_hid_init(struct device *dev)
-{
- return 0;
-};
-
-static int on_keycode_pressed(struct device *dev, u8_t usage_page, u32_t keycode)
-{
- int err;
- LOG_DBG("keycode %d", keycode);
-
- 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, u8_t usage_page, u32_t keycode)
-{
- int err;
- LOG_DBG("keycode %d", keycode);
-
- 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)
-{
- LOG_DBG("modifiers %d", modifiers);
-
- zmk_hid_register_mods(modifiers);
- return zmk_endpoints_send_report(USAGE_KEYPAD);
-}
-
-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(USAGE_KEYPAD);
-}
-
-static const struct behavior_driver_api behavior_hid_driver_api = {
- .keycode_pressed = on_keycode_pressed,
- .keycode_released = on_keycode_released,
- .modifiers_pressed = on_modifiers_pressed,
- .modifiers_released = on_modifiers_released
-};
-
-
-static const struct behavior_hid_config behavior_hid_config = {};
-
-static struct behavior_hid_data behavior_hid_data;
-
-DEVICE_AND_API_INIT(behavior_hid, DT_INST_LABEL(0), behavior_hid_init,
- &behavior_hid_data,
- &behavior_hid_config,
- APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
- &behavior_hid_driver_api); \ 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 7213b3c..34df1c0 100644
--- a/app/src/behaviors/behavior_key_press.c
+++ b/app/src/behaviors/behavior_key_press.c
@@ -10,7 +10,8 @@
#include <drivers/behavior.h>
#include <logging/log.h>
-#include <zmk/events.h>
+#include <zmk/event-manager.h>
+#include <zmk/events/keycode-state-changed.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
@@ -27,15 +28,27 @@ static int behavior_key_press_init(struct device *dev)
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;
+ struct keycode_state_changed *ev;
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);
+
+ ev = new_keycode_state_changed();
+ ev->usage_page = cfg->usage_page;
+ ev->keycode = keycode;
+ ev->state = true;
+ return ZMK_EVENT_RAISE(ev);
}
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;
+ struct keycode_state_changed *ev;
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);
+
+ 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_key_press_driver_api = {
diff --git a/app/src/behaviors/behavior_keymap.c b/app/src/behaviors/behavior_keymap.c
deleted file mode 100644
index 7a06b2f..0000000
--- a/app/src/behaviors/behavior_keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
- *
- * SPDX-License-Identifier: MIT
- */
-
-#define DT_DRV_COMPAT zmk_behavior_keymap
-
-#include <device.h>
-#include <power/reboot.h>
-#include <drivers/behavior.h>
-#include <logging/log.h>
-
-LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
-
-#include <zmk/keymap.h>
-
-struct behavior_keymap_config { };
-struct behavior_keymap_data { };
-
-static int behavior_keymap_init(struct device *dev)
-{
- return 0;
-};
-
-static int on_position_pressed(struct device *dev, u32_t position)
-{
- return zmk_keymap_position_state_changed(position, true);
-}
-
-static int on_position_released(struct device *dev, u32_t position)
-{
- return zmk_keymap_position_state_changed(position, false);
-}
-
-static const struct behavior_driver_api behavior_keymap_driver_api = {
- .position_pressed = on_position_pressed,
- .position_released = on_position_released,
-};
-
-
-static const struct behavior_keymap_config behavior_keymap_config = {};
-
-static struct behavior_keymap_data behavior_keymap_data;
-
-DEVICE_AND_API_INIT(behavior_keymap, DT_INST_LABEL(0), behavior_keymap_init,
- &behavior_keymap_data,
- &behavior_keymap_config,
- APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
- &behavior_keymap_driver_api);
diff --git a/app/src/behaviors/behavior_mod_tap.c b/app/src/behaviors/behavior_mod_tap.c
index 2e6e339..62604eb 100644
--- a/app/src/behaviors/behavior_mod_tap.c
+++ b/app/src/behaviors/behavior_mod_tap.c
@@ -10,7 +10,9 @@
#include <drivers/behavior.h>
#include <logging/log.h>
-#include <zmk/events.h>
+#include <zmk/event-manager.h>
+#include <zmk/events/keycode-state-changed.h>
+#include <zmk/events/modifiers-state-changed.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
@@ -19,6 +21,22 @@ struct behavior_mod_tap_data {
u16_t pending_press_positions;
};
+int behavior_mod_tap_listener(const struct zmk_event_header *eh)
+{
+ if (is_keycode_state_changed(eh)) {
+ struct device *dev = device_get_binding(DT_INST_LABEL(0));
+ const struct keycode_state_changed *ev = cast_keycode_state_changed(eh);
+ if (ev->state) {
+ struct behavior_mod_tap_data *data = dev->driver_data;
+ data->pending_press_positions = 0;
+ }
+ }
+ return 0;
+}
+
+ZMK_LISTENER(behavior_mod_tap, behavior_mod_tap_listener);
+ZMK_SUBSCRIPTION(behavior_mod_tap, keycode_state_changed);
+
static int behavior_mod_tap_init(struct device *dev)
{
return 0;
@@ -30,58 +48,35 @@ static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t m
struct behavior_mod_tap_data *data = dev->driver_data;
LOG_DBG("mods: %d, keycode: %d", mods, keycode);
WRITE_BIT(data->pending_press_positions, position, true);
- return zmk_events_modifiers_pressed(mods);
+ return ZMK_EVENT_RAISE(create_modifiers_state_changed(mods, true));
}
-
-// 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 mods, u32_t keycode)
{
struct behavior_mod_tap_data *data = dev->driver_data;
LOG_DBG("mods: %d, keycode: %d", mods, keycode);
-zmk_events_modifiers_released(mods);
+ ZMK_EVENT_RAISE(create_modifiers_state_changed(mods, false));
+ k_msleep(10); // TODO: Better approach than k_msleep to avoid USB send failures? Retries in the USB endpoint layer?
if (data->pending_press_positions & BIT(position)) {
- zmk_events_keycode_pressed(USAGE_KEYPAD, keycode);
+ ZMK_EVENT_RAISE(create_keycode_state_changed(USAGE_KEYPAD, keycode, true));
k_msleep(10);
- zmk_events_keycode_released(USAGE_KEYPAD, keycode);
+ ZMK_EVENT_RAISE(create_keycode_state_changed(USAGE_KEYPAD, keycode, false));
}
return 0;
}
-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;
- LOG_DBG("pressing: %d", keycode);
- return 0;
-}
-
-static int on_keycode_released(struct device *dev, u8_t usage_page, u32_t keycode)
-{
- LOG_DBG("releasing: %d", keycode);
- return 0;
-}
-
static const struct behavior_driver_api behavior_mod_tap_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,
- .keycode_pressed = on_keycode_pressed,
- .keycode_released = on_keycode_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_mod_tap_config behavior_mod_tap_config = {};
static struct behavior_mod_tap_data behavior_mod_tap_data;
-DEVICE_AND_API_INIT(behavior_key_press, DT_INST_LABEL(0), behavior_mod_tap_init,
+DEVICE_AND_API_INIT(behavior_mod_tap, DT_INST_LABEL(0), behavior_mod_tap_init,
&behavior_mod_tap_data,
&behavior_mod_tap_config,
APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
diff --git a/app/src/behaviors/behavior_momentary_layer.c b/app/src/behaviors/behavior_momentary_layer.c
index 904051e..8a8584a 100644
--- a/app/src/behaviors/behavior_momentary_layer.c
+++ b/app/src/behaviors/behavior_momentary_layer.c
@@ -10,7 +10,6 @@
#include <drivers/behavior.h>
#include <logging/log.h>
-#include <zmk/events.h>
#include <zmk/keymap.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-01 09:42:45 +0000