Index: firmware/App/Services/FpgaDD.c
===================================================================
diff -u -rfd897db8177752330ad08d877e0a13620513dbdc -r91685a2616bc603aaa3d01206e27ac0b0fd02b45
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision fd897db8177752330ad08d877e0a13620513dbdc)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 91685a2616bc603aaa3d01206e27ac0b0fd02b45)
@@ -40,23 +40,23 @@
 // ********** private definitions **********
 
 /// Macro to retrieve the FPGA sensor field based on HW type
-#define GET_FPGA_SENSOR_FIELD(field) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ? fpgaSensorReadings.field : fpgaBeta19SensorReadings.field)
+#define GET_FPGA_SENSOR_FIELD(field) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == FALSE ? fpgaSensorReadings.field : fpgaBeta19SensorReadings.field)
 //#define GET_FPGA_SENSOR_FIELD(field) (fpgaSensorReadings.field)
 
 /// Macro to retrieve the FPGA sensor field based on HW type
-#define GET_FPGA_ACTUATOR_FIELD(field) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ? fpgaActuatorSetPoints.field : fpgaBeta19ActuatorSetPoints.field)
+#define GET_FPGA_ACTUATOR_FIELD(field) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == FALSE ? fpgaActuatorSetPoints.field : fpgaBeta19ActuatorSetPoints.field)
 //#define GET_FPGA_ACTUATOR_FIELD(field) (fpgaActuatorSetPoints.field)
 
 /// Macro to set the FPGA actuator field value based on HW type
-#define SET_FPGA_ACTUATOR_FIELD(field, value) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ? ( fpgaActuatorSetPoints.field = value ) : ( fpgaBeta19ActuatorSetPoints.field = value ))
+#define SET_FPGA_ACTUATOR_FIELD(field, value) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == FALSE ? ( fpgaActuatorSetPoints.field = value ) : ( fpgaBeta19ActuatorSetPoints.field = value ))
 //#define SET_FPGA_ACTUATOR_FIELD(field, value) (fpgaActuatorSetPoints.field = value)
 
 /// Macro to set the FPGA actuator bits based on HW type
-#define SET_FPGA_ACTUATOR_BITS(field, bits) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ? ( fpgaActuatorSetPoints.field |= bits ) : ( fpgaBeta19ActuatorSetPoints.field |= bits ))
+#define SET_FPGA_ACTUATOR_BITS(field, bits) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == FALSE ? ( fpgaActuatorSetPoints.field |= bits ) : ( fpgaBeta19ActuatorSetPoints.field |= bits ))
 //#define SET_FPGA_ACTUATOR_BITS(field, bits) (fpgaActuatorSetPoints.field |= bits)
 
 /// Macro to clear the FPGA actuator bits based on HW type
-#define CLEAR_FPGA_ACTUATOR_BITS(field, bits) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ? ( fpgaActuatorSetPoints.field &= bits ) : ( fpgaBeta19ActuatorSetPoints.field &= bits ))
+#define CLEAR_FPGA_ACTUATOR_BITS(field, bits) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == FALSE ? ( fpgaActuatorSetPoints.field &= bits ) : ( fpgaBeta19ActuatorSetPoints.field &= bits ))
 //#define CLEAR_FPGA_ACTUATOR_BITS(field, bits) (fpgaActuatorSetPoints.field &= bits)
 
 #define FPGA_EXPECTED_ID                0x06                    ///< FPGA expected ID for Beta 2 systems.
@@ -644,8 +644,8 @@
 void initFPGADD( void )
 {
     // Initialize fpga driver for beta 2 hardware
-    initFPGA( (U08*)&fpgaHeader, (U08*)&fpgaBeta19SensorReadings, (U08*)&fpgaBeta19ActuatorSetPoints,
-              sizeof(FPGA_HEADER_T), sizeof(DD_FPGA_SENSORS_BETA_1_9_T), sizeof(FPGA_ACTUATORS_BETA_1_9_T) );
+    initFPGA( (U08*)&fpgaHeader, (U08*)&fpgaSensorReadings, (U08*)&fpgaActuatorSetPoints,
+              sizeof(FPGA_HEADER_T), sizeof(DD_FPGA_SENSORS_T), sizeof(FPGA_ACTUATORS_T) );
 
     // initialize fpga data structures
     memset( &fpgaHeader, 0, sizeof( FPGA_HEADER_T ) );