Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -r21ce57716379c74355e4d268097b1b44bb59170c -rc6bfc4231be6bb3d370ffd38291c05954f38334a --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 21ce57716379c74355e4d268097b1b44bb59170c) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision c6bfc4231be6bb3d370ffd38291c05954f38334a) @@ -37,9 +37,9 @@ * \brief The MAdjustPowerOffReq class * \details The power off request model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x0100| 0x020 | 6 | Cmd | N | UI | HD | Power Off | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * |0x0100| 0x020 | Cmd | N | UI | HD | Power Off | * * | Payload || * | || @@ -92,9 +92,9 @@ * \brief The MAdjustBloodDialysateReq class * \details The blood/dialysate rate change request model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x1700| 0x100 | 9 | Req | Y | UI | HD | Blood/dialysate rate Change | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * |0x1700| 0x100 | Req | Y | UI | HD | Blood/dialysate rate Change | * * | Payload || * | || @@ -119,9 +119,9 @@ * \brief The MAdjustDurationReq class * \details The treatment duration change request model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x1600| 0x100 | 9 | Req | Y | UI | HD | Treatment Duration Change Request | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * |0x1600| 0x100 | Req | Y | UI | HD | Treatment Duration Change Request | * * | Payload || * | || @@ -143,9 +143,9 @@ * \brief The MAdjustUltrafiltrationStateReq class * \details The ultrafiltration pause/resume request model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x1000| 0x100 | 9 | Req | Y | UI | HD | UF Pause/Resume | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * |0x4700| 0x041 | Req | Y | UI | HD | UF Pause/Resume | * * | Payload || * | || @@ -168,9 +168,9 @@ * \brief The MAdjustUltrafiltrationEditReq class * \details The ultrafiltration volume change request model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x1100| 0x100 | 9 | Req | Y | UI | HD | UF Vol. Change Request | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * |0x4100| 0x100 | Req | Y | UI | HD | UF Vol. Change Request | * * | Payload || * | || @@ -192,29 +192,22 @@ * \brief The MAdjustUltrafiltrationConfirmReq class * \details The ultrafiltration volume change user confirm request model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x1500| 0x100 | 9 | Req | Y | UI | HD | UF Vol. Change User Confirm | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * |0x6600| 0x041 | Req | Y | UI | HD | UF Vol. Change User Confirm | * * | Payload || * | || * | #1:(F32) | \ref volume | - * | #2:(U32) | \ref option | * * \sa Options * */ class MAdjustUltrafiltrationConfirmReq : public MModel { public: - enum Options : quint32 { - eDuration = Gui::GuiActions::UF_ADJ_TREATMENT_TIME, - eRate = Gui::GuiActions::UF_ADJ_UF_RATE, - }; - float volume = 0; - Options option = eDuration; QString toString() { - return toString({volume , option}); + return toString({volume}); } static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustUFConfirm", vParameters); @@ -225,9 +218,9 @@ * \brief The MAdjustSalineReq class * \details The model to request the Saline Bolus state * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:--------------------:| - * |0x5E00| 0x100 | 9 | Req | Y | UI | TD | Saline Bolus Request | + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:--------------------:| + * |0x1200| 0x100 | Req | Y | UI | HD | Saline Bolus Request | * * | Payload || * | || @@ -250,37 +243,12 @@ }; /*! - * \brief The MAdjustVitalsReq class - * \details The model to request the Vitals state - * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:--------------------:| - * |0x6300| 0x100 | 9 | Req | Y | UI | TD | Vitals Request | - * - * | Payload || - * | || - * | None || - * - * \sa State - * \sa MTreatmentVitals: Vitals Data - * \sa MAdjustVitalsResponse : Vitals Response - * - */ -class MAdjustVitalsReq : public MModel { -public: - static QString toString(const QVariantList &vParameters) { - return MModel::toString("AdjustVitals", vParameters); - } -}; - - -/*! * \brief The MAdjustHeparinReq class * \details The model to request the Heparin state * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------:| - * |0x4B00| 0x100 | 9 | Req | Y | UI | HD | Heparin Request | + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------:| + * |0x4B00| 0x100 | Req | Y | UI | HD | Heparin Request | * * | Payload || * | || @@ -306,9 +274,9 @@ * \brief The MAdjustPressuresLimitsReq class * \details The model to request the pressures limits adjustment * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------------:| - * |0x4600| 0x100 | 9 | Req | Y | UI | HD | A/V BP Limit Change Request | + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------------------:| + * |0x4600| 0x100 | Req | Y | UI | HD | A/V BP Limit Change Request | * * | Payload ||| * | ||| @@ -342,9 +310,9 @@ * \brief The MAdjustRinsebackReq class * \details The model to request the Rinseback state * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------: | - * |0x5200| 0x100 | 9 | Req | Y | UI | HD | Rinseback Request | + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------: | + * |0x5200| 0x100 | Req | Y | UI | HD | Rinseback Request | * * | Payload || * | || @@ -370,9 +338,9 @@ * \brief The MAdjustRecirculateReq class * \details The model to request the Recirculate state * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------: | - * |0x5400| 0x100 | 9 | Req | Y | UI | HD | Recirculate Request | + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------: | + * |0x5400| 0x100 | Req | Y | UI | HD | Recirculate Request | * * | Payload || * | || @@ -398,9 +366,9 @@ * \brief The MAdjustTreatmentEndReq class * \details The model to request the Rinseback state * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------: | - * |0x5700| 0x100 | 9 | Req | Y | UI | HD | Treatment End Request | + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------: | + * |0x5700| 0x100 | Req | Y | UI | HD | Treatment End Request | * * | Payload || * | || @@ -479,7 +447,6 @@ typedef Model:: MAdjustUltrafiltrationEditReq AdjustUltrafiltrationEditRequestData; typedef Model::MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData; typedef Model:: MAdjustSalineReq AdjustSalineRequestData; -typedef Model:: MAdjustVitalsReq AdjustVitalsRequestData; typedef Model:: MAdjustHeparinReq AdjustHeparinRequestData; typedef Model:: MAdjustRinsebackReq AdjustRinsebackRequestData; typedef Model:: MAdjustRecirculateReq AdjustRecirculateRequestData;