Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r4ae9dd8065549025f92619a9279b0724548a2347 -rc5e51dd7c1fd3f74823da22d7e7a0ca9b83cb196
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 4ae9dd8065549025f92619a9279b0724548a2347)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision c5e51dd7c1fd3f74823da22d7e7a0ca9b83cb196)
@@ -155,7 +155,7 @@
 static OVERRIDE_U32_T parked[ NUM_OF_CONCENTRATE_PUMPS ];                                                       ///< Concentrate pump is currently parked (T/F).
 static OVERRIDE_U32_T parkFaulted[ NUM_OF_CONCENTRATE_PUMPS ];                                                  ///< Concentrate pump park command has faulted (T/F).
 static BOOL isDosingCompleted[ NUM_OF_CONCENTRATE_PUMPS ];                                                      ///< Flag indicating dosing completed status (T/F).
-static U08 Enable_DRV8434S_Stepper_Driver;                                                                      ///< Enable New Stepper driver for Concentrate Pump.
+static U08 Enable_A5984_Stepper_Driver;                                                                         ///< Enable New Stepper driver for Concentrate Pump.
 
 static U32 CONCENTRATE_PUMP_CONTROL_FORWARD;                                                                    ///< Concentrate pump control forward.
 static U32 CONCENTRATE_PUMP_CONTROL_REVERSE;                                                                    ///< Concentrate pump control reverse.
@@ -195,7 +195,7 @@
     acidConcentratePumpParkPersistenceClear   = FALSE;
     bicarbConcentratePumpParkPersistenceClear = FALSE;
     ufPumpParkPersistenceClear                = FALSE;
-    Enable_DRV8434S_Stepper_Driver            = FALSE;
+    Enable_A5984_Stepper_Driver               = FALSE;
 
     checkConcentratePumpControl();
 
@@ -237,7 +237,7 @@
         concentratePumps[ pumpId ].isConcPumpParkInProgress         = FALSE;
         stopConcentratePump( pumpId );
         isDosingCompleted[ pumpId ]                                 = FALSE;
-        concentratePumpMicroStepsPerStep                            = 8.0F;
+        concentratePumpMicroStepsPerStep                            = 64.0F;
     }
 
     concentratePumpDataPublishInterval.data         = CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL;
@@ -1338,58 +1338,59 @@
 static void checkConcentratePumpControl( void )
 {
 
-    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRV8434S_STEPPER_DRIVER ))
+    if ( FALSE == getTestConfigStatus( TEST_CONFIG_DD_ENABLE_A5984_STEPPER_DRIVER ))
     {
-        if ( Enable_DRV8434S_Stepper_Driver == FALSE )
+        if ( Enable_A5984_Stepper_Driver == TRUE )
         {
-            setFPGAD10D11CTRL1Reg( DRV8434S_CTRL1_DEFAULT );
-            setFPGAD10D11CTRL2Reg( DRV8434S_CTRL2_DEFAULT );
-            setFPGAD10D11CTRL4Reg( DRV8434S_CTRL4_DEFAULT );
-            setFPGAD10D11CTRL5Reg( DRV8434S_CTRL5_DEFAULT );
-            setFPGAD10D11CTRL6Reg( DRV8434S_CTRL6_DEFAULT );
-            setFPGAD10D11CTRL7Reg( DRV8434S_CTRL7_DEFAULT );
 
-            setFPGAD76CTRL1Reg( DRV8434S_CTRL1_DEFAULT );
-            setFPGAD76CTRL2Reg( DRV8434S_CTRL2_DEFAULT );
-            setFPGAD76CTRL4Reg( DRV8434S_CTRL4_DEFAULT );
-            setFPGAD76CTRL5Reg( DRV8434S_CTRL5_DEFAULT );
-            setFPGAD76CTRL6Reg( DRV8434S_CTRL6_DEFAULT );
-            setFPGAD76CTRL7Reg( DRV8434S_CTRL7_DEFAULT );
+            CONCENTRATE_PUMP_CONTROL_FORWARD = CONCENTRATE_PUMP_CONTROL_SLEEP_OFF   |
+                                               CONCENTRATE_PUMP_CONTROL_NOT_RESET   |
+                                               CONCENTRATE_PUMP_CONTROL_ENABLE      |
+                                               CONCENTRATE_PUMP_CONTROL_FORWARD_DIR |
+                                               CONCENTRATE_PUMP_CONTROL_EIGHTH_STEP;
 
-            setFPGAD10PumpControl( DRV8434S_CTRL_DEFAULT );
-            setFPGAD11PumpControl( DRV8434S_CTRL_DEFAULT );
-            setFPGAD76PumpControl( DRV8434S_CTRL_DEFAULT );
+            CONCENTRATE_PUMP_CONTROL_REVERSE = CONCENTRATE_PUMP_CONTROL_SLEEP_OFF   |
+                                               CONCENTRATE_PUMP_CONTROL_NOT_RESET   |
+                                               CONCENTRATE_PUMP_CONTROL_ENABLE      |
+                                               CONCENTRATE_PUMP_CONTROL_REVERSE_DIR |
+                                               CONCENTRATE_PUMP_CONTROL_EIGHTH_STEP;
 
-            CONCENTRATE_PUMP_CONTROL_FORWARD = CONCENTRATE_PUMP_CONTROL_DRV_ENABLE           |
-                                               CONCENTRATE_PUMP_CONTROL_DRV_FORWARD_DIR      |
-                                               CONCENTRATE_PUMP_CONTROL_DRV_SIXTYFOURTH_STEP;
-
-            CONCENTRATE_PUMP_CONTROL_REVERSE = CONCENTRATE_PUMP_CONTROL_DRV_ENABLE           |
-                                               CONCENTRATE_PUMP_CONTROL_DRV_REVERSE_DIR      |
-                                               CONCENTRATE_PUMP_CONTROL_DRV_SIXTYFOURTH_STEP;
-
-            concentratePumpMicroStepsPerStep = 64.0F;
-            Enable_DRV8434S_Stepper_Driver   = TRUE;
+           concentratePumpMicroStepsPerStep = 8.0F;
+           Enable_A5984_Stepper_Driver      = FALSE;
         }
 
 
     }
     else
     {
-        CONCENTRATE_PUMP_CONTROL_FORWARD = CONCENTRATE_PUMP_CONTROL_SLEEP_OFF    |
-                                            CONCENTRATE_PUMP_CONTROL_NOT_RESET   |
-                                            CONCENTRATE_PUMP_CONTROL_ENABLE      |
-                                            CONCENTRATE_PUMP_CONTROL_FORWARD_DIR |
-                                            CONCENTRATE_PUMP_CONTROL_EIGHTH_STEP;
+        setFPGAD10D11CTRL1Reg( DRV8434S_CTRL1_DEFAULT );
+        setFPGAD10D11CTRL2Reg( DRV8434S_CTRL2_DEFAULT );
+        setFPGAD10D11CTRL4Reg( DRV8434S_CTRL4_DEFAULT );
+        setFPGAD10D11CTRL5Reg( DRV8434S_CTRL5_DEFAULT );
+        setFPGAD10D11CTRL6Reg( DRV8434S_CTRL6_DEFAULT );
+        setFPGAD10D11CTRL7Reg( DRV8434S_CTRL7_DEFAULT );
 
-        CONCENTRATE_PUMP_CONTROL_REVERSE = CONCENTRATE_PUMP_CONTROL_SLEEP_OFF    |
-                                            CONCENTRATE_PUMP_CONTROL_NOT_RESET   |
-                                            CONCENTRATE_PUMP_CONTROL_ENABLE      |
-                                            CONCENTRATE_PUMP_CONTROL_REVERSE_DIR |
-                                            CONCENTRATE_PUMP_CONTROL_EIGHTH_STEP;
+        setFPGAD76CTRL1Reg( DRV8434S_CTRL1_DEFAULT );
+        setFPGAD76CTRL2Reg( DRV8434S_CTRL2_DEFAULT );
+        setFPGAD76CTRL4Reg( DRV8434S_CTRL4_DEFAULT );
+        setFPGAD76CTRL5Reg( DRV8434S_CTRL5_DEFAULT );
+        setFPGAD76CTRL6Reg( DRV8434S_CTRL6_DEFAULT );
+        setFPGAD76CTRL7Reg( DRV8434S_CTRL7_DEFAULT );
 
-        concentratePumpMicroStepsPerStep = 8.0F;
-        Enable_DRV8434S_Stepper_Driver   = FALSE;
+        setFPGAD10PumpControl( DRV8434S_CTRL_DEFAULT );
+        setFPGAD11PumpControl( DRV8434S_CTRL_DEFAULT );
+        setFPGAD76PumpControl( DRV8434S_CTRL_DEFAULT );
+
+        CONCENTRATE_PUMP_CONTROL_FORWARD = CONCENTRATE_PUMP_CONTROL_DRV_ENABLE           |
+                                           CONCENTRATE_PUMP_CONTROL_DRV_FORWARD_DIR      |
+                                           CONCENTRATE_PUMP_CONTROL_DRV_SIXTYFOURTH_STEP;
+
+        CONCENTRATE_PUMP_CONTROL_REVERSE = CONCENTRATE_PUMP_CONTROL_DRV_ENABLE           |
+                                           CONCENTRATE_PUMP_CONTROL_DRV_REVERSE_DIR      |
+                                           CONCENTRATE_PUMP_CONTROL_DRV_SIXTYFOURTH_STEP;
+
+        concentratePumpMicroStepsPerStep = 64.0F;
+        Enable_A5984_Stepper_Driver      = TRUE;
     }
 }