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

Cleanup unused variables and code

Browse Source
This commit is contained in:
Ollo 2021-04-07 22:42:31 +02:00
parent 658bc7a389
commit 129b2b1478
1 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
esp32/src/main.cpp
View File

@ -38,7 +38,6 @@
******************************************************************************/ ******************************************************************************/
int determineNextPump(); int determineNextPump();
//void setLastActivationForPump(int pumpId, long time);
int readTemp(); int readTemp();
void plantcontrol(); void plantcontrol();
@ -46,30 +45,23 @@ void plantcontrol();
* NON VOLATILE VARIABLES in DEEP SLEEP * NON VOLATILE VARIABLES in DEEP SLEEP
******************************************************************************/ ******************************************************************************/
//only relevant if mode2 did start pumping before
RTC_DATA_ATTR int lastPumpRunning = 0; /**< store last successfully waterd plant */ RTC_DATA_ATTR int lastPumpRunning = 0; /**< store last successfully waterd plant */
RTC_DATA_ATTR long lastWaterValue = 0; /**< to calculate the used water per plant */ RTC_DATA_ATTR long lastWaterValue = 0; /**< to calculate the used water per plant */
RTC_DATA_ATTR int gBootCount = 0;
RTC_DATA_ATTR long rtcLastWateringPlant[MAX_PLANTS] = { 0 }; RTC_DATA_ATTR long rtcLastWateringPlant[MAX_PLANTS] = { 0 };
/****************************************************************************** /******************************************************************************
* LOCAL VARIABLES * LOCAL VARIABLES
******************************************************************************/ ******************************************************************************/
bool volatile mode3Active = false; /**< Controller must not sleep */ bool volatile mDownloadMode = false; /**< Controller must not sleep */
bool volatile mDeepsleep = false; bool volatile mDeepsleep = false; /**< about to sleep, clearing the todolist of the controller */
bool volatile mSensorsRead = false; /**< Sensors are read without Wifi or MQTT */ bool volatile mSensorsRead = false; /**< Sensors are read without Wifi or MQTT */
int readCounter = 0;
bool mConfigured = false; bool mConfigured = false;
long nextBlink = 0; /**< Time needed in main loop to support expected blink code */ long nextBlink = 0; /**< Time needed in main loop to support expected blink code */
RunningMedian waterRawSensor = RunningMedian(5); RunningMedian waterRawSensor = RunningMedian(5);
float mTempLipo = 0.0f; float mSolarVoltage = 0.0f; /**< Voltage from solar panels */
float mTempWater = 0.0f;
float mBatteryVoltage = 0.0f;
float mSolarVoltage = 0.0f;
float mChipTemp = 0.0f;
/*************************** Hardware abstraction *****************************/ /*************************** Hardware abstraction *****************************/
@ -107,9 +99,9 @@ int getCurrentHour()
void espDeepSleepFor(long seconds, bool activatePump = false) void espDeepSleepFor(long seconds, bool activatePump = false)
{ {
if (mode3Active) if (mDownloadMode)
{ {
Serial << "abort deepsleep, mode3Active" << endl; Serial << "abort deepsleep, DownloadMode active" << endl;
return; return;
} }
for (int i = 0; i < 10; i++) for (int i = 0; i < 10; i++)
@ -230,12 +222,7 @@ void readSensors()
// Update battery chip data // Update battery chip data
battery.update(); battery.update();
mSolarVoltage = battery.getVoltage(BATTSENSOR_INDEX_SOLAR) * SOLAR_VOLT_FACTOR; mSolarVoltage = battery.getVoltage(BATTSENSOR_INDEX_SOLAR) * SOLAR_VOLT_FACTOR;
mBatteryVoltage = battery.getVoltage(BATTSENSOR_INDEX_BATTERY);
mChipTemp = battery.getTemperature();
// if(mBatteryVoltage < MINIMUM_LIPO_VOLT){
// Serial.println("Low lipo voltage, abort high level processing");
// }
for (int readCnt = 0; readCnt < AMOUNT_SENOR_QUERYS; readCnt++) for (int readCnt = 0; readCnt < AMOUNT_SENOR_QUERYS; readCnt++)
{ {
for (int i = 0; i < MAX_PLANTS; i++) for (int i = 0; i < MAX_PLANTS; i++)
@ -258,7 +245,6 @@ void onHomieEvent(const HomieEvent &event)
switch (event.type) switch (event.type)
{ {
case HomieEventType::SENDING_STATISTICS: case HomieEventType::SENDING_STATISTICS:
Homie.getLogger() << "My statistics" << endl;
break; break;
case HomieEventType::MQTT_READY: case HomieEventType::MQTT_READY:
if (mSensorsRead) { if (mSensorsRead) {
@ -288,7 +274,7 @@ void onHomieEvent(const HomieEvent &event)
{ {
mPlants[i].deactivatePump(); mPlants[i].deactivatePump();
} }
mode3Active = true; mDownloadMode = true;
break; break;
case HomieEventType::OTA_SUCCESSFUL: case HomieEventType::OTA_SUCCESSFUL:
Homie.getLogger() << "OTA successfull" << endl; Homie.getLogger() << "OTA successfull" << endl;
@ -362,11 +348,11 @@ bool aliveHandler(const HomieRange &range, const String &value)
return false; // only one controller is present return false; // only one controller is present
if (value.equals("ON") || value.equals("On") || value.equals("1")) if (value.equals("ON") || value.equals("On") || value.equals("1"))
{ {
mode3Active = true; mDownloadMode = true;
} }
else else
{ {
mode3Active = false; mDownloadMode = false;
} }
return true; return true;
@ -495,7 +481,7 @@ void setup()
sensorWater.advertise("remaining").setDatatype(NUMBER_TYPE).setUnit("%"); sensorWater.advertise("remaining").setDatatype(NUMBER_TYPE).setUnit("%");
} else { } else {
Serial.println("Initial Setup. Start Accesspoint..."); Serial.println("Initial Setup. Start Accesspoint...");
mode3Active = true; mDownloadMode = true;
} }
stayAlive.advertise("alive").setName("Alive").setDatatype(NUMBER_TYPE).settable(aliveHandler); stayAlive.advertise("alive").setName("Alive").setDatatype(NUMBER_TYPE).settable(aliveHandler);
} }
@ -507,7 +493,7 @@ void setup()
void loop() void loop()
{ {
/* Toggel Senor LED to visualize mode 3 */ /* Toggel Senor LED to visualize mode 3 */
if (mode3Active) if (mDownloadMode)
{ {
if (nextBlink < millis()) if (nextBlink < millis())
{ {
@ -534,7 +520,7 @@ void loop()
} }
/** Timeout always stopping the ESP -> no endless power consumption */ /** Timeout always stopping the ESP -> no endless power consumption */
if (millis() > 30000 && !mode3Active) if (millis() > 30000 && !mDownloadMode)
{ {
Serial << (millis() / 1000) << "not terminated watchdog reset" << endl; Serial << (millis() / 1000) << "not terminated watchdog reset" << endl;
Serial.flush(); Serial.flush();
@ -589,8 +575,12 @@ void plantcontrol()
Serial << "W : " << waterRawSensor.getAverage() << " cm (" << String(waterLevelMax.get() - waterRawSensor.getAverage()) << "%)" << endl; Serial << "W : " << waterRawSensor.getAverage() << " cm (" << String(waterLevelMax.get() - waterRawSensor.getAverage()) << "%)" << endl;
lastWaterValue = waterRawSensor.getAverage(); lastWaterValue = waterRawSensor.getAverage();
sensorLipo.setProperty("percent").send(String(100 * mBatteryVoltage / VOLT_MAX_BATT)); float batteryVoltage = battery.getVoltage(BATTSENSOR_INDEX_BATTERY);
sensorLipo.setProperty("volt").send(String(mBatteryVoltage)); float chipTemp = battery.getTemperature();
sensorLipo.setProperty("percent").send(String(100 * batteryVoltage / VOLT_MAX_BATT));
sensorLipo.setProperty("volt").send(String(batteryVoltage));
sensorLipo.setProperty("current").send(String(battery.getCurrent())); sensorLipo.setProperty("current").send(String(battery.getCurrent()));
sensorLipo.setProperty("Ah").send(String(battery.getAh())); sensorLipo.setProperty("Ah").send(String(battery.getAh()));
sensorLipo.setProperty("ICA").send(String(battery.getICA())); sensorLipo.setProperty("ICA").send(String(battery.getICA()));
@ -598,8 +588,8 @@ void plantcontrol()
sensorLipo.setProperty("CCA").send(String(battery.getCCA())); sensorLipo.setProperty("CCA").send(String(battery.getCCA()));
sensorSolar.setProperty("volt").send(String(mSolarVoltage)); sensorSolar.setProperty("volt").send(String(mSolarVoltage));
sensorTemp.setProperty(TEMPERATUR_SENSOR_CHIP).send(String(mChipTemp)); sensorTemp.setProperty(TEMPERATUR_SENSOR_CHIP).send(String(chipTemp));
Serial << "Chip Temperatur " << mChipTemp << " °C " << endl; Serial << "Chip Temperatur " << chipTemp << " °C " << endl;
bool hasWater = true; //FIXMEmWaterGone > waterLevelMin.get(); bool hasWater = true; //FIXMEmWaterGone > waterLevelMin.get();
//FIXME no water warning message //FIXME no water warning message
@ -607,10 +597,10 @@ void plantcontrol()
if (lastPumpRunning != -1 && !hasWater) if (lastPumpRunning != -1 && !hasWater)
{ {
Serial.println("Want to pump but no water"); Serial.println("Want to pump but no water");
} }
if (lastPumpRunning != -1 && hasWater) else if (lastPumpRunning != -1 && hasWater)
{ {
if (mode3Active) if (mDownloadMode)
{ {
Serial.println("Mode 3 active, ignoring pump request"); Serial.println("Mode 3 active, ignoring pump request");
} }
@ -622,6 +612,7 @@ void plantcontrol()
} }
} }
/* Always handle one of the deep sleep duration */
if (lastPumpRunning == -1 || !hasWater) if (lastPumpRunning == -1 || !hasWater)
{ {
if (mSolarVoltage < SOLAR_CHARGE_MIN_VOLTAGE) if (mSolarVoltage < SOLAR_CHARGE_MIN_VOLTAGE)