C3MA/PlantCtrl
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/0110/PlantCtrl into master

Browse Source
This commit is contained in:
Empire 2020-10-20 18:41:44 +02:00
commit af3d64cf12
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
esp32/platformio.ini
View File

@ -18,5 +18,5 @@ board_build.partitions = huge_app.csv
; the latest development brankitchen-lightch (convention V3.0.x) ; the latest development brankitchen-lightch (convention V3.0.x)
lib_deps = https://github.com/homieiot/homie-esp8266.git#v3.0 lib_deps = https://github.com/homieiot/homie-esp8266.git#v3.0
OneWire OneWire
upload_port = /dev/ttyUSB0 upload_port = /dev/ttyUSB0

12
esp32/src/main.cpp
View File

@ -16,6 +16,7 @@
#include "time.h" #include "time.h"
#include "esp_sleep.h" #include "esp_sleep.h"
#include "RunningMedian.h" #include "RunningMedian.h"
#include <arduino-timer.h>
const unsigned long TEMPREADCYCLE = 30000; /**< Check temperature all half minutes */ const unsigned long TEMPREADCYCLE = 30000; /**< Check temperature all half minutes */
@ -65,6 +66,9 @@ int readCounter = 0;
int mButtonClicks = 0; int mButtonClicks = 0;
bool mConfigured = false; bool mConfigured = false;
auto wait4sleep = timer_create_default(); // create a timer with default settings
RTC_DATA_ATTR int gBootCount = 0; RTC_DATA_ATTR int gBootCount = 0;
RTC_DATA_ATTR int gCurrentPlant = 0; /**< Value Range: 1 ... 7 (0: no plant needs water) */ RTC_DATA_ATTR int gCurrentPlant = 0; /**< Value Range: 1 ... 7 (0: no plant needs water) */
@ -104,9 +108,10 @@ long getCurrentTime(){
} }
//wait till homie flushed mqtt ect. //wait till homie flushed mqtt ect.
void prepareSleep() { bool prepareSleep(void *) {
//FIXME wait till pending mqtt is done, then start sleep via event or whatever //FIXME wait till pending mqtt is done, then start sleep via event or whatever
//Homie.prepareToSleep(); //Homie.prepareToSleep();
return true; // repeat? true there is something in the queue to be done
} }
void mode2MQTT(){ void mode2MQTT(){
@ -127,7 +132,8 @@ void mode2MQTT(){
/* let the ESP sleep qickly, as nothing must be done */ /* let the ESP sleep qickly, as nothing must be done */
if ((millis() >= (MIN_TIME_RUNNING * MS_TO_S)) && (deepSleepTime.get() > 0)) { if ((millis() >= (MIN_TIME_RUNNING * MS_TO_S)) && (deepSleepTime.get() > 0)) {
Serial << "No Water for pumps" << endl; Serial << "No Water for pumps" << endl;
t.after(50, prepareSleep); /* in 500 microseconds */
wait4sleep.in(500, prepareSleep);
return; return;
} }
} }
@ -155,7 +161,7 @@ void mode2MQTT(){
bool lipoTempWarning = abs(temp[1] - temp[2]) > 5; bool lipoTempWarning = abs(temp[1] - temp[2]) > 5;
if(lipoTempWarning){ if(lipoTempWarning){
t.after(50, prepareSleep); wait4sleep.in(500, prepareSleep);
return; return;
} }