diff --git a/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp b/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp index bdcd3f41..646582e5 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp +++ b/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp @@ -848,11 +848,11 @@ void ClassFlowPostProcessing::WriteDataLog(int _analog) string analog = ""; string digital = ""; if (flowAnalog) - analog = flowAnalog->getReadout(_analog); + analog = flowAnalog->getReadoutRawString(_analog); if (flowDigit) - digital = flowDigit->getReadout(_analog); + digital = flowDigit->getReadoutRawString(_analog); // LogFile.WriteToFile(analog); - LogFile.WriteToData(NUMBERS[_analog]->ReturnRawValue, NUMBERS[_analog]->ReturnValue, NUMBERS[_analog]->ErrorMessageText, digital, analog); + LogFile.WriteToData(NUMBERS[_analog]->ReturnRawValue, NUMBERS[_analog]->ReturnValue, NUMBERS[_analog]->ReturnPreValue, NUMBERS[_analog]->ErrorMessageText, digital, analog); printf("WriteDataLog: %s, %s, %s, %s, %s", NUMBERS[_analog]->ReturnRawValue.c_str(), NUMBERS[_analog]->ReturnValue.c_str(), NUMBERS[_analog]->ErrorMessageText.c_str(), digital.c_str(), analog.c_str()); } diff --git a/code/components/jomjol_logfile/ClassLogFile.cpp b/code/components/jomjol_logfile/ClassLogFile.cpp index d5ade3d2..34e5d1eb 100644 --- a/code/components/jomjol_logfile/ClassLogFile.cpp +++ b/code/components/jomjol_logfile/ClassLogFile.cpp @@ -62,7 +62,7 @@ std::string ClassLogFile::getESPHeapInfo(){ return espInfoResultStr; } -void ClassLogFile::WriteToData(std::string _ReturnRawValue, std::string _ReturnValue, std::string _ErrorMessageText, std::string _digital, std::string _analog) +void ClassLogFile::WriteToData(std::string _ReturnRawValue, std::string _ReturnValue, std::string _ReturnPreValue, std::string _ErrorMessageText, std::string _digital, std::string _analog) { printf("Start WriteToData\n"); time_t rawtime; @@ -95,12 +95,14 @@ void ClassLogFile::WriteToData(std::string _ReturnRawValue, std::string _ReturnV strftime(buffer, 80, "%Y-%m-%dT%H:%M:%S", timeinfo); - zwtime = std::string(buffer) + ":"; + zwtime = std::string(buffer) + ":\t"; fputs(zwtime.c_str(), pFile); fputs(_ReturnRawValue.c_str(), pFile); fputs("\t", pFile); fputs(_ReturnValue.c_str(), pFile); fputs("\t", pFile); + fputs(_ReturnPreValue.c_str(), pFile); + fputs("\t", pFile); fputs(_ErrorMessageText.c_str(), pFile); fputs("\t", pFile); fputs(_digital.c_str(), pFile); diff --git a/code/components/jomjol_logfile/ClassLogFile.h b/code/components/jomjol_logfile/ClassLogFile.h index 2a722c6c..c04978a2 100644 --- a/code/components/jomjol_logfile/ClassLogFile.h +++ b/code/components/jomjol_logfile/ClassLogFile.h @@ -28,7 +28,7 @@ public: void WriteToDedicatedFile(std::string _fn, std::string info, bool _time = true); void RemoveOld(); - void WriteToData(std::string _ReturnRawValue, std::string _ReturnValue, std::string _ErrorMessageText, std::string _digital, std::string _analog); + void WriteToData(std::string _ReturnRawValue, std::string _ReturnValue, std::string _ReturnPreValue, std::string _ErrorMessageText, std::string _digital, std::string _analog); std::string GetCurrentFileName();