Index: firmware/App/Drivers/PressureSensor.c
===================================================================
diff -u -rf3a26c402a2ec88f5ee7dbb8eb7127ab5b4692aa -r961784c895cb8f551a2623cd02dcbfe42d04b7c2
--- firmware/App/Drivers/PressureSensor.c	(.../PressureSensor.c)	(revision f3a26c402a2ec88f5ee7dbb8eb7127ab5b4692aa)
+++ firmware/App/Drivers/PressureSensor.c	(.../PressureSensor.c)	(revision 961784c895cb8f551a2623cd02dcbfe42d04b7c2)
@@ -122,22 +122,22 @@
     U16 h14 = getH14Pressure();
 
     // Update status of pressure sensors
-    currentPressureStatus[ H2 ] = getPressureStatusFromFPGARegReading( h2 );
-    currentPressureStatus[ H14 ] = getPressureStatusFromFPGARegReading( h14 );
+    currentPressureStatus[ H2_PRES ] = getPressureStatusFromFPGARegReading( h2 );
+    currentPressureStatus[ H14_PRES ] = getPressureStatusFromFPGARegReading( h14 );
 
     // Update and convert raw pressures to mmHg
-    currentPressureReadings[ H2 ].data = convertPressureRdg2mmHg( h2 );
-    currentPressureReadings[ H14 ].data   = convertPressureRdg2mmHg( h14 );
+    currentPressureReadings[ H2_PRES ].data = convertPressureRdg2mmHg( h2 );
+    currentPressureReadings[ H14_PRES ].data   = convertPressureRdg2mmHg( h14 );
 
     // Update and convert raw pressure sensor temperatures to deg C
-    currentPresTempReadings[ H2 ].data = convertPressureTempReading2DegC( getH2Temperature() );
-    currentPresTempReadings[ H14 ].data = convertPressureTempReading2DegC( getH14Temperature() );
+    currentPresTempReadings[ H2_PRES ].data = convertPressureTempReading2DegC( getH2Temperature() );
+    currentPresTempReadings[ H14_PRES ].data = convertPressureTempReading2DegC( getH14Temperature() );
 
     // Update read and error counters for each pressure sensor
-    lastPressureReadCounter[ H2 ].data = (U32)getH2ReadCounter();
-    lastPressureReadCounter[ H14 ].data = (U32)getH14ReadCounter();
-    lastPressureErrorCounter[ H2 ].data = (U32)getH2ErrorCounter();
-    lastPressureErrorCounter[ H14 ].data = (U32)getH14ErrorCounter();
+    lastPressureReadCounter[ H2_PRES ].data = (U32)getH2ReadCounter();
+    lastPressureReadCounter[ H14_PRES ].data = (U32)getH14ReadCounter();
+    lastPressureErrorCounter[ H2_PRES ].data = (U32)getH2ErrorCounter();
+    lastPressureErrorCounter[ H14_PRES ].data = (U32)getH14ErrorCounter();
 
     // Monitor pressure sensor health
     checkPressureSensors();
@@ -196,17 +196,17 @@
  *************************************************************************/
 static void checkPressureSensors( void )
 {
-    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 ) );
+    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_ARTERIAL_PRESSURE_SENSOR, getPressureSensorReadCount( H2_PRES ) );
+    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_VENOUS_PRESSURE_SESNOR, getPressureSensorReadCount( H14_PRES ) );
+    checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_ARTERIAL_PRESSURE_SENSOR, getPressureSensorErrorCount( H2_PRES ) );
+    checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_VENOUS_PRESSURE_SESNOR, getPressureSensorErrorCount( H14_PRES ) );
 
     // verify status of pressure sensors
-    if ( currentPressureStatus[ H2 ] != PRESSURE_NORMAL_OP )
+    if ( currentPressureStatus[ H2_PRES ] != PRESSURE_NORMAL_OP )
     {
         // TODO - alarm?
     }
-    if ( currentPressureStatus[ H14 ] != PRESSURE_NORMAL_OP )
+    if ( currentPressureStatus[ H14_PRES ] != PRESSURE_NORMAL_OP )
     {
         // TODO - alarm?
     }