Index: sources/model/hd/data/MHDBloodLeakData.cpp =================================================================== diff -u -r38ae7b93679d05a54fc460dac68891562d7da72d -r8e2ac7ad8d482cc42a8e3a0024015f69087057bc --- sources/model/hd/data/MHDBloodLeakData.cpp (.../MHDBloodLeakData.cpp) (revision 38ae7b93679d05a54fc460dac68891562d7da72d) +++ sources/model/hd/data/MHDBloodLeakData.cpp (.../MHDBloodLeakData.cpp) (revision 8e2ac7ad8d482cc42a8e3a0024015f69087057bc) @@ -22,6 +22,9 @@ _data.mBloodLeakState .value, _data.mBloodLeakPersistentCounter .value, _data.mBloodLeakSerialCommState .value, + _data.mBloodLeakIntensity .value, + _data.mBloodLeakDetect .value, + _data.mBloodLeakIntensityMvgAvg .value, }; } @@ -31,11 +34,17 @@ if (GetValue(vByteArray, index, _data.mBloodLeakState )) if (GetValue(vByteArray, index, _data.mBloodLeakPersistentCounter )) if (GetValue(vByteArray, index, _data.mBloodLeakSerialCommState )) + if (GetValue(vByteArray, index, _data.mBloodLeakIntensity )) + if (GetValue(vByteArray, index, _data.mBloodLeakDetect )) + if (GetValue(vByteArray, index, _data.mBloodLeakIntensityMvgAvg )) 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; } } /*! @@ -45,10 +54,13 @@ */ 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; + data.mBloodLeakIntensity = _data.mBloodLeakIntensity .value; + data.mBloodLeakDetect = _data.mBloodLeakDetect .value; + data.mBloodLeakIntensityMvgAvg = _data.mBloodLeakIntensityMvgAvg .value; return data; }