Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -rb587077b5d61033e25b2aa372bc04e221bc77a6f --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision b587077b5d61033e25b2aa372bc04e221bc77a6f) @@ -20,6 +20,7 @@ # Project imports from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common import dd_enum_repository +from leahi_dialin.common import fp_enum_repository from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override @@ -50,8 +51,23 @@ message_id = MsgIds.MSG_ID_DD_CONDUCTIVITY_DATA.value, function = self._handler_conductivity_sensors_sync) - self.dd_conductivity_timestamp = 0.0 #: The timestamp of the last message + 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) + + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, + message_id = MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_CAL_RESPONSE.value, + 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, @@ -61,7 +77,38 @@ 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.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.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.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.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.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): """ @@ -83,7 +130,56 @@ 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.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, + decoder_list = sensor_list, + message = message) + self.dd_conductivity_resistance_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): + """ + Handles published DD conductivity sensor version response messages. + @param message: published DD conductivity sensor resistance data message + @return: None + """ + #TODO: complete response handler + self.dd_conductivity_version_timestamp = timestamp + + @publish(["msg_id_dd_conductivity_cal_data", "dd_conductivity_resistance", "dd_conductivity_cal_timestamp"]) + def _handler_conductivity_cal_sync(self, message, timestamp=0.0): + """ + Handles published DD conductivity sensor calibration response messages. + @param message: published DD conductivity sensor resistance data message + @return: None + """ + #TODO: complete response handler + self.dd_conductivity_cal_timestamp = timestamp + def cmd_conductivity_sensor_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the conductivity sensor data broadcast interval override command @@ -270,3 +366,47 @@ override_text = f'{str(conductivity)} microsiemens/cm', logger = self.logger, can_interface = self.can_interface) + + def cmd_conductivity_sensor_version_request(self, sensor_index: int ) -> None: + """ + Constructs and sends the conductivity version request command + Constraints: + Must be logged into DD. + Given sensor_index must be one of the sensors defined in ConductivitySensorsEnum + + @param sensor_index: unsigned int - index of the sensor + @return: None. Reponse handler will retrieve version data. + """ + sensor_byte_array = integer_to_bytearray(sensor_index) + payload = sensor_byte_array + + cmd_generic_override(payload = payload, + reset = None, + channel_id = CanChannels.dialin_to_dd_ch_id, + msg_id = MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_VERSION_REQUEST, + entity_name = 'DD Conductivity Version Request', + override_text = 'N/A', + logger = self.logger, + can_interface = self.can_interface) + + def cmd_conductivity_sensor_calibration_request(self, sensor_index: int ) -> None: + """ + Constructs and sends the conductivity sensor calibration request command + Constraints: + Must be logged into DD. + Given sensor_index must be one of the sensors defined in ConductivitySensorsEnum + + @param sensor_index: unsigned int - index of the sensor + @return: None. Response handler will retrieve version data. + """ + sensor_byte_array = integer_to_bytearray(sensor_index) + payload = sensor_byte_array + + cmd_generic_override(payload = payload, + reset = None, + channel_id = CanChannels.dialin_to_dd_ch_id, + msg_id = MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_CAL_REQUEST, + entity_name = 'DD Conductivity Calibration Request', + override_text = 'N/A', + logger = self.logger, + can_interface = self.can_interface) \ No newline at end of file