Index: firmware/App/Drivers/PressureSensor.c
===================================================================
diff -u -rbd37ce75271151436de0bb6de9f75123d8251396 -reffc2a8283d6528109b2401bbad70dc554db4e53
--- firmware/App/Drivers/PressureSensor.c	(.../PressureSensor.c)	(revision bd37ce75271151436de0bb6de9f75123d8251396)
+++ firmware/App/Drivers/PressureSensor.c	(.../PressureSensor.c)	(revision effc2a8283d6528109b2401bbad70dc554db4e53)
@@ -18,17 +18,17 @@
 #include "FpgaTD.h"
 #include "Messaging.h"
 #include "PersistentAlarm.h"
-#include "PressureCommon.h"
+#include "PressureCommon.h"
 #include "PressureSensor.h"
-#include "Utilities.h"
-
+#include "Utilities.h"
+
 /**
  *  @addtogroup PressureSensor
  *  @{
  */
 
-// ********** private definitions **********
-
+// ********** private definitions **********
+
 #define PRES_SENSORS_ZERO_OFFSET                    ( 1638.0F )                             ///< Zero offset for pressure sensor readings.
 #define PRES_SENSORS_DIVISOR                        ( 14745.0F - PRES_SENSORS_ZERO_OFFSET ) ///< Divisor for pressure sensor conversion from counts to bars.
 #define PRESSURE_MIN_PSI                            ( -30.0F )                              ///< Minimum of scale for pressure sensor reading (in PSI).
@@ -46,8 +46,8 @@
 #define PRESSURE_STALE_DATA                         2                                       ///< Pressure status bits indicate data is stale (no new data since last fpga read).
 #define PRESSURE_DIAG_CONDITION                     3                                       ///< Pressure status bits diagnostic condition (alarm).
 
-// ********** private data **********
-
+// ********** private data **********
+
 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).
@@ -56,7 +56,7 @@
 
 // ********** private function prototypes **********
 
-static void checkPressureSensors( void );
+static void checkPressureSensors( void );
 static F32 convertPressureRdg2mmHg( U16 counts );
 static U32 getPressureStatusFromFPGARegReading( U16 fpgaReg );
 
@@ -118,26 +118,26 @@
  *************************************************************************/
 void readPressureSensors( void )
 {
-    U16 PBA = getPBAPressure();
-    U16 PBO = getPBOPressure();
+    U16 h2 = getH2Pressure();
+    U16 h14 = getH14Pressure();
 
     // Update status of pressure sensors
-    currentPressureStatus[ PRESSURE_SENSOR_ARTERIAL ] = getPressureStatusFromFPGARegReading( PBA );
-    currentPressureStatus[ PRESSURE_SENSOR_VENOUS ] = getPressureStatusFromFPGARegReading( PBO );
+    currentPressureStatus[ H2 ] = getPressureStatusFromFPGARegReading( h2 );
+    currentPressureStatus[ H14 ] = getPressureStatusFromFPGARegReading( h14 );
 
     // Update and convert raw pressures to mmHg
-    currentPressureReadings[ PRESSURE_SENSOR_ARTERIAL ].data = convertPressureRdg2mmHg( PBA );
-    currentPressureReadings[ PRESSURE_SENSOR_VENOUS ].data   = convertPressureRdg2mmHg( PBO );
+    currentPressureReadings[ H2 ].data = convertPressureRdg2mmHg( h2 );
+    currentPressureReadings[ H14 ].data   = convertPressureRdg2mmHg( h14 );
 
     // Update and convert raw pressure sensor temperatures to deg C
-    currentPresTempReadings[ PRESSURE_SENSOR_ARTERIAL ].data = convertPressureTempReading2DegC( getPBATemperature() );
-    currentPresTempReadings[ PRESSURE_SENSOR_VENOUS ].data = convertPressureTempReading2DegC( getPBOTemperature() );
+    currentPresTempReadings[ H2 ].data = convertPressureTempReading2DegC( getH2Temperature() );
+    currentPresTempReadings[ H14 ].data = convertPressureTempReading2DegC( getH14Temperature() );
 
     // Update read and error counters for each pressure sensor
-    lastPressureReadCounter[ PRESSURE_SENSOR_ARTERIAL ].data = (U32)getPBAReadCounter();
-    lastPressureReadCounter[ PRESSURE_SENSOR_VENOUS ].data = (U32)getPBOReadCounter();
-    lastPressureErrorCounter[ PRESSURE_SENSOR_ARTERIAL ].data = (U32)getPBAErrorCounter();
-    lastPressureErrorCounter[ PRESSURE_SENSOR_VENOUS ].data = (U32)getPBAErrorCounter();
+    lastPressureReadCounter[ H2 ].data = (U32)getH2ReadCounter();
+    lastPressureReadCounter[ H14 ].data = (U32)getH14ReadCounter();
+    lastPressureErrorCounter[ H2 ].data = (U32)getH2ErrorCounter();
+    lastPressureErrorCounter[ H14 ].data = (U32)getH14ErrorCounter();
 
     // Monitor pressure sensor health
     checkPressureSensors();
@@ -196,17 +196,17 @@
  *************************************************************************/
 static void checkPressureSensors( void )
 {
-    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_ARTERIAL_PRESSURE_SENSOR, getPressureSensorReadCount( PRESSURE_SENSOR_ARTERIAL ) );
-    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_VENOUS_PRESSURE_SESNOR, getPressureSensorReadCount( PRESSURE_SENSOR_VENOUS ) );
-    checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_ARTERIAL_PRESSURE_SENSOR, getPressureSensorErrorCount( PRESSURE_SENSOR_ARTERIAL ) );
-    checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_VENOUS_PRESSURE_SESNOR, getPressureSensorErrorCount( PRESSURE_SENSOR_VENOUS ) );
+    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_ARTERIAL_PRESSURE_SENSOR, getPressureSensorReadCount( H2 ) );
+    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_VENOUS_PRESSURE_SESNOR, getPressureSensorReadCount( H14 ) );
+    checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_ARTERIAL_PRESSURE_SENSOR, getPressureSensorErrorCount( H2 ) );
+    checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_VENOUS_PRESSURE_SESNOR, getPressureSensorErrorCount( H14 ) );
 
     // verify status of pressure sensors
-    if ( currentPressureStatus[ PRESSURE_SENSOR_ARTERIAL ] != PRESSURE_NORMAL_OP )
+    if ( currentPressureStatus[ H2 ] != PRESSURE_NORMAL_OP )
     {
         // TODO - alarm?
     }
-    if ( currentPressureStatus[ PRESSURE_SENSOR_ARTERIAL ] != PRESSURE_NORMAL_OP )
+    if ( currentPressureStatus[ H14 ] != PRESSURE_NORMAL_OP )
     {
         // TODO - alarm?
     }
@@ -354,5 +354,5 @@
 
     return result;
 }
-
+
 /**@}*/