Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca) @@ -355,7 +355,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x8400| 0x100 | Req | Y | UI | HD | Isolated UF Duration Change Request | + * |0x8400| 0x100 | Req | Y | UI | TD | Isolated UF Duration Change Request | * * | Payload || * | || @@ -374,28 +374,28 @@ }; /*! - * \brief The MAdjustIsolatedUFVolumeGoalEditReq class + * \brief The MAdjustIsolatedUFVolumeEditReq class * \details The ultrafiltration volume change request model * - * | MSG | CAN ID | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x8600| 0x100 | Req | Y | UI | HD | Isolated UF VolumeGoal Change Request | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * |0x8600| 0x100 | Req | Y | UI | TD | Isolated UF Volume Change Request | * * | Payload || * | || * | #1:(U32) | \ref duration | - * | #1:(U32) | \ref volumeGoal | + * | #1:(U32) | \ref volume | * */ -class MAdjustIsolatedUFVolumeGoalEditReq : public MModel { +class MAdjustIsolatedUFVolumeEditReq : public MModel { public: quint32 duration = 0; - quint32 volumeGoal = 0; + quint32 volume = 0; QString toString() { - return toString({duration, volumeGoal}); + return toString({duration, volume}); } static QString toString(const QVariantList &vParameters) { - return MModel::toString("AdjustIsolatedUFVolumeGoalEdit", vParameters); + return MModel::toString("AdjustIsolatedUFVolumeEdit", vParameters); } }; @@ -405,7 +405,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x8800| 0x041 | Req | Y | UI | HD | Isolated UF Change User Confirm | + * |0x8800| 0x041 | Req | Y | UI | TD | Isolated UF Change User Confirm | * * | Payload || * | || @@ -697,29 +697,29 @@ } -typedef Model:: MDuetConfirmUIr DuetConfirmUIrData; -typedef Model:: MAdjustPowerOffReq AdjustPowerOffRequestData; -typedef Model:: MAdjustBloodDialysateReq AdjustBloodDialysateRequestData; -typedef Model:: MAdjustDurationEditReq AdjustDurationEditRequestData; -typedef Model:: MAdjustDurationConfirmReq AdjustDurationConfirmRequestData; -typedef Model:: MAdjustSetPointsReq AdjustSetPointsRequestData; -typedef Model:: MAdjustBloodFlowRateReq AdjustBloodFlowRateRequestData; -typedef Model:: MAdjustDialysateFlowRateReq AdjustDialysateFlowRateRequestData; -typedef Model:: MAdjustDialysateTemperatureReq AdjustDialysateTemperatureRequestData; -typedef Model:: MAdjustUltrafiltrationStateReq AdjustUltrafiltrationStateRequestData; -typedef Model:: MAdjustUltrafiltrationEditReq AdjustUltrafiltrationEditRequestData; -typedef Model::MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData; -typedef Model::MAdjustIsolatedUFDurationEditReq AdjustIsolatedUFDurationEditRequestData; -typedef Model::MAdjustIsolatedUFVolumeGoalEditReq AdjustIsolatedUFVolumeGoalEditRequestData; -typedef Model:: MAdjustIsolatedUFConfirmReq AdjustIsolatedUFConfirmRequestData; -typedef Model:: MAdjustSalineReq AdjustSalineRequestData; -typedef Model:: MAdjustVitalsReq AdjustVitalsRequestData; -typedef Model:: MAdjustHeparinReq AdjustHeparinRequestData; -typedef Model:: MAdjustRinsebackReq AdjustRinsebackRequestData; -typedef Model:: MAdjustRecirculateReq AdjustRecirculateRequestData; -typedef Model:: MAdjustTreatmentEndReq AdjustTreatmentEndRequestData; -typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData; -typedef Model:: MAdjustBolusVolumeReq AdjustBolusVolumeRequestData; +typedef Model:: MDuetConfirmUIr DuetConfirmUIrData; +typedef Model:: MAdjustPowerOffReq AdjustPowerOffRequestData; +typedef Model:: MAdjustBloodDialysateReq AdjustBloodDialysateRequestData; +typedef Model:: MAdjustDurationEditReq AdjustDurationEditRequestData; +typedef Model:: MAdjustDurationConfirmReq AdjustDurationConfirmRequestData; +typedef Model:: MAdjustSetPointsReq AdjustSetPointsRequestData; +typedef Model:: MAdjustBloodFlowRateReq AdjustBloodFlowRateRequestData; +typedef Model:: MAdjustDialysateFlowRateReq AdjustDialysateFlowRateRequestData; +typedef Model:: MAdjustDialysateTemperatureReq AdjustDialysateTemperatureRequestData; +typedef Model:: MAdjustUltrafiltrationStateReq AdjustUltrafiltrationStateRequestData; +typedef Model:: MAdjustUltrafiltrationEditReq AdjustUltrafiltrationEditRequestData; +typedef Model::MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData; +typedef Model::MAdjustIsolatedUFDurationEditReq AdjustIsolatedUFDurationEditRequestData; +typedef Model:: MAdjustIsolatedUFVolumeEditReq AdjustIsolatedUFVolumeEditRequestData; +typedef Model:: MAdjustIsolatedUFConfirmReq AdjustIsolatedUFConfirmRequestData; +typedef Model:: MAdjustSalineReq AdjustSalineRequestData; +typedef Model:: MAdjustVitalsReq AdjustVitalsRequestData; +typedef Model:: MAdjustHeparinReq AdjustHeparinRequestData; +typedef Model:: MAdjustRinsebackReq AdjustRinsebackRequestData; +typedef Model:: MAdjustRecirculateReq AdjustRecirculateRequestData; +typedef Model:: MAdjustTreatmentEndReq AdjustTreatmentEndRequestData; +typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData; +typedef Model:: MAdjustBolusVolumeReq AdjustBolusVolumeRequestData; // Alarms -typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; -typedef Model:: MAlarmUserActionReq AlarmUserActionRequestData; +typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; +typedef Model:: MAlarmUserActionReq AlarmUserActionRequestData;