Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -r1f36c7f6eb909b9f78b97cc43c4fa24995ae9ef3 -rdf74454a7a75eb63ac577739c1fd0f179e479f44 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 1f36c7f6eb909b9f78b97cc43c4fa24995ae9ef3) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision df74454a7a75eb63ac577739c1fd0f179e479f44) @@ -448,7 +448,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 | @@ -460,7 +460,7 @@ * | #1:(U32) | \ref request | * */ -class MStartTreatmentReq : public MModel { +class MTreatmentStartReq : public MModel { public: enum Options { eSelectParams = 0, @@ -480,19 +480,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, @@ -511,7 +511,7 @@ }; /*! - * \brief The MEndTreatmentReq class + * \brief The MTreatmentEndReq class * \details The model to request an end to treatment * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | @@ -523,7 +523,7 @@ * | N/A || * */ -class MEndTreatmentReq : public MModel { +class MTreatmentEndReq : public MModel { public: // coco begin validated : Has been validated manually. @@ -615,7 +615,6 @@ return MModel::toString("AdjustTreatmentParametersRequest", vParameters); } }; - } typedef Model:: MAdjustPowerOffReq AdjustPowerOffRequestData; @@ -628,9 +627,9 @@ typedef Model:: MAdjustSalineReq AdjustSalineRequestData; typedef Model:: MAdjustHeparinReq AdjustHeparinRequestData; typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData; -typedef Model:: MStartTreatmentReq StartTreatmentRequestData; -typedef Model:: MConfirmTreatmentReq ConfirmTreatmentRequestData; -typedef Model:: MEndTreatmentReq EndTreatmentRequestData; +typedef Model:: MTreatmentStartReq TreatmentStartRequestData; +typedef Model:: MTreatmentConfirmReq TreatmentConfirmRequestData; +typedef Model:: MTreatmentEndReq TreatmentEndRequestData; typedef Model:: MAdjustTreatmentParametersReq AdjustTreatmentParametersRequestData; typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; typedef Model:: MAlarmClearedConditionReq AlarmClearedConditionRequestData;