Index: sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp (.../MTreatmentOutletFlowData.cpp) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp (.../MTreatmentOutletFlowData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-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 MTreatmentOutletFlowData.cpp - * \author (last) Behrouz NematiPour - * \date (last) 16-Oct-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file MTreatmentOutletFlowData.cpp + * \author (last) Dara Navaei + * \date (last) 18-Jan-2024 + * \author (original) Behrouz NematiPour + * \date (original) 11-Apr-2021 * */ #include "MTreatmentOutletFlowData.h" @@ -24,7 +24,13 @@ _data.mMotorSpeed .value, _data.mMotorCtlSpeed .value, _data.mMotorCtlCurrent .value, - _data.mPWMDtCycle .value + _data.mPWMDtCycle .value, + _data.mDopCorrOffset .value, + _data.mDopCalcRate .value, + _data.mUfCalcRate .value, + _data.mRotorHall .value, + _data.mCurrentSetUFRate.value, + _data.mDialOutPumpState.value, }; } @@ -37,6 +43,12 @@ if (GetValue(vByteArray, index, _data.mMotorCtlSpeed )) if (GetValue(vByteArray, index, _data.mMotorCtlCurrent )) if (GetValue(vByteArray, index, _data.mPWMDtCycle )) + if (GetValue(vByteArray, index, _data.mDopCorrOffset )) + if (GetValue(vByteArray, index, _data.mDopCalcRate )) + if (GetValue(vByteArray, index, _data.mUfCalcRate )) + if (GetValue(vByteArray, index, _data.mRotorHall )) + if (GetValue(vByteArray, index, _data.mCurrentSetUFRate)) + if (GetValue(vByteArray, index, _data.mDialOutPumpState)) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -45,6 +57,12 @@ 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; } } /*! @@ -61,5 +79,11 @@ data.mMotorCtlSpeed = _data.mMotorCtlSpeed .value; data.mMotorCtlCurrent = _data.mMotorCtlCurrent.value; data.mPWMDtCycle = _data.mPWMDtCycle .value; + data.mDopCorrOffset = _data.mDopCorrOffset .value; + data.mDopCalcRate = _data.mDopCalcRate .value; + data.mUfCalcRate = _data.mUfCalcRate .value; + data.mRotorHall = _data.mRotorHall .value; + data.mCurrentSetUFRate=_data.mCurrentSetUFRate.value; + data.mDialOutPumpState=_data.mDialOutPumpState.value; return data; }