diff options
| author | Michele Bini <michele.bini@gmail.com> | 2022-03-27 20:41:04 (GMT) |
|---|---|---|
| committer | Michele Bini <michele.bini@gmail.com> | 2022-03-27 20:41:04 (GMT) |
| commit | a2b714f9f8b48f85e345b7aa5b57b4cbda667ffe (patch) | |
| tree | 01992de18a9fe6c1372f12123adfd40a9109f9ee /src/displayapp/screens/WatchFaceDigital.cpp | |
| parent | 4f81b59e2cd453c1a9422fb1f45d2cd27d52b2a3 (diff) | |
| parent | 2fb00c8d012837af7afa93add7d895a34a588cab (diff) | |
Merge ../../InfiniTime into ultraredux
# Conflicts:
# src/displayapp/screens/WatchFaceDigital.cpp
Diffstat (limited to 'src/displayapp/screens/WatchFaceDigital.cpp')
| -rw-r--r-- | src/displayapp/screens/WatchFaceDigital.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp index 56409d0..0bb2bf6 100644 --- a/src/displayapp/screens/WatchFaceDigital.cpp +++ b/src/displayapp/screens/WatchFaceDigital.cpp @@ -62,7 +62,7 @@ WatchFaceDigital::WatchFaceDigital(DisplayApp* app, 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(batteryIcon, "T? [?,?]"); + 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); @@ -119,8 +119,8 @@ void WatchFaceDigital::Refresh() { lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(notificationState.Get())); } - systemTask.motionSensor.RefreshTemperature(); - lv_label_set_text_fmt(batteryIcon, "T%d [%d,%d]", + // systemTask.motionSensor.RefreshTemperature(); + 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)) |