Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rb50acaa8dda74292fb41110440eaaa40f2959fb7 -r89c8709e3b27648926fbb20f25c9a67cbeb99adc
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision b50acaa8dda74292fb41110440eaaa40f2959fb7)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 89c8709e3b27648926fbb20f25c9a67cbeb99adc)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2024-2025 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    ModeGenDialysate.c
 *
-* @author  (last)      Vinayakam Mani
-* @date    (last)      14-Nov-2025
+* @author  (last)      Michael Garthwaite
+* @date    (last)      29-Jan-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  06-Nov-2024
@@ -623,15 +623,16 @@
         execBalancingChamberControl();
     }
 
-#ifdef __SPENT_CHAMBER_FILL__
-    if ( ( TRUE == pendingSpentChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_SPENT_CHAMBER_H_FILL ) == TRUE )
     {
-        setModeGenDStateTransition( DD_GEND_SPENT_CHAMBER_FILL_STATE );
-        pendingSpentChamberFill = FALSE;
-        isDialDeliveryInProgress.data = FALSE;
-        state = DD_GEND_SPENT_CHAMBER_FILL_STATE;
+        if ( ( TRUE == pendingSpentChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
+        {
+            setModeGenDStateTransition( DD_GEND_SPENT_CHAMBER_FILL_STATE );
+            pendingSpentChamberFill = FALSE;
+            isDialDeliveryInProgress.data = FALSE;
+            state = DD_GEND_SPENT_CHAMBER_FILL_STATE;
+        }
     }
-#endif
 #ifdef __BICARB_CHAMBER_FILL__
     if ( ( TRUE == pendingBicarbChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
     {
@@ -676,15 +677,16 @@
         isDialDeliveryInProgress.data = FALSE;
         state = DD_GEND_DIALYSATE_BYPASS_STATE;
     }
-#ifdef __SPENT_CHAMBER_FILL__
-    else if ( ( TRUE == pendingSpentChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
+    else if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_SPENT_CHAMBER_H_FILL ) == TRUE )
     {
-        setModeGenDStateTransition( DD_GEND_SPENT_CHAMBER_FILL_STATE );
-        pendingSpentChamberFill = FALSE;
-        isDialDeliveryInProgress.data = FALSE;
-        state = DD_GEND_SPENT_CHAMBER_FILL_STATE;
+        if ( ( TRUE == pendingSpentChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
+        {
+            setModeGenDStateTransition( DD_GEND_SPENT_CHAMBER_FILL_STATE );
+            pendingSpentChamberFill = FALSE;
+            isDialDeliveryInProgress.data = FALSE;
+            state = DD_GEND_SPENT_CHAMBER_FILL_STATE;
+        }
     }
-#endif
 #ifdef __BICARB_CHAMBER_FILL__
     else if ( ( TRUE == pendingBicarbChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
     {
@@ -985,7 +987,7 @@
  *************************************************************************/
 static void checkDialysateTemperature( void )
 {
-    F32 dialysateTemp                   = getConductivityTemperatureValue( D29_COND );  // Assuming the closest temp sensor to dialyzer
+    F32 dialysateTemp                   = getFilteredConductivitySensorTemperature( D29_COND );  // Assuming the closest temp sensor to dialyzer
     F32 targetTemp                      = getTDTargetDialysateTemperature();
     BOOL isDialTempAboveHighSafety      = ( dialysateTemp >= DIALYSATE_TEMP_UPPER_MAX_SAFETY_LIMIT_C ? TRUE : FALSE );
     BOOL isDialTempAboveLowSafety       = ( dialysateTemp > DIALYSATE_TEMP_UPPER_SAFETY_LIMIT_C ? TRUE : FALSE );
@@ -1044,12 +1046,6 @@
 
         data.genDialysateExecState              = (U32)getCurrentGenDialysateState();
         data.isDialDelInProgress                = (BOOL)getDialDeliveryProgressStatus();
-        data.d6Level                            = (U32)getLevelStatus( D6_LEVL );
-        data.d63Level                           = (U32)getLevelStatus( D63_LEVL );
-        data.d46Level                           = (U32)getLevelStatus( D46_LEVL );
-        data.d9Pressure                         = getFilteredPressure( D9_PRES );
-        data.d18Pressure                        = getFilteredPressure( D18_PRES );
-        data.d51Pressure                        = getFilteredPressure( D51_PRES );
         data.isDialysateGoodtoDeliver           = (BOOL)getDialGoodToDeliverStatus();
         data.currentQd                          = dialysateToDialyzerFlowRate;