Rolling 20220122

This commit is contained in:
jomjol
2022-01-29 15:41:56 +01:00
parent 1ca5e1218d
commit 2029bd6e8a
11 changed files with 90 additions and 88 deletions

View File

@@ -111,25 +111,9 @@ bool ClassFlowPostProcessing::LoadPreValue(void)
double difference = difftime(tStart, NUMBERS[j]->lastvalue);
difference /= 60;
if (difference > PreValueAgeStartup)
{
NUMBERS[j]->PreValueOkay = false;
}
else
{
NUMBERS[j]->PreValueOkay = true;
/*
NUMBERS[j]->Value = NUMBERS[j]->PreValue;
NUMBERS[j]->ReturnValue = to_string(NUMBERS[j]->Value);
NUMBERS[j]->ReturnValueNoError = NUMBERS[j]->ReturnValue;
if (NUMBERS[j]->digit_roi || NUMBERS[j]->analog_roi)
{
NUMBERS[j]->ReturnValue = RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->Nachkomma + 1); // SIcherheitshalber 1 Stelle mehr, da ggf. Exgtended Resolution an ist (wird erst beim ersten Durchlauf gesetzt)
NUMBERS[j]->ReturnValueNoError = NUMBERS[j]->ReturnValue;
}
*/
}
}
}
@@ -638,6 +622,11 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
UpdatePreValueINI = true;
SavePreValue();
}
else
{
NUMBERS[j]->ReturnValue = "";
NUMBERS[j]->ReturnValueNoError = "";
}
}
else
{

View File

@@ -1,4 +1,4 @@
const char* GIT_REV="887c704";
const char* GIT_REV="1ca5e12";
const char* GIT_TAG="";
const char* GIT_BRANCH="rolling";
const char* BUILD_TIME="2022-01-28 18:12";
const char* BUILD_TIME="2022-01-29 15:18";

View File

@@ -13,7 +13,7 @@ extern "C"
#include "Helper.h"
#include <fstream>
const char* GIT_BASE_BRANCH = "master - v10.2.0 - 2022-01-14";
const char* GIT_BASE_BRANCH = "master - v10.3.0 - 2022-01-29";
const char* git_base_branch(void)

View File

@@ -1,4 +1,4 @@
const char* GIT_REV="887c704";
const char* GIT_REV="1ca5e12";
const char* GIT_TAG="";
const char* GIT_BRANCH="rolling";
const char* BUILD_TIME="2022-01-28 18:12";
const char* BUILD_TIME="2022-01-29 15:18";