Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2026-01-29 22:00:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

test4

Browse Source
This commit is contained in:
michael
2026-01-18 20:26:17 +01:00
parent f2f5ae7b8f
commit 6e1288dca0
7 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp
View File

@@ -56,7 +56,7 @@ void ClassFlowMQTT::SetInitialParameter(void)
mqtt_controll_config.validateServerCert = true;
mqtt_controll_config.clientname = network_config.hostname;
mqtt_controll_config.OldValue = "";
mqtt_controll_config.oldValue = "";
mqtt_controll_config.user = "";
mqtt_controll_config.password = "";
@@ -362,10 +362,12 @@ bool ClassFlowMQTT::doFlow(std::string time)
if (name_temp == "default")
{
// e.g. watermeter/default/
name_temp = mqtt_controll_config.maintopic + "/";
}
else
{
// e.g. watermeter/main/
name_temp = mqtt_controll_config.maintopic + "/" + name_temp + "/";
}
@@ -404,6 +406,7 @@ bool ClassFlowMQTT::doFlow(std::string time)
if (change_absolute_temp.length() > 0)
{
// e.g. _key = watermeter/main/changeabsolut, _content = change_absolute_temp, _qos = 1, retained_flag = mqtt_controll_config.retainFlag
success |= MQTTPublish(name_temp + "changeabsolut", change_absolute_temp, qos, mqtt_controll_config.retainFlag); // Legacy API
success |= MQTTPublish(name_temp + "rate_per_digitization_round", change_absolute_temp, qos, mqtt_controll_config.retainFlag);
}
@@ -423,7 +426,7 @@ bool ClassFlowMQTT::doFlow(std::string time)
}
}
mqtt_controll_config.OldValue = value_temp;
mqtt_controll_config.oldValue = value_temp;
if (!success)
{

2
code/components/jomjol_flowcontroll/ClassFlowMQTT.h
View File

@@ -28,7 +28,7 @@ typedef struct
std::string topicTimeStamp;
std::string topicUptime;
std::string topicFreeMem;
std::string OldValue;
std::string oldValue;
std::string user;
std::string password;

9
code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp
View File

@@ -79,6 +79,15 @@ std::string ClassFlowPostProcessing::getJsonFromNumber(int i, std::string _linee
{
json += " \"rate\": \"\"," + _lineend;
}
if (NUMBERS[i]->ReturnChangeAbsolute.length() > 0)
{
json += " \"absrate\": \"" + NUMBERS[i]->ReturnChangeAbsolute + "\"," + _lineend;
}
else
{
json += " \"absrate\": \"\"," + _lineend;
}
json += " \"timestamp\": \"" + NUMBERS[i]->timeStamp + "\"" + _lineend;
json += " }" + _lineend;