mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-07 12:06:58 +03:00
* Implement individual influx topic * Update interface_influxdb.cpp * Update interface_influxdb.cpp * Update FieldName * analogROI: Activate save button after ROI creation (#2326) * Migration of PlatformIO 5.2.0 to 6.1.0 (resp. ESP IDF from 4.4.2 to 5.0.1) (#2305) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * fix leading NaN (#2310) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * Task watchdog has new config name * Fix return value check. It must be something else than ESP_FAIL, but it does not need to be ESP_OK! * add missing strucures to work around new RMTMEM restriction (untested) --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Keep MainFlowTask alive to handle reboot (#2325) * Shared PSRAM memory (#2285) * enable PSRAM logging * add extra functions for psram shared memroy handling * CImageBasis objects still should used dynamic memory (eg. rawImage), haw ever tmpImage must be placed inside the shared memory * Place all STBI allocs inside the shared memory * The models are placed in the shared PSRAM reagion and must be allocated through the dedicated functions * . * renaming * fix cast warning * add flag to switch STBI PSRAM usage * improve PSRAM shared handling * reserve shared PSRAM as early as possible * init logging eralier so we can use it in PSRAM shared alloc * move Wifi_LWIP, BSS_SEG and MQTT Outbox into PSRAM to ffree internal memory * Check if model fits into reserved shared memory * Update code/components/jomjol_tfliteclass/CTfLiteClass.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_flowcontroll/ClassFlowControll.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_image_proc/CImageBasis.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * . * . * . * . * Korrektur Merge Conflict in main.cpp --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * fix PSRAM init return value check * Extend incl. indiv. Measurement * Implement UX * Update ClassFlowInfluxDBv2.cpp * Implement individual influx topic * Update interface_influxdb.cpp * Update interface_influxdb.cpp * Update FieldName * Extend incl. indiv. Measurement * Implement UX * Update ClassFlowInfluxDBv2.cpp * Update main.cpp --------- Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> Co-authored-by: CaCO3 <caco3@ruinelli.ch> Co-authored-by: CaCO3 <caco@ruinelli.ch>
242 lines
6.9 KiB
C++
242 lines
6.9 KiB
C++
#ifdef ENABLE_INFLUXDB
|
|
#include <sstream>
|
|
#include "ClassFlowInfluxDBv2.h"
|
|
#include "Helper.h"
|
|
#include "connect_wlan.h"
|
|
|
|
#include "time_sntp.h"
|
|
#include "interface_influxdb.h"
|
|
|
|
#include "ClassFlowPostProcessing.h"
|
|
#include "esp_log.h"
|
|
#include "../../include/defines.h"
|
|
|
|
#include "ClassLogFile.h"
|
|
|
|
#include <time.h>
|
|
|
|
static const char* TAG = "INFLUXDBV2";
|
|
|
|
void ClassFlowInfluxDBv2::SetInitialParameter(void)
|
|
{
|
|
uri = "";
|
|
database = "";
|
|
dborg = "";
|
|
dbtoken = "";
|
|
// dbfield = "";
|
|
|
|
OldValue = "";
|
|
flowpostprocessing = NULL;
|
|
previousElement = NULL;
|
|
ListFlowControll = NULL;
|
|
disabled = false;
|
|
InfluxDBenable = false;
|
|
}
|
|
|
|
ClassFlowInfluxDBv2::ClassFlowInfluxDBv2()
|
|
{
|
|
SetInitialParameter();
|
|
}
|
|
|
|
ClassFlowInfluxDBv2::ClassFlowInfluxDBv2(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];
|
|
}
|
|
}
|
|
}
|
|
|
|
ClassFlowInfluxDBv2::ClassFlowInfluxDBv2(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 ClassFlowInfluxDBv2::ReadParameter(FILE* pfile, string& aktparamgraph)
|
|
{
|
|
std::vector<string> splitted;
|
|
|
|
aktparamgraph = trim(aktparamgraph);
|
|
printf("akt param: %s\n", aktparamgraph.c_str());
|
|
|
|
if (aktparamgraph.size() == 0)
|
|
if (!this->GetNextParagraph(pfile, aktparamgraph))
|
|
return false;
|
|
|
|
if (toUpper(aktparamgraph).compare("[INFLUXDBV2]") != 0)
|
|
return false;
|
|
|
|
while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph))
|
|
{
|
|
// ESP_LOGD(TAG, "while loop reading line: %s", aktparamgraph.c_str());
|
|
splitted = ZerlegeZeile(aktparamgraph);
|
|
std::string _param = GetParameterName(splitted[0]);
|
|
|
|
if ((toUpper(_param) == "ORG") && (splitted.size() > 1))
|
|
{
|
|
this->dborg = splitted[1];
|
|
}
|
|
if ((toUpper(_param) == "TOKEN") && (splitted.size() > 1))
|
|
{
|
|
this->dbtoken = splitted[1];
|
|
}
|
|
if ((toUpper(_param) == "URI") && (splitted.size() > 1))
|
|
{
|
|
this->uri = splitted[1];
|
|
}
|
|
if (((toUpper(_param) == "FIELD")) && (splitted.size() > 1))
|
|
{
|
|
handleFieldname(splitted[0], splitted[1]);
|
|
}
|
|
if (((toUpper(_param) == "MEASUREMENT")) && (splitted.size() > 1))
|
|
{
|
|
handleMeasurement(splitted[0], splitted[1]);
|
|
}
|
|
if (((toUpper(splitted[0]) == "DATABASE")) && (splitted.size() > 1))
|
|
{
|
|
this->database = splitted[1];
|
|
}
|
|
}
|
|
|
|
printf("uri: %s\n", uri.c_str());
|
|
printf("org: %s\n", dborg.c_str());
|
|
printf("token: %s\n", dbtoken.c_str());
|
|
|
|
if ((uri.length() > 0) && (database.length() > 0) && (dbtoken.length() > 0) && (dborg.length() > 0))
|
|
{
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Init InfluxDB with uri: " + uri + ", org: " + dborg + ", token: *****");
|
|
// printf("vor V2 Init\n");
|
|
InfluxDB_V2_Init(uri, database, dborg, dbtoken);
|
|
// printf("nach V2 Init\n");
|
|
InfluxDBenable = true;
|
|
} else {
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "InfluxDBv2 (Verion2 !!!) init skipped as we are missing some parameters");
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
/*
|
|
string ClassFlowInfluxDBv2::GetInfluxDBMeasurement()
|
|
{
|
|
return measurement;
|
|
}
|
|
*/
|
|
|
|
void ClassFlowInfluxDBv2::handleFieldname(string _decsep, string _value)
|
|
{
|
|
string _digit, _decpos;
|
|
int _pospunkt = _decsep.find_first_of(".");
|
|
// ESP_LOGD(TAG, "Name: %s, Pospunkt: %d", _decsep.c_str(), _pospunkt);
|
|
if (_pospunkt > -1)
|
|
_digit = _decsep.substr(0, _pospunkt);
|
|
else
|
|
_digit = "default";
|
|
for (int j = 0; j < flowpostprocessing->NUMBERS.size(); ++j)
|
|
{
|
|
if (_digit == "default") // Set to default first (if nothing else is set)
|
|
{
|
|
flowpostprocessing->NUMBERS[j]->FieldV2 = _value;
|
|
}
|
|
if (flowpostprocessing->NUMBERS[j]->name == _digit)
|
|
{
|
|
flowpostprocessing->NUMBERS[j]->FieldV2 = _value;
|
|
}
|
|
}
|
|
}
|
|
|
|
void ClassFlowInfluxDBv2::handleMeasurement(string _decsep, string _value)
|
|
{
|
|
string _digit, _decpos;
|
|
int _pospunkt = _decsep.find_first_of(".");
|
|
// ESP_LOGD(TAG, "Name: %s, Pospunkt: %d", _decsep.c_str(), _pospunkt);
|
|
if (_pospunkt > -1)
|
|
_digit = _decsep.substr(0, _pospunkt);
|
|
else
|
|
_digit = "default";
|
|
for (int j = 0; j < flowpostprocessing->NUMBERS.size(); ++j)
|
|
{
|
|
if (_digit == "default") // Set to default first (if nothing else is set)
|
|
{
|
|
flowpostprocessing->NUMBERS[j]->MeasurementV2 = _value;
|
|
}
|
|
if (flowpostprocessing->NUMBERS[j]->name == _digit)
|
|
{
|
|
flowpostprocessing->NUMBERS[j]->MeasurementV2 = _value;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
bool ClassFlowInfluxDBv2::doFlow(string zwtime)
|
|
{
|
|
if (!InfluxDBenable)
|
|
return true;
|
|
|
|
std::string measurement;
|
|
std::string result;
|
|
std::string resulterror = "";
|
|
std::string resultraw = "";
|
|
std::string resultrate = "";
|
|
std::string resulttimestamp = "";
|
|
string zw = "";
|
|
string namenumber = "";
|
|
|
|
|
|
if (flowpostprocessing)
|
|
{
|
|
std::vector<NumberPost*>* NUMBERS = flowpostprocessing->GetNumbers();
|
|
|
|
for (int i = 0; i < (*NUMBERS).size(); ++i)
|
|
{
|
|
measurement = (*NUMBERS)[i]->MeasurementV2;
|
|
result = (*NUMBERS)[i]->ReturnValue;
|
|
resultraw = (*NUMBERS)[i]->ReturnRawValue;
|
|
resulterror = (*NUMBERS)[i]->ErrorMessageText;
|
|
resultrate = (*NUMBERS)[i]->ReturnRateValue;
|
|
resulttimestamp = (*NUMBERS)[i]->timeStamp;
|
|
|
|
if ((*NUMBERS)[i]->FieldV2.length() > 0)
|
|
{
|
|
namenumber = (*NUMBERS)[i]->FieldV2;
|
|
}
|
|
else
|
|
{
|
|
namenumber = (*NUMBERS)[i]->name;
|
|
if (namenumber == "default")
|
|
namenumber = "value";
|
|
else
|
|
namenumber = namenumber + "/value";
|
|
}
|
|
|
|
printf("vor sende Influx_DB_V2 - namenumber. %s, result: %s, timestampt: %s", namenumber.c_str(), result.c_str(), resulttimestamp.c_str());
|
|
|
|
if (result.length() > 0)
|
|
InfluxDB_V2_Publish(measurement, namenumber, result, resulttimestamp);
|
|
// InfluxDB_V2_Publish(namenumber, result, resulttimestamp);
|
|
}
|
|
}
|
|
|
|
OldValue = result;
|
|
|
|
return true;
|
|
}
|
|
|
|
#endif //ENABLE_INFLUXDB
|