|
|
@ -230,7 +230,7 @@ void setup(void) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
clearLog();
|
|
|
|
clearLog();
|
|
|
|
printFastCText("Booting GreenhouseOS...");
|
|
|
|
printFastCText("Booting GreenhouseOS...");
|
|
|
|
printFastCText("Version: 0.3.6");
|
|
|
|
printFastCText("Version: 0.3.7");
|
|
|
|
printFastCText("");
|
|
|
|
printFastCText("");
|
|
|
|
delay(250);
|
|
|
|
delay(250);
|
|
|
|
if(!didDraw) {
|
|
|
|
if(!didDraw) {
|
|
|
@ -519,7 +519,7 @@ void checkBat() {
|
|
|
|
if(analogRead(1) > 910) {
|
|
|
|
if(analogRead(1) > 910) {
|
|
|
|
out += "Using solar.";
|
|
|
|
out += "Using solar.";
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
out += map(y / 20, 572, 859, 0, 100);
|
|
|
|
out += map(y, 572, 859, 0, 100);
|
|
|
|
out += "%";
|
|
|
|
out += "%";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
drawButton(160, 0, 160, 20, "", ILI9341_WHITE);
|
|
|
|
drawButton(160, 0, 160, 20, "", ILI9341_WHITE);
|
|
|
@ -945,12 +945,14 @@ void button(int x, int y) {
|
|
|
|
if (x == 1 && y == 1) {
|
|
|
|
if (x == 1 && y == 1) {
|
|
|
|
menu = 0;
|
|
|
|
menu = 0;
|
|
|
|
upd = true;
|
|
|
|
upd = true;
|
|
|
|
|
|
|
|
delay(125);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (menu == 2) {
|
|
|
|
else if (menu == 2) {
|
|
|
|
if (x == 1 && y == 1) {
|
|
|
|
if (x == 1 && y == 1) {
|
|
|
|
menu = 0;
|
|
|
|
menu = 0;
|
|
|
|
upd = true;
|
|
|
|
upd = true;
|
|
|
|
|
|
|
|
delay(125);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (menu == 3) {
|
|
|
|
else if (menu == 3) {
|
|
|
@ -962,6 +964,7 @@ void button(int x, int y) {
|
|
|
|
updBoxMenu(2);
|
|
|
|
updBoxMenu(2);
|
|
|
|
updBoxMenu(3);
|
|
|
|
updBoxMenu(3);
|
|
|
|
updBoxMenu(4);
|
|
|
|
updBoxMenu(4);
|
|
|
|
|
|
|
|
delay(125);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
TSPoint p = ts.getPoint();
|
|
|
|
TSPoint p = ts.getPoint();
|
|
|
|
p.x = map(p.x, TS_MINX, TS_MAXX, tft.height(), 0);
|
|
|
|
p.x = map(p.x, TS_MINX, TS_MAXX, tft.height(), 0);
|
|
|
|