Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -r144020fa422bc5d0db1bd62647c29022a887206e -r14adcf33a5a509f27095a3a61cf45af61cd2baff --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 144020fa422bc5d0db1bd62647c29022a887206e) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 14adcf33a5a509f27095a3a61cf45af61cd2baff) @@ -103,6 +103,13 @@ NUM_OF_FP_PRES_SENSORS = 5 # Number of Pressure Sensors @unique +class FPPressureSensorAttributesEnum(DialinEnum): + PRES = 0 # Pressure attribute for FP Pressure Sensors + TEMP = 1 # Temperature attribute for FP Pressure Sensors + NUM_OF_FP_PRES_ATTRIBUTES = 2 # Number of FP Pressure Sensor attributes + + +@unique class ROPumpNames(DialinEnum): P12_PUMP = 0 # P12 RO Pump NUM_OF_RO_PUMPS = 1 # Number of RO Pumps @@ -122,16 +129,11 @@ @unique class FPTemperaturesNames(DialinEnum): - M1_TEMP = 0 # Temperature before pressure regulator (M1) - M3_TEMP = 1 # Temperature after pressure regulator (M3) - P10_TEMP = 2 # P10 temperature from inlet conductivity sensor. - P19_TEMP = 3 # P19 temperature from outlet conductivity sensor. - P8_TEMP = 4 # Temperature before inlet conductivity sensor (P8) - P13_TEMP = 5 # Temperature before RO filter (P13) - P17_TEMP = 6 # Temperature after RO filter (P17) - P7_TEMP = 7 # Temperature at p7 flow meter - P16_TEMP = 8 # Temperature at p16 flow meter - NUM_OF_TEMPERATURE_SENSORS = 9 # Number of Temperature Sensors + P10_TEMP = 1 # P10 temperature from inlet conductivity sensor. + P19_TEMP = 2 # P19 temperature from outlet conductivity sensor. + P7_TEMP = 3 # Temperature at p7 flow meter + P16_TEMP = 4 # Temperature at p16 flow meter + NUM_OF_TEMPERATURE_SENSORS = 5 # Number of Temperature Sensors @unique class FPValveStates(DialinEnum): Index: leahi_dialin/fp/modules/pressure_sensors.py =================================================================== diff -u -r00412d78bda4176d5c45a3778cb90ad907928965 -r14adcf33a5a509f27095a3a61cf45af61cd2baff --- leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 00412d78bda4176d5c45a3778cb90ad907928965) +++ leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 14adcf33a5a509f27095a3a61cf45af61cd2baff) @@ -19,7 +19,7 @@ from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.fp_defs import FPPressureSensorNames +from leahi_dialin.common.fp_defs import FPPressureSensorNames, FPPressureSensorAttributesEnum from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum from leahi_dialin.utils.checks import check_broadcast_interval_override_ms @@ -46,15 +46,50 @@ self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_pressures_data, self._handler_pressure_sync) + if self.can_interface is not None: + channel_id = DenaliChannels.fp_sync_broadcast_ch_id + self.msg_id_fp_temperature_data = MsgIds.MSG_ID_FP_TEMPERATURE_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_temperature_data, + self._handler_pressure_sensors_temperature_sync) + self.fp_pressures = { - FPPressureSensorNames.M1_PRES.name: 0.0, - FPPressureSensorNames.M3_PRES.name: 0.0, - FPPressureSensorNames.P8_PRES.name: 0.0, - FPPressureSensorNames.P13_PRES.name: 0.0, - FPPressureSensorNames.P17_PRES.name: 0.0 + FPPressureSensorNames.M1_PRES.name: { + FPPressureSensorAttributesEnum.PRES.name: 0.0 + }, + FPPressureSensorNames.M3_PRES.name: { + FPPressureSensorAttributesEnum.PRES.name: 0.0 + }, + FPPressureSensorNames.P8_PRES.name: { + FPPressureSensorAttributesEnum.PRES.name: 0.0 + }, + FPPressureSensorNames.P13_PRES.name: { + FPPressureSensorAttributesEnum.PRES.name: 0.0 + }, + FPPressureSensorNames.P17_PRES.name: { + FPPressureSensorAttributesEnum.PRES.name: 0.0 + } } + self.fp_pressures_temperatures = { + FPPressureSensorNames.M1_PRES.name: { + FPPressureSensorAttributesEnum.TEMP.name: 0.0 + }, + FPPressureSensorNames.M3_PRES.name: { + FPPressureSensorAttributesEnum.TEMP.name: 0.0 + }, + FPPressureSensorNames.P8_PRES.name: { + FPPressureSensorAttributesEnum.TEMP.name: 0.0 + }, + FPPressureSensorNames.P13_PRES.name: { + FPPressureSensorAttributesEnum.TEMP.name: 0.0 + }, + FPPressureSensorNames.P17_PRES.name: { + FPPressureSensorAttributesEnum.TEMP.name: 0.0 + } + } + self.fp_pressure_timestamp = 0.0 + self.fp_pressures_temperatures_timestamp = 0.0 @publish(["msg_id_fp_pressures_data", "fp_pressures", "fp_pressure_timestamp"]) def _handler_pressure_sync(self, message, timestamp=0.0): @@ -66,19 +101,42 @@ @return: none """ - self.fp_pressures[FPPressureSensorNames.M1_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.fp_pressures[FPPressureSensorNames.M3_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.fp_pressures[FPPressureSensorNames.P8_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.fp_pressures[FPPressureSensorNames.P13_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.fp_pressures[FPPressureSensorNames.P17_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] + self.fp_pressures[FPPressureSensorNames.M1_PRES.name][FPPressureSensorAttributesEnum.PRES.name] = struct.unpack( + 'f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] + self.fp_pressures[FPPressureSensorNames.M3_PRES.name][FPPressureSensorAttributesEnum.PRES.name] = struct.unpack( + 'f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] + self.fp_pressures[FPPressureSensorNames.P8_PRES.name][FPPressureSensorAttributesEnum.PRES.name] = struct.unpack( + 'f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] + self.fp_pressures[FPPressureSensorNames.P13_PRES.name][FPPressureSensorAttributesEnum.PRES.name] = struct.unpack( + 'f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] + self.fp_pressures[FPPressureSensorNames.P17_PRES.name][FPPressureSensorAttributesEnum.PRES.name] = struct.unpack( + 'f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] self.fp_pressure_timestamp = timestamp + @publish(["msg_id_fp_temperature_data", "fp_pressures_temperatures", "fp_pressures_temperatures_timestamp"]) + def _handler_pressure_sensors_temperature_sync(self, message, timestamp=0.0): + """ + Handles published FP pressure sensor temperature data messages. + + @param message: published FP pressure sensor temperature data message + @return: none + """ + + self.fp_pressures_temperatures[FPPressureSensorNames.M1_PRES.name][FPPressureSensorAttributesEnum.TEMP.name] = ( + struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])))[0] + self.fp_pressures_temperatures[FPPressureSensorNames.M3_PRES.name][FPPressureSensorAttributesEnum.TEMP.name] = ( + struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])))[0] + # The position of the message fields jumps to 5 because of the publish function in the DD Temperature.c module + self.fp_pressures_temperatures[FPPressureSensorNames.P8_PRES.name][FPPressureSensorAttributesEnum.TEMP.name] = ( + struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])))[0] + self.fp_pressures_temperatures[FPPressureSensorNames.P13_PRES.name][FPPressureSensorAttributesEnum.TEMP.name] = ( + struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])))[0] + self.fp_pressures_temperatures[FPPressureSensorNames.P17_PRES.name][FPPressureSensorAttributesEnum.TEMP.name] = ( + struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])))[0] + + self.fp_pressures_temperatures_timestamp = timestamp + def cmd_pressure_sensor_override(self, sensor: int, pressure: float, reset: int = NO_RESET) -> int: """ Constructs and sends a measured FP pressure override command message. @@ -160,4 +218,40 @@ return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: self.logger.debug("Timeout!!!!") + return False + + def cmd_pressure_sensor_temperature_override(self, sensor_index: int, sensor_value: float, reset: int = NO_RESET) -> int: + """ + Constructs and sends the value override of a pressure sensor's temperature. + Constraints: + Must be logged into FP. + Given sensor_index must be one of the sensors listed below. + + @param sensor_index : (int) Index of the sensor + @param sensor_value: (float) Value of the sensor to override + @param reset: (int) whether to reset the override value. The default is NO_RESET + @returns 1 if successful, zero otherwise + + """ + rst = integer_to_bytearray(reset) + value = float_to_bytearray(sensor_value) + index = integer_to_bytearray(sensor_index) + payload = rst + value + index + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message_id=MsgIds.MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST.value, + payload=payload) + + self.logger.debug( + "Setting sensor {} to {} C".format(FPPressureSensorNames[str(sensor_index)].name, sensor_value)) + + # Send message + received_message = self.can_interface.send(message) + + # If there is content in message + if received_message is not None: + # Response payload is OK or not + return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] + else: + self.logger.debug("Timeout!!!!") return False \ No newline at end of file Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -r00412d78bda4176d5c45a3778cb90ad907928965 -r14adcf33a5a509f27095a3a61cf45af61cd2baff --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 00412d78bda4176d5c45a3778cb90ad907928965) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 14adcf33a5a509f27095a3a61cf45af61cd2baff) @@ -43,13 +43,8 @@ self.fp_temperature_sensors_timestamp = 0 self.fp_temperatures = { - FPTemperaturesNames.M1_TEMP.name: 0.0, - FPTemperaturesNames.M3_TEMP.name: 0.0, FPTemperaturesNames.P10_TEMP.name: 0.0, FPTemperaturesNames.P19_TEMP.name: 0.0, - FPTemperaturesNames.P8_TEMP.name: 0.0, - FPTemperaturesNames.P13_TEMP.name: 0.0, - FPTemperaturesNames.P17_TEMP.name: 0.0, FPTemperaturesNames.P7_TEMP.name: 0.0, FPTemperaturesNames.P16_TEMP.name: 0.0 } @@ -62,27 +57,13 @@ @param message: published FP temperature sensors data message @returns none """ - self.fp_temperatures[FPTemperaturesNames.M1_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.fp_temperatures[FPTemperaturesNames.M3_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.fp_temperatures[FPTemperaturesNames.P10_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] self.fp_temperatures[FPTemperaturesNames.P19_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.fp_temperatures[FPTemperaturesNames.P8_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - - self.fp_temperatures[FPTemperaturesNames.P13_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - - self.fp_temperatures[FPTemperaturesNames.P17_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.fp_temperatures[FPTemperaturesNames.P7_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] @@ -149,16 +130,11 @@ message_id=MsgIds.MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST.value, payload=payload) - elif FPTemperaturesNames.P7_TEMP.value <= sensor_index < FPTemperaturesNames.NUM_OF_TEMPERATURE_SENSORS.value: + else: # the remaining sensors are flow sensors message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, message_id=MsgIds.MSG_ID_FP_FLOW_TEMP_OVERRIDE_REQUEST.value, payload=payload) - else: # the remaining sensors are sent to the pressure temp override - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, - message_id=MsgIds.MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST.value, - payload=payload) - self.logger.debug("Setting sensor {} to {} C".format(FPTemperaturesNames[str(sensor_index)].name, sensor_value)) # Send message