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-10 13:36:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into rolling

Browse Source
This commit is contained in:
jomjol
2021-11-14 08:48:42 +01:00
parent 7bfa22187d a3d6923fec
commit f8478d7742
7 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -492,8 +492,6 @@ void ClassFlowPostProcessing::InitNUMBERS()
_number->MaxRateValue = 0.1;
_number->useMaxRateValue = false;
_number->checkDigitIncreaseConsistency = false;
_number->PreValueOkay = false;
_number->useMaxRateValue = false;
_number->DecimalShift = 0;
_number->DecimalShiftInitial = 0;
_number->isExtendedResolution = false;
@@ -658,7 +656,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
zwvalue = RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->Nachkomma);
}
if (NUMBERS[j]->useMaxRateValue && (abs(NUMBERS[j]->Value - NUMBERS[j]->PreValue) > NUMBERS[j]->MaxRateValue))
if (NUMBERS[j]->useMaxRateValue && ((abs(NUMBERS[j]->Value - NUMBERS[j]->PreValue) > 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;

6
code/main/version.cpp
View File

@@ -1,4 +1,4 @@
const char* GIT_REV="020e93b";
const char* GIT_REV="4fe9ab9";
const char* GIT_TAG="";
const char* GIT_BRANCH="rolling";
const char* BUILD_TIME="2021-11-06 22:37";
const char* GIT_BRANCH="master";
const char* BUILD_TIME="2021-11-14 08:39";

6
code/version.cpp
View File

@@ -1,4 +1,4 @@
const char* GIT_REV="020e93b";
const char* GIT_REV="4fe9ab9";
const char* GIT_TAG="";
const char* GIT_BRANCH="rolling";
const char* BUILD_TIME="2021-11-06 22:36";
const char* GIT_BRANCH="master";
const char* BUILD_TIME="2021-11-14 08:39";