From 179b14f48c2c7506d1a7832899e134cc3868a41c Mon Sep 17 00:00:00 2001 From: JF Date: Wed, 26 Feb 2020 20:49:26 +0100 Subject: Add new Screens (gauge, meter,...) --- src/DisplayApp/Screens/Modal.cpp | 77 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 src/DisplayApp/Screens/Modal.cpp (limited to 'src/DisplayApp/Screens/Modal.cpp') diff --git a/src/DisplayApp/Screens/Modal.cpp b/src/DisplayApp/Screens/Modal.cpp new file mode 100644 index 00000000..a1b955cf --- /dev/null +++ b/src/DisplayApp/Screens/Modal.cpp @@ -0,0 +1,77 @@ +#include +#include "Modal.h" +#include "../DisplayApp.h" + +using namespace Pinetime::Applications::Screens; +extern lv_font_t jetbrains_mono_extrabold_compressedextrabold_compressed; +extern lv_font_t jetbrains_mono_bold_20; + +Modal::Modal(Pinetime::Applications::DisplayApp *app) : Screen(app) { + + +} + +Modal::~Modal() { + lv_obj_clean(lv_scr_act()); +} + +bool Modal::Refresh() { + + return running; +} + +bool Modal::OnButtonPushed() { + running = false; + return true; +} + +void Modal::Show() { + lv_style_copy(&modal_style, &lv_style_plain_color); + modal_style.body.main_color = modal_style.body.grad_color = LV_COLOR_BLACK; + modal_style.body.opa = LV_OPA_50; + + obj = lv_obj_create(lv_scr_act(), NULL); + lv_obj_set_style(obj, &modal_style); + lv_obj_set_pos(obj, 0, 0); + lv_obj_set_size(obj, LV_HOR_RES, LV_VER_RES); + lv_obj_set_opa_scale_enable(obj, true); /* Enable opacity scaling for the animation */ + + static const char * btns2[] = {"Ok", "Cancel", ""}; + + /* Create the message box as a child of the modal background */ + mbox = lv_mbox_create(obj, NULL); + lv_mbox_add_btns(mbox, btns2); + lv_mbox_set_text(mbox, "Hello world!"); + lv_obj_align(mbox, NULL, LV_ALIGN_CENTER, 0, 0); + lv_obj_set_event_cb(mbox, Modal::mbox_event_cb); + + /* Fade the message box in with an animation */ + lv_anim_t a; + lv_anim_init(&a); + lv_anim_set_time(&a, 500, 0); + lv_anim_set_values(&a, LV_OPA_TRANSP, LV_OPA_COVER); + lv_anim_set_exec_cb(&a, obj, (lv_anim_exec_xcb_t)lv_obj_set_opa_scale); + lv_anim_create(&a); +} + +void Modal::Hide() { + /* Delete the parent modal background */ + lv_obj_del_async(lv_obj_get_parent(mbox)); + mbox = NULL; /* happens before object is actually deleted! */ +} + +void Modal::mbox_event_cb(lv_obj_t *obj, lv_event_t evt) { + auto* m = static_cast(obj->user_data); + m->OnEvent(obj, evt); +} + +void Modal::OnEvent(lv_obj_t *event_obj, lv_event_t evt) { + if(evt == LV_EVENT_DELETE && event_obj == mbox) { + /* Delete the parent modal background */ + lv_obj_del_async(lv_obj_get_parent(mbox)); + mbox = NULL; /* happens before object is actually deleted! */ + } else if(evt == LV_EVENT_VALUE_CHANGED) { + /* A button was clicked */ + lv_mbox_start_auto_close(mbox, 100); + } +} -- cgit v1.2.3-70-g09d2 From 63c57258821b356dfdfd0c73ab24bb918f23a8ae Mon Sep 17 00:00:00 2001 From: JF Date: Sun, 1 Mar 2020 16:01:53 +0100 Subject: Simplify Tile to improve refresh speed (it's not a tile anymore...). Disable debug mode of lvgl. --- src/DisplayApp/Screens/Modal.cpp | 12 ++++++------ src/DisplayApp/Screens/Tile.cpp | 33 ++++++++++++++++++--------------- src/libs/lv_conf.h | 2 +- 3 files changed, 25 insertions(+), 22 deletions(-) (limited to 'src/DisplayApp/Screens/Modal.cpp') diff --git a/src/DisplayApp/Screens/Modal.cpp b/src/DisplayApp/Screens/Modal.cpp index a1b955cf..553b31a0 100644 --- a/src/DisplayApp/Screens/Modal.cpp +++ b/src/DisplayApp/Screens/Modal.cpp @@ -46,12 +46,12 @@ void Modal::Show() { lv_obj_set_event_cb(mbox, Modal::mbox_event_cb); /* Fade the message box in with an animation */ - lv_anim_t a; - lv_anim_init(&a); - lv_anim_set_time(&a, 500, 0); - lv_anim_set_values(&a, LV_OPA_TRANSP, LV_OPA_COVER); - lv_anim_set_exec_cb(&a, obj, (lv_anim_exec_xcb_t)lv_obj_set_opa_scale); - lv_anim_create(&a); +// lv_anim_t a; +// lv_anim_init(&a); +// lv_anim_set_time(&a, 500, 0); +// lv_anim_set_values(&a, LV_OPA_TRANSP, LV_OPA_COVER); +// lv_anim_set_exec_cb(&a, obj, (lv_anim_exec_xcb_t)lv_obj_set_opa_scale); +// lv_anim_create(&a); } void Modal::Hide() { diff --git a/src/DisplayApp/Screens/Tile.cpp b/src/DisplayApp/Screens/Tile.cpp index 1c85aa1d..8028d779 100644 --- a/src/DisplayApp/Screens/Tile.cpp +++ b/src/DisplayApp/Screens/Tile.cpp @@ -16,11 +16,11 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) { screen->OnObjectEvent(obj, event, eventData); } -static const char * btnm_map1[] = {"Meter", "Gauge", "Clock", "\n", "App4", "App5", "App11", ""}; +static const char * btnm_map1[] = {"Meter", "Gauge", "Clock", "\n", "App1", "App2", "App3", ""}; Tile::Tile(DisplayApp* app) : Screen(app) { modal.reset(new Modal(app)); - +/* static lv_point_t valid_pos[] = {{0,0}, {LV_COORD_MIN, LV_COORD_MIN}}; tileview = lv_tileview_create(lv_scr_act(), NULL); lv_tileview_set_valid_positions(tileview, valid_pos, 1); @@ -30,25 +30,28 @@ Tile::Tile(DisplayApp* app) : Screen(app) { lv_obj_set_pos(tile1, 0, 0); lv_obj_set_size(tile1, LV_HOR_RES, LV_VER_RES); lv_tileview_add_element(tileview, tile1); - - btnm1 = lv_btnm_create(tile1, NULL); +*/ + btnm1 = lv_btnm_create(lv_scr_act(), NULL); lv_btnm_set_map(btnm1, btnm_map1); lv_obj_set_size(btnm1, LV_HOR_RES, LV_VER_RES); - labelRelStyle = const_cast(lv_label_get_style(btnm1, LV_BTNM_STYLE_BTN_REL)); - labelRelStyle->text.font = &jetbrains_mono_bold_20; - labelRelStyle->body.grad_color = labelRelStyle->body.main_color; - lv_btnm_set_style(btnm1, LV_BTNM_STYLE_BTN_REL, labelRelStyle); +// labelRelStyle = const_cast(lv_label_get_style(btnm1, LV_BTNM_STYLE_BTN_REL)); +// labelRelStyle->text.font = &jetbrains_mono_bold_20; +// labelRelStyle->body.grad_color = labelRelStyle->body.main_color; +// lv_btnm_set_style(btnm1, LV_BTNM_STYLE_BTN_REL, labelRelStyle); +// +// labelPrStyle = const_cast(lv_label_get_style(btnm1, LV_BTNM_STYLE_BTN_PR)); +// labelPrStyle->text.font = &jetbrains_mono_bold_20; +// labelPrStyle->body.grad_color = labelPrStyle->body.shadow.color; + + - labelPrStyle = const_cast(lv_label_get_style(btnm1, LV_BTNM_STYLE_BTN_PR)); - labelPrStyle->text.font = &jetbrains_mono_bold_20; - labelPrStyle->body.grad_color = labelPrStyle->body.shadow.color; // lv_btnm_set_style(btnm1, LV_BTNM_STYLE_BTN_PR, labelPrStyle); //TODO better style handling - - lv_obj_align(btnm1, tile1, LV_ALIGN_CENTER, 0, 0); +// lv_obj_align(btnm1, tile1, LV_ALIGN_CENTER, 0, 0); btnm1->user_data = this; lv_obj_set_event_cb(btnm1, event_handler); + /* tile2 = lv_obj_create(tileview, NULL); lv_obj_set_pos(tile2, 0, LV_VER_RES); @@ -120,8 +123,8 @@ void Tile::OnObjectEvent(lv_obj_t *obj, lv_event_t event, uint32_t buttonId) { tile->StartClockApp(); break; case 3: - modal->Show(); - break; +// modal->Show(); +// break; case 4: case 5: tile->StartTestApp(); diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h index 34457953..f24c0b99 100644 --- a/src/libs/lv_conf.h +++ b/src/libs/lv_conf.h @@ -249,7 +249,7 @@ typedef void * lv_indev_drv_user_data_t; /*Type of user data in the i * The behavior of asserts can be overwritten by redefining them here. * E.g. #define LV_ASSERT_MEM(p) */ -#define LV_USE_DEBUG 1 +#define LV_USE_DEBUG 0 #if LV_USE_DEBUG /*Check if the parameter is NULL. (Quite fast) */ -- cgit v1.2.3-70-g09d2 From a1d79e7ecc64aa78299329a2431a76b5c951feca Mon Sep 17 00:00:00 2001 From: JF Date: Sun, 1 Mar 2020 17:20:27 +0100 Subject: Fix Model that would crash when closing it. --- src/DisplayApp/Screens/Modal.cpp | 21 +++++++++++---------- src/DisplayApp/Screens/Tile.cpp | 6 +++--- 2 files changed, 14 insertions(+), 13 deletions(-) (limited to 'src/DisplayApp/Screens/Modal.cpp') diff --git a/src/DisplayApp/Screens/Modal.cpp b/src/DisplayApp/Screens/Modal.cpp index 553b31a0..13bd42fa 100644 --- a/src/DisplayApp/Screens/Modal.cpp +++ b/src/DisplayApp/Screens/Modal.cpp @@ -45,13 +45,15 @@ void Modal::Show() { lv_obj_align(mbox, NULL, LV_ALIGN_CENTER, 0, 0); lv_obj_set_event_cb(mbox, Modal::mbox_event_cb); + mbox->user_data = this; + /* Fade the message box in with an animation */ -// lv_anim_t a; -// lv_anim_init(&a); -// lv_anim_set_time(&a, 500, 0); -// lv_anim_set_values(&a, LV_OPA_TRANSP, LV_OPA_COVER); -// lv_anim_set_exec_cb(&a, obj, (lv_anim_exec_xcb_t)lv_obj_set_opa_scale); -// lv_anim_create(&a); + lv_anim_t a; + lv_anim_init(&a); + lv_anim_set_time(&a, 500, 0); + lv_anim_set_values(&a, LV_OPA_TRANSP, LV_OPA_COVER); + lv_anim_set_exec_cb(&a, obj, (lv_anim_exec_xcb_t)lv_obj_set_opa_scale); + lv_anim_create(&a); } void Modal::Hide() { @@ -67,11 +69,10 @@ void Modal::mbox_event_cb(lv_obj_t *obj, lv_event_t evt) { void Modal::OnEvent(lv_obj_t *event_obj, lv_event_t evt) { if(evt == LV_EVENT_DELETE && event_obj == mbox) { - /* Delete the parent modal background */ - lv_obj_del_async(lv_obj_get_parent(mbox)); - mbox = NULL; /* happens before object is actually deleted! */ + Hide(); } else if(evt == LV_EVENT_VALUE_CHANGED) { /* A button was clicked */ - lv_mbox_start_auto_close(mbox, 100); + lv_mbox_start_auto_close(mbox, 0); +// Hide(); } } diff --git a/src/DisplayApp/Screens/Tile.cpp b/src/DisplayApp/Screens/Tile.cpp index 8028d779..72fe35bc 100644 --- a/src/DisplayApp/Screens/Tile.cpp +++ b/src/DisplayApp/Screens/Tile.cpp @@ -16,7 +16,7 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) { screen->OnObjectEvent(obj, event, eventData); } -static const char * btnm_map1[] = {"Meter", "Gauge", "Clock", "\n", "App1", "App2", "App3", ""}; +static const char * btnm_map1[] = {"Meter", "Gauge", "Clock", "\n", "MsgBox", "App2", "App3", ""}; Tile::Tile(DisplayApp* app) : Screen(app) { modal.reset(new Modal(app)); @@ -123,8 +123,8 @@ void Tile::OnObjectEvent(lv_obj_t *obj, lv_event_t event, uint32_t buttonId) { tile->StartClockApp(); break; case 3: -// modal->Show(); -// break; + modal->Show(); + break; case 4: case 5: tile->StartTestApp(); -- cgit v1.2.3-70-g09d2 From 5bc0640b735573b465cfef16fb729ad5f5149eb4 Mon Sep 17 00:00:00 2001 From: JF Date: Sun, 1 Mar 2020 19:09:59 +0100 Subject: Fix typo in the name of the font "jetbrains_mono_extrabold_compressed" + use it as the default font. --- src/DisplayApp/DisplayApp.cpp | 11 +++++++++++ src/DisplayApp/Fonts/jetbrains_mono_extrabold_compressed.c | 10 +++++----- src/DisplayApp/LittleVgl.cpp | 8 ++++++-- src/DisplayApp/Screens/Clock.cpp | 4 ++-- src/DisplayApp/Screens/Gauge.cpp | 2 +- src/DisplayApp/Screens/Meter.cpp | 2 +- src/DisplayApp/Screens/Modal.cpp | 2 +- 7 files changed, 27 insertions(+), 12 deletions(-) (limited to 'src/DisplayApp/Screens/Modal.cpp') diff --git a/src/DisplayApp/DisplayApp.cpp b/src/DisplayApp/DisplayApp.cpp index 316312ed..d7d62dde 100644 --- a/src/DisplayApp/DisplayApp.cpp +++ b/src/DisplayApp/DisplayApp.cpp @@ -120,6 +120,17 @@ void DisplayApp::Refresh() { if(!currentScreen->OnButtonPushed()) { systemTask.PushMessage(System::SystemTask::Messages::GoToSleep); } +// currentScreen.reset(nullptr); +// if(toggle) { +// modal.Show(); +//// currentScreen.reset(new Screens::Tile(this)); +// toggle = false; +// } else { +// modal.Hide(); +//// currentScreen.reset(new Screens::Clock(this, dateTimeController, batteryController, bleController)); +// toggle = true; +// } + break; } } diff --git a/src/DisplayApp/Fonts/jetbrains_mono_extrabold_compressed.c b/src/DisplayApp/Fonts/jetbrains_mono_extrabold_compressed.c index c850cd91..c9917e40 100644 --- a/src/DisplayApp/Fonts/jetbrains_mono_extrabold_compressed.c +++ b/src/DisplayApp/Fonts/jetbrains_mono_extrabold_compressed.c @@ -6,11 +6,11 @@ * Opts: ******************************************************************************/ -#ifndef JETBRAINS_MONO_EXTRABOLD_COMPRESSEDEXTRABOLD_COMPRESSED -#define JETBRAINS_MONO_EXTRABOLD_COMPRESSEDEXTRABOLD_COMPRESSED 1 +#ifndef JETBRAINS_MONO_EXTRABOLD_COMPRESSED +#define JETBRAINS_MONO_EXTRABOLD_COMPRESSED 1 #endif -#if JETBRAINS_MONO_EXTRABOLD_COMPRESSEDEXTRABOLD_COMPRESSED +#if JETBRAINS_MONO_EXTRABOLD_COMPRESSED /*----------------- * BITMAPS @@ -492,7 +492,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = { *----------------*/ /*Initialize a public general font descriptor*/ -lv_font_t jetbrains_mono_extrabold_compressedextrabold_compressed = { +lv_font_t jetbrains_mono_extrabold_compressed = { .get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt, /*Function pointer to get glyph's data*/ .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt, /*Function pointer to get glyph's bitmap*/ .line_height = 60, /*The maximum line height required by the font*/ @@ -503,5 +503,5 @@ lv_font_t jetbrains_mono_extrabold_compressedextrabold_compressed = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; -#endif /*#if JETBRAINS_MONO_EXTRABOLD_COMPRESSEDEXTRABOLD_COMPRESSED*/ +#endif /*#if JETBRAINS_MONO_EXTRABOLD_COMPRESSED*/ diff --git a/src/DisplayApp/LittleVgl.cpp b/src/DisplayApp/LittleVgl.cpp index c4fa1793..59334931 100644 --- a/src/DisplayApp/LittleVgl.cpp +++ b/src/DisplayApp/LittleVgl.cpp @@ -12,6 +12,11 @@ using namespace Pinetime::Components; +extern "C" { +LV_FONT_DECLARE(jetbrains_mono_extrabold_compressed) +LV_FONT_DECLARE(jetbrains_mono_bold_20) +} + static void disp_flush(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t * color_p) { auto* lvgl = static_cast(disp_drv->user_data); lvgl->FlushDisplay(area, color_p); @@ -135,8 +140,7 @@ void LittleVgl::InitTheme() { } void LittleVgl::InitBaseTheme() { - if(font == nullptr) font = LV_FONT_DEFAULT; - + if(font == nullptr) font = &jetbrains_mono_bold_20; lv_style_copy(&def, &lv_style_plain); /*Initialize the default style*/ def.text.font = font; diff --git a/src/DisplayApp/Screens/Clock.cpp b/src/DisplayApp/Screens/Clock.cpp index f0bd8338..1dff88c2 100644 --- a/src/DisplayApp/Screens/Clock.cpp +++ b/src/DisplayApp/Screens/Clock.cpp @@ -7,7 +7,7 @@ #include "../DisplayApp.h" using namespace Pinetime::Applications::Screens; -extern lv_font_t jetbrains_mono_extrabold_compressedextrabold_compressed; +extern lv_font_t jetbrains_mono_extrabold_compressed; extern lv_font_t jetbrains_mono_bold_20; static void event_handler(lv_obj_t * obj, lv_event_t event) { @@ -33,7 +33,7 @@ Clock::Clock(DisplayApp* app, labelStyle->text.font = &jetbrains_mono_bold_20; lv_style_copy(&labelBigStyle, labelStyle); - labelBigStyle.text.font = &jetbrains_mono_extrabold_compressedextrabold_compressed; + labelBigStyle.text.font = &jetbrains_mono_extrabold_compressed; lv_label_set_style(label_battery, LV_LABEL_STYLE_MAIN, labelStyle); diff --git a/src/DisplayApp/Screens/Gauge.cpp b/src/DisplayApp/Screens/Gauge.cpp index 33f76a74..4c4cccd9 100644 --- a/src/DisplayApp/Screens/Gauge.cpp +++ b/src/DisplayApp/Screens/Gauge.cpp @@ -3,7 +3,7 @@ #include "../DisplayApp.h" using namespace Pinetime::Applications::Screens; -extern lv_font_t jetbrains_mono_extrabold_compressedextrabold_compressed; +extern lv_font_t jetbrains_mono_extrabold_compressed; extern lv_font_t jetbrains_mono_bold_20; diff --git a/src/DisplayApp/Screens/Meter.cpp b/src/DisplayApp/Screens/Meter.cpp index 9daafad3..c74b8bdf 100644 --- a/src/DisplayApp/Screens/Meter.cpp +++ b/src/DisplayApp/Screens/Meter.cpp @@ -3,7 +3,7 @@ #include "../DisplayApp.h" using namespace Pinetime::Applications::Screens; -extern lv_font_t jetbrains_mono_extrabold_compressedextrabold_compressed; +extern lv_font_t jetbrains_mono_extrabold_compressed; extern lv_font_t jetbrains_mono_bold_20; diff --git a/src/DisplayApp/Screens/Modal.cpp b/src/DisplayApp/Screens/Modal.cpp index 13bd42fa..7a0264e3 100644 --- a/src/DisplayApp/Screens/Modal.cpp +++ b/src/DisplayApp/Screens/Modal.cpp @@ -3,7 +3,7 @@ #include "../DisplayApp.h" using namespace Pinetime::Applications::Screens; -extern lv_font_t jetbrains_mono_extrabold_compressedextrabold_compressed; +extern lv_font_t jetbrains_mono_extrabold_compressed; extern lv_font_t jetbrains_mono_bold_20; Modal::Modal(Pinetime::Applications::DisplayApp *app) : Screen(app) { -- cgit v1.2.3-70-g09d2 From 824b8a7ebd0e8b4f876dd12f564e89238a1bb1b4 Mon Sep 17 00:00:00 2001 From: JF Date: Mon, 2 Mar 2020 20:12:46 +0100 Subject: Move version display from Clock screen to the modal window (accessible from tile menu) --- src/DisplayApp/Screens/Clock.cpp | 13 +------------ src/DisplayApp/Screens/Modal.cpp | 7 +++++-- src/DisplayApp/Screens/Tile.cpp | 2 +- 3 files changed, 7 insertions(+), 15 deletions(-) (limited to 'src/DisplayApp/Screens/Modal.cpp') diff --git a/src/DisplayApp/Screens/Clock.cpp b/src/DisplayApp/Screens/Clock.cpp index 1dff88c2..7051c433 100644 --- a/src/DisplayApp/Screens/Clock.cpp +++ b/src/DisplayApp/Screens/Clock.cpp @@ -48,11 +48,7 @@ Clock::Clock(DisplayApp* app, label_date = lv_label_create(lv_scr_act(), NULL); lv_label_set_style(label_date, LV_LABEL_STYLE_MAIN, labelStyle); - lv_obj_align(label_date, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 80); - - label_version = lv_label_create(lv_scr_act(), NULL); - lv_label_set_style(label_version, LV_LABEL_STYLE_MAIN, labelStyle); - lv_obj_align(label_version, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 100); + lv_obj_align(label_date, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 60); backgroundLabel = lv_label_create(lv_scr_act(), NULL); backgroundLabel->user_data = this; @@ -140,13 +136,6 @@ bool Clock::Refresh() { } } - if(version.IsUpdated()) { - auto dummy = version.Get(); - char versionStr[20]; - sprintf(versionStr, "VERSION: %d.%d.%d", Version::Major(), Version::Minor(), Version::Patch()); - lv_label_set_text(label_version, versionStr); - } - return running; } diff --git a/src/DisplayApp/Screens/Modal.cpp b/src/DisplayApp/Screens/Modal.cpp index 7a0264e3..fc353c49 100644 --- a/src/DisplayApp/Screens/Modal.cpp +++ b/src/DisplayApp/Screens/Modal.cpp @@ -36,12 +36,15 @@ void Modal::Show() { lv_obj_set_size(obj, LV_HOR_RES, LV_VER_RES); lv_obj_set_opa_scale_enable(obj, true); /* Enable opacity scaling for the animation */ - static const char * btns2[] = {"Ok", "Cancel", ""}; + static const char * btns2[] = {"Ok", ""}; /* Create the message box as a child of the modal background */ mbox = lv_mbox_create(obj, NULL); lv_mbox_add_btns(mbox, btns2); - lv_mbox_set_text(mbox, "Hello world!"); + char versionStr[20]; + sprintf(versionStr, "VERSION: %d.%d.%d", Version::Major(), Version::Minor(), Version::Patch()); + lv_mbox_set_text(mbox, versionStr); +// lv_mbox_set_text(mbox, "Hello world!"); lv_obj_align(mbox, NULL, LV_ALIGN_CENTER, 0, 0); lv_obj_set_event_cb(mbox, Modal::mbox_event_cb); diff --git a/src/DisplayApp/Screens/Tile.cpp b/src/DisplayApp/Screens/Tile.cpp index 72fe35bc..004c8d31 100644 --- a/src/DisplayApp/Screens/Tile.cpp +++ b/src/DisplayApp/Screens/Tile.cpp @@ -16,7 +16,7 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) { screen->OnObjectEvent(obj, event, eventData); } -static const char * btnm_map1[] = {"Meter", "Gauge", "Clock", "\n", "MsgBox", "App2", "App3", ""}; +static const char * btnm_map1[] = {"Meter", "Gauge", "Clock", "\n", "Soft\nversion", "App2", "App3", ""}; Tile::Tile(DisplayApp* app) : Screen(app) { modal.reset(new Modal(app)); -- cgit v1.2.3-70-g09d2