Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -re8d73dd5ebca400248f59bf4c3940ff50dee696a --- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h (.../MPostTreatmentAdjustTreatmentLogResponse.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h (.../MPostTreatmentAdjustTreatmentLogResponse.h) (revision e8d73dd5ebca400248f59bf4c3940ff50dee696a) @@ -32,46 +32,75 @@ * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------: | - * |0x7600| 0x020 | 6 | Rsp | Y | HD | UI | TreatmentLog Response | + * |0xAA00| 0x020 | 6 | Rsp | Y | TD | UI | TreatmentLog Response | * * | Payload || * | || - * | 01 - (U32) | \ref Data::mAccepted | The accept or reject bool flag | | - * | 02 - (U32) | \ref Data::mReason | The rejection reason | | - * | 03 - (U32) | \ref Data::mBloodFlowRate | Blood Flow Rate | (mL/min) | - * | 04 - (U32) | \ref Data::mDialysateFlowRate | Dialysate Flow Rate | (mL/min) | - * | 05 - (U32) | \ref Data::mTreatmentDuration | Treatment Duration | (sec) | - * | 06 - (U32) | \ref Data::mActualTreatmentDuration | Actual Treatment Duration | (sec) | - * | 07 - (U32) | \ref Data::mAcidConcentrateType | Acid Concentrate Type | | - * | 08 - (U32) | \ref Data::mBicarbonateConcentrateType | Bicarbonate Concentrate Type | | - * | 09 - (U32) | \ref Data::mPotassiumConcentration | Potassium Concentration | (mEq/L) | - * | 10 - (U32) | \ref Data::mCalciumConcentration | Calcium Concentration | (mEq/L) | - * | 11 - (U32) | \ref Data::mBicarbonateConcentration | Bicarbonate Concentration | (mEq/L) | - * | 12 - (U32) | \ref Data::mSodiumConcentration | SodiumConcentration | (mEq/L) | - * | 13 - (F32) | \ref Data::mDialysateTemperature | Dialysate Temperature | (Celsius | - * | 14 - (U32) | \ref Data::mDialyzerType | Dialyzer Type | | - * | 15 - (U32) | \ref Data::mTreatmentStartEpoch | Treatment Start Date and Time | (epoch) | - * | 16 - (U32) | \ref Data::mTreatmentEndEpoch | Treatment End Date and Time | (epoch) | - * | 17 - (F32) | \ref Data::mAverageBloodFlow | Average Blood Flow | (mL/min) | - * | 18 - (F32) | \ref Data::mAverageDialysateFlow | Average Dialysate Flow | (mL/min) | - * | 19 - (F32) | \ref Data::mDialysateVolumeUsed | Dialysate Volume Used | (L) | - * | 20 - (F32) | \ref Data::mAverageDialysateTemp | Average Dialysate Temp | (Celsius | - * | 21 - (F32) | \ref Data::mOriginUFVolume | Origin UF Volume | (L) | - * | 22 - (F32) | \ref Data::mTargetUFVolume | Target UF Volume | (L) | - * | 23 - (F32) | \ref Data::mActualUFVolume | Actual UF Volume | (L) | - * | 24 - (F32) | \ref Data::mOriginUFRate | Origin UF Rate | (mL/min) | - * | 25 - (F32) | \ref Data::mTargetUFRate | Target UF Rate | (mL/min) | - * | 26 - (F32) | \ref Data::mActualUFRate | Actual UF Rate | (mL/min) | - * | 27 - (U32) | \ref Data::mSalineBolusVolume | Saline Bolus Volume | (mL) | - * | 28 - (F32) | \ref Data::mHeparinBolusVolume | Heparin Bolus Volume | (mL) | - * | 29 - (F32) | \ref Data::mHeparinDispenseRate | Heparin Dispense Rate | (mL/hr) | - * | 30 - (U32) | \ref Data::mHeparinStop | Heparin Stop | (min) | - * | 31 - (F32) | \ref Data::mHeparinDeliveredVolume | Heparin Delivered Volume | (mL) | - * | 32 - (U32) | \ref Data::mHeparinType | Heparin Type | | - * | 33 - (F32) | \ref Data::mAverageArterialPressure | Average Arterial Pressure | (mmHg) | - * | 34 - (F32) | \ref Data::mAverageVenousPressure | Average Venous Pressure | (mmHg) | - * | 35 - (U32) | \ref Data::mDeviceID | Device ID | | - * | 36 - (U32) | \ref Data::mWaterSampleTestResult | Water Sample Test Result | | + * | 01 - (U32) | \ref Data::mAccepted + * | 02 - (U32) | \ref Data::mReason + * | 03 - (U32) | \ref Data::mBloodFlowRate + * | 04 - (U32) | \ref Data::mBloodFlowRateActual + * | 05 - (U32) | \ref Data::mDialysateFlowRate + * | 06 - (U32) | \ref Data::mDialysateFlowRateActual + * | 07 - (U32) | \ref Data::mTreatmentDuration + * | 08 - (U32) | \ref Data::mTreatmentDurationActual + * | 09 - (U32) | \ref Data::mAcidConcentrateType + * | 10 - (U32) | \ref Data::mAcidConcentrateTypeActual + * | 11 - (U32) | \ref Data::mBicarbonateCartridgeSize + * | 12 - (U32) | \ref Data::mBicarbonateCartridgeSizeActual + * | 13 - (U32) | \ref Data::mPotassiumConcentration + * | 14 - (U32) | \ref Data::mPotassiumConcentrationActual + * | 15 - (U32) | \ref Data::mCalciumConcentration + * | 16 - (U32) | \ref Data::mCalciumConcentrationActual + * | 17 - (U32) | \ref Data::mBicarbonateConcentration + * | 18 - (U32) | \ref Data::mBicarbonateConcentrationActual + * | 19 - (U32) | \ref Data::mSodiumConcentration + * | 20 - (U32) | \ref Data::mSodiumConcentrationActual + * | 21 - (U32) | \ref Data::mVitalsInterval + * | 22 - (U32) | \ref Data::mVitalsIntervalActual + * | 23 - (U32) | \ref Data::mDialyzerType + * | 24 - (U32) | \ref Data::mTreatmentStartEpoch + * | 25 - (U32) | \ref Data::mTreatmentEndEpoch + * | 26 - (U32) | \ref Data::mFluidBolusVolume + * | 27 - (U32) | \ref Data::mFluidBolusVolumeActual + * | 28 - (U32) | \ref Data::mHeparinType + * | 29 - (U32) | \ref Data::mHeparinDeliveryDuration + * | 30 - (U32) | \ref Data::mHeparinDeliveryDurationActual + * | 31 - (U32) | \ref Data::mTreatmentModality + * | 32 - (U32) | \ref Data::mTreatmentModalityActual + * | 33 - (U32) | \ref Data::mHDFOperatingMode + * | 34 - (U32) | \ref Data::mHDFOperatingModeActual + * | 35 - (U32) | \ref Data::mHepatitisStatus + * | 36 - (F32) | \ref Data::mDialysateTemperature + * | 37 - (F32) | \ref Data::mDialysateTemperatureActual + * | 38 - (F32) | \ref Data::mDialysateVolumeUsed + * | 39 - (F32) | \ref Data::mHeparinBolusVolume + * | 40 - (F32) | \ref Data::mHeparinBolusVolumeActual + * | 41 - (F32) | \ref Data::mHeparinDispenseRate + * | 42 - (F32) | \ref Data::mHeparinDispenseRateActual + * | 43 - (F32) | \ref Data::mHeparinDeliveredVolume + * | 44 - (F32) | \ref Data::mAverageArterialPressure + * | 45 - (F32) | \ref Data::mAverageVenousPressure + * | 46 - (F32) | \ref Data::mUFVolume + * | 47 - (F32) | \ref Data::mUFVolumeActual + * | 48 - (F32) | \ref Data::mUFVolumeTarget + * | 49 - (F32) | \ref Data::mUFRate + * | 50 - (F32) | \ref Data::mUFRateActual + * | 51 - (F32) | \ref Data::mUFRateTarget + * | 52 - (F32) | \ref Data::mSubstitutionVolume + * | 53 - (F32) | \ref Data::mSubstitutionVolumeActual + * | 54 - (F32) | \ref Data::mSubstitutionVolumeTarget + * | 55 - (F32) | \ref Data::mSubstitutionRate + * | 56 - (F32) | \ref Data::mSubstitutionRateActual + * | 57 - (F32) | \ref Data::mSubstitutionRateTarget + * | 58 - (F32) | \ref Data::mIsoUfVolume + * | 59 - (F32) | \ref Data::mIsoUfVolumeActual + * | 60 - (F32) | \ref Data::mIsoUfVolumeTarget + * | 61 - (F32) | \ref Data::mIsoUfRate + * | 62 - (F32) | \ref Data::mIsoUfRateActual + * | 63 - (F32) | \ref Data::mIsoUfRateTarget + * | 64 - (F32) | \ref Data::mWaterSampleTestResult + * \sa Data * \sa MAdjustTreatmentLogReq : TreatmentLog Request * \sa MTreatmentTreatmentLog : TreatmentLog Data @@ -92,43 +121,70 @@ QVariantList parameters() const override; struct { - Types::U32 mAccepted ; ///< 01 - (U32) The accept or reject bool flag - Types::U32 mReason ; ///< 02 - (U32) The rejection reason - Types::U32 mBloodFlowRate ; ///< 03 - (U32) Blood Flow Rate (mL/min) - Types::U32 mDialysateFlowRate ; ///< 04 - (U32) Dialysate Flow Rate (mL/min) - Types::U32 mTreatmentDuration ; ///< 05 - (U32) Treatment Duration (sec) - Types::U32 mActualTreatmentDuration ; ///< 06 - (U32) Actual Treatment Duration (sec) - Types::U32 mAcidConcentrateType ; ///< 07 - (U32) Acid Concentrate Type - Types::U32 mBicarbonateConcentrateType ; ///< 08 - (U32) Bicarbonate Concentrate Type - Types::U32 mPotassiumConcentration ; ///< 09 - (U32) Potassium Concentration (mEq/L) - Types::U32 mCalciumConcentration ; ///< 10 - (U32) Calcium Concentration (mEq/L) - Types::U32 mBicarbonateConcentration ; ///< 11 - (U32) Bicarbonate Concentration (mEq/L) - Types::U32 mSodiumConcentration ; ///< 12 - (U32) SodiumConcentration (mEq/L) - Types::F32 mDialysateTemperature ; ///< 13 - (F32) Dialysate Temperature (Celsius) - Types::U32 mDialyzerType ; ///< 14 - (U32) Dialyzer Type - Types::U32 mTreatmentStartEpoch ; ///< 15 - (U32) Treatment Start Date and Time (epoch) - Types::U32 mTreatmentEndEpoch ; ///< 16 - (U32) Treatment End Date and Time (epoch) - Types::F32 mAverageBloodFlow ; ///< 17 - (F32) Average Blood Flow (mL/min) - Types::F32 mAverageDialysateFlow ; ///< 18 - (F32) Average Dialysate Flow (mL/min) - Types::F32 mDialysateVolumeUsed ; ///< 19 - (F32) Dialysate Volume Used (L) - Types::F32 mAverageDialysateTemp ; ///< 20 - (F32) Average Dialysate Temp (Celsius) - Types::F32 mOriginUFVolume ; ///< 21 - (F32) Origin UF Volume (L) - Types::F32 mTargetUFVolume ; ///< 22 - (F32) Target UF Volume (L) - Types::F32 mActualUFVolume ; ///< 23 - (F32) Actual UF Volume (L) - Types::F32 mOriginUFRate ; ///< 24 - (F32) Origin UF Rate (mL/min) - Types::F32 mTargetUFRate ; ///< 25 - (F32) Target UF Rate (mL/min) - Types::F32 mActualUFRate ; ///< 26 - (F32) Actual UF Rate (mL/min) - Types::U32 mSalineBolusVolume ; ///< 27 - (U32) Saline Bolus Volume (mL) - Types::F32 mHeparinBolusVolume ; ///< 28 - (F32) Heparin Bolus Volume (mL) - Types::F32 mHeparinDispenseRate ; ///< 29 - (F32) Heparin Dispense Rate (mL/hr) - Types::U32 mHeparinStop ; ///< 30 - (U32) Heparin Stop (min) - Types::F32 mHeparinDeliveredVolume ; ///< 31 - (F32) Heparin Delivered Volume (mL) - Types::U32 mHeparinType ; ///< 32 - (U32) Heparin Type - Types::F32 mAverageArterialPressure ; ///< 33 - (F32) Average Arterial Pressure (mmHg) - Types::F32 mAverageVenousPressure ; ///< 34 - (F32) Average Venous Pressure (mmHg) - Types::U32 mDeviceID ; ///< 35 - (U32) Device ID - Types::U32 mWaterSampleTestResult ; ///< 36 - (U32) Water Sample Test Result - Types::U32 mHeparinConcentration ; ///< Heparin Concentration (IU/mL) // is filled by UI, for now + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mBloodFlowRate ; + Types::U32 mBloodFlowRateActual ; + Types::U32 mDialysateFlowRate ; + Types::U32 mDialysateFlowRateActual ; + Types::U32 mTreatmentDuration ; + Types::U32 mTreatmentDurationActual ; + Types::U32 mAcidConcentrateType ; + Types::U32 mAcidConcentrateTypeActual ; + Types::U32 mBicarbonateCartridgeSize ; + Types::U32 mBicarbonateCartridgeSizeActual ; + Types::U32 mPotassiumConcentration ; + Types::U32 mPotassiumConcentrationActual ; + Types::U32 mCalciumConcentration ; + Types::U32 mCalciumConcentrationActual ; + Types::U32 mBicarbonateConcentration ; + Types::U32 mBicarbonateConcentrationActual ; + Types::U32 mSodiumConcentration ; + Types::U32 mSodiumConcentrationActual ; + Types::U32 mVitalsInterval ; + Types::U32 mVitalsIntervalActual ; + Types::U32 mDialyzerType ; + Types::U32 mTreatmentStartEpoch ; + Types::U32 mTreatmentEndEpoch ; + Types::U32 mFluidBolusVolume ; + Types::U32 mFluidBolusVolumeActual ; + Types::U32 mHeparinType ; + Types::U32 mHeparinDeliveryDuration ; + Types::U32 mHeparinDeliveryDurationActual ; + Types::U32 mTreatmentModality ; + Types::U32 mTreatmentModalityActual ; + Types::U32 mHDFOperatingMode ; + Types::U32 mHDFOperatingModeActual ; + Types::U32 mHepatitisStatus ; + Types::F32 mDialysateTemperature ; + Types::F32 mDialysateTemperatureActual ; + Types::F32 mDialysateVolumeUsed ; + Types::F32 mHeparinBolusVolume ; + Types::F32 mHeparinBolusVolumeActual ; + Types::F32 mHeparinDispenseRate ; + Types::F32 mHeparinDispenseRateActual ; + Types::F32 mHeparinDeliveredVolume ; + Types::F32 mAverageArterialPressure ; + Types::F32 mAverageVenousPressure ; + Types::F32 mUFVolume ; + Types::F32 mUFVolumeActual ; + Types::F32 mUFVolumeTarget ; + Types::F32 mUFRate ; + Types::F32 mUFRateActual ; + Types::F32 mUFRateTarget ; + Types::F32 mSubstitutionVolume ; + Types::F32 mSubstitutionVolumeActual ; + Types::F32 mSubstitutionVolumeTarget ; + Types::F32 mSubstitutionRate ; + Types::F32 mSubstitutionRateActual ; + Types::F32 mSubstitutionRateTarget ; + Types::F32 mIsoUfVolume ; + Types::F32 mIsoUfVolumeActual ; + Types::F32 mIsoUfVolumeTarget ; + Types::F32 mIsoUfRate ; + Types::F32 mIsoUfRateActual ; + Types::F32 mIsoUfRateTarget ; + Types::F32 mWaterSampleTestResult ; } _data; public: @@ -138,43 +194,70 @@ QString infoText () const override { return QString("AdjustTreatmentLog") ; } struct Data { - bool mAccepted = 0; ///< 01 - (U32) The accept or reject bool flag - quint32 mReason = 0; ///< 02 - (U32) The rejection reason - quint32 mBloodFlowRate = 0; ///< 03 - (U32) Blood Flow Rate (mL/min) - quint32 mDialysateFlowRate = 0; ///< 04 - (U32) Dialysate Flow Rate (mL/min) - quint32 mTreatmentDuration = 0; ///< 05 - (U32) Treatment Duration (sec) - quint32 mActualTreatmentDuration = 0; ///< 06 - (U32) Actual Treatment Duration (sec) - quint32 mAcidConcentrateType = 0; ///< 07 - (U32) Acid Concentrate Type - quint32 mBicarbonateConcentrateType = 0; ///< 08 - (U32) Bicarbonate Concentrate Type - quint32 mPotassiumConcentration = 0; ///< 09 - (U32) Potassium Concentration (mEq/L) - quint32 mCalciumConcentration = 0; ///< 10 - (U32) Calcium Concentration (mEq/L) - quint32 mBicarbonateConcentration = 0; ///< 11 - (U32) Bicarbonate Concentration (mEq/L) - quint32 mSodiumConcentration = 0; ///< 12 - (U32) SodiumConcentration (mEq/L) - float mDialysateTemperature = 0; ///< 13 - (F32) Dialysate Temperature (Celsius) - quint32 mDialyzerType = 0; ///< 14 - (U32) Dialyzer Type - quint32 mTreatmentStartEpoch = 0; ///< 15 - (U32) Treatment Start Date and Time (epoch) - quint32 mTreatmentEndEpoch = 0; ///< 16 - (U32) Treatment End Date and Time (epoch) - float mAverageBloodFlow = 0; ///< 17 - (F32) Average Blood Flow (mL/min) - float mAverageDialysateFlow = 0; ///< 18 - (F32) Average Dialysate Flow (mL/min) - float mDialysateVolumeUsed = 0; ///< 19 - (F32) Dialysate Volume Used (L) - float mAverageDialysateTemp = 0; ///< 20 - (F32) Average Dialysate Temp (Celsius) - float mOriginUFVolume = 0; ///< 21 - (F32) Origin UF Volume (L) - float mTargetUFVolume = 0; ///< 22 - (F32) Target UF Volume (L) - float mActualUFVolume = 0; ///< 23 - (F32) Actual UF Volume (L) - float mOriginUFRate = 0; ///< 24 - (F32) Origin UF Rate (mL/min) - float mTargetUFRate = 0; ///< 25 - (F32) Target UF Rate (mL/min) - float mActualUFRate = 0; ///< 26 - (F32) Actual UF Rate (mL/min) - quint32 mSalineBolusVolume = 0; ///< 27 - (U32) Saline Bolus Volume (mL) - float mHeparinBolusVolume = 0; ///< 28 - (F32) Heparin Bolus Volume (mL) - float mHeparinDispenseRate = 0; ///< 29 - (F32) Heparin Dispense Rate (mL/hr) - quint32 mHeparinStop = 0; ///< 30 - (U32) Heparin Stop (min) - float mHeparinDeliveredVolume = 0; ///< 31 - (F32) Heparin Delivered Volume (mL) - quint32 mHeparinType = 0; ///< 32 - (U32) Heparin Type - float mAverageArterialPressure = 0; ///< 33 - (F32) Average Arterial Pressure (mmHg) - float mAverageVenousPressure = 0; ///< 34 - (F32) Average Venous Pressure (mmHg) - quint32 mDeviceID = 0; ///< 35 - (U32) Device ID - quint32 mWaterSampleTestResult = 0; ///< 36 - (U32) Water Sample Test Result - quint32 mHeparinConcentration = 0; ///< UI - Heparin Concentration (IU/mL) // is filled by UI, for now + quint32 mAccepted = 0; + quint32 mReason = 0; + quint32 mBloodFlowRate = 0; + quint32 mBloodFlowRateActual = 0; + quint32 mDialysateFlowRate = 0; + quint32 mDialysateFlowRateActual = 0; + quint32 mTreatmentDuration = 0; + quint32 mTreatmentDurationActual = 0; + quint32 mAcidConcentrateType = 0; + quint32 mAcidConcentrateTypeActual = 0; + quint32 mBicarbonateCartridgeSize = 0; + quint32 mBicarbonateCartridgeSizeActual = 0; + quint32 mPotassiumConcentration = 0; + quint32 mPotassiumConcentrationActual = 0; + quint32 mCalciumConcentration = 0; + quint32 mCalciumConcentrationActual = 0; + quint32 mBicarbonateConcentration = 0; + quint32 mBicarbonateConcentrationActual = 0; + quint32 mSodiumConcentration = 0; + quint32 mSodiumConcentrationActual = 0; + quint32 mVitalsInterval = 0; + quint32 mVitalsIntervalActual = 0; + quint32 mDialyzerType = 0; + quint32 mTreatmentStartEpoch = 0; + quint32 mTreatmentEndEpoch = 0; + quint32 mFluidBolusVolume = 0; + quint32 mFluidBolusVolumeActual = 0; + quint32 mHeparinType = 0; + quint32 mHeparinDeliveryDuration = 0; + quint32 mHeparinDeliveryDurationActual = 0; + quint32 mTreatmentModality = 0; + quint32 mTreatmentModalityActual = 0; + quint32 mHDFOperatingMode = 0; + quint32 mHDFOperatingModeActual = 0; + quint32 mHepatitisStatus = 0; + float mDialysateTemperature = 0; + float mDialysateTemperatureActual = 0; + float mDialysateVolumeUsed = 0; + float mHeparinBolusVolume = 0; + float mHeparinBolusVolumeActual = 0; + float mHeparinDispenseRate = 0; + float mHeparinDispenseRateActual = 0; + float mHeparinDeliveredVolume = 0; + float mAverageArterialPressure = 0; + float mAverageVenousPressure = 0; + float mUFVolume = 0; + float mUFVolumeActual = 0; + float mUFVolumeTarget = 0; + float mUFRate = 0; + float mUFRateActual = 0; + float mUFRateTarget = 0; + float mSubstitutionVolume = 0; + float mSubstitutionVolumeActual = 0; + float mSubstitutionVolumeTarget = 0; + float mSubstitutionRate = 0; + float mSubstitutionRateActual = 0; + float mSubstitutionRateTarget = 0; + float mIsoUfVolume = 0; + float mIsoUfVolumeActual = 0; + float mIsoUfVolumeTarget = 0; + float mIsoUfRate = 0; + float mIsoUfRateActual = 0; + float mIsoUfRateTarget = 0; + float mWaterSampleTestResult = 0; }; MAdjustTreatmentLogResponse () { }