Index: firmware/.cproject
===================================================================
diff -u -rd3e396a8b52d79faa3b408e7533320d8f8cb76c0 -r2e9cc05e534f7f695a90b5ed47950a1f9b38b978
--- firmware/.cproject	(.../.cproject)	(revision d3e396a8b52d79faa3b408e7533320d8f8cb76c0)
+++ firmware/.cproject	(.../.cproject)	(revision 2e9cc05e534f7f695a90b5ed47950a1f9b38b978)
@@ -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.1939553624" name="Debug" parent="com.ti.ccstudio.buildDefinitions.TMS470.Debug" postannouncebuildStep="AlarmEnum Check" postbuildStep="${PROJECT_ROOT}/checkAlarms.sh;" preannouncebuildStep="AlarmEnum Check" prebuildStep="${PROJECT_ROOT}/checkAlarms.sh;">
+				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.1939553624" 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;;">
 					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.1939553624." name="/" resourcePath="">
 						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.DebugToolchain.516134309" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.linkerDebug.150797795">
 							<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.329041903" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
Index: firmware/App/HDCommon.h
===================================================================
diff -u -ra14a1321839d4695643b1f9cbb7cbd70372f6f09 -r2e9cc05e534f7f695a90b5ed47950a1f9b38b978
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision a14a1321839d4695643b1f9cbb7cbd70372f6f09)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 2e9cc05e534f7f695a90b5ed47950a1f9b38b978)
@@ -31,11 +31,34 @@
 
 #ifndef _RELEASE_
 #ifndef _VECTORCAST_
-// Build switches. NOTE: These build switches are never considered for release builds.
-//    #define BOARD_WITH_NO_HARDWARE          1           // Target is a PCB w/ no hardware
-//    #define RUN_WITHOUT_DG                  1           // Run HD w/o DG
-//    #define SIMULATE_UI                     1           // Build w/o requirement that UI be there
-//    #define TASK_TIMING_OUTPUT_ENABLED      1           // Re-purposes alarm lamp pins for task timing
+//    #define RUN_WITHOUT_DG                  1           // run HD w/o DG
+//    #define DISABLE_UI_TREATMENT_WORKFLOW   1           // disable UI treatment workflow
+    #define RM46_EVAL_BOARD_TARGET          1           // limited build runs on RM46 eval board
+//    #define BREADBOARD_TARGET               1           // old breadboard system build - no longer used?
+//    #define SIMULATE_UI                     1           // build w/o requirement that UI be there
+//    #define TASK_TIMING_OUTPUT_ENABLED      1           // re-purposes alarm lamp pins for task timing
+    #define SKIP_POST                       1           // skip POST tests - all pass
+//    #define LIMITED_NVDATA_CRC_CHECKS       1           // only perform POST CRC checks on nv-data records that are implemented so far
+    #define DISABLE_AIR_TRAP_LEVELING       1           // disable air trap level control
+//    #define DISABLE_3WAY_VALVES             1           // disable 3-way valves
+//    #define TST_3WAY_VALVES_ALWAYS_OPEN     1           // after POST and homing, open all 4 valves
+    #define DISABLE_ACCELS                  1           // disable accelerometer POST and monitoring
+    #define DISABLE_CRC_ERROR               1           // do not error on bad CRC for CAN messages
+    #define DISABLE_ACK_ERRORS              1           // do not error on failure of other node(s) to ACK a message
+    #define DISABLE_MOTOR_CURRENT_CHECKS    1           // do not error on HD pump current checks
+    #define DISABLE_PUMP_FLOW_CHECKS        1           // do not error on HD pump flow checks
+    #define DISABLE_PUMP_SPEED_CHECKS       1           // do not error on HD pump speed checks
+    #define DISABLE_PUMP_DIRECTION_CHECKS   1           // do not error on HD pump direction checks
+    #define DISABLE_SALINE_BOLUS_CHECKS     1           // do not error on HD saline bolus checks
+    #define DISABLE_PRESSURE_CHECKS         1           // do not error on HD pressure checks
+    #define DISABLE_UF_ALARMS               1           // do not error on HD ultrafiltration checks
+    #define DISABLE_VALVE_ALARMS            1           // do not error on HD valve position
+//    #define RUN_PUMPS_OPEN_LOOP             1           // BP and DPi pumps will be run open loop (no flow sensor feedback)
+//    #define RAW_FLOW_SENSOR_DATA            1           // test build will not filter flow sensor data
+//    #define READ_FPGA_ASYNC_DATA            1           // test build reads non-priority register page every other time
+//    #define EMC_TEST_BUILD                  1           // EMC test build - HD/DG run separately but connected, HD pumps toggle on/off w/ stop button
+    #define ALARMS_DEBUG                    1           // triggered alarms sent to debug UART
+    #define V1_5_SYSTEM                     1           // build for v1.5 system
 
     #include <stdio.h>
     #include <strings.h>
Index: firmware/App/Modes/ModeUpdate.c
===================================================================
diff -u
--- firmware/App/Modes/ModeUpdate.c	(revision 0)
+++ firmware/App/Modes/ModeUpdate.c	(revision 2e9cc05e534f7f695a90b5ed47950a1f9b38b978)
@@ -0,0 +1,64 @@
+/**************************************************************************
+*
+* Copyright (c) 2023 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 ModeUpdate.c
+*
+* @author (last) Dana Rich
+* @date (last) 7-March-2023
+*
+* @author (original) Dana Rich
+* @date (original) 7-March-2023
+*
+***************************************************************************/
+
+#include "F021.h"
+#include "HDCommon.h"
+#include "ModeUpdate.h"
+
+#define APP_STATUS_ADDRESS       0x00010000
+#define BL_START_ADDRESS         0x00000000
+
+uint32_t bootloaderStartAddress = (uint32_t)BL_START_ADDRESS;
+uint32_t g_pulUpdateSuccess[2] = {0x5A5A5A5A, 0x00};
+
+/*********************************************************************//**
+ * @brief
+ * The function transfers control to the bootloader code
+ * @details Inputs: none
+ * @details Outputs: Bootloader application started.
+ * @return none
+ *************************************************************************/
+void startBootloader( void )
+{
+    bootloaderStartAddress = (uint32_t)BL_START_ADDRESS;
+    ((void (*)(void))bootloaderStartAddress)();
+}
+
+/*********************************************************************//**
+ * @brief
+ * Sets the flag in FLASH that indicates the devices requests to enter into
+ * update mode from the bootloader.
+ * @details Inputs: none
+ * @details Outputs: Memory location reflects desired status
+ * @return none
+ *************************************************************************/
+void setBootloaderFlag( void )
+{
+    register uint32_t src = (uint32_t)&g_pulUpdateSuccess[1];
+    register uint32_t dst = APP_STATUS_ADDRESS;
+    unsigned int bytes = 16;
+
+    Fapi_issueProgrammingCommand((uint32_t *)dst,
+                                     (uint8_t *)src,
+                                     (uint32_t) bytes,
+                                     0,
+                                     0,
+                                     Fapi_AutoEccGeneration);
+
+    while(Fapi_checkFsmForReady() == Fapi_Status_FsmBusy);
+    while(FAPI_GET_FSM_STATUS != Fapi_Status_Success);
+}
Index: firmware/App/Modes/ModeUpdate.h
===================================================================
diff -u
--- firmware/App/Modes/ModeUpdate.h	(revision 0)
+++ firmware/App/Modes/ModeUpdate.h	(revision 2e9cc05e534f7f695a90b5ed47950a1f9b38b978)
@@ -0,0 +1,24 @@
+/**************************************************************************
+*
+* Copyright (c) 2023 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 ModeUpdate.h
+*
+* @author (last) Dana Rich
+* @date (last) 7-March-2023
+*
+* @author (original) Dana Rich
+* @date (original) 7-March-2023
+*
+***************************************************************************/
+
+#ifndef __MODE_UPDATE_H__
+#define __MODE_UPDATE_H__
+
+void startBootloader( void );
+void setBootloaderFlag( void );
+
+#endif
\ No newline at end of file
Index: firmware/source/sys_link.cmd
===================================================================
diff -u -r8791132fbfcb8fa25fb11a9ab15d695686aaef75 -r2e9cc05e534f7f695a90b5ed47950a1f9b38b978
--- firmware/source/sys_link.cmd	(.../sys_link.cmd)	(revision 8791132fbfcb8fa25fb11a9ab15d695686aaef75)
+++ firmware/source/sys_link.cmd	(.../sys_link.cmd)	(revision 2e9cc05e534f7f695a90b5ed47950a1f9b38b978)
@@ -1,36 +1,36 @@
 /*----------------------------------------------------------------------------*/
 /* sys_link.cmd                                                               */
 /*                                                                            */
-/* 
-* Copyright (C) 2009-2018 Texas Instruments Incorporated - www.ti.com  
-* 
-* 
-*  Redistribution and use in source and binary forms, with or without 
-*  modification, are permitted provided that the following conditions 
+/*
+* Copyright (C) 2009-2018 Texas Instruments Incorporated - www.ti.com
+*
+*
+*  Redistribution and use in source and binary forms, with or without
+*  modification, are permitted provided that the following conditions
 *  are met:
 *
-*    Redistributions of source code must retain the above copyright 
+*    Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 *    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the 
-*    documentation and/or other materials provided with the   
+*    notice, this list of conditions and the following disclaimer in the
+*    documentation and/or other materials provided with the
 *    distribution.
 *
 *    Neither the name of Texas Instruments Incorporated nor the names of
 *    its contributors may be used to endorse or promote products derived
 *    from this software without specific prior written permission.
 *
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 */
@@ -56,8 +56,8 @@
 
 MEMORY
 {
-    VECTORS (X)  : origin=0x00000000 length=0x00000020
-    FLASH0  (RX) : origin=0x00000020 length=0x0013FFE0
+	VECTORS (X)  : origin=0x00010020 length=0x00000020  //APP_START_ADDRESS = 0x10020
+    FLASH0  (RX) : origin=0x00010040 length=0x0012FFC0
     STACKS  (RW) : origin=0x08000000 length=0x00005800
     RAM     (RW) : origin=0x08005800 length=0x0002a800
 
@@ -67,9 +67,9 @@
 #if 1
 MEMORY
 {
-    VECTORS (X)  : origin=0x00000000 length=0x00000020
-    CRCMEM  (RX) : origin=0x00000020 length=0x000001E0
-    FLASH0  (RX) : origin=0x00000200 length=0x0013FE00
+    VECTORS (X)  : origin=0x00010020 length=0x00000020
+    CRCMEM  (RX) : origin=0x00010040 length=0x000001E0
+    FLASH0  (RX) : origin=0x00010220 length=0x0012FE00
     STACKS  (RW) : origin=0x08000000 length=0x00004c00
     RAM     (RW) : origin=0x08004c00 length=0x0002b400
 
@@ -88,15 +88,15 @@
 SECTIONS
 {
     .intvecs : {} > VECTORS
-    .text    : {} > FLASH0 
-    .const   : {} > FLASH0 
-    .cinit   : {} > FLASH0 
-    .pinit   : {} > FLASH0 
+    .text    : {} > FLASH0
+    .const   : {} > FLASH0
+    .cinit   : {} > FLASH0
+    .pinit   : {} > FLASH0
     .bss     : {} > RAM
     .data    : {} > RAM
     .sysmem  : {} > RAM
-    
 
+
 /* USER CODE BEGIN (4) */
 #endif
 /* Override Sections with CRCs here */