Index: sources/model/hd/data/MHDBloodLeakData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r482949dd876ebec823e955670b3d9f3834e9c215 --- sources/model/hd/data/MHDBloodLeakData.cpp (.../MHDBloodLeakData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/MHDBloodLeakData.cpp (.../MHDBloodLeakData.cpp) (revision 482949dd876ebec823e955670b3d9f3834e9c215) @@ -18,18 +18,24 @@ QVariantList MHDBloodLeakData::parameters() const { return { - _data.mBloodLeakStatus .value, - _data.mBloodLeakState .value, + _data.mBloodLeakStatus .value, + _data.mBloodLeakState .value, + _data.mBloodLeakPersistentCounter .value, + _data.mBloodLeakSerialCommState .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.mBloodLeakPersistentCounter )) + if (GetValue(vByteArray, index, _data.mBloodLeakSerialCommState )) 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; } } /*! @@ -39,8 +45,10 @@ */ MHDBloodLeakData::Data MHDBloodLeakData::data() const{ Data data; - data.mBloodLeakStatus = _data.mBloodLeakStatus .value; - data.mBloodLeakState = _data.mBloodLeakState .value; + data.mBloodLeakStatus = _data.mBloodLeakStatus .value; + data.mBloodLeakState = _data.mBloodLeakState .value; + data.mBloodLeakPersistentCounter = _data.mBloodLeakPersistentCounter .value; + data.mBloodLeakSerialCommState = _data.mBloodLeakSerialCommState .value; return data; }