siwat
/
waterish_os_rev3_public
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update WaterishOS-core2.0.ino

This commit is contained in:
Siwat Sirichai 2019-08-12 16:33:05 +07:00
parent 9de580ad46
commit f7a82de2e5
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
WaterishOS-core2.0/WaterishOS-core2.0.ino
View File

@ -33,6 +33,7 @@ PubSubClientTools mqtt(client);
ThreadController threadControl = ThreadController(); ThreadController threadControl = ThreadController();
Thread mqttupdater = Thread(); Thread mqttupdater = Thread();
Thread datacollector = Thread(); Thread datacollector = Thread();
Thread lcdmanager = Thread();
boolean online = true; boolean online = true;
FlowMeter sensorA[6] = FlowMeter(1); FlowMeter sensorA[6] = FlowMeter(1);
FlowMeter sensorB[6] = FlowMeter(3); FlowMeter sensorB[6] = FlowMeter(3);
@ -45,15 +46,11 @@ void writelcd(String line1, String line2){
lcd.setCursor(0,1); lcd.setCursor(0,1);
lcd.print(line2); lcd.print(line2);
} }
void drawmenu() void updatelcd()
{ {
switch (menu) writelcd("Waterish OS S[A]",String(sensorA[0].getCurrentFlowrate())+" "+String(sensorA[1].getCurrentFlowrate())+" "+String(sensorA[2].getCurrentFlowrate())+" "+" "+String(sensorA[3].getCurrentFlowrate())+" "+String(sensorA[4].getCurrentFlowrate())+" "+String(sensorA[5].getCurrentFlowrate()));
{ delay(5000);
case '1': writelcd("Waterish OS S[B]",String(sensorB[0].getCurrentFlowrate())+" "+String(sensorB[1].getCurrentFlowrate())+" "+String(sensorB[2].getCurrentFlowrate())+" "+" "+String(sensorB[3].getCurrentFlowrate())+" "+String(sensorB[4].getCurrentFlowrate())+" "+String(sensorB[5].getCurrentFlowrate()));
lcd.print(" Waterish OS OK ");
break;
}
} }
void ICACHE_RAM_ATTR readA() { void ICACHE_RAM_ATTR readA() {
uint8_t pin = mcp.getLastInterruptPin(); uint8_t pin = mcp.getLastInterruptPin();
@ -114,11 +111,16 @@ void setup() {
writelcd("Boot Sequence P3"," Success!"); writelcd("Boot Sequence P3"," Success!");
delay(2000); delay(2000);
writelcd("Waterish OS a3.9","Reading Sensors"); writelcd("Waterish OS a3.9","Reading Sensors");
delay(1000);
datacollector.onRun(collectdata); datacollector.onRun(collectdata);
datacollector.setInterval(1000); datacollector.setInterval(1000);
if(online)mqttupdater.onRun(updatemqtt); if(online)mqttupdater.onRun(updatemqtt);
if(online)mqttupdater.setInterval(1000); if(online)mqttupdater.setInterval(1000);
lcdmanager.onRun(updatelcd);
lcdmanager.setInterval(5000);
threadControl.add(&datacollector); threadControl.add(&datacollector);
threadControl.add(&lcdmanager);
if(online)threadControl.add(&mqttupdater); if(online)threadControl.add(&mqttupdater);
} }