Index: leahi.pro =================================================================== diff -u -rdc4a0cbb5eb3a967755f4ba40d8407032723c957 -r4c32cadadd4c8abdee1eab4ef6425f356f863547 --- leahi.pro (.../leahi.pro) (revision dc4a0cbb5eb3a967755f4ba40d8407032723c957) +++ leahi.pro (.../leahi.pro) (revision 4c32cadadd4c8abdee1eab4ef6425f356f863547) @@ -61,6 +61,7 @@ sources/model/td/data \ sources/model/td/data/treatment \ sources/model/td/data/treatmentlog \ + sources/model/td/data/pretreatment \ sources/model/td/alarm \ sources/model/td/adjustment \ sources/model/td/adjustment/settings \ @@ -79,6 +80,7 @@ sources/view/td \ sources/view/td/data \ sources/view/td/data/treatment \ + sources/view/td/data/pretreatment \ sources/view/td/adjustment/treatment \ sources/view/td/adjustment/pretreatment \ sources/view/td/adjustment/posttreatment \ @@ -155,6 +157,8 @@ sources/model/confirm/MDuetConfirmTDi.h \ sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.h \ sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.h \ + sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.h \ + sources/model/dd/adjustment/settings/MRoWaterModeResponse.h \ sources/model/dd/data/MDDBloodLeakData.h \ sources/model/dd/data/MDDConcentratePumpData.h \ sources/model/dd/data/MDDConductivityData.h \ @@ -179,7 +183,12 @@ sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.h \ sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h \ sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h \ + sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.h \ sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustAutoSubResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustHDFResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustHDFStateResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFStateResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.h \ @@ -194,8 +203,11 @@ sources/model/td/data/MTDValvesData.h \ sources/model/td/data/MTDVoltageData.h \ sources/model/td/data/MWaterSampleData.h \ + sources/model/td/data/pretreatment/MPreTreatmentStatesData.h \ sources/model/td/data/treatment/MTreatmentBloodFlowData.h \ sources/model/td/data/treatment/MTreatmentBloodPrimeData.h \ + sources/model/td/data/treatment/MTreatmentHDFData.h \ + sources/model/td/data/treatment/MTreatmentDryBicartDisconnectData.h \ sources/model/td/data/treatment/MTreatmentIsolatedUFData.h \ sources/model/td/data/treatment/MTreatmentParametersSetPointData.h \ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h \ @@ -218,6 +230,7 @@ \ # ---------- Models - TD - Data //// ----- @LEAHIZED sources/model/td/data/MTDOpModeData.h \ sources/model/td/data/MTDPowerOffWarning.h \ + sources/model/td/data/MTDSyringePumpData.h \ \ # ---------- Models - TD - Data - Treatment Log sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.h \ sources/model/td/data/treatmentlog/MTreatmentLogEventData.h \ @@ -262,9 +275,16 @@ sources/view/fp/data/VFPROPumpData.h \ sources/view/fp/data/VFPRORejectionPercentageData.h \ sources/view/fp/data/VFPTemperatureData.h \ + sources/view/settings/VAdjustRoWaterMode.h \ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \ sources/view/settings/VAdvancedInstitutionalRecord.h \ + sources/view/settings/VRoWaterMode.h \ sources/view/settings/VCalibrationSettings.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentAutoSub.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDF.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDFState.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentDryBicartDisconnect.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h \ sources/view/td/data/VTDAirBubbleData.h \ sources/view/td/data/VTDAirPumpData.h \ sources/view/td/data/VTDAirTrapData.h \ @@ -277,10 +297,15 @@ sources/view/td/data/VTDVoltageData.h \ sources/view/td/data/VTreatmentRanges.h \ sources/view/td/data/VWaterSampleData.h \ + sources/view/td/data/VTDSyringePumpData.h \ + \ # ---------- Views - TD - Data - Pre-Treatment + sources/view/td/data/pretreatment/VPreTreatmentStatesData.h \ \ # ---------- Views - TD - Data - In-Treatment sources/view/td/data/treatment/VTDTreatmentStatesData.h \ sources/view/td/data/treatment/VTreatmentBloodFlow.h \ sources/view/td/data/treatment/VTreatmentBloodPrimeData.h \ + sources/view/td/data/treatment/VTreatmentHDFData.h \ + sources/view/td/data/treatment/VTreatmentDryBicartDisconnect.h \ sources/view/td/data/treatment/VTreatmentIsolatedUFData.h \ sources/view/td/data/treatment/VTreatmentParametersSetPointData.h \ sources/view/td/data/treatment/VTreatmentPressureOcclusion.h \ @@ -355,20 +380,16 @@ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h \ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h \ - sources/model/dg/adjustment/settings/MDuetRoWaterDG.h \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmStatusData.h \ sources/model/hd/alarm/MAlarmTriggered.h \ sources/model/hd/alarm/MAlarmCleared.h \ sources/model/hd/alarm/MAlarmActiveList.h \ \ # ---------- Models - States Data - sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h \ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h \ \ # ---------- Models - HD - Adjustment sources/model/hd/adjustment/MAdjustRequestsBase.h \ sources/model/hd/adjustment/settings/MAdjustHDRequests.h \ - \ # ---------- Models - HD - Adjustment - Settings - sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h \ \ # ---------- Models - HD - Adjustment - Pre-Treatment sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h \ @@ -394,7 +415,6 @@ sources/model/hd/data/MHDDebugText.h \ sources/model/hd/data/MHDGeneralEvent.h \ sources/model/hd/data/MHDAccelerometerData.h \ - sources/model/hd/data/MHDSyringePumpData.h \ sources/model/hd/data/MHDBloodLeakData.h \ sources/model/hd/data/MTreatmentRangesData.h \ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h \ @@ -451,7 +471,6 @@ sources/view/settings/VAdjustmentServiceMode.h \ sources/view/settings/VAdjustmentServiceDates.h \ sources/view/settings/VAdjustmentDGCleaningUsage.h \ - sources/view/settings/VDuetRoWaterDG.h \ sources/view/settings/VCloudSync.h \ sources/view/settings/VHDUsageInfo.h \ sources/view/settings/VAdjustmentInstitutionalRecord.h \ @@ -479,7 +498,6 @@ \ # ---------- Views - HD - Adjustment - Disinfection sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h \ \ # ---------- Views - HD - Data - States - sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h \ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h \ \ # ---------- Views - HD - Data - Pre-Treatment - Progress sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.h \ @@ -488,7 +506,6 @@ \ # ---------- Views - HD - Data sources/view/hd/data/post/VHDPOSTData.h \ sources/view/hd/data/VHDAccelerometerData.h \ - sources/view/hd/data/VHDSyringePumpData.h \ sources/view/hd/data/VHDBloodLeakData.h \ sources/view/hd/data/treatment/VTreatmentDialysateFlow.h \ sources/view/hd/data/treatment/VTreatmentHeparinData.h \ @@ -530,6 +547,8 @@ sources/model/confirm/MDuetConfirmTDi.cpp \ sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.cpp \ sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.cpp \ + sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.cpp \ + sources/model/dd/adjustment/settings/MRoWaterModeResponse.cpp \ sources/model/dd/data/MDDBloodLeakData.cpp \ sources/model/dd/data/MDDConcentratePumpData.cpp \ sources/model/dd/data/MDDConductivityData.cpp \ @@ -556,6 +575,10 @@ sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.cpp \ sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFStateResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustAutoSubResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustHDFResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustHDFStateResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.cpp \ sources/model/td/data/MTDAirBubbleData.cpp \ @@ -568,8 +591,12 @@ sources/model/td/data/MTDValvesData.cpp \ sources/model/td/data/MTDVoltageData.cpp \ sources/model/td/data/MWaterSampleData.cpp \ + sources/model/td/data/MTDSyringePumpData.cpp \ + sources/model/td/data/pretreatment/MPreTreatmentStatesData.cpp \ sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp \ sources/model/td/data/treatment/MTreatmentBloodPrimeData.cpp \ + sources/model/td/data/treatment/MTreatmentHDFData.cpp \ + sources/model/td/data/treatment/MTreatmentDryBicartDisconnectData.cpp \ sources/model/td/data/treatment/MTreatmentIsolatedUFData.cpp \ sources/model/td/data/treatment/MTreatmentParametersSetPointData.cpp \ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.cpp \ @@ -653,20 +680,19 @@ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp \ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp \ - sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmStatusData.cpp \ sources/model/hd/alarm/MAlarmMapping.cpp \ sources/model/hd/alarm/MAlarmTriggered.cpp \ sources/model/hd/alarm/MAlarmCleared.cpp \ sources/model/hd/alarm/MAlarmActiveList.cpp \ \ # ---------- Models - Data - States - sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \ \ # ---------- Models - TD - Adjustment - Settings sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \ sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.cpp \ sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.cpp \ + sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.cpp \ \ # ---------- Models - TD - Adjustment - Pre-Treatment sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \ sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \ @@ -679,8 +705,6 @@ sources/model/td/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp \ \ # ---------- Models - DD - Adjustment - Settings sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp \ - \ # ---------- Models - HD - Adjustment - Settings - sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp \ \ # ---------- Models - HD - Adjustment - Pre-Treatment sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp \ @@ -698,7 +722,6 @@ sources/model/hd/data/MHDDebugText.cpp \ sources/model/hd/data/MHDGeneralEvent.cpp \ sources/model/hd/data/MHDAccelerometerData.cpp \ - sources/model/hd/data/MHDSyringePumpData.cpp \ sources/model/hd/data/MHDBloodLeakData.cpp \ sources/model/hd/data/MTreatmentRangesData.cpp \ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp \ @@ -743,9 +766,16 @@ sources/view/VGeneralEvent.cpp \ sources/device/DeviceView.cpp \ \ # ---------- Views - TD - States Data + sources/view/settings/VAdjustRoWaterMode.cpp \ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \ sources/view/settings/VAdvancedInstitutionalRecord.cpp \ + sources/view/settings/VRoWaterMode.cpp \ sources/view/settings/VCalibrationSettings.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentAutoSub.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDF.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDFState.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentDryBicartDisconnect.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \ sources/view/td/data/VTDAirBubbleData.cpp \ sources/view/td/data/VTDAirPumpData.cpp \ sources/view/td/data/VTDAirTrapData.cpp \ @@ -758,10 +788,15 @@ sources/view/td/data/VTDVoltageData.cpp \ sources/view/td/data/VTreatmentRanges.cpp \ sources/view/td/data/VWaterSampleData.cpp \ + sources/view/td/data/VTDSyringePumpData.cpp \ + \ # ---------- Views - TD - Data - Pre-Treatment + sources/view/td/data/pretreatment/VPreTreatmentStatesData.cpp \ \ # ---------- Views - TD - Data - In-Treatment sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \ sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \ sources/view/td/data/treatment/VTreatmentBloodPrimeData.cpp \ + sources/view/td/data/treatment/VTreatmentDryBicartDisconnect.cpp \ + sources/view/td/data/treatment/VTreatmentHDFData.cpp \ sources/view/td/data/treatment/VTreatmentIsolatedUFData.cpp \ sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp \ sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp \ @@ -816,7 +851,6 @@ sources/view/settings/VAdjustmentAlarmVolume.cpp \ sources/view/settings/VAdjustmentServiceMode.cpp \ sources/view/settings/VAdjustmentServiceDates.cpp \ - sources/view/settings/VDuetRoWaterDG.cpp \ sources/view/settings/VCloudSync.cpp \ sources/view/settings/VAdjustmentDGCleaningUsage.cpp \ sources/view/settings/VHDUsageInfo.cpp \ @@ -842,11 +876,9 @@ \ # ---------- Views - HD - Adjustment - Disinfection sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp \ \ # ---------- Views - HD - States Data - sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp \ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp \ \ # ---------- Views - HD - Data sources/view/hd/data/VHDAccelerometerData.cpp \ - sources/view/hd/data/VHDSyringePumpData.cpp \ sources/view/hd/data/VHDBloodLeakData.cpp \ \ # ---------- Views - HD - Data - Pre-Treatment sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp \ Index: leahi.qrc =================================================================== diff -u -rdc4a0cbb5eb3a967755f4ba40d8407032723c957 -r4c32cadadd4c8abdee1eab4ef6425f356f863547 --- leahi.qrc (.../leahi.qrc) (revision dc4a0cbb5eb3a967755f4ba40d8407032723c957) +++ leahi.qrc (.../leahi.qrc) (revision 4c32cadadd4c8abdee1eab4ef6425f356f863547) @@ -44,9 +44,9 @@ sources/gui/qml/dialogs/UfVolumeAdjustment.qml sources/gui/qml/dialogs/HeparinRxAdjustment.qml sources/gui/qml/dialogs/AlarmDialog.qml - sources/gui/qml/dialogs/PatientIdEntry.qml sources/gui/qml/dialogs/DryDemoDialog.qml sources/gui/qml/dialogs/ConfirmPasswordDialog.qml + sources/gui/qml/dialogs/DryBicartDisconnectDialog.qml sources/gui/qml/dialogs/CalibrationDialog.qml @@ -216,6 +216,7 @@ sources/gui/qml/components/BaseChart.qml sources/gui/qml/components/ReviewContainer.qml sources/gui/qml/components/LegendItem.qml + sources/gui/qml/components/DryBicartDisconnectButton.qml sources/gui/qml/compounds/PressureRangeSlider.qml @@ -237,6 +238,7 @@ sources/gui/qml/compounds/InteractiveImage.qml sources/gui/qml/compounds/ProcessStatusView.qml sources/gui/qml/compounds/ExportLogsHeaderData.qml + sources/gui/qml/compounds/DryBicartDisconnect.qml qtquickcontrols2.conf Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -ra83697952c42b32904752417c50f1391ea768d5f -r4c32cadadd4c8abdee1eab4ef6425f356f863547 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision a83697952c42b32904752417c50f1391ea768d5f) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 4c32cadadd4c8abdee1eab4ef6425f356f863547) @@ -222,8 +222,22 @@ // ---------------------------------------------------------------------------------------------------- + /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the Dry Bicart DisconnectCommand message. + * \param vData - Data model contains Dry Bicart Disconnect Command + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustDryBicartDisconnectRequestData &vData) +{ + QVariantList mData; + mData += vData.command; + actionTransmit(GuiActionType::ID_AdjustDryBicartDisconnectReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the Blood Prime Command message. * \param vData - Data model contains Blood Prime Command * \return void @@ -493,7 +507,7 @@ * \param vData - Data model contains the alarm volume * \return void */ -void MessageDispatcher::onAdjustment(const AdjustHDAlarmVolumeRequestData &vData) +void MessageDispatcher::onAdjustment(const AdjustTDAlarmVolumeRequestData &vData) { QVariantList mData; mData += vData.volume2HD(); @@ -670,6 +684,46 @@ /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the HDF state + * \param vData - Data model contains hdf state adjustment. + * \return void + */ + void MessageDispatcher::onAdjustment(const AdjustHDFStateRequestData &vData) +{ + QVariantList mData; + mData += vData.state ; + actionTransmit(GuiActionType::ID_AdjustHDFStateReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the HDF auto sub state + * \param vData - Data model contains hdf auto sub state adjustment. + * \return void + */ + void MessageDispatcher::onAdjustment(const AdjustAutoSubRequestData &vData) +{ + QVariantList mData; + mData += vData.state ; + actionTransmit(GuiActionType::ID_AdjustAutoSubReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the HDF adjustment + * \param vData - Data model contains hdf adjustment. + * \return void + */ + void MessageDispatcher::onAdjustment(const AdjustHDFRequestData &vData) +{ + QVariantList mData; + mData += vData.treatmentMode ; + mData += vData.subFluidVolume ; + actionTransmit(GuiActionType::ID_AdjustHDFReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the InitTreatment request message. * \param vData - Data model contains the init treatment request information. * \return void @@ -962,15 +1016,27 @@ * \param vData - Data model contains the UI RO Water Mode adjustment request data. * \return void */ -void MessageDispatcher::onAdjustment(const DuetRoWaterModeUIiData &vData) +void MessageDispatcher::onAdjustment(const AdjustRoWaterModeRequestData &vData) { QVariantList mData; mData += vData.mStatus; - actionTransmit(GuiActionType::ID_DuetRoWaterModeUIi, mData); + actionTransmit(GuiActionType::ID_AdjustRoWaterModeReq, mData); } /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the UI RO Water Mode request. + * \param vData - Data model contains the UI RO Water Mode request data. + * \return void + */ +void MessageDispatcher::onAdjustment(const RoWaterModeRequestData &) +{ + QVariantList mData; + actionTransmit(GuiActionType::ID_RoWaterModeReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the HD Usage Info Denali message. * \param vData - * \return void @@ -1122,6 +1188,8 @@ QVariantList mData; actionTransmit(GuiActionType::ID_ResetHDInServiceModeReq, mData); } + + // ---------------------------------------------------------------------------------------------------- /*! Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -r8d7a40bfbd30d596b4450965597d2e3f2f61326d -r4c32cadadd4c8abdee1eab4ef6425f356f863547 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 8d7a40bfbd30d596b4450965597d2e3f2f61326d) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 4c32cadadd4c8abdee1eab4ef6425f356f863547) @@ -151,6 +151,10 @@ GuiActionType::ID_AdjustHeparinReq , GuiActionType::ID_AdjustPressuresLimitsReq , GuiActionType::ID_AdjustPressuresWideningReq , + GuiActionType::ID_AdjustDryBicartDisconnectReq , + GuiActionType::ID_AdjustHDFStateReq , + GuiActionType::ID_AdjustAutoSubReq , + GuiActionType::ID_AdjustHDFReq , // End-Treatment GuiActionType::ID_AdjustRinsebackReq , GuiActionType::ID_AdjustRecirculateReq , Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rdc4a0cbb5eb3a967755f4ba40d8407032723c957 -r4c32cadadd4c8abdee1eab4ef6425f356f863547 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision dc4a0cbb5eb3a967755f4ba40d8407032723c957) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 4c32cadadd4c8abdee1eab4ef6425f356f863547) @@ -79,7 +79,7 @@ {Gui::GuiActionType::ID_Vitals , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_Ultrafiltration , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_IsolatedUF , 6 * 4 }, // 6 parameters each 4bytes - {Gui::GuiActionType::ID_Heparin , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_Heparin , 3 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_Rinseback , 7 * 4 }, // 6 parameters each 4bytes {Gui::GuiActionType::ID_Recirculate , 1 * 4 }, // 1 parameters each 4bytes {Gui::GuiActionType::ID_BloodPrime , 4 * 4 }, // 4 parameters each 4bytes @@ -90,7 +90,7 @@ {Gui::GuiActionType::ID_HDBloodLeakData , 4 * 4 }, // 4 parameters each 4bytes // ---- {Gui::GuiActionType::ID_TDOpModeData , 2 * 4 }, // 2 parameter each 4bytes - {Gui::GuiActionType::ID_PreTreatmentStates , 11 * 4 }, //11 parameters each 4bytes + {Gui::GuiActionType::ID_PreTreatmentStates , 8 * 4 }, // 8 parameters each 4bytes {Gui::GuiActionType::ID_TreatmentStates , 10 * 4 }, //10 parameters each 4bytes {Gui::GuiActionType::ID_PostTreatmentStates , 2 * 4 }, // 2 parameter each 4bytes @@ -124,7 +124,7 @@ {Gui::GuiActionType::ID_FPRORejectionPercentageData , 5 * 4 }, // 5 parameters each 4bytes // HD Data Messages {Gui::GuiActionType::ID_HDAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes - {Gui::GuiActionType::ID_HDSyringePumpData , 9 * 4 }, // 9 parameters each 4bytes + {Gui::GuiActionType::ID_TDSyringePumpData , 10 * 4 }, //10 parameters each 4bytes {Gui::GuiActionType::ID_HDUsageInfoReq , 0 * 4 }, // 0 parameters each 4bytes {Gui::GuiActionType::ID_HDUsageInfoRsp , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2 bytes //TD Data Messages @@ -274,6 +274,11 @@ {Gui::GuiActionType::ID_AdjustHeparinReq , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AdjustHeparinRsp , 2 * 4 }, // 3 parameters each 4bytes + // ---- Dry Bicarb Disconnect + {Gui::GuiActionType::ID_DryBicartDisconnectData , 5 * 4 }, // 5 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustDryBicartDisconnectReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustDryBicartDisconnectRsp , 2 * 4 }, // 2 parameter each 4bytes + // ---- Rinseback {Gui::GuiActionType::ID_AdjustRinsebackReq , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AdjustRinsebackRsp , 2 * 4 }, // 2 parameters each 4bytes @@ -282,6 +287,15 @@ {Gui::GuiActionType::ID_AdjustRecirculateReq , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AdjustRecirculateRsp , 2 * 4 }, // 2 parameters each 4bytes + // ---- HDF + {Gui::GuiActionType::ID_HDF , 9 * 4 }, // 9 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustHDFStateReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjsutHDFStateRsp , 2 * 4 }, // 2 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustAutoSubReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustAutoSubRsp , 2 * 4 }, // 2 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustHDFReq , 2 * 4 }, // 2 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustHDFRsp , 3 * 4 }, // 3 parameter each 4bytes + // ---- Treatment End {Gui::GuiActionType::ID_AdjustTreatmentEndReq , 0 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AdjustTreatmentEndRsp , 2 * 4 }, // 2 parameters each 4bytes @@ -334,9 +348,10 @@ {Gui::GuiActionType::ID_AdjustDGCleaningUsageReq , 0 * 4 }, // 0 parameter {Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp , 10 * 4 }, //10 parameters each 4bytes // ---- RO Water - {Gui::GuiActionType::ID_DuetRoWaterStatDGq , 0 * 4 }, // 0 parameter each 4bytes - {Gui::GuiActionType::ID_DuetRoWaterModeUIi , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_DuetRoWaterModeDGr , 3 * 4 }, // 3 parameters each 4bytes + {Gui::GuiActionType::ID_RoWaterModeReq , 0 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_RoWaterModeRsp , 3 * 4 }, // 3 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustRoWaterModeReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustRoWaterModeRsp , 2 * 4 }, // 2 parameter each 4bytes // ---- {Gui::GuiActionType::ID_RawData , 255 }, {Gui::GuiActionType::ID_Acknow , 0 }, Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r8d7a40bfbd30d596b4450965597d2e3f2f61326d -r4c32cadadd4c8abdee1eab4ef6425f356f863547 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 8d7a40bfbd30d596b4450965597d2e3f2f61326d) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 4c32cadadd4c8abdee1eab4ef6425f356f863547) @@ -217,7 +217,8 @@ // Generic Confirm case Gui::GuiActionType::ID_DuetConfirmUIr : INTERPRET_TRANSMIT_MESSAGE(DuetConfirmUIrData ); break; // RO Water - case Gui::GuiActionType::ID_DuetRoWaterModeUIi : INTERPRET_TRANSMIT_MESSAGE(DuetRoWaterModeUIiData ); break; + case Gui::GuiActionType::ID_AdjustRoWaterModeReq : INTERPRET_TRANSMIT_MESSAGE(AdjustRoWaterModeRequestData ); break; + case Gui::GuiActionType::ID_RoWaterModeReq : INTERPRET_TRSMT_MT_MESSAGE(RoWaterModeRequestData ); break; // POST case Gui::GuiActionType::ID_UIPostFinalResultData : INTERPRET_TRANSMIT_MESSAGE(AdjustUIPostFinalResultRequestData ); break; // Settings @@ -260,6 +261,11 @@ case Gui::GuiActionType::ID_AdjustSalineReq : INTERPRET_TRANSMIT_MESSAGE(AdjustSalineRequestData ); break; case Gui::GuiActionType::ID_AdjustVitalsReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustVitalsRequestData ); break; case Gui::GuiActionType::ID_AdjustHeparinReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHeparinRequestData ); break; + case Gui::GuiActionType::ID_AdjustDryBicartDisconnectReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDryBicartDisconnectRequestData ); break; + case Gui::GuiActionType::ID_AdjustHDFStateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHDFStateRequestData ); break; + case Gui::GuiActionType::ID_AdjustAutoSubReq : INTERPRET_TRANSMIT_MESSAGE(AdjustAutoSubRequestData ); break; + case Gui::GuiActionType::ID_AdjustHDFReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHDFRequestData ); break; + // in-treatment - ultrafiltration case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationStateRequestData ); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationEditRequestData ); break; @@ -286,7 +292,7 @@ // alarms case Gui::GuiActionType::ID_AlarmSilenceReq : INTERPRET_TRANSMIT_MESSAGE(AlarmSilenceRequestData ); break; case Gui::GuiActionType::ID_AlarmUserActionReq : INTERPRET_TRANSMIT_MESSAGE(AlarmUserActionRequestData ); break; - case Gui::GuiActionType::ID_AlarmVolumeSetReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHDAlarmVolumeRequestData ); break; + case Gui::GuiActionType::ID_AlarmVolumeSetReq : INTERPRET_TRANSMIT_MESSAGE(AdjustTDAlarmVolumeRequestData ); break; // This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. case Gui::GuiActionType::ID_AlarmActiveListReq : INTERPRET_TRSMT_MT_MESSAGE(AlarmActiveListRequestData ); break; case Gui::GuiActionType::ID_AlarmTriggered : INTERPRET_TRANSMIT_MESSAGE(AlarmTriggeredRequestData ); break; @@ -492,7 +498,7 @@ // ----- Datum case Gui::GuiActionType::ID_HDAccelerometerData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDAccelerometerData ); break; - case Gui::GuiActionType::ID_HDSyringePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDSyringePumpData ); break; + case Gui::GuiActionType::ID_TDSyringePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDSyringePumpData ); break; case Gui::GuiActionType::ID_TDVoltageData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDVoltageData ); break; case Gui::GuiActionType::ID_TDAirBubbleData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDAirBubbleData ); break; case Gui::GuiActionType::ID_TDAirPumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDAirPumpData ); break; @@ -531,6 +537,7 @@ case Gui::GuiActionType::ID_DialysateOutletFlow : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DialysateOutletFlow ); break; case Gui::GuiActionType::ID_PressureOcclusion : ok = notify(vMessage, vData, Gui::GuiActionType::ID_PressureOcclusion ); break; case Gui::GuiActionType::ID_Saline : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Saline ); break; + case Gui::GuiActionType::ID_HDF : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDF ); break; case Gui::GuiActionType::ID_Vitals : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Vitals ); break; case Gui::GuiActionType::ID_Heparin : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Heparin ); break; case Gui::GuiActionType::ID_Rinseback : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Rinseback ); break; @@ -540,6 +547,7 @@ case Gui::GuiActionType::ID_Ultrafiltration : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Ultrafiltration ); break; case Gui::GuiActionType::ID_IsolatedUF : ok = notify(vMessage, vData, Gui::GuiActionType::ID_IsolatedUF ); break; case Gui::GuiActionType::ID_TreatmentParametersSetPointData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentParametersSetPointData ); break; + case Gui::GuiActionType::ID_DryBicartDisconnectData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DryBicartDisconnectData ); break; // ----- In-Treatment Adjust case Gui::GuiActionType::ID_AdjustBloodPrimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodPrimeRsp ); break; case Gui::GuiActionType::ID_AdjustDurationEditRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationEditRsp ); break; @@ -564,6 +572,10 @@ case Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditRsp ); break; case Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditRsp ); break; case Gui::GuiActionType::ID_AdjustIsolatedUFConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFConfirmRsp ); break; + case Gui::GuiActionType::ID_AdjustDryBicartDisconnectRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDryBicartDisconnectRsp ); break; + case Gui::GuiActionType::ID_AdjsutHDFStateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjsutHDFStateRsp ); break; + case Gui::GuiActionType::ID_AdjustAutoSubRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustAutoSubRsp ); break; + case Gui::GuiActionType::ID_AdjustHDFRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHDFRsp ); break; // ----- Post-Treatment Adjust case Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp ); break; @@ -584,7 +596,7 @@ case Gui::GuiActionType::ID_AlarmStatus : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmStatus ); break; case Gui::GuiActionType::ID_AlarmTriggered : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmTriggered ); break; case Gui::GuiActionType::ID_AlarmCleared : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmCleared ); break; - case Gui::GuiActionType::ID_AlarmVolumeSetRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmVolumeSetRsp ); break; + case Gui::GuiActionType::ID_AlarmVolumeSetRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmVolumeSetRsp ); break; // This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. case Gui::GuiActionType::ID_AlarmActiveListRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmActiveListRsp ); break; @@ -636,9 +648,6 @@ // DG Response Messages case Gui::GuiActionType::ID_AdjustServiceDatesDGRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesDGRsp ); break; case Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp ); break; - // RO Water - case Gui::GuiActionType::ID_DuetRoWaterStatDGq : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DuetRoWaterStatDGq ); break; - case Gui::GuiActionType::ID_DuetRoWaterModeDGr : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DuetRoWaterModeDGr ); break; // unhandled messages: these will only be logged as received message // there has nothing been defined for these messages. default : printUnhandled (vMessage ); break; @@ -661,6 +670,9 @@ case Gui::GuiActionType::ID_DDValvesStatesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDValvesStatesData ); break; case Gui::GuiActionType::ID_AdjustDDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp ); break; + case Gui::GuiActionType::ID_RoWaterModeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_RoWaterModeRsp ); break; + case Gui::GuiActionType::ID_AdjustRoWaterModeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustRoWaterModeRsp ); break; + case Gui::GuiActionType::ID_DDOperationModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDOperationModeData ); break; case Gui::GuiActionType::ID_AdjustVersionsDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDDRsp ); break; case Gui::GuiActionType::ID_AdjustSerialDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDDRsp ); break; Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -rdc4a0cbb5eb3a967755f4ba40d8407032723c957 -r4c32cadadd4c8abdee1eab4ef6425f356f863547 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision dc4a0cbb5eb3a967755f4ba40d8407032723c957) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 4c32cadadd4c8abdee1eab4ef6425f356f863547) @@ -49,7 +49,8 @@ #include "VDateTime.h" #include "VAdjustmentAlarmVolume.h" #include "VBluetooth.h" -#include "VDuetRoWaterDG.h" +#include "VAdjustRoWaterMode.h" +#include "VRoWaterMode.h" #include "VCloudSync.h" #include "VHDUsageInfo.h" #include "VAdjustmentInstitutionalRecord.h" @@ -93,7 +94,7 @@ #include "VTreatmentBloodPrimeData.h" #include "VTreatmentStopData.h" #include "VHDAccelerometerData.h" -#include "VHDSyringePumpData.h" +#include "VTDSyringePumpData.h" #include "VHDBloodLeakData.h" #include "VTDAirBubbleData.h" #include "VTDAirPumpData.h" @@ -105,7 +106,9 @@ #include "VTDEjectorData.h" #include "VTDTemperatureData.h" #include "VTreatmentTrends.h" +#include "VTreatmentDryBicartDisconnect.h" #include "VWaterSampleData.h" +#include "VTreatmentHDFData.h" // DG data #include "VDGDrainPumpData.h" #include "VDDHeatersData.h" @@ -162,6 +165,10 @@ #include "VTreatmentAdjustmentIsolatedUFState.h" #include "VTreatmentAdjustmentSetPoints.h" #include "VTreatmentAdjustmentVitalsAlarmLimits.h" +#include "VTreatmentAdjustmentAutoSub.h" +#include "VTreatmentAdjustmentHDFState.h" +#include "VTreatmentAdjustmentHDF.h" +#include "VTreatmentAdjustmentDryBicartDisconnect.h" // ----- Post-Treatment Adjustments #include "VPostTreatmentAdjustPatientDisconnectionConfirm.h" #include "VPostTreatmentAdjustDisposablesRemovalConfirm.h" Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r8eee2f9b4de52348bdb7816bfefa9956f1042d94 -r4c32cadadd4c8abdee1eab4ef6425f356f863547 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 8eee2f9b4de52348bdb7816bfefa9956f1042d94) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 4c32cadadd4c8abdee1eab4ef6425f356f863547) @@ -91,7 +91,7 @@ // ----- Settings // Service Mode ID_AdjustServiceModeReq = 0xB000, // 176 - ID_AdjustServiceModeRsp = 0xB100, // 177 + ID_AdjustServiceModeRsp = 0xB10F, // 177 //// ----- @CRAPIZED: had to change to avoid duplication // Version ID_AdjustVersionsUIReq = 0x0D00, // 13 //// ----- @LEAHIZED @@ -121,7 +121,7 @@ // State Messages ID_TDOpModeData = 0x1200, // 18 //// ----- @LEAHIZED - ID_PreTreatmentStates = 0x5C00, // 92 + ID_PreTreatmentStates = 0xB700, // 183 //// ----- @LEAHIZED ID_TreatmentStates = 0x3C00, // 60 //// ----- @LEAHIZED ID_PostTreatmentStates = 0x770F, // 119 //// ----- @CRAPIZED: had to change to avoid duplication @@ -130,7 +130,7 @@ ID_TreatmentTime = 0x3B00, // 59 //// ----- @LEAHIZED ID_BloodFlow = 0x1100, // 17 //// ----- @LEAHIZED ID_DialysateInletFlow = 0x0800, - ID_DialysateOutletFlow = 0x0B00, + ID_DialysateOutletFlow = 0x0B0F, //// ----- @CRAPIZED ID_PressureOcclusion = 0x2400, // 36 //// ----- @LEAHIZED ID_Saline = 0x3D00, // 61 //// ----- @LEAHIZED ID_Ultrafiltration = 0x3E00, // 62 //// ----- @LEAHIZED @@ -198,7 +198,7 @@ ID_DGDrainPumpData = 0x240F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication ID_DDOperationModeData = 0x1300, ID_DGReservoirData = 0x280F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication - ID_DGLoadCellReadingsData = 0x0C00, // 12 + ID_DGLoadCellReadingsData = 0x0C0F, // 12 ID_DGAccelerometerData = 0x340F, // 52 //// ----- @CRAPIZED: had to change to avoid duplication ID_DDValvesStatesData = 0x1B00, // 27 //// ----- @LEAHIZED ID_DDPressuresData = 0x1C00, // 28 //// ----- @LEAHIZED @@ -224,7 +224,7 @@ // HD Data Messages ID_HDAccelerometerData = 0x3300, // 51 - ID_HDSyringePumpData = 0x6900, // 105 + ID_TDSyringePumpData = 0xB100, // 177 ID_HDBloodLeakData = 0x6C0F, // 108 //// ----- @CRAPIZED: had to change to avoid duplication ID_TDAirBubbleData = 0x1E00, // 30 //// ----- @LEAHIZED ID_TDAirPumpData = 0x2000, // 32 //// ----- @LEAHIZED @@ -280,6 +280,10 @@ ID_AdjustHeparinReq = 0x8A00, // 138 ID_AdjustHeparinRsp = 0x8B00, // 139 + ID_DryBicartDisconnectData = 0xC400, // 196 + ID_AdjustDryBicartDisconnectReq = 0xC500, // 197 + ID_AdjustDryBicartDisconnectRsp = 0xC600, // 198 + ID_AdjustPressuresWideningReq = 0xA400, // 114 //// ----- @LEAHIZED ID_AdjustPressuresWideningRsp = 0xA500, // 115 //// ----- @LEAHIZED @@ -305,6 +309,18 @@ ID_AdjustIsoUFStateReq = 0xBA00, // 186 //// ----- @LEAHIZED ID_AdjustIsoUFStateRsp = 0xBB00, // 187 //// ----- @LEAHIZED + // HDF + ID_HDF = 0xBC00, // 188 //// ----- @LEAHIZED + + ID_AdjustHDFStateReq = 0xBD00, // 189 //// ----- @LEAHIZED + ID_AdjsutHDFStateRsp = 0xBE00, // 190 //// ----- @LEAHIZED + + ID_AdjustAutoSubReq = 0xBF00, // 191 //// ----- @LEAHIZED + ID_AdjustAutoSubRsp = 0xC000, // 192 //// ----- @LEAHIZED + + ID_AdjustHDFReq = 0xC100, // 193 //// ----- @LEAHIZED + ID_AdjustHDFRsp = 0xC200, // 194 //// ----- @LEAHIZED + // End-Treatment // Rinseback ID_AdjustRinsebackReq = 0x9000, // 144 //// ----- @LEAHIZED @@ -347,10 +363,12 @@ ID_AdjustDGCleaningUsageRsp = 0x8D0F, // 141 //// ----- @CRAPIZED: had to change to avoid duplication // RO Water Input Mode - ID_DuetRoWaterStatDGq = 0xC300, // 195 DG -> UI // DG initiates Status query - ID_DuetRoWaterModeUIi = 0xBC00, // 188 UI -> DG // UI initiates Mode Set || responses to status query - ID_DuetRoWaterModeDGr = 0xC400, // 196 UI <- DG // DG responses Mode Set + ID_RoWaterModeReq = 0xEB00, // 235 + ID_RoWaterModeRsp = 0xEC00, // 236 + ID_AdjustRoWaterModeReq = 0xED00, // 237 + ID_AdjustRoWaterModeRsp = 0xEE00, // 238 + // Institutional record request and response ID_InstitutionalRecordReq = 0x8200, // 130 UI -> TD request institutional record ID_InstitutionalRecordRsp = 0x8300, // 131 TD -> UI response institutional record Index: sources/gui/qml/main.qml =================================================================== diff -u -rdc4a0cbb5eb3a967755f4ba40d8407032723c957 -r4c32cadadd4c8abdee1eab4ef6425f356f863547 --- sources/gui/qml/main.qml (.../main.qml) (revision dc4a0cbb5eb3a967755f4ba40d8407032723c957) +++ sources/gui/qml/main.qml (.../main.qml) (revision 4c32cadadd4c8abdee1eab4ef6425f356f863547) @@ -24,7 +24,7 @@ // View classes import VGeneralEvent 0.1 import VHDAccelerometer 0.1 -import VHDSyringePump 0.1 +import VTDSyringePump 0.1 import VHDBloodLeak 0.1 import VTDAirBubble 0.1 import VTDAirPump 0.1 @@ -54,7 +54,8 @@ import VDateTime 0.1 import VAdjustmentAlarmVolume 0.1 import VBluetooth 0.1 -import VDuetRoWaterDG 0.1 +import VAdjustRoWaterMode 0.1 +import VRoWaterMode 0.1 import VCloudSync 0.1 import VHDUsageInfo 0.1 import VInstitutionalRecord 0.1 @@ -87,6 +88,8 @@ import VTreatmentRanges 0.1 import VTreatmentHeparin 0.1 import VTreatmentTrends 0.1 +import VTreatmentHDF 0.1 +import VTreatmentDryBicartDisconnect 0.1 // Pre-Treatment import VPreTreatmentAdjustmentInitTreatment 0.1 @@ -155,6 +158,10 @@ import VTreatmentAdjustmentRinseback 0.1 import VTreatmentAdjustmentRecirculate 0.1 import VTreatmentAdjustmentEnd 0.1 +import VTreatmentAdjustmentDryBicartDisconnect 0.1 +import VTreatmentAdjustmentAutoSub 0.1 +import VTreatmentAdjustmentHDFState 0.1 +import VTreatmentAdjustmentHDF 0.1 // Post-Treatmnt import VPostTreatmentAdjustmentPatientDisconnectionConfirm 0.1 import VPostTreatmentAdjustmentDisposablesRemovalConfirm 0.1 @@ -198,7 +205,8 @@ VDateTime { id: vDateTime } VAdjustmentAlarmVolume { id: vAdjustmentAlarmVolume } VBluetooth { id: vBluetooth } - VDuetRoWaterDG { id: vDuetRoWaterDG } + VAdjustRoWaterMode { id: vAdjustRoWaterMode } + VRoWaterMode { id: vRoWaterMode } VCloudSync { id: vCloudSync } VHDUsageInfo { id: vHDUsageInfo } VAdjustmentInstitutionalRecord { id: vAdjustmentInstitutionalRecord } @@ -235,7 +243,7 @@ VGeneralEvent { id: vGeneralEvent } VHDAccelerometer { id: vHDAccelerometer } - VHDSyringePump { id: vHDSyringePump } + VTDSyringePump { id: vTDSyringePump } VTDAirBubble { id: vTDAirBubble } VTDAirPump { id: vTDAirPump } VHDBloodLeak { id: vHDBloodLeak } @@ -262,6 +270,8 @@ VTreatmentRecirculate { id: vTreatmentRecirculate } VTreatmentStop { id: vTreatmentStop } VTreatmentHeparin { id: vTreatmentHeparin } + VTreatmentDryBicartDisconnect { id: vTreatmentDryBicartDisconnect } + VTreatmentHDF { id: vTreatmentHDF } // ---- DD VDGDrainPump { id: vDGDrainPump } @@ -335,6 +345,10 @@ VTreatmentAdjustmentRinseback { id: vTreatmentAdjustmentRinseback } VTreatmentAdjustmentRecirculate { id: vTreatmentAdjustmentRecirculate } VTreatmentAdjustmentEnd { id: vTreatmentAdjustmentEnd } + VTreatmentAdjustmentDryBicartDisconnect { id: vTreatmentAdjustmentDryBicartDisconnect } + VTreatmentAdjustmentAutoSub { id: vTreatmentAdjustmentAutoSub } + VTreatmentAdjustmentHDFState { id: vTreatmentAdjustmentHDFState } + VTreatmentAdjustmentHDF { id: vTreatmentAdjustmentHDF } // --- Post Treatment VPostTreatmentAdjustmentPatientDisconnectionConfirm { id: vPostTreatmentAdjustmentPatientDisconnectionConfirm } @@ -433,6 +447,7 @@ HeaderbarSettings { id: _headerbarSettings } HeaderbarInformation { id: _headerbarInformation } WaterSampleDialog { id: _headerbarWaterSampleDialysate } + DryBicartDisconnectDialog { id: _dryBicartDisconnectDialog } TreatmentAdjustmentVitals { id: _treatmentAdjustmentVitals } EndTreatmentDialog { id: _endTreatmentDialog } RinsebackCompleteDialog { id: _rinsebackCompleteDialog } Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r85105bf140b9b7c4ffc8f0d176f5f01dd2261867 -r4c32cadadd4c8abdee1eab4ef6425f356f863547 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 85105bf140b9b7c4ffc8f0d176f5f01dd2261867) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 4c32cadadd4c8abdee1eab4ef6425f356f863547) @@ -60,8 +60,10 @@ readonly property bool isTreatmentPaused : vTDTreatmentStates.txStop readonly property bool isSBInProgress : ( vTDTreatmentStates.sbRunning || vTDTreatmentStates.sbWaitPump ) readonly property bool isTreatmentEnd : vTDTreatmentStates.txEnd - property int headerMenuIndex : _headerBar.headerMenuIndex + readonly property bool isIsoTreatment : vTDTreatmentStates.txIsolatedUF + property int headerMenuIndex : _headerBar.headerMenuIndex + onHeaderMenuIndexChanged: { switch( _headerBar.currentScreen ) { case HeaderBar.Treatment: Index: sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml =================================================================== diff -u -re7a26aa8823fdabbfb21fe75ea9a581c7d0513b4 -r4c32cadadd4c8abdee1eab4ef6425f356f863547 --- sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml (.../TreatmentHDFComponent.qml) (revision e7a26aa8823fdabbfb21fe75ea9a581c7d0513b4) +++ sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml (.../TreatmentHDFComponent.qml) (revision 4c32cadadd4c8abdee1eab4ef6425f356f863547) @@ -21,11 +21,16 @@ import "qrc:/pages/treatment" TreatmentSection { id: _root - color : Colors.panelBackgroundColor - header.color : Colors.heparinSectionHeader - enableDropShadow : false - header.title : qsTr("Hemodiafiltration") + " (" + qsTr("HDF") + ")" - header.editEnabled : ! isIsoTreatment // LEAHI-PRS-459 + isPaused : ! isIsoTreatment // LEAHI-PRS-459 + color : Colors.panelBackgroundColor + header.color : Colors.heparinSectionHeader + enableDropShadow: false + header { + title : qsTr("Hemodiafiltration") + " (" + qsTr("HDF") + ")" + showPauseResume : true + isPaused : vTreatmentHDF.hdfState === TreatmentHDF.Paused + editEnabled : ! isIsoTreatment // LEAHI-PRS-459 + } contentArea.anchors { topMargin : Variables.defaultMargin @@ -44,28 +49,28 @@ readonly property int topTextFontSize : 25 readonly property int bottomTextFontSize : 60 - readonly property real estimatedSubstitutionVal : 23.0 // TODO update later - readonly property int substitutionRate : 125 // TODO update later + readonly property real estimatedSubstitutionVal : vTreatmentHDF.requestedVolume + readonly property real prescribedSubstitutionVal: vTreatmentCreate.substitutionFluidVolume + readonly property real substitutionRate : vTreatmentHDF.currentRate readonly property real minimum : vTreatmentRanges.substitutionVolumeMin readonly property real maximum : vTreatmentRanges.substitutionVolumeMax readonly property real resolution : vTreatmentRanges.substitutionVolumeRes - readonly property real substitutionValue: 10.0 // TODO update later + readonly property real substitutionValue: vTreatmentHDF.totalVolume - readonly property string statusText : qsTr("Active") - /*isDispensing ? qsTr("Active") : - isPaused ? qsTr("Pause") : - isCompleted ? qsTr("Complete") : qsTr("Active")*/ + readonly property string statusText : vTreatmentHDF.hdfState === TreatmentHDF.Active ? qsTr("Active") : + vTreatmentHDF.hdfState === TreatmentHDF.Paused ? qsTr("Pause") : + vTreatmentHDF.hdfState === TreatmentHDF.Complete ? qsTr("Complete") : Variables.emptyEntry - readonly property string buttonText : qsTr("Pause Substitution Flow") + readonly property bool volumeDeviation: estimatedSubstitutionVal < prescribedSubstitutionVal // LEAHI-PRS-816 + property color statusColor : Colors.transparent readonly property int cellHeight: contentItem.height readonly property int cellWidth : contentItem.width / 2 - _row.spacing - signal substitutionFlowClicked() contentItem: Row { id: _row spacing: Variables.defaultMargin * 2 @@ -84,12 +89,13 @@ topText : qsTr("Estimated Final Substitution Volume") topTextFont.pixelSize : topTextFontSize topTextFont.weight : Font.Medium - bottomText : (_root.estimatedSubstitutionVal).toFixed(Variables.substitutionPrecision) //vTreatmentUltrafiltration.setVolume.toFixed(Variables.substitutionPrecision) + bottomText : (_root.estimatedSubstitutionVal).toFixed(Variables.substitutionPrecision) bottomTextFont.pixelSize: bottomTextFontSize bottomTextFont.weight : Font.Normal leftAlign : true unitText : Variables.unitVolume bottomTextTopMargin : Variables.defaultMargin + bottomTextColor : _root.volumeDeviation ? Colors.pauseColor : Colors.textTextRectLabel } LabelValue { id: _substitutionRate @@ -103,27 +109,30 @@ topText : qsTr("Substitution Rate") topTextFont.pixelSize : topTextFontSize topTextFont.weight : Font.Medium - bottomText : _root.substitutionRate //vTreatmentUltrafiltration.setVolume.toFixed(Variables.substitutionPrecision) + bottomText : _root.substitutionRate.toFixed(Variables.substitutionPrecision) + bottomTextColor : vTreatmentHDF.hdfState === TreatmentHDF.Paused ? Colors.statusTextPaused : Colors.textTextRectLabel bottomTextFont.pixelSize: bottomTextFontSize bottomTextFont.weight : Font.Normal leftAlign : true unitText : Variables.unitTextFlowRate bottomTextTopMargin : Variables.defaultMargin } - ProgressBar { id: _progressbar + ProgressBarEx { id: _progressbar anchors { verticalCenter : parent.verticalCenter right : parent.right } width : parent.width * 0.6 height : 20 decimal : Variables.substitutionPrecision - minimum : _root.minimum - maximum : vTreatmentCreate.substitutionFluidVolume - value : _root.substitutionValue + minimum : 0 + maximum : _root.prescribedSubstitutionVal.toFixed(Variables.substitutionPrecision) + value : _root.substitutionValue.toFixed(Variables.substitutionPrecision) + valueEx : _root.volumeDeviation ? _root.estimatedSubstitutionVal.toFixed(Variables.substitutionPrecision) : 0 + unitText : Variables.unitVolume - color : Colors.progressBarUltrafiltration + color : vTreatmentHDF.hdfState === TreatmentHDF.Paused ? Colors.pauseColor : Colors.progressBarUltrafiltration bgColor : Colors.heparinSectionHeader radius : height showMarker : false @@ -146,7 +155,7 @@ right : parent.right } text : _root.substitutionValue.toFixed(Variables.substitutionPrecision) + " " + Variables.unitVolume - color : Colors.white + color : vTreatmentHDF.hdfState === TreatmentHDF.Paused ? Colors.statusTextPaused : Colors.offWhite font.pixelSize : 40 font.weight : Font.DemiBold } @@ -181,26 +190,6 @@ font.weight : Font.DemiBold } } - - TouchRect { id : _substitutionFlowButton - width : text.implicitWidth + Variables.defaultMargin * 2 - height : 60 - text { - text : _root.buttonText - font.pixelSize : Fonts.fontPixelConfirm - font.weight : Font.Medium - } - - isDefault: true - enabled : ! isIsoTreatment // LEAHI-PRS-459 - - anchors { - bottom : parent.bottom - horizontalCenter: parent.horizontalCenter - } - - onClicked: substitutionFlowClicked() - } } Column { id: _rightColumn @@ -237,14 +226,12 @@ right : _autoSubText.left rightMargin : Variables.defaultMargin } - checked : true // TODO + checked : vTreatmentHDF.autoSubState height : Variables.contentHeight active : ! isIsoTreatment // LEAHI-PRS-459 enabled : active - onClicked: { - print (("Auto Sub Switch set to %1").arg(_autoSubSwitch.checked ? "On" : "Off")) - } + onClicked: vTreatmentAdjustmentAutoSub.doAdjustment( ! _autoSubSwitch.checked ) } } Index: sources/model/MModel.h =================================================================== diff -u -r8d7a40bfbd30d596b4450965597d2e3f2f61326d -r4c32cadadd4c8abdee1eab4ef6425f356f863547 --- sources/model/MModel.h (.../MModel.h) (revision 8d7a40bfbd30d596b4450965597d2e3f2f61326d) +++ sources/model/MModel.h (.../MModel.h) (revision 4c32cadadd4c8abdee1eab4ef6425f356f863547) @@ -27,7 +27,7 @@ #include "MAlarmTriggered.h" #include "MAlarmCleared.h" #include "MAlarmActiveList.h" -#include "MAdjustHDAlarmVolumeResponse.h" +#include "MAdjustTDAlarmVolumeResponse.h" #include "MDuetConfirmTDi.h" // POST @@ -52,6 +52,8 @@ #include "MTreatmentRangesData.h" #include "MTreatmentSalineData.h" #include "MTreatmentVitalsData.h" +#include "MTreatmentHDFData.h" +#include "MTreatmentDryBicartDisconnectData.h" #include "MTreatmentHeparinData.h" #include "MTreatmentRinsebackData.h" #include "MTreatmentRecirculateData.h" @@ -61,7 +63,7 @@ #include "MTreatmentIsolatedUFData.h" #include "MTreatmentParametersSetPointData.h" #include "MHDAccelerometerData.h" -#include "MHDSyringePumpData.h" +#include "MTDSyringePumpData.h" #include "MHDBloodLeakData.h" #include "MHDRTCEpochData.h" #include "MHDUsageInfoResponse.h" @@ -96,7 +98,8 @@ #include "MAdjustDGServiceDatesResponse.h" #include "MAdjustTDDateTimeResponse.h" #include "MAdjustDDDateTimeResponse.h" -#include "MDuetRoWaterDG.h" +#include "MAdjustRoWaterModeResponse.h" +#include "MRoWaterModeResponse.h" #include "MAdjustTDInstitutionalRecordResponse.h" #include "MTDInstitutionalRecordResponse.h" #include "MAdjustTDAdvancedInstitutionalRecordResponse.h" @@ -173,6 +176,10 @@ #include "MTreatmentAdjustEndResponse.h" #include "MTreatmentAdjustPressuresLimitsResponse.h" #include "MTreatmentAdjustPressuresWideningResponse.h" +#include "MTreatmentAdjustAutoSubResponse.h" +#include "MTreatmentAdjustHDFResponse.h" +#include "MTreatmentAdjustHDFStateResponse.h" +#include "MTreatmentAdjustDryBicartDisconnectResponse.h" // Post-Treatment #include "MPostTreatmentAdjustRequests.h" @@ -315,9 +322,10 @@ REGISTER_METATYPE( DuetConfirmTDiData ) \ REGISTER_METATYPE( DuetConfirmUIrData ) \ /* RO Water Mode */ \ - REGISTER_METATYPE( DuetRoWaterStatDGqData ) \ - REGISTER_METATYPE( DuetRoWaterModeUIiData ) \ - REGISTER_METATYPE( DuetRoWaterModeDGrData ) \ + REGISTER_METATYPE( AdjustRoWaterModeRequestData ) \ + REGISTER_METATYPE( AdjustRoWaterModeResponseData ) \ + REGISTER_METATYPE( RoWaterModeRequestData ) \ + REGISTER_METATYPE( RoWaterModeResponseData ) \ /* POST */ \ REGISTER_METATYPE( HDPostSingleResultData ) \ REGISTER_METATYPE( HDPostFinalResultData ) \ @@ -370,15 +378,17 @@ REGISTER_METATYPE( TreatmentRangesData ) \ REGISTER_METATYPE( TreatmentSalineData ) \ REGISTER_METATYPE( TreatmentVitalsData ) \ + REGISTER_METATYPE( TreatmentHDFData ) \ REGISTER_METATYPE( TreatmentHeparinData ) \ + REGISTER_METATYPE( TreatmentDryBicartDisconnectData ) \ REGISTER_METATYPE( TreatmentRinsebackData ) \ REGISTER_METATYPE( TreatmentRecirculateData ) \ REGISTER_METATYPE( TreatmentBloodPrimeData ) \ REGISTER_METATYPE( TreatmentStopData ) \ REGISTER_METATYPE( TreatmentUltrafiltrationData ) \ REGISTER_METATYPE( TreatmentIsolatedUFData ) \ REGISTER_METATYPE( TreatmentParametersSetPointData ) \ - REGISTER_METATYPE( HDSyringePumpData ) \ + REGISTER_METATYPE( TDSyringePumpData ) \ REGISTER_METATYPE( HDAccelerometerData ) \ REGISTER_METATYPE( HDBloodLeakData ) \ REGISTER_METATYPE( TDAirTrapData ) \ @@ -466,6 +476,9 @@ REGISTER_METATYPE( AdjustBloodPrimeRequestData ) \ REGISTER_METATYPE( AdjustBloodDialysateRequestData ) \ REGISTER_METATYPE( AdjustBolusVolumeRequestData ) \ + REGISTER_METATYPE( AdjustHDFStateRequestData ) \ + REGISTER_METATYPE( AdjustAutoSubRequestData ) \ + REGISTER_METATYPE( AdjustHDFRequestData ) \ REGISTER_METATYPE( AdjustDurationEditRequestData ) \ REGISTER_METATYPE( AdjustDurationConfirmRequestData ) \ REGISTER_METATYPE( AdjustSetPointsRequestData ) \ @@ -487,14 +500,15 @@ REGISTER_METATYPE( AdjustRecirculateRequestData ) \ REGISTER_METATYPE( AdjustTreatmentEndRequestData ) \ REGISTER_METATYPE( AdjustPressuresLimitsRequestData ) \ + REGISTER_METATYPE( AdjustDryBicartDisconnectRequestData ) \ REGISTER_METATYPE( AdjustPressuresWideningRequestData ) \ REGISTER_METATYPE( AdjustVersionsResponseData ) \ REGISTER_METATYPE( AdjustVersionsRequestData ) \ REGISTER_METATYPE( AdjustServiceModeRequestData ) \ REGISTER_METATYPE( AdjustServiceDatesRequestData ) \ REGISTER_METATYPE( AdjustTDDateTimeRequestData ) \ REGISTER_METATYPE( AdjustDDDateTimeRequestData ) \ - REGISTER_METATYPE( AdjustHDAlarmVolumeRequestData ) \ + REGISTER_METATYPE( AdjustTDAlarmVolumeRequestData ) \ \ /* Response */ \ /* Post-Treatment */ \ @@ -536,11 +550,15 @@ REGISTER_METATYPE( AdjustSalineResponseData ) \ REGISTER_METATYPE( AdjustVitalsResponseData ) \ REGISTER_METATYPE( AdjustHeparinResponseData ) \ + REGISTER_METATYPE( AdjustDryBicartDisconnectResponseData ) \ REGISTER_METATYPE( AdjustRinsebackResponseData ) \ REGISTER_METATYPE( AdjustRecirculateResponseData ) \ REGISTER_METATYPE( AdjustTreatmentEndResponseData ) \ REGISTER_METATYPE( AdjustPressuresLimitsResponseData ) \ REGISTER_METATYPE( AdjustPressuresWideningResponseData ) \ + REGISTER_METATYPE( AdjustHDFResponseData ) \ + REGISTER_METATYPE( AdjustHDFStateResponseData ) \ + REGISTER_METATYPE( AdjustAutoSubResponseData ) \ REGISTER_METATYPE( AdjustVersionsTDRequestData ) \ REGISTER_METATYPE( AdjustVersionsTDResponseData ) \ REGISTER_METATYPE( AdjustVersionsDDResponseData ) \ @@ -554,7 +572,7 @@ REGISTER_METATYPE( AdjustDDDateTimeResponseData ) \ /* Alarms - Active List Response */ \ REGISTER_METATYPE( AlarmActiveListResponseData ) \ - REGISTER_METATYPE( AdjustHDAlarmVolumeResponseData ) \ + REGISTER_METATYPE( AdjustTDAlarmVolumeResponseData ) \ REGISTER_METATYPE( AdjustInstitutionalRequestData ) \ REGISTER_METATYPE( AdjustInstitutionalRecordResponseData ) \ REGISTER_METATYPE( InstitutionalRequestData ) \ @@ -586,8 +604,8 @@ /* CONFIRM */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DuetConfirmTDiData ) \ /* RO Water Mode */ \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DuetRoWaterStatDGqData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DuetRoWaterModeDGrData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRoWaterModeResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, RoWaterModeResponseData ) \ /* POST */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDPostSingleResultData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDPostFinalResultData ) \ @@ -610,15 +628,17 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRangesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentSalineData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentVitalsData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentHDFData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentHeparinData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentDryBicartDisconnectData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRinsebackData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRecirculateData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentBloodPrimeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentStopData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentUltrafiltrationData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentIsolatedUFData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentParametersSetPointData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDSyringePumpData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDSyringePumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDBloodLeakData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDAirBubbleData ) \ @@ -714,11 +734,15 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSalineResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVitalsResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHeparinResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDryBicartDisconnectResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRinsebackResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresWideningResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDFResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDFStateResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustAutoSubResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsTDRequestData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsTDResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsDDResponseData ) \ @@ -732,7 +756,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDDateTimeResponseData ) \ /* Alarms - Active List Response */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmActiveListResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTDAlarmVolumeResponseData ) \ /* Settings - HD Data Response */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDUsageInfoResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustInstitutionalRecordResponseData ) \ @@ -744,13 +768,17 @@ /* CONFIRM */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DuetConfirmUIrData ) \ /* RO Water Mode */ \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DuetRoWaterModeUIiData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustRoWaterModeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, RoWaterModeRequestData ) \ /* POST */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUIPostFinalResultRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBloodPrimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBolusVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDFStateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustAutoSubRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDFRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDurationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDurationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSetPointsRequestData ) \ @@ -771,14 +799,15 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDryBicartDisconnectRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresWideningRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustServiceModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDatesRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTDAlarmVolumeRequestData ) \ /* Post-Treatment */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientDisconnectionNotifyRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientDisconnectionConfirmRequestData ) \ @@ -835,8 +864,8 @@ /* CONFIRM */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( DuetConfirmTDiData ) \ /* RO Water Mode */ \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DuetRoWaterStatDGqData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DuetRoWaterModeDGrData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRoWaterModeResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( RoWaterModeResponseData ) \ /* POST */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDPostSingleResultData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDPostFinalResultData ) \ @@ -860,15 +889,17 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRangesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentSalineData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentVitalsData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentHDFData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentHeparinData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentDryBicartDisconnectData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRinsebackData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRecirculateData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentBloodPrimeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentStopData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentUltrafiltrationData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentIsolatedUFData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentParametersSetPointData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( HDSyringePumpData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TDSyringePumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDBloodLeakData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TDAirBubbleData ) \ @@ -964,11 +995,15 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSalineResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVitalsResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHeparinResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDryBicartDisconnectResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRinsebackResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRecirculateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresLimitsResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresWideningResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDFResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDFStateResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustAutoSubResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsTDRequestData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsTDResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsDDResponseData ) \ @@ -982,7 +1017,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDDateTimeResponseData ) \ /* Alarms - Active List Response */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmActiveListResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDAlarmVolumeResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTDAlarmVolumeResponseData ) \ /* Settings - HD Data Response */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDUsageInfoResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustInstitutionalRecordResponseData ) \ @@ -995,7 +1030,8 @@ /* CONFIRM */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( DuetConfirmUIrData ) \ /* RO Water Mode */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( DuetRoWaterModeUIiData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustRoWaterModeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( RoWaterModeRequestData ) \ /* POST */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ @@ -1023,6 +1059,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodPrimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBolusVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDFStateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustAutoSubRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDFRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDurationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDurationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSetPointsRequestData ) \ @@ -1044,14 +1083,15 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDryBicartDisconnectRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresWideningRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceDatesRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDAlarmVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTDAlarmVolumeRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmUserActionRequestData ) \ @@ -1070,7 +1110,8 @@ /* CONFIRM */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DuetConfirmUIrData ) \ /* RO Water Mode */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DuetRoWaterModeUIiData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustRoWaterModeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( RoWaterModeRequestData ) \ /* POST */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ @@ -1098,6 +1139,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodPrimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBolusVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDFStateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustAutoSubRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDFRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDurationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDurationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSetPointsRequestData ) \ @@ -1119,14 +1163,15 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDryBicartDisconnectRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPressuresWideningRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustServiceModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustServiceDatesRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDAlarmVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTDAlarmVolumeRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmUserActionRequestData ) \ @@ -1145,7 +1190,8 @@ /* CONFIRM */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DuetConfirmUIrData ) \ /* RO Water Mode */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DuetRoWaterModeUIiData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustRoWaterModeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( RoWaterModeRequestData ) \ /* POST */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ @@ -1173,6 +1219,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodPrimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBolusVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDFStateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustAutoSubRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDFRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSetPointsRequestData ) \ @@ -1188,6 +1237,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustIsolatedUFVolumeEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustIsolatedUFConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDryBicartDisconnectRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPressuresWideningRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVitalsRequestData ) \ @@ -1201,7 +1251,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustServiceDatesRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDAlarmVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTDAlarmVolumeRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmUserActionRequestData ) \ @@ -1220,8 +1270,8 @@ /* CONFIRM */ \ ACTION_RECEIVE_SIGNAL( DuetConfirmTDiData ) \ /* RO Water Mode */ \ - ACTION_RECEIVE_SIGNAL( DuetRoWaterStatDGqData ) \ - ACTION_RECEIVE_SIGNAL( DuetRoWaterModeDGrData ) \ + ACTION_RECEIVE_SIGNAL( AdjustRoWaterModeResponseData ) \ + ACTION_RECEIVE_SIGNAL( RoWaterModeResponseData ) \ /* POST */ \ ACTION_RECEIVE_SIGNAL( HDPostSingleResultData ) \ ACTION_RECEIVE_SIGNAL( HDPostFinalResultData ) \ @@ -1245,15 +1295,17 @@ ACTION_RECEIVE_SIGNAL( TreatmentRangesData ) \ ACTION_RECEIVE_SIGNAL( TreatmentSalineData ) \ ACTION_RECEIVE_SIGNAL( TreatmentVitalsData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentHDFData ) \ ACTION_RECEIVE_SIGNAL( TreatmentHeparinData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentDryBicartDisconnectData ) \ ACTION_RECEIVE_SIGNAL( TreatmentRinsebackData ) \ ACTION_RECEIVE_SIGNAL( TreatmentRecirculateData ) \ ACTION_RECEIVE_SIGNAL( TreatmentBloodPrimeData ) \ ACTION_RECEIVE_SIGNAL( TreatmentStopData ) \ ACTION_RECEIVE_SIGNAL( TreatmentUltrafiltrationData ) \ ACTION_RECEIVE_SIGNAL( TreatmentIsolatedUFData ) \ ACTION_RECEIVE_SIGNAL( TreatmentParametersSetPointData ) \ - ACTION_RECEIVE_SIGNAL( HDSyringePumpData ) \ + ACTION_RECEIVE_SIGNAL( TDSyringePumpData ) \ ACTION_RECEIVE_SIGNAL( HDAccelerometerData ) \ ACTION_RECEIVE_SIGNAL( HDBloodLeakData ) \ ACTION_RECEIVE_SIGNAL( TDAirTrapData ) \ @@ -1350,11 +1402,15 @@ ACTION_RECEIVE_SIGNAL( AdjustSalineResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustVitalsResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustHeparinResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDryBicartDisconnectResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustRinsebackResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustRecirculateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustPressuresLimitsResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustPressuresWideningResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustHDFResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustHDFStateResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustAutoSubResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustVersionsTDRequestData ) \ ACTION_RECEIVE_SIGNAL( AdjustVersionsTDResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustVersionsDDResponseData ) \ @@ -1368,7 +1424,7 @@ ACTION_RECEIVE_SIGNAL( AdjustDDDateTimeResponseData ) \ /* Alarms */ \ ACTION_RECEIVE_SIGNAL( AlarmActiveListResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustHDAlarmVolumeResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustTDAlarmVolumeResponseData ) \ /* Settings - HD data response */ \ ACTION_RECEIVE_SIGNAL( HDUsageInfoResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustInstitutionalRecordResponseData ) \ Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -r8d7a40bfbd30d596b4450965597d2e3f2f61326d -r4c32cadadd4c8abdee1eab4ef6425f356f863547 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 8d7a40bfbd30d596b4450965597d2e3f2f61326d) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 4c32cadadd4c8abdee1eab4ef6425f356f863547) @@ -762,6 +762,31 @@ } }; +/*! + * \brief The MAdjustryBicartDisconnectReq class + * \details The model to request the Dry Bicart Disconnect + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------: | + * |0xC500| 0x100 | Req | Y | UI | HD | Dry Bicart Disconnect Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref command | + * + */ +class MAdjustryBicartDisconnectReq : public MModel { +public: + quint32 command = 0; + + QString toString() { + return toString({command}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDryBicartDisconnect", vParameters); + } +}; + //// ---------- Alarms /*! @@ -809,6 +834,84 @@ } }; +/*! + * \brief The MAdjustHDFStateReq class + * \details The model to request the HDF state + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------: | + * |0xBD00| 0x100 | Req | Y | UI | TD | HDF State Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref state | + * + */ +class MAdjustHDFStateReq : public MModel { +public: + quint32 state = 0; + + QString toString() { + return toString({state}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustHDFState", vParameters); + } +}; + +/*! + * \brief The MAdjustAutoSubReq class + * \details The model to request the auto sub state + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------: | + * |0xBD00| 0x100 | Req | Y | UI | TD | auto sub State Req | + * + * | Payload || + * | || + * | #1:(U32) | \ref state | + * + */ +class MAdjustAutoSubReq : public MModel { +public: + quint32 state = 0; + + QString toString() { + return toString({state}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustAutoSub", vParameters); + } +}; + +/*! + * \brief The MAdjustAutoSubReq class + * \details The model to request the auto sub state + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------: | + * |0xBD00| 0x100 | Req | Y | UI | TD | auto sub State Req | + * + * | Payload || + * | || + * | #1:(U32) | \ref treatmetnModali | + * | #2:(F32) | \ref state | + * + */ +class MAdjustHDFReq : public MModel { +public: + quint32 treatmentMode = 0; + float subFluidVolume = 0; + + QString toString() { + return toString({treatmentMode, + subFluidVolume}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustHDF", vParameters); + } +}; + } typedef Model:: MDuetConfirmUIr DuetConfirmUIrData; @@ -837,6 +940,10 @@ typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData; typedef Model:: MAdjustPressuresWideningReq AdjustPressuresWideningRequestData; typedef Model:: MAdjustBolusVolumeReq AdjustBolusVolumeRequestData; +typedef Model:: MAdjustryBicartDisconnectReq AdjustDryBicartDisconnectRequestData; +typedef Model:: MAdjustHDFStateReq AdjustHDFStateRequestData; +typedef Model:: MAdjustAutoSubReq AdjustAutoSubRequestData; +typedef Model:: MAdjustHDFReq AdjustHDFRequestData; // Alarms typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; typedef Model:: MAlarmUserActionReq AlarmUserActionRequestData; Index: sources/view/VView.h =================================================================== diff -u -rdc4a0cbb5eb3a967755f4ba40d8407032723c957 -r4c32cadadd4c8abdee1eab4ef6425f356f863547 --- sources/view/VView.h (.../VView.h) (revision dc4a0cbb5eb3a967755f4ba40d8407032723c957) +++ sources/view/VView.h (.../VView.h) (revision 4c32cadadd4c8abdee1eab4ef6425f356f863547) @@ -139,7 +139,8 @@ REGISTER_TYPE( VDateTime ) \ REGISTER_TYPE( VAdjustmentAlarmVolume ) \ REGISTER_TYPE( VBluetooth ) \ - REGISTER_TYPE( VDuetRoWaterDG ) \ + REGISTER_TYPE( VAdjustRoWaterMode ) \ + REGISTER_TYPE( VRoWaterMode ) \ REGISTER_TYPE( VCloudSync ) \ REGISTER_TYPE( VHDUsageInfo ) \ REGISTER_TYPE( VAdjustmentInstitutionalRecord ) \ @@ -168,14 +169,15 @@ REGISTER_TYPE( VTreatmentRanges ) \ REGISTER_TYPE( VTreatmentSaline ) \ REGISTER_TYPE( VTreatmentHeparin ) \ + REGISTER_TYPE( VTreatmentDryBicartDisconnect ) \ /* End-Treatment */ \ REGISTER_TYPE( VTreatmentRinseback ) \ REGISTER_TYPE( VTreatmentRecirculate ) \ REGISTER_TYPE( VTreatmentBloodPrime ) \ REGISTER_TYPE( VTreatmentStop ) \ /* Device - Data */ \ REGISTER_TYPE( VHDAccelerometer ) \ - REGISTER_TYPE( VHDSyringePump ) \ + REGISTER_TYPE( VTDSyringePump ) \ REGISTER_TYPE( VHDBloodLeak ) \ REGISTER_TYPE( VTDAirBubble ) \ REGISTER_TYPE( VTDAirPump ) \ @@ -252,6 +254,11 @@ REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFState ) \ REGISTER_TYPE( VTreatmentAdjustmentSetPoints ) \ REGISTER_TYPE( VTreatmentAdjustmentVitalsAlarmLimits ) \ + REGISTER_TYPE( VTreatmentHDF ) \ + REGISTER_TYPE( VTreatmentAdjustmentAutoSub ) \ + REGISTER_TYPE( VTreatmentAdjustmentHDFState ) \ + REGISTER_TYPE( VTreatmentAdjustmentHDF ) \ + REGISTER_TYPE( VTreatmentAdjustmentDryBicartDisconnect ) \ REGISTER_TYPE( VTreatmentCreate ) \ REGISTER_TYPE( VTreatmentIsolatedUF ) \ REGISTER_TYPE( VTreatmentTrends ) \ Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp =================================================================== diff -u -rabe8e7cfe31d4ac42a9d85f8e5d93fa809025ea9 -r4c32cadadd4c8abdee1eab4ef6425f356f863547 --- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision abe8e7cfe31d4ac42a9d85f8e5d93fa809025ea9) +++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision 4c32cadadd4c8abdee1eab4ef6425f356f863547) @@ -57,12 +57,21 @@ void VTDTreatmentStates::onActionReceive(const TreatmentStatesData &vData) { subMode ( vData.mSubMode ); - ufState ( vData.mIsolatedUFState ); + isoUfState ( vData.mIsolatedUFState ); salineState ( vData.mSalineState ); - salineState ( vData.mSalineState ); + // Isolated Ultrafiltration states + bool mIsoUf = vData.mSubMode == GuiTreatmentStates ::TREATMENT_ISO_UF_STATE ; + if ( mIsoUf ) { + ENUM_CHECK_O( GuiIsoUfState, vData.mIsolatedUFState ) { + ENUM_CHECK ( GuiIsoUfState, ISOALTED_UF_RUNNING_STATE ) + ENUM_CHECK ( GuiIsoUfState, ISOLATED_UF_PAUSE_STATE ) + ENUM_CHECK_C( GuiIsoUfState, NUM_OF_ISOLATED_UF_STATES ) } + ENUM_READ ( GuiIsoUfState, ISOALTED_UF_RUNNING_STATE , isoUfRunning ); + ENUM_READ ( GuiIsoUfState, ISOLATED_UF_PAUSE_STATE , isoUfPaused ); + } + txIsolatedUF ( mIsoUf ); // it's the main dialysis event so moved last to have all the sub-dialysis-states updated prior to. - // Ultrafiltration states // Saline Bolus states ENUM_CHECK_O( GuiSalineStates, vData.mSalineState ) {