Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -rb6d23ac9f339d36f9c68000ecc59dcc07fec8838 -r34861b44547037950fcf398accc7649f7fac4529 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision b6d23ac9f339d36f9c68000ecc59dcc07fec8838) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 34861b44547037950fcf398accc7649f7fac4529) @@ -444,13 +444,13 @@ vHDBloodLeak.bloodLeakDetectSetPoint , vHDBloodLeak.bloodLeakZeroedStatus , vHDBloodLeak.bloodLeakState , - vHDBloodLeak.bloodLeakCounter , + vHDBloodLeak.bloodLeakDetectLevel , ] label: [ "SetPt" , "0Stat" , "State" , - "Cntr" , + "DtLvl" , ] @@ -470,7 +470,7 @@ x: col(6) y: row(6) title: "" - model: [ "HD: v%1.%2.%3-%4 %5 v%6.%7 %8" + model: [ "HD: v%1.%2.%3-%4 %5 v%6.%7 %8 CRev: %9" .arg(vAdjustmentVersions.hdVerMajor) .arg(vAdjustmentVersions.hdVerMinor) .arg(vAdjustmentVersions.hdVerMicro) @@ -479,14 +479,15 @@ .arg(vAdjustmentVersions.hdVerFPGAMajor) .arg(vAdjustmentVersions.hdVerFPGAMinor) .arg(vAdjustmentVersions.hdVerFPGALab) + .arg(vAdjustmentVersions.hdVerCompatibilityRev) ] textObjectName: "_HDVersions" } DebugDataColumn { id: _DGVersionsColumn x: col(6) y: row(6.5) title: "" - model: [ "DG: v%1.%2.%3-%4 %5 v%6.%7 %8" + model: [ "DG: v%1.%2.%3-%4 %5 v%6.%7 %8 CRev: %9" .arg(vAdjustmentVersions.dgVerMajor) .arg(vAdjustmentVersions.dgVerMinor) .arg(vAdjustmentVersions.dgVerMicro) @@ -495,6 +496,7 @@ .arg(vAdjustmentVersions.dgVerFPGAMajor) .arg(vAdjustmentVersions.dgVerFPGAMinor) .arg(vAdjustmentVersions.dgVerFPGALab) + .arg(vAdjustmentVersions.dgVerCompatibilityRev) ] textObjectName: "_DGVersions" } Index: sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r34861b44547037950fcf398accc7649f7fac4529 --- sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp (.../MAdjustDGVersionsResponse.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp (.../MAdjustDGVersionsResponse.cpp) (revision 34861b44547037950fcf398accc7649f7fac4529) @@ -18,27 +18,29 @@ QVariantList MAdjustVersionsDGResponse::parameters() const { return { - _data.mMajor .value, - _data.mMinor .value, - _data.mMicro .value, - _data.mBuild .value, - _data.mFPGAId .value, - _data.mFPGAMajor.value, - _data.mFPGAMinor.value, - _data.mFPGALab .value + _data.mMajor .value, + _data.mMinor .value, + _data.mMicro .value, + _data.mBuild .value, + _data.mFPGAId .value, + _data.mFPGAMajor .value, + _data.mFPGAMinor .value, + _data.mFPGALab .value, + _data.mCompatibilityRev .value, }; } bool MAdjustVersionsDGResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mMajor )) - if (GetValue(vByteArray, index, _data.mMinor )) - if (GetValue(vByteArray, index, _data.mMicro )) - if (GetValue(vByteArray, index, _data.mBuild )) - if (GetValue(vByteArray, index, _data.mFPGAId )) - if (GetValue(vByteArray, index, _data.mFPGAMajor)) - if (GetValue(vByteArray, index, _data.mFPGAMinor)) - if (GetValue(vByteArray, index, _data.mFPGALab )) + if (GetValue(vByteArray, index, _data.mMajor )) + if (GetValue(vByteArray, index, _data.mMinor )) + if (GetValue(vByteArray, index, _data.mMicro )) + if (GetValue(vByteArray, index, _data.mBuild )) + if (GetValue(vByteArray, index, _data.mFPGAId )) + if (GetValue(vByteArray, index, _data.mFPGAMajor )) + if (GetValue(vByteArray, index, _data.mFPGAMinor )) + if (GetValue(vByteArray, index, _data.mFPGALab )) + if (GetValue(vByteArray, index, _data.mCompatibilityRev )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -48,17 +50,19 @@ 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; } } AdjustVersionsDGResponseData MAdjustVersionsDGResponse::data() const { Data data; - data.mMajor = _data.mMajor .value; - data.mMinor = _data.mMinor .value; - data.mMicro = _data.mMicro .value; - data.mBuild = _data.mBuild .value; - data.mFPGAId = _data.mFPGAId .value; - data.mFPGAMajor = _data.mFPGAMajor.value; - data.mFPGAMinor = _data.mFPGAMinor.value; - data.mFPGALab = _data.mFPGALab .value; + data.mMajor = _data.mMajor .value; + data.mMinor = _data.mMinor .value; + data.mMicro = _data.mMicro .value; + data.mBuild = _data.mBuild .value; + data.mFPGAId = _data.mFPGAId .value; + data.mFPGAMajor = _data.mFPGAMajor .value; + data.mFPGAMinor = _data.mFPGAMinor .value; + data.mFPGALab = _data.mFPGALab .value; + data.mCompatibilityRev = _data.mCompatibilityRev .value; return data; } Index: sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r34861b44547037950fcf398accc7649f7fac4529 --- sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h (.../MAdjustDGVersionsResponse.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h (.../MAdjustDGVersionsResponse.h) (revision 34861b44547037950fcf398accc7649f7fac4529) @@ -36,14 +36,15 @@ * * | Payload || * | || - * | #1:(U08) | \ref Data::mMajor | - * | #2:(U08) | \ref Data::mMinor | - * | #3:(U08) | \ref Data::mMicro | - * | #4:(U16) | \ref Data::mBuild | - * | #5:(U08) | \ref Data::mFPGAId | - * | #6:(U08) | \ref Data::mFPGAMajor | - * | #7:(U08) | \ref Data::mFPGAMinor | - * | #8:(U08) | \ref Data::mFPGALab | + * | #1:(U08) | \ref Data::mMajor | + * | #2:(U08) | \ref Data::mMinor | + * | #3:(U08) | \ref Data::mMicro | + * | #4:(U16) | \ref Data::mBuild | + * | #5:(U08) | \ref Data::mFPGAId | + * | #6:(U08) | \ref Data::mFPGAMajor | + * | #7:(U08) | \ref Data::mFPGAMinor | + * | #8:(U08) | \ref Data::mFPGALab | + * | #9:(U32) | \ref Data::mCompatibilty Rev | * * \sa Data * \sa MAdjustVersionsDGResponse : DG Versions Response Data @@ -64,14 +65,15 @@ QVariantList parameters() const override; struct { - Types::U08 mMajor ; - Types::U08 mMinor ; - Types::U08 mMicro ; - Types::U16 mBuild ; - Types::U08 mFPGAId ; - Types::U08 mFPGAMajor ; - Types::U08 mFPGAMinor ; - Types::U08 mFPGALab ; + Types::U08 mMajor ; + Types::U08 mMinor ; + Types::U08 mMicro ; + Types::U16 mBuild ; + Types::U08 mFPGAId ; + Types::U08 mFPGAMajor ; + Types::U08 mFPGAMinor ; + Types::U08 mFPGALab ; + Types::U32 mCompatibilityRev ; } _data; public: @@ -81,14 +83,15 @@ QString infoText () const override { return QString("Version") ; } struct Data { - quint8 mMajor = 0; /*!< DG Versions Major value of type quint8 extracted out */ - quint8 mMinor = 0; /*!< DG Versions Minor value of type quint8 extracted out */ - quint8 mMicro = 0; /*!< DG Versions Micro value of type quint8 extracted out */ - quint16 mBuild = 0; /*!< DG Versions Build value of type quint16 extracted out */ - quint8 mFPGAId = 0; /*!< DG Versions FPGA ID value of type quint8 extracted out */ - quint8 mFPGAMajor = 0; /*!< DG Versions FPGA Major value of type quint8 extracted out */ - quint8 mFPGAMinor = 0; /*!< DG Versions FPGA Minor value of type quint8 extracted out */ - quint8 mFPGALab = 0; /*!< DG Versions FPGA Lab value of type quint8 extracted out */ + quint8 mMajor = 0; /*!< DG Versions Major value of type quint8 extracted out */ + quint8 mMinor = 0; /*!< DG Versions Minor value of type quint8 extracted out */ + quint8 mMicro = 0; /*!< DG Versions Micro value of type quint8 extracted out */ + quint16 mBuild = 0; /*!< DG Versions Build value of type quint16 extracted out */ + quint8 mFPGAId = 0; /*!< DG Versions FPGA ID value of type quint8 extracted out */ + quint8 mFPGAMajor = 0; /*!< DG Versions FPGA Major value of type quint8 extracted out */ + quint8 mFPGAMinor = 0; /*!< DG Versions FPGA Minor value of type quint8 extracted out */ + quint8 mFPGALab = 0; /*!< DG Versions FPGA Lab value of type quint8 extracted out */ + quint32 mCompatibilityRev = 0; /*!< DG Compatibility Revision */ }; MAdjustVersionsDGResponse () { } Index: sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r34861b44547037950fcf398accc7649f7fac4529 --- sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp (.../MAdjustHDVersionsResponse.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp (.../MAdjustHDVersionsResponse.cpp) (revision 34861b44547037950fcf398accc7649f7fac4529) @@ -18,27 +18,29 @@ QVariantList MAdjustVersionsHDResponse::parameters() const { return { - _data.mMajor .value, - _data.mMinor .value, - _data.mMicro .value, - _data.mBuild .value, - _data.mFPGAId .value, - _data.mFPGAMajor .value, - _data.mFPGAMinor .value, - _data.mFPGALab .value, + _data.mMajor .value, + _data.mMinor .value, + _data.mMicro .value, + _data.mBuild .value, + _data.mFPGAId .value, + _data.mFPGAMajor .value, + _data.mFPGAMinor .value, + _data.mFPGALab .value, + _data.mCompatibilityRev .value, }; } bool MAdjustVersionsHDResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mMajor )) - if (GetValue(vByteArray, index, _data.mMinor )) - if (GetValue(vByteArray, index, _data.mMicro )) - if (GetValue(vByteArray, index, _data.mBuild )) - if (GetValue(vByteArray, index, _data.mFPGAId )) - if (GetValue(vByteArray, index, _data.mFPGAMajor )) - if (GetValue(vByteArray, index, _data.mFPGAMinor )) - if (GetValue(vByteArray, index, _data.mFPGALab )) + if (GetValue(vByteArray, index, _data.mMajor )) + if (GetValue(vByteArray, index, _data.mMinor )) + if (GetValue(vByteArray, index, _data.mMicro )) + if (GetValue(vByteArray, index, _data.mBuild )) + if (GetValue(vByteArray, index, _data.mFPGAId )) + if (GetValue(vByteArray, index, _data.mFPGAMajor )) + if (GetValue(vByteArray, index, _data.mFPGAMinor )) + if (GetValue(vByteArray, index, _data.mFPGALab )) + if (GetValue(vByteArray, index, _data.mCompatibilityRev )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -48,17 +50,19 @@ 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; } } AdjustVersionsHDResponseData MAdjustVersionsHDResponse::data() const { Data data; - data.mMajor = _data.mMajor .value; - data.mMinor = _data.mMinor .value; - data.mMicro = _data.mMicro .value; - data.mBuild = _data.mBuild .value; - data.mFPGAId = _data.mFPGAId .value; - data.mFPGAMajor = _data.mFPGAMajor.value; - data.mFPGAMinor = _data.mFPGAMinor.value; - data.mFPGALab = _data.mFPGALab .value; + data.mMajor = _data.mMajor .value; + data.mMinor = _data.mMinor .value; + data.mMicro = _data.mMicro .value; + data.mBuild = _data.mBuild .value; + data.mFPGAId = _data.mFPGAId .value; + data.mFPGAMajor = _data.mFPGAMajor .value; + data.mFPGAMinor = _data.mFPGAMinor .value; + data.mFPGALab = _data.mFPGALab .value; + data.mCompatibilityRev = _data.mCompatibilityRev .value; return data; } Index: sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r34861b44547037950fcf398accc7649f7fac4529 --- sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h (.../MAdjustHDVersionsResponse.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h (.../MAdjustHDVersionsResponse.h) (revision 34861b44547037950fcf398accc7649f7fac4529) @@ -36,14 +36,15 @@ * * | Payload || * | || - * | #1:(U08) | \ref Data::mHDMajor | - * | #2:(U08) | \ref Data::mHDMinor | - * | #3:(U08) | \ref Data::mHDMicro | - * | #4:(U16) | \ref Data::mHDBuild | - * | #5:(U08) | \ref Data::mHDFPGAId | - * | #6:(U08) | \ref Data::mHDFPGAMajor | - * | #7:(U08) | \ref Data::mHDFPGAMinor | - * | #8:(U08) | \ref Data::mHDFPGALab | + * | #1:(U08) | \ref Data::mHDMajor | + * | #2:(U08) | \ref Data::mHDMinor | + * | #3:(U08) | \ref Data::mHDMicro | + * | #4:(U16) | \ref Data::mHDBuild | + * | #5:(U08) | \ref Data::mHDFPGAId | + * | #6:(U08) | \ref Data::mHDFPGAMajor | + * | #7:(U08) | \ref Data::mHDFPGAMinor | + * | #8:(U08) | \ref Data::mHDFPGALab | + * | #9:(U32) | \ref Data::mCompatibilityRev | * * \sa Data * \sa MAdjustVersionsHDResponse : HD Versions Response Data @@ -64,14 +65,15 @@ QVariantList parameters() const override; struct { - Types::U08 mMajor ; - Types::U08 mMinor ; - Types::U08 mMicro ; - Types::U16 mBuild ; - Types::U08 mFPGAId ; - Types::U08 mFPGAMajor ; - Types::U08 mFPGAMinor ; - Types::U08 mFPGALab ; + Types::U08 mMajor ; + Types::U08 mMinor ; + Types::U08 mMicro ; + Types::U16 mBuild ; + Types::U08 mFPGAId ; + Types::U08 mFPGAMajor ; + Types::U08 mFPGAMinor ; + Types::U08 mFPGALab ; + Types::U32 mCompatibilityRev ; } _data; public: @@ -81,14 +83,15 @@ QString infoText () const override { return QString("VersionRsp") ; } struct Data { - quint8 mMajor = 0; /*!< HD Versions Major value of type quint8 extracted out */ - quint8 mMinor = 0; /*!< HD Versions Minor value of type quint8 extracted out */ - quint8 mMicro = 0; /*!< HD Versions Micro value of type quint8 extracted out */ - quint16 mBuild = 0; /*!< HD Versions Build value of type quint16 extracted out */ - quint8 mFPGAId = 0; /*!< HD Versions FPGA ID value of type quint8 extracted out */ - quint8 mFPGAMajor = 0; /*!< HD Versions FPGA Major value of type quint8 extracted out */ - quint8 mFPGAMinor = 0; /*!< HD Versions FPGA Minor value of type quint8 extracted out */ - quint8 mFPGALab = 0; /*!< HD Versions FPGA Lab value of type quint8 extracted out */ + quint8 mMajor = 0; /*!< HD Versions Major value of type quint8 extracted out */ + quint8 mMinor = 0; /*!< HD Versions Minor value of type quint8 extracted out */ + quint8 mMicro = 0; /*!< HD Versions Micro value of type quint8 extracted out */ + quint16 mBuild = 0; /*!< HD Versions Build value of type quint16 extracted out */ + quint8 mFPGAId = 0; /*!< HD Versions FPGA ID value of type quint8 extracted out */ + quint8 mFPGAMajor = 0; /*!< HD Versions FPGA Major value of type quint8 extracted out */ + quint8 mFPGAMinor = 0; /*!< HD Versions FPGA Minor value of type quint8 extracted out */ + quint8 mFPGALab = 0; /*!< HD Versions FPGA Lab value of type quint8 extracted out */ + quint32 mCompatibilityRev = 0; /*!< HD Versions Compatibility Revision */ }; MAdjustVersionsHDResponse () { } Index: sources/model/hd/data/treatment/MTreatmentStatesData.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r34861b44547037950fcf398accc7649f7fac4529 --- sources/model/hd/data/treatment/MTreatmentStatesData.cpp (.../MTreatmentStatesData.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/model/hd/data/treatment/MTreatmentStatesData.cpp (.../MTreatmentStatesData.cpp) (revision 34861b44547037950fcf398accc7649f7fac4529) @@ -27,6 +27,7 @@ _data.mBloodPrimeState .value, _data.mTreatmentEndState .value, _data.mTreatmentStopState .value, + _data.mDialysisState .value, }; } @@ -41,6 +42,7 @@ if (GetValue(vByteArray, index, _data.mBloodPrimeState )) if (GetValue(vByteArray, index, _data.mTreatmentEndState )) if (GetValue(vByteArray, index, _data.mTreatmentStopState )) + if (GetValue(vByteArray, index, _data.mDialysisState )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -51,6 +53,7 @@ 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; } } /*! @@ -69,5 +72,6 @@ data.mBloodPrimeState = _data.mBloodPrimeState .value; data.mTreatmentEndState = _data.mTreatmentEndState .value; data.mTreatmentStopState = _data.mTreatmentStopState .value; + data.mDialysisState = _data.mDialysisState .value; return data; } Index: sources/model/hd/data/treatment/MTreatmentStatesData.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r34861b44547037950fcf398accc7649f7fac4529 --- sources/model/hd/data/treatment/MTreatmentStatesData.h (.../MTreatmentStatesData.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/model/hd/data/treatment/MTreatmentStatesData.h (.../MTreatmentStatesData.h) (revision 34861b44547037950fcf398accc7649f7fac4529) @@ -84,6 +84,7 @@ Types::U32 mBloodPrimeState ; Types::U32 mTreatmentEndState ; Types::U32 mTreatmentStopState ; + Types::U32 mDialysisState ; } _data; public: @@ -102,6 +103,7 @@ quint32 mBloodPrimeState = 0; ///< BloodPrime State - Blood_Prime_States quint32 mTreatmentEndState = 0; ///< TreatmentEnd State - Treatment_Stop_States quint32 mTreatmentStopState = 0; ///< TreatmentStop State - Treatment_End_States + quint32 mDialysisState = 0; ///< Dialysis State - Dialysis_State }; MTreatmentStates() { } Index: sources/view/settings/VAdjustmentVersions.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r34861b44547037950fcf398accc7649f7fac4529 --- sources/view/settings/VAdjustmentVersions.cpp (.../VAdjustmentVersions.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/settings/VAdjustmentVersions.cpp (.../VAdjustmentVersions.cpp) (revision 34861b44547037950fcf398accc7649f7fac4529) @@ -39,21 +39,23 @@ void VAdjustmentVersions::onActionReceive(const AdjustVersionsHDResponseData &vData) { // HD versions data - hdVerMajor ( vData.mMajor ); - hdVerMinor ( vData.mMinor ); - hdVerMicro ( vData.mMicro ); - hdVerBuild ( vData.mBuild ); - hdVerFPGAId ( vData.mFPGAId ); - hdVerFPGAMajor ( vData.mFPGAMajor ); - hdVerFPGAMinor ( vData.mFPGAMinor ); - hdVerFPGALab ( vData.mFPGALab ); + hdVerMajor ( vData.mMajor ); + hdVerMinor ( vData.mMinor ); + hdVerMicro ( vData.mMicro ); + hdVerBuild ( vData.mBuild ); + hdVerFPGAId ( vData.mFPGAId ); + hdVerFPGAMajor ( vData.mFPGAMajor ); + hdVerFPGAMinor ( vData.mFPGAMinor ); + hdVerFPGALab ( vData.mFPGALab ); + hdVerCompatibilityRev ( vData.mCompatibilityRev ); hdVerDevice ( _hdVerDeviceFormat - .arg ( vData.mMajor ) - .arg ( vData.mMinor ) - .arg ( vData.mMicro ) - .arg ( vData.mBuild )); + .arg ( vData.mMajor ) + .arg ( vData.mMinor ) + .arg ( vData.mMicro ) + .arg ( vData.mBuild ) + .arg ( vData.mCompatibilityRev )); hdVerFPGA ( _hdVerFPGAFormat .arg ( vData.mFPGAId ) @@ -69,21 +71,23 @@ void VAdjustmentVersions::onActionReceive(const AdjustVersionsDGResponseData &vData) { // DG versions data - dgVerMajor ( vData.mMajor ); - dgVerMinor ( vData.mMinor ); - dgVerMicro ( vData.mMicro ); - dgVerBuild ( vData.mBuild ); - dgVerFPGAId ( vData.mFPGAId ); - dgVerFPGAMajor ( vData.mFPGAMajor ); - dgVerFPGAMinor ( vData.mFPGAMinor ); - dgVerFPGALab ( vData.mFPGALab ); + dgVerMajor ( vData.mMajor ); + dgVerMinor ( vData.mMinor ); + dgVerMicro ( vData.mMicro ); + dgVerBuild ( vData.mBuild ); + dgVerFPGAId ( vData.mFPGAId ); + dgVerFPGAMajor ( vData.mFPGAMajor ); + dgVerFPGAMinor ( vData.mFPGAMinor ); + dgVerFPGALab ( vData.mFPGALab ); + dgVerCompatibilityRev ( vData.mCompatibilityRev ); dgVerDevice ( _dgVerDeviceFormat - .arg ( vData.mMajor ) - .arg ( vData.mMinor ) - .arg ( vData.mMicro ) - .arg ( vData.mBuild )); + .arg ( vData.mMajor ) + .arg ( vData.mMinor ) + .arg ( vData.mMicro ) + .arg ( vData.mBuild ) + .arg ( vData.mCompatibilityRev )); dgVerFPGA ( _dgVerFPGAFormat .arg ( vData.mFPGAId ) Index: sources/view/settings/VAdjustmentVersions.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r34861b44547037950fcf398accc7649f7fac4529 --- sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision 34861b44547037950fcf398accc7649f7fac4529) @@ -42,9 +42,9 @@ AdjustVersionsRequestData _data; - const QString _hdVerDeviceFormat = "%1.%2.%3.%4"; + const QString _hdVerDeviceFormat = "%1.%2.%3.%4.%5"; const QString _hdVerFPGAFormat = "%1.%2.%3.%4"; - const QString _dgVerDeviceFormat = "%1.%2.%3.%4"; + const QString _dgVerDeviceFormat = "%1.%2.%3.%4.%5"; const QString _dgVerFPGAFormat = "%1.%2.%3.%4"; // coco begin validated: @@ -56,24 +56,26 @@ // coco end // HD Versions data - PROPERTY( quint8 , hdVerMajor , 0) - PROPERTY( quint8 , hdVerMinor , 0) - PROPERTY( quint8 , hdVerMicro , 0) - PROPERTY( quint16 , hdVerBuild , 0) - PROPERTY( quint8 , hdVerFPGAId , 0) - PROPERTY( quint8 , hdVerFPGAMajor , 0) - PROPERTY( quint8 , hdVerFPGAMinor , 0) - PROPERTY( quint8 , hdVerFPGALab , 0) + PROPERTY( quint8 , hdVerMajor , 0) + PROPERTY( quint8 , hdVerMinor , 0) + PROPERTY( quint8 , hdVerMicro , 0) + PROPERTY( quint16 , hdVerBuild , 0) + PROPERTY( quint8 , hdVerFPGAId , 0) + PROPERTY( quint8 , hdVerFPGAMajor , 0) + PROPERTY( quint8 , hdVerFPGAMinor , 0) + PROPERTY( quint8 , hdVerFPGALab , 0) + PROPERTY( quint32 , hdVerCompatibilityRev , 0) // DG Versions data - PROPERTY( quint8 , dgVerMajor , 0) - PROPERTY( quint8 , dgVerMinor , 0) - PROPERTY( quint8 , dgVerMicro , 0) - PROPERTY( quint16 , dgVerBuild , 0) - PROPERTY( quint8 , dgVerFPGAId , 0) - PROPERTY( quint8 , dgVerFPGAMajor , 0) - PROPERTY( quint8 , dgVerFPGAMinor , 0) - PROPERTY( quint8 , dgVerFPGALab , 0) + PROPERTY( quint8 , dgVerMajor , 0) + PROPERTY( quint8 , dgVerMinor , 0) + PROPERTY( quint8 , dgVerMicro , 0) + PROPERTY( quint16 , dgVerBuild , 0) + PROPERTY( quint8 , dgVerFPGAId , 0) + PROPERTY( quint8 , dgVerFPGAMajor , 0) + PROPERTY( quint8 , dgVerFPGAMinor , 0) + PROPERTY( quint8 , dgVerFPGALab , 0) + PROPERTY( quint32 , dgVerCompatibilityRev , 0) PROPERTY( QString , hdVerDevice ,"") PROPERTY( QString , hdVerFPGA ,"")