Index: firmware/App/Monitors/BloodLeak.c
===================================================================
diff -u -r3417933e6edf61a914c428e2fa944b3b349272a4 -reacc1f34fe4aa5db54718166b6d1e9c34f6e4fc6
--- firmware/App/Monitors/BloodLeak.c	(.../BloodLeak.c)	(revision 3417933e6edf61a914c428e2fa944b3b349272a4)
+++ firmware/App/Monitors/BloodLeak.c	(.../BloodLeak.c)	(revision eacc1f34fe4aa5db54718166b6d1e9c34f6e4fc6)
@@ -542,20 +542,23 @@
  *************************************************************************/
 BOOL isBloodLeakZeroingNeeded( void )
 {
-    BOOL status         = FALSE;
-    TD_OP_MODE_T opMode = getTDOpMode();
+    BOOL status = FALSE;
 
-    if ( MODE_PRET == opMode )
+    TD_MODE_SUB_MODE_T tdModes;
+
+    getTDOperationMode( &tdModes );
+
+    if ( MODE_PRET == tdModes.tdMode )
     {
         U32 intensity = getEmbModeInfoValue( I_EMB_MODE_CMD );
 
         if ( ( intensity <= BLD_START_OF_TX_MIN_INTENSITY_DRIFT ) || ( intensity >= BLD_MAX_UPPER_INTENSITY_DRIFT ) )
         {
-            SEND_EVENT_WITH_2_F32_DATA( DD_EVENT_BLOOD_LEAK_ZEROING_REQUIRED, intensity, opMode )
+            SEND_EVENT_WITH_2_F32_DATA( DD_EVENT_BLOOD_LEAK_ZEROING_REQUIRED, intensity, tdModes.tdMode )
             status = TRUE;
         }
     }
-    else if ( MODE_TREA == opMode )
+    else if ( MODE_TREA == tdModes.tdMode )
     {
         status |= isLowerRangeIntensityDriftZeroingNeeded();
         status |= isUpperIntensityZeroingNeeded();
@@ -858,9 +861,13 @@
 {
     BLOOD_LEAK_STATE_T state = BLOOD_LEAK_NORMAL_STATE;
 
+    TD_MODE_SUB_MODE_T tdModes;
+
+    getTDOperationMode( &tdModes );
+
     bloodLeakStatus.data = getFPGABloodDetectProcessedStatus();
 
-    switch ( getTDOpMode() )
+    switch ( tdModes.tdMode )
     {
         case MODE_TREA:
         case MODE_SERV:
@@ -2011,12 +2018,15 @@
  *************************************************************************/
 BOOL testSetBloodLeak2EmbeddedMode( MESSAGE_T *message )
 {
-    BOOL result       = FALSE;
-    TD_OP_MODE_T mode = getTDOpMode();
+    BOOL result = FALSE;
 
+    TD_MODE_SUB_MODE_T tdModes;
+
+    getTDOperationMode( &tdModes );
+
     // Check if the mode is fault, service or standby before accepting a transition to
     // the embedded mode
-    if ( ( MODE_FAUL == mode ) || ( MODE_SERV == mode ) || ( MODE_STAN == mode ) )
+    if ( ( MODE_FAUL == tdModes.tdMode ) || ( MODE_SERV == tdModes.tdMode ) || ( MODE_STAN == tdModes.tdMode ) )
     {
         bloodLeakSignalEmbModeReq = TRUE;
         bloodLeakEmbModeRqstedCmd = CS_EMB_MODE_CMD;