Index: firmware/App/Modes/ModeService.c
===================================================================
diff -u -ra4669c80291e85fa5ce17d77ebcfd0c882831202 -r256d5cb05f1ef09e19e2f2733a111f600c73a7ee
--- firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision a4669c80291e85fa5ce17d77ebcfd0c882831202)
+++ firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision 256d5cb05f1ef09e19e2f2733a111f600c73a7ee)
@@ -8,7 +8,7 @@
 * @file    ModeService.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      03-Aug-2022
+* @date    (last)      21-Sep-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -54,10 +54,11 @@
 U32 transitionToServiceMode( void )
 {
     // Deenergize all the actuators
-
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_OFF );
+    deenergizeActuators();
+    initServiceMode();
 
-    return 0;
+    return serviceState;
 }
 
 /*********************************************************************//**
@@ -76,7 +77,7 @@
             break;
 
         default:
-            // TODO - s/w fault
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_SERVICE_MODE_INVALID_EXEC_STATE, serviceState )
             serviceState = DG_SERVICE_STATE_START;
             break;
     }