Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -rc65551beea443f6fb5a50c5be5af73c97fe77cf5 -r66cc826068b54bc436cde0fae70a05ba6c1ac974
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision c65551beea443f6fb5a50c5be5af73c97fe77cf5)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 66cc826068b54bc436cde0fae70a05ba6c1ac974)
@@ -8,7 +8,7 @@
 * @file    ModeDrain.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      25-Feb-2022
+* @date    (last)      31-Mar-2022
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  20-Dec-2019
@@ -19,6 +19,7 @@
 #include "ConductivitySensors.h"
 #include "DrainPump.h"
 #include "Heaters.h"
+#include "ModeFill.h"
 #include "ModeDrain.h"
 #include "OperationModes.h"
 #include "Pressures.h"
@@ -242,6 +243,19 @@
             setValveState( VRD2, VALVE_STATE_CLOSED );
         }
 
+        // check for empty bottles at the end of drain
+        if ( TRUE == isEmptyAcidBottle() )                                // is acid volume < 10%
+        {
+            setThisFisrtFillFlag( TRUE );                                 // indicates bottles need prime
+            activateAlarmNoData( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME );    // trigger empty acid bottle alarm
+        }
+
+        if ( TRUE == isEmptyBicarbBottle() )
+        {
+            setThisFisrtFillFlag( TRUE );
+            activateAlarmNoData( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME );
+        }
+
         if ( TRUE == isReservoirTarePending() )
         {   // Tare reservoir load cells at empty if requested
             result = DG_DRAIN_STATE_TARE;
@@ -251,9 +265,7 @@
             requestNewOperationMode( DG_MODE_GENE );
         }
     }
-
-    // Drain timed out raise the alarm
-    if ( TRUE == didTimeout( dialysateDrainStartTime, DIALYSATE_DRAIN_TIME_OUT ) )
+    else if ( TRUE == didTimeout( dialysateDrainStartTime, DIALYSATE_DRAIN_TIME_OUT ) )  // Drain timed out raise the alarm
     {
         activateAlarmNoData( ALARM_ID_DG_DIALYSATE_DRAIN_TIME_OUT );
     }