diff options
| author | jacqueline <me@jacqueline.id.au> | 2024-01-10 20:32:01 +1100 |
|---|---|---|
| committer | jacqueline <me@jacqueline.id.au> | 2024-01-10 20:34:36 +1100 |
| commit | 55bde70b9651b411ac0135bd4704f5b6972ea799 (patch) | |
| tree | 520e502d62dabab2511a6032c1b29d86d1b1cb55 /src/ui/screen_settings.cpp | |
| parent | 1b2d791a05954fd161376e3ddce0d44f74fcc6c0 (diff) | |
| download | tangara-fw-55bde70b9651b411ac0135bd4704f5b6972ea799.tar.gz | |
add accurate esp and samd versions + expose this info to lua
Diffstat (limited to 'src/ui/screen_settings.cpp')
| -rw-r--r-- | src/ui/screen_settings.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/ui/screen_settings.cpp b/src/ui/screen_settings.cpp index a3a24eeb..3f4c2c46 100644 --- a/src/ui/screen_settings.cpp +++ b/src/ui/screen_settings.cpp @@ -15,6 +15,7 @@ #include "core/lv_obj.h" #include "core/lv_obj_tree.h" #include "display.hpp" +#include "esp_app_desc.h" #include "esp_log.h" #include "core/lv_group.h" @@ -32,6 +33,7 @@ #include "misc/lv_area.h" #include "model_top_bar.hpp" #include "nvs.hpp" +#include "samd.hpp" #include "screen.hpp" #include "themes.hpp" #include "ui_events.hpp" @@ -529,12 +531,13 @@ Storage::Storage(models::TopBar& bar) : MenuScreen(bar, "Storage") { }); } -FirmwareUpdate::FirmwareUpdate(models::TopBar& bar) +FirmwareUpdate::FirmwareUpdate(models::TopBar& bar, drivers::Samd& samd) : MenuScreen(bar, "Firmware Update") { lv_obj_set_flex_align(content_, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER); - label_pair(content_, "SAMD21 FW:", "vIDKLOL"); + auto samd_ver = samd.Version(); + label_pair(content_, "SAMD21 FW:", {samd_ver.data(), samd_ver.size()}); lv_obj_t* spacer = lv_obj_create(content_); lv_obj_set_size(spacer, 1, 4); @@ -549,7 +552,8 @@ FirmwareUpdate::FirmwareUpdate(models::TopBar& bar) spacer = lv_obj_create(content_); lv_obj_set_size(spacer, 1, 8); - label_pair(content_, "ESP32 FW:", "vIDKLOL"); + auto desc = esp_app_get_description(); + label_pair(content_, "ESP32 FW:", desc->version); spacer = lv_obj_create(content_); lv_obj_set_size(spacer, 1, 4); |