Commit e6001eee authored by matt's avatar matt
Browse files

Show project version in About screen

parent 68b6974b
......@@ -6,8 +6,8 @@ const char *about_text =
#elif defined HWVER_DESKTOP
"#ffafff MegaGRRL Desktop#"
#endif
"\nFirmware ver: "FWVER_D
"\n#462dff by# #ffffff kunoichi labs#\n"
"\nFirmware ver: %s\n"
"#462dff by# #ffffff kunoichi labs#\n"
"#462dff //# #ffafff natalie null#\n"
"#00ff00 Copyright 2018-2020#\n"
"#ffff00 https://kunoichilabs.dev#\n\n"
......@@ -53,6 +53,7 @@ const char *about_text =
#include "freertos/task.h"
#include "about.h"
#include "softbar.h"
#include "esp_ota_ops.h"
//static const char* TAG = "Ui_About";
......@@ -70,6 +71,8 @@ uint16_t about_h = 0;
void Ui_About_Setup(lv_obj_t *uiscreen) {
const esp_app_desc_t *esp_app_desc = esp_ota_get_app_description();
LcdDma_Mutex_Take(pdMS_TO_TICKS(1000));
container = lv_cont_create(uiscreen, NULL);
......@@ -89,7 +92,7 @@ void Ui_About_Setup(lv_obj_t *uiscreen) {
lv_label_set_align(about_ta, LV_LABEL_ALIGN_CENTER);
lv_label_set_style(about_ta, LV_LABEL_STYLE_MAIN, &about_ta_style);
lv_label_set_recolor(about_ta, true);
lv_label_set_static_text(about_ta, about_text);
lv_label_set_text_fmt(about_ta, about_text, esp_app_desc->version);
lv_obj_set_pos(about_ta, 0, 250);
about_h = lv_obj_get_height(about_ta);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment