Index: sources/model/hd/adjustment/settings/MAdjustHDRequests.h =================================================================== diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) +++ sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -17,7 +17,10 @@ // Qt -//project +// FW +#include "Compatible.h" + +// project #include "MAdjustRequestsBase.h" using namespace Gui; @@ -96,26 +99,67 @@ * * | Payload || * | || - * | (N/A) || + * | #1:(U08) | major | + * | #2:(U08) | minor | + * | #3:(U08) | micro | + * | #4:(U16) | revision(build) | + * | #5:(U32) | compatibility | * */ class MAdjustVersionsReq : public MModel { public: + quint8 ver_major = QString("%1").arg(VER_MAJOR ).toUInt(); + quint8 ver_minor = QString("%1").arg(VER_MINOR ).toUInt(); + quint8 ver_micro = QString("%1").arg(VER_MICRO ).toUInt(); + quint16 ver_revis = QString("%1").arg(VER_REVIS ).toUInt(); + quint32 ver_comp = QString("%1").arg(SW_COMPATIBILITY_REV).toUInt(); + // coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { - return toString({}); + return toString({ ver_major , + ver_minor , + ver_micro , + ver_revis , + ver_comp , + }); } // coco end static QString toString(const QVariantList &vParameters) { - return MModel::toString("Version", vParameters); + return MModel::toString("VersionReq", vParameters); } static Can::Can_Id canid () { return Can::eChlid_UI_Sync; } }; + /*! + * \brief The MAdjustVersionsRsp class + * \details The UI versions response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:----:|:---:|:---:|:----:|:-----------:| + * | 0x9F00 | 0x200 | Rsp | Y | UI | HD | UI Versions/SN Response | + * + * | Payload || + * | || + * | #1:(U08) | major | + * | #2:(U08) | minor | + * | #3:(U08) | micro | + * | #4:(U16) | revision(build) | + * | #5:(U32) | compatibility | + * + */ +class MAdjustVersionsRsp : public MAdjustVersionsReq { +public: + static QString toString(const QVariantList &vParameters) { + return MModel::toString("VersionRsp", vParameters); + } + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_HD; } +}; + +/*! * \brief The MAdjustServiceReq class * \details The DG/HD versions request model * @@ -144,9 +188,40 @@ static Can::Can_Id canid () { return Can::eChlid_UI_Sync; } }; + +/*! + * \brief The MAdjustUIPostFinalResultRequest class + * \details The UI power on self test result model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:----:|:---:|:---:|:----:|:-----------:| + * | 0x9200 | 0x100 | Req | Y | UI | HD | Report UI POST result | + * + * | Payload || + * | || + * | #1:(U32) mResult | \ref mResult | + * + */ +class MAdjustUIPostFinalResultReq : public MModel { +public: + + quint32 mResult; + + // coco begin validated : Has been validated manually. + // This object is used statically for now, kept the logic for later usage. + QString toString() { + return toString( { mResult } ); + } + // coco end + static QString toString(const QVariantList &vParameters) { + return MModel::toString("UIPOSTDone", vParameters); + } +}; } -typedef Model:: MAdjustVersionsReq AdjustVersionsRequestData; -typedef Model:: MAdjustServiceReq AdjustServiceRequestData; -typedef Model:: MAdjustHDDateTimeReq AdjustHDDateTimeRequestData; -typedef Model::MAdjustHDAlarmVolumeReq AdjustHDAlarmVolumeRequestData; +typedef Model:: MAdjustVersionsReq AdjustVersionsRequestData; +typedef Model:: MAdjustVersionsRsp AdjustVersionsResponseData; +typedef Model:: MAdjustServiceReq AdjustServiceRequestData; +typedef Model:: MAdjustHDDateTimeReq AdjustHDDateTimeRequestData; +typedef Model:: MAdjustHDAlarmVolumeReq AdjustHDAlarmVolumeRequestData; +typedef Model::MAdjustUIPostFinalResultReq AdjustUIPostFinalResultRequestData;