Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -r71784f783e4e2c0eadebef28eefb0fc53534ba66 -r741b1c70f851810f2c265cdd38dfa158b7ee0c37 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 71784f783e4e2c0eadebef28eefb0fc53534ba66) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 741b1c70f851810f2c265cdd38dfa158b7ee0c37) @@ -357,7 +357,7 @@ // coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { - return toString({state}); + return toString({silence}); } // coco end static QString toString(const QVariantList &vParameters) { @@ -366,19 +366,20 @@ }; /*! - * \brief The MAlarmAcknowledgeReq class + * \brief The MAlarmClearedConditionReq class * \details The model to tell HD an alarm has been acknowledged * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:----:|:----------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| - * |0x3F00| 0x001,2,4 | N/A | Cmd | Y | UI | HD | Alarm Acknowledge Request | + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:----------:|:-----:|:----:|:---:|:---:|:----:|:------------------------:| + * |0x3F00| 0x001,2,4 | N/A | Cmd | Y | UI | HD | Alarm Condition Cleared | * * | Payload || * | || * | #1:(U32) | \ref alarmID | * */ -class MAlarmAcknowledgeReq : public MModel { +// coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. +class MAlarmClearedConditionReq : public MModel { public: GuiAlarmID alarmID = GuiAlarmID::ALARM_ID_NO_ALARM; // coco begin validated : Has been validated manually. @@ -387,11 +388,12 @@ return toString({alarmID}); } // coco end + // coco begin validate : static QString toString(const QVariantList &vParameters) { - return MModel::toString("AlarmAcknowledge", vParameters); + return MModel::toString("AlarmCondition", vParameters); } }; - +// coco end /*! * \brief The MAlarmUserActionReq class * \details The model to tell HD an alarm action has been made by user @@ -604,5 +606,5 @@ typedef Model:: MEndTreatmentReq EndTreatmentRequestData; typedef Model:: MAdjustTreatmentParametersReq AdjustTreatmentParametersRequestData; typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; -typedef Model:: MAlarmAcknowledgeReq AlarmAcknowledgeRequestData; +typedef Model:: MAlarmClearedConditionReq AlarmClearedConditionRequestData; typedef Model:: MAlarmUserActionReq AlarmUserActionRequestData;