Display layout optimization
This commit is contained in:
parent
3231d46994
commit
3392138f6f
|
@ -251,9 +251,11 @@ void display_screen_graph(float *values, char* key, int buffersize)
|
|||
display.firstPage();
|
||||
do {
|
||||
display_header(title_graph);
|
||||
display.drawLine(15, 60, 9, 60); //X mark
|
||||
display.drawLine(16, 60, 9, 60); //X mark
|
||||
display.drawLine(15, 8, 15, 62); //Y boarder
|
||||
display.drawStr(7,63, "0");
|
||||
display.drawStr(7,34, "k");
|
||||
display.drawStr(7,46, "W");
|
||||
display.drawLine(13, 36, 15, 36); //marker Y 5
|
||||
display.drawLine(13, 13, 15, 13); //marker Y 1
|
||||
|
||||
|
@ -289,13 +291,29 @@ void display_screen_graph(float *values, char* key, int buffersize)
|
|||
if (max > 14000) { graph_max_kW = 15000; }
|
||||
if (max > 15000) { graph_max_kW = 16000; }
|
||||
if (max > 16000) { graph_max_kW = 17000; }
|
||||
display.setCursor(7,17);
|
||||
|
||||
if ((graph_max_kW/1000) < 10)
|
||||
{
|
||||
display.setCursor(7,17);
|
||||
}
|
||||
else
|
||||
{
|
||||
display.setCursor(1,17);
|
||||
}
|
||||
display.print(graph_max_kW/1000);
|
||||
|
||||
for (int i = 0; i<buffersize; i++)
|
||||
{
|
||||
display.drawLine((15+i), 60, (15+i), map(values[i], 0, graph_max_kW, 60, 13));
|
||||
}
|
||||
display.drawStr(117, 17, key);
|
||||
|
||||
if (strlen(key) < 3) {
|
||||
display.drawStr(117, 17, key);
|
||||
}
|
||||
else
|
||||
{
|
||||
display.drawStr(111, 17, key);
|
||||
}
|
||||
|
||||
} while ( display.nextPage() );
|
||||
}
|
Loading…
Reference in New Issue