From 98e13492eadafcc6ccb4e677843f6ddb74219329 Mon Sep 17 00:00:00 2001 From: Moirtz Wagner Date: Sun, 9 Nov 2025 12:06:07 +0100 Subject: [PATCH] bugfix and arc rescale --- Raumtermostat/src/ui/actions.cpp | 8 ++++---- Raumtermostat/src/ui/screens.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Raumtermostat/src/ui/actions.cpp b/Raumtermostat/src/ui/actions.cpp index 570b6a1..30200ae 100644 --- a/Raumtermostat/src/ui/actions.cpp +++ b/Raumtermostat/src/ui/actions.cpp @@ -46,14 +46,14 @@ static void alarm_ani_end_cb(lv_anim_t *var) } void ui_settemp(float tmp){ - lv_arc_set_value(objects.temp_arc, (int32_t) (tmp*2)); + lv_arc_set_value(objects.temp_arc, (int32_t) (tmp)); } void update_status(void){ tm timeinfo; getLocalTime(&timeinfo); char buffer[15]; - strftime(buffer, sizeof(buffer), "%R", &timeinfo); + strftime(buffer, sizeof(buffer), "%H : %M", &timeinfo); static unsigned long fullOnTime = millis(); lv_label_set_text_fmt(objects.press_txt,"%4.2f hPa",glblData.seaLevelPress); lv_label_set_text_fmt(objects.hum_txt,"%2.0f %%rH",glblData.hum); @@ -62,7 +62,7 @@ void update_status(void){ if(!arc_pressed && !animating){ lv_label_set_text_fmt(objects.temp_txt,"%2.1f °C",glblData.temp); }else{ - glblData.settemp = lv_arc_get_value(objects.temp_arc)/2.0; + glblData.settemp = lv_arc_get_value(objects.temp_arc); lv_label_set_text_fmt(objects.temp_txt,"%2.1f °C",glblData.settemp); } if(glblData.enBuff){ @@ -180,7 +180,7 @@ void chartDrawingCB(lv_event_t * e){ draw_line_dsc.dash_gap = 1; draw_line_dsc.dash_width = 2; draw_line_dsc.p1.x = chart_obj_coords.x1+5; - draw_line_dsc.p1.y = lv_obj_get_y2(objects.y_scale) - (lv_obj_get_height(objects.y_scale)*(lv_arc_get_value(objects.temp_arc)-scale_min*2)*5)/((scale_max-scale_min)*10) -1; + draw_line_dsc.p1.y = lv_obj_get_y2(objects.y_scale) - (lv_obj_get_height(objects.y_scale)*(lv_arc_get_value(objects.temp_arc)-scale_min)*10)/((scale_max-scale_min)*10) -1; draw_line_dsc.p2.x = chart_obj_coords.x2-5; draw_line_dsc.p2.y = draw_line_dsc.p1.y; lv_draw_line(layer,&draw_line_dsc); diff --git a/Raumtermostat/src/ui/screens.c b/Raumtermostat/src/ui/screens.c index 16162b0..9e5f253 100644 --- a/Raumtermostat/src/ui/screens.c +++ b/Raumtermostat/src/ui/screens.c @@ -43,7 +43,7 @@ void create_screen_main() { objects.temp_arc = obj; lv_obj_set_pos(obj, 15, 15); lv_obj_set_size(obj, 210, 210); - lv_arc_set_range(obj, 10*2, 30*2); + lv_arc_set_range(obj, 10, 30); lv_arc_set_value(obj, 23*2); lv_obj_add_event_cb(obj, action_zoom_set_temp, LV_EVENT_PRESSED, (void *)1); lv_obj_add_event_cb(obj, action_zoom_set_temp, LV_EVENT_RELEASED, (void *)0);