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-31 14:51:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

v10.5.0

Browse Source
This commit is contained in:
jomjol
2022-02-18 21:14:04 +01:00
parent bcb1d98191
commit 1dd703b337
8 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,6 @@ struct NumberPost {
string ReturnRawValue; // Rohwert (mit N & führenden 0)
string ReturnValue; // korrigierter Rückgabewert, ggf. mit Fehlermeldung
string ReturnPreValue; // korrigierter Rückgabewert ohne Fehlermeldung
// string ReturnValueNoError;
string ErrorMessageText; // Fehlermeldung bei Consistency Check
int AnzahlAnalog;
int AnzahlDigital;

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

@@ -626,7 +626,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
NUMBERS[j]->ReturnRawValue = ShiftDecimal(NUMBERS[j]->ReturnRawValue, NUMBERS[j]->DecimalShift);
printf("RetunrRawValue %s", NUMBERS[j]->ReturnRawValue.c_str());
printf("ReturnRaw %s", NUMBERS[j]->ReturnRawValue.c_str());
if (IgnoreLeadingNaN)
@@ -676,7 +676,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
else
_ratedifference = (NUMBERS[j]->Value - NUMBERS[j]->PreValue);
if (abs(_ratedifference) > NUMBERS[j]->MaxRateValue)
if (abs(_ratedifference) > abs(NUMBERS[j]->MaxRateValue))
{
NUMBERS[j]->ErrorMessageText = NUMBERS[j]->ErrorMessageText + "Rate too high - Read: " + RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->Nachkomma) + " - Pre: " + RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma);
NUMBERS[j]->Value = NUMBERS[j]->PreValue;
@@ -829,14 +829,14 @@ float ClassFlowPostProcessing::checkDigitConsistency(float input, int _decilamsh
while (pot <= pot_max)
{
zw = input / pow(10, pot-1);
aktdigit_before = ((int) round(zw) + 10) % 10;
aktdigit_before = ((int) zw) % 10;
zw = _preValue / pow(10, pot-1);
olddigit_before = ((int) round(zw) + 10) % 10;
olddigit_before = ((int) zw) % 10;
zw = input / pow(10, pot);
aktdigit = ((int) round(zw) + 10) % 10;
aktdigit = ((int) zw) % 10;
zw = _preValue / pow(10, pot);
olddigit = ((int) round(zw) + 10) % 10;
olddigit = ((int) zw) % 10;
no_nulldurchgang = (olddigit_before <= aktdigit_before);

4
code/main/version.cpp
View File

@@ -1,4 +1,4 @@
const char* GIT_REV="1f5486e";
const char* GIT_REV="bcb1d98";
const char* GIT_TAG="";
const char* GIT_BRANCH="rolling";
const char* BUILD_TIME="2022-02-15 21:28";
const char* BUILD_TIME="2022-02-18 21:01";

2
code/main/version.h
View File

@@ -13,7 +13,7 @@ extern "C"
#include "Helper.h"
#include <fstream>
const char* GIT_BASE_BRANCH = "master - v10.4.0 - 2022-02-12";
const char* GIT_BASE_BRANCH = "master - v10.5.0 - 2022-02-18";
const char* git_base_branch(void)

4
code/version.cpp
View File

@@ -1,4 +1,4 @@
const char* GIT_REV="1f5486e";
const char* GIT_REV="bcb1d98";
const char* GIT_TAG="";
const char* GIT_BRANCH="rolling";
const char* BUILD_TIME="2022-02-15 21:28";
const char* BUILD_TIME="2022-02-18 21:01";