haui/InfiniTime_mirror
1
0
Fork 1
mirror of https://github.com/InfiniTimeOrg/InfiniTime.git synced 2024-10-22 15:11:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed random #'s from the text values

Browse source
This commit is contained in:
JustScott 2024-02-03 14:13:58 -06:00
parent 53c53c6512
commit faae3e0ff5
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/displayapp/screens/WatchFaceTerminal.cpp
View file

@ -117,7 +117,7 @@ void WatchFaceTerminal::Refresh() {
hour = hour - 12; hour = hour - 12;
ampmChar[0] = 'P'; ampmChar[0] = 'P';
} }
lv_label_set_text_fmt(label_time, "[TIME] %02d:%02d:%02d %s#", hour, minute, second, ampmChar); lv_label_set_text_fmt(label_time, "[TIME] %02d:%02d:%02d %s", hour, minute, second, ampmChar);
} else { } else {
lv_label_set_text_fmt(label_time, "[TIME] %02d:%02d:%02d", hour, minute, second); lv_label_set_text_fmt(label_time, "[TIME] %02d:%02d:%02d", hour, minute, second);
} }
@ -127,7 +127,7 @@ void WatchFaceTerminal::Refresh() {
uint16_t year = dateTimeController.Year(); uint16_t year = dateTimeController.Year();
Controllers::DateTime::Months month = dateTimeController.Month(); Controllers::DateTime::Months month = dateTimeController.Month();
uint8_t day = dateTimeController.Day(); uint8_t day = dateTimeController.Day();
lv_label_set_text_fmt(label_date, "[DATE] %04d-%02d-%02d#", short(year), char(month), char(day)); lv_label_set_text_fmt(label_date, "[DATE] %04d-%02d-%02d", short(year), char(month), char(day));
} }
} }
@ -170,7 +170,7 @@ void WatchFaceTerminal::Refresh() {
stepCount = motionController.NbSteps(); stepCount = motionController.NbSteps();
if (stepCount.IsUpdated()) { if (stepCount.IsUpdated()) {
lv_label_set_text_fmt(stepValue, "[STEP] %lu steps#", stepCount.Get()); lv_label_set_text_fmt(stepValue, "[STEP] %lu steps", stepCount.Get());
} }
@ -180,9 +180,9 @@ void WatchFaceTerminal::Refresh() {
if (heartbeatRunning.Get()) { if (heartbeatRunning.Get()) {
lv_obj_set_style_local_text_color(heartbeatValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::deepOrange); lv_obj_set_style_local_text_color(heartbeatValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::deepOrange);
lv_label_set_text_fmt(heartbeatValue, "[L_HR] %d bpm#", heartbeat.Get()); lv_label_set_text_fmt(heartbeatValue, "[L_HR] %d bpm", heartbeat.Get());
} else { } else {
lv_label_set_text_static(heartbeatValue, "[L_HR] ---#"); lv_label_set_text_static(heartbeatValue, "[L_HR] ---");
lv_obj_set_style_local_text_color(heartbeatValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::gray); lv_obj_set_style_local_text_color(heartbeatValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::gray);
} }
} }
@ -191,14 +191,14 @@ void WatchFaceTerminal::Refresh() {
bleRadioEnabled = bleController.IsRadioEnabled(); bleRadioEnabled = bleController.IsRadioEnabled();
if (bleState.IsUpdated() || bleRadioEnabled.IsUpdated()) { if (bleState.IsUpdated() || bleRadioEnabled.IsUpdated()) {
if (!bleRadioEnabled.Get()) { if (!bleRadioEnabled.Get()) {
lv_label_set_text_static(connectState, "[STAT] Disabled#"); lv_label_set_text_static(connectState, "[STAT] Disabled");
lv_obj_set_style_local_text_color(connectState, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::gray); lv_obj_set_style_local_text_color(connectState, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::gray);
} else { } else {
if (bleState.Get()) { if (bleState.Get()) {
lv_label_set_text_static(connectState, "[STAT] Connected#"); lv_label_set_text_static(connectState, "[STAT] Connected");
lv_obj_set_style_local_text_color(connectState, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::blue); lv_obj_set_style_local_text_color(connectState, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::blue);
} else { } else {
lv_label_set_text_static(connectState, "[STAT] Disconnected#"); lv_label_set_text_static(connectState, "[STAT] Disconnected");
lv_obj_set_style_local_text_color(connectState, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::gray); lv_obj_set_style_local_text_color(connectState, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::gray);
} }
} }