Index: sources/model/confirm/MDuetConfirmHDi.cpp =================================================================== diff -u -r124c2e38e72a1a655d9d479c9c7a1cd8c5d5e6c4 -r4509b968b7280dc7e5b21490f9b5ec99f60e878f --- sources/model/confirm/MDuetConfirmHDi.cpp (.../MDuetConfirmHDi.cpp) (revision 124c2e38e72a1a655d9d479c9c7a1cd8c5d5e6c4) +++ sources/model/confirm/MDuetConfirmHDi.cpp (.../MDuetConfirmHDi.cpp) (revision 4509b968b7280dc7e5b21490f9b5ec99f60e878f) @@ -18,21 +18,33 @@ QVariantList MDuetConfirmHDi::parameters() const { return { - _data.mId .value, - _data.mCommand .value, - _data.mReason .value, + _data.mId .value, + _data.mCommand .value, + _data.mReason .value, + _data.mExtraParam1 .value, + _data.mExtraParam2 .value, + _data.mExtraParam3 .value, + _data.mExtraParam4 .value, }; } bool MDuetConfirmHDi::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mId )) - if (GetValue(vByteArray, index, _data.mCommand )) - if (GetValue(vByteArray, index, _data.mReason )) + if (GetValue(vByteArray, index, _data.mId )) + if (GetValue(vByteArray, index, _data.mCommand )) + if (GetValue(vByteArray, index, _data.mReason )) + if (GetValue(vByteArray, index, _data.mExtraParam1 )) + if (GetValue(vByteArray, index, _data.mExtraParam2 )) + if (GetValue(vByteArray, index, _data.mExtraParam3 )) + if (GetValue(vByteArray, index, _data.mExtraParam4 )) 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; } } /*! @@ -42,8 +54,12 @@ */ DuetConfirmHDiData MDuetConfirmHDi::data() const { Data data; - data.mId = _data.mId .value; - data.mCommand = _data.mCommand .value; - data.mReason = _data.mReason .value; + data.mId = _data.mId .value; + data.mCommand = _data.mCommand .value; + data.mReason = _data.mReason .value; + data.mExtraParam1 = _data.mExtraParam1 .value; + data.mExtraParam2 = _data.mExtraParam2 .value; + data.mExtraParam3 = _data.mExtraParam3 .value; + data.mExtraParam4 = _data.mExtraParam4 .value; return data; }