Index: sources/model/hd/data/MHDBloodLeakData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 --- sources/model/hd/data/MHDBloodLeakData.cpp (.../MHDBloodLeakData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/data/MHDBloodLeakData.cpp (.../MHDBloodLeakData.cpp) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) @@ -20,40 +20,16 @@ return { _data.mBloodLeakStatus .value, _data.mBloodLeakState .value, - _data.mBloodLeakZeroStatusCounter.value, - _data.mBloodLeakCounter .value, - _data.mBloodLeakZeroedStatus .value, - _data.mBloodLeakDetectSetPoint .value, - _data.mBloodLeakDetectLevel .value, - _data.mBloodLeakStatusCount .value, - _data.mBloodLeakLEDIntensity .value, - _data.mBloodLeakRegisterCounter .value, }; } bool MHDBloodLeakData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if (GetValue(vByteArray, index, _data.mBloodLeakStatus )) if (GetValue(vByteArray, index, _data.mBloodLeakState )) - if (GetValue(vByteArray, index, _data.mBloodLeakZeroStatusCounter )) - if (GetValue(vByteArray, index, _data.mBloodLeakCounter )) - if (GetValue(vByteArray, index, _data.mBloodLeakZeroedStatus )) - if (GetValue(vByteArray, index, _data.mBloodLeakDetectSetPoint )) - if (GetValue(vByteArray, index, _data.mBloodLeakDetectLevel )) - if (GetValue(vByteArray, index, _data.mBloodLeakStatusCount )) - if (GetValue(vByteArray, index, _data.mBloodLeakLEDIntensity )) - if (GetValue(vByteArray, index, _data.mBloodLeakRegisterCounter )) return true ; 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; } } /*! @@ -65,14 +41,6 @@ Data data; data.mBloodLeakStatus = _data.mBloodLeakStatus .value; data.mBloodLeakState = _data.mBloodLeakState .value; - data.mBloodLeakZeroStatusCounter= _data.mBloodLeakZeroStatusCounter.value; - data.mBloodLeakCounter = _data.mBloodLeakCounter .value; - data.mBloodLeakZeroedStatus = _data.mBloodLeakZeroedStatus .value; - data.mBloodLeakDetectSetPoint = _data.mBloodLeakDetectSetPoint .value; - data.mBloodLeakDetectLevel = _data.mBloodLeakDetectLevel .value; - data.mBloodLeakStatusCount = _data.mBloodLeakStatusCount .value; - data.mBloodLeakLEDIntensity = _data.mBloodLeakLEDIntensity .value; - data.mBloodLeakRegisterCounter = _data.mBloodLeakRegisterCounter .value; return data; }