Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -rb687ab5673dc5da53537f538056ea12842b3f6ce -rcd5be724d5a3ba7457e761191d82f278654d7f5c
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision b687ab5673dc5da53537f538056ea12842b3f6ce)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision cd5be724d5a3ba7457e761191d82f278654d7f5c)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2024 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)      Michael Garthwaite
-* @date    (last)      24-Aug-2023
+* @author  (last)      Dara Navaei
+* @date    (last)      12-Oct-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -165,7 +165,7 @@
         transitionToNewOperationMode( newMode );
         currentMode = newMode;
 
-        if ( ( MODE_TREA == lastMode ) && ( currentMode != MODE_TREA ) )
+        if ( MODE_TREA == lastMode )
         {
             // If the last mode is treatment but the new mode is not treatment
             // it means the treatment is done. Get the elapsed time since the beginning of the treatment and convert it to hours to be written
@@ -219,8 +219,10 @@
             break;
     }   // End switch
 
+#ifndef _VECTORCAST_
     // Send operation status event when appropriate
     if ( ( priorSubMode != currentSubMode ) || ( priorSubState != currentSubState ) || ( prior4thLevelState != current4thLevelState ) )
+#endif
     {
         sendOperationStatusEvent();
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_MODE_CHANGE, priorSubMode, currentSubMode )