Index: HDDefs.h =================================================================== diff -u -r8da6f918c375e966829ac8a1e5171a92ed63db2f -r4f151adda6a8e1ea9cf7fdd8806a81b3491d2baa --- HDDefs.h (.../HDDefs.h) (revision 8da6f918c375e966829ac8a1e5171a92ed63db2f) +++ HDDefs.h (.../HDDefs.h) (revision 4f151adda6a8e1ea9cf7fdd8806a81b3491d2baa) @@ -7,8 +7,8 @@ * * @file HDDefs.h * -* @author (last) Michael Garthwaite -* @date (last) 16-May-2023 +* @author (last) Sean Nash +* @date (last) 19-Jul-2023 * * @author (original) Sean Nash * @date (original) 29-May-2020 @@ -109,23 +109,10 @@ STANDBY_START_STATE = 0, ///< Start standby (home actuators). STANDBY_WAIT_FOR_TREATMENT_STATE, ///< Wait for treatment. STANDBY_WAIT_FOR_DISINFECT_STATE, ///< Wait for UI to send disinfect option. - - STANDBY_WAIT_FOR_DG_FLUSH_CMD_RESPONSE_STATE, ///< Wait for DG flush command response. - STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE, ///< Wait for DG flush to start. - STANDBY_DG_FLUSH_IN_PROGRESS_STATE, ///< DG flush operation is in progress - - STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_CMD_RESPONSE_STATE, ///< Wait for DG heat disinfect command response. - STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_TO_START_STATE, ///< Wait for DG heat disinfect to start. - STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE, ///< DG heat disinfect operation is in progress. - - STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_CMD_RESPONSE_STATE, ///< Wait for DG chemical disinfect command response. - STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_TO_START_STATE, ///< Wait for DG chemical disinfect to start. - STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE, ///< DG chemical disinfect operation is in progress - - STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_FLUSH_CMD_RESPONSE_STATE, ///< Wait for DG chemical disinfect flush command response. - STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_FLUSH_TO_START_STATE, ///< Wait for DG chemical disinfect flush to start. - STANDBY_DG_CHEM_DISINFECT_FLUSH_IN_PROGRESS_STATE, ///< DG chemical disinfect flush operation is in progress - NUM_OF_STANDBY_STATES ///< Number of standby states (sub-modes) + STANDBY_WAIT_FOR_DG_CLEANING_MODE_CMD_RESPONSE_STATE, ///< Wait for DG cleaning mode command response state. + STANDBY_WAIT_FOR_DG_CLEANING_MODE_TO_START_STATE, ///< Wait for DG cleaning mode to start state. + STANDBY_CLEANING_MODE_IN_PROGRESS_STATE, ///< Cleaning mode in progress state. + NUM_OF_STANDBY_STATES ///< Number of standby states (sub-modes). }; typedef enum HD_Standby_States HD_STANDBY_STATE_T; ///< Type for HD standby states enumeration @@ -269,6 +256,7 @@ WET_SELF_TESTS_BUBBLE_CHECK_SETUP_STATE, ///< Setup for wet air bubble self-test state. WET_SELF_TESTS_BUBBLE_CHECK_STATE, ///< Wet self-test air bubble detectors state. WET_SELF_TESTS_PRIME_CHECK_STATE, ///< Prime check wet self-tests state, checks for primed patient lines. + WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_DEBUBBLE_STATE, ///< Blood leak detector debubble state. WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE, ///< Blood leak detector self-test state. WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE, ///< Setup valve and start dialysate pump for first displacement. WET_SELF_TESTS_FIRST_DISPLACEMENT_STATE, ///< Fill reservoir 2 with 100 mL of dialysate from reservoir 1 state. @@ -561,6 +549,7 @@ RINSEBACK_PAUSED_STATE, ///< Rinseback paused state of the rinseback sub-mode state machine RINSEBACK_STOP_STATE, ///< Rinseback stopped (done) state of the rinseback sub-mode state machine RINSEBACK_RUN_ADDITIONAL_STATE, ///< Additional rinseback volume (10 mL) state of the rinseback sub-mode state machine + RINSEBACK_RECONNECT_PATIENT_STATE, ///< Rinseback patient reconnect state of the rinseback sub-mode state machine NUM_OF_RINSEBACK_STATES ///< Number of rinseback sub-mode states }; typedef enum Rinseback_States RINSEBACK_STATE_T; ///< Type for rinseback states enumeration. @@ -822,19 +811,22 @@ GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL_FLUSH, ///< Chemical disinfect flush stop user confirmation GENERIC_CONFIRM_ID_DISINFECT_CHEM_FLUSH_SAMPLE_PASS_FAIL, ///< Chemical disinfect sample flush pass/fail GENERIC_CONFIRM_ID_TREATMENT_END, ///< End treatment user confirmation + GENERIC_CONFIRM_ID_DISINFECT_STOP_ACTIVE_COOL, ///< Active cool stop user confirmation + GENERIC_CONFIRM_ID_DISINFECT_STOP_RO_PERMEATE_SAMPLE, ///< RO permeate sample stop user confirmation + GENERIC_CONFIRM_ID_RO_PERMEATE_SAMPLE_STOP_OR_DISPENSE, ///< RO permeate sample stop or dispense NUM_OF_GENERIC_CONFIRM_IDS, ///< Total number of generic confirm IDs }; typedef enum Generic_Confirm_Id GENERIC_CONFIRM_ID_T; ///< Type for generic confirm enumeration /// List of confirmation request status typedef enum Confirmation_Status { - CONFIRMATION_REQUEST_STATUS_REJECTED = 0, ///< Confirmation status rejected - CONFIRMATION_REQUEST_STATUS_ACCEPTED, ///< Confirmation status accepted - CONFIRMATION_REQUEST_STATUS_TIMEOUT, ///< Confirmation status timeout - CONFIRMATION_REQUEST_STATUS_PENDING, ///< Confirmation status pending response - CONFIRMATION_REQUEST_STATUS_UNUSED, ///< Confirmation status Unused - NUM_OF_CONFIRMATION_REQUEST_STATUS ///< Number of confirmation status + CONFIRMATION_REQUEST_STATUS_REJECTED = 0, ///< Confirmation status rejected + CONFIRMATION_REQUEST_STATUS_ACCEPTED, ///< Confirmation status accepted + CONFIRMATION_REQUEST_STATUS_TIMEOUT, ///< Confirmation status timeout + CONFIRMATION_REQUEST_STATUS_PENDING, ///< Confirmation status pending response + CONFIRMATION_REQUEST_STATUS_UNUSED, ///< Confirmation status Unused + NUM_OF_CONFIRMATION_REQUEST_STATUS ///< Number of confirmation status } CONFIRMATION_REQUEST_STATUS_T; /**@}*/