Index: sources/view/settings/VAdjustmentVersions.h =================================================================== diff -u -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 -rb80f8f84f21f86ad4c962a2c690447c572498e0b --- sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) +++ sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b) @@ -22,6 +22,7 @@ #include "MAdjustTDVersionsRequest.h" #include "MAdjustTDVersionsResponse.h" #include "MAdjustDDVersionsResponse.h" +#include "MAdjustFPVersionsResponse.h" #include "MAdjustTDSerialNumberResponse.h" #include "MAdjustDDSerialNumberResponse.h" @@ -46,11 +47,14 @@ const QString _tdVerFPGAFormat = "%1.%2.%3.%4"; const QString _ddVerDeviceFormat = "%1.%2.%3.%4.%5"; const QString _ddVerFPGAFormat = "%1.%2.%3.%4"; + const QString _fpVerDeviceFormat = "%1.%2.%3.%4.%5"; + const QString _fpVerFPGAFormat = "%1.%2.%3.%4"; // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI TRIGGER( bool , adjustmentTD , 0) TRIGGER( bool , adjustmentDD , 0) + TRIGGER( bool , adjustmentFP , 0) // TD Versions data PROPERTY( quint8 , tdVerMajor , 0) @@ -74,17 +78,31 @@ PROPERTY( quint8 , ddVerFPGALab , 0) PROPERTY( quint32 , ddVerCompatibilityRev , 0) + // FP Versions data + PROPERTY( quint8 , fpVerMajor , 0) + PROPERTY( quint8 , fpVerMinor , 0) + PROPERTY( quint8 , fpVerMicro , 0) + PROPERTY( quint16 , fpVerBuild , 0) + PROPERTY( quint8 , fpVerFPGAId , 0) + PROPERTY( quint8 , fpVerFPGAMajor , 0) + PROPERTY( quint8 , fpVerFPGAMinor , 0) + PROPERTY( quint8 , fpVerFPGALab , 0) + PROPERTY( quint32 , fpVerCompatibilityRev , 0) + PROPERTY( QString , tdVerDevice ,"") PROPERTY( QString , tdVerFPGA ,"") PROPERTY( QString , tdSerial ,"") PROPERTY( QString , ddVerDevice ,"") PROPERTY( QString , ddVerFPGA ,"") PROPERTY( QString , ddSerial ,"") + PROPERTY( QString , fpVerDevice ,"") + PROPERTY( QString , fpVerFPGA ,"") VIEW_DEC_CLASS(VAdjustmentVersions) VIEW_DEC_SLOT ( AdjustVersionsTDRequestData) VIEW_DEC_SLOT (AdjustVersionsTDResponseData) VIEW_DEC_SLOT (AdjustVersionsDDResponseData) + VIEW_DEC_SLOT (AdjustVersionsFPResponseData) VIEW_DEC_SLOT (AdjustSerialNumberTDResponseData) VIEW_DEC_SLOT (AdjustSerialNumberDDResponseData)