Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r72fe36cdaa95eb8b68ba8a3714f8a92df65b4486 -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 72fe36cdaa95eb8b68ba8a3714f8a92df65b4486) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -345,7 +345,7 @@ // ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq); break; // this message has been inherited from MAbstract and should use notify but since the response message is not standard can't use notify yet. - // when received gets payload len error and can't be interpreted. + // when received gets payload len error and can't be interpreted. (Needs FW modification) case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq : ok = adjustUltrafiltrationState (vMessage, vData); break; // TODO : implement notify<>() case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp : ok = adjustUltrafiltrationEdit (vMessage, vData); break; // TODO : implement notify<>() case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp : ok = adjustUltrafiltrationConfirm (vMessage, vData); break; // TODO : implement notify<>() Index: sources/model/MDGDebugText.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/MDGDebugText.h (.../MDGDebugText.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/MDGDebugText.h (.../MDGDebugText.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -28,28 +28,30 @@ * \brief The MDGDebugText class * \details the Debug Text Message from DG * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | Payload | - * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------------------------:|:----------------------------------------------------------:| - * |0xFFF2| 0x070 | 17 | Event| N | DG | UI | DG debug text for UI to log ASCII text | 40 bytes, null term text + msg overhead will take 6 frames | + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------------------------:| + * |0xFFF2| 0x070 | 17 | Event| N | DG | UI | DG debug text for UI to log ASCII text | * - * | Payload || - * | || + * | Payload | + * | | + * | 40 bytes, null term text + msg overhead will take 6 frames | * - * Logging info : + * \sa Data * - * | typeText | unitText | infoText | - * |:---------:|:--------:|:--------:| - * | Datum | HD | Debug | + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | DG | + * | infoText | Debug | * - * \sa Data */ class MDGDebugText : public MAbstract { // friends friend class ::tst_models; QVariantList parameters() const override; - QString _data; public: Index: sources/model/MHDDebugText.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/MHDDebugText.h (.../MHDDebugText.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/MHDDebugText.h (.../MHDDebugText.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -28,20 +28,23 @@ * \brief The MHDDebugText class * \details the Debug Text Message from HD * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | Payload | - * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------------------------:|:----------------------------------------------------------:| - * |0xFFF1| 0x020 | 6 | Event| N | HD | UI | HD debug text for UI to log ASCII text | 40 bytes, null term text + msg overhead will take 6 frames | + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------------------------:| + * |0xFFF1| 0x020 | 6 | Event| N | HD | UI | HD debug text for UI to log ASCII text | * - * | Payload || - * | || + * | Payload | + * | | + * | 40 bytes, null term text + msg overhead will take 6 frames | * - * Logging info : + * \sa Data * - * | typeText | unitText | infoText | - * |:---------:|:--------:|:--------:| - * | Datum | HD | Debug | + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | HD | + * | infoText | Debug | * - * \sa Data */ class MHDDebugText : public MAbstract { Index: sources/model/MPowerOff.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/MPowerOff.h (.../MPowerOff.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/MPowerOff.h (.../MPowerOff.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -27,15 +27,23 @@ * \brief The MPowerOff class * \details The power off model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U08) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:|:--: | - * |0x0100| 0x020 | 6 | Cmd | N | HD | UI | Power Off | \ref Data::mStatuS | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:| + * |0x0100| 0x020 | 6 | Cmd | N | HD | UI | Power Off | * * | Payload || * | || + * | #1:(U08) | \ref Data::mStatus | * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | PowerOff | + * */ class MPowerOff : public MAbstract { public: Index: sources/model/dg/data/MDGDrainPumpData.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/dg/data/MDGDrainPumpData.h (.../MDGDrainPumpData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/dg/data/MDGDrainPumpData.h (.../MDGDrainPumpData.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -41,6 +41,13 @@ * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | DG | + * | infoText | DrainPump | + * */ class MDGDrainPump : public MAbstract { Index: sources/model/dg/data/MDGHeatersData.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/dg/data/MDGHeatersData.h (.../MDGHeatersData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/dg/data/MDGHeatersData.h (.../MDGHeatersData.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -30,15 +30,25 @@ * \brief The MDGHeaters class * \details The DG heaters data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | #3:(U32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: | - * |0x2C00| 0x080 | 8 | 2 Hz | N | DG | All | DG Heaters Data | \ref Data::mMainPrimaryDC | \ref Data::mSmallPrimaryDC | \ref Data::mTrimmerDC | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x2C00| 0x080 | 8 | 2 Hz | N | DG | All | DG Heaters Data | * * | Payload || * | || - + * | #1:(U32) | \ref Data::mMainPrimaryDC | + * | #2:(U32) | \ref Data::mSmallPrimaryDC | + * | #3:(U32) | \ref Data::mTrimmerDC | + * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | DG | + * | infoText | Heaters | + * */ class MDGHeaters : public MAbstract { Index: sources/model/dg/data/MDGLoadCellReadingsData.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/dg/data/MDGLoadCellReadingsData.h (.../MDGLoadCellReadingsData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/dg/data/MDGLoadCellReadingsData.h (.../MDGLoadCellReadingsData.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -43,6 +43,13 @@ * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | DG | + * | infoText | LoadCell | + * */ class MDGLoadCellReadings : public MAbstract { Index: sources/model/dg/data/MDGOperationModeData.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/dg/data/MDGOperationModeData.h (.../MDGOperationModeData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/dg/data/MDGOperationModeData.h (.../MDGOperationModeData.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -30,18 +30,23 @@ * \brief The MDGOperationMode class * \details The DG operation mode data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: | - * |0x2700| 0x080 | 8 | 1 Hz | N | DG | All | DG Operation Mode Data | \ref Data::mOpMode | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x2700| 0x080 | 8 | 1 Hz | N | DG | All | DG Operation Mode Data | * * | Payload || * | || + * | #1:(U32) | \ref Data::mOpMode | * - * - * - * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | DG | + * | infoText | OpMode | + * */ class MDGOperationMode : public MAbstract { Index: sources/model/dg/data/MDGPressuresData.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/dg/data/MDGPressuresData.h (.../MDGPressuresData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/dg/data/MDGPressuresData.h (.../MDGPressuresData.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -30,15 +30,26 @@ * \brief The MDGPressures class * \details The DG pressures data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(F32) | #2:(F32) | #3:(F32) | #4:(F32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: | - * |0x2000| 0x080 | 8 | 1 Hz | N | DG | All | DG Pressures Data | \ref Data::mROInletPSI | \ref Data::mROOutletPSI | \ref Data::mDrainInletPSI | \ref Data::mDrainOutletPSI | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x2000| 0x080 | 8 | 1 Hz | N | DG | All | DG Pressures Data | * * | Payload || * | || + * | #1:(F32) | \ref Data::mROInletPSI | + * | #2:(F32) | \ref Data::mROOutletPSI | + * | #3:(F32) | \ref Data::mDrainInletPSI | + * | #4:(F32) | \ref Data::mDrainOutletPSI | * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | DG | + * | infoText | Pressures | + * */ class MDGPressures : public MAbstract { Index: sources/model/dg/data/MDGROPumpData.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/dg/data/MDGROPumpData.h (.../MDGROPumpData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/dg/data/MDGROPumpData.h (.../MDGROPumpData.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -28,16 +28,25 @@ * \brief The MDGROPump class * \details The DG RO pump data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(F32) | #3:(F32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: | - * |0x1F00| 0x080 | 8 | 1 Hz | N | DG | All | DG RO Pump Data | \ref Data::mPressure | \ref Data::mFlowRate | \ref Data::mPWM | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x1F00| 0x080 | 8 | 1 Hz | N | DG | All | DG RO Pump Data | * * | Payload || * | || + * | #1:(U32) | \ref Data::mPressure| + * | #2:(F32) | \ref Data::mFlowRate| + * | #3:(F32) | \ref Data::mPWM | * - * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | DG | + * | infoText | ROPump | + * */ class MDGROPump : public MAbstract { Index: sources/model/dg/data/MDGReservoirData.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/dg/data/MDGReservoirData.h (.../MDGReservoirData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/dg/data/MDGReservoirData.h (.../MDGReservoirData.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -30,15 +30,25 @@ * \brief The MDGReservoir class * \details The DG reservoir data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | #3:(U32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: | - * |0x2800| 0x080 | 8 | 1 Hz | N | DG | All | DG Reservoir Data | \ref Data::mActiveReservoir | \ref Data::mFillToVol | \ref Data::mDrainToVol | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x2800| 0x080 | 8 | 1 Hz | N | DG | All | DG Reservoir Data | * * | Payload || * | || + * | #1:(U32) | \ref Data::mActiveReservoir | + * | #2:(U32) | \ref Data::mFillToVol | + * | #3:(U32) | \ref Data::mDrainToVol | * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | DG | + * | infoText | Reservoir | + * */ class MDGReservoir : public MAbstract { Index: sources/model/dg/data/MDGTemperaturesData.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/dg/data/MDGTemperaturesData.h (.../MDGTemperaturesData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/dg/data/MDGTemperaturesData.h (.../MDGTemperaturesData.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -30,9 +30,9 @@ * \brief The MDGTemperatures class * \details The DG temperatures data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: - * |0x2D00| 0x080 | 8 | 2 Hz | N | DG | All | DG Temperatures Data + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x2D00| 0x080 | 8 | 2 Hz | N | DG | All | DG Temperatures Data | * * | Payload || * | || @@ -51,6 +51,13 @@ * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | DG | + * | infoText | Temperatures | + * */ class MDGTemperatures : public MAbstract { Index: sources/model/dg/data/MDGValvesStatesData.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/dg/data/MDGValvesStatesData.h (.../MDGValvesStatesData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/dg/data/MDGValvesStatesData.h (.../MDGValvesStatesData.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -30,16 +30,24 @@ * \brief The MDGValvesStates class * \details The DG valves states data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U16) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: | - * |0x2A00| 0x080 | 8 | 2 Hz | N | DG | All | DG Valves States Data | \ref Data::mStates | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x2A00| 0x080 | 8 | 2 Hz | N | DG | All | DG Valves States Data | * * | Payload || * | || + * | #1:(U16) | \ref Data::mStates | * - * * \sa Data * \sa Flag + * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | DG | + * | infoText | ValvesStates | + * */ class MDGValvesStates : public MAbstract { Index: sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h (.../MTreatmentAdjustBloodDialysateResponse.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h (.../MTreatmentAdjustBloodDialysateResponse.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -27,19 +27,29 @@ namespace Model { /*! - * \brief The MBlooddialysateratechangeResponse class + * \brief The MAdjustBloodDialysateResponse class * \details The blood/dialysate rate change response model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | #3:(U32) | #4:(U32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: | - * |0x1800| 0x020 | 6 | Rsp | Y | HD | UI | Blood/dialysate rate change Response | \ref Data::mAccepted | \ref Data::mReason | \ref Data::mBloodRate | \ref Data::mDialysateRate | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x1800| 0x020 | 6 | Rsp | Y | HD | UI | Blood/dialysate rate change Response | * * | Payload || * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(U32) | \ref Data::mBloodRate | + * | #4:(U32) | \ref Data::mDialysateRate | * - * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | AdjustBloodDialysate | + * */ class MAdjustBloodDialysateResponse : public MAbstract { Index: sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h (.../MTreatmentAdjustDurationResponse.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h (.../MTreatmentAdjustDurationResponse.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -27,20 +27,29 @@ namespace Model { /*! - * \brief The MTreatmentDurationchangeResponse class + * \brief The MAdjustDurationResponse class * \details The treatment duration change response model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | #3:(U32) | #5:(F32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: | - * |0x1B00| 0x020 | 6 | Rsp | Y | HD | UI | Treatment Duration change Response | \ref Data::mAccepted | \ref Data::mReason | \ref Data::mDuration | \ref Data::mUFVolume | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x1B00| 0x020 | 6 | Rsp | Y | HD | UI | Treatment Duration change Response | * * | Payload || * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(U32) | \ref Data::mDuration | + * | #4:(F32) | \ref Data::mUFVolume | * - * - * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | AdjustDuration | + * */ class MAdjustDurationResponse : public MAbstract { Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -50,12 +50,13 @@ * \brief The MAdjustPowerOffReq class * \details The power off request model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U08) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: | - * |0x0100| 0x020 | 6 | Cmd | N | HD | UI | Power Off | \ref state | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x0100| 0x020 | 6 | Cmd | N | HD | UI | Power Off | * * | Payload || * | || + * | #1:(U08) | \ref state | * * */ @@ -79,10 +80,14 @@ * \brief The MAdjustBloodDialysateReq class * \details The blood/dialysate rate change request model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: | - * |0x1700| 0x100 | 9 | Req | Y | UI | HD | Blood/dialysate rate Change | \ref bloodFlow | \ref dialysateFlow | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x1700| 0x100 | 9 | Req | Y | UI | HD | Blood/dialysate rate Change | * + * | Payload || + * | || + * | #1:(U32) | \ref bloodFlow | + * | #2:(U32) | \ref dialysateFlow | * * */ @@ -105,10 +110,14 @@ * \brief The MAdjustDurationReq class * \details The treatment duration change request model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: | - * |0x1600| 0x100 | 9 | Req | Y | UI | HD | Treatment Duration Change Request | \ref duration | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x1600| 0x100 | 9 | Req | Y | UI | HD | Treatment Duration Change Request | * + * | Payload || + * | || + * | #1:(U32) | \ref duration | + * */ class MAdjustDurationReq : public MModel { public: @@ -128,10 +137,14 @@ * \brief The MAdjustUltrafiltrationStateReq class * \details The ultrafiltration pause/resume request model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: | - * |0x1000| 0x100 | 9 | Req | Y | UI | HD | UF Pause/Resume | \ref requestedState | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x1000| 0x100 | 9 | Req | Y | UI | HD | UF Pause/Resume | * + * | Payload || + * | || + * | #1:(U32) | \ref requestedState | + * */ class MAdjustUltrafiltrationStateReq : public MModel { public: @@ -156,10 +169,14 @@ * \brief The MAdjustUltrafiltrationEditReq class * \details The ultrafiltration volume change request model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(F32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: | - * |0x1100| 0x100 | 9 | Req | Y | UI | HD | UF Vol. Change Request | \ref volume | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x1100| 0x100 | 9 | Req | Y | UI | HD | UF Vol. Change Request | * + * | Payload || + * | || + * | #1:(F32) | \ref volume | + * */ class MAdjustUltrafiltrationEditReq : public MModel { public: @@ -179,10 +196,15 @@ * \brief The MAdjustUltrafiltrationConfirmReq class * \details The ultrafiltration volume change user confirm request model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(F32) | #2:(U32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: | - * |0x1500| 0x100 | 9 | Req | Y | UI | HD | UF Vol. Change User Confirm | \ref volume | \ref option | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x1500| 0x100 | 9 | Req | Y | UI | HD | UF Vol. Change User Confirm | * + * | Payload || + * | || + * | #1:(F32) | \ref volume | + * | #2:(U32) | \ref option | + * * \sa Options * */ @@ -210,10 +232,14 @@ * \brief The MAdjustSalineReq class * \details The model to request the Saline Bolus state * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1:(U32) | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:--------------------:|:-------------------:| - * | 18 | 0x100 | 9 | Req | Y | UI | HD | Saline Bolus Request | \ref requestedState | + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:--------------------:| + * | 18 | 0x100 | 9 | Req | Y | UI | HD | Saline Bolus Request | * + * | Payload || + * | || + * | #1:(U32) | \ref requestedState | + * * \sa State * \sa MTreatmentSaline : Saline Bolus Data * \sa MAdjustSalineResponse : Saline Bolus Response @@ -242,10 +268,14 @@ * \brief The MAlarmSilenceReq class * \details The model to request alarm silent * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1:(U32) | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:--------------------:|:-------------------:| - * | | | | Req | Y | UI | HD | Alarm Silent Request | | + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:--------------------:| + * | | | | Req | Y | UI | HD | Alarm Silent Request | * + * | Payload || + * | || + * | #1:(U32) | TBD | + * */ class MAlarmSilenceReq : public MModel { public: Index: sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.h (.../MTreatmentAdjustSalineResponse.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.h (.../MTreatmentAdjustSalineResponse.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -30,17 +30,27 @@ * \brief The MAdjustSalineResponse class * \details The Saline Bolus adjustment response model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1:(U32) | #2:(U32) | #3:(U32) | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------:|:--------------------:|:-------------------:|:-------------------:| - * | 20 | 0x020 | 6 | Rsp | Y | HD | UI | Saline Bolus Response | \ref Data::mAccepted | \ref Data::mReason | \ref Data::mTarget | + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------:| + * | 20 | 0x020 | 6 | Rsp | Y | HD | UI | Saline Bolus Response | * * | Payload || * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(U32) | \ref Data::mTarget | * * \sa Data * \sa MAdjustSalineReq : Saline Bolus Request * \sa MTreatmentSaline : Saline Bolus Data * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | AdjustSaline | + * */ class MAdjustSalineResponse : public MAbstract { Index: sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h (.../MTreatmentAdjustUltrafiltrationConfirmResponse.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h (.../MTreatmentAdjustUltrafiltrationConfirmResponse.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -27,18 +27,30 @@ /*! * \brief The MAdjustUltrafiltrationConfirmResponse class - * \details The uf vol. change confirmation response model + * \details The UF vol. change confirmation response model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | #3:(F32) | #4:(U32) | #5:(F32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: | - * |0x2E00| 0x020 | 6 | Rsp | Y | HD | UI | UF Vol. Change Confirmation Response | \ref Data::mAccepted | \ref Data::mReason | \ref Data::mVolume | \ref Data::mDuration | \ref Data::mRate | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x2E00| 0x020 | 6 | Rsp | Y | HD | UI | UF Vol. Change Confirmation Response | * * | Payload || * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | | | + * | #3:(F32) | \ref Data::mVolume | + * | #4:(U32) | \ref Data::mDuration | + * | #5:(F32) | \ref Data::mRate | * - * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | AdjustUFConfirm | + * */ class MAdjustUltrafiltrationConfirmResponse { Index: sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h (.../MTreatmentAdjustUltrafiltrationEditResponse.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h (.../MTreatmentAdjustUltrafiltrationEditResponse.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -28,18 +28,34 @@ /*! * \brief The MAdjustUltrafiltrationEditResponse class - * \details The uf vol. change response model + * \details The UF vol. change response model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | #1:(U32) | #2:(U32) | #3:(F32) | #4:(U32) | #5:(F32) | #6:(U32) | #7:(U32) | #8:(F32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: |:--: |:--: |:--: |:--: |:--: | - * |0x1300| 0x020 | 6 | Rsp | Y | HD | UI | UF Vol. Change Response | \ref Data::mAccepted | \ref Data::mReason | \ref Data::mAccepted | \ref Data::mReason | \ref Data::mVolume | \ref Data::mDuration | \ref Data::mRate | \ref Data::mDurationDiff | \ref Data::mRateDiff | \ref Data::mRateOld | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x1300| 0x020 | 6 | Rsp | Y | HD | UI | UF Vol. Change Response | * * | Payload || * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | | | + * | #3:(F32) | \ref Data::mVolume | + * | #4:(U32) | \ref Data::mDuration | + * | #5:(F32) | \ref Data::mRate | + * | | | + * | #6:(S32) | \ref Data::mDurationDiff | + * | #7:(F32) | \ref Data::mRateDiff | + * | #8:(F32) | \ref Data::mRateOld | * - * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | AdjustUFEdit | + * */ class MAdjustUltrafiltrationEditResponse : public MAdjustUltrafiltrationConfirmResponse { Index: sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h (.../MTreatmentAdjustUltrafiltrationStateResponse.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h (.../MTreatmentAdjustUltrafiltrationStateResponse.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -30,16 +30,23 @@ * \brief The MAdjustUltrafiltrationStateResponse class * \details The ultrafiltration adjustment state response model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1:(U08) | - * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------: |:--: | - * |0x1000| 0x100 | 9 | Rsp | N | HD | UI | Generic response ACK/NAK | mAccepted | + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------: | + * |0x1000| 0x100 | 9 | Rsp | N | HD | UI | Generic response ACK/NAK | * * | Payload || * | || + * | #1:(U08) | \ref Data::mAccepted | * - * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | AdjustUFState | + * */ class MAdjustUltrafiltrationStateResponse : public MAbstract { Index: sources/model/hd/alarm/MAlarmCleared.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/hd/alarm/MAlarmCleared.h (.../MAlarmCleared.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/hd/alarm/MAlarmCleared.h (.../MAlarmCleared.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -29,15 +29,23 @@ * \brief The MAlarmCleared class * \details The alarm cleared model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: | - * |0x0400| 0x001 | 1 | Event | Y | HD | All | Alarm Cleared | \ref Data::mAlarmID | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x0400| 0x001 | 1 | Event | Y | HD | All | Alarm Cleared | * * | Payload || * | || + * | #1:(U32) | \ref Data::mAlarmID | * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | Alarm Cleared | + * */ class MAlarmCleared { Index: sources/model/hd/alarm/MAlarmStatusData.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/hd/alarm/MAlarmStatusData.h (.../MAlarmStatusData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/hd/alarm/MAlarmStatusData.h (.../MAlarmStatusData.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -30,15 +30,27 @@ * \brief The MAlarmStatus class * \details The alarm status model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | #3:(U32) | #4:(U32) | #5:(U16) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: | - * |0x0200| 0x001 | 1 | 1 Hz | N | HD | All | Alarm Status | \ref Data::mState | \ref Data::mTop | \ref Data::mEscalatesIn | \ref Data::mMuteTimeout | \ref Data::mFlags | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x0200| 0x001 | 1 | 1 Hz | N | HD | All | Alarm Status | * * | Payload || * | || + * | #1:(U32) | \ref Data::mState | + * | #2:(U32) | \ref Data::mTop | + * | #3:(U32) | \ref Data::mEscalatesIn | + * | #4:(U32) | \ref Data::mMuteTimeout | + * | #5:(U16) | \ref Data::mFlags | * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | HD | + * | infoText | Alarm Status | + * */ class MAlarmStatus { Index: sources/model/hd/alarm/MAlarmTriggered.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -29,15 +29,23 @@ * \brief The MAlarmTriggered class * \details The alarm triggered model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: | - * |0x0300| 0x001 | 1 | Event | Y | HD | All | Alarm Triggered | \ref Data::mAlarmID | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x0300| 0x001 | 1 | Event | Y | HD | All | Alarm Triggered | * * | Payload || * | || + * | #1:(U32) | \ref Data::mAlarmID | * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | Alarm Triggered | + * */ class MAlarmTriggered { Index: sources/model/hd/data/MHDOperationModeData.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/hd/data/MHDOperationModeData.h (.../MHDOperationModeData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/hd/data/MHDOperationModeData.h (.../MHDOperationModeData.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -30,15 +30,23 @@ * \brief The MHDOperationMode class * \details The HD operation mode data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: | - * |0x2500| 0x040 | 7 | 1 Hz | N | HD | All | HD Operation Mode Data | \ref Data::mOpMode | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x2500| 0x040 | 7 | 1 Hz | N | HD | All | HD Operation Mode Data | * * | Payload || * | || + * | #1:(U32) | \ref Data::mOpMode | * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | HD | + * | infoText | OpMode | + * */ class MHDOperationMode : public MAbstract { Index: sources/model/hd/data/MTreatmentFlowsData.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/hd/data/MTreatmentFlowsData.h (.../MTreatmentFlowsData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/hd/data/MTreatmentFlowsData.h (.../MTreatmentFlowsData.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -60,15 +60,29 @@ * \brief The MBloodFlow class * \details The blood flow data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(S32) | #2:(F32) | #3:(F32) | #4:(F32) | #5:(F32) | #6:(F32) | #7:(F32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: |:--: |:--: | - * |0x0500| 0x040 | 7 | 1 Hz | N | HD | All | Blood Flow Data | \ref Data::mFlowSetPoint | \ref Data::mMeasuredFlow | \ref Data::mRotorSpeed | \ref Data::mMotorSpeed | \ref Data::mMotorCtlSpeed | \ref Data::mMotorCtlCurrent | \ref Data::mPWMDutyCycle | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x0500| 0x040 | 7 | 1 Hz | N | HD | All | Blood Flow Data | * * | Payload || * | || + * | #1:(S32) | \ref Data::mFlowSetPoint | + * | #2:(F32) | \ref Data::mMeasuredFlow | + * | #3:(F32) | \ref Data::mRotorSpeed | + * | #4:(F32) | \ref Data::mMotorSpeed | + * | #5:(F32) | \ref Data::mMotorCtlSpeed | + * | #6:(F32) | \ref Data::mMotorCtlCurrent | + * | #7:(F32) | \ref Data::mPWMDutyCycle | * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | HD | + * | infoText | BloodFlow | + * */ class MBloodFlow : public MFlow { @@ -97,15 +111,29 @@ * \brief The MDialysateFlow class * \details The dialysate flow data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(S32) | #2:(F32) | #3:(F32) | #4:(F32) | #5:(F32) | #6:(F32) | #7:(F32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: |:--: |:--: | - * |0x0800| 0x040 | 7 | 1 Hz | N | HD | All | Dialysate Flow Data | mFlowSetPoint | mMeasuredFlow | mRotorSpeed | mMotorSpeed | mMotorCtlSpeed | mMotorCtlCurrent | mPWMDutyCycle | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x0800| 0x040 | 7 | 1 Hz | N | HD | All | Dialysate Flow Data | * * | Payload || * | || + * | #1:(S32) | \ref Data::mFlowSetPoint | + * | #2:(F32) | \ref Data::mMeasuredFlow | + * | #3:(F32) | \ref Data::mRotorSpeed | + * | #4:(F32) | \ref Data::mMotorSpeed | + * | #5:(F32) | \ref Data::mMotorCtlSpeed | + * | #6:(F32) | \ref Data::mMotorCtlCurrent | + * | #7:(F32) | \ref Data::mPWMDutyCycle | * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | HD | + * | infoText | DialysateFlow | + * */ class MDialysateFlow : public MFlow { Index: sources/model/hd/data/MTreatmentOutletFlowData.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/hd/data/MTreatmentOutletFlowData.h (.../MTreatmentOutletFlowData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/hd/data/MTreatmentOutletFlowData.h (.../MTreatmentOutletFlowData.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -30,15 +30,29 @@ * \brief The MOutletFlow class * \details The outlet flow data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(F32) | #2:(F32) | #3:(F32) | #4:(F32) | #5:(F32) | #6:(F32) | #7:(F32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: |:--: |:--: | - * |0x0B00| 0x040 | 7 | 1 Hz | N | HD | All | Outlet Flow Data | \ref Data::mRefUFVol | \ref Data::mMeasUFVol | \ref Data::mRotorSpeed | \ref Data::mMotorSpeed | \ref Data::mMotorCtlSpeed | \ref Data::mMotorCtlCurrent | \ref Data::mPWMDtCycle | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x0B00| 0x040 | 7 | 1 Hz | N | HD | All | Outlet Flow Data | * * | Payload || * | || + * | #1:(F32) | \ref Data::mRefUFVol | + * | #2:(F32) | \ref Data::mMeasUFVol | + * | #3:(F32) | \ref Data::mRotorSpeed | + * | #4:(F32) | \ref Data::mMotorSpeed | + * | #5:(F32) | \ref Data::mMotorCtlSpeed | + * | #6:(F32) | \ref Data::mMotorCtlCurrent | + * | #7:(F32) | \ref Data::mPWMDtCycle | * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | HD | + * | infoText | OutletFlow | + * */ class MOutletFlow : public MAbstract { Index: sources/model/hd/data/MTreatmentPressureOcclusionData.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/hd/data/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/hd/data/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -27,18 +27,30 @@ namespace Model { /*! - * \brief The MPressureOcclusionData class + * \brief The MPressureOcclusion class * \details The pressureocclusion data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(F32) | #2:(F32) | #3:(F32) | #4:(F32) | #5:(F32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: | - * |0x0900| 0x040 | 7 | 1 Hz | N | HD | All | PressureOcclusion Data | \ref Data::mArterialPressure | \ref Data::mVenousPressure | \ref Data::mBloodPumpOcclusion | \ref Data::mDialysateInletPumpOcclusion | \ref Data::mDialysateOutletPumpOcclusion | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x0900| 0x040 | 7 | 1 Hz | N | HD | All | PressureOcclusion Data | * * | Payload || * | || + * | #1:(F32) | \ref Data::mArterialPressure | + * | #2:(F32) | \ref Data::mVenousPressure | + * | #3:(F32) | \ref Data::mBloodPumpOcclusion | + * | #4:(F32) | \ref Data::mDialysateInletPumpOcclusion | + * | #5:(F32) | \ref Data::mDialysateOutletPumpOcclusion | * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | HD | + * | infoText | Pressure/Occlusion | + * */ class MPressureOcclusion : public MAbstract { Index: sources/model/hd/data/MTreatmentRangesData.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/hd/data/MTreatmentRangesData.h (.../MTreatmentRangesData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/hd/data/MTreatmentRangesData.h (.../MTreatmentRangesData.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -31,15 +31,28 @@ * \brief The MTreatmentRanges class * \details The treatment adjustment parameter ranges data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | #3:(F32) | #4:(F32) | #5:(U32) | #6:(U32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: |:--: | - * |0x1A00| 0x020 | 6 | 1/60 Hz| Y | HD | UI | Treatment adjustment param ranges Data | \ref Data::mDuration_Min | \ref Data::mDuration_Max | \ref Data::mUltrafiltration_Volume_Min | \ref Data::mUltrafiltration_Volume_Max | \ref Data::mDialysate_Flow_Min | \ref Data::mDialysate_Flow_Max | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x1A00| 0x020 | 6 | 1/60 Hz| Y | HD | UI | Treatment adjustment param ranges Data | * * | Payload || * | || + * | #1:(U32) | \ref Data::mDuration_Min | + * | #2:(U32) | \ref Data::mDuration_Max | + * | #3:(F32) | \ref Data::mUltrafiltration_Volume_Min | + * | #4:(F32) | \ref Data::mUltrafiltration_Volume_Max | + * | #5:(U32) | \ref Data::mDialysate_Flow_Min | + * | #6:(U32) | \ref Data::mDialysate_Flow_Max | * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | HD | + * | infoText | TreatmentRanges | + * */ class MTreatmentRanges : public MAbstract { Index: sources/model/hd/data/MTreatmentSalineData.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/hd/data/MTreatmentSalineData.h (.../MTreatmentSalineData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/hd/data/MTreatmentSalineData.h (.../MTreatmentSalineData.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -31,16 +31,26 @@ * \brief The MTreatmentSaline class * \details The treatment saline bolus data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(F32) | #3:(F32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: | - * |0x2F00| 0x040 | 7 | 1 Hz | N | HD | All | Treatment Saline Bolus Data | \ref Data::mTarget | \ref Data::mCumulative | \ref Data::mDelivered | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x2F00| 0x040 | 7 | 1 Hz | N | HD | All | Treatment Saline Bolus Data | * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mTarget | + * | #2:(F32) | \ref Data::mCumulative | + * | #3:(F32) | \ref Data::mDelivered | + * * \sa Data * \sa MAdjustSalineReq : Saline Bolus Request * \sa MAdjustSalineResponse : Saline Bolus Response * - * | Payload || - * | || + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | HD | + * | infoText | SalineData | * */ class MTreatmentSaline : public MAbstract { Index: sources/model/hd/data/MTreatmentStatesData.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/hd/data/MTreatmentStatesData.h (.../MTreatmentStatesData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/hd/data/MTreatmentStatesData.h (.../MTreatmentStatesData.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -32,15 +32,25 @@ * These are states of the current treatment. * It also includes the ultrafiltration states, saline bolus states. * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | #3:(U32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: | - * |0x0F00| 0x040 | 7 | 1 Hz | N | HD | All | Treatment States Data | \ref Data::mSubMode | \ref Data::mUFState | \ref Data::mSalineState | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x0F00| 0x040 | 7 | 1 Hz | N | HD | All | Treatment States Data | * * | Payload || * | || + * | #1:(U32) | \ref Data::mSubMode | + * | #2:(U32) | \ref Data::mUFState | + * | #3:(U32) | \ref Data::mSalineState | * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | HD | + * | infoText | TreatmentStates | + * */ class MTreatmentStates : public MAbstract { Index: sources/model/hd/data/MTreatmentTimeData.h =================================================================== diff -u -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 --- sources/model/hd/data/MTreatmentTimeData.h (.../MTreatmentTimeData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) +++ sources/model/hd/data/MTreatmentTimeData.h (.../MTreatmentTimeData.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) @@ -31,15 +31,25 @@ * \brief The MTreatmentTime class * \details The treatment time data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | #3:(U32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: | - * |0x0D00| 0x040 | 7 | 1 Hz | N | HD | All | Treatment Time Data | \ref Data::mTotal | \ref Data::mElapsed | \ref Data::mRemaining | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x0D00| 0x040 | 7 | 1 Hz | N | HD | All | Treatment Time Data | * * | Payload || * | || + * | #1:(U32) | \ref Data::mTotal | + * | #2:(U32) | \ref Data::mElapsed | + * | #3:(U32) | \ref Data::mRemaining | * * \sa Data * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | HD | + * | infoText | TreatmentTime | + * */ class MTreatmentTime : public MAbstract {