Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -raf8d98b36b427e2b5f4d6659fcf3b58ee79eab6a -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision af8d98b36b427e2b5f4d6659fcf3b58ee79eab6a) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) @@ -74,7 +74,7 @@ {Gui::GuiActionType::ID_BloodFlow , 8 * 4 }, // 8 parameters each 4bytes {Gui::GuiActionType::ID_DialysateInletFlow , 7 * 4 }, // 7 parameters each 4bytes {Gui::GuiActionType::ID_DialysateOutletFlow , 7 * 4 }, // 7 parameters each 4bytes - {Gui::GuiActionType::ID_PressureOcclusion , 5 * 4 }, // 5 parameters each 4bytes + {Gui::GuiActionType::ID_PressureOcclusion , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_Saline , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_Heparin , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_Rinseback , 6 * 4 }, // 6 parameters each 4bytes @@ -83,12 +83,12 @@ {Gui::GuiActionType::ID_TreatmentStop , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_HDAirBubbleData , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_HDAirTrapData , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_HDBloodLeakData , 10 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_HDBloodLeakData , 2 * 4 }, // 2 parameters each 4bytes // ---- {Gui::GuiActionType::ID_HDOperationModeData , 2 * 4 }, // 2 parameter each 4bytes {Gui::GuiActionType::ID_PreTreatmentStates , 11 * 4 }, //11 parameters each 4bytes {Gui::GuiActionType::ID_TreatmentStates , 10 * 4 }, // 9 parameters each 4bytes - {Gui::GuiActionType::ID_PostTreatmentStates , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_PostTreatmentStates , 2 * 4 }, // 2 parameter each 4bytes // DG Data Messages {Gui::GuiActionType::ID_DGROPumpData , 4 * 4 }, // 4 parameters each 4bytes Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -raf8d98b36b427e2b5f4d6659fcf3b58ee79eab6a -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision af8d98b36b427e2b5f4d6659fcf3b58ee79eab6a) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) @@ -456,17 +456,12 @@ x: col(7) y: row(4.5) model: [ - vHDBloodLeak.bloodLeakDetectSetPoint , - vHDBloodLeak.bloodLeakZeroedStatus , - vHDBloodLeak.bloodLeakState , - vHDBloodLeak.bloodLeakDetectLevel , + vHDBloodLeak.bloodLeakStatus , + vHDBloodLeak.bloodLeakState , ] label: [ - "SetPt" , - "0Stat" , + "Stats" , "State" , - "DtLvl" , - ] } Index: sources/model/hd/adjustment/settings/MAdjustHDRequests.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 --- sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) @@ -38,9 +38,9 @@ * \brief The MAdjustHDDateTime class * \details The model to request starting a treatment * - * | MSG | CAN ID | Type | Ack | Src | Dest | Description | - * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:| - * | 109 | 0x100 | Req | Y | UI | HD | Set RTC Date and Time | + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:----:|:---:|:---:|:----:|:-----------:| + * | 0x6d00 | 0x100 | Req | Y | UI | HD | Set RTC Date and Time | * * | Payload || * | || Index: sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 --- sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h (.../MAdjustHDServiceModeResponse.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h (.../MAdjustHDServiceModeResponse.h) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) @@ -36,8 +36,8 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mLastServiceDateEpoch | - * | #2:(U32) | \ref Data::mServiceIntervalSeconds | + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | * * \sa Data * Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h (.../MTreatmentAdjustUltrafiltrationEditResponse.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h (.../MTreatmentAdjustUltrafiltrationEditResponse.h) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) @@ -41,9 +41,9 @@ * | | | * | #3:(F32) | \ref Data::mVolume | * | #4:(U32) | \ref Data::mDuration | - * | #5:(F32) | \ref Data::mRate | + * | #5:(S32) | \ref Data::mDurationDiff | * | | | - * | #6:(S32) | \ref Data::mDurationDiff | + * | #6:(F32) | \ref Data::mRate | * | #7:(F32) | \ref Data::mRateDiff | * | #8:(F32) | \ref Data::mRateOld | * @@ -65,6 +65,9 @@ public: QString stringPrefix = "AdjustUFEdit"; + //NOTE: The correct order is followed in cpp to fill in the values regarding the payload byte orders. + // The struct here is just the values not in correct order + // since has been inherited from the confirm to borrow some struct variables. struct Data : public MAdjustUltrafiltrationConfirmResponse::Data { qint32 mDurationDiff= 0; /*!< durationDiff value of type quint32 extracted out */ float mRateDiff = 0; /*!< rateDiff value of type float extracted out */ Index: sources/model/hd/data/MHDBloodLeakData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 --- sources/model/hd/data/MHDBloodLeakData.cpp (.../MHDBloodLeakData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/data/MHDBloodLeakData.cpp (.../MHDBloodLeakData.cpp) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) @@ -20,40 +20,16 @@ return { _data.mBloodLeakStatus .value, _data.mBloodLeakState .value, - _data.mBloodLeakZeroStatusCounter.value, - _data.mBloodLeakCounter .value, - _data.mBloodLeakZeroedStatus .value, - _data.mBloodLeakDetectSetPoint .value, - _data.mBloodLeakDetectLevel .value, - _data.mBloodLeakStatusCount .value, - _data.mBloodLeakLEDIntensity .value, - _data.mBloodLeakRegisterCounter .value, }; } bool MHDBloodLeakData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if (GetValue(vByteArray, index, _data.mBloodLeakStatus )) if (GetValue(vByteArray, index, _data.mBloodLeakState )) - if (GetValue(vByteArray, index, _data.mBloodLeakZeroStatusCounter )) - if (GetValue(vByteArray, index, _data.mBloodLeakCounter )) - if (GetValue(vByteArray, index, _data.mBloodLeakZeroedStatus )) - if (GetValue(vByteArray, index, _data.mBloodLeakDetectSetPoint )) - if (GetValue(vByteArray, index, _data.mBloodLeakDetectLevel )) - if (GetValue(vByteArray, index, _data.mBloodLeakStatusCount )) - if (GetValue(vByteArray, index, _data.mBloodLeakLEDIntensity )) - if (GetValue(vByteArray, index, _data.mBloodLeakRegisterCounter )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } - else { if(vIndex) *vIndex = index; return false; } - else { if(vIndex) *vIndex = index; return false; } - else { if(vIndex) *vIndex = index; return false; } - else { if(vIndex) *vIndex = index; return false; } - else { if(vIndex) *vIndex = index; return false; } - else { if(vIndex) *vIndex = index; return false; } - else { if(vIndex) *vIndex = index; return false; } - else { if(vIndex) *vIndex = index; return false; } } /*! @@ -65,14 +41,6 @@ Data data; data.mBloodLeakStatus = _data.mBloodLeakStatus .value; data.mBloodLeakState = _data.mBloodLeakState .value; - data.mBloodLeakZeroStatusCounter= _data.mBloodLeakZeroStatusCounter.value; - data.mBloodLeakCounter = _data.mBloodLeakCounter .value; - data.mBloodLeakZeroedStatus = _data.mBloodLeakZeroedStatus .value; - data.mBloodLeakDetectSetPoint = _data.mBloodLeakDetectSetPoint .value; - data.mBloodLeakDetectLevel = _data.mBloodLeakDetectLevel .value; - data.mBloodLeakStatusCount = _data.mBloodLeakStatusCount .value; - data.mBloodLeakLEDIntensity = _data.mBloodLeakLEDIntensity .value; - data.mBloodLeakRegisterCounter = _data.mBloodLeakRegisterCounter .value; return data; } Index: sources/model/hd/data/MHDBloodLeakData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 --- sources/model/hd/data/MHDBloodLeakData.h (.../MHDBloodLeakData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/data/MHDBloodLeakData.h (.../MHDBloodLeakData.h) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) @@ -40,14 +40,6 @@ * | || * | #01:(U32) | \ref Data::mBloodLeakStatus | * | #02:(U32) | \ref Data::mBloodLeakState | - * | #03:(U32) | \ref Data::mBloodLeakZeroStatusCounter | - * | #04:(U32) | \ref Data::mBloodLeakCounter | - * | #05:(u32) | \ref Data::mBloodLeakZeroedStatus | - * | #06:(U32) | \ref Data::mBloodLeakDetectSetPoint | - * | #07:(U32) | \ref Data::mBloodLeakDetectLevel | - * | #08:(U32) | \ref Data::mBloodLeakStatusCount | - * | #09:(U32) | \ref Data::mBloodLeakLEDIntensity | - * | #10:(U32) | \ref Data::mBloodLeakRegisterCounter | * * \sa Data * @@ -69,14 +61,6 @@ struct { Types::U32 mBloodLeakStatus ; Types::U32 mBloodLeakState ; - Types::U32 mBloodLeakZeroStatusCounter ; - Types::U32 mBloodLeakCounter ; - Types::U32 mBloodLeakZeroedStatus ; - Types::U32 mBloodLeakDetectSetPoint ; - Types::U32 mBloodLeakDetectLevel ; - Types::U32 mBloodLeakStatusCount ; - Types::U32 mBloodLeakLEDIntensity ; - Types::U32 mBloodLeakRegisterCounter ; } _data; public: @@ -88,15 +72,6 @@ struct Data { quint32 mBloodLeakStatus = 0; quint32 mBloodLeakState = 0; - quint32 mBloodLeakZeroStatusCounter = 0; - quint32 mBloodLeakCounter = 0; - quint32 mBloodLeakZeroedStatus = 0; - quint32 mBloodLeakDetectSetPoint = 0; - quint32 mBloodLeakDetectLevel = 0; - quint32 mBloodLeakStatusCount = 0; - quint32 mBloodLeakLEDIntensity = 0; - quint32 mBloodLeakRegisterCounter = 0; - }; MHDBloodLeakData () { } Index: sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 --- sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp (.../MPostTreatmentStatesData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp (.../MPostTreatmentStatesData.cpp) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) @@ -18,15 +18,18 @@ QVariantList MPostTreatmentStates::parameters() const { return { - _data.mSubMode.value, + _data.mSubMode .value, + _data.mDrainState .value, }; } bool MPostTreatmentStates::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mSubMode )) + if (GetValue(vByteArray, index, _data.mSubMode )) + if (GetValue(vByteArray, index, _data.mDrainState )) return true ; - else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -36,6 +39,7 @@ */ MPostTreatmentStates::Data MPostTreatmentStates::data() const { Data data; - data.mSubMode = _data.mSubMode.value; + data.mSubMode = _data.mSubMode .value; + data.mDrainState = _data.mDrainState .value; return data; } Index: sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 --- sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h (.../MPostTreatmentStatesData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h (.../MPostTreatmentStatesData.h) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) @@ -31,13 +31,14 @@ * \details The post treatment states data model * These are states of the post treatment. * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x7700| 0x040 | 7 | 1 Hz | N | HD | All | Post-Treatment States Data | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * |0x7700| 0x040 | 1 Hz | N | HD | All | Post-Treatment States Data | * * | Payload || * | || - * | #1:(U32) | \ref Data::mState | + * | #1:(U32) | \ref Data::mSubMode | + * | #2:(U32) | \ref Data::mDrainState | * * \sa Data * \sa HD_Post_Treatment_Mode_States @@ -59,6 +60,7 @@ struct { Types::U32 mSubMode ; ///< State - HD_Post_Treatment_Mode_States + Types::U32 mDrainState ; ///< State - ??? } _data; public: @@ -69,6 +71,7 @@ struct Data { quint32 mSubMode = 0; ///< State - HD_Post_Treatment_Mode_States + quint32 mDrainState = 0; ///< State - ??? }; MPostTreatmentStates() { } Index: sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 --- sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h (.../MTreatmentBloodPrimeData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h (.../MTreatmentBloodPrimeData.h) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) @@ -38,7 +38,6 @@ * | || * | #1:(F32) | \ref Data::mTarget | * | #2:(F32) | \ref Data::mCurrent | - * | #3:(F32) | \ref Data::mSafety | * * \sa Data * Index: sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 --- sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) @@ -21,8 +21,6 @@ _data.mArterialPressure .value, _data.mVenousPressure .value, _data.mBloodPumpOcclusion .value, - _data.mDialysateInletPumpOcclusion .value, - _data.mDialysateOutletPumpOcclusion .value }; } @@ -31,14 +29,10 @@ if (GetValue(vByteArray, index, _data.mArterialPressure )) if (GetValue(vByteArray, index, _data.mVenousPressure )) if (GetValue(vByteArray, index, _data.mBloodPumpOcclusion )) - if (GetValue(vByteArray, index, _data.mDialysateInletPumpOcclusion )) - if (GetValue(vByteArray, index, _data.mDialysateOutletPumpOcclusion )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } - else { if(vIndex) *vIndex = index; return false; } - else { if(vIndex) *vIndex = index; return false; } } /*! @@ -51,7 +45,5 @@ data.mArterialPressure = _data.mArterialPressure .value; data.mVenousPressure = _data.mVenousPressure .value; data.mBloodPumpOcclusion = _data.mBloodPumpOcclusion .value; - data.mDialysateInletPumpOcclusion = _data.mDialysateInletPumpOcclusion .value; - data.mDialysateOutletPumpOcclusion = _data.mDialysateOutletPumpOcclusion .value; return data; } Index: sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 --- sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) @@ -39,8 +39,6 @@ * | #1:(F32) | \ref Data::mArterialPressure | * | #2:(F32) | \ref Data::mVenousPressure | * | #3:(U32) | \ref Data::mBloodPumpOcclusion | - * | #4:(U32) | \ref Data::mDialysateInletPumpOcclusion | - * | #5:(U32) | \ref Data::mDialysateOutletPumpOcclusion | * * \sa Data * @@ -63,8 +61,6 @@ Types::F32 mArterialPressure ; Types::F32 mVenousPressure ; Types::U32 mBloodPumpOcclusion ; - Types::U32 mDialysateInletPumpOcclusion ; - Types::U32 mDialysateOutletPumpOcclusion ; } _data; public: @@ -77,8 +73,6 @@ float mArterialPressure = 0; ///< ArterialPressure float mVenousPressure = 0; ///< VenousPressure quint32 mBloodPumpOcclusion = 0; ///< BloodPumpOcclusion - quint32 mDialysateInletPumpOcclusion = 0; ///< DialysateInletPumpOcclusion - quint32 mDialysateOutletPumpOcclusion = 0; ///< DialysateOutletPumpOcclusion }; MPressureOcclusion () { } Index: sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 --- sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h (.../MTreatmentLogAlarmData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h (.../MTreatmentLogAlarmData.h) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) @@ -33,7 +33,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:| - * |0x9400| 0x020 | Event | Y | HD | UI | Treatment Log Alarm Data | + * |0x9500| 0x020 | Event | Y | HD | UI | Treatment Log Alarm Data | * * | Payload || * | || Index: sources/model/hd/data/treatmentlog/MTreatmentLogEventData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 --- sources/model/hd/data/treatmentlog/MTreatmentLogEventData.h (.../MTreatmentLogEventData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/data/treatmentlog/MTreatmentLogEventData.h (.../MTreatmentLogEventData.h) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) @@ -33,7 +33,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:| - * |0x9400| 0x020 | Event | Y | HD | UI | Treatment Log Event Data | + * |0x9500| 0x020 | Event | Y | HD | UI | Treatment Log Event Data | * * | Payload || * | || Index: sources/view/hd/data/VHDBloodLeakData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 --- sources/view/hd/data/VHDBloodLeakData.cpp (.../VHDBloodLeakData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/data/VHDBloodLeakData.cpp (.../VHDBloodLeakData.cpp) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) @@ -22,12 +22,4 @@ void VHDBloodLeak::onActionReceive(const HDBloodLeakData &vData) { bloodLeakStatus (vData.mBloodLeakStatus ); bloodLeakState (vData.mBloodLeakState ); - bloodLeakZeroStatusCounter (vData.mBloodLeakZeroStatusCounter ); - bloodLeakCounter (vData.mBloodLeakCounter ); - bloodLeakZeroedStatus (vData.mBloodLeakZeroedStatus ); - bloodLeakDetectSetPoint (vData.mBloodLeakDetectSetPoint ); - bloodLeakDetectLevel (vData.mBloodLeakDetectLevel ); - bloodLeakStatusCount (vData.mBloodLeakStatusCount ); - bloodLeakLEDIntensity (vData.mBloodLeakLEDIntensity ); - bloodLeakLEDIntensity (vData.mBloodLeakLEDIntensity ); } Index: sources/view/hd/data/VHDBloodLeakData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 --- sources/view/hd/data/VHDBloodLeakData.h (.../VHDBloodLeakData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/data/VHDBloodLeakData.h (.../VHDBloodLeakData.h) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) @@ -37,14 +37,6 @@ PROPERTY( quint32 , bloodLeakStatus , 0) PROPERTY( quint32 , bloodLeakState , 0) - PROPERTY( quint32 , bloodLeakZeroStatusCounter , 0) - PROPERTY( quint32 , bloodLeakCounter , 0) - PROPERTY( quint32 , bloodLeakZeroedStatus , 0) - PROPERTY( quint32 , bloodLeakDetectSetPoint , 0) - PROPERTY( quint32 , bloodLeakDetectLevel , 0) - PROPERTY( quint32 , bloodLeakStatusCount , 0) - PROPERTY( quint32 , bloodLeakLEDIntensity , 0) - PROPERTY( quint32 , bloodLeakRegisterCounter , 0) VIEW_DEC(VHDBloodLeak, HDBloodLeakData) }; Index: sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 --- sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp (.../VPostTreatmentStatesData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp (.../VPostTreatmentStatesData.cpp) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) @@ -26,10 +26,12 @@ */ void View::VPostTreatmentStates::onActionReceive(const PostTreatmentStatesData &vData) { - subMode ( vData.mSubMode ); + subMode ( vData.mSubMode ); + drainState ( vData.mDrainState ); - patientDisconnection ( vData.mSubMode == GuiPostTreatmentStates::HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE ); drainReservoirs ( vData.mSubMode == GuiPostTreatmentStates::HD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE ); + patientDisconnection ( vData.mSubMode == GuiPostTreatmentStates::HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE ); + disposableRemoval ( vData.mSubMode == GuiPostTreatmentStates::HD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE ); verify ( vData.mSubMode == GuiPostTreatmentStates::HD_POST_TREATMENT_VERIFY_STATE ); // DEBUG: *** Only for test *** Index: sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 --- sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h (.../VPostTreatmentStatesData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h (.../VPostTreatmentStatesData.h) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) @@ -41,10 +41,12 @@ TRIGGER ( bool , state , false ) // changes in case any message received. PROPERTY( quint8 , subMode , 0 ) ///< HD_Post_Treatment_Mode_States + PROPERTY( quint8 , drainState , 0 ) ///< ??? // Start post-treatment mode state - PROPERTY( bool , patientDisconnection , false ) ///< HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE, Patient disconnection state PROPERTY( bool , drainReservoirs , false ) ///< HD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE , Drain reservoirs state + PROPERTY( bool , patientDisconnection , false ) ///< HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE, Patient disconnection state + PROPERTY( bool , disposableRemoval , false ) ///< HD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE , Disposable removal state PROPERTY( bool , verify , false ) ///< HD_POST_TREATMENT_VERIFY_STATE , Verify cartridge removed, syringe removed, and reservoirs drained state VIEW_DEC(VPostTreatmentStates, PostTreatmentStatesData) Index: sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 --- sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp (.../VTreatmentPressureOcclusion.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp (.../VTreatmentPressureOcclusion.cpp) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) @@ -24,6 +24,4 @@ arterialPressure ( vData.mArterialPressure ); venousPressure ( vData.mVenousPressure ); bloodPumpOcclusion ( vData.mBloodPumpOcclusion ); - dialysateInletPumpOcclusion ( vData.mDialysateInletPumpOcclusion ); - dialysateOutletPumpOcclusion ( vData.mDialysateOutletPumpOcclusion ); } Index: sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 --- sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h (.../VTreatmentPressureOcclusion.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h (.../VTreatmentPressureOcclusion.h) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) @@ -38,12 +38,7 @@ PROPERTY( float , arterialPressure , 0) PROPERTY( float , venousPressure , 0) - // disabled coco begin validated: These three properties have not been used in GUI. - // has been manually tested that it works perfectly fine if used. PROPERTY( quint32 , bloodPumpOcclusion , 0) - PROPERTY( quint32 , dialysateInletPumpOcclusion , 0) - PROPERTY( quint32 , dialysateOutletPumpOcclusion , 0) - // disabled coco end VIEW_DEC(VTreatmentPressureOcclusion, PressureOcclusionData) };