Index: sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp (.../MTreatmentBloodFlowData.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp (.../MTreatmentBloodFlowData.cpp) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -18,31 +18,29 @@ QVariantList MBloodFlow::parameters() const { return { - _data.mFlowSetPoint .value, - _data.mMeasuredFlow .value, - _data.mRotorSpeed .value, - _data.mMotorSpeed .value, - _data.mMotorCtlSpeed .value, - _data.mMotorCtlCurrent .value, - _data.mPWMDutyCycle .value, - _data.mRotorCount .value, - _data.mPresFlow .value, - _data.mRotorHall .value, + _data.mFlowSetPoint .value, + _data.mMeasuredFlow .value, + _data.mRotorSpeed .value, + _data.mMotorSpeed .value, + _data.mMotorCtlCurrent .value, + _data.mRPM .value, + _data.mRotorCount .value, + _data.mPresFlow .value, + _data.mRotorHall .value, }; } bool MBloodFlow::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mFlowSetPoint )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mMeasuredFlow )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mRotorSpeed )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mMotorSpeed )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mMotorCtlSpeed )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mMotorCtlCurrent )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mPWMDutyCycle )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mRotorCount )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mPresFlow )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mRotorHall )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mFlowSetPoint )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mMeasuredFlow )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mRotorSpeed )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mMotorSpeed )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mMotorCtlCurrent )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mRPM )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mRotorCount )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mPresFlow )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mRotorHall )) goto lError; return true ; @@ -60,15 +58,14 @@ */ MBloodFlow::Data MBloodFlow::data() const { Data data; - data.mFlowSetPoint = _data.mFlowSetPoint .value; - data.mMeasuredFlow = _data.mMeasuredFlow .value; - data.mRotorSpeed = _data.mRotorSpeed .value; - data.mMotorSpeed = _data.mMotorSpeed .value; - 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; + data.mFlowSetPoint = _data.mFlowSetPoint .value; + data.mMeasuredFlow = _data.mMeasuredFlow .value; + data.mRotorSpeed = _data.mRotorSpeed .value; + data.mMotorSpeed = _data.mMotorSpeed .value; + data.mMotorCtlCurrent = _data.mMotorCtlCurrent .value; + data.mRPM = _data.mRPM .value; + data.mRotorCount = _data.mRotorCount .value; + data.mPresFlow = _data.mPresFlow .value; + data.mRotorHall = _data.mRotorHall .value; return data; }