Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -r7aaeb8b04744443272aaadb2c5cbb1d409a7e191 -reb9d26e8944248072cc6a6d201660d0c48711445 --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 7aaeb8b04744443272aaadb2c5cbb1d409a7e191) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision eb9d26e8944248072cc6a6d201660d0c48711445) @@ -37,7 +37,9 @@ X2_TEMP = 8 # Temperature RO Concentrate X3_TEMP = 9 # Temperature RO Concentrate drop X4_TEMP = 10 # Temperature drain drop - NUM_OF_TEMPERATURE_SENSORS = 11 # Number of Temperature Sensors + P7_TEMP = 11 # Temperature at p7 flow meter + P16_TEMP = 12 # Temperature at p16 flow meter + NUM_OF_TEMPERATURE_SENSORS = 13 # Number of Temperature Sensors class FPTemperatureSensors(AbstractSubSystem): @@ -65,7 +67,10 @@ FPTemperaturesNames.X1_TEMP.name: 0.0, FPTemperaturesNames.X2_TEMP.name: 0.0, FPTemperaturesNames.X3_TEMP.name: 0.0, - FPTemperaturesNames.X4_TEMP.name: 0.0, } + FPTemperaturesNames.X4_TEMP.name: 0.0, + FPTemperaturesNames.P7_TEMP.name: 0.0, + FPTemperaturesNames.P16_TEMP.name: 0.0, + } @publish(["fp_temperatures_timestamp", "fp_temperatures"]) def _handler_temperature_sensors_sync(self, message,timestamp=0.0): @@ -108,6 +113,12 @@ self.fp_temperatures[FPTemperaturesNames.X4_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] + self.fp_temperatures[FPTemperaturesNames.X4_TEMP.name] = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0] + + self.fp_temperatures[FPTemperaturesNames.X4_TEMP.name] = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0] + self.fp_temperature_sensors_timestamp = timestamp def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: @@ -167,6 +178,11 @@ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, message_id=MsgIds.MSG_ID_FP_TEMPERATURE_OVERRIDE_REQUEST.value, payload=payload) + 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 message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, message_id=MsgIds.MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST.value,