Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2025-12-08 04:26:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix for time stamp (#3180)

Browse Source 
* Update ClassFlowPostProcessing.cpp

* Update ClassFlowDefineTypes.h

* Update ClassFlowPostProcessing.cpp

* Update ClassFlowPostProcessing.cpp

* Update ClassFlowPostProcessing.cpp

* Update ClassFlowPostProcessing.cpp

* Update interface_webhook.cpp
This commit is contained in:
michael
2024-08-24 13:19:21 +02:00
committed by GitHub
parent c9a3df4eec
commit f8eb4db171
3 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/components/jomjol_flowcontroll/ClassFlowDefineTypes.h
View File

@@ -45,7 +45,8 @@ struct NumberPost {
bool PreValueOkay; // previousValueValid; indicates that the reading of the previous round has no errors bool PreValueOkay; // previousValueValid; indicates that the reading of the previous round has no errors
bool AllowNegativeRates; // allowNegativeRate; defines if the consistency checks allow negative rates between consecutive meter readings. bool AllowNegativeRates; // allowNegativeRate; defines if the consistency checks allow negative rates between consecutive meter readings.
bool checkDigitIncreaseConsistency; // extendedConsistencyCheck; performs an additional consistency check to avoid wrong readings bool checkDigitIncreaseConsistency; // extendedConsistencyCheck; performs an additional consistency check to avoid wrong readings
time_t lastvalue; // previousValueTimestamp; FIXME: usage in the code is ambigious, as sometimes it's `time_t` and sometimes `struct tm` time_t timeStampLastValue; // Timestamp for the last read value; is used for the log
time_t timeStampLastPreValue; // Timestamp for the last PreValue set; is used for useMaxRateValue
time_t timeStampTimeUTC; // FIXME: not used; can be removed. time_t timeStampTimeUTC; // FIXME: not used; can be removed.
string timeStamp; // localTimeStr; timestamp of last valid reading formatted as local time string timeStamp; // localTimeStr; timestamp of last valid reading formatted as local time
double FlowRateAct; // currentRate; ΔValue/min; since usage is not limited to water meters, the physical unit is not known. double FlowRateAct; // currentRate; ΔValue/min; since usage is not limited to water meters, the physical unit is not known.

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

@@ -128,8 +128,8 @@ bool ClassFlowPostProcessing::SetPreValue(double _newvalue, string _numbers, boo
NUMBERS[j]->PreValueOkay = true; NUMBERS[j]->PreValueOkay = true;
if (_extern) { if (_extern) {
time(&(NUMBERS[j]->lastvalue)); time(&(NUMBERS[j]->timeStampLastPreValue));
localtime(&(NUMBERS[j]->lastvalue)); localtime(&(NUMBERS[j]->timeStampLastPreValue));
} }
//ESP_LOGD(TAG, "Found %d! - set to %.8f", j, NUMBERS[j]->PreValue); //ESP_LOGD(TAG, "Found %d! - set to %.8f", j, NUMBERS[j]->PreValue);
@@ -199,11 +199,11 @@ bool ClassFlowPostProcessing::LoadPreValue(void) {
whenStart.tm_sec = ss; whenStart.tm_sec = ss;
whenStart.tm_isdst = -1; whenStart.tm_isdst = -1;
NUMBERS[j]->lastvalue = mktime(&whenStart); NUMBERS[j]->timeStampLastPreValue = mktime(&whenStart);
time(&tStart); time(&tStart);
localtime(&tStart); localtime(&tStart);
double difference = difftime(tStart, NUMBERS[j]->lastvalue); double difference = difftime(tStart, NUMBERS[j]->timeStampLastPreValue);
difference /= 60; difference /= 60;
if (difference > PreValueAgeStartup) { if (difference > PreValueAgeStartup) {
@@ -254,11 +254,11 @@ bool ClassFlowPostProcessing::LoadPreValue(void) {
ESP_LOGD(TAG, "TIME: %d, %d, %d, %d, %d, %d", whenStart.tm_year, whenStart.tm_mon, whenStart.tm_wday, whenStart.tm_hour, whenStart.tm_min, whenStart.tm_sec); ESP_LOGD(TAG, "TIME: %d, %d, %d, %d, %d, %d", whenStart.tm_year, whenStart.tm_mon, whenStart.tm_wday, whenStart.tm_hour, whenStart.tm_min, whenStart.tm_sec);
NUMBERS[0]->lastvalue = mktime(&whenStart); NUMBERS[0]->timeStampLastPreValue = mktime(&whenStart);
time(&tStart); time(&tStart);
localtime(&tStart); localtime(&tStart);
double difference = difftime(tStart, NUMBERS[0]->lastvalue); double difference = difftime(tStart, NUMBERS[0]->timeStampLastPreValue);
difference /= 60; difference /= 60;
if (difference > PreValueAgeStartup) { if (difference > PreValueAgeStartup) {
@@ -292,10 +292,10 @@ void ClassFlowPostProcessing::SavePreValue() {
for (int j = 0; j < NUMBERS.size(); ++j) { for (int j = 0; j < NUMBERS.size(); ++j) {
char buffer[80]; char buffer[80];
struct tm* timeinfo = localtime(&NUMBERS[j]->lastvalue); struct tm* timeinfo = localtime(&NUMBERS[j]->timeStampLastPreValue);
strftime(buffer, 80, PREVALUE_TIME_FORMAT_OUTPUT, timeinfo); strftime(buffer, 80, PREVALUE_TIME_FORMAT_OUTPUT, timeinfo);
NUMBERS[j]->timeStamp = std::string(buffer); NUMBERS[j]->timeStamp = std::string(buffer);
NUMBERS[j]->timeStampTimeUTC = NUMBERS[j]->lastvalue; NUMBERS[j]->timeStampTimeUTC = NUMBERS[j]->timeStampLastPreValue;
// ESP_LOGD(TAG, "SaverPreValue %d, Value: %f, Nachkomma %d", j, NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma); // ESP_LOGD(TAG, "SaverPreValue %d, Value: %f, Nachkomma %d", j, NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma);
_zw = NUMBERS[j]->name + "\t" + NUMBERS[j]->timeStamp + "\t" + RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma) + "\n"; _zw = NUMBERS[j]->name + "\t" + NUMBERS[j]->timeStamp + "\t" + RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma) + "\n";
@@ -722,12 +722,9 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) {
NUMBERS[j]->ErrorMessageText = ""; NUMBERS[j]->ErrorMessageText = "";
NUMBERS[j]->Value = -1; NUMBERS[j]->Value = -1;
// calculate time difference BEFORE we overwrite the 'lastvalue' // calculate time difference
double difference = difftime(imagetime, NUMBERS[j]->lastvalue); // in seconds // double LastValueTimeDifference = difftime(imagetime, NUMBERS[j]->timeStampLastValue); // in seconds
double LastPreValueTimeDifference = difftime(imagetime, NUMBERS[j]->timeStampLastPreValue); // in seconds
// TODO:
// We could call `NUMBERS[j]->lastvalue = imagetime;` here and remove all other such calls further down.
// But we should check nothing breaks!
UpdateNachkommaDecimalShift(); UpdateNachkommaDecimalShift();
@@ -791,9 +788,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) {
else { else {
string _zw = NUMBERS[j]->name + ": Raw: " + NUMBERS[j]->ReturnRawValue + ", Value: " + NUMBERS[j]->ReturnValue + ", Status: " + NUMBERS[j]->ErrorMessageText; string _zw = NUMBERS[j]->name + ": Raw: " + NUMBERS[j]->ReturnRawValue + ", Value: " + NUMBERS[j]->ReturnValue + ", Status: " + NUMBERS[j]->ErrorMessageText;
LogFile.WriteToFile(ESP_LOG_INFO, TAG, _zw); LogFile.WriteToFile(ESP_LOG_INFO, TAG, _zw);
/* TODO to be discussed, see https://github.com/jomjol/AI-on-the-edge-device/issues/1617 */ NUMBERS[j]->timeStampLastValue = imagetime;
NUMBERS[j]->lastvalue = imagetime;
WriteDataLog(j); WriteDataLog(j);
continue; // there is no number because there is still an N. continue; // there is no number because there is still an N.
} }
@@ -860,7 +855,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) {
NUMBERS[j]->ErrorMessageText = NUMBERS[j]->ErrorMessageText + "Neg. Rate - Read: " + zwvalue + " - Raw: " + NUMBERS[j]->ReturnRawValue + " - Pre: " + RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma) + " "; NUMBERS[j]->ErrorMessageText = NUMBERS[j]->ErrorMessageText + "Neg. Rate - Read: " + zwvalue + " - Raw: " + NUMBERS[j]->ReturnRawValue + " - Pre: " + RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma) + " ";
NUMBERS[j]->Value = NUMBERS[j]->PreValue; NUMBERS[j]->Value = NUMBERS[j]->PreValue;
NUMBERS[j]->ReturnValue = ""; NUMBERS[j]->ReturnValue = "";
NUMBERS[j]->lastvalue = imagetime; NUMBERS[j]->timeStampLastValue = imagetime;
string _zw = NUMBERS[j]->name + ": Raw: " + NUMBERS[j]->ReturnRawValue + ", Value: " + NUMBERS[j]->ReturnValue + ", Status: " + NUMBERS[j]->ErrorMessageText; string _zw = NUMBERS[j]->name + ": Raw: " + NUMBERS[j]->ReturnRawValue + ", Value: " + NUMBERS[j]->ReturnValue + ", Status: " + NUMBERS[j]->ErrorMessageText;
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, _zw); LogFile.WriteToFile(ESP_LOG_ERROR, TAG, _zw);
@@ -874,8 +869,9 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) {
ESP_LOGD(TAG, "After AllowNegativeRates: Value %f", NUMBERS[j]->Value); ESP_LOGD(TAG, "After AllowNegativeRates: Value %f", NUMBERS[j]->Value);
#endif #endif
difference /= 60; // LastValueTimeDifference = LastValueTimeDifference / 60; // in minutes
NUMBERS[j]->FlowRateAct = (NUMBERS[j]->Value - NUMBERS[j]->PreValue) / difference; LastPreValueTimeDifference = LastPreValueTimeDifference / 60; // in minutes
NUMBERS[j]->FlowRateAct = (NUMBERS[j]->Value - NUMBERS[j]->PreValue) / LastPreValueTimeDifference;
NUMBERS[j]->ReturnRateValue = to_string(NUMBERS[j]->FlowRateAct); NUMBERS[j]->ReturnRateValue = to_string(NUMBERS[j]->FlowRateAct);
if (NUMBERS[j]->useMaxRateValue && PreValueUse && NUMBERS[j]->PreValueOkay) { if (NUMBERS[j]->useMaxRateValue && PreValueUse && NUMBERS[j]->PreValueOkay) {
@@ -885,6 +881,10 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) {
_ratedifference = NUMBERS[j]->FlowRateAct; _ratedifference = NUMBERS[j]->FlowRateAct;
} }
else { else {
// TODO:
// Since I don't know if this is desired, I'll comment it out first.
// int roundDifference = (int)(round(LastPreValueTimeDifference / LastValueTimeDifference)); // calculate how many rounds have passed since NUMBERS[j]->timeLastPreValue was set
// _ratedifference = ((NUMBERS[j]->Value - NUMBERS[j]->PreValue) / ((int)(round(LastPreValueTimeDifference / LastValueTimeDifference)))); // Difference per round, as a safeguard in case a reading error(Neg. Rate - Read: or Rate too high - Read:) occurs in the meantime
_ratedifference = (NUMBERS[j]->Value - NUMBERS[j]->PreValue); _ratedifference = (NUMBERS[j]->Value - NUMBERS[j]->PreValue);
} }
@@ -893,7 +893,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) {
NUMBERS[j]->Value = NUMBERS[j]->PreValue; NUMBERS[j]->Value = NUMBERS[j]->PreValue;
NUMBERS[j]->ReturnValue = ""; NUMBERS[j]->ReturnValue = "";
NUMBERS[j]->ReturnRateValue = ""; NUMBERS[j]->ReturnRateValue = "";
NUMBERS[j]->lastvalue = imagetime; NUMBERS[j]->timeStampLastValue = imagetime;
string _zw = NUMBERS[j]->name + ": Raw: " + NUMBERS[j]->ReturnRawValue + ", Value: " + NUMBERS[j]->ReturnValue + ", Status: " + NUMBERS[j]->ErrorMessageText; string _zw = NUMBERS[j]->name + ": Raw: " + NUMBERS[j]->ReturnRawValue + ", Value: " + NUMBERS[j]->ReturnValue + ", Status: " + NUMBERS[j]->ErrorMessageText;
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, _zw); LogFile.WriteToFile(ESP_LOG_ERROR, TAG, _zw);
@@ -909,7 +909,9 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) {
NUMBERS[j]->ReturnChangeAbsolute = RundeOutput(NUMBERS[j]->Value - NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma); NUMBERS[j]->ReturnChangeAbsolute = RundeOutput(NUMBERS[j]->Value - NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma);
NUMBERS[j]->PreValue = NUMBERS[j]->Value; NUMBERS[j]->PreValue = NUMBERS[j]->Value;
NUMBERS[j]->PreValueOkay = true; NUMBERS[j]->PreValueOkay = true;
NUMBERS[j]->lastvalue = imagetime;
NUMBERS[j]->timeStampLastValue = imagetime;
NUMBERS[j]->timeStampLastPreValue = imagetime;
NUMBERS[j]->ReturnValue = RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->Nachkomma); NUMBERS[j]->ReturnValue = RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->Nachkomma);
NUMBERS[j]->ReturnPreValue = RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma); NUMBERS[j]->ReturnPreValue = RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma);
@@ -935,7 +937,7 @@ void ClassFlowPostProcessing::WriteDataLog(int _index) {
string digital = ""; string digital = "";
string timezw = ""; string timezw = "";
char buffer[80]; char buffer[80];
struct tm* timeinfo = localtime(&NUMBERS[_index]->lastvalue); struct tm* timeinfo = localtime(&NUMBERS[_index]->timeStampLastValue);
strftime(buffer, 80, PREVALUE_TIME_FORMAT_OUTPUT, timeinfo); strftime(buffer, 80, PREVALUE_TIME_FORMAT_OUTPUT, timeinfo);
timezw = std::string(buffer); timezw = std::string(buffer);

10
code/components/jomjol_webhook/interface_webhook.cpp
View File

@@ -26,17 +26,13 @@ void WebhookInit(std::string _uri, std::string _apiKey)
void WebhookPublish(std::vector<NumberPost*>* numbers) void WebhookPublish(std::vector<NumberPost*>* numbers)
{ {
cJSON *jsonArray = cJSON_CreateArray(); cJSON *jsonArray = cJSON_CreateArray();
for (int i = 0; i < (*numbers).size(); ++i) for (int i = 0; i < (*numbers).size(); ++i)
{ {
string timezw = ""; string timezw = "";
char buffer[80]; char buffer[80];
struct tm* timeinfo = localtime(&(*numbers)[i]->lastvalue); struct tm* timeinfo = localtime(&(*numbers)[i]->timeStampLastPreValue);
strftime(buffer, 80, PREVALUE_TIME_FORMAT_OUTPUT, timeinfo); strftime(buffer, 80, PREVALUE_TIME_FORMAT_OUTPUT, timeinfo);
timezw = std::string(buffer); timezw = std::string(buffer);
@@ -85,8 +81,6 @@ void WebhookPublish(std::vector<NumberPost*>* numbers)
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "HTTP request failed"); LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "HTTP request failed");
} }
esp_http_client_cleanup(http_client); esp_http_client_cleanup(http_client);
cJSON_Delete(jsonArray); cJSON_Delete(jsonArray);
free(jsonString); free(jsonString);
@@ -125,4 +119,4 @@ static esp_err_t http_event_handler(esp_http_client_event_t *evt)
return ESP_OK; return ESP_OK;
} }
#endif //ENABLE_WEBHOOK #endif //ENABLE_WEBHOOK