Index: leahi_dialin/fp/modules/flow_sensors.py =================================================================== diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -r82b297112cb6098c63938b45e1e2b6099f460697 --- leahi_dialin/fp/modules/flow_sensors.py (.../flow_sensors.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) +++ leahi_dialin/fp/modules/flow_sensors.py (.../flow_sensors.py) (revision 82b297112cb6098c63938b45e1e2b6099f460697) @@ -49,14 +49,8 @@ self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_flow_data, self._handler_flow_sensor_sync) self.fp_flows = { - FPFlowSensorNames.P7_FLOW.name: { - FPFlowSensorAttributesEnum.FLOW.name: 0.0, - FPFlowSensorAttributesEnum.TEMP.name: 0.0 - }, - FPFlowSensorNames.P16_FLOW.name: { - FPFlowSensorAttributesEnum.FLOW.name: 0.0, - FPFlowSensorAttributesEnum.TEMP.name: 0.0 - } + FPFlowSensorNames.P7_FLOW.name: { FPFlowSensorAttributesEnum.FLOW.name: 0.0 }, + FPFlowSensorNames.P16_FLOW.name: { FPFlowSensorAttributesEnum.FLOW.name: 0.0 } } self.fp_flow_timestamp = 0 @@ -73,10 +67,6 @@ message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] self.fp_flows[FPFlowSensorNames.P16_FLOW.name][FPFlowSensorAttributesEnum.FLOW.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.fp_flows[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_flows[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_timestamp = timestamp @@ -143,35 +133,6 @@ self.logger.debug("Timeout!!!!") return False - def cmd_flow_temp_override(self, flow_sensor: int, temp: float, reset: int = NO_RESET) -> int: - """ - Constructs and sends flow temp override command. - Must be logged into FP. - - @param flow_sensor: integer - the sensor to override its value - @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_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 - def cmd_filtered_flow_rate_override(self, flow_sensor: int, rate: float, reset: int = NO_RESET) -> int: """ Constructs and sends filtered flow rate override command. @@ -199,33 +160,4 @@ 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 - @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