Index: sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp =================================================================== diff -u -r22e9fba5d14ea03731b4e30f6bbde22561921894 -r38ae7b93679d05a54fc460dac68891562d7da72d --- sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp (.../MTreatmentDialysateFlowData.cpp) (revision 22e9fba5d14ea03731b4e30f6bbde22561921894) +++ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp (.../MTreatmentDialysateFlowData.cpp) (revision 38ae7b93679d05a54fc460dac68891562d7da72d) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved. + * Copyright (c) 2022-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 MTreatmentInletFlowData.cpp - * \author (last) Michael Garthwaite - * \date (last) 9-Feb-2022 - * \author (original) Michael Garthwaite - * \date (original) 9-Feb-2022 + * \file MTreatmentDialysateFlowData.cpp + * \author (last) Dara Navaei + * \date (last) 08-May-2024 + * \author (original) Michael Garthwaite + * \date (original) 16-Feb-2022 * */ #include "MTreatmentDialysateFlowData.h" @@ -25,6 +25,9 @@ _data.mMotorCtlSpeed .value, _data.mMotorCtlCurrent.value, _data.mPWMDutyCycle .value, + _data.mRotorCount .value, + _data.mPresFlow .value, + _data.mRotorHall .value, }; } @@ -37,6 +40,9 @@ if (GetValue(vByteArray, index, _data.mMotorCtlSpeed )) if (GetValue(vByteArray, index, _data.mMotorCtlCurrent )) if (GetValue(vByteArray, index, _data.mPWMDutyCycle )) + if (GetValue(vByteArray, index, _data.mRotorCount )) + if (GetValue(vByteArray, index, _data.mPresFlow )) + if (GetValue(vByteArray, index, _data.mRotorHall )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -45,9 +51,11 @@ 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; } } - /*! * \brief MDialysateFlow::data * \details Provides model's Data from the received messages data values of @@ -63,5 +71,8 @@ data.mMotorCtlSpeed = _data.mMotorCtlSpeed .value; data.mMotorCtlCurrent = _data.mMotorCtlCurrent.value; data.mPWMDutyCycle = _data.mPWMDutyCycle .value; + data.mRotorCount = _data.mRotorCount .value; + data.mPresFlow = _data.mPresFlow .value; + data.mRotorHall = _data.mRotorHall .value; return data; }