Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r47f0a02ea1c25f2d9b3f9e7a0f3ac722d4f53a7b -rdd9473deb8e53793a6a2440c67e727be1e7aa0ca --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 47f0a02ea1c25f2d9b3f9e7a0f3ac722d4f53a7b) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision dd9473deb8e53793a6a2440c67e727be1e7aa0ca) @@ -631,7 +631,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 +647,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': [], } Index: leahi_dialin/dd/modules/voltages.py =================================================================== diff -u -rf1b8b4e9558e9cb95b994044f1d7d247c6c8be3f -rdd9473deb8e53793a6a2440c67e727be1e7aa0ca --- leahi_dialin/dd/modules/voltages.py (.../voltages.py) (revision f1b8b4e9558e9cb95b994044f1d7d247c6c8be3f) +++ leahi_dialin/dd/modules/voltages.py (.../voltages.py) (revision dd9473deb8e53793a6a2440c67e727be1e7aa0ca) @@ -58,7 +58,11 @@ dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_24V_2.name: 0.0, dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_FPGA_VCC_V.name: 0.0, dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_FPGA_AUX_V.name: 0.0, - dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_FPGA_PVN_V.name: 0.0 + dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_FPGA_PVN_V.name: 0.0, + dd_enum_repository.DDMonitoredVoltages.FPGA_AC_DC_POWER_SUPPY_VOLTAGE.name: 0.0, + dd_enum_repository.DDMonitoredVoltages.FPGA_AC_DC_POWER_SUPPY_CURRNENT.name: 0.0, + dd_enum_repository.DDMonitoredVoltages.FPGA_AC_HEATER_VOLTAGE.name: 0.0, + dd_enum_repository.DDMonitoredVoltages.FPGA_AC_HEATER_CURRENT.name: 0.0 } @@ -72,14 +76,18 @@ @return: none """ sensor_list = [] - sensor_list.append((dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_1_2V.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_3_3V.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_5V_LOGIC.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_24V_1.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_24V_2.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_FPGA_VCC_V.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_FPGA_AUX_V.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_FPGA_PVN_V.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_1_2V.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_3_3V.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_5V_LOGIC.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_24V_1.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_24V_2.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_FPGA_VCC_V.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_FPGA_AUX_V.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_FPGA_PVN_V.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDMonitoredVoltages.FPGA_AC_DC_POWER_SUPPY_VOLTAGE.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDMonitoredVoltages.FPGA_AC_DC_POWER_SUPPY_CURRNENT.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDMonitoredVoltages.FPGA_AC_HEATER_VOLTAGE.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDMonitoredVoltages.FPGA_AC_HEATER_CURRENT.name, DataTypes.F32)) self.process_into_dict(dict_to_update = self.monitored_voltages, decoder_list = sensor_list,