Revert "Merge pull request #1167 from haverland/fix_analogtodigital"

This reverts commit ba59c8ee66, reversing
changes made to 730006977c.
This commit is contained in:
jomjol
2022-10-14 18:12:11 +02:00
parent ba59c8ee66
commit 2ed3f4aa40
17 changed files with 753 additions and 626 deletions

View File

@@ -35,7 +35,6 @@ std::string ClassFlowPostProcessing::GetJSON(std::string _id, std::string _mac,
else
json += " \"value\": \"\"," + _lineend;
json += " \"raw\": \"" + NUMBERS[i]->ReturnRawValue + "\"," + _lineend;
json += " \"pre\": \"" + NUMBERS[i]->ReturnPreValue + "\"," + _lineend;
json += " \"error\": \"" + NUMBERS[i]->ErrorMessageText + "\"," + _lineend;
if (NUMBERS[i]->ReturnRateValue.length() > 0)
json += " \"rate\": " + NUMBERS[i]->ReturnRateValue + "," + _lineend;
@@ -79,7 +78,7 @@ void ClassFlowPostProcessing::SetPreValue(double zw, string _numbers, bool _exte
if (NUMBERS[j]->name == _numbers)
{
NUMBERS[j]->PreValue = zw;
NUMBERS[j]->ReturnPreValue = RundeOutput(zw, NUMBERS[j]->Nachkomma);
NUMBERS[j]->ReturnPreValue = std::to_string(zw);
NUMBERS[j]->PreValueOkay = true;
if (_extern)
{