Index: firmware/.cproject
===================================================================
diff -u -r63fb2b39c8498b6018fc2fb2130f355ba11f08ff -r838bd7060d127e6967559bc2b3998eac201bf738
--- firmware/.cproject	(.../.cproject)	(revision 63fb2b39c8498b6018fc2fb2130f355ba11f08ff)
+++ firmware/.cproject	(.../.cproject)	(revision 838bd7060d127e6967559bc2b3998eac201bf738)
@@ -13,7 +13,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.281406999" name="Debug" parent="com.ti.ccstudio.buildDefinitions.TMS470.Debug" postbuildStep="&quot;${CCE_INSTALL_ROOT}/utils/tiobj2bin/tiobj2bin&quot; &quot;${BuildArtifactFileName}&quot; &quot;${BuildArtifactFileBaseName}.bin&quot; &quot;${CG_TOOL_ROOT}/bin/armofd&quot; &quot;${CG_TOOL_ROOT}/bin/armhex&quot; &quot;${CCE_INSTALL_ROOT}/utils/tiobj2bin/mkhex4bin&quot;">
+				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.281406999" name="Debug" parent="com.ti.ccstudio.buildDefinitions.TMS470.Debug" postbuildStep="&quot;${CCS_INSTALL_ROOT}/utils/tiobj2bin/tiobj2bin&quot; &quot;${BuildArtifactFileName}&quot; &quot;${BuildArtifactFileBaseName}.bin&quot; &quot;${CG_TOOL_ROOT}/bin/armofd&quot; &quot;${CG_TOOL_ROOT}/bin/armhex&quot; &quot;${CCS_INSTALL_ROOT}/utils/tiobj2bin/mkhex4bin&quot;;">
 					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.281406999." name="/" resourcePath="">
 						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.DebugToolchain.1333153093" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.linkerDebug.1745922214">
 							<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.763344490" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
Index: firmware/.settings/com.ti.ccstudio.project.core.prefs
===================================================================
diff -u
--- firmware/.settings/com.ti.ccstudio.project.core.prefs	(revision 0)
+++ firmware/.settings/com.ti.ccstudio.project.core.prefs	(revision 838bd7060d127e6967559bc2b3998eac201bf738)
@@ -0,0 +1,4 @@
+ccsVersionValidationPolicy=warning
+compilerVersionValidationPolicy=flexible
+eclipse.preferences.version=1
+productVersionsValidationPolicy=flexible
Index: firmware/App/Modes/ModeUpdate.c
===================================================================
diff -u
--- firmware/App/Modes/ModeUpdate.c	(revision 0)
+++ firmware/App/Modes/ModeUpdate.c	(revision 838bd7060d127e6967559bc2b3998eac201bf738)
@@ -0,0 +1,128 @@
+
+
+#include "Messaging.h"
+#include "ModeUpdate.h"
+#include "OperationModes.h"
+#include "Timers.h"
+
+/**
+ *  @addtogroup TDStandbyMode
+ *  @{
+ */
+
+// ********** private definitions **********
+
+#define BEFORE_MCU_RESET_TIMEOUT_MS                   100                                    ///< Before micro-controller unit reset timeout in milliseconds.
+
+// ********** private data **********
+
+static U32 modeUpdateStartTimeMS;                                                            ///< Mode update start time in milliseconds.
+static TD_UPDATE_STATE_T currentUpdateState;                                                 ///< Current state (sub-mode) of update mode.
+
+// ********** private function prototypes **********
+
+static TD_UPDATE_STATE_T handleUpdateModeStartState( void );
+static TD_UPDATE_STATE_T handleUpdateModeResetMCUState( void );
+
+/*********************************************************************//**
+ * @brief
+ * The initUpdateMode function initializes the Update Mode Unit.
+ * @details \b Inputs: none
+ * @details \b Outputs: currentUpdateState, modeUpdateStartTimeMS
+ * @return none
+ *************************************************************************/
+void initUpdateMode( void )
+{
+    currentUpdateState    = UPDATE_INIT_STATE;
+    modeUpdateStartTimeMS = 0;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The transitionToUpdateMode function prepares for transition to update mode.
+ * @details \b Inputs: none
+ * @details \b Outputs: Update Mode unit re-initialized.
+ * @return initial state
+ *************************************************************************/
+U32 transitionToUpdateMode( void )
+{
+    initUpdateMode();
+
+    // Set the timer when the transition to update mode has been called upon requesting to transition to mode update
+    modeUpdateStartTimeMS = getMSTimerCount();
+
+    return currentUpdateState;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The execUpdateMode function executes the update Mode state machine.
+ * @details \b Inputs: currentUpdateState
+ * @details \b Outputs: currentUpdateState
+ * @return current state (sub-mode)
+ *************************************************************************/
+U32 execUpdateMode( void )
+{
+    switch ( currentUpdateState )
+    {
+        case UPDATE_INIT_STATE:
+            currentUpdateState = handleUpdateModeStartState();
+            break;
+
+        case UPDATE_RESET_MCU_STATE:
+            currentUpdateState = handleUpdateModeResetMCUState();
+            break;
+
+        default:
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_UPDATE_INVALID_STATE, currentUpdateState );
+            currentUpdateState = UPDATE_INIT_STATE;
+            break;
+    }
+
+    return currentUpdateState;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleUpdateModeStartState function executes the update mode start
+ * state. The start state transitions to the next state after the specified
+ * timeout.
+ * @details \b Inputs: modeUpdateStartTimeMS
+ * @details \b Outputs: none
+ * @return next state of the update mode state machine
+ *************************************************************************/
+static TD_UPDATE_STATE_T handleUpdateModeStartState( void )
+{
+    TD_UPDATE_STATE_T state = UPDATE_INIT_STATE;
+
+    if ( TRUE == didTimeout( modeUpdateStartTimeMS, BEFORE_MCU_RESET_TIMEOUT_MS ) )
+    {
+        state = UPDATE_RESET_MCU_STATE;
+    }
+
+    return state;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleUpdateModeResetMCUState function executes the update mode reset
+ * micro-controller unit state. The state resets the MCU.
+ * @details \b Inputs: none
+ * @details \b Outputs: none
+ * @return next state of the update mode state machine
+ *************************************************************************/
+static TD_UPDATE_STATE_T handleUpdateModeResetMCUState( void )
+{
+    TD_UPDATE_STATE_T state = UPDATE_RESET_MCU_STATE;
+
+    resetMicroControllerUnit();
+
+    return state;
+}
+
+/*************************************************************************
+ *                       TEST SUPPORT FUNCTIONS
+ *************************************************************************/
+
+
+/**@}*/
Index: firmware/App/Modes/ModeUpdate.h
===================================================================
diff -u
--- firmware/App/Modes/ModeUpdate.h	(revision 0)
+++ firmware/App/Modes/ModeUpdate.h	(revision 838bd7060d127e6967559bc2b3998eac201bf738)
@@ -0,0 +1,27 @@
+
+
+#ifndef __MODE_UPDATE_H__
+#define __MODE_UPDATE_H__
+
+#include "TDCommon.h"
+#include "TDDefs.h"
+
+/**
+ *  @defgroup TDUpdateMode TDUpdateMode
+ *  @brief Update mode unit. Manages the update mode functions via a state machine.
+ *
+ *  @addtogroup TDUpdateMode
+ *  @{
+ */
+
+// ********** public definitions **********
+
+// ********** public function prototypes **********
+
+void initUpdateMode ( void );
+U32 transitionToUpdateMode( void );
+U32 execUpdateMode( void );
+
+/**@}*/
+
+#endif
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -reef41b7363d82763095a1317f1757f360f0d9ec1 -r838bd7060d127e6967559bc2b3998eac201bf738
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision eef41b7363d82763095a1317f1757f360f0d9ec1)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 838bd7060d127e6967559bc2b3998eac201bf738)
@@ -24,6 +24,7 @@
 #include "ModeStandby.h"
 #include "ModePreTreat.h"
 #include "ModeTreatment.h"
+#include "ModeUpdate.h"
 //#include "ModePostTreat.h"
 //#include "NVDataMgmt.h"
 #include "OperationModes.h"
@@ -71,14 +72,15 @@
 
 /// This matrix determines legal transitions from one mode to another
 static const TD_OP_MODE_T MODE_TRANSITION_TABLE[ NUM_OF_MODES - 1 ][ NUM_OF_MODES - 1 ] = {
-// From    to->    FAULT    SERVICE      INIT      STANBY    PRE-TREAT  TREATMENT  POST_TREA
-/* FAUL     */{ MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, },
-/* SERV     */{ MODE_NLEG, MODE_SERV, 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, },
-/* STAN     */{ MODE_FAUL, MODE_SERV, MODE_INIT, MODE_STAN, MODE_PRET, MODE_NLEG, MODE_NLEG, },
-/* PRET     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_PRET, MODE_TREA, MODE_POST, },     // From Standby to next mode is pretreatment
-/* TREA     */{ MODE_FAUL, 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_POST, }, };
+// From    to->    FAULT    SERVICE      INIT      STANBY    PRE-TREAT  TREATMENT  POST_TREA UPDATE
+/* FAUL     */{ MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_UPDT, },
+/* SERV     */{ MODE_NLEG, 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_UPDT, },
+/* STAN     */{ MODE_FAUL, MODE_SERV, MODE_INIT, MODE_STAN, MODE_PRET, MODE_NLEG, MODE_NLEG, MODE_UPDT, },
+/* PRET     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_PRET, MODE_TREA, MODE_POST, MODE_POST, },     // From Standby to next mode is pretreatment
+/* TREA     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_TREA, MODE_POST, MODE_POST, },
+/* POST     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_POST, MODE_POST, },
+/* UPDT     */{ MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_UPDT, }, };
 
 // ********** private function prototypes **********
 
@@ -124,6 +126,7 @@
     initStandbyMode();
     initPreTreatmentMode();
     initTreatmentMode();
+    initUpdateMode();
 //    initPostTreatmentMode();
 }
 
@@ -212,6 +215,10 @@
 //            currentSubMode = execPostTreatmentMode();
 //            break;
 
+        case MODE_UPDT:
+            currentSubMode = execUpdateMode();
+            break;
+
         default:
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_STATE, currentMode )
             currentMode = MODE_FAUL;
@@ -411,6 +418,9 @@
 //        case MODE_POST:
 //            currentSubMode = transitionToPostTreatmentMode();
 //            break;
+        case MODE_UPDT:
+            currentSubMode = transitionToUpdateMode();
+            break;
         default:
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_TRANSITION_TO, newMode )
             break;
Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -rc049177f4d18a4740a357941b48a833d7115b581 -r838bd7060d127e6967559bc2b3998eac201bf738
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision c049177f4d18a4740a357941b48a833d7115b581)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 838bd7060d127e6967559bc2b3998eac201bf738)
@@ -61,7 +61,7 @@
     SW_FAULT_ID_CAN_PARITY_ERROR = 30,
     SW_FAULT_ID_CAN_OFF_ERROR = 31,
     SW_FAULT_ID_UNEXPECTED_DMA_INTERRUPT = 32,
-    SW_FAULT_ID_AVAILABLE1 = 33,
+    SW_FAULT_ID_MODE_UPDATE_INVALID_STATE = 33,
     SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL = 34,
     SW_FAULT_ID_MSG_QUEUES_ADD_QUEUE_FULL = 35,
     SW_FAULT_ID_MSG_QUEUES_ADD_INVALID_QUEUE = 36,
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r72bc0d5f33dbb07afc8a7cd9015e4861c6c371a1 -r838bd7060d127e6967559bc2b3998eac201bf738
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 72bc0d5f33dbb07afc8a7cd9015e4861c6c371a1)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 838bd7060d127e6967559bc2b3998eac201bf738)
@@ -185,6 +185,7 @@
     { MSG_ID_TD_BLOOD_PRIME_VOLUME_OVERRIDE,                            &testBloodPrimeVolumeOverride },
     { MSG_ID_TD_BLOOD_PRIME_PUBLISH_INTERVAL_OVERRIDE_REQUEST,          &testBloodPrimePublishIntervalOverride },
     { MSG_ID_TD_ENABLE_VENOUS_BUBBLE_ALARM,                             &testEnableVenousBubbleAlarm },
+    { MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE,                            &handleUpdateAvailable },
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T))
@@ -598,6 +599,18 @@
 
 /*********************************************************************//**
  * @brief
+ * The resetMicroControllerUnit function resets the MCU.
+ * @details \b Inputs: none
+ * @details \b Outputs: none
+ * @return none
+ *************************************************************************/
+void resetMicroControllerUnit( void )
+{
+    setSystemREG1_SYSECR( (0x2) << 14 );  // Reset processor
+}
+
+/*********************************************************************//**
+ * @brief
  * The sendTestAckResponseMsg function constructs a simple response message
  * for a handled test message and queues it for transmit on the TD=>PC CAN
  * channel.
@@ -666,6 +679,32 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleUpdateAvailable function handles a request from the
+ * Firmware FPGA Updater (FFU) to reset the TD firmware processor.
+ * @note If reset is successful, this function will not return.
+ * @details \b Inputs: none
+ * @details \b Outputs: TD processor soft reset if request is valid
+ * @param message Pointer to the reset request message
+ * @return FALSE if reset command rejected
+ *************************************************************************/
+BOOL handleUpdateAvailable( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( 0 == message->hdr.payloadLen )
+    {   // S/w reset of processor
+        result = TRUE;                        // Reset will prevent this from getting transmitted though
+        requestNewOperationMode( MODE_UPDT );
+    }
+
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_TD_2_UI, result );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The testTDSoftwareResetRequest function handles a request to reset the
  * TD firmware processor.
  * @note If reset is successful, this function will not return.
@@ -682,7 +721,7 @@
     if ( 0 == message->hdr.payloadLen )
     {   // S/w reset of processor
         result = TRUE;                        // Reset will prevent this from getting transmitted though
-        setSystemREG1_SYSECR( (0x2) << 14 );  // Reset processor
+        resetMicroControllerUnit();
     }
 
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
Index: firmware/App/Services/Messaging.h
===================================================================
diff -u -r395522dffef1348e176564925656012f529c1910 -r838bd7060d127e6967559bc2b3998eac201bf738
--- firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision 395522dffef1348e176564925656012f529c1910)
+++ firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision 838bd7060d127e6967559bc2b3998eac201bf738)
@@ -154,10 +154,12 @@
 
 BOOL isTestingActivated( void );
 void setTesterStatusToLoggedOut( void );
+void resetMicroControllerUnit( void );
 
 void handleIncomingMessage( MESSAGE_T *message );
 BOOL handleUICheckIn( MESSAGE_T *message );
 BOOL handleTesterLogInRequest( MESSAGE_T *message );
+BOOL handleUpdateAvailable( MESSAGE_T *message );
 
 BOOL testTDSoftwareResetRequest( MESSAGE_T *message );