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

add timer only mode, more sane default config

Browse Source
This commit is contained in:
Empire
2022-05-20 01:00:04 +02:00
parent 5dedc76727
commit 662d7bc853
5 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
esp32/src/PlantCtrl.cpp
View File

@@ -31,7 +31,7 @@ void Plant::init(void)
/* Initialize Home Settings validator */
this->mSetting->pSensorDry->setDefaultValue(DEACTIVATED_PLANT);
this->mSetting->pSensorDry->setValidator([](long candidate)
{ return (((candidate >= 0.0) && (candidate <= 100.0)) || equalish(candidate, DEACTIVATED_PLANT) || equalish(candidate, HYDROPONIC_MODE)); });
{ return (((candidate >= 0.0) && (candidate <= 100.0)) || equalish(candidate, DEACTIVATED_PLANT) || equalish(candidate, HYDROPONIC_MODE) || equalish(candidate, TIMER_ONLY)); });
this->mSetting->pPumpAllowedHourRangeStart->setDefaultValue(8); // start at 8:00
this->mSetting->pPumpAllowedHourRangeStart->setValidator([](long candidate)

6
esp32/src/main.cpp
View File

@@ -460,7 +460,7 @@ int determineNextPump(bool isLowLight)
log(LOG_LEVEL_DEBUG, String(String(i) + " No pump required: due to light"), LOG_DEBUG_CODE);
continue;
}
if (!plant.isHydroponic())
if (! (plant.isHydroponic() || plant.isTimerOnly()))
{
if (equalish(plant.getCurrentMoistureRaw(), MISSING_SENSOR))
{
@@ -497,7 +497,7 @@ int determineNextPump(bool isLowLight)
}
}
if (!plant.isHydroponic())
if (! (plant.isHydroponic() || plant.isTimerOnly()))
{
consecutiveWateringPlant[i]++;
}
@@ -1137,9 +1137,11 @@ bool determineTimedLightState(bool lowLight)
}
int curHour = getCurrentHour();
bool condition1 = ((hoursStart > hoursEnd) &&
(curHour >= hoursStart || curHour <= hoursEnd));
bool condition2 = /* Handle e.g. start = 8, end = 21 */
((hoursStart < hoursEnd) &&
(curHour >= hoursStart && curHour <= hoursEnd));
timedLightNode.setProperty("debug").send(String(curHour) + " " + String(hoursStart) + " " + String(hoursEnd) + " " + String(condition1) + " " + String(condition2));