Index: HDDefs.h =================================================================== diff -u -ra51bdb2726b09df57f22dfc6c10965fcf4d5da95 -r2ec1ba224e53f264c43e61c226aca5618b20984f --- HDDefs.h (.../HDDefs.h) (revision a51bdb2726b09df57f22dfc6c10965fcf4d5da95) +++ HDDefs.h (.../HDDefs.h) (revision 2ec1ba224e53f264c43e61c226aca5618b20984f) @@ -51,19 +51,25 @@ /// Enumeration of init & POST mode states. enum HD_POST_States { - POST_STATE_START = 0, ///< Start initialize & POST mode state - POST_STATE_WATCHDOG, ///< Run watchdog test mode state - POST_STATE_FPGA, ///< Run FPGA test mode state - POST_STATE_RTC, ///< Run RTC test mode state - POST_STATE_NVDATAMGMT, ///< Run NV Data Mgmt. test mode state - POST_STATE_BLOOD_FLOW, ///< Run Blood Flow test mode state - POST_STATE_DIALYSATE_FLOW, ///< Run Dialysate Flow test mode state - POST_STATE_VALVES, ///< Run Valves test mode state - POST_STATE_ALARM_LAMP, ///< Run alarm lamp test mode state - POST_STATE_ACCELEROMETER, ///< Run Accelerometer test mode state - POST_STATE_STUCK_BUTTON, ///< Run stuck button test mode state - POST_STATE_COMPLETED, ///< POST self-tests completed mode state - POST_STATE_FAILED, ///< POST self-tests failed mode state + POST_STATE_START = 0, ///< Start initialize & POST mode state + POST_STATE_FW_INTEGRITY, ///< Run firmware integrity test state + 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_VALVES, ///< Run valves test state + POST_STATE_SYRINGE_PUMP, ///< Run syringe pump test state + POST_STATE_ALARM_AUDIO, ///< Run alarm audio test state + POST_STATE_ALARM_LAMP, ///< Run alarm lamp test state + POST_STATE_ACCELEROMETER, ///< Run Accelerometer test state + POST_STATE_STUCK_BUTTON, ///< Run stuck button test state + POST_STATE_UI_POST, ///< Check whether UI passed its POST tests + POST_STATE_FW_COMPATIBILITY, ///< Run firmware compatibility test state + POST_STATE_FPGA, ///< Run FPGA test state + POST_STATE_COMPLETED, ///< POST self-tests completed state + POST_STATE_FAILED, ///< POST self-tests failed state NUM_OF_POST_STATES ///< Number of initialize & POST mode states }; typedef enum HD_POST_States HD_POST_STATE_T; ///< Type for HD POST states enumeration @@ -95,14 +101,14 @@ { STANDBY_START_STATE = 0, ///< Start standby STANDBY_WAIT_FOR_TREATMENT_STATE, ///< Wait for treatment - STANDBY_WAIT_FOR_DISINFECT_STATE, ///< Wait for UI to send disinfection option + STANDBY_WAIT_FOR_DISINFECT_STATE, ///< Wait for UI to send disinfect option STANDBY_DG_FLUSH_IN_PROGRESS_STATE, ///< DG flush operation is in progress - STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE, ///< DG heat disinfection operation is in progress - STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE, ///< DG chemical disinfection operation is in progress + STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE, ///< DG heat disinfect operation is in progress + STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE, ///< DG chemical disinfect operation is in progress 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 - +typedef enum HD_Standby_States HD_STANDBY_STATE_T; ///< Type for HD standby states enumeration + /**@}*/ /** @@ -207,7 +213,6 @@ NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE, ///< No cartridge occlusion sensors self-test state NO_CART_SELF_TESTS_BLOOD_FLOW_METERS_STATE, ///< No cartridge blood flow meter self-test state NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE, ///< No cartridge dialysate flow meter self-test state - NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE, ///< No cartridge leak detectors self-test state NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE, ///< No cartridge board temperature self-test state NO_CART_SELF_TESTS_HOME_VALVES_STATE, ///< No cartridge home valves state NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE, ///< No cartridge home syringe pump state @@ -621,6 +626,43 @@ }; typedef enum Bicarb_Concentrates BICARB_CONCENTRATE_TYPE_T; ///< Type for bicarbonate concentrates enumeration -/**@}*/ +/**@}*/ + +/// Enumeration of HD pumps. +enum HD_Pumps +{ + HD_PUMP_BLOOD_PUMP = 0, ///< HD Blood pump + HD_PUMP_DIALYSATE_INLET_PUMP, ///< HD Dialysate inlet pump + HD_PUMP_DIALYSATE_OUTLET_PUMP, ///< HD Dialysate outlet pump + HD_PUMP_SYRINGE, ///< HD Syringe pump + NUM_OF_HD_PUMPS ///< Number of HD pumps +}; +typedef enum HD_Pumps HD_PUMP_T; ///< Type for HD pump enumeration + +/** + * @addtogroup HDTreatmentLog + * @{ + */ + +/// Enumeration of event IDs. +enum Event_List +{ + BLOOD_FLOW_RATE_CHANGE_EVENT = 0, ///< Blood flow rate change event + DIALYSATE_FLOW_RATE_CHANGE_EVENT, ///< Dialysate flow rate change event + TREATMENT_DURATION_CHANGE_EVENT, ///< Treatment duration change event + UF_VOLUME_CHANGE_EVENT, ///< Ultrafiltration volume change event + UF_PAUSE_RESUME_EVENT, ///< Ultrafiltration pause/resume event + ARTERIAL_PRESSURE_LOWER_LIMIT_CHANGE_EVENT, ///< Arterial pressure lower limit change event + ARTERIAL_PRESSURE_UPPER_LIMIT_CHANGE_EVENT, ///< Arterial pressure upper limit change event + VENOUS_PRESSURE_LOWER_LIMIT_CHANGE_EVENT, ///< Venous pressure lower limit change event + VENOUS_PRESSURE_UPPER_LIMIT_CHANGE_EVENT, ///< Venous pressure upper limit change event + 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 +}; +typedef enum Event_List EVENT_ID_T; ///< Type for event list enumeration + +/**@}*/ #endif