chriz/OpenMQTT-Gateway
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

[SYS] Remove handleJsonQueue wrapper and use std::string (#2038)

Browse Source 
Co-authored-by: Florian <1technophile@users.noreply.github.com>
This commit is contained in:
FlorianandFlorian authored and GitHub committed 2024-08-29 09:44:05 -05:00
1 parent cb824e2ee4
commit 719976b652
36 files changed
+68 -74
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

main/ZactuatorONOFF.ino
+1 -1
View File
@@ -311,6 +311,6 @@ void stateONOFFMeasures() {
ONOFFdata["uselaststate"] = ONOFFConfig.useLastStateOnStart; ONOFFdata["uselaststate"] = ONOFFConfig.useLastStateOnStart;
# endif # endif
ONOFFdata["origin"] = subjectGTWONOFFtoMQTT; ONOFFdata["origin"] = subjectGTWONOFFtoMQTT;
handleJsonEnqueue(ONOFFdata, QueueSemaphoreTimeOutTask); enqueueJsonObject(ONOFFdata, QueueSemaphoreTimeOutTask);
} }
#endif #endif
main/ZdisplaySSD1306.ino
+1 -1
View File
@@ -503,7 +503,7 @@ String stateSSD1306Display() {
DISPLAYdata["log-oled"] = (bool)logToOLEDDisplay; DISPLAYdata["log-oled"] = (bool)logToOLEDDisplay;
DISPLAYdata["json-oled"] = (bool)jsonDisplay; DISPLAYdata["json-oled"] = (bool)jsonDisplay;
DISPLAYdata["origin"] = subjectSSD1306toMQTT; DISPLAYdata["origin"] = subjectSSD1306toMQTT;
handleJsonEnqueue(DISPLAYdata); enqueueJsonObject(DISPLAYdata);
// apply // apply
Oled.display->setBrightness(round(displayBrightness * 2.55)); Oled.display->setBrightness(round(displayBrightness * 2.55));
main/Zgateway2G.ino
+1 -1
View File
@@ -91,7 +91,7 @@ bool _2GtoMQTT() {
A6l.deleteSMS(unreadSMSLocs[i]); // we delete the SMS received A6l.deleteSMS(unreadSMSLocs[i]); // we delete the SMS received
Log.trace(F("Adv data 2GtoMQTT" CR)); Log.trace(F("Adv data 2GtoMQTT" CR));
SMSdata["origin"] = subject2GtoMQTT; SMSdata["origin"] = subject2GtoMQTT;
return handleJsonEnqueue(SMSdata); return enqueueJsonObject(SMSdata);
} }
return false; return false;
} }
main/ZgatewayBLEConnect.ino
+8 -8
View File
@@ -120,7 +120,7 @@ bool zBLEConnect::processActions(std::vector<BLEAction>& actions) {
BLEdata["success"] = result; BLEdata["success"] = result;
if (result || it.ttl <= 1) { if (result || it.ttl <= 1) {
buildTopicFromId(BLEdata, subjectBTtoMQTT); buildTopicFromId(BLEdata, subjectBTtoMQTT);
handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask); enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
} }
} }
} }
@@ -160,7 +160,7 @@ void LYWSD03MMC_connect::notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* pD
BLEdata["volt"] = (float)(((pData[4] * 256) + pData[3]) / 1000.0); BLEdata["volt"] = (float)(((pData[4] * 256) + pData[3]) / 1000.0);
BLEdata["batt"] = (float)(((((pData[4] * 256) + pData[3]) / 1000.0) - 2.1) * 100); BLEdata["batt"] = (float)(((((pData[4] * 256) + pData[3]) / 1000.0) - 2.1) * 100);
buildTopicFromId(BLEdata, subjectBTtoMQTT); buildTopicFromId(BLEdata, subjectBTtoMQTT);
handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask); enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
} else { } else {
Log.notice(F("Invalid notification data" CR)); Log.notice(F("Invalid notification data" CR));
return; return;
@@ -225,7 +225,7 @@ void DT24_connect::notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* pData, s
BLEdata["tempc"] = (float)(m_data[24] * 256) + m_data[25]; BLEdata["tempc"] = (float)(m_data[24] * 256) + m_data[25];
BLEdata["tempf"] = (float)(convertTemp_CtoF((m_data[24] * 256) + m_data[25])); BLEdata["tempf"] = (float)(convertTemp_CtoF((m_data[24] * 256) + m_data[25]));
buildTopicFromId(BLEdata, subjectBTtoMQTT); buildTopicFromId(BLEdata, subjectBTtoMQTT);
handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask); enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
} else { } else {
Log.notice(F("Invalid notification data" CR)); Log.notice(F("Invalid notification data" CR));
return; return;
@@ -304,7 +304,7 @@ void BM2_connect::notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* pData, si
// to avoid the BM2 device tracker going offline because of the voltage MQTT message without an RSSI value // to avoid the BM2 device tracker going offline because of the voltage MQTT message without an RSSI value
BLEdata["rssi"] = -60; BLEdata["rssi"] = -60;
buildTopicFromId(BLEdata, subjectBTtoMQTT); buildTopicFromId(BLEdata, subjectBTtoMQTT);
handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask); enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
} else { } else {
Log.notice(F("Invalid notification data" CR)); Log.notice(F("Invalid notification data" CR));
return; return;
@@ -362,7 +362,7 @@ void HHCCJCY01HHCC_connect::publishData() {
BLEdata["id"] = (char*)mac_address.c_str(); BLEdata["id"] = (char*)mac_address.c_str();
BLEdata["batt"] = (int)batteryValue; BLEdata["batt"] = (int)batteryValue;
buildTopicFromId(BLEdata, subjectBTtoMQTT); buildTopicFromId(BLEdata, subjectBTtoMQTT);
handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask); enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
} else { } else {
Log.notice(F("Failed getting characteristic" CR)); Log.notice(F("Failed getting characteristic" CR));
} }
@@ -394,7 +394,7 @@ void XMWSDJ04MMC_connect::notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* p
BLEdata["volt"] = (float)((pData[4] | (pData[5] << 8)) / 1000.0); BLEdata["volt"] = (float)((pData[4] | (pData[5] << 8)) / 1000.0);
BLEdata["batt"] = (float)((((pData[4] | (pData[5] << 8)) / 1000.0) - 2.1) * 100); BLEdata["batt"] = (float)((((pData[4] | (pData[5] << 8)) / 1000.0) - 2.1) * 100);
buildTopicFromId(BLEdata, subjectBTtoMQTT); buildTopicFromId(BLEdata, subjectBTtoMQTT);
handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask); enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
} else { } else {
Log.notice(F("Invalid notification data" CR)); Log.notice(F("Invalid notification data" CR));
return; return;
@@ -500,7 +500,7 @@ bool SBS1_connect::processActions(std::vector<BLEAction>& actions) {
BLEdata["id"] = it.addr; BLEdata["id"] = it.addr;
BLEdata["state"] = it.value; BLEdata["state"] = it.value;
buildTopicFromId(BLEdata, subjectBTtoMQTT); buildTopicFromId(BLEdata, subjectBTtoMQTT);
handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask); enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
} }
} }
} }
@@ -600,7 +600,7 @@ bool SBBT_connect::processActions(std::vector<BLEAction>& actions) {
BLEdata["direction"] = "up"; BLEdata["direction"] = "up";
} }
buildTopicFromId(BLEdata, subjectBTtoMQTT); buildTopicFromId(BLEdata, subjectBTtoMQTT);
handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask); enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
} }
} }
} }
main/ZgatewayBT.ino
+8 -8
View File
@@ -148,7 +148,7 @@ String stateBTMeasures(bool start) {
String output; String output;
serializeJson(jo, output); serializeJson(jo, output);
jo["origin"] = subjectBTtoMQTT; jo["origin"] = subjectBTtoMQTT;
handleJsonEnqueue(jo, QueueSemaphoreTimeOutTask); enqueueJsonObject(jo, QueueSemaphoreTimeOutTask);
return (output); return (output);
} }
@@ -430,7 +430,7 @@ void updateDevicesStatus() {
BLEdata["id"] = p->macAdr; BLEdata["id"] = p->macAdr;
BLEdata["state"] = "offline"; BLEdata["state"] = "offline";
buildTopicFromId(BLEdata, subjectBTtoMQTT); buildTopicFromId(BLEdata, subjectBTtoMQTT);
handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask); enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
// We set the lastUpdate to 0 to avoid replublishing the offline state // We set the lastUpdate to 0 to avoid replublishing the offline state
p->lastUpdate = 0; p->lastUpdate = 0;
} }
@@ -444,7 +444,7 @@ void updateDevicesStatus() {
BLEdata["id"] = p->macAdr; BLEdata["id"] = p->macAdr;
BLEdata["state"] = "offline"; BLEdata["state"] = "offline";
buildTopicFromId(BLEdata, subjectBTtoMQTT); buildTopicFromId(BLEdata, subjectBTtoMQTT);
handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask); enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
// We set the lastUpdate to 0 to avoid replublishing the offline state // We set the lastUpdate to 0 to avoid replublishing the offline state
p->lastUpdate = 0; p->lastUpdate = 0;
} }
@@ -1244,13 +1244,13 @@ void PublishDeviceData(JsonObject& BLEdata) {
BLEdata["mac"] = BLEdata["id"].as<std::string>(); BLEdata["mac"] = BLEdata["id"].as<std::string>();
BLEdata["id"] = BLEdata["uuid"].as<std::string>(); BLEdata["id"] = BLEdata["uuid"].as<std::string>();
} }
handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask); enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
} }
// If the device is not a sensor and pubOnlySensors is true we don't publish this payload // If the device is not a sensor and pubOnlySensors is true we don't publish this payload
if (!BTConfig.pubOnlySensors || BLEdata.containsKey("model") || !BLEDecoder) { // Identified device if (!BTConfig.pubOnlySensors || BLEdata.containsKey("model") || !BLEDecoder) { // Identified device
buildTopicFromId(BLEdata, subjectBTtoMQTT); buildTopicFromId(BLEdata, subjectBTtoMQTT);
handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask); enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
} else { } else {
Log.notice(F("Not a sensor device filtered" CR)); Log.notice(F("Not a sensor device filtered" CR));
return; return;
@@ -1271,10 +1271,10 @@ void PublishDeviceData(JsonObject& BLEdata) {
BLEdata["mac"] = BLEdata["id"].as<std::string>(); BLEdata["mac"] = BLEdata["id"].as<std::string>();
BLEdata["id"] = BLEdata["uuid"].as<std::string>(); BLEdata["id"] = BLEdata["uuid"].as<std::string>();
} }
handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask); enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
} }
buildTopicFromId(BLEdata, subjectBTtoMQTT); buildTopicFromId(BLEdata, subjectBTtoMQTT);
handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask); enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
} else { } else {
Log.notice(F("Low rssi, device filtered" CR)); Log.notice(F("Low rssi, device filtered" CR));
return; return;
@@ -1351,7 +1351,7 @@ void immediateBTAction(void* pvParameters) {
BLEdata["id"] = BLEactions.back().addr; BLEdata["id"] = BLEactions.back().addr;
BLEdata["success"] = false; BLEdata["success"] = false;
buildTopicFromId(BLEdata, subjectBTtoMQTT); buildTopicFromId(BLEdata, subjectBTtoMQTT);
handleJsonEnqueue(BLEdata, QueueSemaphoreTimeOutTask); enqueueJsonObject(BLEdata, QueueSemaphoreTimeOutTask);
BLEactions.pop_back(); BLEactions.pop_back();
BTProcessLock = false; BTProcessLock = false;
} }
main/ZgatewayGFSunInverter.ino
+2 -2
View File
@@ -59,7 +59,7 @@ void GFSunInverterDataHandler(GfSun2000Data data) {
jdata["register"] = jregister; jdata["register"] = jregister;
# endif # endif
jdata["origin"] = subjectRFtoMQTT; jdata["origin"] = subjectRFtoMQTT;
handleJsonEnqueue(jdata); enqueueJsonObject(jdata);
} }
void GFSunInverterErrorHandler(int errorId, char* errorMessage) { void GFSunInverterErrorHandler(int errorId, char* errorMessage) {
@@ -72,7 +72,7 @@ void GFSunInverterErrorHandler(int errorId, char* errorMessage) {
jdata["msg"] = errorMessage; jdata["msg"] = errorMessage;
jdata["id"] = errorId; jdata["id"] = errorId;
jdata["origin"] = subjectRFtoMQTT; jdata["origin"] = subjectRFtoMQTT;
handleJsonEnqueue(jdata); enqueueJsonObject(jdata);
} }
void setupGFSunInverter() { void setupGFSunInverter() {
main/ZgatewayIR.ino
+1 -1
View File
@@ -148,7 +148,7 @@ void IRtoMQTT() {
} else if (!isAduplicateSignal(MQTTvalue) && MQTTvalue != 0) { // conditions to avoid duplications of IR -->MQTT } else if (!isAduplicateSignal(MQTTvalue) && MQTTvalue != 0) { // conditions to avoid duplications of IR -->MQTT
Log.trace(F("Adv data IRtoMQTT" CR)); Log.trace(F("Adv data IRtoMQTT" CR));
IRdata["origin"] = subjectIRtoMQTT; IRdata["origin"] = subjectIRtoMQTT;
handleJsonEnqueue(IRdata); enqueueJsonObject(IRdata);
Log.trace(F("Store val: %D" CR), MQTTvalue); Log.trace(F("Store val: %D" CR), MQTTvalue);
storeSignalValue(MQTTvalue); storeSignalValue(MQTTvalue);
if (repeatIRwMQTT) { if (repeatIRwMQTT) {
main/ZgatewayLORA.ino
+2 -2
View File
@@ -473,11 +473,11 @@ void LORAtoMQTT() {
LORAdataBuffer["origin"] = subjectLORAtoMQTT; LORAdataBuffer["origin"] = subjectLORAtoMQTT;
} }
handleJsonEnqueue(LORAdata); enqueueJsonObject(LORAdata);
if (repeatLORAwMQTT) { if (repeatLORAwMQTT) {
Log.trace(F("Pub LORA for rpt" CR)); Log.trace(F("Pub LORA for rpt" CR));
LORAdata["origin"] = subjectMQTTtoLORA; LORAdata["origin"] = subjectMQTTtoLORA;
handleJsonEnqueue(LORAdata); enqueueJsonObject(LORAdata);
} }
} }
} }
main/ZgatewayPilight.ino
+3 -3
View File
@@ -81,11 +81,11 @@ void pilightCallback(const String& protocol, const String& message, int status,
RFPiLightdata["repeats"] = (int)repeats; RFPiLightdata["repeats"] = (int)repeats;
RFPiLightdata["status"] = (int)status; RFPiLightdata["status"] = (int)status;
RFPiLightdata["origin"] = subjectPilighttoMQTT; RFPiLightdata["origin"] = subjectPilighttoMQTT;
handleJsonEnqueue(RFPiLightdata); enqueueJsonObject(RFPiLightdata);
if (repeatPilightwMQTT) { if (repeatPilightwMQTT) {
Log.trace(F("Pub Pilight for rpt" CR)); Log.trace(F("Pub Pilight for rpt" CR));
RFPiLightdata["origin"] = subjectMQTTtoPilight; RFPiLightdata["origin"] = subjectMQTTtoPilight;
handleJsonEnqueue(RFPiLightdata); enqueueJsonObject(RFPiLightdata);
} }
} }
} }
@@ -108,7 +108,7 @@ void pilightRawCallback(const uint16_t* pulses, size_t length) {
// Enqueue data // Enqueue data
RFPiLightdata["origin"] = subjectPilighttoMQTT; RFPiLightdata["origin"] = subjectPilighttoMQTT;
handleJsonEnqueue(RFPiLightdata); enqueueJsonObject(RFPiLightdata);
} }
# endif # endif
main/ZgatewayRF.ino
+2 -2
View File
@@ -146,14 +146,14 @@ void RFtoMQTT() {
RFtoMQTTdiscovery(MQTTvalue); RFtoMQTTdiscovery(MQTTvalue);
# endif # endif
RFdata["origin"] = subjectRFtoMQTT; RFdata["origin"] = subjectRFtoMQTT;
handleJsonEnqueue(RFdata); enqueueJsonObject(RFdata);
// Casting "receivedSignal[o].value" to (unsigned long) because ArduinoLog doesn't support uint64_t for ESP's // Casting "receivedSignal[o].value" to (unsigned long) because ArduinoLog doesn't support uint64_t for ESP's
Log.trace(F("Store val: %u" CR), (unsigned long)MQTTvalue); Log.trace(F("Store val: %u" CR), (unsigned long)MQTTvalue);
storeSignalValue(MQTTvalue); storeSignalValue(MQTTvalue);
if (repeatRFwMQTT) { if (repeatRFwMQTT) {
Log.trace(F("Pub RF for rpt" CR)); Log.trace(F("Pub RF for rpt" CR));
RFdata["origin"] = subjectMQTTtoRF; RFdata["origin"] = subjectMQTTtoRF;
handleJsonEnqueue(RFdata); enqueueJsonObject(RFdata);
} }
} }
} }
main/ZgatewayRF2.ino
+1 -1
View File
@@ -118,7 +118,7 @@ void RF2toMQTT() {
RF2toMQTTdiscovery(RF2data); RF2toMQTTdiscovery(RF2data);
# endif # endif
RF2data["origin"] = subjectRF2toMQTT; RF2data["origin"] = subjectRF2toMQTT;
handleJsonEnqueue(RF2data); enqueueJsonObject(RF2data);
} }
} }
main/ZgatewayRFM69.ino
+1 -1
View File
@@ -212,7 +212,7 @@ void MQTTtoRFM69(char* topicOri, JsonObject& RFM69data) {
Log.notice(F(" OK " CR)); Log.notice(F(" OK " CR));
// Acknowledgement to the GTWRF topic // Acknowledgement to the GTWRF topic
RFM69data["origin"] = subjectGTWRFM69toMQTT; RFM69data["origin"] = subjectGTWRFM69toMQTT;
handleJsonEnqueue(RFM69data); enqueueJsonObject(RFM69data);
} else { } else {
Log.error(F("MQTTtoRFM69 sending failed" CR)); Log.error(F("MQTTtoRFM69 sending failed" CR));
} }
main/ZgatewayRTL_433.ino
+1 -2
View File
@@ -309,8 +309,7 @@ void rtl_433_Callback(char* message) {
storeRTL_433Discovery(RFrtl_433_ESPdata, (char*)model.c_str(), (char*)type.c_str(), (char*)uniqueid.c_str()); storeRTL_433Discovery(RFrtl_433_ESPdata, (char*)model.c_str(), (char*)type.c_str(), (char*)uniqueid.c_str());
# endif # endif
RFrtl_433_ESPdata["origin"] = (char*)topic.c_str(); RFrtl_433_ESPdata["origin"] = (char*)topic.c_str();
handleJsonEnqueue(RFrtl_433_ESPdata); enqueueJsonObject(RFrtl_433_ESPdata);
//pub(topic.c_str(), RFrtl_433_ESPdata);
storeSignalValue(MQTTvalue); storeSignalValue(MQTTvalue);
pubOled((char*)topic.c_str(), RFrtl_433_ESPdata); pubOled((char*)topic.c_str(), RFrtl_433_ESPdata);
} }
main/ZgatewaySERIAL.ino
+2 -2
View File
@@ -182,11 +182,11 @@ void SERIALtoMQTT() {
PublishDeviceData(SERIALdata); PublishDeviceData(SERIALdata);
# endif # endif
} else { } else {
handleJsonEnqueue(SERIALdata); enqueueJsonObject(SERIALdata);
} }
} else { } else {
SERIALdata["origin"] = subjectSERIALtoMQTT; SERIALdata["origin"] = subjectSERIALtoMQTT;
handleJsonEnqueue(SERIALdata); enqueueJsonObject(SERIALdata);
} }
# endif # endif
main/ZgatewaySRFB.ino
+2 -2
View File
@@ -121,13 +121,13 @@ void _rfbDecode() {
if (!isAduplicateSignal(MQTTvalue) && MQTTvalue != 0) { // conditions to avoid duplications of RF -->MQTT if (!isAduplicateSignal(MQTTvalue) && MQTTvalue != 0) { // conditions to avoid duplications of RF -->MQTT
Log.trace(F("Adv data SRFBtoMQTT" CR)); Log.trace(F("Adv data SRFBtoMQTT" CR));
SRFBdata["origin"] = subjectSRFBtoMQTT; SRFBdata["origin"] = subjectSRFBtoMQTT;
handleJsonEnqueue(SRFBdata); enqueueJsonObject(SRFBdata);
Log.trace(F("Store val: %lu" CR), MQTTvalue); Log.trace(F("Store val: %lu" CR), MQTTvalue);
storeSignalValue(MQTTvalue); storeSignalValue(MQTTvalue);
if (repeatSRFBwMQTT) { if (repeatSRFBwMQTT) {
Log.trace(F("Publish SRFB for rpt" CR)); Log.trace(F("Publish SRFB for rpt" CR));
SRFBdata["origin"] = subjectMQTTtoSRFB; SRFBdata["origin"] = subjectMQTTtoSRFB;
handleJsonEnqueue(SRFBdata); enqueueJsonObject(SRFBdata);
} }
} }
_rfbAck(); _rfbAck();
main/ZgatewayWeatherStation.ino
+5 -5
View File
@@ -36,7 +36,7 @@ void PairedDeviceAdded(byte newID) {
RFdata["sensor"] = newID; RFdata["sensor"] = newID;
RFdata["action"] = "paired"; RFdata["action"] = "paired";
RFdata["origin"] = subjectRFtoMQTT; RFdata["origin"] = subjectRFtoMQTT;
handleJsonEnqueue(RFdata); enqueueJsonObject(RFdata);
wsdr.pair(NULL, PairedDeviceAdded); wsdr.pair(NULL, PairedDeviceAdded);
} }
@@ -56,7 +56,7 @@ void sendWindSpeedData(byte id, float wind_speed, byte battery_status) {
RFdata["wind_speed"] = wind_speed; RFdata["wind_speed"] = wind_speed;
RFdata["battery"] = bitRead(battery_status, 0) == 0 ? "OK" : "Low"; RFdata["battery"] = bitRead(battery_status, 0) == 0 ? "OK" : "Low";
RFdata["origin"] = subjectRFtoMQTT; RFdata["origin"] = subjectRFtoMQTT;
handleJsonEnqueue(RFdata); enqueueJsonObject(RFdata);
Log.trace(F("Store wind speed val: %lu" CR), MQTTvalue); Log.trace(F("Store wind speed val: %lu" CR), MQTTvalue);
storeSignalValue(MQTTvalue); storeSignalValue(MQTTvalue);
} }
@@ -71,7 +71,7 @@ void sendRainData(byte id, float rain_volume, byte battery_status) {
RFdata["rain_volume"] = rain_volume; RFdata["rain_volume"] = rain_volume;
RFdata["battery"] = bitRead(battery_status, 1) == 0 ? "OK" : "Low"; RFdata["battery"] = bitRead(battery_status, 1) == 0 ? "OK" : "Low";
RFdata["origin"] = subjectRFtoMQTT; RFdata["origin"] = subjectRFtoMQTT;
handleJsonEnqueue(RFdata); enqueueJsonObject(RFdata);
Log.trace(F("Store rain_volume: %lu" CR), MQTTvalue); Log.trace(F("Store rain_volume: %lu" CR), MQTTvalue);
storeSignalValue(MQTTvalue); storeSignalValue(MQTTvalue);
} }
@@ -87,7 +87,7 @@ void sendWindData(byte id, int wind_direction, float wind_gust, byte battery_sta
RFdata["wind_gust"] = wind_gust; RFdata["wind_gust"] = wind_gust;
RFdata["battery"] = bitRead(battery_status, 0) == 0 ? "OK" : "Low"; RFdata["battery"] = bitRead(battery_status, 0) == 0 ? "OK" : "Low";
RFdata["origin"] = subjectRFtoMQTT; RFdata["origin"] = subjectRFtoMQTT;
handleJsonEnqueue(RFdata); enqueueJsonObject(RFdata);
Log.trace(F("Store wind data val: %lu" CR), MQTTvalue); Log.trace(F("Store wind data val: %lu" CR), MQTTvalue);
storeSignalValue(MQTTvalue); storeSignalValue(MQTTvalue);
} }
@@ -104,7 +104,7 @@ void sendTemperatureData(byte id, float temperature, int humidity, byte battery_
RFdata["humidity"] = humidity; RFdata["humidity"] = humidity;
RFdata["battery"] = bitRead(battery_status, 0) == 0 ? "OK" : "Low"; RFdata["battery"] = bitRead(battery_status, 0) == 0 ? "OK" : "Low";
RFdata["origin"] = subjectRFtoMQTT; RFdata["origin"] = subjectRFtoMQTT;
handleJsonEnqueue(RFdata); enqueueJsonObject(RFdata);
Log.trace(F("Store temp val: %lu" CR), MQTTvalue); Log.trace(F("Store temp val: %lu" CR), MQTTvalue);
storeSignalValue(MQTTvalue); storeSignalValue(MQTTvalue);
} }
main/ZsensorADC.ino
+1 -1
View File
@@ -94,7 +94,7 @@ void MeasureADC() {
ADCdata["mvolt_scaled"] = (int)voltage; // real scaled/calibrated value in mV ADCdata["mvolt_scaled"] = (int)voltage; // real scaled/calibrated value in mV
# endif # endif
ADCdata["origin"] = ADCTOPIC; ADCdata["origin"] = ADCTOPIC;
handleJsonEnqueue(ADCdata); enqueueJsonObject(ADCdata);
persistedadc = val; persistedadc = val;
} }
} }
main/ZsensorAHTx0.ino
+1 -1
View File
@@ -104,7 +104,7 @@ void MeasureAHTTempHum() {
Log.notice(F("Same Humidity. Don't send it" CR)); Log.notice(F("Same Humidity. Don't send it" CR));
} }
AHTx0data["origin"] = AHTTOPIC; AHTx0data["origin"] = AHTTOPIC;
handleJsonEnqueue(AHTx0data); enqueueJsonObject(AHTx0data);
} }
persisted_aht_tempc = ahtTempC.temperature; persisted_aht_tempc = ahtTempC.temperature;
persisted_aht_hum = ahtHum.relative_humidity; persisted_aht_hum = ahtHum.relative_humidity;
main/ZsensorBH1750.ino
+1 -1
View File
@@ -101,7 +101,7 @@ void MeasureLightIntensity() {
Log.trace(F("Same wattsm2 don't send it" CR)); Log.trace(F("Same wattsm2 don't send it" CR));
} }
BH1750data["origin"] = subjectBH1750toMQTT; BH1750data["origin"] = subjectBH1750toMQTT;
handleJsonEnqueue(BH1750data); enqueueJsonObject(BH1750data);
} }
persistedll = Lux; persistedll = Lux;
persistedlf = ftcd; persistedlf = ftcd;
main/ZsensorBME280.ino
+1 -1
View File
@@ -188,7 +188,7 @@ void MeasureTempHumAndPressure() {
Log.trace(F("Same Altitude Feet don't send it" CR)); Log.trace(F("Same Altitude Feet don't send it" CR));
} }
BME280data["origin"] = BMETOPIC; BME280data["origin"] = BMETOPIC;
handleJsonEnqueue(BME280data); enqueueJsonObject(BME280data);
} }
persisted_bme_tempc = BmeTempC; persisted_bme_tempc = BmeTempC;
main/ZsensorC37_YL83_HMRD.ino
+1 -1
View File
@@ -67,7 +67,7 @@ void MeasureC37_YL83_HMRDWater() {
} }
if (C37_YL83_HMRDdata.size() > 0) { if (C37_YL83_HMRDdata.size() > 0) {
C37_YL83_HMRDdata["origin"] = C37_YL83_HMRD_TOPIC; C37_YL83_HMRDdata["origin"] = C37_YL83_HMRD_TOPIC;
handleJsonEnqueue(C37_YL83_HMRDdata); enqueueJsonObject(C37_YL83_HMRDdata);
if (sensorDigitalValue == 1) { //No water detected, all good we can sleep if (sensorDigitalValue == 1) { //No water detected, all good we can sleep
if (SYSConfig.powerMode > 0) if (SYSConfig.powerMode > 0)
ready_to_sleep = true; ready_to_sleep = true;
main/ZsensorDHT.ino
+1 -1
View File
@@ -69,7 +69,7 @@ void MeasureTempAndHum() {
Log.trace(F("Same temp don't send it" CR)); Log.trace(F("Same temp don't send it" CR));
} }
DHTdata["origin"] = DHTTOPIC; DHTdata["origin"] = DHTTOPIC;
handleJsonEnqueue(DHTdata); enqueueJsonObject(DHTdata);
} }
persistedh = h; persistedh = h;
persistedt = t; persistedt = t;
main/ZsensorDS1820.ino
+1 -1
View File
@@ -158,7 +158,7 @@ void MeasureDS1820Temp() {
} }
String origin = String(OW_TOPIC) + "/" + ds1820_addr[i]; String origin = String(OW_TOPIC) + "/" + ds1820_addr[i];
DS1820data["origin"] = origin; DS1820data["origin"] = origin;
handleJsonEnqueue(DS1820data); enqueueJsonObject(DS1820data);
if (SYSConfig.powerMode > 0) if (SYSConfig.powerMode > 0)
ready_to_sleep = true; ready_to_sleep = true;
} else { } else {
main/ZsensorGPIOInput.ino
+1 -1
View File
@@ -92,7 +92,7 @@ void MeasureGPIOInput() {
GPIOdata["gpio"] = "LOW"; GPIOdata["gpio"] = "LOW";
} }
GPIOdata["origin"] = subjectGPIOInputtoMQTT; GPIOdata["origin"] = subjectGPIOInputtoMQTT;
handleJsonEnqueue(GPIOdata); enqueueJsonObject(GPIOdata);
# if defined(ZactuatorONOFF) && defined(ACTUATOR_TRIGGER) # if defined(ZactuatorONOFF) && defined(ACTUATOR_TRIGGER)
//Trigger the actuator if we are not at startup //Trigger the actuator if we are not at startup
main/ZsensorHCSR04.ino
+1 -1
View File
@@ -69,7 +69,7 @@ void MeasureDistance() {
Log.trace(F("HC SR04 Distance hasn't changed" CR)); Log.trace(F("HC SR04 Distance hasn't changed" CR));
} }
distance = d; distance = d;
handleJsonEnqueue(HCSR04data); enqueueJsonObject(HCSR04data);
} }
} }
} }
main/ZsensorHCSR501.ino
+1 -1
View File
@@ -64,7 +64,7 @@ void MeasureHCSR501() {
# endif # endif
if (HCSR501data.size() > 0) { if (HCSR501data.size() > 0) {
HCSR501data["origin"] = subjectHCSR501toMQTT; HCSR501data["origin"] = subjectHCSR501toMQTT;
handleJsonEnqueue(HCSR501data); enqueueJsonObject(HCSR501data);
} }
} }
} }
main/ZsensorHTU21.ino
+1 -1
View File
@@ -101,7 +101,7 @@ void MeasureTempHum() {
Log.notice(F("Same Humidity. Don't send it" CR)); Log.notice(F("Same Humidity. Don't send it" CR));
} }
HTU21data["origin"] = HTUTOPIC; HTU21data["origin"] = HTUTOPIC;
handleJsonEnqueue(HTU21data); enqueueJsonObject(HTU21data);
} }
persisted_htu_tempc = HtuTempC; persisted_htu_tempc = HtuTempC;
persisted_htu_hum = HtuHum; persisted_htu_hum = HtuHum;
main/ZsensorINA226.ino
+1 -1
View File
@@ -73,7 +73,7 @@ void MeasureINA226() {
INA226data["current"] = current; INA226data["current"] = current;
INA226data["power"] = power; INA226data["power"] = power;
INA226data["origin"] = subjectINA226toMQTT; INA226data["origin"] = subjectINA226toMQTT;
handleJsonEnqueue(INA226data); enqueueJsonObject(INA226data);
} }
} }
main/ZsensorLM75.ino
+1 -1
View File
@@ -88,7 +88,7 @@ void MeasureTemp() {
LM75data["tempc"] = (float)lm75TempC; LM75data["tempc"] = (float)lm75TempC;
LM75data["tempf"] = (float)lm75TempF; LM75data["tempf"] = (float)lm75TempF;
LM75data["origin"] = LM75TOPIC; LM75data["origin"] = LM75TOPIC;
handleJsonEnqueue(LM75data); enqueueJsonObject(LM75data);
} else { } else {
Log.notice(F("Same Temp. Don't send it" CR)); Log.notice(F("Same Temp. Don't send it" CR));
} }
main/ZsensorMQ2.ino
+1 -1
View File
@@ -67,7 +67,7 @@ void MeasureGasMQ2() {
MQ2data["gas"] = analogRead(MQ2SENSORADCPIN); MQ2data["gas"] = analogRead(MQ2SENSORADCPIN);
MQ2data["detected"] = digitalRead(MQ2SENSORDETECTPIN) == HIGH ? "false" : "true"; MQ2data["detected"] = digitalRead(MQ2SENSORDETECTPIN) == HIGH ? "false" : "true";
MQ2data["origin"] = subjectMQ2toMQTT; MQ2data["origin"] = subjectMQ2toMQTT;
handleJsonEnqueue(MQ2data); enqueueJsonObject(MQ2data);
} }
} }
#endif #endif
main/ZsensorRN8209.ino
+1 -1
View File
@@ -95,7 +95,7 @@ void rn8209_loop(void* mode) {
PublishingTimerRN8209 = now; PublishingTimerRN8209 = now;
if (RN8209data) { if (RN8209data) {
RN8209data["origin"] = subjectRN8209toMQTT; RN8209data["origin"] = subjectRN8209toMQTT;
handleJsonEnqueue(RN8209data, QueueSemaphoreTimeOutTask); enqueueJsonObject(RN8209data, QueueSemaphoreTimeOutTask);
} }
} }
//esp_task_wdt_reset(); //esp_task_wdt_reset();
main/ZsensorSHTC3.ino
+1 -1
View File
@@ -61,7 +61,7 @@ void MeasureTempAndHum() {
Log.trace(F("Same temp don't send it" CR)); Log.trace(F("Same temp don't send it" CR));
} }
SHTC3data["origin"] = SHTC3TOPIC; SHTC3data["origin"] = SHTC3TOPIC;
handleJsonEnqueue(SHTC3data); enqueueJsonObject(SHTC3data);
} }
persistedh = h; persistedh = h;
persistedt = t; persistedt = t;
main/ZsensorTEMT6000.ino
+1 -1
View File
@@ -68,7 +68,7 @@ void MeasureLightIntensityTEMT6000() {
TEMT6000data["ftcd"] = (float)(lux) / 10.764; TEMT6000data["ftcd"] = (float)(lux) / 10.764;
TEMT6000data["wattsm2"] = (float)(lux) / 683.0; TEMT6000data["wattsm2"] = (float)(lux) / 683.0;
TEMT6000data["origin"] = subjectTEMT6000toMQTT; TEMT6000data["origin"] = subjectTEMT6000toMQTT;
handleJsonEnqueue(TEMT6000data); enqueueJsonObject(TEMT6000data);
} else { } else {
Log.trace(F("Same lux value, do not send" CR)); Log.trace(F("Same lux value, do not send" CR));
} }
main/ZsensorTSL2561.ino
+1 -1
View File
@@ -105,7 +105,7 @@ void MeasureLightIntensityTSL2561() {
TSL2561data["ftcd"] = (float)(event.light) / 10.764; TSL2561data["ftcd"] = (float)(event.light) / 10.764;
TSL2561data["wattsm2"] = (float)(event.light) / 683.0; TSL2561data["wattsm2"] = (float)(event.light) / 683.0;
TSL2561data["origin"] = subjectTSL12561toMQTT; TSL2561data["origin"] = subjectTSL12561toMQTT;
handleJsonEnqueue(TSL2561data); enqueueJsonObject(TSL2561data);
} else { } else {
Log.trace(F("Same lux value, do not send" CR)); Log.trace(F("Same lux value, do not send" CR));
} }
main/ZwebUI.ino
+1 -1
View File
@@ -1741,7 +1741,7 @@ String stateWebUIStatus() {
// WebUIdata["currentMessage"] = currentWebUIMessage; // WebUIdata["currentMessage"] = currentWebUIMessage;
WebUIdata["origin"] = subjectWebUItoMQTT; WebUIdata["origin"] = subjectWebUItoMQTT;
handleJsonEnqueue(WebUIdata); enqueueJsonObject(WebUIdata);
return output; return output;
} }
main/main.ino
+8 -13
View File
@@ -89,7 +89,7 @@ struct JsonBundle {
StaticJsonDocument<JSON_MSG_BUFFER> doc; StaticJsonDocument<JSON_MSG_BUFFER> doc;
}; };
std::queue<String> jsonQueue; std::queue<std::string> jsonQueue;
#ifdef ESP32 #ifdef ESP32
# include <driver/adc.h> # include <driver/adc.h>
@@ -496,7 +496,7 @@ boolean enqueueJsonObject(const StaticJsonDocument<JSON_MSG_BUFFER>& jsonDoc, in
return false; return false;
} }
Log.trace(F("Enqueue JSON" CR)); Log.trace(F("Enqueue JSON" CR));
String jsonString; std::string jsonString;
serializeJson(jsonDoc, jsonString); serializeJson(jsonDoc, jsonString);
#ifdef ESP32 #ifdef ESP32
// Semaphore check before enqueueing a document // Semaphore check before enqueueing a document
@@ -514,14 +514,9 @@ boolean enqueueJsonObject(const StaticJsonDocument<JSON_MSG_BUFFER>& jsonDoc, in
return true; return true;
} }
// Semaphore check before enqueueing a document
bool handleJsonEnqueue(const StaticJsonDocument<JSON_MSG_BUFFER>& jsonDoc, int timeout) {
return enqueueJsonObject(jsonDoc, timeout);
}
// Semaphore check before enqueueing a document with default timeout QueueSemaphoreTimeOutLoop // Semaphore check before enqueueing a document with default timeout QueueSemaphoreTimeOutLoop
bool handleJsonEnqueue(const StaticJsonDocument<JSON_MSG_BUFFER>& jsonDoc) { bool enqueueJsonObject(const StaticJsonDocument<JSON_MSG_BUFFER>& jsonDoc) {
return handleJsonEnqueue(jsonDoc, QueueSemaphoreTimeOutLoop); return enqueueJsonObject(jsonDoc, QueueSemaphoreTimeOutLoop);
} }
#ifdef ESP32 #ifdef ESP32
@@ -2824,7 +2819,7 @@ String stateMeasures() {
SYSdata["modules"] = modules; SYSdata["modules"] = modules;
SYSdata["origin"] = subjectSYStoMQTT; SYSdata["origin"] = subjectSYStoMQTT;
handleJsonEnqueue(SYSdata); enqueueJsonObject(SYSdata);
pubOled(subjectSYStoMQTT, SYSdata); pubOled(subjectSYStoMQTT, SYSdata);
char jsonChar[100]; char jsonChar[100];
@@ -3074,7 +3069,7 @@ bool checkForUpdates() {
latestVersion = jsondata["latest_version"].as<String>(); latestVersion = jsondata["latest_version"].as<String>();
jsondata["origin"] = subjectRLStoMQTT; jsondata["origin"] = subjectRLStoMQTT;
jsondata["retain"] = true; jsondata["retain"] = true;
handleJsonEnqueue(jsondata); enqueueJsonObject(jsondata);
Log.trace(F("Update file found on server" CR)); Log.trace(F("Update file found on server" CR));
return true; return true;
@@ -3149,7 +3144,7 @@ void MQTTHttpsFWUpdate(char* topicOri, JsonObject& HttpsFwUpdateData) {
StaticJsonDocument<JSON_MSG_BUFFER> jsondata; StaticJsonDocument<JSON_MSG_BUFFER> jsondata;
jsondata["release_summary"] = "Update in progress ..."; jsondata["release_summary"] = "Update in progress ...";
jsondata["origin"] = subjectRLStoMQTT; jsondata["origin"] = subjectRLStoMQTT;
handleJsonEnqueue(jsondata); enqueueJsonObject(jsondata);
std::string ota_cert = processCert(HttpsFwUpdateData["ota_server_cert"] | ""); std::string ota_cert = processCert(HttpsFwUpdateData["ota_server_cert"] | "");
Log.notice(F("OTA cert: %s" CR), ota_cert.c_str()); Log.notice(F("OTA cert: %s" CR), ota_cert.c_str());
@@ -3225,7 +3220,7 @@ void MQTTHttpsFWUpdate(char* topicOri, JsonObject& HttpsFwUpdateData) {
jsondata["release_summary"] = "Update success !"; jsondata["release_summary"] = "Update success !";
jsondata["installed_version"] = latestVersion; jsondata["installed_version"] = latestVersion;
jsondata["origin"] = subjectRLStoMQTT; jsondata["origin"] = subjectRLStoMQTT;
handleJsonEnqueue(jsondata); enqueueJsonObject(jsondata);
# if !MQTT_BROKER_MODE # if !MQTT_BROKER_MODE
if (cnt_index != 0) // We don't enable the change of cert provided at build time if (cnt_index != 0) // We don't enable the change of cert provided at build time
cnt_parameters_array[cnt_index].ota_server_cert = ota_cert; cnt_parameters_array[cnt_index].ota_server_cert = ota_cert;