Index: sources/model/fp/data/MFPFlowData.cpp =================================================================== diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -ra7719c04d88da7ba4046e5c24c3ba22d632bedad --- sources/model/fp/data/MFPFlowData.cpp (.../MFPFlowData.cpp) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b) +++ sources/model/fp/data/MFPFlowData.cpp (.../MFPFlowData.cpp) (revision a7719c04d88da7ba4046e5c24c3ba22d632bedad) @@ -20,17 +20,13 @@ return { _data.mP7Flow .value, _data.mP16Flow .value, - _data.mP7Temp .value, - _data.mP16Temp .value, }; } bool MFPFlow::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if ( ! GetValue(vByteArray, index, _data.mP7Flow )) goto lError; if ( ! GetValue(vByteArray, index, _data.mP16Flow )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mP7Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mP16Temp )) goto lError; return true ; @@ -47,9 +43,8 @@ */ MFPFlow::Data MFPFlow::data() const { Data data; - data.mWaterInletFlow = _data.mP7Flow .value; - data.mROFilterOutletFlow = _data.mP16Flow .value; - data.mWaterInletTemp = _data.mP7Temp .value; - data.mROFilterOutletTemp = _data.mP16Temp .value; + data.mP7Flow = _data.mP7Flow .value; + data.mP16Flow = _data.mP16Flow .value; + return data; }