Index: firmware/App/Services/FpgaDD.c
===================================================================
diff -u -r4440a7a6b86afcaed7573596abe30bcf5820aba4 -rdfeca71d28f8e979352c5aeb2e600c7922a06b89
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 4440a7a6b86afcaed7573596abe30bcf5820aba4)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision dfeca71d28f8e979352c5aeb2e600c7922a06b89)
@@ -38,12 +38,12 @@
 
 // ********** private definitions **********
 
-/////
-//#define FPGASENSORREADINGS        ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ? (DD_FPGA_SENSORS_T*)&fpgaSensorReadings : (DD_FPGA_SENSORS_BETA_2_T*)&fpgaBeta2SensorReadings )
-//
-/////
-//#define FPGAACTUATORSETPOINTS     ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ? (FPGA_ACTUATORS_T*)&fpgaActuatorSetPoints : (FPGA_ACTUATORS_BETA_2_T*)&fpgaBeta2ActuatorSetPoints )
+/// 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 ? fpgaBeta2SensorReadings.field : fpgaSensorReadings.field)
 
+/// Macro to retrieve the FPGA actuator field based on HW type
+#define GET_FPGA_ACTUATOR_FIELD(field) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ? fpgaBeta2ActuatorSetPoints.field : fpgaActuatorSetPoints.field)
+
 #define FPGA_EXPECTED_ID                0x04                    ///< FPGA expected ID.
 
 #define MAX_COMM_ERROR_RETRIES          5                       ///< Maximum number of communication error retries
@@ -605,12 +605,6 @@
 static DD_FPGA_SENSORS_BETA_2_T    fpgaBeta2SensorReadings;                ///< DD FPGA sensors structure for beta 2.
 static FPGA_ACTUATORS_BETA_2_T     fpgaBeta2ActuatorSetPoints;             ///< FPGA actuator set points structure for beta 2.
 
-/// 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 ? fpgaBeta2SensorReadings.field : fpgaSensorReadings.field)
-
-/// Macro to retrieve the FPGA actuator field based on HW type
-#define GET_FPGA_ACTUATOR_FIELD(field) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ? fpgaBeta2ActuatorSetPoints.field : fpgaActuatorSetPoints.field)
-
 // ********** private function prototypes **********
 
 static U16 getFPGATimerCount( void );