From b3f3362b506d628c53cc610801bc3109965659ea Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Mon, 31 Aug 2020 10:18:19 -0400 Subject: feat(display): Initial widget/status screen work. * Battery and output status widgets * Built in status screen combining them. * Ability to define a custom status screen factory function. --- app/include/zmk/ble.h | 2 ++ app/include/zmk/display/status_screen.h | 11 +++++++++++ app/include/zmk/display/widgets/battery_status.h | 18 ++++++++++++++++++ app/include/zmk/display/widgets/output_status.h | 18 ++++++++++++++++++ app/include/zmk/endpoints.h | 1 + 5 files changed, 50 insertions(+) create mode 100644 app/include/zmk/display/status_screen.h create mode 100644 app/include/zmk/display/widgets/battery_status.h create mode 100644 app/include/zmk/display/widgets/output_status.h (limited to 'app/include') diff --git a/app/include/zmk/ble.h b/app/include/zmk/ble.h index 56980c6..90afbda 100644 --- a/app/include/zmk/ble.h +++ b/app/include/zmk/ble.h @@ -14,7 +14,9 @@ int zmk_ble_prof_next(); int zmk_ble_prof_prev(); int zmk_ble_prof_select(u8_t index); +int zmk_ble_active_profile_index(); bt_addr_le_t *zmk_ble_active_profile_addr(); +bool zmk_ble_active_profile_is_open(); bool zmk_ble_active_profile_is_connected(); char *zmk_ble_active_profile_name(); diff --git a/app/include/zmk/display/status_screen.h b/app/include/zmk/display/status_screen.h new file mode 100644 index 0000000..34660ad --- /dev/null +++ b/app/include/zmk/display/status_screen.h @@ -0,0 +1,11 @@ +/* + * Copyright (c) 2020 Peter Johanson + * + * SPDX-License-Identifier: MIT + */ + +#pragma once + +#include + +lv_obj_t *zmk_display_status_screen(); \ No newline at end of file diff --git a/app/include/zmk/display/widgets/battery_status.h b/app/include/zmk/display/widgets/battery_status.h new file mode 100644 index 0000000..b87e87e --- /dev/null +++ b/app/include/zmk/display/widgets/battery_status.h @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#pragma once + +#include +#include + +struct zmk_widget_battery_status { + sys_snode_t node; + lv_obj_t *obj; +}; + +int zmk_widget_battery_status_init(struct zmk_widget_battery_status *widget, lv_obj_t *parent); +lv_obj_t *zmk_widget_battery_status_obj(struct zmk_widget_battery_status *widget); \ No newline at end of file diff --git a/app/include/zmk/display/widgets/output_status.h b/app/include/zmk/display/widgets/output_status.h new file mode 100644 index 0000000..66f0927 --- /dev/null +++ b/app/include/zmk/display/widgets/output_status.h @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#pragma once + +#include +#include + +struct zmk_widget_output_status { + sys_snode_t node; + lv_obj_t *obj; +}; + +int zmk_widget_output_status_init(struct zmk_widget_output_status *widget, lv_obj_t *parent); +lv_obj_t *zmk_widget_output_status_obj(struct zmk_widget_output_status *widget); \ No newline at end of file diff --git a/app/include/zmk/endpoints.h b/app/include/zmk/endpoints.h index aad688e..c252ef0 100644 --- a/app/include/zmk/endpoints.h +++ b/app/include/zmk/endpoints.h @@ -16,5 +16,6 @@ enum zmk_endpoint { int zmk_endpoints_select(enum zmk_endpoint endpoint); int zmk_endpoints_toggle(); +enum zmk_endpoint zmk_endpoints_selected(); int zmk_endpoints_send_report(u8_t usage_report); -- cgit v1.2.3