Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r34d5565286b43d593aea1a854f7cb2fb917de777 -red3eb121e6f8b717386c77af4419df76f9fa2e19 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 34d5565286b43d593aea1a854f7cb2fb917de777) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision ed3eb121e6f8b717386c77af4419df76f9fa2e19) @@ -1029,13 +1029,15 @@ @unique class DDConductivityResistanceAttributes(DialinEnum): - RAW_RESISTANCE = 0 # Raw Conductivity resistance Attribute - RTD_RESISTANCE = 1 # raw RTD resistance Attribute - NUM_OF_RESISTANCE_ATTRIBUTES = 2 # Number of conductivity sensor Attributes + CONDUCTIVITY = 0 # Conductivity + CONDUCTIVITY_RESISTANCE = 1 # raw conductivity resistance Attribute + RTD_RESISTANCE = 2 # raw RTD resistance Attribute + NUM_OF_RESISTANCE_ATTRIBUTES = 3 # Number of conductivity sensor Attributes DDConductivityResistanceAttributes._str_list = { # Official Name : Accepted strings - 'RAW_RESISTANCE': ['cond resistance,'], - 'RTD_RESISTANCE': ['rtd resistance'], + 'CONDUCTIVITY': ['conductivity,'], + 'RTD_RESISTANCE': ['conductivity resistance'], + 'UNCOMPENSATED_COND' : ['rtd resistance'], 'NUM_OF_RESISTANCE_ATTRIBUTES': [], } \ No newline at end of file Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -rb587077b5d61033e25b2aa372bc04e221bc77a6f -red3eb121e6f8b717386c77af4419df76f9fa2e19 --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision b587077b5d61033e25b2aa372bc04e221bc77a6f) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision ed3eb121e6f8b717386c77af4419df76f9fa2e19) @@ -52,10 +52,6 @@ function = self._handler_conductivity_sensors_sync) self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, - message_id = MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA.value, - function = self._handler_conductivity_resistance_sync) - - self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_VERSION_RESPONSE.value, function = self._handler_conductivity_version_sync) @@ -64,51 +60,38 @@ function = self._handler_conductivity_cal_sync) self.dd_conductivity_timestamp = 0.0 #: The timestamp of the last conductivity message - self.dd_conductivity_resistance_timestamp = 0.0 #: The timestamp of the last conductivity resistance message self.dd_conductivity_cal_timestamp = 0.0 #: The timestamp of the last calibration response message self.dd_conductivity_version_timestamp = 0.0 #: The timestamp of the last version response message #: The Conductivity Sensors data in dictionary format self.dd_conductivity = { - dd_enum_repository.DDConductivitySensorNames.D17_COND.name: 0.0, - 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 - } - - self.dd_conductivity_resistance = { dd_enum_repository.DDConductivitySensorNames.D17_COND.name: { - dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name: 0.0, + dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name: 0.0, + dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name: 0.0, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name: 0.0, }, dd_enum_repository.DDConductivitySensorNames.D27_COND.name: { - dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name: 0.0, + dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name: 0.0, + dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name: 0.0, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name: 0.0, }, dd_enum_repository.DDConductivitySensorNames.D29_COND.name: { - dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name: 0.0, + dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name: 0.0, + dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name: 0.0, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name: 0.0, }, dd_enum_repository.DDConductivitySensorNames.D43_COND.name: { - dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name: 0.0, + dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name: 0.0, + dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name: 0.0, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name: 0.0, }, dd_enum_repository.DDConductivitySensorNames.D74_COND.name: { - dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name: 0.0, + dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name: 0.0, + dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name: 0.0, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name: 0.0, }, - fp_enum_repository.FPConductivitySensorNames.P9_COND.name: { - dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name: 0.0, - dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name: 0.0, - }, - fp_enum_repository.FPConductivitySensorNames.P18_COND.name: { - dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name: 0.0, - dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name: 0.0, - }, } - @publish(["msg_id_dd_conductivity_data", "dd_conductivity", "dd_conductivity_timestamp"]) def _handler_conductivity_sensors_sync(self, message, timestamp=0.0): """ @@ -119,46 +102,26 @@ @return: None """ sensor_list =[] - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND.name, DataTypes.F32)) - - self.process_into_dict(dict_to_update = self.dd_conductivity, - decoder_list = sensor_list, - message = message) - self.dd_conductivity_timestamp = timestamp - - @publish(["msg_id_dd_conductivity_resistance_data", "dd_conductivity_resistance", "dd_conductivity_resistance_timestamp"]) - def _handler_conductivity_resistance_sync(self, message, timestamp=0.0): - """ - Handles published DD conductivity sensor resistance data messages. DD Conductivity sensor resistance data are captured - for reference. - - @param message: published DD conductivity sensor resistance data message - @return: None - """ - sensor_list =[] - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name, DataTypes.F32)) - sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name, DataTypes.F32)) - sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name, DataTypes.F32)) sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name, DataTypes.F32)) sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name, DataTypes.F32)) sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name, DataTypes.F32)) sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name, DataTypes.F32)) sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name, DataTypes.F32)) - sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name, DataTypes.F32)) - sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name, DataTypes.F32)) - self.process_into_dict(dict_to_update = self.dd_conductivity_resistance, + self.process_into_dict(dict_to_update = self.dd_conductivity, decoder_list = sensor_list, message = message) - self.dd_conductivity_resistance_timestamp = timestamp + self.dd_conductivity_timestamp = timestamp @publish(["msg_id_dd_conductivity_version_data", "dd_conductivity_resistance", "dd_conductivity_version_timestamp"]) def _handler_conductivity_version_sync(self, message, timestamp=0.0): Index: leahi_dialin/fp/modules/conductivity_sensors.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -red3eb121e6f8b717386c77af4419df76f9fa2e19 --- leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision ed3eb121e6f8b717386c77af4419df76f9fa2e19) @@ -19,10 +19,10 @@ # Project imports from leahi_dialin.common.constants import NO_RESET -from leahi_dialin.common import fp_enum_repository +from leahi_dialin.common import fp_enum_repository, dd_enum_repository from leahi_dialin.common.fp_defs import BETA_IOFP_COND_SENSOR_OFFSET from leahi_dialin.common.generic_defs import DataTypes -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem @@ -58,8 +58,17 @@ #: The Conductivity Sensors data in dictionary format self.fp_conductivity = { - fp_enum_repository.FPConductivitySensorNames.P9_COND.name: 0.0, - fp_enum_repository.FPConductivitySensorNames.P18_COND.name: 0.0 + + fp_enum_repository.FPConductivitySensorNames.P9_COND.name: { + dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name: 0.0, + dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name: 0.0, + dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name: 0.0, + }, + fp_enum_repository.FPConductivitySensorNames.P18_COND.name: { + dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name: 0.0, + dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name: 0.0, + dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name: 0.0, + }, } #: The RO Rejection Ratio data in dictionary format @@ -82,8 +91,20 @@ @return: None """ sensor_list =[] - sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P9_COND.name, DataTypes.F32)) - sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P18_COND.name, DataTypes.F32)) + sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P9_COND.name, + dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name, DataTypes.F32)) + sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P18_COND.name, + dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name, DataTypes.F32)) + sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P9_COND.name, + dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name, + DataTypes.F32)) + sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P18_COND.name, + dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name, + DataTypes.F32)) + sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P9_COND.name, + dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name, DataTypes.F32)) + sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P18_COND.name, + dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name, DataTypes.F32)) self.process_into_dict(dict_to_update = self.fp_conductivity, decoder_list = sensor_list,