Index: leahi.pro =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r54c96a3275592c881e0fcd0cdfba65e8b1a78677 --- leahi.pro (.../leahi.pro) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ leahi.pro (.../leahi.pro) (revision 54c96a3275592c881e0fcd0cdfba65e8b1a78677) @@ -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 \ @@ -183,6 +185,9 @@ 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/MTreatmentAdjustPressuresWideningResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \ @@ -196,8 +201,10 @@ 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/MTreatmentIsolatedUFData.h \ sources/model/td/data/treatment/MTreatmentParametersSetPointData.h \ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h \ @@ -268,6 +275,10 @@ 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/VTreatmentAdjustmentPressuresWidening.h \ sources/view/td/data/VTDAirBubbleData.h \ sources/view/td/data/VTDAirPumpData.h \ @@ -281,10 +292,13 @@ sources/view/td/data/VTDVoltageData.h \ sources/view/td/data/VTreatmentRanges.h \ sources/view/td/data/VWaterSampleData.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/VTreatmentIsolatedUFData.h \ sources/view/td/data/treatment/VTreatmentParametersSetPointData.h \ sources/view/td/data/treatment/VTreatmentPressureOcclusion.h \ @@ -363,7 +377,6 @@ 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 \ @@ -477,7 +490,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 \ @@ -555,6 +567,9 @@ 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/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 \ @@ -567,8 +582,10 @@ sources/model/td/data/MTDValvesData.cpp \ sources/model/td/data/MTDVoltageData.cpp \ sources/model/td/data/MWaterSampleData.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/MTreatmentIsolatedUFData.cpp \ sources/model/td/data/treatment/MTreatmentParametersSetPointData.cpp \ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.cpp \ @@ -659,7 +676,6 @@ 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 \ @@ -744,6 +760,10 @@ 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/VTreatmentAdjustmentPressuresWidening.cpp \ sources/view/td/data/VTDAirBubbleData.cpp \ sources/view/td/data/VTDAirPumpData.cpp \ @@ -757,10 +777,13 @@ sources/view/td/data/VTDVoltageData.cpp \ sources/view/td/data/VTreatmentRanges.cpp \ sources/view/td/data/VWaterSampleData.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/VTreatmentIsolatedUFData.cpp \ sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp \ sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp \ @@ -838,7 +861,6 @@ \ # ---------- 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 \ Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r8fa5a167170e6b1c77551e8583e5ec3dcb8f45b0 -r54c96a3275592c881e0fcd0cdfba65e8b1a78677 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 8fa5a167170e6b1c77551e8583e5ec3dcb8f45b0) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 54c96a3275592c881e0fcd0cdfba65e8b1a78677) @@ -480,7 +480,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(); @@ -989,15 +989,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 Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r54c96a3275592c881e0fcd0cdfba65e8b1a78677 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 54c96a3275592c881e0fcd0cdfba65e8b1a78677) @@ -80,8 +80,8 @@ {Gui::GuiActionType::ID_Ultrafiltration , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_IsolatedUF , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_Heparin , 3 * 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 @@ -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 @@ -278,6 +278,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/canbus/MessageInterpreter.cpp =================================================================== diff -u -r8fa5a167170e6b1c77551e8583e5ec3dcb8f45b0 -r54c96a3275592c881e0fcd0cdfba65e8b1a78677 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 8fa5a167170e6b1c77551e8583e5ec3dcb8f45b0) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 54c96a3275592c881e0fcd0cdfba65e8b1a78677) @@ -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 @@ -289,7 +290,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; @@ -590,7 +591,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; @@ -642,9 +643,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; @@ -667,6 +665,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 -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r54c96a3275592c881e0fcd0cdfba65e8b1a78677 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 54c96a3275592c881e0fcd0cdfba65e8b1a78677) @@ -57,6 +57,7 @@ #include "VInstitutionalRecord.h" #include "VAdjustmentAdvancedInstitutionalRecord.h" #include "VAdvancedInstitutionalRecord.h" +#include "VCalibrationSettings.h" // states data #include "VTDOpModeData.h" #include "VPreTreatmentStatesData.h" @@ -106,6 +107,7 @@ #include "VTDTemperatureData.h" #include "VTreatmentTrends.h" #include "VWaterSampleData.h" +#include "VTreatmentHDFData.h" // DG data #include "VDGDrainPumpData.h" #include "VDDHeatersData.h" @@ -161,6 +163,9 @@ #include "VTreatmentAdjustmentIsolatedUFVolumeEdit.h" #include "VTreatmentAdjustmentSetPoints.h" #include "VTreatmentAdjustmentVitalsAlarmLimits.h" +#include "VTreatmentAdjustmentAutoSub.h" +#include "VTreatmentAdjustmentHDFState.h" +#include "VTreatmentAdjustmentHDF.h" // ----- Post-Treatment Adjustments #include "VPostTreatmentAdjustPatientDisconnectionConfirm.h" #include "VPostTreatmentAdjustDisposablesRemovalConfirm.h" Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r54c96a3275592c881e0fcd0cdfba65e8b1a78677 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 54c96a3275592c881e0fcd0cdfba65e8b1a78677) @@ -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 @@ -302,6 +302,18 @@ ID_AdjustIsolatedUFConfirmReq = 0x9F00, // 159 //// ----- @LEAHIZED ID_AdjustIsolatedUFConfirmRsp = 0xA000, // 160 //// ----- @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 Index: sources/gui/qml/main.qml =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r54c96a3275592c881e0fcd0cdfba65e8b1a78677 --- sources/gui/qml/main.qml (.../main.qml) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/gui/qml/main.qml (.../main.qml) (revision 54c96a3275592c881e0fcd0cdfba65e8b1a78677) @@ -59,6 +59,7 @@ import VCloudSync 0.1 import VHDUsageInfo 0.1 import VInstitutionalRecord 0.1 +import VCalibrationSettings 0.1 import VAdjustmentInstitutionalRecord 0.1 import VAdvancedInstitutionalRecord 0.1 import VAdjustmentAdvancedInstitutionalRecord 0.1 @@ -87,6 +88,7 @@ import VTreatmentRanges 0.1 import VTreatmentHeparin 0.1 import VTreatmentTrends 0.1 +import VTreatmentHDF 0.1 // Pre-Treatment import VPreTreatmentAdjustmentInitTreatment 0.1 @@ -154,6 +156,9 @@ import VTreatmentAdjustmentRinseback 0.1 import VTreatmentAdjustmentRecirculate 0.1 import VTreatmentAdjustmentEnd 0.1 +import VTreatmentAdjustmentAutoSub 0.1 +import VTreatmentAdjustmentHDFState 0.1 +import VTreatmentAdjustmentHDF 0.1 // Post-Treatmnt import VPostTreatmentAdjustmentPatientDisconnectionConfirm 0.1 import VPostTreatmentAdjustmentDisposablesRemovalConfirm 0.1 @@ -205,6 +210,8 @@ VInstitutionalRecord { id: vInstitutionalRecord } VAdjustmentAdvancedInstitutionalRecord { id: vAdjustmentAdvancedInstitutionalRecord } VAdvancedInstitutionalRecord { id: vAdvancedInstitutionalRecord } + VCalibrationSettings { id: vCalibrationSettings } + //VAdjustIn // ---- States VTDOpMode { id: vTDOpMode @@ -260,6 +267,7 @@ VTreatmentRecirculate { id: vTreatmentRecirculate } VTreatmentStop { id: vTreatmentStop } VTreatmentHeparin { id: vTreatmentHeparin } + VTreatmentHDF { id: vTreatmentHDF } // ---- DD VDGDrainPump { id: vDGDrainPump } @@ -332,6 +340,9 @@ VTreatmentAdjustmentRinseback { id: vTreatmentAdjustmentRinseback } VTreatmentAdjustmentRecirculate { id: vTreatmentAdjustmentRecirculate } VTreatmentAdjustmentEnd { id: vTreatmentAdjustmentEnd } + VTreatmentAdjustmentAutoSub { id: vTreatmentAdjustmentAutoSub } + VTreatmentAdjustmentHDFState { id: vTreatmentAdjustmentHDFState } + VTreatmentAdjustmentHDF { id: vTreatmentAdjustmentHDF } // --- Post Treatment VPostTreatmentAdjustmentPatientDisconnectionConfirm { id: vPostTreatmentAdjustmentPatientDisconnectionConfirm } Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r7bde5ac0646170a584dd5410fcf89fd9bc8b251c -r54c96a3275592c881e0fcd0cdfba65e8b1a78677 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 54c96a3275592c881e0fcd0cdfba65e8b1a78677) @@ -74,6 +74,7 @@ readonly property bool visibleAdvancedInstitutional : loggedIn readonly property bool visibleLocalization : loggedIn readonly property bool visibleAdvancedModes : loggedIn + readonly property bool visibleCalibrationSettings : loggedIn readonly property string settingsTitle : _GuiView.manufactSetup ? qsTr("Manufacturing Setup") : _GuiView.updateSetup ? qsTr("Software Update") : qsTr("Device Settings") @@ -100,6 +101,7 @@ AdvancedInstitutional , FeatureConfigurations , AdvancedMode , + CalibrationSettings , Home } property var itemsText : [ @@ -124,6 +126,7 @@ qsTr("Advanced Institutional Settings" ), // AdvancedInstitutional qsTr("Feature Configurations" ), // FeatureConfigurations qsTr("Advanced Mode" ), // Advanced Modes + qsTr("Calibration Settings" ), // Calibration Settings settingsTitle , // settings home ] @@ -149,6 +152,7 @@ visibleAdvancedInstitutional , // AdvancedInstitutional visibleFeatureConfigurations , // FeatureConfigurations visibleAdvancedModes , // Advanced Modes + visibleCalibrationSettings , // Calibration Settings false , // leave last and false align with settings home ] @@ -260,6 +264,10 @@ push( _settingAdvancedMode ) break + case SettingsStack.CalibrationSettings: + push( _settingCalibrationSettings ) + break + default: console.debug("Unknown Index", vIndex) break @@ -286,6 +294,7 @@ SettingsLocalization { id: _settingLocalization } SettingsFeatureConfigurations { id: _settingsFeatureConfigurations} SettingsAdvancedMode { id: _settingAdvancedMode } + SettingsCalibrationSettings { id: _settingCalibrationSettings } function gotoServiceMode( vservice ) { //DEBUG console.log (" 0 ---------- ", _GuiView.manufactMode, _GuiView.manufactSetup, vservice, stackView.initialItem, stackView.currentItem, stackView.depth) Index: sources/model/MModel.h =================================================================== diff -u -r8fa5a167170e6b1c77551e8583e5ec3dcb8f45b0 -r54c96a3275592c881e0fcd0cdfba65e8b1a78677 --- sources/model/MModel.h (.../MModel.h) (revision 8fa5a167170e6b1c77551e8583e5ec3dcb8f45b0) +++ sources/model/MModel.h (.../MModel.h) (revision 54c96a3275592c881e0fcd0cdfba65e8b1a78677) @@ -27,7 +27,7 @@ #include "MAlarmTriggered.h" #include "MAlarmCleared.h" #include "MAlarmActiveList.h" -#include "MAdjustHDAlarmVolumeResponse.h" +#include "MAdjustTDAlarmVolumeResponse.h" #include "MDuetConfirmTDi.h" // POST @@ -97,7 +97,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" @@ -318,9 +319,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 ) \ @@ -500,7 +502,7 @@ REGISTER_METATYPE( AdjustServiceDatesRequestData ) \ REGISTER_METATYPE( AdjustTDDateTimeRequestData ) \ REGISTER_METATYPE( AdjustDDDateTimeRequestData ) \ - REGISTER_METATYPE( AdjustHDAlarmVolumeRequestData ) \ + REGISTER_METATYPE( AdjustTDAlarmVolumeRequestData ) \ \ /* Response */ \ /* Post-Treatment */ \ @@ -562,7 +564,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 ) \ @@ -594,8 +596,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 ) \ @@ -743,7 +745,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 ) \ @@ -755,7 +757,8 @@ /* 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 ) \ \ @@ -792,7 +795,7 @@ 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 ) \ @@ -849,8 +852,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 ) \ @@ -999,7 +1002,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 ) \ @@ -1012,7 +1015,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 */ \ @@ -1070,7 +1074,7 @@ 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 ) \ @@ -1089,7 +1093,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 */ \ @@ -1147,7 +1152,7 @@ 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 ) \ @@ -1166,7 +1171,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 */ \ @@ -1224,7 +1230,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 ) \ @@ -1243,8 +1249,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 ) \ @@ -1394,7 +1400,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/view/VView.h =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r54c96a3275592c881e0fcd0cdfba65e8b1a78677 --- sources/view/VView.h (.../VView.h) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/view/VView.h (.../VView.h) (revision 54c96a3275592c881e0fcd0cdfba65e8b1a78677) @@ -147,6 +147,7 @@ REGISTER_TYPE( VInstitutionalRecord ) \ REGISTER_TYPE( VAdjustmentAdvancedInstitutionalRecord ) \ REGISTER_TYPE( VAdvancedInstitutionalRecord ) \ + REGISTER_TYPE( VCalibrationSettings ) \ /* Alarm */ \ REGISTER_TYPE( VAlarmStatus ) \ REGISTER_TYPE( VAlarmActiveList ) \ @@ -251,6 +252,10 @@ REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFVolumeEdit ) \ REGISTER_TYPE( VTreatmentAdjustmentSetPoints ) \ REGISTER_TYPE( VTreatmentAdjustmentVitalsAlarmLimits ) \ + REGISTER_TYPE( VTreatmentHDF ) \ + REGISTER_TYPE( VTreatmentAdjustmentAutoSub ) \ + REGISTER_TYPE( VTreatmentAdjustmentHDFState ) \ + REGISTER_TYPE( VTreatmentAdjustmentHDF ) \ REGISTER_TYPE( VTreatmentCreate ) \ REGISTER_TYPE( VTreatmentIsolatedUF ) \ REGISTER_TYPE( VTreatmentTrends ) \