Index: sources/model/hd/data/MHDOperationModeData.cpp =================================================================== diff -u -r96854524927f212c24b9e4a253baeff2e672228f -r4afc91856c00e01dfb5d84bc54d2d92faefec0db --- sources/model/hd/data/MHDOperationModeData.cpp (.../MHDOperationModeData.cpp) (revision 96854524927f212c24b9e4a253baeff2e672228f) +++ sources/model/hd/data/MHDOperationModeData.cpp (.../MHDOperationModeData.cpp) (revision 4afc91856c00e01dfb5d84bc54d2d92faefec0db) @@ -18,15 +18,18 @@ QVariantList MHDOperationMode::parameters() const { return { - _data.mOpMode.value + _data.mOpMode .value, + _data.mSubMode .value, }; } bool MHDOperationMode::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mOpMode )) - return true ; + if (GetValue(vByteArray, index, _data.mOpMode )) + if (GetValue(vByteArray, index, _data.mSubMode )) + return true ; else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -36,6 +39,7 @@ */ MHDOperationMode::Data MHDOperationMode::data() const { Data data; - data.mOpMode = _data.mOpMode.value; + data.mOpMode = _data.mOpMode .value; + data.mSubMode = _data.mSubMode .value; return data; }