diff options
| author | Pete Johanson <peter@peterjohanson.com> | 2021-01-18 00:35:56 -0500 |
|---|---|---|
| committer | Pete Johanson <peter@peterjohanson.com> | 2021-01-20 07:06:11 -0500 |
| commit | 3fe2acc2d191006fa6309191ee99b2e4e249ed08 (patch) | |
| tree | 4994508fdc58daee4629c671e07e689b6332bd32 /app/src/display/widgets | |
| parent | 003db892adadb7b760f43411d7154fe60bf3556d (diff) | |
refactor(core): Extra event payloads to own types, refactor API.
* Make it easier to use *just* event payloads by defining the data,
and then having event manager macros generate "wrapper structs"
* Improve is_*/cast_* APIs to hide details of full event struct.
* Create `zmk_event_t` typedef to pass to event handlers.
* Bring event names inline w/ consistent `zmk_` prefix.
Diffstat (limited to 'app/src/display/widgets')
| -rw-r--r-- | app/src/display/widgets/battery_status.c | 6 | ||||
| -rw-r--r-- | app/src/display/widgets/layer_status.c | 4 | ||||
| -rw-r--r-- | app/src/display/widgets/output_status.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/app/src/display/widgets/battery_status.c b/app/src/display/widgets/battery_status.c index f1f1c9f..309c3e9 100644 --- a/app/src/display/widgets/battery_status.c +++ b/app/src/display/widgets/battery_status.c @@ -75,14 +75,14 @@ lv_obj_t *zmk_widget_battery_status_obj(struct zmk_widget_battery_status *widget return widget->obj; } -int battery_status_listener(const struct zmk_event_header *eh) { +int battery_status_listener(const zmk_event_t *eh) { struct zmk_widget_battery_status *widget; SYS_SLIST_FOR_EACH_CONTAINER(&widgets, widget, node) { set_battery_symbol(widget->obj); } return ZMK_EV_EVENT_BUBBLE; } ZMK_LISTENER(widget_battery_status, battery_status_listener) -ZMK_SUBSCRIPTION(widget_battery_status, battery_state_changed); +ZMK_SUBSCRIPTION(widget_battery_status, zmk_battery_state_changed); #if IS_ENABLED(CONFIG_USB) -ZMK_SUBSCRIPTION(widget_battery_status, usb_conn_state_changed); +ZMK_SUBSCRIPTION(widget_battery_status, zmk_usb_conn_state_changed); #endif /* IS_ENABLED(CONFIG_USB) */ diff --git a/app/src/display/widgets/layer_status.c b/app/src/display/widgets/layer_status.c index 6700bb3..9960f2a 100644 --- a/app/src/display/widgets/layer_status.c +++ b/app/src/display/widgets/layer_status.c @@ -69,11 +69,11 @@ lv_obj_t *zmk_widget_layer_status_obj(struct zmk_widget_layer_status *widget) { return widget->obj; } -int layer_status_listener(const struct zmk_event_header *eh) { +int layer_status_listener(const zmk_event_t *eh) { struct zmk_widget_layer_status *widget; SYS_SLIST_FOR_EACH_CONTAINER(&widgets, widget, node) { set_layer_symbol(widget->obj); } return 0; } ZMK_LISTENER(widget_layer_status, layer_status_listener) -ZMK_SUBSCRIPTION(widget_layer_status, layer_state_changed);
\ No newline at end of file +ZMK_SUBSCRIPTION(widget_layer_status, zmk_layer_state_changed);
\ No newline at end of file diff --git a/app/src/display/widgets/output_status.c b/app/src/display/widgets/output_status.c index 716228b..7e37f90 100644 --- a/app/src/display/widgets/output_status.c +++ b/app/src/display/widgets/output_status.c @@ -79,7 +79,7 @@ lv_obj_t *zmk_widget_output_status_obj(struct zmk_widget_output_status *widget) return widget->obj; } -int output_status_listener(const struct zmk_event_header *eh) { +int output_status_listener(const zmk_event_t *eh) { struct zmk_widget_output_status *widget; SYS_SLIST_FOR_EACH_CONTAINER(&widgets, widget, node) { set_status_symbol(widget->obj); } return ZMK_EV_EVENT_BUBBLE; @@ -87,8 +87,8 @@ int output_status_listener(const struct zmk_event_header *eh) { ZMK_LISTENER(widget_output_status, output_status_listener) #if defined(CONFIG_USB) -ZMK_SUBSCRIPTION(widget_output_status, usb_conn_state_changed); +ZMK_SUBSCRIPTION(widget_output_status, zmk_usb_conn_state_changed); #endif #if defined(CONFIG_ZMK_BLE) -ZMK_SUBSCRIPTION(widget_output_status, ble_active_profile_changed); +ZMK_SUBSCRIPTION(widget_output_status, zmk_ble_active_profile_changed); #endif |