Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -rd27c40205e18118f4689f62463a266da1f91dba6 -r17b02f26012e7378daf831057c6f62c4ecdcfff0 --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 17b02f26012e7378daf831057c6f62c4ecdcfff0) @@ -56,8 +56,8 @@ dd_enum_repository.DDConductivitySensorNames.D43_COND.name: 0.0, dd_enum_repository.DDConductivitySensorNames.D74_COND.name: 0.0 } - if GlobalVariables.NEXT_GEN_HW: - self.fp_temperatures[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = 0.0 + if GlobalVariables().NEXT_GEN_HW: + self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = 0.0 self.dd_conductivity_timestamp = 0.0 @@ -86,7 +86,9 @@ 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.NEXT_GEN_HW: + if GlobalVariables().NEXT_GEN_HW: + 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( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]