forked from ClemensElflein/CoverUI
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Restructure into LedSymbol & Bar widgets
- Loading branch information
1 parent
2fff601
commit d8e2654
Showing
5 changed files
with
164 additions
and
104 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| /** | ||
| * @file WidgetBar.hpp | ||
| * @author Apehaenger ([email protected]) | ||
| * @brief Tiny class/wrapper for a progress-bar, which get displayed for GPS or Battery (as LVGL bar) for OpenMower https://github.com/ClemensElflein/OpenMower | ||
| * @version 0.1 | ||
| * @date 2023-09-11 | ||
| * | ||
| * @copyright Copyright (c) 2023 | ||
| */ | ||
| #ifndef __WIDGETBAR_HPP | ||
| #define __WIDGETBAR_HPP | ||
|
|
||
| #include <Arduino.h> | ||
| #include <lvgl.h> | ||
| #include "LEDcontrol.h" | ||
|
|
||
| namespace display | ||
| { | ||
| class WidgetBar | ||
| { | ||
| public: | ||
| std::string bar_label; // sprintf formatted bar label like "<UNICODE SYMBOL> %d %%" | ||
|
|
||
| WidgetBar(const std::string &t_bar_label, lv_align_t align, lv_coord_t x_ofs, lv_coord_t y_ofs, lv_coord_t w, lv_coord_t h) : bar_label(t_bar_label) | ||
| { | ||
| // Init bar style settings for custom (labeled) bar graph | ||
| lv_style_init(&bar_style_bg); | ||
| lv_style_set_border_color(&bar_style_bg, lv_color_hex(0xffffff)); | ||
| lv_style_set_border_width(&bar_style_bg, 2); | ||
| lv_style_set_pad_all(&bar_style_bg, 3); // To make the indicator smaller | ||
| lv_style_set_radius(&bar_style_bg, 4); | ||
|
|
||
| lv_style_init(&bar_style_indic); | ||
| lv_style_set_bg_opa(&bar_style_indic, LV_OPA_COVER); | ||
| lv_style_set_bg_color(&bar_style_indic, lv_color_hex(0xffffff)); | ||
| lv_style_set_radius(&bar_style_indic, 1); | ||
|
|
||
| // Draw bar | ||
| bar = lv_bar_create(lv_scr_act()); | ||
| lv_obj_set_user_data(bar, (void *)bar_label.c_str()); // Store bar label to object user data | ||
| lv_obj_remove_style_all(bar); // To have a clean start | ||
| lv_obj_add_style(bar, &bar_style_bg, 0); | ||
| lv_obj_add_style(bar, &bar_style_indic, LV_PART_INDICATOR); | ||
|
|
||
| lv_obj_add_event_cb(bar, event_bar_label_cb, LV_EVENT_DRAW_PART_END, NULL); | ||
| lv_obj_set_size(bar, w, h); | ||
| lv_obj_align(bar, align, x_ofs, y_ofs); | ||
| } | ||
|
|
||
| void set_value(int16_t value) | ||
| { | ||
| lv_bar_set_value(bar, value, LV_ANIM_OFF); | ||
| } | ||
|
|
||
|
|
||
| private: | ||
| lv_obj_t *bar; | ||
| lv_style_t bar_style_bg, bar_style_indic; | ||
|
|
||
| static void event_bar_label_cb(lv_event_t *e) | ||
| { | ||
| lv_obj_draw_part_dsc_t *dsc = lv_event_get_draw_part_dsc(e); | ||
| if (dsc->part != LV_PART_INDICATOR) | ||
| return; | ||
|
|
||
| lv_obj_t *obj = lv_event_get_target(e); | ||
| int32_t bar_value = lv_bar_get_value(obj); | ||
| lv_draw_label_dsc_t label_dsc; | ||
| lv_draw_label_dsc_init(&label_dsc); | ||
|
|
||
| char buf[12]; | ||
| lv_snprintf(buf, sizeof(buf), (const char *)lv_obj_get_user_data(obj), bar_value); | ||
|
|
||
| lv_point_t txt_size; | ||
| lv_txt_get_size(&txt_size, buf, label_dsc.font, label_dsc.letter_space, label_dsc.line_space, LV_COORD_MAX, | ||
| label_dsc.flag); | ||
|
|
||
| lv_area_t txt_area; | ||
| // If the indicator is long enough put the text inside on the right | ||
| if (lv_area_get_width(dsc->draw_area) > txt_size.x + 20) | ||
| { | ||
| txt_area.x2 = dsc->draw_area->x2 - 5; | ||
| txt_area.x1 = txt_area.x2 - txt_size.x + 1; | ||
| label_dsc.color = lv_color_black(); | ||
| } | ||
| // If the indicator is still short put the text out of it on the right | ||
| else | ||
| { | ||
| txt_area.x1 = dsc->draw_area->x2 + 5; | ||
| txt_area.x2 = txt_area.x1 + txt_size.x - 1; | ||
| label_dsc.color = lv_color_white(); | ||
| } | ||
|
|
||
| txt_area.y1 = (dsc->draw_area->y1 + (lv_area_get_height(dsc->draw_area) - txt_size.y) / 2) + 1; | ||
| txt_area.y2 = txt_area.y1 + txt_size.y; | ||
|
|
||
| lv_draw_label(dsc->draw_ctx, &label_dsc, &txt_area, buf, NULL); | ||
| } | ||
| }; | ||
| } // namespace display | ||
|
|
||
| #endif // __WIDGETBAR_HPP |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| /** | ||
| * @file GuiLedSymbol.hpp | ||
| * @file WidgetLedSymbol.hpp | ||
| * @author Apehaenger ([email protected]) | ||
| * @brief Tiny class/wrapper for a virtual LED, which get displayed as symbol (LVGL label) for OpenMower https://github.com/ClemensElflein/OpenMower | ||
| * @version 0.1 | ||
|
|
@@ -29,16 +29,55 @@ namespace display | |
| lv_obj_align(label, align, x_ofs, y_ofs); | ||
| } | ||
|
|
||
| void set(LED_state state) | ||
| static void anim_blink_cb(void *var, int32_t v) | ||
| { | ||
| if (state == LED_off) | ||
| lv_obj_add_flag(label, LV_OBJ_FLAG_HIDDEN); | ||
| else if (state == LED_on) | ||
| if (v) | ||
| lv_obj_clear_flag((lv_obj_t *)var, LV_OBJ_FLAG_HIDDEN); | ||
| else | ||
| lv_obj_add_flag((lv_obj_t *)var, LV_OBJ_FLAG_HIDDEN); | ||
| } | ||
|
|
||
| void set(LED_state t_state) | ||
| { | ||
| if (t_state == state) | ||
| return; | ||
|
|
||
| switch (t_state) | ||
| { | ||
| case LED_on: | ||
| lv_anim_del(label, (lv_anim_exec_xcb_t)anim_blink_cb); | ||
| lv_obj_clear_flag(label, LV_OBJ_FLAG_HIDDEN); | ||
| break; | ||
| case LED_blink_slow: | ||
| startBlinkAnim(600); // Somehow slower than originals 500ms (because of increased blink_fast period) | ||
| break; | ||
| case LED_blink_fast: | ||
| startBlinkAnim(200); // 100ms fast blink is to quick for the cheap WYM240128K1 | ||
| break; | ||
| default: // off | ||
| lv_anim_del(label, (lv_anim_exec_xcb_t)anim_blink_cb); | ||
| lv_obj_add_flag(label, LV_OBJ_FLAG_HIDDEN); | ||
| break; | ||
| } | ||
| state = t_state; | ||
| } | ||
|
|
||
| private: | ||
| lv_obj_t *label; | ||
| lv_anim_t anim; | ||
| LED_state state = LED_on; | ||
|
|
||
| void startBlinkAnim(uint16_t t_period_ms) | ||
| { | ||
| lv_anim_init(&anim); | ||
| lv_anim_set_exec_cb(&anim, (lv_anim_exec_xcb_t)anim_blink_cb); | ||
| lv_anim_set_var(&anim, label); | ||
| lv_anim_set_time(&anim, t_period_ms); | ||
| lv_anim_set_repeat_delay(&anim, t_period_ms); | ||
| lv_anim_set_values(&anim, 0, 1); | ||
| lv_anim_set_repeat_count(&anim, LV_ANIM_REPEAT_INFINITE); | ||
| lv_anim_start(&anim); | ||
| } | ||
| }; | ||
| } // namespace display | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters