Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -rd2774cbe954e861f6ec31d44134e74c8e9d66f22 -ra0520ee656b58da05b3eafad2eb278308f9f49b0 --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision d2774cbe954e861f6ec31d44134e74c8e9d66f22) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision a0520ee656b58da05b3eafad2eb278308f9f49b0) @@ -122,16 +122,16 @@ @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 + M3_TEMP = 0 # Temperature after pressure regulator (M3) + P10_TEMP = 1 # P10 temperature from inlet conductivity sensor. + P19_TEMP = 2 # P19 temperature from outlet conductivity sensor. + P8_TEMP = 3 # Temperature before inlet conductivity sensor (P8) + P13_TEMP = 4 # Temperature before RO filter (P13) + P17_TEMP = 5 # Temperature after RO filter (P17) + P7_TEMP = 6 # Temperature at p7 flow meter + P16_TEMP = 7 # Temperature at p16 flow meter + P46_TEMP = 8 # Temperature after sediment filter (P46) + NUM_OF_TEMPERATURE_SENSORS = 9 # Number of Temperature Sensors @unique class FPValveStates(DialinEnum): Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -r00412d78bda4176d5c45a3778cb90ad907928965 -ra0520ee656b58da05b3eafad2eb278308f9f49b0 --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 00412d78bda4176d5c45a3778cb90ad907928965) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision a0520ee656b58da05b3eafad2eb278308f9f49b0) @@ -43,15 +43,15 @@ 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 + FPTemperaturesNames.P16_TEMP.name: 0.0, + FPTemperaturesNames.P46_TEMP.name: 0.0 } @publish(["msg_id_fp_temperature_data", "fp_temperatures", "fp_temperatures_timestamp"]) @@ -62,31 +62,31 @@ @param message: published FP temperature sensors data message @returns none """ - self.fp_temperatures[FPTemperaturesNames.M1_TEMP.name] = struct.unpack('f', bytearray( + self.fp_temperatures[FPTemperaturesNames.M3_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( + self.fp_temperatures[FPTemperaturesNames.P10_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( + self.fp_temperatures[FPTemperaturesNames.P19_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( + self.fp_temperatures[FPTemperaturesNames.P8_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( + self.fp_temperatures[FPTemperaturesNames.P13_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( + self.fp_temperatures[FPTemperaturesNames.P17_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( + self.fp_temperatures[FPTemperaturesNames.P7_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( + self.fp_temperatures[FPTemperaturesNames.P16_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - self.fp_temperatures[FPTemperaturesNames.P16_TEMP.name] = struct.unpack('f', bytearray( + self.fp_temperatures[FPTemperaturesNames.P46_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] self.fp_temperature_sensors_timestamp = timestamp @@ -144,11 +144,13 @@ index = integer_to_bytearray(sensor_index) payload = rst + value + index - if sensor_index <= FPTemperaturesNames.P19_TEMP.value: + # FP Conductivity Sensor Temperature Override + if FPTemperaturesNames.P10_TEMP.value <= 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 Sensor 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,