diff --git a/src/display.cpp b/src/display.cpp index 05a11c8..84061f4 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -50,8 +50,8 @@ void display_setup(bool set_show_temp_outside, char lang[2]) { set_display_language(lang); } -void display_globals(float temperature_outside) { - temperature_outside = temperature_outside; +void display_temp_outside(float mqtt_temp_outside) { + temperature_outside = mqtt_temp_outside; } void display_begin() { @@ -107,10 +107,11 @@ void display_header(char* TEXT) { display.setFont(u8g2_font_6x10_tr); display.drawStr(2,7,TEXT); display.drawLine(0, 8, 128, 8); - display.drawLine(100, 0, 100, 8); + display.drawLine(94, 0, 94, 8); + display.drawLine(62, 0, 62, 8); if (show_temp_outside) { - display.setCursor(70,7); display.print(temperature_outside,1); + display.setCursor(70,7); display.print(temperature_outside,1); display.print("C"); } } diff --git a/src/display.h b/src/display.h index 78e0569..41b01a0 100644 --- a/src/display.h +++ b/src/display.h @@ -23,7 +23,7 @@ ; THE SOFTWARE. */ void display_setup(bool set_show_temp_outside,char lang[2]); -void display_globals(float temperature_outside); +void display_temp_outside(float temperature_outside); void display_begin(); void display_init(char* VERSION); void display_logo(); diff --git a/src/lang.cpp b/src/lang.cpp index 543890d..41463c2 100644 --- a/src/lang.cpp +++ b/src/lang.cpp @@ -37,6 +37,6 @@ void set_display_language(char lang[2]) { title_pv = (char*)"PV modules"; title_battery = (char*)"Battery"; - title_grid = (char*)"Grid overview"; + title_grid = (char*)"Grid"; } } \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index f9b3801..4570e7c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -60,7 +60,7 @@ char address_grid_meter[6] = ""; char address_inverter[6] = ""; char address_battery[6] = ""; char address_outside_temperature[6] = ""; -char display_lang[2] = ""; +char display_lang[6] = ""; long unsigned int DISPLAY_REFRESH_INTERVAL; long unsigned int DISPLAY_SCREEN_INTERVAL; @@ -207,7 +207,7 @@ void callback(char* topic, byte* message, unsigned int length) { if (String(topic) == mqtt_temp_outside) { DynamicJsonDocument json(512); deserializeJson(json, messageTemp); - display_globals(json["value"]); + display_temp_outside(json["value"]); } //System - AC Load Phase 1 @@ -353,7 +353,7 @@ void setup() { WiFiManagerParameter custom_address_inverter("address_inverter", "Address of vebus inverter", address_inverter, 6); WiFiManagerParameter custom_address_battery("address_battery", "Address of can battery", address_battery, 6); WiFiManagerParameter custom_address_outside_temperature("address_outside_temperature", "Address of outside temperature", address_outside_temperature, 6); - WiFiManagerParameter custom_display_lang("display_lang", "Display language en, de", display_lang, 2); + WiFiManagerParameter custom_display_lang("display_lang", "Display language en, de", display_lang, 6); WiFiManager wm; wm.setSaveConfigCallback(saveConfigCallback);