Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -r17b02f26012e7378daf831057c6f62c4ecdcfff0 -r40186f183b0331f4c76c24c1e5385539ce603402 --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 17b02f26012e7378daf831057c6f62c4ecdcfff0) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 40186f183b0331f4c76c24c1e5385539ce603402) @@ -56,7 +56,7 @@ dd_enum_repository.DDConductivitySensorNames.D43_COND.name: 0.0, dd_enum_repository.DDConductivitySensorNames.D74_COND.name: 0.0 } - if GlobalVariables().NEXT_GEN_HW: + if GlobalVariables().HW_BETA_1_9: self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = 0.0 self.dd_conductivity_timestamp = 0.0 @@ -86,7 +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().NEXT_GEN_HW: + 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(