Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rc70815ad2b3beadf61832f2e4d12eb90d476e020 -r490a131c41be4c335a7fbd74ff79b5784fb1726c --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 490a131c41be4c335a7fbd74ff79b5784fb1726c) @@ -329,7 +329,7 @@ ID_AdjustTreatmentLogRsp = 0xAA00, // 167 // Treatment Log Data - ID_TreatmentLogAvrgeData = 0x940F, // 148 //// ----- @CRAPIZED: had to change to avoid duplication + ID_TreatmentLogAvrgeData = 0xAD00, // ID_TreatmentLogAlarmData = 0x6A00, // 106 //// ----- @LEAHIZED ID_TreatmentLogEventData = 0x6B00, // 107 //// ----- @LEAHIZED @@ -406,8 +406,8 @@ Q_ENUM(UF_Adjustments) Q_ENUM(UF_Commands) // Saline - Q_ENUM(Saline_Bolus_States) - Q_ENUM(Saline_Commands) + Q_ENUM(Fluid_Bolus_States) + Q_ENUM(Fluid_Bolus_Commands) // Heparin Q_ENUM(Heparin_States) Q_ENUM(Heparin_Commands) @@ -482,8 +482,8 @@ typedef GuiActions::UF_Commands GuiUFCommands; typedef GuiActions::UF_Adjustments GuiUFAdjustment; // Saline - typedef GuiActions::Saline_Bolus_States GuiSalineStates; - typedef GuiActions::Saline_Commands GuiSalineCommands; + typedef GuiActions::Fluid_Bolus_States GuiSalineStates; + typedef GuiActions::Fluid_Bolus_Commands GuiSalineCommands; // Heparin typedef GuiActions::Heparin_States GuiHeparinStates; typedef GuiActions::Heparin_Commands GuiHeparinCommands; Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml =================================================================== diff -u -r70d6ebddd11a5df068f059fd563a0c1d0b50a2a3 -r490a131c41be4c335a7fbd74ff79b5784fb1726c --- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 70d6ebddd11a5df068f059fd563a0c1d0b50a2a3) +++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 490a131c41be4c335a7fbd74ff79b5784fb1726c) @@ -156,10 +156,10 @@ onConfirmClicked: _root.confirmClicked() } - PostTreatmentDisconnectStack { id: _postTreatmentDisconnectStack; stepIndex: PostTreatmentStack.Disconnect } - PostTreatmentBase { id: _postTreatmentRemove; stepIndex: PostTreatmentStack.Remove; instructionBased: true } - PostTreatmentReview { id: _postTreatmentReview; stepIndex: PostTreatmentStack.Review } - PostTreatmentBase { id: _postTreatmentDisinfection; stepIndex: PostTreatmentStack.Disinfection } + PostTreatmentDisconnectStack { id: _postTreatmentDisconnectStack; stepIndex: PostTreatmentStack.Disconnect } + PostTreatmentBase { id: _postTreatmentRemove; stepIndex: PostTreatmentStack.Remove; instructionBased: true } + PostTreatmentReview { id: _postTreatmentReview; stepIndex: PostTreatmentStack.Review } + PostTreatmentDisinfection { id: _postTreatmentDisinfection; stepIndex: PostTreatmentStack.Disinfection } // connections Connections { target: vPostTreatmentStates Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -re6ffa6d5d1b7820875de07cdbb15f06617400344 -r490a131c41be4c335a7fbd74ff79b5784fb1726c --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision e6ffa6d5d1b7820875de07cdbb15f06617400344) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 490a131c41be4c335a7fbd74ff79b5784fb1726c) @@ -382,7 +382,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x8400| 0x100 | Req | Y | UI | TD | Isolated UF Duration Change Request | + * |0x9B00| 0x100 | Req | Y | UI | TD | Isolated UF Duration Change Request | * * | Payload || * | || @@ -406,7 +406,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x8600| 0x100 | Req | Y | UI | TD | Isolated UF Volume Change Request | + * |0x9D00| 0x100 | Req | Y | UI | TD | Isolated UF Volume Change Request | * * | Payload || * | || @@ -432,7 +432,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x8800| 0x041 | Req | Y | UI | TD | Isolated UF Change User Confirm | + * |0x9F00| 0x041 | Req | Y | UI | TD | Isolated UF Change User Confirm | * * | Payload || * | || @@ -467,7 +467,7 @@ */ class MAdjustSalineReq : public MModel { public: - GuiSalineCommands requestedState = GuiSalineCommands::SALINE_CMD_STOP; // the requested state. Initially it's Stop => start. + GuiSalineCommands requestedState = GuiSalineCommands::FLUID_BOLUS_CMD_STOP; // the requested state. Initially it's Stop => start. QString toString() { return toString({requestedState}); } Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.cpp =================================================================== diff -u -r99d10909ee4ee821cd4ab6dc323c3798d9090b39 -r490a131c41be4c335a7fbd74ff79b5784fb1726c --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.cpp (.../VTreatmentAdjustmentSaline.cpp) (revision 99d10909ee4ee821cd4ab6dc323c3798d9090b39) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.cpp (.../VTreatmentAdjustmentSaline.cpp) (revision 490a131c41be4c335a7fbd74ff79b5784fb1726c) @@ -38,7 +38,7 @@ /*! * \brief View::VTreatmentAdjustmentSaline::doAdjustment * \details the invocable slot to adjust(start/stop) the treatment saline bolus state - * \param vStart - if true sets the requestedState to 1(SALINE_CMD_START) otherwise to 0(SALINE_CMD_STOP) + * \param vStart - if true sets the requestedState to 1(FLUID_BOLUS_CMD_START) otherwise to 0(FLUID_BOLUS_CMD_STOP) */ /*! @@ -47,7 +47,7 @@ */ void View::VTreatmentAdjustmentSaline::doStart() { - _data.requestedState = GuiSalineCommands::SALINE_CMD_START; + _data.requestedState = GuiSalineCommands::FLUID_BOLUS_CMD_START; emit didAdjustment(_data); } @@ -57,6 +57,6 @@ */ void View::VTreatmentAdjustmentSaline::doStop() { - _data.requestedState = GuiSalineCommands::SALINE_CMD_STOP; + _data.requestedState = GuiSalineCommands::FLUID_BOLUS_CMD_STOP; emit didAdjustment(_data); } Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp =================================================================== diff -u -r726dc38cf98a8f0a827b2efeecfd32996d0eee90 -r490a131c41be4c335a7fbd74ff79b5784fb1726c --- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision 726dc38cf98a8f0a827b2efeecfd32996d0eee90) +++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision 490a131c41be4c335a7fbd74ff79b5784fb1726c) @@ -65,14 +65,16 @@ // Ultrafiltration states // Saline Bolus states - ENUM_CHECK_O( GuiSalineStates, vData.mSalineState ) { - ENUM_CHECK ( GuiSalineStates, SALINE_BOLUS_STATE_IDLE ) - ENUM_CHECK ( GuiSalineStates, SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ) - ENUM_CHECK ( GuiSalineStates, SALINE_BOLUS_STATE_IN_PROGRESS ) - ENUM_CHECK_C( GuiSalineStates, NUM_OF_SALINE_BOLUS_STATES ) } - ENUM_READ ( GuiSalineStates, SALINE_BOLUS_STATE_IDLE , sbIdle ); - ENUM_READ ( GuiSalineStates, SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , sbWaitPump ); - ENUM_READ ( GuiSalineStates, SALINE_BOLUS_STATE_IN_PROGRESS , sbRunning ); + ENUM_CHECK_O( GuiSalineStates, vData.mSalineState ) { + ENUM_CHECK ( GuiSalineStates, FLUID_BOLUS_IDLE_STATE ) + ENUM_CHECK ( GuiSalineStates, FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE ) + ENUM_CHECK ( GuiSalineStates, FLUID_BOLUS_SALINE_IN_PROGRESS_STATE ) + ENUM_CHECK ( GuiSalineStates, FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE ) + ENUM_CHECK_C( GuiSalineStates, NUM_OF_FLUID_BOLUS_STATES ) } + ENUM_READ ( GuiSalineStates, FLUID_BOLUS_IDLE_STATE , sbIdle ); + ENUM_READ ( GuiSalineStates, FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE , sbWaitPump ); + ENUM_READ ( GuiSalineStates, FLUID_BOLUS_SALINE_IN_PROGRESS_STATE , sbRunning ); + ENUM_READ ( GuiSalineStates, FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE , sbSubstitutionRunning ); // Heparin States _heparin = false; @@ -113,12 +115,14 @@ // Treatment states - Dialysis bool mDialysis = vData.mSubMode == GuiTreatmentStates ::TREATMENT_DIALYSIS_STATE ; if ( mDialysis ) { - ENUM_CHECK_O( GuiDialysisState, vData.mDialysisState ) { - ENUM_CHECK ( GuiDialysisState, DIALYSIS_UF_STATE ) - ENUM_CHECK ( GuiDialysisState, DIALYSIS_UF_PAUSED_STATE ) - ENUM_CHECK_C( GuiDialysisState, NUM_OF_DIALYSIS_STATES ) } - ENUM_READ ( GuiDialysisState, DIALYSIS_UF_STATE , dyUltrafiltration ); - ENUM_READ ( GuiDialysisState, DIALYSIS_UF_PAUSED_STATE , dySalineBolus ); + ENUM_CHECK_O( GuiDialysisState, vData.mDialysisState ) { + ENUM_CHECK ( GuiDialysisState, DIALYSIS_UF_STATE ) + ENUM_CHECK ( GuiDialysisState, DIALYSIS_UF_PAUSED_STATE ) + ENUM_CHECK ( GuiDialysisState, DIALYSIS_UF_FLUID_BOLUS_STATE ) + ENUM_CHECK_C( GuiDialysisState, NUM_OF_DIALYSIS_STATES ) } + ENUM_READ ( GuiDialysisState, DIALYSIS_UF_STATE , dyUltrafiltration ); + ENUM_READ ( GuiDialysisState, DIALYSIS_UF_PAUSED_STATE , dyUltrafiltrationPaused ); + ENUM_READ ( GuiDialysisState, DIALYSIS_UF_FLUID_BOLUS_STATE , dyFluidBolus ); } txDialysis ( mDialysis ); // it's the main dialysis event so moved last to have all the sub-dialysis-states updated prior to. @@ -179,10 +183,12 @@ ENUM_CHECK ( GuiBloodPrimeStates, BLOOD_PRIME_RAMP_STATE ) ENUM_CHECK ( GuiBloodPrimeStates, BLOOD_PRIME_RUN_STATE ) ENUM_CHECK ( GuiBloodPrimeStates, BLOOD_PRIME_PAUSED_STATE ) + ENUM_CHECK ( GuiBloodPrimeStates, BLOOD_PRIME_FLUID_BOLUS_STATE ) ENUM_CHECK_C( GuiBloodPrimeStates, NUM_OF_BLOOD_PRIME_STATES ) } - ENUM_READ ( GuiBloodPrimeStates, BLOOD_PRIME_RAMP_STATE , bpRamp ) - ENUM_READ ( GuiBloodPrimeStates, BLOOD_PRIME_RUN_STATE , bpRun ) + ENUM_READ ( GuiBloodPrimeStates, BLOOD_PRIME_RAMP_STATE , bpRamp ); + ENUM_READ ( GuiBloodPrimeStates, BLOOD_PRIME_RUN_STATE , bpRun ); ENUM_READ ( GuiBloodPrimeStates, BLOOD_PRIME_PAUSED_STATE , bpPaused ); + ENUM_READ ( GuiBloodPrimeStates, BLOOD_PRIME_FLUID_BOLUS_STATE , bpFluidBolus ); } txBloodPrime ( mBloodPrime ); @@ -192,9 +198,11 @@ ENUM_CHECK_O( GuiTreatmentEndStates, vData.mTreatmentEndState ) { ENUM_CHECK ( GuiTreatmentEndStates, TREATMENT_END_WAIT_FOR_RINSEBACK_STATE ) ENUM_CHECK ( GuiTreatmentEndStates, TREATMENT_END_PAUSED_STATE ) + ENUM_CHECK ( GuiTreatmentEndStates, TREATMENT_END_FLUID_BOLUS_STATE ) ENUM_CHECK_C( GuiTreatmentEndStates, NUM_OF_TREATMENT_END_STATES ) } ENUM_READ ( GuiTreatmentEndStates, TREATMENT_END_WAIT_FOR_RINSEBACK_STATE , teWaitRinseback ); ENUM_READ ( GuiTreatmentEndStates, TREATMENT_END_PAUSED_STATE , tePaused ); + ENUM_READ ( GuiTreatmentEndStates, TREATMENT_END_FLUID_BOLUS_STATE , teFluidBolus ); } txEnd ( mTreatmentEnd ); @@ -207,12 +215,14 @@ ENUM_CHECK ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECIRC_BLOOD_ONLY_STATE ) ENUM_CHECK ( GuiTreatmentPausedStates, TREATMENT_PAUSED_NO_RECIRC_STATE ) ENUM_CHECK ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECOVER_BLOOD_DETECT_STATE ) + ENUM_CHECK ( GuiTreatmentPausedStates, TREATMENT_PAUSED_FLUID_BOLUS_STATE ) ENUM_CHECK_C( GuiTreatmentPausedStates, NUM_OF_TREATMENT_PAUSED_STATES ) } ENUM_READ ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECIRC_STATE , tsRecirculate ) ENUM_READ ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECIRC_DIALYSATE_ONLY_STATE, tsRecirculateDialysate ) ENUM_READ ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECIRC_BLOOD_ONLY_STATE , tsRecirculateBlood ) ENUM_READ ( GuiTreatmentPausedStates, TREATMENT_PAUSED_NO_RECIRC_STATE , tsRecirculateNo ) ENUM_READ ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECOVER_BLOOD_DETECT_STATE , tsRecoverBloodDetect ) + ENUM_READ ( GuiTreatmentPausedStates, TREATMENT_PAUSED_FLUID_BOLUS_STATE , tsFluidBolus ) } txStop ( mTreatmentStop ); Index: sources/view/td/data/treatment/VTDTreatmentStatesData.h =================================================================== diff -u -r726dc38cf98a8f0a827b2efeecfd32996d0eee90 -r490a131c41be4c335a7fbd74ff79b5784fb1726c --- sources/view/td/data/treatment/VTDTreatmentStatesData.h (.../VTDTreatmentStatesData.h) (revision 726dc38cf98a8f0a827b2efeecfd32996d0eee90) +++ sources/view/td/data/treatment/VTDTreatmentStatesData.h (.../VTDTreatmentStatesData.h) (revision 490a131c41be4c335a7fbd74ff79b5784fb1726c) @@ -75,6 +75,7 @@ PROPERTY( bool , sbIdle , true ) ///< SALINE_BOLUS_STATE_IDLE = 0 # No saline bolus delivery is in progress PROPERTY( bool , sbWaitPump , false) ///< SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP = 1 # Wait for pumps to stop before starting bolus PROPERTY( bool , sbRunning , false) ///< SALINE_BOLUS_STATE_IN_PROGRESS = 2 # A saline bolus delivery is in progress + PROPERTY( bool , sbSubstitutionRunning , false) ///< FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE = 3 # A substitution delivery is in progress // ---- Heparin states PROPERTY( bool , hpOff , true ) ///< HEPARIN_STATE_OFF = 0 # No heparin delivery is in progress @@ -89,7 +90,8 @@ // Dialysis States PROPERTY( bool , dyStart , true ) ///< Start state of the dialysis sub-mode state machine PROPERTY( bool , dyUltrafiltration , false) ///< Ultrafiltration state of the dialysis sub-mode state machine - PROPERTY( bool , dySalineBolus , false) ///< Saline bolus state of the dialysis sub-mode state machine + PROPERTY( bool , dyUltrafiltrationPaused , false) ///< Ultrafiltration Paused state of the dialysis sub-mode state machine + PROPERTY( bool , dyFluidBolus , false) ///< Fluid Bolus state of the dialysis sub-mode state machine // Rinseback States PROPERTY( bool , rbInit , true ) ///< RINSEBACK_STOP_INIT_STATE = 0 # Start state (stopped) of the rinseback sub-mode state machine @@ -109,17 +111,20 @@ PROPERTY( bool , bpRamp , true ) ///< BLOOD_PRIME_RAMP_STATE = 0 # Ramp state of the blood prime sub-mode state machine PROPERTY( bool , bpRun , true ) ///< BLOOD_PRIME_RUN_STATE = 1 # Run state of the blood prime sub-mode state machine PROPERTY( bool , bpPaused , true ) ///< BLOOD_PRIME_PAUSED_STATE = 2 # Paused state of the blood prime sub-mode state machine + PROPERTY( bool , bpFluidBolus , true ) ///< BLOOD_PRIME_FLUID_BOLUS_STATE = 3 # Fluid bolus is running during blood prime // Treatment End PROPERTY( bool , teWaitRinseback , true ) ///< TREATMENT_END_WAIT_FOR_RINSEBACK_STATE = 0 # Wait for rinseback state of the treatment end sub-mode state machine PROPERTY( bool , tePaused , false) ///< TREATMENT_END_PAUSED_STATE = 1 # Paused state of the treatment end sub-mode state machine + PROPERTY( bool , teFluidBolus , false) ///< TREATMENT_END_FLUID_BOLUS_STATE = 2 # Fluid Bolus state of the treatment end sub-mode state machine // Treatment Stop - PROPERTY( bool , tsRecirculate , true ) ///< TREATMENT_STOP_RECIRC_STATE = 0, Dialysate and Blood re-circulation state of the treatment stop sub-mode state machine - PROPERTY( bool , tsRecirculateDialysate , false) ///< TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_STATE= 1, Re-circulate Dialysate only state of the treatment re-circulate sub-mode state machine - PROPERTY( bool , tsRecirculateBlood , false) ///< TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE = 2, Re-circulate Blood only state of the treatment re-circulate sub-mode state machine - PROPERTY( bool , tsRecirculateNo , false) ///< TREATMENT_STOP_NO_RECIRC_STATE = 3, No re-circulation state of the treatment stop sub-mode state machine - PROPERTY( bool , tsRecoverBloodDetect , false) ///< TREATMENT_STOP_RECOVER_BLOOD_DETECT_STATE = 4, Treatment stop recover blood detect state + PROPERTY( bool , tsRecirculate , true ) ///< TREATMENT_PAUSED_RECIRC_STATE = 0, Dialysate and Blood re-circulation state of the treatment stop sub-mode state machine + PROPERTY( bool , tsRecirculateDialysate , false) ///< TREATMENT_PAUSED_RECIRC_DIALYSATE_ONLY_STATE= 1, Re-circulate Dialysate only state of the treatment re-circulate sub-mode state machine + PROPERTY( bool , tsRecirculateBlood , false) ///< TREATMENT_PAUSED_RECIRC_BLOOD_ONLY_STATE = 2, Re-circulate Blood only state of the treatment re-circulate sub-mode state machine + PROPERTY( bool , tsRecirculateNo , false) ///< TREATMENT_PAUSED_NO_RECIRC_STATE = 3, No re-circulation state of the treatment stop sub-mode state machine + PROPERTY( bool , tsRecoverBloodDetect , false) ///< TREATMENT_PAUSED_RECOVER_BLOOD_DETECT_STATE = 4, Treatment stop recover blood detect state + PROPERTY( bool , tsFluidBolus , false) ///< TREATMENT_PAUSED_FLUID_BOLUS_STATE = 5, Fluid Bolus state of the treatment paused sub-mode state machine // class definition VIEW_DEC_CLASS(VTDTreatmentStates)