Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r86533b7ed5c2fb03a287ed72e366fb7b6d2aa14e -rc67b334aaf46d4b3568c93598df34ffcf14e4af4 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 86533b7ed5c2fb03a287ed72e366fb7b6d2aa14e) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision c67b334aaf46d4b3568c93598df34ffcf14e4af4) @@ -1037,13 +1037,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/common/msg_ids.py =================================================================== diff -u -rcc8682c8a5dfae91f2a2b934cb21181d2188ea3e -rc67b334aaf46d4b3568c93598df34ffcf14e4af4 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision cc8682c8a5dfae91f2a2b934cb21181d2188ea3e) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision c67b334aaf46d4b3568c93598df34ffcf14e4af4) @@ -202,7 +202,7 @@ MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE = 0xB4 MSG_ID_TD_UI_CONFIRMATION_REQUEST = 0xB5 MSG_ID_UI_CONFIRMATION_RESULT_RESPONSE = 0xB6 - MSG_ID_TD_POWER_OFF_REQUEST = 0xB7 + AVAILABLE_MSG_ID_B7 = 0xB7 MSG_ID_UI_VITALS_ADJUSTMENT_REQUEST = 0xB8 MSG_ID_TD_VITALS_ADJUSTMENT_RESPONSE = 0xB9 MSG_ID_UI_DD_NVM_GET_RECORD_REQUEST = 0xBA Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -r5e60e9aed5d499a0e3244efeb8361554749233b4 -rc67b334aaf46d4b3568c93598df34ffcf14e4af4 --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 5e60e9aed5d499a0e3244efeb8361554749233b4) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision c67b334aaf46d4b3568c93598df34ffcf14e4af4) @@ -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 -re45b20cdc5d4c5dcff8cef530b173ca94cb2e422 -rc67b334aaf46d4b3568c93598df34ffcf14e4af4 --- leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision e45b20cdc5d4c5dcff8cef530b173ca94cb2e422) +++ leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision c67b334aaf46d4b3568c93598df34ffcf14e4af4) @@ -19,11 +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 MsgFieldPositions -from leahi_dialin.common.msg_ids import MsgIds +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 @@ -59,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 @@ -83,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, Index: leahi_dialin/ui/fp_messaging.py =================================================================== diff -u -r3e2f7365bb1a643d2fc9bea2dc51f4b15f0ba9e2 -rc67b334aaf46d4b3568c93598df34ffcf14e4af4 --- leahi_dialin/ui/fp_messaging.py (.../fp_messaging.py) (revision 3e2f7365bb1a643d2fc9bea2dc51f4b15f0ba9e2) +++ leahi_dialin/ui/fp_messaging.py (.../fp_messaging.py) (revision c67b334aaf46d4b3568c93598df34ffcf14e4af4) @@ -67,15 +67,11 @@ self.can_interface.send(message, 0) - def fp_pressure(self, m1Pressure : float, - m3Pressure : float, + def fp_pressure(self, m3Pressure : float, p8Pressure : float, p13Pressure : float, p17Pressure : float, - x1Pressure : float, - x2Pressure : float, - x3Pressure : float, - x4Pressure : float): + p46Pressure : float): """ Broadcasts the current FP Level Sensor data (Msg ID: 0x34, 52) Args: @@ -90,15 +86,11 @@ x4Pressure (float): Pressure drain drop @return: None """ - payload = conversions.float_to_bytearray(m1Pressure ) - payload += conversions.float_to_bytearray(m3Pressure ) - payload += conversions.float_to_bytearray(p8Pressure ) - payload += conversions.float_to_bytearray(p13Pressure ) - payload += conversions.float_to_bytearray(p17Pressure ) - payload += conversions.float_to_bytearray(x1Pressure ) - payload += conversions.float_to_bytearray(x2Pressure ) - payload += conversions.float_to_bytearray(x3Pressure ) - payload += conversions.float_to_bytearray(x4Pressure ) + payload = conversions.float_to_bytearray(m3Pressure ) + payload += conversions.float_to_bytearray(p8Pressure ) + payload += conversions.float_to_bytearray(p13Pressure) + payload += conversions.float_to_bytearray(p17Pressure) + payload += conversions.float_to_bytearray(p46Pressure) message = CAN.CanMessage.build_message( channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id, @@ -164,9 +156,7 @@ self.can_interface.send(message, 0) def fp_flow_sensors(self, p7Flow : float, - p16Flow : float, - p7Temp : float, - p16Temp : float): + p16Flow : float): """ Broadcasts the current FP flow data (Msg ID: 0x36, 54) Args: @@ -178,8 +168,6 @@ """ payload = conversions.float_to_bytearray(p7Flow ) payload += conversions.float_to_bytearray(p16Flow ) - payload += conversions.float_to_bytearray(p7Temp ) - payload += conversions.float_to_bytearray(p16Temp ) message = CAN.CanMessage.build_message( channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id, @@ -207,19 +195,17 @@ self.can_interface.send(message, 0) - def fp_temperature(self, p10Temp : float, - p19Temp : float, - m1Temp : float, - m3Temp : float, - p8Temp : float, - p13Temp : float, - p17Temp : float, - x1Temp : float, - x2Temp : float, - x3Temp : float, - x4Temp : float, - p7Temp : float, - p16Temp : float): + def fp_temperature(self, m3Temp : float, + p8Temp : float, + p13Temp : float, + p17Temp : float, + p46Temp : float, + p10Temp : float, + p19Temp : float, + p7Temp : float, + p16Temp : float, + p7InternalTemp : float, + p16InternalTemp : float): """ Broadcasts the current FP temperature data (Msg ID: 0x39, 57) Args: @@ -238,19 +224,17 @@ p16Temp (float): Temperature RO outlet @return: None """ - payload = conversions.float_to_bytearray(p10Temp ) - payload += conversions.float_to_bytearray(p19Temp ) - payload += conversions.float_to_bytearray(m1Temp ) - payload += conversions.float_to_bytearray(m3Temp ) - payload += conversions.float_to_bytearray(p8Temp ) - payload += conversions.float_to_bytearray(p13Temp ) - payload += conversions.float_to_bytearray(p17Temp ) - payload += conversions.float_to_bytearray(x1Temp ) - payload += conversions.float_to_bytearray(x2Temp ) - payload += conversions.float_to_bytearray(x3Temp ) - payload += conversions.float_to_bytearray(x4Temp ) - payload += conversions.float_to_bytearray(p7Temp ) - payload += conversions.float_to_bytearray(p16Temp ) + payload = conversions.float_to_bytearray(m3Temp ) + payload += conversions.float_to_bytearray(p8Temp ) + payload += conversions.float_to_bytearray(p13Temp ) + payload += conversions.float_to_bytearray(p17Temp ) + payload += conversions.float_to_bytearray(p46Temp ) + payload += conversions.float_to_bytearray(p10Temp ) + payload += conversions.float_to_bytearray(p19Temp ) + payload += conversions.float_to_bytearray(p7Temp ) + payload += conversions.float_to_bytearray(p16Temp ) + payload += conversions.float_to_bytearray(p7InternalTemp ) + payload += conversions.float_to_bytearray(p16InternalTemp ) message = CAN.CanMessage.build_message( channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id,