Index: firmware/App/Drivers/PressureSensor.c
===================================================================
diff -u -r72ae21d8343d3a2b07a47452ff48549e25f876df -r051cd0430ef8342bd606115c98871e26dc24acf1
--- firmware/App/Drivers/PressureSensor.c	(.../PressureSensor.c)	(revision 72ae21d8343d3a2b07a47452ff48549e25f876df)
+++ firmware/App/Drivers/PressureSensor.c	(.../PressureSensor.c)	(revision 051cd0430ef8342bd606115c98871e26dc24acf1)
@@ -42,7 +42,6 @@
 static OVERRIDE_F32_T currentPressureReadings[ NUM_OF_PRESSURE_SENSORS ];                               ///< Current pressure sensor pressure readings (overrideable).
 static OVERRIDE_F32_T currentPresTempReadings[ NUM_OF_PRESSURE_SENSORS ];                               ///< Current pressure sensor temperature readings (overrideable).
 static OVERRIDE_U32_T lastPressureReadCounter[ NUM_OF_PRESSURE_SENSORS ];                               ///< Last pressure sensor read count (Overrideable).
-static OVERRIDE_U32_T lastPressureErrorCounter[ NUM_OF_PRESSURE_SENSORS ];                              ///< Last pressure sensor error count (Overrideable).
 
 // ********** private function prototypes **********
 
@@ -77,10 +76,6 @@
         lastPressureReadCounter[ sensor ].ovInitData = 0;
         lastPressureReadCounter[ sensor ].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
@@ -97,7 +92,7 @@
  * sensor readings for all pressure sensors.
  * @details \b Inputs: FPGA
  * @details \b Outputs: currentPressureReadings[],currentPresTempReadings[],
- * lastPressureReadCounter[],lastPressureErrorCounter[].
+ * lastPressureReadCounter[].
  * @return none
  *************************************************************************/
 void readPressureSensors( void )
@@ -109,6 +104,10 @@
     currentPressureReadings[ P13_PRES ].data   = convertPressureReading( getFPGAP13RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI );
     currentPressureReadings[ P17_PRES ].data = convertPressureReading( getFPGAP17RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI );
     currentPressureReadings[ X1_PRES ].data = convertPressureReading( getFPGAX1RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI );
+    currentPressureReadings[ X2_PRES ].data = convertPressureReading( getFPGAX2RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI );
+    currentPressureReadings[ X3_PRES ].data = convertPressureReading( getFPGAX3RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI );
+    currentPressureReadings[ X4_PRES ].data = convertPressureReading( getFPGAX4RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI );
+    currentPressureReadings[ X5_PRES ].data = convertPressureReading( getFPGAX5RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI );
 
     // Update and convert raw pressure sensor temperatures to deg C
     currentPresTempReadings[ M1_PRES ].data = convertPressureTempReading2DegC( getFPGAM1RawTemperature() );
@@ -117,6 +116,10 @@
     currentPresTempReadings[ P13_PRES ].data = convertPressureTempReading2DegC( getFPGAP13RawTemperature() );
     currentPresTempReadings[ P17_PRES ].data = convertPressureTempReading2DegC( getFPGAP17RawTemperature() );
     currentPresTempReadings[ X1_PRES ].data = convertPressureTempReading2DegC( getFPGAX1RawTemperature() );
+    currentPresTempReadings[ X2_PRES ].data = convertPressureTempReading2DegC( getFPGAX2RawTemperature() );
+    currentPresTempReadings[ X3_PRES ].data = convertPressureTempReading2DegC( getFPGAX3RawTemperature() );
+    currentPresTempReadings[ X4_PRES ].data = convertPressureTempReading2DegC( getFPGAX4RawTemperature() );
+    currentPresTempReadings[ X5_PRES ].data = convertPressureTempReading2DegC( getFPGAX5RawTemperature() );
 
     // Update read and error counters for each pressure sensor
     lastPressureReadCounter[ M1_PRES ].data = (U32)getFPGAM1ReadCount();
@@ -125,14 +128,11 @@
     lastPressureReadCounter[ P13_PRES ].data = (U32)getFPGAP13ReadCount();
     lastPressureReadCounter[ P17_PRES ].data = (U32)getFPGAP17ReadCount();
     lastPressureReadCounter[ X1_PRES ].data = (U32)getFPGAX1ReadCount();
+    lastPressureReadCounter[ X2_PRES ].data = (U32)getFPGAX2ReadCount();
+    lastPressureReadCounter[ X3_PRES ].data = (U32)getFPGAX3ReadCount();
+    lastPressureReadCounter[ X4_PRES ].data = (U32)getFPGAX4ReadCount();
+    lastPressureReadCounter[ X5_PRES ].data = (U32)getFPGAX5ReadCount();
 
-    lastPressureErrorCounter[ M1_PRES ].data = (U32)getFPGAM1ErrorCount();
-    lastPressureErrorCounter[ M3_PRES ].data = (U32)getFPGAM3ErrorCount();
-    lastPressureErrorCounter[ P8_PRES ].data = (U32)getFPGAP8ErrorCount();
-    lastPressureErrorCounter[ P13_PRES ].data = (U32)getFPGAP13ErrorCount();
-    lastPressureErrorCounter[ P17_PRES ].data = (U32)getFPGAP17ErrorCount();
-    lastPressureErrorCounter[ X1_PRES ].data = (U32)getFPGAX1ErrorCount();
-
 //    // Monitor pressure sensor health
 //    checkPressureSensors();
 }
@@ -179,7 +179,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR1, (U32)sensor )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR1, (U32)sensor )
     }
 
     return result;
@@ -209,7 +209,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR2, (U32)sensor )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR2, (U32)sensor )
     }
 
     return result;
@@ -239,43 +239,13 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR3, sensor )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR3, sensor )
     }
 
     return result;
 }
 
-/*********************************************************************//**
- * @brief
- * The getPressureSensorErrorCount function gets the current pressure sensor
- * error count for a given pressure sensor.
- * @details \b Alarm: ALARM_ID_RO_SOFTWARE_FAULT if given sensor is invalid.
- * @details \b Inputs: lastPressureErrorCounter
- * @details \b Outputs: none
- * @param sensor ID of pressure sensor to get error count for.
- * @return The current pressure sensor error count of a given pressure sensor.
- *************************************************************************/
-U32 getPressureSensorErrorCount( PRESSURE_SENSORS_T sensor )
-{
-    U32 result = 0;
 
-    if ( sensor < NUM_OF_PRESSURE_SENSORS )
-    {
-        result = lastPressureErrorCounter[ sensor ].data;
-        if ( OVERRIDE_KEY == lastPressureErrorCounter[ sensor ].override )
-        {
-            result = lastPressureErrorCounter[ sensor ].ovData;
-        }
-    }
-    else
-    {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR4, sensor )
-    }
-
-    return result;
-}
-
-
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
@@ -332,21 +302,4 @@
     return result;
 }
 
-/*********************************************************************//**
- * @brief
- * The testPressureSensorErrorCounterOverride function overrides the value
- * of the specified pressure sensor error counter with a given value.
- * @details \b Inputs: none
- * @details \b Outputs: lastPressureErrorCounter[]
- * @param message Override message from Dialin which includes an sensor
- * ID and override value of the pressure sensor error counter.
- * @return TRUE if override successful, FALSE if not
- *************************************************************************/
-BOOL testPressureSensorErrorCounterOverride( MESSAGE_T *message )
-{
-    BOOL result = u32ArrayOverride( message, &lastPressureErrorCounter[0], NUM_OF_PRESSURE_SENSORS - 1, 0, PRES_SENSORS_READ_ERR_MAX_CNT );
-
-    return result;
-}
-
 /**@}*/