Index: TDDefs.h =================================================================== diff -u -raeb7481b59eac77a0cc6d6c4904cc8fa368b7ff0 -r3e6c9b5cd9859e269312f4efafc89de3685178a9 --- TDDefs.h (.../TDDefs.h) (revision aeb7481b59eac77a0cc6d6c4904cc8fa368b7ff0) +++ TDDefs.h (.../TDDefs.h) (revision 3e6c9b5cd9859e269312f4efafc89de3685178a9) @@ -84,9 +84,9 @@ /// Enumeration of fault mode states. enum HD_Fault_States { - HD_FAULT_STATE_START = 0, ///< HD fault start state - HD_FAULT_STATE_RUN_NV_POSTS, ///< HD fault run NV posts state - HD_FAULT_STATE_COMPLETE, ///< HD fault run complete state + HD_FAULT_STATE_START = 0, ///< TD fault start state + HD_FAULT_STATE_RUN_NV_POSTS, ///< TD fault run NV posts state + HD_FAULT_STATE_COMPLETE, ///< TD fault run complete state NUM_OF_HD_FAULT_STATES ///< Number of fault mode states }; typedef enum HD_Fault_States HD_FAULT_STATE_T; ///< Type for HD fault states enumeration @@ -680,17 +680,6 @@ /**@}*/ -/// 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 HDTreatmentMode * @{ @@ -728,37 +717,28 @@ /// Enumeration of TD event IDs. enum TD_Event_List { - TD_EVENT_STARTUP = 0, ///< HD startup event - TD_EVENT_OP_MODE_CHANGE, ///< HD Op mode change event - TD_EVENT_SUB_MODE_CHANGE, ///< HD Op sub-mode change event - TD_EVENT_DRY_SELF_TEST_CARTRIDGE_RESULT, ///< HD dry self test cartridge result - TD_EVENT_DRY_SELF_TEST_PRESSURE_RESULT, ///< HD dry self test pressure result - TD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT, ///< HD wet self test displacement result - TD_EVENT_CPU_RAM_ERROR_STATUS, ///< HD CPU RAM error status - TD_EVENT_CAL_RECORD_UPDATE, ///< HD new calibration record updated - TD_EVENT_SYSTEM_RECORD_UPDATE, ///< HD new system record has been updated - TD_EVENT_SERVICE_UPDATE, ///< HD new service record has been updated - TD_EVENT_USAGE_INFO_UPDATE, ///< HD new usage information has been updated - TD_EVENT_SW_CONFIG_UPDATE, ///< HD new software configuration has been updated - TD_EVENT_BUTTON, ///< HD button pressed/released - TD_EVENT_SAFETY_LINE, ///< HD safety line pulled/released - TD_EVENT_RSRVR_1_LOAD_CELL_START_VALUES, ///< HD reservoir 1 load cells start values - TD_EVENT_RSRVR_1_LOAD_CELL_END_VALUES, ///< HD reservoir 2 load cells end values - TD_EVENT_RSRVR_2_LOAD_CELL_START_VALUES, ///< HD reservoir 2 load cells start values - TD_EVENT_RSRVR_2_LOAD_CELL_END_VALUES, ///< HD reservoir 2 load cells end values - TD_EVENT_SUB_STATE_CHANGE, ///< HD Op sub-state change event - TD_EVENT_SYRINGE_PUMP_STATE, ///< HD syringe pump state change event - TD_EVENT_OCCLUSION_BASELINE, ///< HD event occlusion baseline event - TD_EVENT_RSRVR_UF_VOLUME_AND_TIME, ///< HD ultrafiltration volume and time for a reservoir use - TD_EVENT_RSRVR_UF_RATE, ///< HD ultrafiltration measured and expected rates - TD_EVENT_OPERATION_STATUS, ///< HD aggregated opmode, submode, and substate event. - TD_EVENT_AIR_TRAP_FILL, ///< HD initiated an air trap fill (opened VBT briefly). - TD_EVENT_AIR_PUMP_ON_OFF, ///< HD turned air pump on or off. - TD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT, ///< HD blood leak self tests result. - TD_EVENT_BLOOD_LEAK_NUM_OF_SET_POINT_CHECK_FAILURES, ///< HD blood leak number of set point check failures - TD_EVENT_DRY_SELF_TEST_PRESSURE_DECAY_WAIT_PERIOD, ///< HD dry self test pressure decay waiting period. - TD_EVENT_INSTIT_RECORD_UPDATE, ///< HD new institutional record has been updated. - TD_EVENT_PARTIAL_OCCLUSION_BASELINE, ///< HD event partial occlusion baseline event + TD_EVENT_STARTUP = 0, ///< TD startup event + TD_EVENT_OP_MODE_CHANGE, ///< TD Op mode change event + TD_EVENT_SUB_MODE_CHANGE, ///< TD Op sub-mode change event + TD_EVENT_DRY_SELF_TEST_CARTRIDGE_RESULT, ///< TD dry self test cartridge result + TD_EVENT_DRY_SELF_TEST_PRESSURE_RESULT, ///< TD dry self test pressure result + TD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT, ///< TD wet self test displacement result + TD_EVENT_CPU_RAM_ERROR_STATUS, ///< TD CPU RAM error status + TD_EVENT_CAL_RECORD_UPDATE, ///< TD new calibration record updated + TD_EVENT_SYSTEM_RECORD_UPDATE, ///< TD new system record has been updated + TD_EVENT_SERVICE_UPDATE, ///< TD new service record has been updated + TD_EVENT_USAGE_INFO_UPDATE, ///< TD new usage information has been updated + TD_EVENT_SW_CONFIG_UPDATE, ///< TD new software configuration has been updated + TD_EVENT_BUTTON, ///< TD button pressed/released + TD_EVENT_SAFETY_LINE, ///< TD safety line pulled/released + TD_EVENT_SUB_STATE_CHANGE, ///< TD Op sub-state change event + TD_EVENT_RSRVR_UF_RATE, ///< TD ultrafiltration measured and expected rates + TD_EVENT_OPERATION_STATUS, ///< TD aggregated opmode, submode, and substate event. + TD_EVENT_AIR_TRAP_FILL, ///< TD started/stopped an air trap fill operation. + TD_EVENT_AIR_TRAP_LOWER, ///< TD started/stopped an air trap lower level operation. + TD_EVENT_AIR_PUMP_ON_OFF, ///< TD turned air pump on/off. + TD_EVENT_DRY_SELF_TEST_PRESSURE_DECAY_WAIT_PERIOD, ///< TD dry self test pressure decay waiting period. + TD_EVENT_INSTIT_RECORD_UPDATE, ///< TD new institutional record has been updated. TD_EVENT_VALVE_POS_CHANGE, ///< TD pinch valve position change TD_EVENT_VALVE_HOMED_POS_SETTING, ///< TD pinch valve homed encoder positions for A/B/C. NUM_OF_TD_EVENT_IDS ///< Total number of TD events