Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -ra9315539f527b92523b1598ff91e47db4d71dae2 -r0803f828b81e046166457564650acf6a9bbd3cc6
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision a9315539f527b92523b1598ff91e47db4d71dae2)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 0803f828b81e046166457564650acf6a9bbd3cc6)
@@ -8,7 +8,7 @@
 * @file    Reservoirs.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      25-Feb-2022
+* @date    (last)      31-Mar-2022
 *
 * @author  (original)  Sean
 * @date    (original)  18-Mar-2020
@@ -45,10 +45,10 @@
 #define DEFAULT_DRAIN_VOLUME_ML                   0                                               ///< Default drain volume in mL.
 #define MAX_DRAIN_VOLUME_ML                       MAX_RESERVOIR_VOLUME_ML                         ///< Maximum drain volume in mL.
 
-#define MIN_DRAIN_INLET_PSI_EMPTY                 -3.0                                            ///< Minimum drain inlet pressure (in PSI) to indicate reservoir is empty while drain pump on.
+#define MIN_DRAIN_INLET_PSI_EMPTY                 -3.0F                                           ///< Minimum drain inlet pressure (in PSI) to indicate reservoir is empty while drain pump on.
 #define RESERVOIR_DATA_PUB_INTERVAL               ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )       ///< interval (ms/task time) at which the reservoir data is published on the CAN bus.
-#define MAX_REDUNDANT_LOAD_CELL_DIFF              50.0                                            ///< Maximum difference in redundant load cells when determining if fill completed.
-#define MAX_DRAIN_RPM_MLP                         2400.0                                          ///< Maximum drain RPM in mL/min.
+#define MAX_REDUNDANT_LOAD_CELL_DIFF              50.0F                                           ///< Maximum difference in redundant load cells when determining if fill completed.
+#define MAX_DRAIN_RPM_MLP                         2400.0F                                         ///< Maximum drain RPM in mL/min.
 #define DATA_PUBLISH_COUNTER_START_COUNT          5                                               ///< Data publish counter start count.
 
 // ********** private data **********
@@ -310,15 +310,20 @@
     cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE;
 
     // fill command only valid in generation idle mode
-    if ( ( DG_MODE_GENE == getCurrentOperationMode() ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == getCurrentGenIdleState() ) )
+    if ( ( DG_MODE_GENE == getCurrentOperationMode() ) && ( ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == getCurrentGenIdleState() ) ||
+                                                            ( DG_GEN_IDLE_MODE_STATE_HANDLE_BAD_FILL == getCurrentGenIdleState() ) ) )
     {
         // validate parameters
         if ( fillToVolMl < MAX_FILL_VOLUME_ML )
         {
             fillVolumeTargetMl.data = fillToVolMl;
             cmdResponse.rejected    = FALSE;
 
-            requestNewOperationMode( DG_MODE_FILL );
+            if ( ( FALSE == isAlarmActive( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME ) ) ||    // reject moving to fill mode if
+                 ( FALSE == isAlarmActive( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME ) ) )   // alarm is active
+            {
+                requestNewOperationMode( DG_MODE_FILL );
+            }
         }
         else
         {
@@ -778,7 +783,6 @@
     reservoirWeightUnchangeStartTime[ reservoirId ]                 = 0;
     reservoirPreviousStatus[ reservoirId ].previousReservoirWeightG = getLoadCellSmallFilteredWeight( associatedLoadCell[ reservoirId ] );
     reservoirPreviousStatus[ reservoirId ].previousDrainFlowML      = 0.0;
-
 }