Crash_Override
/
ESP_Solar_Monitor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small pixel alignments for v1.0

This commit is contained in:
Carsten Schmiemann 2022-11-28 01:33:02 +01:00
parent e8560f5266
commit caf796c818
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/display.cpp
View File

@ -228,8 +228,17 @@ void display_screen_grid(float grid_power, float consum, float inv_power, float
display_header(title_grid);
display.drawXBM(0,9, grid_width, grid_height, grid_bits);
display.setCursor(10,45); display.print(grid_power,0); display.print("W");
display.setCursor(40,54); display.print(inv_power,0); display.print("W");
display.setCursor(40,63); display.print(inv_current,1); display.print("A");
if (inv_power == 0)
{
display.setCursor(46,54); display.print("OFF");
}
else
{
display.setCursor(40,54); display.print(inv_power,0); display.print("W");
display.setCursor(40,63); display.print(inv_current,1); display.print("A");
}
display.setCursor(87,20); display.print(consum,0); display.print("W");
if (show_pv_chg_screen)
@ -269,12 +278,12 @@ void display_screen_graph(float *values, char* key, int type, int buffersize)
{
display.drawStr(58,17, title_graph_pv);
}
display.drawLine(17, 60, 9, 60); //X mark
display.drawLine(13, 60, 15, 60); //X mark
display.drawLine(15, 10, 15, 62); //Y boarder
display.drawStr(7,63, "0");
display.drawStr(7,64, "0");
display.drawStr(7,34, "k");
display.drawStr(7,46, "W");
display.drawLine(13, 36, 15, 36); //marker Y 5
display.drawLine(13, 36, 15, 36); //marker Y .5
display.drawLine(13, 13, 15, 13); //marker Y 1
for (int i = 25; i<130; i += 10)

12
src/main.cpp
View File

@ -94,7 +94,7 @@ bool display_conf_time_present = false;
bool display_conf_dc_pvcharger_present = false;
bool display_conf_graph_present = false;
bool display_conf_statistics_present = false;
const int display_graph_buffersize = 109;
const int display_graph_buffersize = 110;
float display_graph_ringbuffer_load_1h[display_graph_buffersize] = { 0 };
float display_graph_ringbuffer_load_24h[display_graph_buffersize] = { 0 };
float display_graph_ringbuffer_pv_1h[display_graph_buffersize] = { 0 };
@ -249,21 +249,21 @@ void callback(char* topic, byte* message, unsigned int length) {
DynamicJsonDocument json(512);
deserializeJson(json, messageTemp);
load_ph1 = json["value"];
consum_p = load_ph1 + load_ph2 + load_ph3; //calc consumption on each msg for precision
consum_p = load_ph1 + load_ph2 + load_ph3; //calc consumption on each msg for faster response
}
//System - AC Load Phase 2
if (String(topic) == mqtt_grid_power_l2) {
DynamicJsonDocument json(512);
deserializeJson(json, messageTemp);
load_ph2 = json["value"];
consum_p = load_ph1 + load_ph2 + load_ph3; //calc consumption on each msg for precision
consum_p = load_ph1 + load_ph2 + load_ph3; //calc consumption on each msg for faster response
}
//System - AC Load Phase 3
if (String(topic) == mqtt_grid_power_l3) {
DynamicJsonDocument json(512);
deserializeJson(json, messageTemp);
load_ph3 = json["value"];
consum_p = load_ph1 + load_ph2 + load_ph3; //calc consumption on each msg for precision
consum_p = load_ph1 + load_ph2 + load_ph3; //calc consumption on each msg for faster response
}
}
@ -611,9 +611,9 @@ void setup() {
Serial.print("display dc pc chg present: "); Serial.println(display_conf_dc_pvcharger_present);
Serial.print("display graph present: "); Serial.println(display_conf_graph_present);
Serial.print("display stats present: "); Serial.println(display_conf_statistics_present);
display_text_fullscreen((char*)"Configuration summary", (char*)"GX MQTT Server IP:", mqtt_server, (char*)"GX VRM ID:", gx_vrm_id, (char*)" 1/2");
display_text_fullscreen((char*)"Configuration summary", (char*)"GX MQTT Server IP:", mqtt_server, (char*)"GX VRM ID:", gx_vrm_id, (char*)" 1/2");
delay(3000);
display_text_fullscreen((char*)"Configuration summary", (char*)"Disp. Refresh:", disp_refresh_interval, (char*)"Disp. rotation:", disp_screen_interval, (char*)" 2/2");
display_text_fullscreen((char*)"Configuration summary", (char*)"Disp. Refresh:", disp_refresh_interval, (char*)"Disp. rotation:", disp_screen_interval, (char*)" 2/2");
delay(3000);
lastDispRefreshTime = millis();
lastScreenChangeTime = millis();