Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r83be31443b784bde461da44ed1a05cf66f4b250e -r14cae75063dc6af729140082bce14a158a1b6506
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 83be31443b784bde461da44ed1a05cf66f4b250e)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 14cae75063dc6af729140082bce14a158a1b6506)
@@ -225,16 +225,29 @@
             setValveState( D35_VALV, VALVE_STATE_CLOSED );  // VDI
             setValveState( D40_VALV, VALVE_STATE_CLOSED );  // VDO
             setValveState( D47_VALV, VALVE_STATE_CLOSED );  // spent chamber purge valve
-            setValveState( D64_VALV, VALVE_STATE_CLOSED );
             setValveState( D34_VALV, VALVE_STATE_OPEN );    // Bypass valve
-            setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+            setValveState( D8_VALV, VALVE_STATE_CLOSED );
+            setValveState( D54_VALV, VALVE_STATE_CLOSED );
+            setValveState( D81_VALV, VALVE_STATE_CLOSED );
+            setValveState( D85_VALV, VALVE_STATE_CLOSED );
+            setValveState( D31_VALV, VALVE_STATE_CLOSED );
 
+            if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == FALSE )
+            {
+                setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+                setValveState( D64_VALV, VALVE_STATE_CLOSED );
+            }
+
             // Turn on the primary heater
             calculateTargetDialysateTemp();
             setHeaterTargetTemperature( D5_HEAT, getGenDialysateTargetTemperature() );
             setD28TempFeedbackControl( TRUE );
             startHeater( D5_HEAT );
 
+            //Turn on Trimmer heater
+            setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+            startHeater( D45_HEAT );
+
             //Testing : Enable close loop once testing is complete
             //setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, FALSE );
             setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
@@ -257,13 +270,28 @@
             setValveState( D64_VALV, VALVE_STATE_CLOSED );
             setValveState( D14_VALV, VALVE_STATE_OPEN );
             setValveState( D53_VALV, VALVE_STATE_OPEN );    // Drain valve
+            setValveState( D8_VALV, VALVE_STATE_CLOSED );
+            setValveState( D54_VALV, VALVE_STATE_CLOSED );
+            setValveState( D81_VALV, VALVE_STATE_CLOSED );
+            setValveState( D85_VALV, VALVE_STATE_CLOSED );
+            setValveState( D31_VALV, VALVE_STATE_CLOSED );
 
+            if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == FALSE )
+            {
+                setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+                setValveState( D64_VALV, VALVE_STATE_CLOSED );
+            }
+
             // Turn on the primary heater
             calculateTargetDialysateTemp();
             setHeaterTargetTemperature( D5_HEAT, getGenDialysateTargetTemperature() );
             setD28TempFeedbackControl( TRUE );
             startHeater( D5_HEAT );
 
+            //Turn on Trimmer heater
+            setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+            startHeater( D45_HEAT );
+
             //setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, FALSE );
             setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
             //setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, FALSE );
@@ -288,7 +316,18 @@
             setValveState( D34_VALV, VALVE_STATE_OPEN );    // Bypass valve
             setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
             setValveState( D47_VALV, VALVE_STATE_OPEN );    // Spent chamber purge valve
+            setValveState( D8_VALV, VALVE_STATE_CLOSED );
+            setValveState( D54_VALV, VALVE_STATE_CLOSED );
+            setValveState( D81_VALV, VALVE_STATE_CLOSED );
+            setValveState( D85_VALV, VALVE_STATE_CLOSED );
+            setValveState( D31_VALV, VALVE_STATE_CLOSED );
 
+            if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == FALSE )
+            {
+                setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+                setValveState( D64_VALV, VALVE_STATE_CLOSED );
+            }
+
             requestConcentratePumpOff( D76_PUMP, FALSE );
             requestConcentratePumpOff( D11_PUMP, FALSE );
             requestConcentratePumpOff( D10_PUMP, FALSE );
@@ -298,6 +337,8 @@
             setHeaterTargetTemperature( D5_HEAT, getGenDialysateTargetTemperature() );
             setD28TempFeedbackControl( TRUE );
             startHeater( D5_HEAT );
+            //Stop trimmer heater
+            stopHeater( D45_HEAT );
 
             setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
             setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_FILL_RPM, TRUE );
@@ -322,8 +363,12 @@
 
             setValveState( D53_VALV, VALVE_STATE_OPEN );    // Drain valve
             setValveState( D34_VALV, VALVE_STATE_OPEN );    // Bypass valve
-            setValveState( D64_VALV, VALVE_STATE_OPEN );    // Bicarb chamber purge valve
-            setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+
+            if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == FALSE )
+            {
+                setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+                setValveState( D64_VALV, VALVE_STATE_CLOSED );
+            }
             bicarbFillStartTimeMS = getMSTimerCount();
 
             // Turn on the primary heater
@@ -362,7 +407,6 @@
             setValveState( D40_VALV, VALVE_STATE_CLOSED );
             setValveState( D31_VALV, VALVE_STATE_CLOSED );
             setValveState( D47_VALV, VALVE_STATE_CLOSED );
-            setValveState( D64_VALV, VALVE_STATE_CLOSED );
             setValveState( D54_VALV, VALVE_STATE_CLOSED );
             setValveState( D14_VALV, VALVE_STATE_CLOSED );
             setValveState( D52_VALV, VALVE_STATE_CLOSED );
@@ -374,7 +418,12 @@
 
             setValveState( D34_VALV, VALVE_STATE_OPEN );
             setValveState( D53_VALV, VALVE_STATE_OPEN );
-            setValveState( D80_VALV, VALVE_STATE_OPEN );
+
+            if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == FALSE )
+            {
+                setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+                setValveState( D64_VALV, VALVE_STATE_CLOSED );
+            }
             break;
 
         case DD_GEND_ISOLATED_UF_STATE:
@@ -1039,7 +1088,7 @@
  *************************************************************************/
 static void checkDialysateTemperature( void )
 {
-    F32 dialysateTemp                   = getConductivityTemperatureValue( D29_COND );  // Assuming the closest temp sensor to dialyzer
+    F32 dialysateTemp                   = getFilteredConductivitySensorTemperatureValue( 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 );