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