Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rd37f31cff6c20085953ecb598558e4d91e42f0af -r43a84133216095b12529dbfcc957bb3738bbc3a2
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision d37f31cff6c20085953ecb598558e4d91e42f0af)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 43a84133216095b12529dbfcc957bb3738bbc3a2)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    SyringePump.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      04-Jan-2022
+* @author  (last)      Hung Nguyen
+* @date    (last)      15-Feb-2022
 *
 * @author  (original)  Sean Nash
 * @date    (original)  04-Mar-2021
@@ -126,7 +126,7 @@
 #define SYRINGE_PUMP_MICROSTEP_TOGGLE_TIME_FOR_STOP   0xFFFFFFFF                            ///< Syringe pump microstep toggle time setting to indicate zero speed (stopped).
 
 #define DATA_PUBLISH_COUNTER_START_COUNT              10                                    ///< Data publish counter start count.
-
+
 /// Control bits to run syringe pump in reverse direction
 static const U08 SYRINGE_PUMP_CONTROL_RUN_REVERSE = SYRINGE_PUMP_CONTROL_SLEEP_OFF |
                                                     SYRINGE_PUMP_CONTROL_NOT_RESET |
@@ -1002,18 +1002,18 @@
     {
         isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR, FALSE );
     }
-
-    // Execute syringe pump control state machine
-    switch ( syringePumpState )
-    {
-        case SYRINGE_PUMP_INIT_STATE:
-            syringePumpState = handleSyringePumpInitState();
-            break;
-
-        case SYRINGE_PUMP_OFF_STATE:
-            syringePumpState = handleSyringePumpOffState();
-            break;
 
+    // Execute syringe pump control state machine
+    switch ( syringePumpState )
+    {
+        case SYRINGE_PUMP_INIT_STATE:
+            syringePumpState = handleSyringePumpInitState();
+            break;
+
+        case SYRINGE_PUMP_OFF_STATE:
+            syringePumpState = handleSyringePumpOffState();
+            break;
+
         case SYRINGE_PUMP_RETRACT_STATE:
             syringePumpState = handleSyringePumpRetractState();
             break;
@@ -1850,11 +1850,12 @@
         syringePumpDataPublicationTimerCounter = 0;
     }
 }
+
 
+/*************************************************************************
+ *                       TEST SUPPORT FUNCTIONS
+ *************************************************************************/
 
-/*************************************************************************
- *                       TEST SUPPORT FUNCTIONS
- *************************************************************************/
 
 
 /*********************************************************************//**