Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r2d295ca85f19e95da42476a57ca6b4496baf980a -rfc63fb0998e49133a69660c3eccf63fd0aba9413
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 2d295ca85f19e95da42476a57ca6b4496baf980a)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision fc63fb0998e49133a69660c3eccf63fd0aba9413)
@@ -485,17 +485,17 @@
     // finds the delta temperature to be added with the target temperature
     // to maintain the target temperature at dialyzer.
     // Lets calculate the B1,B2 and B3 heat dissipation factors
-    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
     {
+        heatDissipation_b3 = calculateHeatDissipationB3();
+        heatDissipation_b1b2 = calculateHeatDissipationB1andB2();
+    }
+    else
+    {
         // based on Beta2.0 heat loss model
         heatDissipation_b3 = calculateBeta2HeatDissipationB3();
         heatDissipation_b1b2 = calculateBeta2HeatDissipationB1andB2();
     }
-    else
-    {
-        heatDissipation_b3 = calculateHeatDissipationB3();
-        heatDissipation_b1b2 = calculateHeatDissipationB1andB2();
-    }
 
     // Reverse calculation of target temp at D28 to get the target dialyzer temperature
     targetTempAtD28 = calculateInitialTemp( targetTemp, heatDissipation_b3 );
@@ -521,7 +521,7 @@
         F32 targetTempfromTD            = getTDTargetDialysateTemperature();
         F32 measuredTempAtDialyzer      = 0.0F;
 
-        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
+        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
         {
             measuredTempAtDialyzer      = getTeensyConductivityTemperatureValue( D27_COND );
         }
Index: firmware/App/Controllers/RinsePump.c
===================================================================
diff -u -ra6737c3bcc8286c153b778c2c395f465e76aaafb -rfc63fb0998e49133a69660c3eccf63fd0aba9413
--- firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision a6737c3bcc8286c153b778c2c395f465e76aaafb)
+++ firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision fc63fb0998e49133a69660c3eccf63fd0aba9413)
@@ -275,7 +275,7 @@
 
     rinsePumpTargetSpeedRPM = 0;
 
-    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
     {
         F32 pwmPercent;
 
@@ -287,8 +287,8 @@
     }
     else
     {
-        // Current Beta 1.9 system uses on/off bit
-        setValveState( D88_79_VALV, VALVE_STATE_CLOSED );
+        // Set PWM count zero to stop the logical rinse pump
+        setRinsePumpPwmCount( D79_RINSE_PUMP, RINSE_PUMP_OFF_COUNT );
     }
 
     return state;
@@ -305,7 +305,7 @@
 {
     RINSE_PUMP_STATE_T state = RINSE_PUMP_STATE_ON;
 
-    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
     {
         F32 pwmPercent;
 
@@ -315,11 +315,6 @@
         // Turn on logical rinse pump with given PWM value
         setRinsePumpPwm( D79_RINSE_PUMP, pwmPercent );
     }
-    else
-    {
-        // Current Beat 1.9 system uses on/off bit
-        setValveState( D88_79_VALV, VALVE_STATE_OPEN );
-    }
 
     return state;
 }
Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -rfd897db8177752330ad08d877e0a13620513dbdc -rfc63fb0998e49133a69660c3eccf63fd0aba9413
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision fd897db8177752330ad08d877e0a13620513dbdc)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision fc63fb0998e49133a69660c3eccf63fd0aba9413)
@@ -256,7 +256,7 @@
 
     for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ )
     {
-        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
+        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
         {
             if ( sensor != D74_COND )
             {
@@ -343,7 +343,7 @@
 
     for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ )
     {
-        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
+        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
         {
             if ( sensor != D74_COND )
             {
@@ -741,7 +741,7 @@
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload );
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
     {
 
         if ( payload.index != D74_COND )
@@ -778,7 +778,7 @@
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload );
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
     {
 
         if ( payload.index != D74_COND )
Index: firmware/App/Monitors/Level.c
===================================================================
diff -u -ra6737c3bcc8286c153b778c2c395f465e76aaafb -rfc63fb0998e49133a69660c3eccf63fd0aba9413
--- firmware/App/Monitors/Level.c	(.../Level.c)	(revision a6737c3bcc8286c153b778c2c395f465e76aaafb)
+++ firmware/App/Monitors/Level.c	(.../Level.c)	(revision fc63fb0998e49133a69660c3eccf63fd0aba9413)
@@ -135,35 +135,35 @@
                 break;
 
             case D63_LEVL:
-                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
+                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
                 {
-                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD63LevelSensor() ) ? LEVEL_STATE_HIGH  : LEVEL_STATE_LOW;
+                    currentLevelStatus = ( processLevelCount( getFPGAD63LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
                 }
                 else
                 {
-                    currentLevelStatus = ( processLevelCount( getFPGAD63LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
+                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD63LevelSensor() ) ? LEVEL_STATE_HIGH  : LEVEL_STATE_LOW;
                 }
                 break;
 
             case D98_LEVL:
-                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
+                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
                 {
-                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD98LevelSensor() ) ? LEVEL_STATE_HIGH  : LEVEL_STATE_LOW;
+                    currentLevelStatus = ( processLevelCount( getFPGAD98LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
                 }
                 else
                 {
-                    currentLevelStatus = ( processLevelCount( getFPGAD98LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
+                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD98LevelSensor() ) ? LEVEL_STATE_HIGH  : LEVEL_STATE_LOW;
                 }
                 break;
 
             case D46_LEVL:
-                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
+                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
                 {
-                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD46LevelSensor() ) ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW;
+                    currentLevelStatus = ( processLevelCount( getFPGAD46LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
                 }
                 else
                 {
-                    currentLevelStatus = ( processLevelCount( getFPGAD46LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
+                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD46LevelSensor() ) ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW;
                 }
                 break;
 
@@ -447,44 +447,42 @@
     {
        levelStatus = getFPGAD6LevelStatus();
 
-       if ( ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) != TRUE ) &&
-            ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) )
+       if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
        {
            // Beta 1.9 behavior
            currentLevelStatus = getLevelStateBeta19( levelStatus );
        }
-       else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
+       else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
        {
-           // Beta 2.0 behavior
-           currentLevelStatus = getLevelState( levelStatus );
+           // Beta 1.0 behavior
+           currentLevelStatus = getLevelStateBeta10( levelStatus );
        }
        else
        {
-           // Beta 1.0 behavior
-           currentLevelStatus = getLevelStateBeta10( levelStatus );
+           // Beta 2.0 behavior
+           currentLevelStatus = getLevelState( levelStatus );
        }
     }
 
     else if ( P25_LEVL == levelId )
     {
        levelStatus = getFPGAP25FloaterState();
 
-       if ( ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) != TRUE ) &&
-            ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) )
+       if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
        {
            // Beta 1.9 behavior
            currentLevelStatus = getLevelStateBeta19( levelStatus );
        }
-       else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
-      {
-          // Beta 2.0 behavior
-          currentLevelStatus = getLevelState( levelStatus );
-      }
-       else
+       else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
        {
            // Beta 1.0 behavior
            currentLevelStatus = getLevelStateBeta10( levelStatus );
        }
+       else
+       {
+           // Beta 2.0 behavior
+           currentLevelStatus = getLevelState( levelStatus );
+       }
     }
 
     else
Index: firmware/App/Monitors/Temperature.c
===================================================================
diff -u -ra6737c3bcc8286c153b778c2c395f465e76aaafb -rfc63fb0998e49133a69660c3eccf63fd0aba9413
--- firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision a6737c3bcc8286c153b778c2c395f465e76aaafb)
+++ firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision fc63fb0998e49133a69660c3eccf63fd0aba9413)
@@ -349,13 +349,13 @@
         {
             CONDUCTIVITY_SENSORS_T sensor = ( DIAL_TEMP_D28 == i ? D27_COND : D29_COND );
 
-            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
+            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
             {
-                temperatureC = getTeensyConductivityTemperatureValue( sensor );
+                temperatureC = getConductivityTemperature( sensor );
             }
             else
             {
-                temperatureC = getConductivityTemperature( sensor );
+                temperatureC = getTeensyConductivityTemperatureValue( sensor );
             }
 
             currentIndex = dialTempMovingAvgData[ i ].dialTempSamplesNextIndex;
@@ -482,22 +482,22 @@
         data.d99Temp        = getTemperatureValue( D99_TEMP );
         data.boardTemp      = getTemperatureValue( BRD_TEMP );
 
-        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
+        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
         {
-            data.d16CondTemp    = getTeensyConductivityTemperatureValue( D17_COND );
-            data.d28CondTemp    = getTeensyConductivityTemperatureValue( D27_COND );
-            data.d30CondTemp    = getTeensyConductivityTemperatureValue( D29_COND );
-            data.d44CondTemp    = getTeensyConductivityTemperatureValue( D43_COND );
-            data.d75CondTemp    = getConductivityTemperature( D74_COND );
-        }
-        else
-        {
             data.d16CondTemp    = getConductivityTemperature( D17_COND );
             data.d28CondTemp    = getConductivityTemperature( D27_COND );
             data.d30CondTemp    = getConductivityTemperature( D29_COND );
             data.d44CondTemp    = getConductivityTemperature( D43_COND );
             data.d75CondTemp    = getConductivityTemperature( D74_COND );
         }
+        else
+        {
+            data.d16CondTemp    = getTeensyConductivityTemperatureValue( D17_COND );
+            data.d28CondTemp    = getTeensyConductivityTemperatureValue( D27_COND );
+            data.d30CondTemp    = getTeensyConductivityTemperatureValue( D29_COND );
+            data.d44CondTemp    = getTeensyConductivityTemperatureValue( D43_COND );
+            data.d75CondTemp    = getConductivityTemperature( D74_COND );
+        }
 
         data.d4AvgTemp      = getFilteredTemperatureValue( D4_TEMP );
         data.d50AvgTemp     = getFilteredTemperatureValue( D50_TEMP );
Index: firmware/App/Services/FpgaDD.c
===================================================================
diff -u -ra6737c3bcc8286c153b778c2c395f465e76aaafb -rfc63fb0998e49133a69660c3eccf63fd0aba9413
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision a6737c3bcc8286c153b778c2c395f465e76aaafb)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision fc63fb0998e49133a69660c3eccf63fd0aba9413)
@@ -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 ) == FALSE ? fpgaSensorReadings.field : fpgaBeta19SensorReadings.field)
+#define GET_FPGA_SENSOR_FIELD(field) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ? 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 ) == FALSE ? fpgaActuatorSetPoints.field : fpgaBeta19ActuatorSetPoints.field)
+#define GET_FPGA_ACTUATOR_FIELD(field) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ? 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 ) == FALSE ? ( fpgaActuatorSetPoints.field = value ) : ( fpgaBeta19ActuatorSetPoints.field = value ))
+#define SET_FPGA_ACTUATOR_FIELD(field, value) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ? ( 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 ) == FALSE ? ( fpgaActuatorSetPoints.field |= bits ) : ( fpgaBeta19ActuatorSetPoints.field |= bits ))
+#define SET_FPGA_ACTUATOR_BITS(field, bits) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ? ( 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 ) == FALSE ? ( fpgaActuatorSetPoints.field &= bits ) : ( fpgaBeta19ActuatorSetPoints.field &= bits ))
+#define CLEAR_FPGA_ACTUATOR_BITS(field, bits) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ? ( 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.
@@ -1193,6 +1193,20 @@
 
 /*********************************************************************//**
  * @brief
+ * The setFPGAD92PumpSetStepSpeed function sets the step speed period for
+ * HDF D92_Pump.
+ * @details \b Inputs: none
+ * @details \b Outputs: fpgaD92PumpSpeed
+ * @param stepSpeed The HDF pump step speed period
+ * @return none
+ *************************************************************************/
+void setFPGAD92PumpSetStepSpeed( U32 stepSpeed )
+{
+    fpgaActuatorSetPoints.fpgaD92PumpSpeed = stepSpeed;
+}
+
+/*********************************************************************//**
+ * @brief
  * The setFPGAD11PumpControl function sets the DVT concentrate pump 1
  * (acid pump) control mode.
  *      bit 7: Park (set in different function)
@@ -1256,6 +1270,26 @@
 
 /*********************************************************************//**
  * @brief
+ * The setFPGAD92PumpControl function sets the UF pump
+ * (D76 pump) control mode.
+ *      bit 7: Park (set in different function)
+ *      bit 6: nSleep
+ *      bit 5: nReset
+ *      bit 4: nEnable
+ *      bit 3: Direction (1=Fwd, 0=Rev)
+ *      bit 0-2: Microstepping resolution
+ * @details \b Inputs: none
+ * @details \b Outputs: fpgaD76PumpControl
+ * @param control UF pump control set
+ * @return none
+ *************************************************************************/
+void setFPGAD92PumpControl( U08 control )
+{
+    fpgaActuatorSetPoints.fpgaD92PumpControl &= 0x80; // preserve msb (park command bit)
+    fpgaActuatorSetPoints.fpgaD92PumpControl |= control;
+}
+/*********************************************************************//**
+ * @brief
  * The setFPGAD11PumpParkCmd function sets the DVT concentrate pump 1
  * (acid pump) park command bit.
  *      bit 7: Park command bit
@@ -1374,6 +1408,19 @@
 
 /*********************************************************************//**
  * @brief
+ * The setFPGAD92PumpRevolutionCount function sets the HDF
+ * pump revolution count.
+ * @details \b Inputs: none
+ * @details \b Outputs: fpgaD92PumpRevCount
+ * @param count the number of revolution to be rotated for the pump.
+ * @return none
+ *************************************************************************/
+void setFPGAD92PumpRevolutionCount( U32 count )
+{
+    fpgaActuatorSetPoints.fpgaD92PumpRevCount = count;
+}
+/*********************************************************************//**
+ * @brief
  * The setFPGAD5HeaterOnOffControl function sets the primary heater
  * On/Off control.
  * @details \b Inputs: none
@@ -1672,6 +1719,25 @@
 
 /*********************************************************************//**
  * @brief
+ * The getFPGAD76PumpControlStatus function gets the Ultrafilteration pump
+ * (D76 pump) control mode.
+ *      bit 7: Park (set in different function)
+ *      bit 6: nSleep
+ *      bit 5: nReset
+ *      bit 4: nEnable
+ *      bit 3: Direction (1=Fwd, 0=Rev)
+ *      bit 0-2: Microstepping resolution
+ * @details \b Inputs: none
+ * @details \b Outputs: fpgaD76PumpControl
+ * @return UF pump control status bit
+ *************************************************************************/
+U08 getFPGAD92PumpControlStatus( void )
+{
+    return fpgaActuatorSetPoints.fpgaD92PumpControl;
+}
+
+/*********************************************************************//**
+ * @brief
  * The getFPGAUFPumpFault function gets UF pumps fault
  * reported by FGPA.
  * @details \b Inputs: fpgaD76PumpFault
@@ -2518,13 +2584,13 @@
     U16 result;
 
 #if 1    // Remove when Beta 1.9 is obsolete
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
     {
-        result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & BIT( BIT1 ) ) >> BIT1;
+        result = fpgaBeta19SensorReadings.fpgaD63LevelSensor;
     }
     else
     {
-        result = fpgaBeta19SensorReadings.fpgaD63LevelSensor;
+        result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & BIT( BIT1 ) ) >> BIT1;
     }
 #else
     result = GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus );
@@ -2546,13 +2612,13 @@
     U16 result;
 
 #if 1    // Remove when Beta 1.9 is obsolete
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
     {
-        result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & BIT( BIT2 ) ) >> BIT2;
+        result = fpgaBeta19SensorReadings.fpgaD98LevelSensor;
     }
     else
     {
-        result = fpgaBeta19SensorReadings.fpgaD98LevelSensor;
+        result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & BIT( BIT2 ) ) >> BIT2;
     }
 #else
     result = GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus );
@@ -2574,13 +2640,13 @@
     U16 result;
 
 #if 1    // Remove when Beta 1.9 is obsolete
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
     {
-        result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & BIT ( BIT0 ) ) >> BIT0;
+        result = fpgaBeta19SensorReadings.fpgaD46LevelSensor;
     }
     else
     {
-        result = fpgaBeta19SensorReadings.fpgaD46LevelSensor;
+        result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & BIT ( BIT0 ) ) >> BIT0;
     }
 #else
     result = GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus );
@@ -2614,7 +2680,7 @@
 {
     U08 result;
 #if 1    // Remove when Beta 1.9 is obsolete
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
     {
         result = fpgaSensorReadings.fpgaConductiveLevelStatus;
     }
@@ -2741,7 +2807,7 @@
 {
     U08 result = 0U;
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
     {
         result = fpgaSensorReadings.fpgaIOExpReadCount;
     }
@@ -2761,7 +2827,7 @@
 {
     U08 result = 0U;
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
     {
         result = fpgaSensorReadings.fpgaIOExpERrorCount;
     }
@@ -2780,7 +2846,7 @@
 {
     U08 result = 0U;
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
     {
         result = fpgaSensorReadings.fpgaHallSensorStatus;
     }
@@ -2799,7 +2865,7 @@
 {
     U08 result = 0U;
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
     {
         result = fpgaSensorReadings.fpgaGPIOStatus;
     }
@@ -2851,7 +2917,7 @@
 {
     U32 result = 0UL;
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
     {
         result = fpgaSensorReadings.tempTax1;
     }
@@ -2870,7 +2936,7 @@
 {
     U32 result = 0UL;
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
     {
         result = fpgaSensorReadings.tempRTD;
     }
@@ -2890,7 +2956,7 @@
 {
     U08 result = 0U;
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
     {
         result = fpgaSensorReadings.ad7124readcnt;
     }
@@ -2910,7 +2976,7 @@
 {
     U08 result = 0U;
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
     {
         result = fpgaSensorReadings.ad7124errcnt;
     }
@@ -3618,7 +3684,7 @@
 {
     U08 result = 0U;
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
     {
         result = fpgaSensorReadings.p7flowReadCount;
     }
@@ -3638,7 +3704,7 @@
 {
     U08 result = 0U;
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
     {
         result = fpgaSensorReadings.p7flowErrorCount;
     }
@@ -3658,7 +3724,7 @@
 {
     U08 result = 0U;
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
     {
         result = fpgaSensorReadings.p16flowReadCount;
     }
@@ -3678,7 +3744,7 @@
 {
     U08 result = 0U;
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
     {
         result = fpgaSensorReadings.p16flowErrorCount;
     }