Index: HDDefs.h =================================================================== diff -u -r2ec1ba224e53f264c43e61c226aca5618b20984f -r55d4034fc19fc15389fcdc22e3d012d27573f1d0 --- HDDefs.h (.../HDDefs.h) (revision 2ec1ba224e53f264c43e61c226aca5618b20984f) +++ HDDefs.h (.../HDDefs.h) (revision 55d4034fc19fc15389fcdc22e3d012d27573f1d0) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file HDDefs.h +* @file HDDefs.h * -* @author (last) Sean Nash -* @date (last) 14-Oct-2020 +* @author (last) Hung Nguyen +* @date (last) 22-Nov-2021 * -* @author (original) Sean Nash -* @date (original) 29-May-2020 +* @author (original) Sean Nash +* @date (original) 29-May-2020 * ***************************************************************************/ @@ -53,12 +53,14 @@ { POST_STATE_START = 0, ///< Start initialize & POST mode state POST_STATE_FW_INTEGRITY, ///< Run firmware integrity test state + POST_STATE_AC, ///< Check HD has AC power - power off if not POST_STATE_WATCHDOG, ///< Run watchdog test state POST_STATE_SAFETY_SHUTDOWN, ///< Run safety shutdown test state POST_STATE_RTC, ///< Run RTC test state POST_STATE_NVDATAMGMT, ///< Run NV Data Mgmt. test state POST_STATE_BLOOD_FLOW, ///< Run blood flow test state - POST_STATE_DIALYSATE_FLOW, ///< Run dialysate flow test state + POST_STATE_DIALYSATE_FLOW, ///< Run dialysate flow test state + POST_STATE_BLOOD_LEAK, ///< Run blood leak sensor test state POST_STATE_VALVES, ///< Run valves test state POST_STATE_SYRINGE_PUMP, ///< Run syringe pump test state POST_STATE_ALARM_AUDIO, ///< Run alarm audio test state @@ -255,13 +257,15 @@ { HD_PRIME_START_STATE = 0, ///< Prime start state HD_PRIME_WAIT_FOR_USER_START_STATE, ///< Wait for user to start prime state + HD_PRIME_SALINE_DIALYZER_SETUP_STATE, ///< Saline dialyzer setup state + HD_PRIME_SALINE_DIALYZER_STATE, ///< Saline dialyzer fluid path state HD_PRIME_SALINE_SETUP_STATE, ///< Saline setup state HD_PRIME_SALINE_PURGE_AIR_STATE, ///< Saline purge air state HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE, ///< Circulate blood circuit state HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE, ///< Wait for reservoir 1 fill complete - HD_PRIME_DIALYSATE_DIALYZER_STATE, ///< Dialysate dialyzer fluid path state - HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE, ///< Wait for reservoir 2 fill complete HD_PRIME_DIALYSATE_BYPASS_STATE, ///< Dialysate bypass fluid path state + HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE, ///< Wait for reservoir 2 fill complete + HD_PRIME_DIALYSATE_DIALYZER_STATE, ///< Dialysate dialyzer fluid path state HD_PRIME_WET_SELF_TESTS_STATE, ///< Perform wet self-tests after priming complete HD_PRIME_PAUSE, ///< Prime pause state, waits to be resumed HD_PRIME_COMPLETE, ///< Prime complete state @@ -317,10 +321,11 @@ /// Enumeration of post-treatment mode states. enum HD_Post_Treatment_Mode_States { - HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE = 0, ///< Patient disconnection state - HD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE, ///< Drain reservoirs state - HD_POST_TREATMENT_VERIFY_STATE, ///< Verify cartridge removed, syringe removed, and reservoirs drained state - NUM_OF_HD_POST_TREATMENT_STATES ///< Number of post-treatment mode states + HD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE = 0, ///< Drain reservoirs state + HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE, ///< Patient disconnection state + HD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE, ///< Disposable removal state + HD_POST_TREATMENT_VERIFY_STATE, ///< Verify cartridge removed, syringe removed, and reservoirs drained state + NUM_OF_HD_POST_TREATMENT_STATES ///< Number of post-treatment mode states }; typedef enum HD_Post_Treatment_Mode_States HD_POST_TREATMENT_STATE_T; ///< Type for HD post treatment mode states enumeration @@ -644,8 +649,8 @@ * @{ */ -/// Enumeration of event IDs. -enum Event_List +/// Enumeration of treatment event IDs. +enum Tx_Event_List { BLOOD_FLOW_RATE_CHANGE_EVENT = 0, ///< Blood flow rate change event DIALYSATE_FLOW_RATE_CHANGE_EVENT, ///< Dialysate flow rate change event @@ -659,10 +664,27 @@ HEPARIN_PAUSE_RESUME_EVENT, ///< Heparin pause/resume event SALINE_BOLUSES_CHANGE_EVENT, ///< Saline boluses change event MID_TREATMENT_RINSE_BACK_EVENT, ///< Mid treatment rinse-back event - NUM_OF_EVENT_IDS ///< Total number of events + NUM_OF_TX_EVENT_IDS ///< Total number of treatment events }; -typedef enum Event_List EVENT_ID_T; ///< Type for event list enumeration +typedef enum Tx_Event_List TX_EVENT_ID_T; ///< Type for treatment event list enumeration /**@}*/ +/** + * @addtogroup CommonHeader + * @{ + */ + +/// Enumeration of HD event IDs. +enum HD_Event_List +{ + HD_EVENT_STARTUP = 0, ///< HD startup event + HD_EVENT_OP_MODE_CHANGE, ///< HD Op mode change event + HD_EVENT_SUB_MODE_CHANGE, ///< HD Op sub-mode change event + NUM_OF_EVENT_IDS ///< Total number of HD events +}; +typedef enum HD_Event_List HD_EVENT_ID_T; ///< Type for HD event list enumeration + +/**@}*/ + #endif