Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -rfcaca0915c314d04b9fa96c1960d32b63ab877db -re107dacab9f6c78574f1c26e1004e0dbdc8dba03
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision fcaca0915c314d04b9fa96c1960d32b63ab877db)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision e107dacab9f6c78574f1c26e1004e0dbdc8dba03)
@@ -53,7 +53,7 @@
 
 // Drain R1 & R2 states defines
 #define DRAIN_PUMP_TARGET_RPM                       2400                                                       ///< Drain pump target RPM during drain.
-#define DRAIN_WEIGHT_UNCHANGE_TIMEOUT               ( 6 * MS_PER_SECOND )                                      ///< Time period of unchanged weight during draining before timeout.
+#define DRAIN_WEIGHT_UNCHANGE_TIMEOUT_MS               ( 6 * MS_PER_SECOND )                                      ///< Time period of unchanged weight during draining before timeout.
 #define RSRVRS_DRAIN_TIMEOUT_MS                     ( 2 * SEC_PER_MIN * MS_PER_SECOND )                        ///< Reservoirs 1 & 2 drain timeout in ms.
 #define RSRVRS_INITIAL_DRAIN_TIMEOUT_MS            ( 2 * SEC_PER_MIN * MS_PER_SECOND )                        ///< Reservoirs 1 & 2 initial drain time out in milliseconds.
 
@@ -107,7 +107,7 @@
 #define DISINFECT_TEMP_OUT_OF_RANGE_TIMEOUT_MS      ( 1 * MS_PER_SECOND )                                      ///< Chemical disinfect temperature out of range in milliseconds.
 
 // Initial disinfectant fill of R1 and R2
-#define RSRVRS_FULL_VOL_ML                          1800.0F                                                    ///< Reservoirs 1 & 2 full volume in mL.
+#define RSRVRS_FULL_VOL_ML                          1850.0F                                                    ///< Reservoirs 1 & 2 full volume in mL.
 #define RSRVRS_LEAK_VOL_TIMEOUT_TASK_INT            ( ( 30 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL )         ///< Time delay for declaring that reservoir is leaking due to volume depletion.
 #define RSRVRS_MAX_LEAK_VOL_CHANGE_ML               100.0F;                                                    ///< Volume loss that is necessary to declare a reservoir leak.
 
@@ -480,7 +480,7 @@
 
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr1Status )
     {
-        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIMEOUT_MS );
+        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT_MS, RSRVRS_INITIAL_DRAIN_TIMEOUT_MS );
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
     {   // Done with draining R1
@@ -522,7 +522,7 @@
 
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr2Status )
     {
-        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIMEOUT_MS );
+        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT_MS, RSRVRS_INITIAL_DRAIN_TIMEOUT_MS );
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
     {
@@ -1175,7 +1175,7 @@
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr2Status )
     {
         // If the cancellation water path cannot be done, got to basic cancellation path
-        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIMEOUT_MS );
+        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT_MS, RSRVRS_INITIAL_DRAIN_TIMEOUT_MS );
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
         {
@@ -1195,7 +1195,7 @@
     if ( ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status ) && ( DG_RESERVOIR_ABOVE_TARGET == rsrvr1Status ) )
     {
         // If the cancellation water path cannot be done, got to basic cancellation path
-        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIMEOUT_MS );
+        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT_MS, RSRVRS_INITIAL_DRAIN_TIMEOUT_MS );
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
         {
@@ -1625,7 +1625,7 @@
 #endif
     {
         // If the dialysate cap is open during any state, alarm
-        if ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) )
+        if ( ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ) && ( chemDisinfectState != DG_CHEM_DISINFECT_STATE_START ) )
         {
             prevChemDisinfectState      = chemDisinfectState;
             chemDisinfectState          = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;