Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -rb1cfd49d9d2c58c3f8c82d5eaf345f5ca09dd497 -r592befb279772fb5a528816d60a16c811478ddd6 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision b1cfd49d9d2c58c3f8c82d5eaf345f5ca09dd497) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 592befb279772fb5a528816d60a16c811478ddd6) @@ -192,8 +192,8 @@ MSG_ID_TD_ADJUST_TREATMENT_LOGS_RESPONSE = 0xAA MSG_ID_TD_WATER_SAMPLE_RESULT_RESPONSE = 0xAB MSG_ID_TD_WATER_SAMPLE_DATA = 0xAC - MSG_ID_TD_DRY_SELF_TEST_PROGRESS_DATA = 0xAD - MSG_ID_TD_TUBING_SET_BARCODE_SCAN_REQUEST = 0xAE + MSG_ID_TD_TREATMENT_LOG_AVERAGE_DATA = 0xAD + MSG_ID_TD_DRY_SELF_TEST_PROGRESS_DATA = 0xAE MSG_ID_TD_TUBE_SET_AUTHENTICATION_REQUEST = 0xAF MSG_ID_UI_TUBE_SET_AUTHENTICATION_ACK_RESPONSE = 0xB0 MSG_ID_TD_SYRINGE_PUMP_DATA = 0xB1 @@ -251,8 +251,8 @@ MSG_ID_UI_TD_NVM_SET_USAGE_INFO_RECORD = 0xE5 MSG_ID_TD_NVM_CAL_RESPONSE = 0xE6 MSG_ID_UI_TD_NVM_SET_CAL_RECORD = 0xE7 - + MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0 MSG_ID_TD_TESTER_LOGIN_REQUEST = 0x8000 Index: leahi_dialin/dd/modules/voltages.py =================================================================== diff -u -r8ef0478470000c7e0de4dc05440521c955e18107 -r592befb279772fb5a528816d60a16c811478ddd6 --- leahi_dialin/dd/modules/voltages.py (.../voltages.py) (revision 8ef0478470000c7e0de4dc05440521c955e18107) +++ leahi_dialin/dd/modules/voltages.py (.../voltages.py) (revision 592befb279772fb5a528816d60a16c811478ddd6) @@ -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,