Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -reb23f842f5b153622da276cdd167d98ea4d7ef04 -rd619b1355f03ab8e2e53956908bda66fea542224 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision eb23f842f5b153622da276cdd167d98ea4d7ef04) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision d619b1355f03ab8e2e53956908bda66fea542224) @@ -342,18 +342,18 @@ * \brief The MAlarmSilenceReq class * \details The model to request alarm silent * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:--------------------:| - * | | | | Req | Y | UI | HD | Alarm Silent Request | + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------------------:| + * |0x3200| 0x100 | 9 | Req | Y | UI | HD | Alarm (de)Silent Request | * * | Payload || * | || - * | #1:(U32) | TBD | + * | #1:(U32) | state | * */ class MAlarmSilenceReq : public MModel { public: - quint8 state; + quint8 state = 1; // coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { @@ -369,9 +369,9 @@ * \brief The MAlarmAcknowledgeReq class * \details The model to tell HD an alarm has been acknowledged * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| - * | 63 | 0x100 | N/A | Cmd | Y | UI | HD | Alarm Acknolwedge Request | + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:----------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| + * |0x3F00| 0x001,2,4 | N/A | Cmd | Y | UI | HD | Alarm Acknowledge Request | * * | Payload || * | || @@ -380,25 +380,25 @@ */ class MAlarmAcknowledgeReq : public MModel { public: - quint32 alarmID; + GuiAlarmID alarmID = GuiAlarmID::ALARM_ID_NO_ALARM; // coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({alarmID}); } // coco end static QString toString(const QVariantList &vParameters) { - return MModel::toString("AlarmAcknowledgeRequest", vParameters); + return MModel::toString("AlarmAcknowledge", vParameters); } }; /*! * \brief The MAlarmUserActionReq class * \details The model to tell HD an alarm action has been made by user * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| - * |0x4000| 0x100 | N/A | Cmd | Y | UI | HD | Alarm User Action | + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:------------------:| + * |0x4000| 0x100 | N/A | Cmd | Y | UI | HD | Alarm User Action | * * | Payload || * | ||