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

code refactoring: use the defined states of header file

Browse Source
This commit is contained in:
Ollo 2022-08-21 11:59:50 +02:00
parent 5d24a51bd9
commit c444117853
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
esp32/include/HomieTypes.h
View File

@ -69,9 +69,9 @@ static const char *SENSOR_STRING[] = {
#define PLANTSTATE_STR_NO_SENSOR "nosensor" #define PLANTSTATE_STR_NO_SENSOR "nosensor"
#define PLANTSTATE_STR_WET "wet" #define PLANTSTATE_STR_WET "wet"
#define PLANTSTATE_STR_SUNNY_ALARM "sunny+alarm" #define PLANTSTATE_STR_SUNNY_ALARM "sunny+alarm"
#define PLANTSTATE_STR_ACTIVE_ALARM "activate+alarm" #define PLANTSTATE_STR_ACTIVE_ALARM "active+alarm"
#define PLANTSTATE_STR_ACTIVE_SUPESSED "activate+supressed" #define PLANTSTATE_STR_ACTIVE_SUPESSED "active+supressed"
#define PLANTSTATE_STR_ACTIVE "activate" #define PLANTSTATE_STR_ACTIVE "active"
#define PLANTSTATE_STR_SUNNY "sunny" #define PLANTSTATE_STR_SUNNY "sunny"
#define PLANTSTATE_STR_COOLDOWN_ALARM "cooldown+alarm" #define PLANTSTATE_STR_COOLDOWN_ALARM "cooldown+alarm"
#define PLANTSTATE_STR_COOLDOWN "cooldown" #define PLANTSTATE_STR_COOLDOWN "cooldown"

2
esp32/include/PlantCtrl.h
View File

@ -197,7 +197,7 @@ public:
return this->mSetting->pPumpOnlyWhenLowLight->get(); return this->mSetting->pPumpOnlyWhenLowLight->get();
} }
void publishState(String state); void publishState(int stateNumber, String stateString);
bool switchHandler(const HomieRange &range, const String &value); bool switchHandler(const HomieRange &range, const String &value);

4
esp32/src/PlantCtrl.cpp
View File

@ -209,11 +209,11 @@ void Plant::deactivatePump(void)
} }
} }
void Plant::publishState(String state) void Plant::publishState(int stateNumber, String stateString)
{ {
if (this->mConnected) if (this->mConnected)
{ {
this->mPlant->setProperty("state").send(state); this->mPlant->setProperty("state").send(stateString);
} }
} }

24
esp32/src/main.cpp
View File

@ -429,7 +429,7 @@ int determineNextPump(bool isLowLight)
Plant plant = mPlants[i]; Plant plant = mPlants[i];
if (!plant.isPumpTriggerActive()) if (!plant.isPumpTriggerActive())
{ {
plant.publishState("deactivated"); plant.publishState(PLANTSTATE_NUM_DEACTIVATED, PLANTSTATE_STR_DEACTIVATED);
log(LOG_LEVEL_DEBUG, String(String(i) + " Skip deactivated pump"), LOG_DEBUG_CODE); log(LOG_LEVEL_DEBUG, String(String(i) + " Skip deactivated pump"), LOG_DEBUG_CODE);
continue; continue;
} }
@ -437,11 +437,11 @@ int determineNextPump(bool isLowLight)
{ {
if (wateralarm) if (wateralarm)
{ {
plant.publishState("cooldown+alarm"); plant.publishState(PLANTSTATE_NUM_COOLDOWN_ALARM, PLANTSTATE_STR_COOLDOWN_ALARM);
} }
else else
{ {
plant.publishState("cooldown"); plant.publishState(PLANTSTATE_NUM_COOLDOWN, PLANTSTATE_STR_COOLDOWN);
} }
log(LOG_LEVEL_DEBUG, String(String(i) + " Skipping due to cooldown " + String(rtcLastWateringPlant[i] + plant.getCooldownInSeconds())), LOG_DEBUG_CODE); log(LOG_LEVEL_DEBUG, String(String(i) + " Skipping due to cooldown " + String(rtcLastWateringPlant[i] + plant.getCooldownInSeconds())), LOG_DEBUG_CODE);
continue; continue;
@ -450,11 +450,11 @@ int determineNextPump(bool isLowLight)
{ {
if (wateralarm) if (wateralarm)
{ {
plant.publishState("sunny+alarm"); plant.publishState(PLANTSTATE_NUM_SUNNY_ALARM, PLANTSTATE_STR_SUNNY_ALARM);
} }
else else
{ {
plant.publishState("sunny"); plant.publishState(PLANTSTATE_NUM_SUNNY, PLANTSTATE_STR_SUNNY);
} }
log(LOG_LEVEL_DEBUG, String(String(i) + " No pump required: due to light"), LOG_DEBUG_CODE); log(LOG_LEVEL_DEBUG, String(String(i) + " No pump required: due to light"), LOG_DEBUG_CODE);
@ -464,7 +464,7 @@ int determineNextPump(bool isLowLight)
{ {
if (equalish(plant.getCurrentMoistureRaw(), MISSING_SENSOR)) if (equalish(plant.getCurrentMoistureRaw(), MISSING_SENSOR))
{ {
plant.publishState("nosensor"); plant.publishState(PLANTSTATE_NUM_NO_SENSOR, PLANTSTATE_STR_NO_SENSOR);
log(LOG_LEVEL_ERROR, String(String(i) + " No pump possible: missing sensor"), LOG_MISSING_PUMP); log(LOG_LEVEL_ERROR, String(String(i) + " No pump possible: missing sensor"), LOG_MISSING_PUMP);
continue; continue;
} }
@ -483,17 +483,17 @@ int determineNextPump(bool isLowLight)
{ {
if (wateralarm) if (wateralarm)
{ {
plant.publishState("active+alarm"); plant.publishState(PLANTSTATE_NUM_ACTIVE_ALARM, PLANTSTATE_STR_ACTIVE_ALARM);
} }
else else
{ {
if (mDownloadMode) if (mDownloadMode)
{ {
plant.publishState("active+supressed"); plant.publishState(PLANTSTATE_NUM_ACTIVE_SUPESSED, PLANTSTATE_STR_ACTIVE_SUPESSED);
} }
else else
{ {
plant.publishState("active"); plant.publishState(PLANTSTATE_NUM_ACTIVE, PLANTSTATE_STR_ACTIVE);
} }
} }
@ -510,11 +510,11 @@ int determineNextPump(bool isLowLight)
{ {
if (wateralarm) if (wateralarm)
{ {
plant.publishState("after-work+alarm"); plant.publishState(PLANTSTATE_NUM_AFTERWORK_ALARM, PLANTSTATE_STR_AFTERWORK_ALARM);
} }
else else
{ {
plant.publishState("after-work"); plant.publishState(PLANTSTATE_NUM_AFTERWORK, PLANTSTATE_STR_AFTERWORK);
} }
log(LOG_LEVEL_DEBUG, String(String(i) + " ignored due to time boundary: " + String(plant.getHoursStart()) + " to " + String(plant.getHoursEnd()) + " ( current " + String(getCurrentHour()) + " )"), LOG_DEBUG_CODE); log(LOG_LEVEL_DEBUG, String(String(i) + " ignored due to time boundary: " + String(plant.getHoursStart()) + " to " + String(plant.getHoursEnd()) + " ( current " + String(getCurrentHour()) + " )"), LOG_DEBUG_CODE);
} }
@ -522,7 +522,7 @@ int determineNextPump(bool isLowLight)
} }
else else
{ {
plant.publishState("wet"); plant.publishState(PLANTSTATE_NUM_WET, PLANTSTATE_STR_WET);
// plant was detected as wet, remove consecutive count // plant was detected as wet, remove consecutive count
consecutiveWateringPlant[i] = 0; consecutiveWateringPlant[i] = 0;
} }