Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -r0b8e00869ef81ef0a834c03c13049f4c281870d2 -r62d4bbefa96100e5a01194c0b704fe32d9db56ec --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 0b8e00869ef81ef0a834c03c13049f4c281870d2) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) @@ -496,6 +496,64 @@ static Can::Can_Id canid () { return Can::eChlid_UI_Sync; } }; +/*! + * \brief The MAdjustAlarmVolumeReq class + * \details The DG/HD versions request model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:----:|:---:|:---:|:----:|:---------------------------:| + * | 0x4E00 | 0x100 | Req | Y | UI | HD | HD Set Alarm Volume Request | + * + * | Payload || + * | || + * | #1:(U32) volume | \ref Alarm Volume | + * + */ +class MAdjustAlarmVolumeReq : public MModel { +public: + + quint32 volume; + + // coco begin validated : Has been validated manually. + // This object is used statically for now, kept the logic for later usage. + QString toString() { + return toString({volume}); + } + // coco end + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AlarmVolume", vParameters); + } +}; + +/*! + * \brief The MAdjustServiceReq class + * \details The DG/HD versions request model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:----:|:---:|:---:|:----:|:---------------------------:| + * | 0x8900 | 0x200 | Req | Y | UI | All | DG/HD Service Dates Request | + * + * | Payload || + * | || + * | #1:(N/A) | \ref None | + * + */ +class MAdjustServiceReq : public MModel { +public: + + // coco begin validated : Has been validated manually. + // This object is used statically for now, kept the logic for later usage. + QString toString() { + return toString({}); + } + // coco end + static QString toString(const QVariantList &vParameters) { + return MModel::toString("ServiceDates", vParameters); + } + + static Can::Can_Id canid () { return Can::eChlid_UI_Sync; } +}; + //// ---------- Alarms /*! @@ -582,7 +640,7 @@ }; /*! - * \brief The MStartTreatmentReq class + * \brief The MTreatmentStartReq class * \details The model to request starting a treatment * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | @@ -594,7 +652,7 @@ * | #1:(U32) | \ref request | * */ -class MStartTreatmentReq : public MModel { +class MTreatmentStartReq : public MModel { public: enum Options { eSelectParams = 0, @@ -614,19 +672,19 @@ }; /*! - * \brief The MConfirmTreatmentReq class + * \brief The MTreatmentConfirmReq class * \details The model to tell HD treatment parameters have been confirmed * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| - * | 56 | 0x100 | 9 | Req | Y | UI | HD | Confirm Treatment Request | + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:-----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| + * | 0x3B00| 0x100 | 9 | Req | Y | UI | HD | Confirm Treatment Request | * * | Payload || * | || * | #1:(U32) | \ref request | * */ -class MConfirmTreatmentReq : public MModel { +class MTreatmentConfirmReq : public MModel { public: enum Options { eCancel = 0, @@ -723,6 +781,58 @@ } }; +/*! + * \brief The MAdjustHDDateTime class + * \details The model to request starting a treatment + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:-------------------------:| + * | 109 | 0x100 | Req | Y | UI | HD | Set RTC Date and Time | + * + * | Payload || + * | || + * | #1:(U32) | \ref mEpoch | + * + */ +class MAdjustHDDateTimeReq : public MModel { +public: + quint32 mEpoch; + // coco begin validated : Has been validated manually. + QString toString() { + return toString({mEpoch}); + } + // coco end + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustHDDateTime", vParameters); + } +}; + + +/*! + * \brief The MAdjustDGDateTime class + * \details The model to request starting a treatment + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:-------------------------:| + * | 111 | 0x110 | Req | Y | UI | DG | Set RTC Date and Time | + * + * | Payload || + * | || + * | #1:(U32) | \ref mEpoch | + * + */ +class MAdjustDGDateTimeReq : public MModel { +public: + quint32 mEpoch; + // coco begin validated : Has been validated manually. + QString toString() { + return toString({mEpoch}); + } + // coco end + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDGDateTime", vParameters); + } +}; } typedef Model:: MAdjustPowerOffReq AdjustPowerOffRequestData; @@ -738,10 +848,14 @@ typedef Model:: MAdjustRecirculateReq AdjustRecirculateRequestData; typedef Model:: MAdjustTreatmentEndReq AdjustTreatmentEndRequestData; typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData; -typedef Model:: MStartTreatmentReq StartTreatmentRequestData; -typedef Model:: MConfirmTreatmentReq ConfirmTreatmentRequestData; +typedef Model:: MTreatmentStartReq TreatmentStartRequestData; +typedef Model:: MTreatmentConfirmReq TreatmentConfirmRequestData; typedef Model:: MAdjustTreatmentParametersReq AdjustTreatmentParametersRequestData; typedef Model:: MAdjustVersionsReq AdjustVersionsRequestData; +typedef Model:: MAdjustServiceReq AdjustServiceRequestData; +typedef Model:: MAdjustHDDateTimeReq AdjustHDDateTimeRequestData; +typedef Model:: MAdjustDGDateTimeReq AdjustDGDateTimeRequestData; +typedef Model:: MAdjustAlarmVolumeReq AdjustAlarmVolumeRequestData; // Alarms typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; typedef Model:: MAlarmClearedConditionReq AlarmClearedConditionRequestData;