Index: sources/model/dg/data/MDGTemperaturesData.cpp =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf724589acaa51725f5e5f8a746404d01804efbcf --- sources/model/dg/data/MDGTemperaturesData.cpp (.../MDGTemperaturesData.cpp) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/dg/data/MDGTemperaturesData.cpp (.../MDGTemperaturesData.cpp) (revision f724589acaa51725f5e5f8a746404d01804efbcf) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file MDGTemperaturesData.cpp - * \author (last) Behrouz NemaiPour - * \date (last) 04-Jul-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file MDGTemperaturesData.cpp + * \author (last) Dara Navaei + * \date (last) 05-Feb-2024 + * \author (original) Behrouz NemaiPour + * \date (original) 02-Jul-2020 * */ #include "MDGTemperaturesData.h" @@ -19,24 +19,36 @@ QVariantList MDGTemperatures::parameters() const { return { - _data.mInletPrimaryHeater .value, - _data.mOutletPrimaryHeater .value, - _data.mConductivitySensor1 .value, - _data.mConductivitySensor2 .value, - _data.mOutletRedundancy .value, - _data.mInletDialysate .value, - _data.mPrimaryHeaterThermoCouple .value, - _data.mTrimmerHeaterThermoCouple .value, - _data.mPrimaryHeaterColdJunction .value, - _data.mTrimmerHeaterColdJunction .value, - _data.mPrimaryHeaterInternal .value, - _data.mTrimmerHeaterInternal .value + _data.mInletPrimaryHeater .value, + _data.mHeatDisinfect .value, + _data.mOutletPrimaryHeater .value, + _data.mConductivitySensor1 .value, + _data.mConductivitySensor2 .value, + _data.mOutletRedundancy .value, + _data.mInletDialysate .value, + _data.mPrimaryHeaterThermoCouple .value, + _data.mTrimmerHeaterThermoCouple .value, + _data.mPrimaryHeaterColdJunction .value, + _data.mTrimmerHeaterColdJunction .value, + _data.mPrimaryHeaterInternal .value, + _data.mTrimmerHeaterInternal .value, + _data.mFpgaBoard .value, + _data.mLoadCellA1B1 .value, + _data.mLoadCellA2B2 .value, + _data.mInternalTHDORTD .value, + _data.mInternalTDIRTD .value, + _data.mInteralTHDRTD .value, + _data.mInternalCondSnsrTemp .value, + _data.mBaroTempSensor .value, + _data.mDialysateInletMvngAvg .value, + _data.mRedundantOutletMvngAvg .value, }; } bool MDGTemperatures::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if (GetValue(vByteArray, index, _data.mInletPrimaryHeater )) + if (GetValue(vByteArray, index, _data.mHeatDisinfect )) if (GetValue(vByteArray, index, _data.mOutletPrimaryHeater )) if (GetValue(vByteArray, index, _data.mConductivitySensor1 )) if (GetValue(vByteArray, index, _data.mConductivitySensor2 )) @@ -48,6 +60,16 @@ if (GetValue(vByteArray, index, _data.mTrimmerHeaterColdJunction )) if (GetValue(vByteArray, index, _data.mPrimaryHeaterInternal )) if (GetValue(vByteArray, index, _data.mTrimmerHeaterInternal )) + if (GetValue(vByteArray, index, _data.mFpgaBoard )) + if (GetValue(vByteArray, index, _data.mLoadCellA1B1 )) + if (GetValue(vByteArray, index, _data.mLoadCellA2B2 )) + if (GetValue(vByteArray, index, _data.mInternalTHDORTD )) + if (GetValue(vByteArray, index, _data.mInternalTDIRTD )) + if (GetValue(vByteArray, index, _data.mInteralTHDRTD )) + if (GetValue(vByteArray, index, _data.mInternalCondSnsrTemp )) + if (GetValue(vByteArray, index, _data.mBaroTempSensor )) + if (GetValue(vByteArray, index, _data.mDialysateInletMvngAvg )) + if (GetValue(vByteArray, index, _data.mRedundantOutletMvngAvg )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -61,6 +83,17 @@ else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -71,6 +104,7 @@ MDGTemperatures::Data MDGTemperatures::data() const { Data data; data.mInletPrimaryHeater = _data.mInletPrimaryHeater .value; + data.mHeatDisinfect = _data.mHeatDisinfect .value; data.mOutletPrimaryHeater = _data.mOutletPrimaryHeater .value; data.mConductivitySensor1 = _data.mConductivitySensor1 .value; data.mConductivitySensor2 = _data.mConductivitySensor2 .value; @@ -82,5 +116,15 @@ data.mTrimmerHeaterColdJunction = _data.mTrimmerHeaterColdJunction .value; data.mPrimaryHeaterInternal = _data.mPrimaryHeaterInternal .value; data.mTrimmerHeaterInternal = _data.mTrimmerHeaterInternal .value; + data.mFpgaBoard = _data.mFpgaBoard .value; + data.mLoadCellA1B1 = _data.mLoadCellA1B1 .value; + data.mLoadCellA2B2 = _data.mLoadCellA2B2 .value; + data.mInternalTHDORTD = _data.mInternalTHDORTD .value; + data.mInternalTDIRTD = _data.mInternalTDIRTD .value; + data.mInteralTHDRTD = _data.mInteralTHDRTD .value; + data.mInternalCondSnsrTemp = _data.mInternalCondSnsrTemp .value; + data.mBaroTempSensor = _data.mBaroTempSensor .value; + data.mDialysateInletMvngAvg = _data.mDialysateInletMvngAvg .value; + data.mRedundantOutletMvngAvg = _data.mRedundantOutletMvngAvg .value; return data; }