Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -rb0a5452ec4b9be9be937095b1249079a2fce5ce5 -ra727129f5f547fc7a46f481417f7b926454d3e97
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision b0a5452ec4b9be9be937095b1249079a2fce5ce5)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision a727129f5f547fc7a46f481417f7b926454d3e97)
@@ -70,7 +70,7 @@
 #define NUM_OF_TEMP_SENSORS_TO_AVG                  4.0F                                                       ///< Number of temperature sensors to average to check the difference.
 
 // Flush and drain R1 and R2
-#define RSRVRS_FULL_VOL_ML                          1680.0F                                                    ///< Reservoirs 1 & 2 full volume in mL. TODo original value was 1900
+#define RSRVRS_FULL_VOL_ML                          1850.0F                                                    ///< Reservoirs 1 & 2 full volume in mL. TODo original value was 1900
 #define RSRVRS_PARTIAL_FILL_VOL_ML                  500.0F                                                     ///< Reservoirs 1 & 2 partial volume in mL.
 #define RSRVRS_FULL_STABLE_TIME_COUNT               ( ( 4 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL )          ///< Reservoirs 1 & 2 full stable time in counts.
 #define RSRVRS_FILL_UP_TIMEOUT_MS                   ( 5 * SEC_PER_MIN * MS_PER_SECOND )                        ///< Reservoirs 1 & 2 full fill up timeout in ms.
@@ -81,7 +81,7 @@
 #define CHEM_DISINFECT_TARGET_RO_FLOW_LPM           0.8F                                                       ///< Chemical disinfect target RO flow rate in L/min.
 #define CHEM_DISINFECT_MAX_RO_PRESSURE_PSI          130                                                        ///< Chemical disinfect maximum RO pressure in psi.
 #define CHEM_DISINFECT_TARGET_DRAIN_PRES_PSI        10.0                                                       ///< Chemical disinfect target drain outlet pressure in psi.
-#define CHEM_DISINFECT_TIME_MS                      ( 1 * SEC_PER_MIN * MS_PER_SECOND )                        ///< Chemical disinfect time for each section in milliseconds.  TODO original time was 36 minutes
+#define CHEM_DISINFECT_TIME_MS                      ( 36 * SEC_PER_MIN * MS_PER_SECOND )                       ///< Chemical disinfect time for each section in milliseconds.  TODO original time was 36 minutes
 #define CHEM_DISINFECT_START_TEMP_TIMOUT_MS         ( 4 * MIN_PER_HOUR * SEC_PER_MIN * MS_PER_SECOND )         ///< Chemical disinfect reaching to minimum temperature timeout in milliseconds.
 #define RSRVRS_TARGET_VOL_OUT_TIMEOUT_MS            ( 0.5F * SEC_PER_MIN * MS_PER_SECOND )                     ///< Reservoirs 1 & 2 maximum volume out of range timeout during chemical disinfect. TODO change this to 5 seconds
 #define RSRVRS_MAX_TARGET_VOL_CHANGE_ML             600.0F                                                     ///< Reservoirs 1 & 2 maximum allowed volume change when full during chemical disinfect. TODO original value is 100 mL