Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r12929ac400de74684371b01b962926f868922448 -r2245e17875668a9326a5f5155a56747378e139e9
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 12929ac400de74684371b01b962926f868922448)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 2245e17875668a9326a5f5155a56747378e139e9)
@@ -404,7 +404,7 @@
     F32 bicarbVolume      = getF32OverrideValue( &bicarbDoseVolume );
 
     // Check fresh and spent dialysate pressure in range or BC switch only flag set
-#ifdef __BC_PRESSURE_ALARM__
+#ifndef __BC_PRESSURE_ALARM__
     if ( 1 )
 #else
     if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) &&
@@ -597,7 +597,7 @@
     F32 bicarbVolume      = getF32OverrideValue( &bicarbDoseVolume );
 
     // Check fresh and spent dialysate pressure in range
-#ifdef __BC_PRESSURE_ALARM__
+#ifndef __BC_PRESSURE_ALARM__
     if ( 1 )
 #else
     if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) &&
Index: firmware/App/Drivers/PressureSensor.c
===================================================================
diff -u -r12929ac400de74684371b01b962926f868922448 -r2245e17875668a9326a5f5155a56747378e139e9
--- firmware/App/Drivers/PressureSensor.c	(.../PressureSensor.c)	(revision 12929ac400de74684371b01b962926f868922448)
+++ firmware/App/Drivers/PressureSensor.c	(.../PressureSensor.c)	(revision 2245e17875668a9326a5f5155a56747378e139e9)
@@ -32,11 +32,11 @@
 #define PRES_SENSORS_COUNT_ERROR_TIMEOUT_MS         ( 2 * MS_PER_SECOND )                               ///< Pressure sensors read and error count timeout in milliseconds.
 #define HIGH_PRES_MAX_PSI                           145.038F                                            ///< Convert pressure to PSI for 10 bar pressure sensor
 #define LOW_PRES_MAX_PSI                            50.7632F                                            ///< Convert pressure to PSI for 3.5 bar pressure sensor
-#define __BETA_HW_VER__
+#ifdef __BETA_HW_VER__
 #define PRES_MIN_PSI                                0.0F                                                ///< Minimum value for PSI conversion
-//#else
+#else
 #define PRES_MIN_PSI                                -14.5038F                                           ///< Minimum value for PSI conversion
-//#endif
+#endif
 #define ONE_BAR_TO_MILLI_BAR                        1000                                                ///< 1 bar to milli-bar conversion.
 #define COUNTS_TO_MILLI_BAR                         100                                                 ///< Counts to milli-bar conversion.
 #define BAR_TO_MMHG                                 ( 750.062F )                                        ///< Conversion factor for converting bar to mmHg.
@@ -146,7 +146,7 @@
 void readPressureSensors( void )
 {
     // Update and convert raw pressures to mmHg
-#ifdef __BETA_HW_VER__
+#ifndef __BETA_HW_VER__
     currentPressureReadings[ M1_PRES ].data = convertPressureReading( getFPGAM1PresRawPressure(), PRES_MIN_PSI, HIGH_PRES_MAX_PSI );
     currentPressureReadings[ M3_PRES ].data   = convertPressureReading( getFPGAM3PresRawPressure(),PRES_MIN_PSI, HIGH_PRES_MAX_PSI );
     currentPressureReadings[ D9_PRES ].data = convertPressureReading( getFPGAD9PresRawPressure(),PRES_MIN_PSI, HIGH_PRES_MAX_PSI );
Index: firmware/App/Services/Messaging.h
===================================================================
diff -u -r12929ac400de74684371b01b962926f868922448 -r2245e17875668a9326a5f5155a56747378e139e9
--- firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision 12929ac400de74684371b01b962926f868922448)
+++ firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision 2245e17875668a9326a5f5155a56747378e139e9)
@@ -81,7 +81,6 @@
 
 BOOL handleSetTestConfiguration( MESSAGE_T *message );
 BOOL handleGetTestConfiguration( MESSAGE_T *message );
-//BOOL handleSendTestConfiguration( MESSAGE_T *message );
 BOOL handleResetAllTestConfigurations( MESSAGE_T *message );
 
 /**@}*/