Index: leahi_dialin/fp/modules/pressure_sensors.py =================================================================== diff -u -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d -r9a97e1f14f267d899b1604a9584284d6074f9224 --- leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d) +++ leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 9a97e1f14f267d899b1604a9584284d6074f9224) @@ -19,7 +19,6 @@ from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.fp_defs import fp_enum_repository -from leahi_dialin.common.global_vars import GlobalVariables from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.protocols.CAN import DenaliChannels @@ -50,10 +49,9 @@ fp_enum_repository.FPPressureSensorNames.M3_PRES.name: 0.0, fp_enum_repository.FPPressureSensorNames.P8_PRES.name: 0.0, fp_enum_repository.FPPressureSensorNames.P13_PRES.name: 0.0, - fp_enum_repository.FPPressureSensorNames.P17_PRES.name: 0.0 + fp_enum_repository.FPPressureSensorNames.P17_PRES.name: 0.0, + fp_enum_repository.FPPressureSensorNames.P46_PRES.name: 0.0 } - if GlobalVariables().HW_BETA_1_9: - self.fp_pressures[fp_enum_repository.FPTemperatureSensorNames.P46_PRES.name] = 0.0 self.fp_pressure_timestamp = 0.0 @@ -75,9 +73,8 @@ message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] self.fp_pressures[fp_enum_repository.FPPressureSensorNames.P17_PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - if GlobalVariables().HW_BETA_1_9: - self.fp_pressures[fp_enum_repository.FPPressureSensorNames.P46_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] + self.fp_pressures[fp_enum_repository.FPPressureSensorNames.P46_PRES.name] = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] self.fp_pressure_timestamp = timestamp