Index: firmware/App/Modes/ModeService.c
===================================================================
diff -u -r4d7d40a27130dc813d653f044cbb856b1b7d8481 -r3b70632c04247a6973960e1f37ae73eb4384a6b7
--- firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision 4d7d40a27130dc813d653f044cbb856b1b7d8481)
+++ firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision 3b70632c04247a6973960e1f37ae73eb4384a6b7)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-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 ModeService.c
+* @file    ModeService.c
 *
-* @author (last) Quang Nguyen
-* @date (last) 24-Aug-2020
+* @author  (last)      Michael Garthwaite
+* @date    (last)      07-Sep-2022
 *
-* @author (original) Dara Navaei
-* @date (original) 05-Nov-2019
+* @author  (original)  Dara Navaei
+* @date    (original)  05-Nov-2019
 *
 ***************************************************************************/
 
@@ -48,10 +48,15 @@
  * The transitionToServiceMode function prepares for transition to service mode.
  * @details Inputs: none
  * @details Outputs: none
- * @return none
+ * @return initial state
  *************************************************************************/
-void transitionToServiceMode( void )
+U32 transitionToServiceMode( void )
 {
+    deenergizeActuators();
+
+    initServiceMode();
+
+    return serviceState;
 }
 
 /*********************************************************************//**
@@ -70,7 +75,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;
     }