diff options
| -rw-r--r-- | src/displayapp/screens/WatchFaceDigital.cpp | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp index 3fbb373..4641148 100644 --- a/src/displayapp/screens/WatchFaceDigital.cpp +++ b/src/displayapp/screens/WatchFaceDigital.cpp @@ -199,12 +199,6 @@ WatchFaceDigital::WatchFaceDigital(DisplayApp* app, lv_label_set_text_fmt(label_temp, "??°C"); lv_obj_align(label_temp, nullptr, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0); - label_temp = lv_label_create(lv_scr_act(), nullptr); - lv_obj_align(label_temp, lv_scr_act(), LV_ALIGN_CENTER, 0, -60); - lv_obj_set_style_local_text_color( label_temp, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999)); - lv_obj_set_style_local_text_font( label_temp, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &neofont1); - lv_label_set_text_fmt(label_temp, "T? [?,?]"); - label_time = lv_label_create(lv_scr_act(), nullptr); lv_obj_set_style_local_text_font(label_time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &neofont3); lv_label_set_text_fmt(label_time, hhmm_label_text); @@ -346,19 +340,19 @@ void WatchFaceDigital::Refresh() { } #ifndef INFINISIM - temperature = systemTask.motionSensor.temperature_last_read_value+23; - if (temperature.IsUpdated()) { - lv_obj_set_style_local_text_color( label_temp, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999)); - lv_label_set_text_fmt(label_temp, "%d°C", temperature); #if 0 - lv_label_set_text_fmt(label_temp, "T%d [%d,%d]", + lv_label_set_text_fmt(label_temp, "T%d [%d,%d]", ((int)(systemTask.motionSensor.temperature_last_read_value+23)), ((int)(systemTask.motionSensor.temperature_last_result)), - ((int)(systemTask.motionSensor.temperature_read_counter)) - ); -#endif + ((int)(systemTask.motionSensor.temperature_read_counter))); +#else + temperature = systemTask.motionSensor.temperature_last_read_value+23; + if (temperature.IsUpdated()) { + lv_obj_set_style_local_text_color( label_temp, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999)); + lv_label_set_text_fmt(label_temp, "%d°C", temperature.Get()); } #endif +#endif currentDateTime = dateTimeController.CurrentDateTime(); |