mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-07 03:56:57 +03:00
* Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * fix frozen time in datafile on error (#1534) Co-authored-by: CaCO3 <caco@ruinelli.ch> * log NTP server name (#1497) * log NTP server name * . * . * replace calls to /wasserzaehler.html with calls to /value (#1469) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix cookie usage, use correct http response codes, add 404 page (#1495) * replaced some HTTP response code with better matching codes * add custom 404 page, add log entry for debugging * fix cookie * replace non-necessary whitespace * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Don't autofail if NTP server can't be reached during initalization (#1498) This fixes an issue with a restricted network without internet access, where the hardcoded ntp server can't be reached and thus the esp resets, as it's not able to finish initalization. * Update Changelog.md * Update Changelog.md for release * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * only use sntp_getservername() after init sntp * set default NTP server on dnew installations Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> * Renamed variables and added debug log (#1537) * add debug logs * renamed variables * renamed TAGs, added flow status logging * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * replaced printf usage in LogFile.WriteToFile() * ENABLE_MQTT c++ macro definition (#1546) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition (#1547) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition * Update Changelog.md * Update Changelog.md * Rearange task to CPU (http, camera, mqtt) (#1557) * Streamlined MQTT interlock when not activated & interlock MQTT when WIFI is not connected (#1556) * streamlined mqtt interlock when disabled * Disconnect mqtt client before reboot * Interlock MQTT with WIFI * Update * loglevel to DEBUG * Update * mqtt msg id incremental * new ENABLE_MQTT includes * Loglevel to DEBUG * Loglevel * Update interface_mqtt.cpp * show uptime on overview page, moved labels from firmware to Web UI (#1543) * show uptime on overview page, moved labels from firmware to Web UI * show uptime on info page * also use formated time in log Co-authored-by: CaCO3 <caco@ruinelli.ch> * Continue boot on bad PSRAM (#1558) * add sensor status, show special index/setup page in case of a critical error * continue booting on PSRAM error * Update main.cpp added log messages * init PSRAM and add more log messages * cleanup of init checks * . * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * add sensor status, show special index/setup page in case of a critical error (#1560) * add sensor status, show special index/setup page in case of a critical error * Added Reboot * . * added more buttons Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * Update Webinstaller to v13.0.7 * remove html-from-11.3.1 in release (#1565) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 * only initial_esp32_setup and update.zip as artefacts * remove unneeded cache * rename step ota-v2 to ota * rename ota-v2 to ota Co-authored-by: github-actions <github-actions@github.com> * make the sidebar on the overviw page wider and show the round counter (#1570) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Create reply-bot.yml * Update ClassFlowPostProcessing.cpp * Add bot (#1581) * Update reply-bot.yml * Create label-commenter-config.yml * added missing html change * extended instructions (#1583) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix Rate Problem * removed redundant "Status:" * Bugfix Double Extract ZIP-Files * Update FeatureRequest.md (#1591) in case of position change between the measurments set this state to true, if there is no change set it back to false. In a defined time window this movement can lead into an alarm state / water leak.. haveing this state in the mqtt broker can trigger functions like closing the ater pipe walve and so on... * Update manifest.json * Delete .gitignore * Delete .gitmodules * Delete firmware.bin * Add files via upload * Block REST API calls till resource is ready (#1609) * Block REST API call till ressource is ready * Update * Update * Update * replace relative include of gethost.js with absolute one. This is needed as that file gets incuded on dynamically generated content which can be on different path levels (#1610) Co-authored-by: CaCO3 <caco@ruinelli.ch> * esp_spiram.h has been replaced by esp32/spiram.h (#1605) * esp_spiram.h has been replaced by esp32/spiram.h * Preparations for next Bugfix Release (#1615) * Merge branch 'rolling' (#1559) * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * fix frozen time in datafile on error (#1534) Co-authored-by: CaCO3 <caco@ruinelli.ch> * log NTP server name (#1497) * log NTP server name * . * . * replace calls to /wasserzaehler.html with calls to /value (#1469) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix cookie usage, use correct http response codes, add 404 page (#1495) * replaced some HTTP response code with better matching codes * add custom 404 page, add log entry for debugging * fix cookie * replace non-necessary whitespace * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Don't autofail if NTP server can't be reached during initalization (#1498) This fixes an issue with a restricted network without internet access, where the hardcoded ntp server can't be reached and thus the esp resets, as it's not able to finish initalization. * Update Changelog.md * Update Changelog.md for release * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * only use sntp_getservername() after init sntp * set default NTP server on dnew installations Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> * Renamed variables and added debug log (#1537) * add debug logs * renamed variables * renamed TAGs, added flow status logging * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * replaced printf usage in LogFile.WriteToFile() * ENABLE_MQTT c++ macro definition (#1546) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition (#1547) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition * Update Changelog.md Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: Nicolas Liaudat <nliaudat@users.noreply.github.com> * Update Changelog.md for release Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: Nicolas Liaudat <nliaudat@users.noreply.github.com> * new model version (#1619) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 * only initial_esp32_setup and update.zip as artefacts * remove unneeded cache * rename step ota-v2 to ota * rename ota-v2 to ota * new models - ana-class100 v1.5.4 - ana-cont-11.0.4 - dig-class100 v1.5.0 Co-authored-by: github-actions <github-actions@github.com> * Update Changelog.md (#1630) * Correct RenameNumber * Update Changelog.md * Fix reloading of data file (#1635) * Update data.html * fixed * show link to graph Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: Nicolas Liaudat <nliaudat@users.noreply.github.com> Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> Co-authored-by: smartboart <38385805+smartboart@users.noreply.github.com>
311 lines
9.9 KiB
C++
311 lines
9.9 KiB
C++
#ifdef ENABLE_MQTT
|
|
|
|
#include <sstream>
|
|
#include <iomanip>
|
|
#include "ClassFlowMQTT.h"
|
|
#include "Helper.h"
|
|
#include "connect_wlan.h"
|
|
#include "ClassLogFile.h"
|
|
|
|
#include "time_sntp.h"
|
|
#include "interface_mqtt.h"
|
|
#include "ClassFlowPostProcessing.h"
|
|
#include "ClassFlowControll.h"
|
|
|
|
#include "server_mqtt.h"
|
|
|
|
#include <time.h>
|
|
|
|
|
|
#define __HIDE_PASSWORD
|
|
|
|
static const char *TAG = "MQTT";
|
|
#define LWT_TOPIC "connection"
|
|
#define LWT_CONNECTED "connected"
|
|
#define LWT_DISCONNECTED "connection lost"
|
|
|
|
extern const char* libfive_git_version(void);
|
|
extern const char* libfive_git_revision(void);
|
|
extern const char* libfive_git_branch(void);
|
|
|
|
|
|
void ClassFlowMQTT::SetInitialParameter(void)
|
|
{
|
|
uri = "";
|
|
topic = "";
|
|
topicError = "";
|
|
topicRate = "";
|
|
topicTimeStamp = "";
|
|
maintopic = hostname;
|
|
|
|
topicUptime = "";
|
|
topicFreeMem = "";
|
|
|
|
clientname = "AIOTED-" + getMac();
|
|
|
|
OldValue = "";
|
|
flowpostprocessing = NULL;
|
|
user = "";
|
|
password = "";
|
|
SetRetainFlag = 0;
|
|
previousElement = NULL;
|
|
ListFlowControll = NULL;
|
|
disabled = false;
|
|
keepAlive = 25*60;
|
|
}
|
|
|
|
ClassFlowMQTT::ClassFlowMQTT()
|
|
{
|
|
SetInitialParameter();
|
|
}
|
|
|
|
ClassFlowMQTT::ClassFlowMQTT(std::vector<ClassFlow*>* lfc)
|
|
{
|
|
SetInitialParameter();
|
|
|
|
ListFlowControll = lfc;
|
|
for (int i = 0; i < ListFlowControll->size(); ++i)
|
|
{
|
|
if (((*ListFlowControll)[i])->name().compare("ClassFlowPostProcessing") == 0)
|
|
{
|
|
flowpostprocessing = (ClassFlowPostProcessing*) (*ListFlowControll)[i];
|
|
}
|
|
}
|
|
}
|
|
|
|
ClassFlowMQTT::ClassFlowMQTT(std::vector<ClassFlow*>* lfc, ClassFlow *_prev)
|
|
{
|
|
SetInitialParameter();
|
|
|
|
previousElement = _prev;
|
|
ListFlowControll = lfc;
|
|
|
|
for (int i = 0; i < ListFlowControll->size(); ++i)
|
|
{
|
|
if (((*ListFlowControll)[i])->name().compare("ClassFlowPostProcessing") == 0)
|
|
{
|
|
flowpostprocessing = (ClassFlowPostProcessing*) (*ListFlowControll)[i];
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
bool ClassFlowMQTT::ReadParameter(FILE* pfile, string& aktparamgraph)
|
|
{
|
|
std::vector<string> zerlegt;
|
|
|
|
aktparamgraph = trim(aktparamgraph);
|
|
|
|
if (aktparamgraph.size() == 0)
|
|
if (!this->GetNextParagraph(pfile, aktparamgraph))
|
|
return false;
|
|
|
|
if (toUpper(aktparamgraph).compare("[MQTT]") != 0) // Paragraph passt nich zu MakeImage
|
|
return false;
|
|
|
|
while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph))
|
|
{
|
|
zerlegt = ZerlegeZeile(aktparamgraph);
|
|
if ((toUpper(zerlegt[0]) == "USER") && (zerlegt.size() > 1))
|
|
{
|
|
this->user = zerlegt[1];
|
|
}
|
|
if ((toUpper(zerlegt[0]) == "PASSWORD") && (zerlegt.size() > 1))
|
|
{
|
|
this->password = zerlegt[1];
|
|
}
|
|
if ((toUpper(zerlegt[0]) == "URI") && (zerlegt.size() > 1))
|
|
{
|
|
this->uri = zerlegt[1];
|
|
}
|
|
if ((toUpper(zerlegt[0]) == "SETRETAINFLAG") && (zerlegt.size() > 1))
|
|
{
|
|
if (toUpper(zerlegt[1]) == "TRUE") {
|
|
SetRetainFlag = 1;
|
|
setMqtt_Server_Retain(SetRetainFlag);
|
|
}
|
|
}
|
|
if ((toUpper(zerlegt[0]) == "HOMEASSISTANTDISCOVERY") && (zerlegt.size() > 1))
|
|
{
|
|
if (toUpper(zerlegt[1]) == "TRUE")
|
|
SetHomeassistantDiscoveryEnabled(true);
|
|
}
|
|
if ((toUpper(zerlegt[0]) == "METERTYPE") && (zerlegt.size() > 1)) {
|
|
/* Use meter type for the device class
|
|
Make sure it is a listed one on https://developers.home-assistant.io/docs/core/entity/sensor/#available-device-classes */
|
|
if (toUpper(zerlegt[1]) == "WATER_M3") {
|
|
mqttServer_setMeterType("water", "m³", "h", "m³/h");
|
|
}
|
|
else if (toUpper(zerlegt[1]) == "WATER_L") {
|
|
mqttServer_setMeterType("water", "L", "h", "L/h");
|
|
}
|
|
else if (toUpper(zerlegt[1]) == "WATER_FT3") {
|
|
mqttServer_setMeterType("water", "ft³", "m", "ft³/m"); // Minutes
|
|
}
|
|
else if (toUpper(zerlegt[1]) == "WATER_GAL") {
|
|
mqttServer_setMeterType("water", "gal", "h", "gal/h");
|
|
}
|
|
else if (toUpper(zerlegt[1]) == "GAS_M3") {
|
|
mqttServer_setMeterType("gas", "m³", "h", "m³/h");
|
|
}
|
|
else if (toUpper(zerlegt[1]) == "GAS_FT3") {
|
|
mqttServer_setMeterType("gas", "ft³", "m", "ft³/m"); // Minutes
|
|
}
|
|
else if (toUpper(zerlegt[1]) == "ENERGY_WH") {
|
|
mqttServer_setMeterType("energy", "Wh", "h", "W");
|
|
}
|
|
else if (toUpper(zerlegt[1]) == "ENERGY_KWH") {
|
|
mqttServer_setMeterType("energy", "kWh", "h", "kW");
|
|
}
|
|
else if (toUpper(zerlegt[1]) == "ENERGY_MWH") {
|
|
mqttServer_setMeterType("energy", "MWh", "h", "MW");
|
|
}
|
|
}
|
|
|
|
if ((toUpper(zerlegt[0]) == "CLIENTID") && (zerlegt.size() > 1))
|
|
{
|
|
this->clientname = zerlegt[1];
|
|
}
|
|
|
|
if (((toUpper(zerlegt[0]) == "TOPIC") || (toUpper(zerlegt[0]) == "MAINTOPIC")) && (zerlegt.size() > 1))
|
|
{
|
|
maintopic = zerlegt[1];
|
|
mqttServer_setMainTopic(maintopic);
|
|
}
|
|
}
|
|
|
|
/* Note:
|
|
* Originally, we started the MQTT client here.
|
|
* How ever we need the interval parameter from the ClassFlowControll, but that only gets started later.
|
|
* To work around this, we delay the start and trigger it from ClassFlowControll::ReadParameter() */
|
|
|
|
return true;
|
|
}
|
|
|
|
|
|
string ClassFlowMQTT::GetMQTTMainTopic()
|
|
{
|
|
return maintopic;
|
|
}
|
|
|
|
|
|
bool ClassFlowMQTT::Start(float AutoIntervall)
|
|
{
|
|
roundInterval = AutoIntervall; // Minutes
|
|
keepAlive = roundInterval * 60 * 2.5; // Seconds, make sure it is greater thatn 2 rounds!
|
|
|
|
std::stringstream stream;
|
|
stream << std::fixed << std::setprecision(1) << "Digitizer interval is " << roundInterval <<
|
|
" minutes => setting MQTT LWT timeout to " << ((float)keepAlive/60) << " minutes.";
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, stream.str());
|
|
|
|
mqttServer_setParameter(flowpostprocessing->GetNumbers(), keepAlive, roundInterval);
|
|
|
|
bool MQTTConfigCheck = MQTT_Configure(uri, clientname, user, password, maintopic, LWT_TOPIC, LWT_CONNECTED,
|
|
LWT_DISCONNECTED, keepAlive, SetRetainFlag, (void *)&GotConnected);
|
|
|
|
if (!MQTTConfigCheck) {
|
|
return false;
|
|
}
|
|
|
|
return (MQTT_Init() == 1);
|
|
}
|
|
|
|
|
|
bool ClassFlowMQTT::doFlow(string zwtime)
|
|
{
|
|
std::string result;
|
|
std::string resulterror = "";
|
|
std::string resultraw = "";
|
|
std::string resultpre = "";
|
|
std::string resultrate = ""; // Always Unit / Minute
|
|
std::string resultRatePerTimeUnit = ""; // According to selection
|
|
std::string resulttimestamp = "";
|
|
std::string resultchangabs = "";
|
|
string zw = "";
|
|
string namenumber = "";
|
|
|
|
publishSystemData();
|
|
|
|
if (flowpostprocessing && getMQTTisConnected())
|
|
{
|
|
std::vector<NumberPost*>* NUMBERS = flowpostprocessing->GetNumbers();
|
|
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Publishing MQTT topics...");
|
|
|
|
for (int i = 0; i < (*NUMBERS).size(); ++i)
|
|
{
|
|
result = (*NUMBERS)[i]->ReturnValue;
|
|
resultraw = (*NUMBERS)[i]->ReturnRawValue;
|
|
resultpre = (*NUMBERS)[i]->ReturnPreValue;
|
|
resulterror = (*NUMBERS)[i]->ErrorMessageText;
|
|
resultrate = (*NUMBERS)[i]->ReturnRateValue; // Unit per minutes
|
|
resultchangabs = (*NUMBERS)[i]->ReturnChangeAbsolute; // Units per round
|
|
resulttimestamp = (*NUMBERS)[i]->timeStamp;
|
|
|
|
namenumber = (*NUMBERS)[i]->name;
|
|
if (namenumber == "default")
|
|
namenumber = maintopic + "/";
|
|
else
|
|
namenumber = maintopic + "/" + namenumber + "/";
|
|
|
|
|
|
if (result.length() > 0)
|
|
MQTTPublish(namenumber + "value", result, SetRetainFlag);
|
|
|
|
if (resulterror.length() > 0)
|
|
MQTTPublish(namenumber + "error", resulterror, SetRetainFlag);
|
|
|
|
if (resultrate.length() > 0) {
|
|
MQTTPublish(namenumber + "rate", resultrate, SetRetainFlag);
|
|
|
|
std::string resultRatePerTimeUnit;
|
|
if (getTimeUnit() == "h") { // Need conversion to be per hour
|
|
resultRatePerTimeUnit = resultRatePerTimeUnit = to_string((*NUMBERS)[i]->FlowRateAct * 60); // per minutes => per hour
|
|
}
|
|
else { // Keep per minute
|
|
resultRatePerTimeUnit = resultrate;
|
|
}
|
|
MQTTPublish(namenumber + "rate_per_time_unit", resultRatePerTimeUnit, SetRetainFlag);
|
|
}
|
|
|
|
if (resultchangabs.length() > 0) {
|
|
MQTTPublish(namenumber + "changeabsolut", resultchangabs, SetRetainFlag); // Legacy API
|
|
MQTTPublish(namenumber + "rate_per_digitalization_round", resultchangabs, SetRetainFlag);
|
|
}
|
|
|
|
if (resultraw.length() > 0)
|
|
MQTTPublish(namenumber + "raw", resultraw, SetRetainFlag);
|
|
|
|
if (resulttimestamp.length() > 0)
|
|
MQTTPublish(namenumber + "timestamp", resulttimestamp, SetRetainFlag);
|
|
|
|
std::string json = flowpostprocessing->getJsonFromNumber(i, "\n");
|
|
MQTTPublish(namenumber + "json", json, SetRetainFlag);
|
|
}
|
|
}
|
|
|
|
/* Disabled because this is no longer a use case */
|
|
// else
|
|
// {
|
|
// for (int i = 0; i < ListFlowControll->size(); ++i)
|
|
// {
|
|
// zw = (*ListFlowControll)[i]->getReadout();
|
|
// if (zw.length() > 0)
|
|
// {
|
|
// if (result.length() == 0)
|
|
// result = zw;
|
|
// else
|
|
// result = result + "\t" + zw;
|
|
// }
|
|
// }
|
|
// MQTTPublish(topic, result, SetRetainFlag);
|
|
// }
|
|
|
|
OldValue = result;
|
|
|
|
return true;
|
|
}
|
|
|
|
|
|
#endif //ENABLE_MQTT
|