andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2026-10-28 11:15:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

sprinkler - status notifications on start and mode changing

Browse Source
This commit is contained in:
andry
2026-09-27 22:51:14 +03:00
parent e442001ec9
commit 0afe8bc866
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lighthub/modules/out_sprinkler.cpp
+27 -1
View File
@@ -52,7 +52,7 @@ static bool isValidControlPin(short pin)
bool out_sprinkler::publishBooleanStateIfChanged(const char * subItem, bool state, uint32_t flag, uint32_t & lastState, bool forcePublish) bool out_sprinkler::publishBooleanStateIfChanged(const char * subItem, bool state, uint32_t flag, uint32_t & lastState, bool forcePublish)
{ {
if (!&lastState) return false; //if (!&lastState) return false;
if ((state == (bool) (lastState & flag)) && !forcePublish) return true; if ((state == (bool) (lastState & flag)) && !forcePublish) return true;
if (state) lastState |= flag ; else lastState &= ~flag; if (state) lastState |= flag ; else lastState &= ~flag;
return publishBooleanState(subItem, state); return publishBooleanState(subItem, state);
@@ -481,6 +481,7 @@ int out_sprinkler::Poll(short cause)
publishState = publishState && publishBooleanState("/$rPump", lastVals & LASTPUMPSTATE); publishState = publishState && publishBooleanState("/$rPump", lastVals & LASTPUMPSTATE);
publishState = publishState && publishBooleanState("/$rDren", lastVals & LASTDRENSTATE); publishState = publishState && publishBooleanState("/$rDren", lastVals & LASTDRENSTATE);
publishState = publishState && publishBooleanState("/$rVIN", lastVals & LASTVINSTATE); publishState = publishState && publishBooleanState("/$rVIN", lastVals & LASTVINSTATE);
getAndNotifyStatus();
} }
if (publishState) statePublished = true; if (publishState) statePublished = true;
@@ -728,6 +729,29 @@ int out_sprinkler::Poll(short cause)
return 0; return 0;
} }
void out_sprinkler::getAndNotifyStatus()
{
if (!item || !gatesObj) return;
/*
aJsonObject * zone = gatesObj->child;
while (zone)
{
if (zone->name && *zone->name && zone->type == aJson_Object)
{
long setVal = getIntFromJson(zone, "set", 0);
long valVal = getIntFromJson(zone, "val", 0);
item->SendStatusImmediate(itemCmd().Int(setVal).setSuffix(S_SET), FLAG_PARAMETERS, zone->name);
item->SendStatusImmediate(itemCmd().Int(valVal).setSuffix(S_VAL), FLAG_PARAMETERS, zone->name);
}
zone = zone->next;
}
long wCtrVal = getIntFromJson(gatesObj, "@wCtr", 0);
item->SendStatusImmediate(itemCmd().Int(wCtrVal).setSuffix(S_SET), FLAG_PARAMETERS);
*/
int state = getIntFromJson(gatesObj, "@state", SP_UNKNOWN);
notifyState((sprinklerState)state);
}
int out_sprinkler::Ctrl(itemCmd cmd, char* subItem, bool toExecute, bool authorized) int out_sprinkler::Ctrl(itemCmd cmd, char* subItem, bool toExecute, bool authorized)
{ {
if (!item || !gatesObj) return 0; if (!item || !gatesObj) return 0;
@@ -810,11 +834,13 @@ int out_sprinkler::Ctrl(itemCmd cmd, char* subItem, bool toExecute, bool authori
switch (cmd.getCmd()) switch (cmd.getCmd())
{ {
case CMD_ON: case CMD_ON:
getAndNotifyStatus();
return 1; return 1;
case CMD_OFF: case CMD_OFF:
turnOffAllZones(); turnOffAllZones();
pump(false); pump(false);
getAndNotifyStatus();
return 1; return 1;
case CMD_DRY: case CMD_DRY:
lighthub/modules/out_sprinkler.h
+2 -1
View File
@@ -72,6 +72,7 @@ protected:
bool isFreeze(); bool isFreeze();
void notifyState(short state); void notifyState(short state);
int moveToState(sprinklerState nextState); int moveToState(sprinklerState nextState);
void updateCounterValue(); void updateCounterValue();
void getAndNotifyStatus();
}; };
#endif #endif