Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
matt
MegaGRRL
Commits
e6001eee
Commit
e6001eee
authored
Mar 07, 2021
by
matt
Browse files
Show project version in About screen
parent
68b6974b
Changes
1
Hide whitespace changes
Inline
Side-by-side
firmware/main/ui/about.c
View file @
e6001eee
...
...
@@ -6,8 +6,8 @@ const char *about_text =
#elif defined HWVER_DESKTOP
"#ffafff MegaGRRL Desktop#"
#endif
"
\n
Firmware ver:
"
FWVER_D
"
\n
#462dff by# #ffffff kunoichi labs#
\n
"
"
\n
Firmware 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_tex
t
(
about_ta
,
about_text
);
lv_label_set_
text_fm
t
(
about_ta
,
about_text
,
esp_app_desc
->
version
);
lv_obj_set_pos
(
about_ta
,
0
,
250
);
about_h
=
lv_obj_get_height
(
about_ta
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment