Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -r82b297112cb6098c63938b45e1e2b6099f460697 --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 82b297112cb6098c63938b45e1e2b6099f460697) @@ -18,7 +18,7 @@ from logging import Logger from .constants import NO_RESET, RESET -from leahi_dialin.common.fp_defs import FPTemperaturesNames +from leahi_dialin.common.fp_defs import FPTemperaturesNames, FPFlowSensorNames, FPFlowSensorAttributesEnum from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum @@ -57,6 +57,18 @@ FPTemperaturesNames.P16_TEMP.name: 0.0, } + if self.can_interface is not None: + channel_id = DenaliChannels.fp_sync_broadcast_ch_id + self.msg_id_fp_flow_temperature_data = MsgIds.MSG_ID_FP_FLOW_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_flow_temperature_data, + self._handler_flow_sensors_temperature_sync) + + self.fp_flow_temperatures_timestamp = 0.0 + self.fp_flow_temperatures = { + FPFlowSensorNames.P7_FLOW.name: { FPFlowSensorAttributesEnum.TEMP.name: 0.0 }, + FPFlowSensorNames.P16_FLOW.name: { FPFlowSensorAttributesEnum.TEMP.name: 0.0 } + } + @publish(["msg_id_fp_temperature_data", "fp_temperatures", "fp_temperatures_timestamp"]) def _handler_temperature_sensors_sync(self, message,timestamp=0.0): """ @@ -106,6 +118,22 @@ self.fp_temperature_sensors_timestamp = timestamp + @publish(["msg_id_fp_flow_temperature_data", "fp_flow_temperatures", "fp_flow_temperatures_timestamp"]) + def _handler_flow_sensors_temperature_sync(self, message, timestamp=0.0): + """ + Handles published FP flow sensors temperature message + + @param message: published FP flow sensors temperature data message + @returns none + """ + + self.fp_flow_temperatures[FPFlowSensorNames.P7_FLOW.name][FPFlowSensorAttributesEnum.TEMP.name] = struct.unpack( + 'f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] + self.fp_flow_temperatures[FPFlowSensorNames.P16_FLOW.name][FPFlowSensorAttributesEnum.TEMP.name] = struct.unpack( + 'f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] + + self.fp_flow_temperatures_timestamp = timestamp + def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends broadcast time interval. @@ -148,7 +176,7 @@ 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_index : (int) Index of the sensor from FPTemperaturesNames @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 @@ -159,17 +187,19 @@ index = integer_to_bytearray(sensor_index) payload = rst + value + index + # FP Conductivity Sensors Temperature override if sensor_index <= FPTemperaturesNames.P19_TEMP.value: message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, message_id=MsgIds.MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST.value, payload=payload) + # FP Flow Sensors Temperature override elif FPTemperaturesNames.P7_TEMP.value <= sensor_index < FPTemperaturesNames.NUM_OF_TEMPERATURE_SENSORS.value: 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 + # FP Pressure Sensors Temperature override + else: 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) @@ -185,4 +215,33 @@ return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: self.logger.debug("Timeout!!!!") + return False + + def cmd_filtered_flow_temp_override(self, flow_sensor: int, temp: float, reset: int = NO_RESET) -> int: + """ + Constructs and sends filtered flow temp override command. + Must be logged into FP. + + @param flow_sensor: integer - the sensor to override its value from FPFlowSensorNames + @param temp: float - the temperature value to override + @param reset: integer - 1 to reset a previous override, 0 to override + @returns 1 if successful, zero otherwise + """ + reset_value = integer_to_bytearray(reset) + lvl = integer_to_bytearray(flow_sensor) + sts = float_to_bytearray(temp) + payload = reset_value + sts + lvl + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message_id=MsgIds.MSG_ID_FP_FILTERED_FLOW_TEMP_OVERRIDE_REQUEST.value, + payload=payload) + + # 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