shark/greenhouse
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug fixes, bump version to 0.3.6

Browse Source
This commit is contained in:
ThirstyShark 2019-05-19 21:24:42 -05:00
parent e40e51849c
commit 059869cf73
3 changed files with 6025 additions and 6002 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Greenhouse.ino
View File

@ -230,7 +230,7 @@ void setup(void) {
} }
clearLog(); clearLog();
printFastCText("Booting GreenhouseOS..."); printFastCText("Booting GreenhouseOS...");
printFastCText("Version: 0.3.5"); printFastCText("Version: 0.3.6");
printFastCText(""); printFastCText("");
delay(250); delay(250);
if(!didDraw) { if(!didDraw) {
@ -341,6 +341,10 @@ void loop(void) {
String out = "Water Level:"; String out = "Water Level:";
tft.drawString(out.c_str(), 2, 2, 2); tft.drawString(out.c_str(), 2, 2, 2);
checkBat(); checkBat();
printFastCText("[ INFO ] Exited debug mode.");
} else {
printFastCText("[ INFO ] Switched to debug mode.");
delay(500);
} }
} }
} }
@ -929,7 +933,7 @@ void button(int x, int y) {
upd = true; upd = true;
go = true; go = true;
} }
delay(250);
} }
} }
else if (menu == 1) { else if (menu == 1) {
@ -938,9 +942,6 @@ void button(int x, int y) {
pinMode(9, OUTPUT); pinMode(9, OUTPUT);
digitalWrite(9, LOW); // RESET digitalWrite(9, LOW); // RESET
} }
if (y == 0) {
//do nothing
}
if (x == 1 && y == 1) { if (x == 1 && y == 1) {
menu = 0; menu = 0;
upd = true; upd = true;
@ -1016,7 +1017,7 @@ void button(int x, int y) {
updBoxMenu(dispbox); updBoxMenu(dispbox);
} }
} }
delay(175); delay(50);
} }
void displayText(int x, int y, boolean center, String text, int size) { void displayText(int x, int y, boolean center, String text, int size) {

6007
Greenhouse.ino.mega.hex
View File

File diff suppressed because it is too large Load Diff

6007
Greenhouse.ino.with_bootloader.mega.hex
View File

File diff suppressed because it is too large Load Diff