Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r0d8381c50f7189c4cfbc2794a4aedf297eea7d15 -r8e7158d8231435496fcf1d5649e51babf859ccc7
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 0d8381c50f7189c4cfbc2794a4aedf297eea7d15)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 8e7158d8231435496fcf1d5649e51babf859ccc7)
@@ -1,27 +1,23 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2021 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 OperationModes.c
 *
 * @author (last) Sean Nash
-* @date (last) 28-Aug-2020
+* @date (last) 01-Dec-2020
 *
 * @author (original) Dara Navaei
 * @date (original) 05-Nov-2019
 *
 ***************************************************************************/
 
-#include <HDCommon.h>
 #include "gio.h"
 
-#include "TaskGeneral.h"
-#include "SystemCommMessages.h"
-#include "OperationModes.h"
-
+#include "HDCommon.h"
 #include "ModeInitPOST.h"
 #include "ModeService.h"
 #include "ModeFault.h"
@@ -30,6 +26,9 @@
 #include "ModePreTreat.h"
 #include "ModeTreatment.h"
 #include "ModePostTreat.h"
+#include "OperationModes.h"
+#include "SystemCommMessages.h"
+#include "TaskGeneral.h"
 
 /**
  *  @addtogroup HDOperationModes
@@ -55,7 +54,7 @@
 /* SERV     */{ MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, },
 /* INIT     */{ MODE_FAUL, MODE_NLEG, MODE_INIT, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, },
 /* STAN     */{ MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_STAN, MODE_TPAR, MODE_NLEG, MODE_NLEG, MODE_NLEG, },
-/* TPAR     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_TPAR, MODE_PRET, MODE_NLEG, MODE_NLEG, },
+/* TPAR     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_TPAR, MODE_PRET, MODE_NLEG, MODE_NLEG, },
 /* PRET     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_PRET, MODE_TREA, MODE_NLEG, },
 /* TREA     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_TREA, MODE_POST, },
 /* POST     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_POST, }, };
@@ -69,9 +68,8 @@
 /*********************************************************************//**
  * @brief
  * The initOperationModes function initializes the Operation Modes module.
- * @details
- * Inputs : none
- * Outputs : Operation Modes module initialized.
+ * @details Inputs: none
+ * @details Outputs: Operation Modes module initialized.
  * @return none
  *************************************************************************/
 void initOperationModes( void )
@@ -103,9 +101,8 @@
 /*********************************************************************//**
  * @brief
  * The execOperationModes function executes the Operation Modes state machine.
- * @details
- * Inputs : none
- * Outputs : currentMode is set by state machine.
+ * @details Inputs: none
+ * @details Outputs: currentMode is set by state machine.
  * @return none
  *************************************************************************/
 void execOperationModes( void )
@@ -183,9 +180,8 @@
  * The requestNewOperationMode function requests transition to a new
  * operation mode.  The request will be arbitrated when the state machine
  * is next executed.
- * @details
- * Inputs : none
- * Outputs : modeRequest[]
+ * @details Inputs: none
+ * @details Outputs: modeRequest[]
  * @return none
  *************************************************************************/
 void requestNewOperationMode( HD_OP_MODE_T newMode )
@@ -205,9 +201,8 @@
 /*********************************************************************//**
  * @brief
  * The getCurrentOperationMode function gets the current operation mode.
- * @details
- * Inputs : currentMode
- * Outputs : none
+ * @details Inputs: currentMode
+ * @details Outputs: none
  * @return the current operation mode
  *************************************************************************/
 HD_OP_MODE_T getCurrentOperationMode( void )
@@ -219,9 +214,8 @@
  * @brief
  * The arbitrateModeRequest function arbitrates any pending mode transition
  * requests.
- * @details
- * Inputs : modeRequest[]
- * Outputs : modeRequest[] is reset
+ * @details Inputs: modeRequest[]
+ * @details Outputs: modeRequest[] is reset
  * @return the next operation mode (current mode if no requests pending)
  *************************************************************************/
 static HD_OP_MODE_T arbitrateModeRequest( void )
@@ -258,9 +252,8 @@
  * @brief
  * The transitionToNewOperationMode function calls the transition to function
  * for a new operation mode that we are transitioning to.
- * @details
- * Inputs : none
- * Outputs : transition function called for new mode
+ * @details Inputs: none
+ * @details Outputs: transition function called for new mode
  * @return none
  *************************************************************************/
 static void transitionToNewOperationMode( HD_OP_MODE_T newMode )
@@ -302,9 +295,8 @@
  * @brief
  * The broadcastOperationMode function sends the current operation mode at
  * the prescribed interval.
- * @details
- * Inputs : broadcastModeIntervalCtr
- * Outputs : HD operation mode broadcast message sent.
+ * @details Inputs: broadcastModeIntervalCtr
+ * @details Outputs: HD operation mode broadcast message sent.
  * @return none
  *************************************************************************/
 static void broadcastOperationMode( void )
@@ -316,26 +308,4 @@
     }
 }
 
-/*********************************************************************//**
- * @brief
- * The testRestorePriorModeFromFault function restores the operation mode
- * to its prior mode if currently in fault mode.
- * This is a test function and requires a tester be logged into the HD.
- * @details Inputs: lastMode
- * @details Outputs: currentMode.
- * @return none
- *************************************************************************/
-void testRestorePriorModeFromFault( void )
-{
-    // verify tester has logged in with HD
-    if ( TRUE == isTestingActivated() )
-    {
-        // if in fault mode, go back to prior mode
-        if ( MODE_FAUL == currentMode )
-        {
-            currentMode = lastMode;
-        }
-    }
-}
-
 /**@}*/