Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r862daa5b6357ddaba02aa7d1fb9d0952e4a16e6f -rd0dedd8e720be5de357176ffb095484ec082c830 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 862daa5b6357ddaba02aa7d1fb9d0952e4a16e6f) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision d0dedd8e720be5de357176ffb095484ec082c830) @@ -316,47 +316,47 @@ # ================================================== Enum Creators: Events ================================================== @unique class DDEventList(DialinEnum): - DD_EVENT_STARTUP = 0 # DD startup event - DD_EVENT_OP_MODE_CHANGE = 1 # DD Op mode change event - DD_EVENT_SUB_MODE_CHANGE = 2 # DD Op sub-mode change event - DD_EVENT_OPERATION_STATUS = 3 # DD operation status event - DD_EVENT_D6_LEVL_CHANGE = 4 # DD floater level change event - DD_EVENT_D63_LEVL_CHANGE = 5 # DD bicarb upper level change event - DD_EVENT_D98_LEVL_CHANGE = 6 # DD bicarb lower level change event - DD_EVENT_D46_LEVL_CHANGE = 7 # DD spent dialysate air seperation level change event - DD_EVENT_TD_COMMUNICATION_LOSS = 8 # DD TD communication loss - DD_EVENT_TEMPERATURE_DRIFT = 9 # DD dialysate temperature drift - DD_EVENT_BLOOD_LEAK_ZEROING_REQUEST = 10 # DD blood leak zeroing request - DD_EVENT_BLOOD_LEAK_ZEROING_REQUIRED = 11 # DD blood leak zeroing required - DD_EVENT_BLOOD_LEAK_NUM_OF_SET_POINT_CHECK_FAILURES = 12 # DD blood leak number of setpoint check failures - DD_EVENT_CPU_RAM_ERROR_STATUS = 13 # DD CPU RAM error - DD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT = 14 # DD blood leak self test result - DD_EVENT_BC_SWITCH_ONLY_MODE_CHANGE = 15 # DD Balancing Chamber Switching Only status event - DD_EVENT_BC_FILL_STATE_CHANGE = 16 # Balancing chamber state switch event - DD_EVENT_HEATER_STATE_CHANGE = 17 # DD heater state change event - DD_EVENT_DRY_BICART_STATE_CHANGE = 18 # DD Dry Bicart State change event - NUM_OF_DD_EVENT_IDS = 19 # Total number of DD events + STARTUP = 0 # DD startup event + OP_MODE_CHANGE = 1 # DD Op mode change event + SUB_MODE_CHANGE = 2 # DD Op sub-mode change event + OPERATION_STATUS = 3 # DD operation status event + D6_LEVL_CHANGE = 4 # DD floater level change event + D63_LEVL_CHANGE = 5 # DD bicarb upper level change event + D98_LEVL_CHANGE = 6 # DD bicarb lower level change event + D46_LEVL_CHANGE = 7 # DD spent dialysate air seperation level change event + TD_COMMUNICATION_LOSS = 8 # DD TD communication loss + TEMPERATURE_DRIFT = 9 # DD dialysate temperature drift + BLOOD_LEAK_ZEROING_REQUEST = 10 # DD blood leak zeroing request + BLOOD_LEAK_ZEROING_REQUIRED = 11 # DD blood leak zeroing required + BLOOD_LEAK_NUM_OF_SET_POINT_CHECK_FAILURES = 12 # DD blood leak number of setpoint check failures + CPU_RAM_ERROR_STATUS = 13 # DD CPU RAM error + BLOOD_LEAK_SELF_TEST_RESULT = 14 # DD blood leak self test result + BC_SWITCH_ONLY_MODE_CHANGE = 15 # DD Balancing Chamber Switching Only status event + BC_FILL_STATE_CHANGE = 16 # Balancing chamber state switch event + HEATER_STATE_CHANGE = 17 # DD heater state change event + DRY_BICART_STATE_CHANGE = 18 # DD Dry Bicart State change event + NUM_OF_DD_EVENT_IDS = 19 # Total number of DD events DDEventList._str_list = { # Official Name : Accepted strings - 'DD_EVENT_STARTUP': ['startup'], - 'DD_EVENT_OP_MODE_CHANGE': ['op mode change', 'operation mode change'], - 'DD_EVENT_SUB_MODE_CHANGE': ['sub mode change'], - 'DD_EVENT_OPERATION_STATUS': ['status', 'operation status'], - 'DD_EVENT_D6_LEVL_CHANGE': ['d6 level change'], - 'DD_EVENT_D63_LEVL_CHANGE': ['d63 level change'], - 'DD_EVENT_D46_LEVL_CHANGE': ['d46 level change'], - 'DD_EVENT_TD_COMMUNICATION_LOSS': ['td communication loss'], - 'DD_EVENT_TEMPERATURE_DRIFT': ['temperature drift'], - 'DD_EVENT_BLOOD_LEAK_ZEROING_REQUEST': ['blood leak zeroing request'], - 'DD_EVENT_BLOOD_LEAK_ZEROING_REQUIRED': ['blood leak zeroing required'], - 'DD_EVENT_BLOOD_LEAK_NUM_OF_SET_POINT_CHECK_FAILURES': ['blood leak check failed'], - 'DD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT': ['blood leak self test'], - 'DD_EVENT_CPU_RAM_ERROR_STATUS': ['cpu ram error status', 'cpu error status', 'ram error status', 'memory error status'], - 'DD_EVENT_BC_SWITCH_ONLY_MODE_CHANGE': ['bc switch only change'], - 'DD_EVENT_BC_FILL_STATE_CHANGE': ['bc state change'], - 'DD_EVENT_HEATER_STATE_CHANGE': ['heater state change'], - 'DD_EVENT_DRY_BICART_STATE_CHANGE': ['dry bicart state change'], + 'STARTUP': ['startup'], + 'OP_MODE_CHANGE': ['op mode change', 'operation mode change'], + 'SUB_MODE_CHANGE': ['sub mode change'], + 'OPERATION_STATUS': ['status', 'operation status'], + 'D6_LEVL_CHANGE': ['d6 level change'], + 'D63_LEVL_CHANGE': ['d63 level change'], + 'D46_LEVL_CHANGE': ['d46 level change'], + 'TD_COMMUNICATION_LOSS': ['td communication loss'], + 'TEMPERATURE_DRIFT': ['temperature drift'], + 'BLOOD_LEAK_ZEROING_REQUEST': ['blood leak zeroing request'], + 'BLOOD_LEAK_ZEROING_REQUIRED': ['blood leak zeroing required'], + 'BLOOD_LEAK_NUM_OF_SET_POINT_CHECK_FAILURES': ['blood leak check failed'], + 'BLOOD_LEAK_SELF_TEST_RESULT': ['blood leak self test'], + 'CPU_RAM_ERROR_STATUS': ['cpu ram error status', 'cpu error status', 'ram error status', 'memory error status'], + 'BC_SWITCH_ONLY_MODE_CHANGE': ['bc switch only change'], + 'BC_FILL_STATE_CHANGE': ['bc state change'], + 'HEATER_STATE_CHANGE': ['heater state change'], + 'DRY_BICART_STATE_CHANGE': ['dry bicart state change'], 'NUM_OF_DD_EVENT_IDS': [], } @@ -734,24 +734,24 @@ @unique class DDBloodLeakStates(DialinEnum): - BLOOD_LEAK_WAIT_FOR_POST_STATE = 0 # - BLOOD_LEAK_CHECK_SET_POINT_STATE = 1 # - BLOOD_LEAK_INIT_STATE = 2 # - BLOOD_LEAK_CHECK_ZERO_AND_SELF_TEST_STATE = 3 # - BLOOD_LEAK_VERIFY_INTENSITY_AFTER_ZEROING_STATE = 4 # - BLOOD_LEAK_NORMAL_STATE = 5 # - BLOOD_LEAK_RECOVER_BLOOD_DETECT_STATE = 6 # - NUM_OF_BLOOD_LEAK_STATES = 7 # Number of blood leak states + WAIT_FOR_POST_STATE = 0 # + CHECK_SET_POINT_STATE = 1 # + INIT_STATE = 2 # + CHECK_ZERO_AND_SELF_TEST_STATE = 3 # + VERIFY_INTENSITY_AFTER_ZEROING_STATE = 4 # + NORMAL_STATE = 5 # + RECOVER_BLOOD_DETECT_STATE = 6 # + NUM_OF_BLOOD_LEAK_STATES = 7 # Number of blood leak states DDBloodLeakStates._str_list = { # Official Name : Accepted strings - 'BLOOD_LEAK_WAIT_FOR_POST_STATE': ['wait for post', 'wait'], - 'BLOOD_LEAK_CHECK_SET_POINT_STATE': ['check set point'], - 'BLOOD_LEAK_INIT_STATE': ['init'], - 'BLOOD_LEAK_CHECK_ZERO_AND_SELF_TEST_STATE': ['check zero and self test'], - 'BLOOD_LEAK_VERIFY_INTENSITY_AFTER_ZEROING_STATE': ['verify', 'verify intensity after zeroing'], - 'BLOOD_LEAK_NORMAL_STATE': ['normal'], - 'BLOOD_LEAK_RECOVER_BLOOD_DETECT_STATE': ['recover blood', 'recover blood detect'], + 'WAIT_FOR_POST_STATE': ['wait for post', 'wait'], + 'CHECK_SET_POINT_STATE': ['check set point'], + 'INIT_STATE': ['init'], + 'CHECK_ZERO_AND_SELF_TEST_STATE': ['check zero and self test'], + 'VERIFY_INTENSITY_AFTER_ZEROING_STATE': ['verify', 'verify intensity after zeroing'], + 'NORMAL_STATE': ['normal'], + 'RECOVER_BLOOD_DETECT_STATE': ['recover blood', 'recover blood detect'], 'NUM_OF_BLOOD_LEAK_STATES': [], }