Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -rcef8149cb8dfbd5c91c32f5318334c5db2366f7e -r45a5b4b93d1793860d5a000406591ee5cf6935d6
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision cef8149cb8dfbd5c91c32f5318334c5db2366f7e)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 45a5b4b93d1793860d5a000406591ee5cf6935d6)
@@ -9,7 +9,7 @@
 * @file    FPGA.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      24-May-2022
+* @date    (last)      28-Aug-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -83,7 +83,11 @@
 #define DRAIN_PUMP_DAC_SHIFT_BITS       4                       ///< Drain pump DAC shift bits.
 
 #define FPGA_FLUIDLEAK_STATE_MASK       0x0004                  ///< Bit mask for fluid leak detector.
-#define FPGA_ENABLE_VALVES_CONTROL      0x015F                  ///< FPGA enable valves control
+#define FPGA_ENABLE_VALVES_CONTROL      0x015F                  ///< FPGA enable valves control.
+#define FPGA_VBF_PWM_PULL_IN_MS         ( 3 * MS_PER_SECOND )   ///< FPGA VBf PWM pull in in milliseconds.
+#define FPGA_VBF_PWM_LOW                9999                    ///< FPGA VBf PWM low.
+#define FPGA_VBF_PWM_PERIOD             16666                   ///< FPGA VBf PWM period.
+#define FPGA_ENABLE_VALVES_PWM          0x0020                  ///< FPGA enable valves PWM.
 #define CONCENTRATE_CAP_SWITCH_MASK     0x10                    ///< Concentrate cap switch bit mask.
 #define DIALYSATE_CAP_SWITCH_MASK       0x20                    ///< Dialysate cap switch bit mask.
 #define FPGA_THD_CONTROL_COMMAND        0X01                    ///< FPGA THd control command.
@@ -383,19 +387,19 @@
     memset( &fpgaActuatorSetPoints, 0, sizeof( FPGA_ACTUATORS_T ) );
 
     // Set the THd control register to 0x1 to make sure its ADC is running
-    fpgaActuatorSetPoints.fpgaTHdControlReg = FPGA_THD_CONTROL_COMMAND;
-    fpgaActuatorSetPoints.fpgaValveStates   = FPGA_ENABLE_VALVES_CONTROL;
+    fpgaActuatorSetPoints.fpgaTHdControlReg  = FPGA_THD_CONTROL_COMMAND;
+    fpgaActuatorSetPoints.fpgaValveStates    = FPGA_ENABLE_VALVES_CONTROL;
+    fpgaActuatorSetPoints.fpgaValvePWMEnable = FPGA_ENABLE_VALVES_PWM;
+    fpgaActuatorSetPoints.fpgaVBfPWMPullin   = FPGA_VBF_PWM_PULL_IN_MS;
+    fpgaActuatorSetPoints.fpgaVBfPWMLow      = FPGA_VBF_PWM_LOW;
+    fpgaActuatorSetPoints.fpgaVBFPWMPeriod   = FPGA_VBF_PWM_PERIOD;
 
     // initialize fpga comm buffers
     memset( &fpgaWriteCmdBuffer, 0, FPGA_WRITE_CMD_BUFFER_LEN );
     memset( &fpgaReadCmdBuffer, 0, FPGA_READ_CMD_BUFFER_LEN );
     memset( &fpgaWriteResponseBuffer, 0, FPGA_WRITE_RSP_BUFFER_LEN );
     memset( &fpgaReadResponseBuffer, 0, FPGA_READ_RSP_BUFFER_LEN );
 
-    // Assume the read byte size is set for V3 since V3 contains less number of bytes.
-    // Once the V3 or DVT build switch is set resize the number of bytes to read.
-    fpgaReadByteSize = FPGA_SIZE_OF_V3_READ_BYTES;
-
     // enable interrupt notifications for FPGA serial port
     sciEnableNotification( scilinREG, SCI_OE_INT | SCI_FE_INT );
 
@@ -775,7 +779,7 @@
     fpgaReadCmdBuffer[ 0 ] = FPGA_READ_CMD_CODE;
     fpgaReadCmdBuffer[ 1 ] = GET_LSB_OF_WORD( FPGA_BULK_READ_START_ADDR );
     fpgaReadCmdBuffer[ 2 ] = GET_MSB_OF_WORD( FPGA_BULK_READ_START_ADDR );
-    fpgaReadCmdBuffer[ 3 ] = fpgaReadByteSize; //sizeof( DG_FPGA_SENSORS_T );
+    fpgaReadCmdBuffer[ 3 ] = fpgaReadByteSize;
     crc = crc16( fpgaReadCmdBuffer, FPGA_READ_CMD_HDR_LEN );
     fpgaReadCmdBuffer[ 4 ] = GET_MSB_OF_WORD( crc );
     fpgaReadCmdBuffer[ 5 ] = GET_LSB_OF_WORD( crc );
@@ -786,7 +790,7 @@
 
     // prep DMA for sending the bulk read cmd and receiving its response
     setupDMAForReadCmd( FPGA_READ_CMD_HDR_LEN + FPGA_CRC_LEN );
-    setupDMAForReadResp( FPGA_READ_RSP_HDR_LEN + fpgaReadByteSize /*sizeof( DG_FPGA_SENSORS_T )*/ + FPGA_CRC_LEN );
+    setupDMAForReadResp( FPGA_READ_RSP_HDR_LEN + fpgaReadByteSize + FPGA_CRC_LEN );
 
     // set fpga comm flags for bulk write cmd and follow-up bulk read command
     fpgaWriteCommandInProgress = TRUE;
@@ -822,7 +826,7 @@
         // did FPGA Ack the read command?
         if ( fpgaReadResponseBuffer[ 0 ] == FPGA_READ_CMD_ACK )
         {
-            U32 rspSize = FPGA_READ_RSP_HDR_LEN + fpgaReadByteSize; //sizeof( DG_FPGA_SENSORS_T );
+            U32 rspSize = FPGA_READ_RSP_HDR_LEN + fpgaReadByteSize;
             U32 crcPos = rspSize;
             U16 crc = MAKE_WORD_OF_BYTES( fpgaReadResponseBuffer[ crcPos ], fpgaReadResponseBuffer[ crcPos + 1 ] );
 
@@ -831,7 +835,7 @@
             {
                 fpgaCommRetryCount = 0;
                 // capture the read values
-                memcpy( &fpgaSensorReadings, &fpgaReadResponseBuffer[ FPGA_READ_RSP_HDR_LEN ], fpgaReadByteSize /*sizeof( DG_FPGA_SENSORS_T )*/ );
+                memcpy( &fpgaSensorReadings, &fpgaReadResponseBuffer[ FPGA_READ_RSP_HDR_LEN ], fpgaReadByteSize );
                 result = FPGA_STATE_WRITE_ALL_ACTUATORS;
             }
             else // bad CRC
@@ -1235,8 +1239,6 @@
     fpgaActuatorSetPoints.fpgaCP2StepSpeed = stepSpeed;
 }
 
-/****************************DVT Functions*******************************************/
-
 /*********************************************************************//**
  * @brief
  * The setFPGAAcidPumpControl function sets the DVT concentrate pump 1
@@ -2135,6 +2137,19 @@
 
 /*********************************************************************//**
  * @brief
+ * The getFPGABaroMfgInfo function gets the FPGA barometric pressure
+ * sensor manufacturing information.
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
+ * @return barometric pressure sensor manufacturing information
+ *************************************************************************/
+U16 getFPGABaroMfgInfo( void )
+{
+    return fpgaSensorReadings.fpgaBaroManufacInfo;
+}
+
+/*********************************************************************//**
+ * @brief
  * The getFPGABaroPressureSensitivity function gets the FPGA barometric pressure
  * sensor sensitivity.
  * @details Inputs: fpgaSensorReadings
@@ -2213,6 +2228,19 @@
 
 /*********************************************************************//**
  * @brief
+ * The getFPGABaroCoeffsCRC function gets the FPGA barometric pressure
+ * sensor temperature coefficients' CRC.
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
+ * @return barometric pressure sensor temperature coefficients' CRC
+ *************************************************************************/
+U16 getFPGABaroCoeffsCRC( void )
+{
+    return fpgaSensorReadings.fpgaBaroPROMCRC;
+}
+
+/*********************************************************************//**
+ * @brief
  * The getFPGABaroPressure function gets the FPGA barometric pressure sensor
  * pressure.
  * @details Inputs: fpgaSensorReadings
@@ -2352,4 +2380,28 @@
     return fpgaSensorReadings.fpgaDialysateFlowSensorEdgeCount;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAHeaterGateADC function gets Heater Gate ADC value.
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
+ * @return heater gate adc value
+ *************************************************************************/
+U16 getFPGAHeaterGateADC( void )
+{
+    return fpgaSensorReadings.fpgaHeaterGateADC;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The getFPGAHeaterGndADC function gets Heater Ground ADC value.
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
+ * @return heater ground adc value
+ *************************************************************************/
+U16 getFPGAHeaterGndADC( void )
+{
+    return fpgaSensorReadings.fpgaHeaterGNDADC;
+}
+
 /**@}*/