Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d -r9a97e1f14f267d899b1604a9584284d6074f9224 --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 9a97e1f14f267d899b1604a9584284d6074f9224) @@ -20,7 +20,6 @@ from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.dd_defs import dd_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 @@ -55,10 +54,9 @@ dd_enum_repository.DDConductivitySensorNames.D27_COND.name: 0.0, dd_enum_repository.DDConductivitySensorNames.D29_COND.name: 0.0, dd_enum_repository.DDConductivitySensorNames.D43_COND.name: 0.0, - dd_enum_repository.DDConductivitySensorNames.D74_COND.name: 0.0 + dd_enum_repository.DDConductivitySensorNames.D74_COND.name: 0.0, + dd_enum_repository.DDConductivitySensorNames.D98_COND.name: 0.0 } - if GlobalVariables().HW_BETA_1_9: - self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = 0.0 self.dd_conductivity_timestamp = 0.0 @@ -87,10 +85,7 @@ self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D74_COND.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - if GlobalVariables().HW_BETA_1_9: - if dd_enum_repository.DDConductivitySensorNames.D98_COND.name not in self.dd_conductivity: - self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = 0.0 - self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = struct.unpack('f', bytearray( + self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] self.dd_conductivity_timestamp = timestamp