Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -r38e8dd31728056dbb7f9304c98ab16d7147b75a2 -r3715028b608b10e1d440a8a738c8a4f70d3d411b --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 3715028b608b10e1d440a8a738c8a4f70d3d411b) @@ -18,7 +18,6 @@ from logging import Logger from leahi_dialin.common.constants import NO_RESET -from leahi_dialin.common.global_vars import GlobalVariables from leahi_dialin.common.fp_defs import fp_enum_repository, BETA_IOFP_COND_SENSOR_OFFSET, BETA_IOFP_PRES_SENSOR_OFFSET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override @@ -52,9 +51,8 @@ fp_enum_repository.FPTemperatureSensorNames.P16_TEMP.name: 0.0, fp_enum_repository.FPTemperatureSensorNames.P7_INTERNAL_TEMP.name: 0.0, fp_enum_repository.FPTemperatureSensorNames.P16_INTERNAL_TEMP.name: 0.0, + fp_enum_repository.FPTemperatureSensorNames.P46_TEMP.name: 0.0 } - if GlobalVariables().HW_BETA_1_9: - self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P46_TEMP.name] = 0.0 @publish(["msg_id_fp_temperature_data", "fp_temperatures", "fp_temperatures_timestamp"]) @@ -76,10 +74,7 @@ sensor_list.append((fp_enum_repository.FPTemperatureSensorNames.P16_TEMP, 'f')) sensor_list.append((fp_enum_repository.FPTemperatureSensorNames.P7_INTERNAL_TEMP, 'f')) sensor_list.append((fp_enum_repository.FPTemperatureSensorNames.P16_INTERNAL_TEMP, 'f')) - if GlobalVariables().HW_BETA_1_9: - if fp_enum_repository.FPTemperatureSensorNames.P46_TEMP.name not in self.fp_enum_repository: - self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P46_TEMP.name] = 0.0 - sensor_list.append((fp_enum_repository.FPTemperatureSensorNames.P46_TEMP, 'f')) + sensor_list.append((fp_enum_repository.FPTemperatureSensorNames.P46_TEMP, 'f')) i = 1 for sensor in sensor_list: