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

mode cleanup

Browse Source
This commit is contained in:
Empire 2020-10-20 18:41:41 +02:00
parent b0829cba6b
commit 01e2839f30
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
esp32/src/main.cpp
View File

@ -47,7 +47,6 @@ RTC_DATA_ATTR long lastWaterValue = 0;
bool warmBoot = true; bool warmBoot = true;
bool mode2Active = false;
bool mode3Active = false; /**< Controller must not sleep */ bool mode3Active = false; /**< Controller must not sleep */
@ -318,7 +317,7 @@ void onHomieEvent(const HomieEvent& event) {
//wait for rtc sync? //wait for rtc sync?
rtcDeepSleepTime = deepSleepTime.get(); rtcDeepSleepTime = deepSleepTime.get();
if(mode2Active){ if(!mode3Active){
mode2MQTT(); mode2MQTT();
} }
Homie.getLogger() << "MQTT connected, preparing for deep sleep after 100ms..." << endl; Homie.getLogger() << "MQTT connected, preparing for deep sleep after 100ms..." << endl;
@ -599,14 +598,12 @@ bool mode1(){
void mode2(){ void mode2(){
Serial.println("Init mode 2"); Serial.println("Init mode 2");
mode2Active = true;
systemInit(); systemInit();
/* Jump into Mode 3, if not configured */ /* Jump into Mode 3, if not configured */
if (!mConfigured) { if (!mConfigured) {
Serial.println("upgrade to mode 3"); Serial.println("upgrade to mode 3");
mode2Active = false;
mode3Active = true; mode3Active = true;
} }
} }
@ -672,6 +669,14 @@ void setup() {
esp_sleep_enable_timer_wakeup(sleepEmptyLipo * 1000U); esp_sleep_enable_timer_wakeup(sleepEmptyLipo * 1000U);
mDeepSleep = true; mDeepSleep = true;
} }
if(mode1()){
mode2();
} else {
Serial.println("Nothing to do back to sleep");
Serial.flush();
esp_deep_sleep_start();
}
} }
/** /**
@ -680,22 +685,7 @@ void setup() {
*/ */
void loop() { void loop() {
/* Perform the active modes (non mode1) */ Homie.loop();
if (mode3Active || mode2Active) {
Homie.loop();
} else {
/* Check which mode shall be selected */
if(warmBoot){
warmBoot = false;
if(mode1()){
mode2();
} else {
Serial.println("Nothing to do back to sleep");
Serial.flush();
esp_deep_sleep_start();
}
}
}
if(millis() > 30000 && !mode3Active){ if(millis() > 30000 && !mode3Active){
Serial << (millis()/ 1000) << "s running; going to suicide ..." << endl; Serial << (millis()/ 1000) << "s running; going to suicide ..." << endl;