iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-30 11:59:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

wifiIsConnect, module Broker update

Browse Source
This commit is contained in:
Mit4el
2024-12-08 21:35:53 +03:00
parent 322925fa5a
commit 5e801e7789
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/classes/IoTScenario.cpp
View File

@@ -342,7 +342,8 @@ enum SysOp {
sysop_getIP, sysop_getIP,
sysop_mqttPub, sysop_mqttPub,
sysop_getUptime, sysop_getUptime,
sysop_mqttIsConnect sysop_mqttIsConnect,
sysop_wifiIsConnect
}; };
IoTValue sysExecute(SysOp command, std::vector<IoTValue> &param) { IoTValue sysExecute(SysOp command, std::vector<IoTValue> &param) {
@@ -446,6 +447,9 @@ IoTValue sysExecute(SysOp command, std::vector<IoTValue> &param) {
case sysop_mqttIsConnect: case sysop_mqttIsConnect:
value.valD = mqttIsConnect(); value.valD = mqttIsConnect();
break; break;
case sysop_wifiIsConnect:
value.valD = isNetworkActive();
break;
} }
return value; return value;
@@ -502,6 +506,8 @@ class SysCallExprAST : public ExprAST {
operation = sysop_getUptime; operation = sysop_getUptime;
else if (Callee == F("mqttIsConnect")) else if (Callee == F("mqttIsConnect"))
operation = sysop_mqttIsConnect; operation = sysop_mqttIsConnect;
else if (Callee == F("wifiIsConnect"))
operation = sysop_wifiIsConnect;
else else
operation = sysop_notfound; operation = sysop_notfound;
} }

6
src/modules/exec/BrokerMQTT/BrokerMQTT.cpp
View File

@@ -121,6 +121,8 @@ bool _global_debug = false;
clientMqtt->loop(); clientMqtt->loop();
if (picoMqtt) if (picoMqtt)
picoMqtt->loop(); picoMqtt->loop();
if (!clientMqtt && !picoMqtt)
vTaskDelete(NULL);
// picoMqtt.loop(); // picoMqtt.loop();
// vTaskDelayUntil(&xLastWakeTime, pdMS_TO_TICKS(5)); // vTaskDelayUntil(&xLastWakeTime, pdMS_TO_TICKS(5));
} }
@@ -213,8 +215,10 @@ bool _global_debug = false;
~BrokerMQTT() ~BrokerMQTT()
{ {
vTaskDelete(brokerTask); //vTaskDelete(brokerTask);
if (picoMqtt)
delete picoMqtt; delete picoMqtt;
if (clientMqtt)
delete clientMqtt; delete clientMqtt;
} }
}; };