Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -r38e8dd31728056dbb7f9304c98ab16d7147b75a2 -r3715028b608b10e1d440a8a738c8a4f70d3d411b --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 3715028b608b10e1d440a8a738c8a4f70d3d411b) @@ -55,10 +55,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 +86,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