Index: firmware/App/Drivers/PressureSensor.c
===================================================================
diff -u -rd4d21b42ee8bd292a6d9f7966fe37abe0271dfda -r3edf8084a5028ee0d00a3fba496284e593e4254d
--- firmware/App/Drivers/PressureSensor.c	(.../PressureSensor.c)	(revision d4d21b42ee8bd292a6d9f7966fe37abe0271dfda)
+++ firmware/App/Drivers/PressureSensor.c	(.../PressureSensor.c)	(revision 3edf8084a5028ee0d00a3fba496284e593e4254d)
@@ -20,7 +20,6 @@
 #include "Messaging.h"
 #include "PersistentAlarm.h"
 #include "PressureSensor.h"
-#include "TemperatureSensors.h"
 
 /**
  *  @addtogroup PressureSensor
@@ -55,30 +54,30 @@
  *************************************************************************/
 void initPressureSensor( void )
 {
-    U32 i;
+    PRESSURE_SENSORS_T sensor;
 
     // Initialize override structures for each pressure sensor
-    for ( i = (U32)PRESSURE_SENSOR_FIRST; i < (U32)NUM_OF_PRESSURE_SENSORS; i++ )
+    for ( sensor = PRESSURE_SENSOR_FIRST; sensor < NUM_OF_PRESSURE_SENSORS; sensor++ )
     {
-        currentPressureReadings[ i ].data = 0.0F;
-        currentPressureReadings[ i ].ovData = 0.0F;
-        currentPressureReadings[ i ].ovInitData = 0.0F;
-        currentPressureReadings[ i ].override = OVERRIDE_RESET;
+        currentPressureReadings[ sensor ].data = 0.0F;
+        currentPressureReadings[ sensor ].ovData = 0.0F;
+        currentPressureReadings[ sensor ].ovInitData = 0.0F;
+        currentPressureReadings[ sensor ].override = OVERRIDE_RESET;
 
-        currentPresTempReadings[ i ].data = 0.0F;
-        currentPresTempReadings[ i ].ovData = 0.0F;
-        currentPresTempReadings[ i ].ovInitData = 0.0F;
-        currentPresTempReadings[ i ].override = OVERRIDE_RESET;
+        currentPresTempReadings[ sensor ].data = 0.0F;
+        currentPresTempReadings[ sensor ].ovData = 0.0F;
+        currentPresTempReadings[ sensor ].ovInitData = 0.0F;
+        currentPresTempReadings[ sensor ].override = OVERRIDE_RESET;
 
-        lastPressureReadCounter[ i ].data = 0;
-        lastPressureReadCounter[ i ].ovData = 0;
-        lastPressureReadCounter[ i ].ovInitData = 0;
-        lastPressureReadCounter[ i ].override = OVERRIDE_RESET;
+        lastPressureReadCounter[ sensor ].data = 0;
+        lastPressureReadCounter[ sensor ].ovData = 0;
+        lastPressureReadCounter[ sensor ].ovInitData = 0;
+        lastPressureReadCounter[ sensor ].override = OVERRIDE_RESET;
 
-        lastPressureErrorCounter[ i ].data = 0;
-        lastPressureErrorCounter[ i ].ovData = 0;
-        lastPressureErrorCounter[ i ].ovInitData = 0;
-        lastPressureErrorCounter[ i ].override = OVERRIDE_RESET;
+        lastPressureErrorCounter[ sensor ].data = 0;
+        lastPressureErrorCounter[ sensor ].ovData = 0;
+        lastPressureErrorCounter[ sensor ].ovInitData = 0;
+        lastPressureErrorCounter[ sensor ].override = OVERRIDE_RESET;
     }
 
     // Initialize the FPGA persistent alarms
@@ -222,7 +221,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR2, sensor )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR2, (U32)sensor )
     }
 
     return result;