Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r8ef0478470000c7e0de4dc05440521c955e18107 -r86533b7ed5c2fb03a287ed72e366fb7b6d2aa14e --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 8ef0478470000c7e0de4dc05440521c955e18107) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 86533b7ed5c2fb03a287ed72e366fb7b6d2aa14e) @@ -329,8 +329,13 @@ 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_BLOOD_LEAK_SELF_TEST_RESULT = 13 # DD blood leak self test result - NUM_OF_DD_EVENT_IDS = 14 # Total number of DD events + 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 DDEventList._str_list = { # Official Name : Accepted strings @@ -347,6 +352,11 @@ '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'], 'NUM_OF_DD_EVENT_IDS': [], } @@ -631,7 +641,11 @@ MONITORED_LINE_FPGA_VCC_V = 5 # FPGA Vcc (3V) MONITORED_LINE_FPGA_AUX_V = 6 # FPGA Vaux (3V) MONITORED_LINE_FPGA_PVN_V = 7 # FPGA Vpvn (1V) - NUM_OF_MONITORED_VOLTAGE_LINES = 8 # Number of TD operation modes + FPGA_AC_DC_POWER_SUPPY_VOLTAGE = 8 # FPGA power supply voltage, not-monitored + FPGA_AC_DC_POWER_SUPPY_CURRENT = 9 # FPGA power supply current, not-monitored + FPGA_AC_HEATER_VOLTAGE = 10 # FPGA heater voltage, not-monitored + FPGA_AC_HEATER_CURRENT = 11 # FPGA heater current, not-monitored + NUM_OF_MONITORED_VOLTAGE_LINES = 12 # Number of TD operation modes DDMonitoredVoltages._str_list = { # Official Name : Accepted strings @@ -643,6 +657,10 @@ 'MONITORED_LINE_FPGA_VCC_V': ['fpga vcc'], 'MONITORED_LINE_FPGA_AUX_V': ['fpga aux'], 'MONITORED_LINE_FPGA_PVN_V': ['fpga pvn'], + 'FPGA_AC_DC_POWER_SUPPY_VOLTAGE': ['power supply voltage'], + 'FPGA_AC_DC_POWER_SUPPY_CURRENT': ['power supply current'], + 'FPGA_AC_HEATER_VOLTAGE':['ac heater voltage'], + 'FPGA_AC_HEATER_CURRENT':['ac heater current'], 'NUM_OF_MONITORED_VOLTAGE_LINES': [], }