Index: firmware/App/Services/FpgaDD.c
===================================================================
diff -u -r9813fbbe169275c84c8161deb7e6649521bddb41 -r3d892e651530c0b7254611347a5fd61d994407a1
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 9813fbbe169275c84c8161deb7e6649521bddb41)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 3d892e651530c0b7254611347a5fd61d994407a1)
@@ -382,8 +382,8 @@
     U32 fpgaD99Temp;                            ///< Reg 668.  D99 temperature sensor
     U32 tempTax1;                               ///< Reg 672.  ( Tax1 ) temperature sensor reading.
     U32 tempRTD;                                ///< Reg 676.  spare temperature sensor reading.
-    U08 ad7124readcnt;                           ///< Reg 680.  Counter which increments when an invalid transaction happen between FPGA and AD7124.
-    U08 ad7124errcnt;                          ///< Reg 681.  Counter which increments when a valid transaction happens between FPGA and AD7124.
+    U08 ad7124readcnt;                          ///< Reg 680.  Counter which increments when an invalid transaction happen between FPGA and AD7124.
+    U08 ad7124errcnt;                           ///< Reg 681.  Counter which increments when a valid transaction happens between FPGA and AD7124.
     U16 flowRateP16;                            ///< Reg 682.  P16 flow sensor rate.
     U16 flowTempP16;                            ///< Reg 684.  P16 flow sensor temperature.
     U16 flowIntTempP16;                         ///< Reg 686.  P16 flow sensor internal temperature.
@@ -432,19 +432,19 @@
     U08 fpgaD43TempReadCount;                   ///< Reg 784. D44 temperature successful read count
     U08 fpgaD43TempErrorCount;                  ///< Reg 785. D44 Temperature error read count
     U08 fpgaD43CalMemCounter;                   ///< Reg 786. TBD
-    U08 fpgaP9CalMemCounter;                   ///< Reg 787. TBD
+    U08 fpgaP9CalMemCounter;                    ///< Reg 787. TBD
     U32 conductivityP9Data;                     ///< Reg 788. P10 CAL word update
-    U32 conductivityP9Cond;                        ///< Reg 792. P10 Conductivity
-    U32 conductivityP9Temp;                        ///< Reg 796. P10 Temperature
-    U08 conductivityP9ReadCount;                     ///< Reg 800. P10 successful read count
-    U08 conductivityP9ErrorCount;                    ///< Reg 801. P10 error read count
-    U08 fpgaP9TempReadCount;                   ///< Reg 802. P10 temperature successful read count
-    U08 fpgaP9TempErrorCount;                  ///< Reg 803. P10 Temperature error read count
-    U32 conductivityP18Data;                     ///< Reg 804. P19 CAL word update
-    U32 conductivityP18Cond;                        ///< Reg 808. P19 Conductivity
-    U32 conductivityP18Temp;                        ///< Reg 812. P19 Temperature
-    U08 conductivityP18ReadCount;                     ///< Reg 816. P19 successful read count
-    U08 conductivityP18ErrorCount;                    ///< Reg 817. P19 error read count
+    U32 conductivityP9Cond;                     ///< Reg 792. P10 Conductivity
+    U32 conductivityP9Temp;                     ///< Reg 796. P10 Temperature
+    U08 conductivityP9ReadCount;                ///< Reg 800. P10 successful read count
+    U08 conductivityP9ErrorCount;               ///< Reg 801. P10 error read count
+    U08 fpgaP9TempReadCount;                    ///< Reg 802. P10 temperature successful read count
+    U08 fpgaP9TempErrorCount;                   ///< Reg 803. P10 Temperature error read count
+    U32 conductivityP18Data;                    ///< Reg 804. P19 CAL word update
+    U32 conductivityP18Cond;                    ///< Reg 808. P19 Conductivity
+    U32 conductivityP18Temp;                    ///< Reg 812. P19 Temperature
+    U08 conductivityP18ReadCount;               ///< Reg 816. P19 successful read count
+    U08 conductivityP18ErrorCount;              ///< Reg 817. P19 error read count
     U08 fpgaP18TempReadCount;                   ///< Reg 818. P19 temperature successful read count
     U08 fpgaP18TempErrorCount;                  ///< Reg 819. P19 Temperature error read count
     U08 fpgaP18CalMemCounter;                   ///< Reg 820. TBD
@@ -618,10 +618,10 @@
 // ********** private data **********
 
 static FPGA_HEADER_T                  fpgaHeader;                             ///< FPGA header structure.
-static DD_FPGA_SENSORS_BETA_1_9_T     fpgaBeta19SensorReadings;                     ///< DD FPGA sensors structure.
-static FPGA_ACTUATORS_BETA_1_9_T      fpgaBeta19ActuatorSetPoints;                  ///< FPGA actuator set points structure.
-static DD_FPGA_SENSORS_T              fpgaSensorReadings;                ///< DD FPGA sensors structure for beta 2.
-static FPGA_ACTUATORS_T               fpgaActuatorSetPoints;             ///< FPGA actuator set points structure for beta 2.
+static DD_FPGA_SENSORS_BETA_1_9_T     fpgaBeta19SensorReadings;               ///< DD FPGA sensors structure.
+static FPGA_ACTUATORS_BETA_1_9_T      fpgaBeta19ActuatorSetPoints;            ///< FPGA actuator set points structure.
+static DD_FPGA_SENSORS_T              fpgaSensorReadings;                     ///< DD FPGA sensors structure for beta 2.
+static FPGA_ACTUATORS_T               fpgaActuatorSetPoints;                  ///< FPGA actuator set points structure for beta 2.
 
 // ********** private function prototypes **********
 
@@ -658,7 +658,7 @@
     fpgaActuatorSetPoints.fpgaDDSpareValvePWMControl    = FPGA_ENABLE_UF_VALVES_PWM;
     fpgaActuatorSetPoints.fpgaADCControl                = FPGA_ADC_AUTO_READ_ENABLE;
 
-#if 1
+#if 1    // Remove when Beta 1.9 is obsolete
     // Set the valve control mode and default state of valve for Beta 1.9 HW
     fpgaBeta19ActuatorSetPoints.fpgaValveControl              = FPGA_ENABLE_VALVES_CONTROL;
     fpgaBeta19ActuatorSetPoints.fpgaValvePWMEnable            = FPGA_ENABLE_VALVES_PWM;
@@ -3072,7 +3072,7 @@
  *************************************************************************/
 U16 getFPGAD63LevelSensor( void )
 {
-#if 1
+#if 1    // Remove when Beta 1.9 is obsolete
     if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
     {
         return 0;
@@ -3120,7 +3120,7 @@
  *************************************************************************/
 U16 getFPGAD46LevelSensor( void )
 {
-#if 1
+#if 1    // Remove when Beta 1.9 is obsolete
     if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
     {
         return fpgaSensorReadings.fpgaConductiveLevelStatus;
@@ -3157,7 +3157,7 @@
  *************************************************************************/
 U08 getFPGAFloater2Status( void )
 {
-#if 1
+#if 1    // Remove when Beta 1.9 is obsolete
     if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
     {
         return fpgaSensorReadings.fpgaConductiveLevelStatus;