Index: sources/model/dd/data/MDDTemperaturesData.cpp =================================================================== diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -r64d551143d898bf2ce79cb564e5a3389eb9be91e --- sources/model/dd/data/MDDTemperaturesData.cpp (.../MDDTemperaturesData.cpp) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) +++ sources/model/dd/data/MDDTemperaturesData.cpp (.../MDDTemperaturesData.cpp) (revision 64d551143d898bf2ce79cb564e5a3389eb9be91e) @@ -19,41 +19,57 @@ QVariantList MDDTemperatures::parameters() const { return { - _data.d1Temp .value, - _data.x6Temp .value, - _data.d4Temp .value, - _data.d50Temp .value, - _data.boardTemp .value, - _data.baroTemp .value, - _data.d16CondTemp .value, - _data.d28CondTemp .value, - _data.d30CondTemp .value, - _data.d44CondTemp .value, - _data.d75CondTemp .value, - _data.d4AvgTemp .value, - _data.d50AvgTemp .value, - _data.d28AvgTemp .value, - _data.d30AvgTemp .value, + _data.mD1Temperature .value, + _data.mD78Temperature .value, + _data.mD4Temperature .value, + _data.mD50Temperature .value, + _data.mD99Temperature .value, + _data.mBoardTemperature .value, + _data.mD16Conductivity .value, + _data.mD28Conductivity .value, + _data.mD30Conductivity .value, + _data.mD44Conductivity .value, + _data.mD75Conductivity .value, + _data.mD4MovingAverage .value, + _data.mD50MovingAverage .value, + _data.mD99MovingAverage .value, + _data.mD28MovingAverage .value, + _data.mD30MovingAverage .value, + _data.mD78MovingAverage .value, + _data.mD9PressureAverage .value, + _data.mD66PressureAverage .value, + _data.mD51PressureAverage .value, + _data.mD18PressureAverage .value, + _data.mD41PressureAverage .value, + _data.mD87PressureAverage .value, }; } bool MDDTemperatures::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.d1Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.x6Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d4Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d50Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.boardTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.baroTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d16CondTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d28CondTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d30CondTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d44CondTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d75CondTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d4AvgTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d50AvgTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d28AvgTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d30AvgTemp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD1Temperature )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD78Temperature )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD4Temperature )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD50Temperature )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD99Temperature )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBoardTemperature )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD16Conductivity )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD28Conductivity )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD30Conductivity )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD44Conductivity )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD75Conductivity )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD4MovingAverage )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD50MovingAverage )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD99MovingAverage )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD28MovingAverage )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD30MovingAverage )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD78MovingAverage )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD9PressureAverage )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD66PressureAverage )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD51PressureAverage )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD18PressureAverage )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD41PressureAverage )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD87PressureAverage )) goto lError; return true ; @@ -70,20 +86,28 @@ */ MDDTemperatures::Data MDDTemperatures::data() const { Data data; - data.mInletHeatExchanger = _data.d1Temp .value; - data.mOutletHeatExchanger = _data.x6Temp .value; - data.mHydraulicsPrimaryHeater = _data.d4Temp .value; - data.mTrimmerHeater = _data.d50Temp .value; - data.mBoardTemperature = _data.boardTemp .value; - data.mBarometricTemperature = _data.baroTemp .value; - data.mD16Conductivity = _data.d16CondTemp .value; - data.mD28Conductivity = _data.d28CondTemp .value; - data.mD30Conductivity = _data.d30CondTemp .value; - data.mD44Conductivity = _data.d44CondTemp .value; - data.mD75Conductivity = _data.d75CondTemp .value; - data.mD4MovingAverage = _data.d4AvgTemp .value; - data.mD50MovingAverage = _data.d50AvgTemp .value; - data.mD28MovingAverage = _data.d28AvgTemp .value; - data.mD30MovingAverage = _data.d30AvgTemp .value; + data.mD1Temperature = _data.mD1Temperature .value; + data.mD78Temperature = _data.mD78Temperature .value; + data.mD4Temperature = _data.mD4Temperature .value; + data.mD50Temperature = _data.mD50Temperature .value; + data.mD99Temperature = _data.mD99Temperature .value; + data.mBoardTemperature = _data.mBoardTemperature .value; + data.mD16Conductivity = _data.mD16Conductivity .value; + data.mD28Conductivity = _data.mD28Conductivity .value; + data.mD30Conductivity = _data.mD30Conductivity .value; + data.mD44Conductivity = _data.mD44Conductivity .value; + data.mD75Conductivity = _data.mD75Conductivity .value; + data.mD4MovingAverage = _data.mD4MovingAverage .value; + data.mD50MovingAverage = _data.mD50MovingAverage .value; + data.mD99MovingAverage = _data.mD99MovingAverage .value; + data.mD28MovingAverage = _data.mD28MovingAverage .value; + data.mD30MovingAverage = _data.mD30MovingAverage .value; + data.mD78MovingAverage = _data.mD78MovingAverage .value; + data.mD9PressureAverage = _data.mD9PressureAverage .value; + data.mD66PressureAverage = _data.mD66PressureAverage .value; + data.mD51PressureAverage = _data.mD51PressureAverage .value; + data.mD18PressureAverage = _data.mD18PressureAverage .value; + data.mD41PressureAverage = _data.mD41PressureAverage .value; + data.mD87PressureAverage = _data.mD87PressureAverage .value; return data; }