Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r65cca9d3650f1da299e0c0c682bc557439a407f2 -rc48a99d2d1c852adcc986253b6c420a90dab7bfe
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 65cca9d3650f1da299e0c0c682bc557439a407f2)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision c48a99d2d1c852adcc986253b6c420a90dab7bfe)
@@ -17,9 +17,10 @@
 
 #include <string.h>     // for memcpy()
 
-#include "TaskGeneral.h"
+#include "ModeRecirculate.h"
 #include "OperationModes.h"
 #include "SystemCommMessages.h"
+#include "TaskGeneral.h"
 #include "Reservoirs.h"
 
 /**
@@ -30,9 +31,9 @@
 // ********** private definitions **********
 
 #define MIN_RESERVOIR_VOLUME_ML                     0                                       ///< Minimum reservoir volume in mL.
-#define MAX_RESERVOIR_VOLUME_ML                     3000                                    ///< Maximum reservoir volume in mL.
+#define MAX_RESERVOIR_VOLUME_ML                     2500                                    ///< Maximum reservoir volume in mL.
 #define DEFAULT_FILL_VOLUME_ML                      1500                                    ///< Default fill volume for treatment in mL.
-#define DISINFECT_FILL_VOLUME_ML                    2900                                    ///> Fill volume for disinfection in mL.
+#define DISINFECT_FILL_VOLUME_ML                    2400                                    ///> Fill volume for disinfection in mL.
 #define MAX_FILL_VOLUME_ML                          MAX_RESERVOIR_VOLUME_ML                 ///> Maximum fill volume in mL.
 #define DEFAULT_DRAIN_VOLUME_ML                     100                                     ///> Default drain volume in mL.
 #define MAX_DRAIN_VOLUME_ML                         MAX_RESERVOIR_VOLUME_ML                 ///> Maximum drain volume in mL.
@@ -128,7 +129,8 @@
     BOOL result = FALSE;
 
     // fill command only valid in re-circulate mode
-    if ( MODE_CIRC == getCurrentOperationMode() )
+    if ( ( MODE_CIRC == getCurrentOperationMode() ) &&
+         ( RECIRCULATE_MODE_STATE_RECIRC_WATER == getRecirculateModeState() ) )
     {
         // validate parameters
         if ( fillToVolMl < MAX_FILL_VOLUME_ML )
@@ -212,6 +214,38 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The startTrimmerHeater function handles a start trimmer heater command \n
+ * from the HD.
+ * @details
+ * Inputs : none
+ * Outputs : start trimmer heater
+ * @return TRUE if stop drain command successful, FALSE if not.
+ *************************************************************************/
+BOOL startTrimmerHeater( void )
+{
+    BOOL result = FALSE;
+    // TODO
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The stopTrimmerHeater function handles a stop trimmer heater command \n
+ * from the HD.
+ * @details
+ * Inputs : none
+ * Outputs : stop trimmer heater
+ * @return TRUE if stop drain command successful, FALSE if not.
+ *************************************************************************/
+BOOL stopTrimmerHeater( void )
+{
+    BOOL result = FALSE;
+    // TODO
+    return result;
+}
+
 /*************************************************************************
  *                       GET SUPPORT FUNCTIONS
  *************************************************************************/