Index: sources/model/dg/data/MDGHeatersData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r1f2e7dbd08b00f8c56eedf29f083733570aa642e --- sources/model/dg/data/MDGHeatersData.cpp (.../MDGHeatersData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/dg/data/MDGHeatersData.cpp (.../MDGHeatersData.cpp) (revision 1f2e7dbd08b00f8c56eedf29f083733570aa642e) @@ -18,21 +18,46 @@ QVariantList MDGHeaters::parameters() const { return { - _data.mMainPrimaryDC .value, - _data.mSmallPrimaryDC .value, - _data.mTrimmerDC .value + _data.mMainPrimayHeaterDC .value, + _data.mSmallPrimaryHeaterDC .value, + _data.mTrimmerHeaterDC .value, + _data.mPrimaryTargetTemp .value, + _data.mTrimmerTargetTemp .value, + _data.mPrimaryHeaterState .value, + _data.mTrimmerHeaterState .value, + _data.mPrimaryEfficiency .value, + _data.mPrimaryCalcTargetTemp .value, + _data.mTrimmerCalcCurrentTemp .value, + _data.mTrimmerUseLastDC .value, }; + } bool MDGHeaters::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mMainPrimaryDC )) - if (GetValue(vByteArray, index, _data.mSmallPrimaryDC )) - if (GetValue(vByteArray, index, _data.mTrimmerDC )) + if (GetValue(vByteArray, index, _data.mMainPrimayHeaterDC )) + if (GetValue(vByteArray, index, _data.mSmallPrimaryHeaterDC )) + if (GetValue(vByteArray, index, _data.mTrimmerHeaterDC )) + if (GetValue(vByteArray, index, _data.mPrimaryTargetTemp )) + if (GetValue(vByteArray, index, _data.mTrimmerTargetTemp )) + if (GetValue(vByteArray, index, _data.mPrimaryHeaterState )) + if (GetValue(vByteArray, index, _data.mTrimmerHeaterState )) + if (GetValue(vByteArray, index, _data.mPrimaryEfficiency )) + if (GetValue(vByteArray, index, _data.mPrimaryCalcTargetTemp )) + if (GetValue(vByteArray, index, _data.mTrimmerCalcCurrentTemp )) + if (GetValue(vByteArray, index, _data.mTrimmerUseLastDC )) 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; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -42,8 +67,16 @@ */ MDGHeaters::Data MDGHeaters::data() const { Data data; - data.mMainPrimaryDC = _data.mMainPrimaryDC .value; - data.mSmallPrimaryDC = _data.mSmallPrimaryDC .value; - data.mTrimmerDC = _data.mTrimmerDC .value; + data.mMainPrimayHeaterDC = _data.mMainPrimayHeaterDC .value; + data.mSmallPrimaryHeaterDC = _data.mSmallPrimaryHeaterDC .value; + data.mTrimmerHeaterDC = _data.mTrimmerHeaterDC .value; + data.mPrimaryTargetTemp = _data.mPrimaryTargetTemp .value; + data.mTrimmerTargetTemp = _data.mTrimmerTargetTemp .value; + data.mPrimaryHeaterState = _data.mPrimaryHeaterState .value; + data.mTrimmerHeaterState = _data.mTrimmerHeaterState .value; + data.mPrimaryEfficiency = _data.mPrimaryEfficiency .value; + data.mPrimaryCalcTargetTemp = _data.mPrimaryCalcTargetTemp .value; + data.mTrimmerCalcCurrentTemp = _data.mTrimmerCalcCurrentTemp .value; + data.mTrimmerUseLastDC = _data.mTrimmerUseLastDC .value; return data; }