From 300e1d2630d3d5b1591a75f5dad885f8686867d3 Mon Sep 17 00:00:00 2001 From: Pawel Bogut Date: Sat, 11 Nov 2023 21:30:55 +0100 Subject: [PATCH] feat(nice_view): Add option to show battery percentage on vertical view --- app/boards/shields/nice_view/Kconfig.defconfig | 3 +++ app/boards/shields/nice_view/widgets/util.c | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/app/boards/shields/nice_view/Kconfig.defconfig b/app/boards/shields/nice_view/Kconfig.defconfig index 53edc1cc..d8e7cb0d 100644 --- a/app/boards/shields/nice_view/Kconfig.defconfig +++ b/app/boards/shields/nice_view/Kconfig.defconfig @@ -33,6 +33,9 @@ config NICE_VIEW_WIDGET_STATUS select LV_USE_IMG select LV_USE_CANVAS +config NICE_VIEW_BATTERY_SHOW_PERCENTAGE + bool "Show battery percentage instead of icon" + config NICE_VIEW_WIDGET_INVERTED bool "Invert custom status widget colors" diff --git a/app/boards/shields/nice_view/widgets/util.c b/app/boards/shields/nice_view/widgets/util.c index b4915ab7..c324b10c 100644 --- a/app/boards/shields/nice_view/widgets/util.c +++ b/app/boards/shields/nice_view/widgets/util.c @@ -30,6 +30,18 @@ void draw_battery(lv_obj_t *canvas, const struct status_state *state) { lv_draw_rect_dsc_t rect_white_dsc; init_rect_dsc(&rect_white_dsc, LVGL_FOREGROUND); +#if IS_ENABLED(CONFIG_NICE_VIEW_BATTERY_SHOW_PERCENTAGE) + char text[4] = {}; + sprintf(text, "%i%%", state->battery); + lv_draw_label_dsc_t label_dsc; + init_label_dsc(&label_dsc, LVGL_FOREGROUND, &lv_font_montserrat_16, LV_TEXT_ALIGN_CENTER); + lv_canvas_draw_text(canvas, 0, 5, 68, &label_dsc, text); + if (state->charging) { + lv_draw_img_dsc_t img_dsc; + lv_draw_img_dsc_init(&img_dsc); + lv_canvas_draw_img(canvas, 1, -1, &bolt, &img_dsc); + } +#else lv_canvas_draw_rect(canvas, 0, 2, 29, 12, &rect_white_dsc); lv_canvas_draw_rect(canvas, 1, 3, 27, 10, &rect_black_dsc); lv_canvas_draw_rect(canvas, 2, 4, (state->battery + 2) / 4, 8, &rect_white_dsc); @@ -41,6 +53,7 @@ void draw_battery(lv_obj_t *canvas, const struct status_state *state) { lv_draw_img_dsc_init(&img_dsc); lv_canvas_draw_img(canvas, 9, -1, &bolt, &img_dsc); } +#endif } void init_label_dsc(lv_draw_label_dsc_t *label_dsc, lv_color_t color, const lv_font_t *font,