Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -rc241fc1d31be3e4958582dff94de8189f5bbba67 -r1f8abdd821041623392d18cf4f80cad9ae1bf246 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision c241fc1d31be3e4958582dff94de8189f5bbba67) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 1f8abdd821041623392d18cf4f80cad9ae1bf246) @@ -293,6 +293,19 @@ } }; +/*! + * \brief The MAlarmAcknowledgeReq class + * \details The model to tell HD an alarm has been acknowledged + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| + * | 63 | 0x100 | N/A | Cmd | Y | UI | HD | Alarm Acknolwedge Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref alarmID | + * + */ class MAlarmAcknowledgeReq : public MModel { public: quint32 alarmID; @@ -307,6 +320,19 @@ } }; +/*! + * \brief The MStartTreatmentReq class + * \details The model to request starting a treatment + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| + * | 56 | 0x100 | 9 | Req | Y | UI | HD | Start Treatment Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref request | + * + */ class MStartTreatmentReq : public MModel { public: enum Options { @@ -326,6 +352,19 @@ } }; +/*! + * \brief The MConfirmTreatmentReq 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 | + * + * | Payload || + * | || + * | #1:(U32) | \ref request | + * + */ class MConfirmTreatmentReq : public MModel { public: enum Options { @@ -344,6 +383,19 @@ } }; +/*! + * \brief The MEndTreatmentReq class + * \details The model to request an end to treatment + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| + * | 60 | 0x100 | 9 | Req | Y | UI | HD | End Treatment Request | + * + * | Payload || + * | || + * | N/A || + * + */ class MEndTreatmentReq : public MModel { public: @@ -358,26 +410,55 @@ } }; +/*! + * \brief The MAdjustTreatmentParametersReq class + * \details The model used to request treatment parameters validation + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| + * | 60 | 0x100 | 9 | Req | Y | UI | HD | New Treatment Parameters Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref bloodFlowRate | + * | #2:(U32) | \ref dialysateFlowRate | + * | #3:(U32) | \ref duration | + * | #4:(U32) | \ref heparinStopTime | + * | #5:(U32) | \ref salineBolus | + * | #6:(U32) | \ref acidConcentrate | + * | #7:(U32) | \ref bicarbonateConcentrate | + * | #8:(U32) | \ref dialyzerType | + * | #9:(U32) | \ref bloodPressureMeasureInterval | + * | #10:(U32) | \ref rinsebackFlowRate | + * | #11:(S32) | \ref arterialPressureLimitLow | + * | #12:(S32) | \ref arterialPressureLimitHigh | + * | #13:(S32) | \ref venousPressureLimitLow | + * | #14:(S32) | \ref venousPressureLimitHigh | + * | #15:(F32) | \ref heparinDispensingRate | + * | #16:(F32) | \ref heparinBolusVolume | + * | #17:(F32) | \ref dialysateTemp | + * + */ class MAdjustTreatmentParametersReq : public MModel { public: quint32 bloodFlowRate = 0; // mL/min quint32 dialysateFlowRate = 0; // mL/min quint32 duration = 0; // minutes - float heparinDispensingRate = 0; // mL/hr - float heparinBolusVolume = 0; // mL quint32 heparinStopTime = 0; // min quint32 salineBolus = 0; // mL quint32 acidConcentrate = 0; // quint32 bicarbonateConcentrate = 0; // quint32 dialyzerType = 0; // - float dialysateTemp = 0; // Celsius + quint32 bloodPressureMeasureInterval = 0; // minutes + quint32 rinsebackFlowRate = 0; // mL/min qint32 arterialPressureLimitLow = 0; // mmHg qint32 arterialPressureLimitHigh = 0; // mmHg qint32 venousPressureLimitLow = 0; // mmHg qint32 venousPressureLimitHigh = 0; // mmHg - quint32 bloodPressureMeasureInterval = 0; // minutes - quint32 rinsebackFlowRate = 0; // mL/min + float heparinDispensingRate = 0; // mL/hr + float heparinBolusVolume = 0; // mL + float dialysateTemp = 0; // Celsius // coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. @@ -386,20 +467,20 @@ bloodFlowRate , dialysateFlowRate , duration , - heparinDispensingRate , - heparinBolusVolume , heparinStopTime , salineBolus , acidConcentrate , bicarbonateConcentrate , dialyzerType , - dialysateTemp , + bloodPressureMeasureInterval , + rinsebackFlowRate , arterialPressureLimitLow , arterialPressureLimitHigh , venousPressureLimitLow , venousPressureLimitHigh , - bloodPressureMeasureInterval , - rinsebackFlowRate , + heparinDispensingRate , + heparinBolusVolume , + dialysateTemp , }); } // coco end