Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -rf325fa7bac94c7c0dcc9ed4185273e94669e17b7 -r3e5cdca5de3ac46619325bf1e37c572d729d5fa9 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision f325fa7bac94c7c0dcc9ed4185273e94669e17b7) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 3e5cdca5de3ac46619325bf1e37c572d729d5fa9) @@ -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 { +// MAlarmAcknowledgeReq +class MAlarmClearedConditionReq : public MModel { public: GuiAlarmID alarmID = GuiAlarmID::ALARM_ID_NO_ALARM; // coco begin validated : Has been validated manually. @@ -388,7 +389,7 @@ } // coco end static QString toString(const QVariantList &vParameters) { - return MModel::toString("AlarmAcknowledge", vParameters); + return MModel::toString("AlarmCondition", vParameters); } }; @@ -604,5 +605,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;