Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -re30951f62cdc9c52f20e9218df947d3860b3c7a7 -raa36ab1ed13d099286cedcbd066f7dce11146d13
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision e30951f62cdc9c52f20e9218df947d3860b3c7a7)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision aa36ab1ed13d099286cedcbd066f7dce11146d13)
@@ -252,22 +252,6 @@
 
 /*********************************************************************//**
  * @brief
- * The startDGHeatDisinfect function starts heat disinfect mode.
- * @details
- * Inputs: none
- * Outputs: none
- * @return: TRUE if the switch was successful
- *************************************************************************/
-BOOL startDGHeatDisinfect( void )
-{
-    // TODO: make sure DG is not in the middle of something and it is in standby
-    requestNewOperationMode( DG_MODE_HEAT );
-
-    return TRUE; // TODO Check whether it is the right request before switching
-}
-
-/*********************************************************************//**
- * @brief
  * The stopDGHeatDisinfect function stops heat disinfect mode.
  * @details
  * Inputs: heatDisinfectionState
@@ -656,17 +640,17 @@
     {
         // Set the actuators for evacuate recirculation path
         setValveState( VPI, VALVE_STATE_OPEN );
-        setValveState( VBF, VALVE_STATE_OPEN );
+        setValveState( VBF, VALVE_STATE_CLOSED );
         setValveState( VSP, VALVE_STATE_CLOSED );
         setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
         setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
         setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO ); // C to NC
         setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO ); // C to NC
-        setValveState( VRO, VALVE_STATE_R2_C_TO_NO );
-        setValveState( VRD, VALVE_STATE_R1_C_TO_NO );
+        setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
+        setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
         setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
         setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
-        setROPumpTargetFlowRate( RO_PUMP_TARGET_FLOW_RATE_LPM );
+        setROPumpTargetFlowRate( 0.3 );  //RO_PUMP_TARGET_FLOW_RATE_LPM
         stateTimer = getMSTimerCount(); // For evac recirc path. TODO later, it should be controlled using
         // the composite pump
 
@@ -677,8 +661,8 @@
         setActuatorsToFillWater();
         // Start the UV reactors to disinfect the water that
         // is being filled up
-        startInletUVReactor();
-        startOutletUVReactor();
+        //startInletUVReactor();
+        //startOutletUVReactor();
 
         state = INTERNAL_HEAT_DISINFECT_STATE_FILL_WITH_WATER;
     }
@@ -769,7 +753,7 @@
     INTERNAL_HEAT_DISINFECT_STATE_T state = INTERNAL_HEAT_DISINFECT_STATE_EVACUATE_RECIRC_PATH;
 
     // TODO change this to composition pump mode
-    if ( didTimeout( stateTimer, HEAT_DISINFECT_EVAC_RECIRC_PATH_TIME_MS ) )
+    /*if ( didTimeout( stateTimer, HEAT_DISINFECT_EVAC_RECIRC_PATH_TIME_MS ) )
     {
         // Set the state to evacuate reservoir 1
         signalROPumpHardStop();
@@ -787,7 +771,7 @@
         setDrainPumpTargetSpeed( drainPumpTargetRPM ); //TODO commented for testing
 
         state = INTERNAL_HEAT_DISINFECT_STATE_EVACUATE_R1;
-    }
+    }*/
 
     return state;
 }
@@ -880,16 +864,16 @@
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
-    setValveState( VRO, VALVE_STATE_R2_C_TO_NO );
-    setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
+    setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
+    setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
     setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
     setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
 
     //TODO composition pumps
     signalROPumpHardStop();
     signalDrainPumpHardStop();
-    stopInletUVReactor();
-    stopOutletUVReactor();
+    //stopInletUVReactor();
+    //stopOutletUVReactor();
     stopPrimaryHeater();
     stopTrimmerHeater();
 }