Index: dialin/common/hd_defs.py =================================================================== diff -u -r7e923bbdc3b74e8987de2ffbad17c84970454cb6 -ra8ff79bbffee9942f01d874fd258f33370ffa1b9 --- dialin/common/hd_defs.py (.../hd_defs.py) (revision 7e923bbdc3b74e8987de2ffbad17c84970454cb6) +++ dialin/common/hd_defs.py (.../hd_defs.py) (revision a8ff79bbffee9942f01d874fd258f33370ffa1b9) @@ -328,12 +328,18 @@ HD_EVENT_SERVICE_UPDATE = 9 # HD new service record has been updated HD_EVENT_USAGE_INFO_UPDATE = 10 # HD new usage information has been updated HD_EVENT_SW_CONFIG_UPDATE = 11 # HD new software configuration has been updated - HD_EVENT_RSRVR_1_LOAD_CELL_START_VALUES = 12 # HD reservoir 1 load cells start values - HD_EVENT_RSRVR_1_LOAD_CELL_END_VALUES = 13 # HD reservoir 2 load cells end values - HD_EVENT_RSRVR_2_LOAD_CELL_START_VALUES = 14 # HD reservoir 2 load cells start values - HD_EVENT_RSRVR_2_LOAD_CELL_END_VALUES = 15 # HD reservoir 2 load cells end values - HD_EVENT_SUB_STATE_CHANGE = 16 # HD Op sub-state change event - NUM_OF_EVENT_IDS = 17 # Total number of HD events + HD_EVENT_BUTTON = 12 # HD button pressed/released + HD_EVENT_SAFETY_LINE = 13 # HD safety line pulled/released + HD_EVENT_RSRVR_1_LOAD_CELL_START_VALUES = 14 # HD reservoir 1 load cells start values + HD_EVENT_RSRVR_1_LOAD_CELL_END_VALUES = 15 # HD reservoir 2 load cells end values + HD_EVENT_RSRVR_2_LOAD_CELL_START_VALUES = 16 # HD reservoir 2 load cells start values + HD_EVENT_RSRVR_2_LOAD_CELL_END_VALUES = 17 # HD reservoir 2 load cells end values + HD_EVENT_SUB_STATE_CHANGE = 18 # HD Op sub-state change event + HD_EVENT_SYRINGE_PUMP_STATE = 19 # HD syringe pump state change event + HD_EVENT_OCCLUSION_BASELINE = 20 # HD event occlusion baseline event + HD_EVENT_RSRVR_UF_VOLUME_AND_TIME = 21 # HD ultrafiltration volume and time for a reservoir use + HD_EVENT_RSRVR_UF_RATE = 22 # HD ultrafiltration measured and expected rates + NUM_OF_EVENT_IDS = 23 # Total number of HD events @unique class HDEventDataType(DialinEnum):