Index: firmware/App/Controllers/SubstitutionPump.c
===================================================================
diff -u -r4ae9dd8065549025f92619a9279b0724548a2347 -rc5e51dd7c1fd3f74823da22d7e7a0ca9b83cb196
--- firmware/App/Controllers/SubstitutionPump.c	(.../SubstitutionPump.c)	(revision 4ae9dd8065549025f92619a9279b0724548a2347)
+++ firmware/App/Controllers/SubstitutionPump.c	(.../SubstitutionPump.c)	(revision c5e51dd7c1fd3f74823da22d7e7a0ca9b83cb196)
@@ -125,7 +125,7 @@
 static SUBSTITUTION_PUMP_T substitutionPumps[ NUM_OF_SUB_PUMPS ];                                               ///< Array of Substitution pumps' data structure.
 static OVERRIDE_F32_T pumpTargetRate[ NUM_OF_SUB_PUMPS ];                                                       ///< Target substitution pumps' rate (mL/min).
 static U32 substitutionPumpPublishTimerCounter;                                                                 ///< Substitution pump data publication counter.
-static U08 Enable_DRV8434S_Stepper_Driver;                                                                      ///< Enable new stepper driver for Substitution Pump.
+static U08 Enable_A5984_Stepper_Driver;                                                                         ///< Enable new stepper driver for Substitution Pump.
 static U32 SUBSTITUTION_PUMP_CONTROL_FORWARD;                                                                   ///< Substitution Pump forward Control.
 static U32 SUBSTITUTION_PUMP_CONTROL_STOP;                                                                      ///< Substitution pump stop state control.
 
@@ -168,7 +168,7 @@
     substitutionPumpDataPublishInterval.ovInitData   = SUBSTITUTION_PUMP_DATA_PUBLISH_INTERVAL;
     substitutionPumpDataPublishInterval.ovData       = 0;
     substitutionPumpDataPublishInterval.override     = OVERRIDE_RESET;
-    Enable_DRV8434S_Stepper_Driver                   = FALSE;
+    Enable_A5984_Stepper_Driver                      = FALSE;
 
     initPersistentAlarm( ALARM_ID_DD_D92_PUMP_RPM_OUT_OF_RANGE, RPM_OUT_OF_RANGE_TIME_OUT, RPM_OUT_OF_RANGE_TIME_OUT );
 }
@@ -549,43 +549,43 @@
  *************************************************************************/
 static void checkSubstitutionPumpControl( void )
 {
-    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRV8434S_STEPPER_DRIVER ) )
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_ENABLE_A5984_STEPPER_DRIVER ) )
     {
-        if( Enable_DRV8434S_Stepper_Driver == FALSE )
+        if( Enable_A5984_Stepper_Driver == TRUE )
         {
-            SUBSTITUTION_PUMP_CONTROL_FORWARD = SUBSTITUTION_PUMP_CONTROL_DRV_ENABLE |
-                                                SUBSTITUTION_PUMP_CONTROL_DRV_REVERSE_DIR |
-                                                SUBSTITUTION_PUMP_CONTROL_DRV_SIXTY_FOUR_STEP;
+            SUBSTITUTION_PUMP_CONTROL_FORWARD = SUBSTITUTION_PUMP_CONTROL_SLEEP_OFF |
+                                                SUBSTITUTION_PUMP_CONTROL_NOT_RESET |
+                                                SUBSTITUTION_PUMP_CONTROL_ENABLE |
+                                                SUBSTITUTION_PUMP_CONTROL_REVERSE_DIR |
+                                                SUBSTITUTION_PUMP_CONTROL_SIXTY_FOUR_STEP;
 
-            SUBSTITUTION_PUMP_CONTROL_STOP    = SUBSTITUTION_PUMP_CONTROL_DRV_DISABLE |
-                                                SUBSTITUTION_PUMP_CONTROL_DRV_REVERSE_DIR |
-                                                SUBSTITUTION_PUMP_CONTROL_DRV_SIXTY_FOUR_STEP;
+            SUBSTITUTION_PUMP_CONTROL_STOP   = SUBSTITUTION_PUMP_CONTROL_SLEEP_OFF |
+                                               SUBSTITUTION_PUMP_CONTROL_NOT_RESET |
+                                               SUBSTITUTION_PUMP_CONTROL_DISABLE |
+                                               SUBSTITUTION_PUMP_CONTROL_REVERSE_DIR |
+                                               SUBSTITUTION_PUMP_CONTROL_SIXTY_FOUR_STEP;
 
-            setFPGAD92CTRL1Reg( DRV8434S_CTRL1_DEFAULT );
-            setFPGAD92CTRL2Reg( DRV8434S_CTRL2_DEFAULT );
-            setFPGAD92CTRL4Reg( DRV8434S_CTRL4_DEFAULT );
-            setFPGAD92CTRL5Reg( DRV8434S_CTRL5_DEFAULT );
-            setFPGAD92CTRL6Reg( DRV8434S_CTRL6_DEFAULT );
-            setFPGAD92CTRL7Reg( DRV8434S_CTRL7_DEFAULT );
-
-            Enable_DRV8434S_Stepper_Driver= TRUE;
+            Enable_A5984_Stepper_Driver     = FALSE;
         }
     }
     else
     {
-        SUBSTITUTION_PUMP_CONTROL_FORWARD = SUBSTITUTION_PUMP_CONTROL_SLEEP_OFF |
-                                            SUBSTITUTION_PUMP_CONTROL_NOT_RESET |
-                                            SUBSTITUTION_PUMP_CONTROL_ENABLE |
-                                            SUBSTITUTION_PUMP_CONTROL_REVERSE_DIR |
-                                            SUBSTITUTION_PUMP_CONTROL_SIXTY_FOUR_STEP;
+        SUBSTITUTION_PUMP_CONTROL_FORWARD = SUBSTITUTION_PUMP_CONTROL_DRV_ENABLE |
+                                            SUBSTITUTION_PUMP_CONTROL_DRV_REVERSE_DIR |
+                                            SUBSTITUTION_PUMP_CONTROL_DRV_SIXTY_FOUR_STEP;
 
-        SUBSTITUTION_PUMP_CONTROL_STOP   = SUBSTITUTION_PUMP_CONTROL_SLEEP_OFF |
-                                           SUBSTITUTION_PUMP_CONTROL_NOT_RESET |
-                                           SUBSTITUTION_PUMP_CONTROL_DISABLE |
-                                           SUBSTITUTION_PUMP_CONTROL_REVERSE_DIR |
-                                           SUBSTITUTION_PUMP_CONTROL_SIXTY_FOUR_STEP;
+        SUBSTITUTION_PUMP_CONTROL_STOP    = SUBSTITUTION_PUMP_CONTROL_DRV_DISABLE |
+                                            SUBSTITUTION_PUMP_CONTROL_DRV_REVERSE_DIR |
+                                            SUBSTITUTION_PUMP_CONTROL_DRV_SIXTY_FOUR_STEP;
 
-        Enable_DRV8434S_Stepper_Driver= FALSE;
+        setFPGAD92CTRL1Reg( DRV8434S_CTRL1_DEFAULT );
+        setFPGAD92CTRL2Reg( DRV8434S_CTRL2_DEFAULT );
+        setFPGAD92CTRL4Reg( DRV8434S_CTRL4_DEFAULT );
+        setFPGAD92CTRL5Reg( DRV8434S_CTRL5_DEFAULT );
+        setFPGAD92CTRL6Reg( DRV8434S_CTRL6_DEFAULT );
+        setFPGAD92CTRL7Reg( DRV8434S_CTRL7_DEFAULT );
+
+        Enable_A5984_Stepper_Driver = TRUE;
     }
 }