Index: sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r32ca8b84563394e35720ec2da6e607d45a128f39 --- sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp (.../MTreatmentDialysateFlowData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp (.../MTreatmentDialysateFlowData.cpp) (revision 32ca8b84563394e35720ec2da6e607d45a128f39) @@ -25,6 +25,8 @@ _data.mMotorCtlSpeed .value, _data.mMotorCtlCurrent.value, _data.mPWMDutyCycle .value, + _data.mRotorCount .value, + _data.mPresFlow .value, }; } @@ -37,6 +39,8 @@ 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 )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -45,9 +49,10 @@ 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 +68,7 @@ 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; return data; }