Index: firmware/App/Drivers/PressureSensor.c
===================================================================
diff -u -ra014a5b7ce32af7396c85b4124d65a142f1786b2 -r2b6cacca0848d44870d297c90e5d63b27485195e
--- firmware/App/Drivers/PressureSensor.c	(.../PressureSensor.c)	(revision a014a5b7ce32af7396c85b4124d65a142f1786b2)
+++ firmware/App/Drivers/PressureSensor.c	(.../PressureSensor.c)	(revision 2b6cacca0848d44870d297c90e5d63b27485195e)
@@ -231,7 +231,7 @@
 
     // If the arterial pressure status is normal, convert the counts to pressure in mmHg
     presPSI = ( ( (F32)rdg - PRES_SENSORS_ZERO_OFFSET ) *( PRESSURE_MAX_PSI - PRESSURE_MIN_PSI ) / PRES_SENSORS_DIVISOR ) + PRESSURE_MIN_PSI;
-    mmHg    = presPSI * PSI_TO_MMHG;
+    mmHg = convertPsiToMmhg( presPSI );
 
     return mmHg;
 }
@@ -533,7 +533,7 @@
 {
    F32 psiToMmhgConversionFactor;
 
-   if ( getTestConfigStatus( TEST_CONFIG_ENABLE_BETA_1_0_HW ) == TRUE )
+   if ( getTestConfigStatus( TEST_CONFIG_ENABLE_BETA_1_HW ) == TRUE )
    {
        // Beta 1: 30 PSI
        psiToMmhgConversionFactor = ( PRESSURE_MAX_PSI / 30.0F );