Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r166d929af60e9051ca100b6914d0bc0af76576b5 -r515e9c4529471f434d57b4ff57ce3e486bc0eaa8
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 166d929af60e9051ca100b6914d0bc0af76576b5)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 515e9c4529471f434d57b4ff57ce3e486bc0eaa8)
@@ -71,6 +71,7 @@
 static BOOL checkValveStateName( DD_VALVES_T valveID, VALVE_STATE_NAMES_T valveStateName );
 static U32 convertValveStateNameToValveState( VALVE_STATE_NAMES_T valveStateName );
 static U32 getValveState( U32 valveID );
+static void setFPGAPWMConfigurations( void );
 
 /*********************************************************************//**
  * @brief
@@ -120,6 +121,26 @@
 
     readCommandedValveStates();
     // initially set valve PWM configuration and enable
+    setFPGAPWMConfigurations();
+    setFPGAValvePWMEnable( valvePWMEnable );
+    setFPGAUFValvePWMEnable( valveUFPWMEnable );
+
+    // initially set all valves to de-energized state via FPGA
+    setFPGAValveStates( commandedValvesStates );
+    setFPGABCValveStates( commandedBCValveStates );
+    setFPGAUFValveStates( commandedUFValveStates );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The setFPGAPWMConfigurations function sets the FPGA for Valve PWM control.
+ * @details \b Inputs: none
+ * @details \b Outputs: Valves PWM timing set and enabled.
+ * @return none
+ *************************************************************************/
+static void setFPGAPWMConfigurations( void )
+{
+
     setFPGAD14PWMPullIn( VALVE_PWM_PULL_IN );
     setFPGAD14PWMLow( VALVE_PWM_LOW );
     setFPGAD14PWMPeriod( VALVE_PWM_PERIOD );
@@ -180,13 +201,6 @@
     setFPGAUFValvePWMLow( VALVE_PWM_LOW );
     setFPGAUFValvePWMPeriod( VALVE_PWM_PERIOD );
 
-    setFPGAValvePWMEnable( valvePWMEnable );
-    setFPGAUFValvePWMEnable( valveUFPWMEnable );
-
-    // initially set all valves to de-energized state via FPGA
-    setFPGAValveStates( commandedValvesStates );
-    setFPGABCValveStates( commandedBCValveStates );
-    setFPGAUFValveStates( commandedUFValveStates );
 }
 
 /*********************************************************************//**