Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r6d4aa77e6b85aa7621a234660f631e725fb1d441 -ra183c6d91569ee07c9e944c989b67dc818a87941
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 6d4aa77e6b85aa7621a234660f631e725fb1d441)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision a183c6d91569ee07c9e944c989b67dc818a87941)
@@ -7,8 +7,8 @@
 *
 * @file    ModeStandby.c
 *
-* @author  (last)      Raghu Kallala
-* @date    (last)      22-Apr-2026
+* @author  (last)      Arpita Srivastava
+* @date    (last)      13-Jul-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  07-Aug-2024
@@ -25,7 +25,7 @@
 #include "ModeGenDialysate.h"
 #include "MessageSupport.h"
 #include "Messaging.h"
-//#include "NVDataMgmt.h"
+//#include "NVMgmt.h"
 #include "OperationModes.h"
 #include "PermeateTank.h"
 #include "Pressure.h"
@@ -44,13 +44,12 @@
 
 // ********** private data **********
 
-static DD_STANDBY_MODE_STATE_T standbyState;                                              ///< Currently active standby state.
+static DD_STANDBY_MODE_STATE_T standbyState;                                            ///< Currently active standby state.
 
-static BOOL pendingStartDDPreGenRequest;                                                  ///< Flag indicating TD has requested DD start the pre generation dialysate request.
-//static BOOL pendingStartDDFlushRequest;                                                 ///< Flag indicating TD has requested DD start flush.
-//static BOOL pendingStartDDHeatDisinfectRequest;                                         ///< Flag indicating TD has requested DD start heat disinfect.
-//static BOOL pendingStartDDHeatDisinfectActiveCoolRequest;                               ///< Flag indicating TD has requested DD start heat disinfect active cool.
-//static BOOL pendingStartDGROPermeateSampleRequest;                                      ///< Flag indicating TD has requested DD to command RO to start permeate sample.
+static BOOL pendingStartDDPreGenRequest;                                                ///< Flag indicating TD has requested DD start the pre generation dialysate request.
+static BOOL pendingStartDDFlushRequest;                                                 ///< Flag indicating TD has requested DD start flush.
+static BOOL pendingStartDDHeatDisinfectRequest;                                         ///< Flag indicating TD has requested DD start heat disinfect.
+static BOOL pendingStartDDHeatDisinfectActiveCoolRequest;                               ///< Flag indicating TD has requested DD start heat disinfect active cool.
 
 // ********** private function prototypes **********
 
@@ -68,10 +67,9 @@
 {
     standbyState                                 = DD_STANDBY_MODE_STATE_IDLE;
     pendingStartDDPreGenRequest                  = FALSE;
-//    pendingStartDDFlushRequest                   = FALSE;
-//    pendingStartDDHeatDisinfectRequest           = FALSE;
-//    pendingStartDDHeatDisinfectActiveCoolRequest = FALSE;
-//    pendingStartDDROPermeateSampleRequest        = FALSE;
+    pendingStartDDFlushRequest                   = FALSE;
+    pendingStartDDHeatDisinfectRequest           = FALSE;
+    pendingStartDDHeatDisinfectActiveCoolRequest = FALSE;
 }
 
 /*********************************************************************//**
@@ -91,10 +89,9 @@
 
     deenergizeActuators( PARK_CONC_PUMPS );
 
-    resetPermeateTank();
-
     // Deactivate Balancing Chamber Switching
     requestBalChamberSwitching( FALSE );
+    resetPermeateTank();
 
 //    // Upon transition to mode standby set CD1 and CD2 calibration records to be picked to the normal
 //    // table. If the chemical disinfect fails, the mode transitions back to mode standby.
@@ -180,28 +177,23 @@
            requestNewOperationMode( DD_MODE_PREG );
        }
     }
-//    else if ( TRUE == pendingStartDDFlushRequest )
-//    {
-//        pendingStartDDFlushRequest = FALSE;
+    else if ( TRUE == pendingStartDDFlushRequest )
+    {
+        pendingStartDDFlushRequest = FALSE;
 //        requestNewOperationMode( DD_MODE_FLUS );
-//    }
-//    else if ( TRUE == pendingStartDDHeatDisinfectRequest )
-//    {
-//        pendingStartDDHeatDisinfectRequest = FALSE;
-//        requestNewOperationMode( DD_MODE_HEAT );
-//    }
-//    else if ( TRUE == pendingStartDDHeatDisinfectActiveCoolRequest )
-//    {
-//        pendingStartDDHeatDisinfectActiveCoolRequest = FALSE;
-//
-//        requestNewOperationMode( DD_MODE_HCOL );
-//    }
-//    else if ( TRUE == pendingStartDDROPermeateSampleRequest )
-//    {
-//        pendingStartDDROPermeateSampleRequest = FALSE;
-//        requestNewOperationMode( DD_MODE_ROPS );
-//    }
+    }
+    else if ( TRUE == pendingStartDDHeatDisinfectRequest )
+    {
+        pendingStartDDHeatDisinfectRequest = FALSE;
+        requestNewOperationMode( DD_MODE_HEAT );
+    }
+    else if ( TRUE == pendingStartDDHeatDisinfectActiveCoolRequest )
+    {
+        pendingStartDDHeatDisinfectActiveCoolRequest = FALSE;
 
+        requestNewOperationMode( DD_MODE_HCOL );
+    }
+
     return state;
 }
 
@@ -306,7 +298,7 @@
 //        cmdResponse.rejectCode  = DD_CMD_REQUEST_REJECT_REASON_NONE;
 //
 //#ifndef _RELEASE_
-//        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) )
+//        if ( TRUE == getTestConfigStatus( TEST_CONFIG_DISABLE_CAPS_MONITOR ) )
 //        {
 //            concCap = STATE_CLOSED;
 //            diaCap  = STATE_CLOSED;
@@ -366,7 +358,7 @@
 //        cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_NONE;
 //
 //#ifndef _RELEASE_
-//        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) )
+//        if ( TRUE == getTestConfigStatus( TEST_CONFIG_DISABLE_CAPS_MONITOR ) )
 //        {
 //            concCap = STATE_CLOSED;
 //            diaCap  = STATE_CLOSED;
@@ -427,7 +419,7 @@
 //        cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_NONE;
 //
 //#ifndef _RELEASE_
-//        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) )
+//        if ( TRUE == getTestConfigStatus( TEST_CONFIG_DISABLE_CAPS_MONITOR ) )
 //        {
 //            concCap = STATE_CLOSED;
 //            diaCap  = STATE_CLOSED;