Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -rb6fb8796a82272af1b5791be8cd3fc3b445e0f1d -rae2b7f296dcd0247814356a28380b3ac582a8551
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision b6fb8796a82272af1b5791be8cd3fc3b445e0f1d)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision ae2b7f296dcd0247814356a28380b3ac582a8551)
@@ -929,19 +929,19 @@
     readCount  = (U32)getFPGATRoReadCount();
     processTempSnsrsADCRead( TEMPSENSORS_OUTLET_REDUNDANT, getFPGATRoTemp(), errorCount, readCount, TRUE );
 
-    errorCount = (U32)getFPGATDiErrorCount();
-    readCount  = (U32)getFPGATDiReadCount();
+    errorCount = (U32)getFPGATDiErrorCount(); // TODO remove these and do not check in the new persistent alarm
+    readCount  = (U32)getFPGATDiReadCount();  // TODO remove these and do not check in the new persistent alarm
     processTempSnsrsADCRead( TEMPSENSORS_INLET_DIALYSATE, getFPGATDiTemp(), errorCount, readCount, TRUE );
 
-    errorCount = (U32)getFPGAPrimaryHeaterFlags();
-    readCount  = (U32)getFPGAPrimaryHeaterReadCount();
-    processHtrsTempSnsrsADCRead( TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE, getFPGAPrimaryHeaterTemp(),       errorCount, readCount );
-    processHtrsTempSnsrsADCRead( TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION, getFPGAPrimaryColdJunctionTemp(), errorCount, readCount );
+    errorCount = (U32)getFPGAPrimaryHeaterFlags();     // TODO remove these and do not check in the new persistent alarm
+    readCount  = (U32)getFPGAPrimaryHeaterReadCount(); // TODO remove these and do not check in the new persistent alarm
+    //processHtrsTempSnsrsADCRead( TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE, getFPGAPrimaryHeaterTemp(),       errorCount, readCount );
+    //processHtrsTempSnsrsADCRead( TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION, getFPGAPrimaryColdJunctionTemp(), errorCount, readCount );
 
     errorCount = (U32)getFPGATrimmerHeaterFlags();
     readCount  = (U32)getFPGATrimmerHeaterReadCount();
-    processHtrsTempSnsrsADCRead( TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE, getFPGATrimmerHeaterTemp(),       errorCount, readCount );
-    processHtrsTempSnsrsADCRead( TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION, getFPGATrimmerColdJunctionTemp(), errorCount, readCount );
+    //processHtrsTempSnsrsADCRead( TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE, getFPGATrimmerHeaterTemp(),       errorCount, readCount );
+    //processHtrsTempSnsrsADCRead( TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION, getFPGATrimmerColdJunctionTemp(), errorCount, readCount );
 
     // NOTE: FPGA board temperature sensor is different from the rest of the sensors. This sensor does not have FPGA count and error
     // coming from FPGA. It is kept here to do moving average on the values. The supporting functions need to see the FPGA read count
@@ -1032,14 +1032,38 @@
 
         for ( i = 0; i < NUM_OF_TEMPERATURE_SENSORS; i++ )
         {
-           temperature = getTemperatureValue( i );
-
-           // Check both temperature and to be in range
-           if ( ( ( temperature < TEMP_SENSORS_MIN_ALLOWED_DEGREE_C ) || ( temperature > tempSensors[ i ].maxAllowedTemp ) ) &&
-                  ( getCurrentOperationMode() != DG_MODE_INIT  ) )
+           switch ( i )
            {
-               isTemperatureOutOfRange |= TRUE;
+               case TEMPSENSORS_INLET_PRIMARY_HEATER:
+               case TEMPSENSORS_HEAT_DISINFECT:
+               case TEMPSENSORS_OUTLET_PRIMARY_HEATER:
+               case TEMPSENSORS_CONDUCTIVITY_SENSOR_1:
+               case TEMPSENSORS_CONDUCTIVITY_SENSOR_2:
+               case TEMPSENSORS_OUTLET_REDUNDANT:
+               case TEMPSENSORS_INLET_DIALYSATE:
+               case TEMPSENSORS_FPGA_BOARD_SENSOR:
+               case TEMPSENSORS_LOAD_CELL_A1_B1:
+               case TEMPSENSORS_LOAD_CELL_A2_B2:
+               case TEMPSENSORS_INTERNAL_TRO_RTD:
+               case TEMPSENSORS_INTERNAL_TDI_RTD:
+               case TEMPSENSORS_INTERNAL_THD_RTD:
+               case TEMPSENSORS_INTERNAL_COND_TEMP_SENSOR:
+               case TEMPSENSORS_BAROMETRIC_TEMP_SENSOR:
+                   temperature = getTemperatureValue( i );
+
+                   // Check both temperature and to be in range
+                   if ( ( ( temperature < TEMP_SENSORS_MIN_ALLOWED_DEGREE_C ) || ( temperature > tempSensors[ i ].maxAllowedTemp ) ) &&
+                          ( getCurrentOperationMode() != DG_MODE_INIT  ) )
+                   {
+                       isTemperatureOutOfRange |= TRUE;
+                   }
+                   break;
+
+               default:
+                   // Ignore the rest of the sensors
+                   break;
            }
+
         }
 
         checkPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE, isTemperatureOutOfRange, i, temperature );
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -rb49fcf5c295e49f7133ea07398c54b083bf65d49 -rae2b7f296dcd0247814356a28380b3ac582a8551
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision b49fcf5c295e49f7133ea07398c54b083bf65d49)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision ae2b7f296dcd0247814356a28380b3ac582a8551)
@@ -82,7 +82,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.
@@ -375,8 +379,12 @@
     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 );