Index: firmware/App/Services/TDInterface.c
===================================================================
diff -u -rc90fd723edae06c0cd1c709ef42c7ab3ad52b749 -r4fdac9edd409e97468c317e6c3c34dd5ac602410
--- firmware/App/Services/TDInterface.c	(.../TDInterface.c)	(revision c90fd723edae06c0cd1c709ef42c7ab3ad52b749)
+++ firmware/App/Services/TDInterface.c	(.../TDInterface.c)	(revision 4fdac9edd409e97468c317e6c3c34dd5ac602410)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2024-2026 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    TDInterface.c
 *
 * @author  (last)      Vinayakam Mani
-* @date    (last)      28-Oct-2024
+* @date    (last)      26-Feb-2026
 *
 * @author  (original)  Vinayakam Mani
-* @date    (original)  28-Oct-2024
+* @date    (original)  06-Nov-2024
 *
 ***************************************************************************/
 
@@ -72,7 +72,6 @@
 static TD_OP_MODE_T tdCurrentOpMode;                                       ///< Current TD operation mode.
 static U32 tdSubMode;                                                      ///< Current state (sub-mode) of current TD operation mode.
 static BOOL tdDialyzerBypass;                                              ///< TD dialyzer bypass
-
 static BOOL tdOpModeDataFreshFlag = FALSE;                                 ///< Flag to signal/process fresh TD op mode data
 
 static OVERRIDE_F32_T tdDialysateFlowrate;                                 ///< TD Dialysate flow rate
@@ -396,14 +395,23 @@
     {
         PRE_GEN_DIALYSATE_REQ_PAYLOAD_T startPreGenRequest;
         DD_OP_MODE_T ddMode = getCurrentOperationMode();
+        FP_OP_MODE_T fpMode = getCurrentFPOperationMode();
 
         memcpy( &startPreGenRequest, message->payload, sizeof( PRE_GEN_DIALYSATE_REQ_PAYLOAD_T ) );
 
         // Process the pre-gen dialysate delivery request message
         if ( ( DD_MODE_STAN == ddMode ) && ( TRUE == startPreGenRequest.start ) )
         {
             // Start FP Pre-Generate Permeate
-            fpReason = signalStartGenPermeate();
+
+            if ( ( FP_MODE_STAN == fpMode ) && ( getTestConfigStatus( TEST_CONFIG_DD_RUN_SOLO ) == FALSE ) )
+            {
+                fpReason = signalStartGenPermeate();
+            }
+            else
+            {
+                fpReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
+            }
             // start pre-gen dialysate
             result = requestDDPreGenStart();
 
@@ -414,7 +422,8 @@
             // Update Temperature, Acid/Bicarb type and dialysate rate for pregen process.
             setTDDialysateFlowrate( startPreGenRequest.dialRate );
             setTDTargetDialysateTemperature( startPreGenRequest.dialTemp );
-            setTDAcidAndBicarbType( startPreGenRequest.acidType, startPreGenRequest.bicarbType );
+            //TODO : update latest staging code
+            //setTDAcidAndBicarbType( startPreGenRequest.acidType, startPreGenRequest.bicarbType );
         }
         else if ( DD_MODE_PREG == ddMode )
         {
@@ -470,7 +479,8 @@
             setTDTargetDialysateTemperature( startTxRequest.dialTemp );
 
             // Set concentrate types, Bypass dialyzer
-            setTDAcidAndBicarbType( startTxRequest.acidType, startTxRequest.bicarbType );
+            //TODO : update latest staging code
+            //setTDAcidAndBicarbType( startTxRequest.acidType, startTxRequest.bicarbType );
             setTDDialyzerBypass( startTxRequest.bypassDialyzer );
 
             // start dialysate generation
@@ -498,7 +508,8 @@
                 setTDTargetDialysateTemperature( startTxRequest.dialTemp );
 
                 // Set concentrate types, Bypass dialyzer
-                setTDAcidAndBicarbType( startTxRequest.acidType, startTxRequest.bicarbType );
+                //TODO : update latest staging code
+                //setTDAcidAndBicarbType( startTxRequest.acidType, startTxRequest.bicarbType );
                 setTDDialyzerBypass( startTxRequest.bypassDialyzer );
 
                 // Signal to update treatement parameters