Index: etc/reports/alarms/AlarmMapping.csv =================================================================== diff -u -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba -rf835b04c0a82a4ebf58f94b817f7961b2e824c35 --- etc/reports/alarms/AlarmMapping.csv (.../AlarmMapping.csv) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) +++ etc/reports/alarms/AlarmMapping.csv (.../AlarmMapping.csv) (revision f835b04c0a82a4ebf58f94b817f7961b2e824c35) @@ -254,19 +254,19 @@ 253,"FW reserved for use." 254,"FW reserved for use." 255,"FW reserved for use." - 256,"TD invalid tubing set." - 257,"TD install new blood tubing set." - 258,"TD no tubing set detected." - 259,"TD tubing set authentication timeout." - 260,"TD pressure too high to zero." - 261,"TD venous pressurization timeout." - 262,"TD venous pressure decay failure." - 263,"TD venous pressure leak." - 264,"TD venous pressure relief failure." - 265,"TD arterial pressurization timeout." - 266,"TD arterial pressure decay failure." - 267,"TD arterial pressure leak." - 268,"TD arterial pressure relief failure." + 256,"FW reserved for use." + 257,"FW reserved for use." + 258,"FW reserved for use." + 259,"FW reserved for use." + 260,"FW reserved for use." + 261,"FW reserved for use." + 262,"FW reserved for use." + 263,"FW reserved for use." + 264,"FW reserved for use." + 265,"FW reserved for use." + 266,"FW reserved for use." + 267,"FW reserved for use." + 268,"FW reserved for use." 269,"FW reserved for use." 270,"FW reserved for use." 271,"FW reserved for use." Index: etc/reports/alarms/AlarmMapping.py =================================================================== diff -u -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba -rf835b04c0a82a4ebf58f94b817f7961b2e824c35 --- etc/reports/alarms/AlarmMapping.py (.../AlarmMapping.py) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) +++ etc/reports/alarms/AlarmMapping.py (.../AlarmMapping.py) (revision f835b04c0a82a4ebf58f94b817f7961b2e824c35) @@ -255,19 +255,19 @@ 253 : "FW reserved for use." 254 : "FW reserved for use." 255 : "FW reserved for use." - 256 : "TD invalid tubing set." - 257 : "TD install new blood tubing set." - 258 : "TD no tubing set detected." - 259 : "TD tubing set authentication timeout." - 260 : "TD pressure too high to zero." - 261 : "TD venous pressurization timeout." - 262 : "TD venous pressure decay failure." - 263 : "TD venous pressure leak." - 264 : "TD venous pressure relief failure." - 265 : "TD arterial pressurization timeout." - 266 : "TD arterial pressure decay failure." - 267 : "TD arterial pressure leak." - 268 : "TD arterial pressure relief failure." + 256 : "FW reserved for use." + 257 : "FW reserved for use." + 258 : "FW reserved for use." + 259 : "FW reserved for use." + 260 : "FW reserved for use." + 261 : "FW reserved for use." + 262 : "FW reserved for use." + 263 : "FW reserved for use." + 264 : "FW reserved for use." + 265 : "FW reserved for use." + 266 : "FW reserved for use." + 267 : "FW reserved for use." + 268 : "FW reserved for use." 269 : "FW reserved for use." 270 : "FW reserved for use." 271 : "FW reserved for use." Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba -rf835b04c0a82a4ebf58f94b817f7961b2e824c35 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision f835b04c0a82a4ebf58f94b817f7961b2e824c35) @@ -92,7 +92,7 @@ {Gui::GuiActionType::ID_TDOpModeData , 2 * 4 }, // 2 parameter 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 + {Gui::GuiActionType::ID_PostTreatmentStates , 1 * 4 }, // 1 parameter each 4bytes // DG Data Messages {Gui::GuiActionType::ID_DGROPumpData , 6 * 4 }, // 6 parameters each 4bytes Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba -rf835b04c0a82a4ebf58f94b817f7961b2e824c35 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision f835b04c0a82a4ebf58f94b817f7961b2e824c35) @@ -123,7 +123,7 @@ ID_TDOpModeData = 0x1200, // 18 //// ----- @LEAHIZED ID_PreTreatmentStates = 0xB700, // 183 //// ----- @LEAHIZED ID_TreatmentStates = 0x3C00, // 60 //// ----- @LEAHIZED - ID_PostTreatmentStates = 0x770F, // 119 //// ----- @CRAPIZED: had to change to avoid duplication + ID_PostTreatmentStates = 0xDA00, // 218 //// ----- @LEAHIZED // ----- ID_PowerOffWarning = 0x2200, // 34 //// ----- @LEAHIZED @@ -466,7 +466,7 @@ #include "DDDefs.h" Q_ENUM(DD_Op_Modes) - Q_ENUM(DD_Disinfect_States) + Q_ENUM(Disinfect_Selection) Q_ENUM(DD_Heat_UI_States) Q_ENUM(DD_Valves) @@ -544,7 +544,7 @@ typedef GuiActions::TD_Post_Treatment_Mode_States GuiPostTreatmentStates; // Disinfection Heat States - typedef GuiActions::DD_Disinfect_States GuiDisinfectDGStates; + typedef GuiActions::Disinfect_Selection GuiDisinfectDDSelection; typedef GuiActions::DD_Heat_UI_States GuiDisinfectDGHeatStates; // DD Valves Index: sources/gui/qml/pages/posttreatment/PostTreatmentDisinfection.qml =================================================================== diff -u -r555ee09fefaaeff952a24b735f1e40e67ada7cec -rf835b04c0a82a4ebf58f94b817f7961b2e824c35 --- sources/gui/qml/pages/posttreatment/PostTreatmentDisinfection.qml (.../PostTreatmentDisinfection.qml) (revision 555ee09fefaaeff952a24b735f1e40e67ada7cec) +++ sources/gui/qml/pages/posttreatment/PostTreatmentDisinfection.qml (.../PostTreatmentDisinfection.qml) (revision f835b04c0a82a4ebf58f94b817f7961b2e824c35) @@ -11,7 +11,12 @@ PostTreatmentBase { id: _root - signal itemClicked(int vIndex) + enum Disinfect { + Rinse , + Heat , + HeatCitric , + SubstitutionPort + } Row { id: _row anchors.fill : parent @@ -45,7 +50,6 @@ topMargin : Variables.defaultMargin * 2 } alignCenter : false - onItemClicked : _root.itemClicked(vIndex) rowCount : itemsText.count ?? 0 colCount : 1 itemWidth : _root.width / 2.5 @@ -62,6 +66,23 @@ qsTr("Heat Disinfect") , qsTr("Citric Acid Heat Disinfect") , qsTr("Substitution Port Disinfect") ] + + onItemClicked: { + switch ( vIndex ) { + case PostTreatmentDisinfection.Rinse: + vDisinfectAdjustDisinfect.doFlush() + break + case PostTreatmentDisinfection.Heat: + vDisinfectAdjustDisinfect.doHeat() + break + case PostTreatmentDisinfection.HeatCitric: + vDisinfectAdjustDisinfect.doHeatCitric() + break + case PostTreatmentDisinfection.SubstitutionPort: + vDisinfectAdjustDisinfect.doSubstitutionPort() + break + } + } } } Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml =================================================================== diff -u -r20765b9c0e05cd7c3b0a3320606eecc1d4fdfc91 -rf835b04c0a82a4ebf58f94b817f7961b2e824c35 --- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 20765b9c0e05cd7c3b0a3320606eecc1d4fdfc91) +++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision f835b04c0a82a4ebf58f94b817f7961b2e824c35) @@ -74,7 +74,7 @@ setPage( _postTreatmentDisinfection ) break case PostTreatmentStack.Disinfection: - // Skip button - go back to standby -- Finish Treatment + vDisinfectAdjustDisinfect.doSkip() break default: break @@ -176,10 +176,10 @@ // connections Connections { target: vPostTreatmentStates - function onDrainReservoirsChanged ( vValue ) { console.debug("drainReservoirs ", vValue )} - function onPatientDisconnectionChanged ( vValue ) { console.debug("patientDisconnection", vValue )} - function onDisposableRemovalChanged ( vValue ) { console.debug("disposableRemoval ", vValue )} - function onVerifyChanged ( vValue ) { console.debug("verify ", vValue )} + function onPatientDisconnectionChanged ( vValue ) { console.debug("patientDisconnection ", vValue )} + function onAutoEjectChanged ( vValue ) { console.debug("autoEject ", vValue )} + function onDisposableRemovalChanged ( vValue ) { console.debug("disposableRemoval ", vValue )} + function onDisinfectionChanged ( vValue ) { console.debug("disinfection ", vValue )} } Connections { target: vTDOpMode @@ -214,4 +214,15 @@ } } } + + // Disinfect + Connections { target: vDisinfectAdjustDisinfect + function onAdjustmentTriggered ( vValue ) { + if ( vDisinfectAdjustDisinfect.adjustment_Accepted ) { + _postTreatmentDisinfection.reasonText = "" + } else { + _postTreatmentDisinfection.reasonText = vDisinfectAdjustDisinfect.text() + } + } + } } Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h =================================================================== diff -u -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba -rf835b04c0a82a4ebf58f94b817f7961b2e824c35 --- sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h (.../MDisinfectAdjustStartRequests.h) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) +++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h (.../MDisinfectAdjustStartRequests.h) (revision f835b04c0a82a4ebf58f94b817f7961b2e824c35) @@ -49,7 +49,7 @@ */ class MAdjustDisinfectStartReq : public MModel { public: - GuiDisinfectDGStates mState = GuiDisinfectDGStates::DD_DISINFECT_NOT_RUNNING_STATE; + GuiDisinfectDGStates mState = GuiDisinfectDDSelection::DISINFECT_SEL_SKIP; static QString toString(const QVariantList &vParameters) { return MModel::toString("DisinfectStart", vParameters); } Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba -rf835b04c0a82a4ebf58f94b817f7961b2e824c35 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision f835b04c0a82a4ebf58f94b817f7961b2e824c35) @@ -289,19 +289,19 @@ /*0253*/case GuiAlarmID::ALARM_ID_FW_RESERVED_253 : { result = QObject::tr("FW reserved for use." ); break; } /* 253*/ /*0254*/case GuiAlarmID::ALARM_ID_FW_RESERVED_254 : { result = QObject::tr("FW reserved for use." ); break; } /* 254*/ /*0255*/case GuiAlarmID::ALARM_ID_FW_RESERVED_255 : { result = QObject::tr("FW reserved for use." ); break; } /* 255*/ -/*0256*/case GuiAlarmID::ALARM_ID_TD_INVALID_TUBING_SET : { result = QObject::tr("TD invalid tubing set." ); break; } /* 256*/ -/*0257*/case GuiAlarmID::ALARM_ID_TD_INSTALL_NEW_BLOOD_TUBING_SET : { result = QObject::tr("TD install new blood tubing set." ); break; } /* 257*/ -/*0258*/case GuiAlarmID::ALARM_ID_TD_TUBING_SET_NOT_DETECTED : { result = QObject::tr("TD no tubing set detected." ); break; } /* 258*/ -/*0259*/case GuiAlarmID::ALARM_ID_TD_TUBING_SET_AUTHENTICATION_TIMEOUT : { result = QObject::tr("TD tubing set authentication timeout." ); break; } /* 259*/ -/*0260*/case GuiAlarmID::ALARM_ID_TD_PRESSURE_TOO_HIGH_TO_ZERO : { result = QObject::tr("TD pressure too high to zero." ); break; } /* 260*/ -/*0261*/case GuiAlarmID::ALARM_ID_TD_VENOUS_PRESSURIZATION_TIMEOUT : { result = QObject::tr("TD venous pressurization timeout." ); break; } /* 261*/ -/*0262*/case GuiAlarmID::ALARM_ID_TD_VENOUS_PRESSURE_DECAY : { result = QObject::tr("TD venous pressure decay failure." ); break; } /* 262*/ -/*0263*/case GuiAlarmID::ALARM_ID_TD_VENOUS_PRESSURE_LEAK : { result = QObject::tr("TD venous pressure leak." ); break; } /* 263*/ -/*0264*/case GuiAlarmID::ALARM_ID_TD_VENOUS_PRESSURE_RELIEF : { result = QObject::tr("TD venous pressure relief failure." ); break; } /* 264*/ -/*0265*/case GuiAlarmID::ALARM_ID_TD_ARTERIAL_PRESSURIZATION_TIMEOUT : { result = QObject::tr("TD arterial pressurization timeout." ); break; } /* 265*/ -/*0266*/case GuiAlarmID::ALARM_ID_TD_ARTERIAL_PRESSURE_DECAY : { result = QObject::tr("TD arterial pressure decay failure." ); break; } /* 266*/ -/*0267*/case GuiAlarmID::ALARM_ID_TD_ARTERIAL_PRESSURE_LEAK : { result = QObject::tr("TD arterial pressure leak." ); break; } /* 267*/ -/*0268*/case GuiAlarmID::ALARM_ID_TD_ARTERIAL_PRESSURE_RELIEF : { result = QObject::tr("TD arterial pressure relief failure." ); break; } /* 268*/ +/*0256*/case GuiAlarmID::ALARM_ID_FW_RESERVED_256 : { result = QObject::tr("FW reserved for use." ); break; } /* 256*/ +/*0257*/case GuiAlarmID::ALARM_ID_FW_RESERVED_257 : { result = QObject::tr("FW reserved for use." ); break; } /* 257*/ +/*0258*/case GuiAlarmID::ALARM_ID_FW_RESERVED_258 : { result = QObject::tr("FW reserved for use." ); break; } /* 258*/ +/*0259*/case GuiAlarmID::ALARM_ID_FW_RESERVED_259 : { result = QObject::tr("FW reserved for use." ); break; } /* 259*/ +/*0260*/case GuiAlarmID::ALARM_ID_FW_RESERVED_260 : { result = QObject::tr("FW reserved for use." ); break; } /* 260*/ +/*0261*/case GuiAlarmID::ALARM_ID_FW_RESERVED_261 : { result = QObject::tr("FW reserved for use." ); break; } /* 261*/ +/*0262*/case GuiAlarmID::ALARM_ID_FW_RESERVED_262 : { result = QObject::tr("FW reserved for use." ); break; } /* 262*/ +/*0263*/case GuiAlarmID::ALARM_ID_FW_RESERVED_263 : { result = QObject::tr("FW reserved for use." ); break; } /* 263*/ +/*0264*/case GuiAlarmID::ALARM_ID_FW_RESERVED_264 : { result = QObject::tr("FW reserved for use." ); break; } /* 264*/ +/*0265*/case GuiAlarmID::ALARM_ID_FW_RESERVED_265 : { result = QObject::tr("FW reserved for use." ); break; } /* 265*/ +/*0266*/case GuiAlarmID::ALARM_ID_FW_RESERVED_266 : { result = QObject::tr("FW reserved for use." ); break; } /* 266*/ +/*0267*/case GuiAlarmID::ALARM_ID_FW_RESERVED_267 : { result = QObject::tr("FW reserved for use." ); break; } /* 267*/ +/*0268*/case GuiAlarmID::ALARM_ID_FW_RESERVED_268 : { result = QObject::tr("FW reserved for use." ); break; } /* 268*/ /*0269*/case GuiAlarmID::ALARM_ID_FW_RESERVED_269 : { result = QObject::tr("FW reserved for use." ); break; } /* 269*/ /*0270*/case GuiAlarmID::ALARM_ID_FW_RESERVED_270 : { result = QObject::tr("FW reserved for use." ); break; } /* 270*/ /*0271*/case GuiAlarmID::ALARM_ID_FW_RESERVED_271 : { result = QObject::tr("FW reserved for use." ); break; } /* 271*/ Index: sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -rf835b04c0a82a4ebf58f94b817f7961b2e824c35 --- sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp (.../MPostTreatmentStatesData.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp (.../MPostTreatmentStatesData.cpp) (revision f835b04c0a82a4ebf58f94b817f7961b2e824c35) @@ -19,14 +19,12 @@ QVariantList MPostTreatmentStates::parameters() const { return { _data.mSubMode .value, - _data.mDrainState .value, }; } bool MPostTreatmentStates::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if ( ! GetValue(vByteArray, index, _data.mSubMode )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDrainState )) goto lError; return true ; @@ -44,6 +42,5 @@ MPostTreatmentStates::Data MPostTreatmentStates::data() const { Data data; data.mSubMode = _data.mSubMode .value; - data.mDrainState = _data.mDrainState .value; return data; } Index: sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -rf835b04c0a82a4ebf58f94b817f7961b2e824c35 --- sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h (.../MPostTreatmentStatesData.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h (.../MPostTreatmentStatesData.h) (revision f835b04c0a82a4ebf58f94b817f7961b2e824c35) @@ -33,12 +33,11 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x7700| 0x040 | 1 Hz | N | HD | All | Post-Treatment States Data | + * |0xDA00| 0x040 | 1 Hz | N | TD | All | Post-Treatment States Data | * * | Payload || * | || * | #1:(U32) | \ref Data::mSubMode | - * | #2:(U32) | \ref Data::mDrainState | * * \sa Data * \sa HD_Post_Treatment_Mode_States @@ -47,7 +46,7 @@ * | || * | || * | typeText | Datum | - * | unitText | HD | + * | unitText | TD | * | infoText | PostTreatmentStates | * */ @@ -60,7 +59,6 @@ struct { Types::U32 mSubMode ; ///< State - HD_Post_Treatment_Mode_States - Types::U32 mDrainState ; ///< State - Drain_States - Post-Treatment drain reservoirs state machine [Not currently being used] } _data; public: Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp =================================================================== diff -u -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba -rf835b04c0a82a4ebf58f94b817f7961b2e824c35 --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision f835b04c0a82a4ebf58f94b817f7961b2e824c35) @@ -49,7 +49,7 @@ */ void View::VDisinfectAdjustDisinfect::doSkip() { - _data.mState = GuiDisinfectDGStates::DD_DISINFECT_FLUSH_STATE; + _data.mState = GuiDisinfectDDSelection::DISINFECT_SEL_SKIP; emit didAdjustment(_data); } @@ -60,7 +60,7 @@ */ void View::VDisinfectAdjustDisinfect::doFlush() { - _data.mState = GuiDisinfectDGStates::DD_DISINFECT_FLUSH_STATE; + _data.mState = GuiDisinfectDDSelection::DISINFECT_SEL_FLUSH; emit didAdjustment(_data); } @@ -70,7 +70,7 @@ */ void View::VDisinfectAdjustDisinfect::doHeat() { - // FIXENUM: _data.mState = GuiDisinfectDGStates::DD_DISINFECT_CHEM_STATE; + _data.mState = GuiDisinfectDDSelection::DISINFECT_SEL_HEAT; emit didAdjustment(_data); } @@ -81,9 +81,8 @@ */ void View::VDisinfectAdjustDisinfect::doHeatCitric() { - // FIXENUM: _data.mState = GuiDisinfectDGStates::DD_DISINFECT_CHEM_FLUSH_STATE; + _data.mState = GuiDisinfectDDSelection::DISINFECT_SEL_HEAT_CITRIC; emit didAdjustment(_data); - } /*! @@ -92,9 +91,8 @@ */ void View::VDisinfectAdjustDisinfect::doSubstitutionPort() { - _data.mState = GuiDisinfectDGStates::DD_DISINFECT_RO_PERMEATE_SAMPLE_STATE; + _data.mState = GuiDisinfectDDSelection::DISINFECT_SEL_SUBSTITUTION_PORT; emit didAdjustment(_data); - } Index: sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp =================================================================== diff -u -ra924fbf2e81c3c61a3e817256bca51f98d2f099c -rf835b04c0a82a4ebf58f94b817f7961b2e824c35 --- sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp (.../VPostTreatmentStatesData.cpp) (revision a924fbf2e81c3c61a3e817256bca51f98d2f099c) +++ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp (.../VPostTreatmentStatesData.cpp) (revision f835b04c0a82a4ebf58f94b817f7961b2e824c35) @@ -27,12 +27,11 @@ void View::VPostTreatmentStates::onActionReceive(const PostTreatmentStatesData &vData) { subMode ( vData.mSubMode ); - drainState ( vData.mDrainState ); -// drainReservoirs ( vData.mSubMode == GuiPostTreatmentStates::TD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE ); patientDisconnection ( vData.mSubMode == GuiPostTreatmentStates::TD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE ); + autoEject ( vData.mSubMode == GuiPostTreatmentStates::TD_POST_TREATMENT_AUTO_EJECT_STATE ); disposableRemoval ( vData.mSubMode == GuiPostTreatmentStates::TD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE ); - verify ( vData.mSubMode == GuiPostTreatmentStates::TD_POST_TREATMENT_VERIFY_STATE ); + disinfection ( vData.mSubMode == GuiPostTreatmentStates::TD_POST_TREATMENT_DISINFECTION_STATE ); // DEBUG: *** Only for test *** // Be careful it is always triggered on each message. Index: sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -rf835b04c0a82a4ebf58f94b817f7961b2e824c35 --- sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h (.../VPostTreatmentStatesData.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h (.../VPostTreatmentStatesData.h) (revision f835b04c0a82a4ebf58f94b817f7961b2e824c35) @@ -40,14 +40,13 @@ // Be careful it is always triggered on each message. TRIGGER ( bool , state , false ) // changes in case any message received. - PROPERTY( quint8 , subMode , 0 ) ///< HD_Post_Treatment_Mode_States - PROPERTY( quint8 , drainState , 0 ) ///< ??? + PROPERTY( quint8 , subMode , 0 ) ///< TD // Start post-treatment mode state - PROPERTY( bool , drainReservoirs , false ) ///< HD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE , Drain reservoirs state - PROPERTY( bool , patientDisconnection , false ) ///< HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE, Patient disconnection state - PROPERTY( bool , disposableRemoval , false ) ///< HD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE , Disposable removal state - PROPERTY( bool , verify , false ) ///< HD_POST_TREATMENT_VERIFY_STATE , Verify cartridge removed, syringe removed, and reservoirs drained state + PROPERTY( bool , patientDisconnection , false ) ///< TD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE + PROPERTY( bool , autoEject , false ) ///< TD_POST_TREATMENT_AUTO_EJECT_STATE + PROPERTY( bool , disposableRemoval , false ) ///< TD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE + PROPERTY( bool , disinfection , false ) ///< TD_POST_TREATMENT_DISINFECTION_STATE VIEW_DEC(VPostTreatmentStates, PostTreatmentStatesData) };