Index: sources/model/MDGDebugText.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/MDGDebugText.h (.../MDGDebugText.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/MDGDebugText.h (.../MDGDebugText.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -32,6 +32,9 @@ * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------------------------:|:----------------------------------------------------------:| * |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 | * + * | Payload || + * | || + * * Logging info : * * | typeText | unitText | infoText | Index: sources/model/MHDDebugText.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/MHDDebugText.h (.../MHDDebugText.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/MHDDebugText.h (.../MHDDebugText.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -32,6 +32,9 @@ * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------------------------:|:----------------------------------------------------------:| * |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 | * + * | Payload || + * | || + * * Logging info : * * | typeText | unitText | infoText | Index: sources/model/MPowerOff.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/MPowerOff.h (.../MPowerOff.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/MPowerOff.h (.../MPowerOff.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -31,6 +31,9 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:|:--: | * |0x0100| 0x020 | 6 | Cmd | N | HD | UI | Power Off | \ref Data::mStatuS | * + * | Payload || + * | || + * * \sa Data * */ Index: sources/model/dg/data/MDGDrainPumpData.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/dg/data/MDGDrainPumpData.h (.../MDGDrainPumpData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/dg/data/MDGDrainPumpData.h (.../MDGDrainPumpData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -30,10 +30,15 @@ * \brief The MDGDrainPump class * \details The DG drain pump data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: | - * |0x2400| 0x080 | 8 | 1 Hz | N | DG | All | DG Drain Pump Data | \ref Data::mRPM | \ref Data::mDAC | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x2400| 0x080 | 8 | 1 Hz | N | DG | All | DG Drain Pump Data | * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mRPM | + * | #2:(U32) | \ref Data::mDAC | + * * \sa Data * */ Index: sources/model/dg/data/MDGHeatersData.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/dg/data/MDGHeatersData.h (.../MDGHeatersData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/dg/data/MDGHeatersData.h (.../MDGHeatersData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -34,6 +34,9 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: | * |0x2C00| 0x080 | 8 | 2 Hz | N | DG | All | DG Heaters Data | \ref Data::mMainPrimaryDC | \ref Data::mSmallPrimaryDC | \ref Data::mTrimmerDC | * + * | Payload || + * | || + * \sa Data * */ Index: sources/model/dg/data/MDGLoadCellReadingsData.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/dg/data/MDGLoadCellReadingsData.h (.../MDGLoadCellReadingsData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/dg/data/MDGLoadCellReadingsData.h (.../MDGLoadCellReadingsData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -30,10 +30,17 @@ * \brief The MDGLoadCellReadings class * \details The DG load cell readings data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(F32) | #2:(F32) | #3:(F32) | #4:(F32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: | - * |0x0C00| 0x080 | 8 | 10 Hz | N | DG | All | DG Load Cell Readings Data | \ref Data::mReservoir1Prim | \ref Data::mReservoir1Bkup | \ref Data::mReservoir2Prim | \ref Data::mReservoir2Bkup | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x0C00| 0x080 | 8 | 10 Hz | N | DG | All | DG Load Cell Readings Data | * + * | Payload || + * | || + * | #1:(F32) | \ref Data::mReservoir1Prim | + * | #2:(F32) | \ref Data::mReservoir1Bkup | + * | #3:(F32) | \ref Data::mReservoir2Prim | + * | #4:(F32) | \ref Data::mReservoir2Bkup | + * * \sa Data * */ Index: sources/model/dg/data/MDGOperationModeData.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/dg/data/MDGOperationModeData.h (.../MDGOperationModeData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/dg/data/MDGOperationModeData.h (.../MDGOperationModeData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -34,6 +34,12 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: | * |0x2700| 0x080 | 8 | 1 Hz | N | DG | All | DG Operation Mode Data | \ref Data::mOpMode | * + * | Payload || + * | || + * + * + * + * * \sa Data * */ Index: sources/model/dg/data/MDGPressuresData.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/dg/data/MDGPressuresData.h (.../MDGPressuresData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/dg/data/MDGPressuresData.h (.../MDGPressuresData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -34,6 +34,9 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: | * |0x2000| 0x080 | 8 | 1 Hz | N | DG | All | DG Pressures Data | \ref Data::mROInletPSI | \ref Data::mROOutletPSI | \ref Data::mDrainInletPSI | \ref Data::mDrainOutletPSI | * + * | Payload || + * | || + * * \sa Data * */ Index: sources/model/dg/data/MDGROPumpData.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/dg/data/MDGROPumpData.h (.../MDGROPumpData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/dg/data/MDGROPumpData.h (.../MDGROPumpData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -32,6 +32,10 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: | * |0x1F00| 0x080 | 8 | 1 Hz | N | DG | All | DG RO Pump Data | \ref Data::mPressure | \ref Data::mFlowRate | \ref Data::mPWM | * + * | Payload || + * | || + * + * * \sa Data * */ Index: sources/model/dg/data/MDGReservoirData.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/dg/data/MDGReservoirData.h (.../MDGReservoirData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/dg/data/MDGReservoirData.h (.../MDGReservoirData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -34,6 +34,9 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: | * |0x2800| 0x080 | 8 | 1 Hz | N | DG | All | DG Reservoir Data | \ref Data::mActiveReservoir | \ref Data::mFillToVol | \ref Data::mDrainToVol | * + * | Payload || + * | || + * * \sa Data * */ Index: sources/model/dg/data/MDGTemperaturesData.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/dg/data/MDGTemperaturesData.h (.../MDGTemperaturesData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/dg/data/MDGTemperaturesData.h (.../MDGTemperaturesData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -30,18 +30,25 @@ * \brief The MDGTemperatures class * \details The DG temperatures data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(F32) | #2:(F32) | #3:(F32) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: | - * |0x2D00| 0x080 | 8 | 2 Hz | N | DG | All | DG Temperatures Data | \ref Data::mInletPrimaryHeater | \ref Data::mOutletPrimaryHeater | \ref Data::mConductivitySensor1 | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: + * |0x2D00| 0x080 | 8 | 2 Hz | N | DG | All | DG Temperatures Data * - * | #4:(F32) | #5:(F32) | #6:(F32) | #7:(F32) | #8:(F32) | - * |:--: |:--: |:--: |:--: |:--: | - * | \ref Data::mConductivitySensor2 | \ref Data::mOutletRedundancy | \ref Data::mInletDialysate | \ref Data::mPrimaryHeaterThermoCouple | \ref Data::mTrimmerHeaterThermoCouple | + * | Payload || + * | || + * | # 1:(F32) | \ref Data::mInletPrimaryHeater | + * | # 2:(F32) | \ref Data::mOutletPrimaryHeater | + * | # 3:(F32) | \ref Data::mConductivitySensor1 | + * | # 4:(F32) | \ref Data::mConductivitySensor2 | + * | # 5:(F32) | \ref Data::mOutletRedundancy | + * | # 6:(F32) | \ref Data::mInletDialysate | + * | # 7:(F32) | \ref Data::mPrimaryHeaterThermoCouple | + * | # 8:(F32) | \ref Data::mTrimmerHeaterThermoCouple | + * | # 9:(F32) | \ref Data::mPrimaryHeaterColdJunction | + * | #10:(F32) | \ref Data::mTrimmerHeaterColdJunction | + * | #11:(F32) | \ref Data::mPrimaryHeaterInternal | + * | #12:(F32) | \ref Data::mTrimmerHeaterInternal | * - * | #9:(F32) | #10:(F32) | #11:(F32) | #12:(F32) | - * | :--: |:--: |:--: |:--: | - * | \ref Data::mPrimaryHeaterColdJunction | \ref Data::mTrimmerHeaterColdJunction | \ref Data::mPrimaryHeaterInternal | \ref Data::mTrimmerHeaterInternal | - * * \sa Data * */ Index: sources/model/dg/data/MDGValvesStatesData.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/dg/data/MDGValvesStatesData.h (.../MDGValvesStatesData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/dg/data/MDGValvesStatesData.h (.../MDGValvesStatesData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -34,6 +34,10 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: | * |0x2A00| 0x080 | 8 | 2 Hz | N | DG | All | DG Valves States Data | \ref Data::mStates | * + * | Payload || + * | || + * + * * \sa Data * \sa Flag */ Index: sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h (.../MTreatmentAdjustBloodDialysateResponse.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h (.../MTreatmentAdjustBloodDialysateResponse.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -34,6 +34,10 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: | * |0x1800| 0x020 | 6 | Rsp | Y | HD | UI | Blood/dialysate rate change Response | \ref Data::mAccepted | \ref Data::mReason | \ref Data::mBloodRate | \ref Data::mDialysateRate | * + * | Payload || + * | || + * + * * \sa Data * */ Index: sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h (.../MTreatmentAdjustDurationResponse.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h (.../MTreatmentAdjustDurationResponse.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -34,6 +34,11 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: | * |0x1B00| 0x020 | 6 | Rsp | Y | HD | UI | Treatment Duration change Response | \ref Data::mAccepted | \ref Data::mReason | \ref Data::mDuration | \ref Data::mUFVolume | * + * | Payload || + * | || + * + * + * * \sa Data * */ Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -54,6 +54,10 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: | * |0x0100| 0x020 | 6 | Cmd | N | HD | UI | Power Off | \ref state | * + * | Payload || + * | || + * + * */ class MAdjustPowerOffReq : public MModel { public: @@ -79,6 +83,8 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: | * |0x1700| 0x100 | 9 | Req | Y | UI | HD | Blood/dialysate rate Change | \ref bloodFlow | \ref dialysateFlow | * + * + * */ class MAdjustBloodDialysateReq : public MModel { public: Index: sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.h (.../MTreatmentAdjustSalineResponse.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.h (.../MTreatmentAdjustSalineResponse.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -34,6 +34,9 @@ * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------:|:--------------------:|:-------------------:|:-------------------:| * | 20 | 0x020 | 6 | Rsp | Y | HD | UI | Saline Bolus Response | \ref Data::mAccepted | \ref Data::mReason | \ref Data::mTarget | * + * | Payload || + * | || + * * \sa Data * \sa MAdjustSalineReq : Saline Bolus Request * \sa MTreatmentSaline : Saline Bolus Data Index: sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h (.../MTreatmentAdjustUltrafiltrationConfirmResponse.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h (.../MTreatmentAdjustUltrafiltrationConfirmResponse.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -33,6 +33,10 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: | * |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 | * + * | Payload || + * | || + * + * * \sa Data * */ Index: sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h (.../MTreatmentAdjustUltrafiltrationEditResponse.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h (.../MTreatmentAdjustUltrafiltrationEditResponse.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -34,6 +34,10 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: |:--: |:--: |:--: |:--: |:--: | * |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 | * + * | Payload || + * | || + * + * * \sa Data * */ Index: sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h (.../MTreatmentAdjustUltrafiltrationStateResponse.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h (.../MTreatmentAdjustUltrafiltrationStateResponse.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -34,6 +34,10 @@ * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------: |:--: | * |0x1000| 0x100 | 9 | Rsp | N | HD | UI | Generic response ACK/NAK | mAccepted | * + * | Payload || + * | || + * + * * \sa Data * */ Index: sources/model/hd/alarm/MAlarmCleared.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/hd/alarm/MAlarmCleared.h (.../MAlarmCleared.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/hd/alarm/MAlarmCleared.h (.../MAlarmCleared.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -33,6 +33,9 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: | * |0x0400| 0x001 | 1 | Event | Y | HD | All | Alarm Cleared | \ref Data::mAlarmID | * + * | Payload || + * | || + * * \sa Data * */ Index: sources/model/hd/alarm/MAlarmStatusData.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/hd/alarm/MAlarmStatusData.h (.../MAlarmStatusData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/hd/alarm/MAlarmStatusData.h (.../MAlarmStatusData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -34,6 +34,9 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: | * |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 | * + * | Payload || + * | || + * * \sa Data * */ Index: sources/model/hd/alarm/MAlarmTriggered.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -33,6 +33,9 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: | * |0x0300| 0x001 | 1 | Event | Y | HD | All | Alarm Triggered | \ref Data::mAlarmID | * + * | Payload || + * | || + * * \sa Data * */ Index: sources/model/hd/data/MHDOperationModeData.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/hd/data/MHDOperationModeData.h (.../MHDOperationModeData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/hd/data/MHDOperationModeData.h (.../MHDOperationModeData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -34,6 +34,9 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: | * |0x2500| 0x040 | 7 | 1 Hz | N | HD | All | HD Operation Mode Data | \ref Data::mOpMode | * + * | Payload || + * | || + * * \sa Data * */ Index: sources/model/hd/data/MTreatmentFlowsData.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/hd/data/MTreatmentFlowsData.h (.../MTreatmentFlowsData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/hd/data/MTreatmentFlowsData.h (.../MTreatmentFlowsData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -64,6 +64,9 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: |:--: |:--: | * |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 | * + * | Payload || + * | || + * * \sa Data * */ @@ -98,6 +101,9 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: |:--: |:--: | * |0x0800| 0x040 | 7 | 1 Hz | N | HD | All | Dialysate Flow Data | mFlowSetPoint | mMeasuredFlow | mRotorSpeed | mMotorSpeed | mMotorCtlSpeed | mMotorCtlCurrent | mPWMDutyCycle | * + * | Payload || + * | || + * * \sa Data * */ Index: sources/model/hd/data/MTreatmentOutletFlowData.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/hd/data/MTreatmentOutletFlowData.h (.../MTreatmentOutletFlowData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/hd/data/MTreatmentOutletFlowData.h (.../MTreatmentOutletFlowData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -34,6 +34,9 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: |:--: |:--: | * |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 | * + * | Payload || + * | || + * * \sa Data * */ Index: sources/model/hd/data/MTreatmentPressureOcclusionData.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/hd/data/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/hd/data/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -34,6 +34,9 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: | * |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 | * + * | Payload || + * | || + * * \sa Data * */ Index: sources/model/hd/data/MTreatmentRangesData.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/hd/data/MTreatmentRangesData.h (.../MTreatmentRangesData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/hd/data/MTreatmentRangesData.h (.../MTreatmentRangesData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -35,6 +35,9 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: |:--: | * |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 | * + * | Payload || + * | || + * * \sa Data * */ Index: sources/model/hd/data/MTreatmentSalineData.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/hd/data/MTreatmentSalineData.h (.../MTreatmentSalineData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/hd/data/MTreatmentSalineData.h (.../MTreatmentSalineData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -39,6 +39,9 @@ * \sa MAdjustSalineReq : Saline Bolus Request * \sa MAdjustSalineResponse : Saline Bolus Response * + * | Payload || + * | || + * */ class MTreatmentSaline : public MAbstract { Index: sources/model/hd/data/MTreatmentStatesData.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/hd/data/MTreatmentStatesData.h (.../MTreatmentStatesData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/hd/data/MTreatmentStatesData.h (.../MTreatmentStatesData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -36,6 +36,9 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: | * |0x0F00| 0x040 | 7 | 1 Hz | N | HD | All | Treatment States Data | \ref Data::mSubMode | \ref Data::mUFState | \ref Data::mSalineState | * + * | Payload || + * | || + * * \sa Data * */ Index: sources/model/hd/data/MTreatmentTimeData.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf55997d0ae3f14b8dbe1cfad700edc73d5cdd80b --- sources/model/hd/data/MTreatmentTimeData.h (.../MTreatmentTimeData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/hd/data/MTreatmentTimeData.h (.../MTreatmentTimeData.h) (revision f55997d0ae3f14b8dbe1cfad700edc73d5cdd80b) @@ -35,6 +35,9 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: | * |0x0D00| 0x040 | 7 | 1 Hz | N | HD | All | Treatment Time Data | \ref Data::mTotal | \ref Data::mElapsed | \ref Data::mRemaining | * + * | Payload || + * | || + * * \sa Data * */