Index: leahi.pro
===================================================================
diff -u -radf593e5ad91c1e689564298bf8d411d7847b158 -rc4a72b20ccc74172b5c5cc6f440f53dc5693908f
--- leahi.pro (.../leahi.pro) (revision adf593e5ad91c1e689564298bf8d411d7847b158)
+++ leahi.pro (.../leahi.pro) (revision c4a72b20ccc74172b5c5cc6f440f53dc5693908f)
@@ -182,6 +182,11 @@
sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h \
sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.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/MTreatmentAdjustIsolatedUFStateResponse.h \
+ sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.h \
sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.h \
sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.h \
sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \
@@ -198,6 +203,8 @@
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 \
@@ -220,6 +227,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 \
@@ -266,7 +274,11 @@
sources/view/fp/data/VFPTemperatureData.h \
sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \
sources/view/settings/VAdvancedInstitutionalRecord.h \
- sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.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/data/VTDAirBubbleData.h \
sources/view/td/data/VTDAirPumpData.h \
sources/view/td/data/VTDAirTrapData.h \
@@ -279,12 +291,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 \
@@ -305,6 +320,8 @@
sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.h \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.h \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFConfirm.h \
+ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFState.h \
+ sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.h \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.h \
@@ -395,7 +412,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 \
@@ -488,7 +504,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 \
@@ -555,6 +570,11 @@
sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.cpp \
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/MTreatmentAdjustAutoSubResponse.cpp \
+ sources/model/td/adjustment/treatment/MTreatmentAdjustHDFResponse.cpp \
+ sources/model/td/adjustment/treatment/MTreatmentAdjustHDFStateResponse.cpp \
+ sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.cpp \
sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.cpp \
sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.cpp \
sources/model/td/data/MTDAirBubbleData.cpp \
@@ -567,9 +587,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 \
@@ -697,7 +720,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 \
@@ -744,7 +766,11 @@
\ # ---------- Views - TD - States Data
sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \
sources/view/settings/VAdvancedInstitutionalRecord.cpp \
- sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.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/data/VTDAirBubbleData.cpp \
sources/view/td/data/VTDAirPumpData.cpp \
sources/view/td/data/VTDAirTrapData.cpp \
@@ -757,12 +783,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/VTreatmentHDFData.cpp \
+ sources/view/td/data/treatment/VTreatmentDryBicartDisconnect.cpp \
sources/view/td/data/treatment/VTreatmentIsolatedUFData.cpp \
sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp \
sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp \
@@ -783,6 +812,8 @@
sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.cpp \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.cpp \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFConfirm.cpp \
+ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFState.cpp \
+ sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.cpp \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp \
@@ -844,7 +875,6 @@
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 -r456da384df52c20ce45b2bec4317806ee11af1f6 -rc4a72b20ccc74172b5c5cc6f440f53dc5693908f
--- leahi.qrc (.../leahi.qrc) (revision 456da384df52c20ce45b2bec4317806ee11af1f6)
+++ leahi.qrc (.../leahi.qrc) (revision c4a72b20ccc74172b5c5cc6f440f53dc5693908f)
@@ -30,6 +30,7 @@
sources/gui/qml/pages/settings/SettingsAdvancedMode.qml
sources/gui/qml/pages/settings/SettingsFeatureConfigurations.qml
sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml
+ sources/gui/qml/pages/settings/SettingsCalibrationSettings.qml
sources/gui/qml/dialogs/ConfirmDialog.qml
@@ -45,6 +46,8 @@
sources/gui/qml/dialogs/AlarmDialog.qml
sources/gui/qml/dialogs/DryDemoDialog.qml
sources/gui/qml/dialogs/ConfirmPasswordDialog.qml
+ sources/gui/qml/dialogs/CalibrationDialog.qml
+ sources/gui/qml/dialogs/DryBicartDisconnectDialog.qml
sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml
@@ -213,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
@@ -234,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
@@ -339,6 +344,7 @@
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentHDF.qml
+ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentEndIsolatedUF.qml
sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml
Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -radf593e5ad91c1e689564298bf8d411d7847b158 -rc4a72b20ccc74172b5c5cc6f440f53dc5693908f
--- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision adf593e5ad91c1e689564298bf8d411d7847b158)
+++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision c4a72b20ccc74172b5c5cc6f440f53dc5693908f)
@@ -78,10 +78,10 @@
{Gui::GuiActionType::ID_Saline , 4 * 4 }, // 4 parameters each 4bytes
{Gui::GuiActionType::ID_Vitals , 3 * 4 }, // 3 parameters each 4bytes
{Gui::GuiActionType::ID_Ultrafiltration , 4 * 4 }, // 4 parameters each 4bytes
- {Gui::GuiActionType::ID_IsolatedUF , 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_Rinseback , 6 * 4 }, // 6 parameters each 4bytes
- {Gui::GuiActionType::ID_Recirculate , 2 * 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
{Gui::GuiActionType::ID_TreatmentStop , 2 * 4 }, // 2 parameters each 4bytes
{Gui::GuiActionType::ID_TDAirBubbleData , 2 * 4 }, // 2 parameters 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
@@ -192,6 +192,10 @@
{Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp , 2 * 4 }, // 2 parameter each 4bytes
// ----
+ {Gui::GuiActionType::ID_AdjustIsoUFStateReq , 1 * 4 }, // 1 parameter each 4bytes
+ {Gui::GuiActionType::ID_AdjustIsoUFStateRsp , 2 * 4 }, // 2 parameter each 4bytes
+
+ // ----
{Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq , 1 * 4 }, // 1 parameter each 4bytes
{Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp , 4 * 4 }, // 4 parameters each 4bytes
@@ -270,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
@@ -278,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
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -radf593e5ad91c1e689564298bf8d411d7847b158 -rc4a72b20ccc74172b5c5cc6f440f53dc5693908f
--- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision adf593e5ad91c1e689564298bf8d411d7847b158)
+++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision c4a72b20ccc74172b5c5cc6f440f53dc5693908f)
@@ -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
@@ -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
@@ -302,6 +306,21 @@
ID_AdjustIsolatedUFConfirmReq = 0x9F00, // 159 //// ----- @LEAHIZED
ID_AdjustIsolatedUFConfirmRsp = 0xA000, // 160 //// ----- @LEAHIZED
+ 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
@@ -345,9 +364,10 @@
// 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_DuetRoWaterModeUIi = 0xBC0F, // 188 UI -> DG // UI initiates Mode Set || responses to status query
+ ID_DuetRoWaterModeDGr = 0xC40F, // 196 //// ----- @CRAPIZED: had to change to avoid duplication
+
// Institutional record request and response
ID_InstitutionalRecordReq = 0x8200, // 130 UI -> TD request institutional record
ID_InstitutionalRecordRsp = 0x8300, // 131 TD -> UI response institutional record
@@ -482,6 +502,9 @@
// Ultrafiltration
typedef GuiActions::UF_Commands GuiUFCommands;
typedef GuiActions::UF_Adjustments GuiUFAdjustment;
+ // Isolated UF
+ typedef GuiActions::ISO_UF_Commands GuiIsoUFCommands;
+ typedef GuiActions::Isolated_UF_States GuiIsoUfState;
// Saline
typedef GuiActions::Fluid_Bolus_States GuiSalineStates;
typedef GuiActions::Fluid_Bolus_Commands GuiSalineCommands;
Index: sources/view/VTreatmentCreate.h
===================================================================
diff -u -r456da384df52c20ce45b2bec4317806ee11af1f6 -rc4a72b20ccc74172b5c5cc6f440f53dc5693908f
--- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 456da384df52c20ce45b2bec4317806ee11af1f6)
+++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision c4a72b20ccc74172b5c5cc6f440f53dc5693908f)
@@ -76,7 +76,7 @@
QString _tdSerialNumber = "";
VALUESET(quint32 , treatmentModality , 0)
- VALUESET(quint32 , hdfTreatmentMode , 0)
+ VALUESET(quint32 , hdfTreatmentMode , 1) // Default - Post Dilution
VALUESET(quint32 , bloodFlowRate , 0)
VALUESET(quint32 , dialysateFlowRate , 0)
VALUESET(quint32 , treatmentDuration , 0)