Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -rdcd360fb4dc37db2dcbeb7fb14fb327fe68235f4 -r604d8aaceeb8e0b650ac2054644333fc7717bb51
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision dcd360fb4dc37db2dcbeb7fb14fb327fe68235f4)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 604d8aaceeb8e0b650ac2054644333fc7717bb51)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    ModeDrain.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      06-Nov-2021
+* @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"
@@ -50,11 +51,10 @@
 
 #define DIALYSATE_DRAIN_TIME_OUT        ( 2 * SEC_PER_MIN * MS_PER_SECOND )                   ///< Dialysate drain time out.
 
-/// Time period to wait for concentrate lines to rinse.
-#define RINSE_CONCENTRATE_LINES_WAIT    ( 25 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )
-/// Reserver the concentrate speed to rinse out concentrate lines.
-#define RINSE_SPEED                     ( ( CONCENTRATE_PUMP_MAX_SPEED - 3.0 ) * -1.0 )
+#define RINSE_CONCENTRATE_LINES_WAIT    ( 25 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )        ///< Time period to wait for concentrate lines to rinse.
 
+#define RINSE_SPEED                     ( ( CONCENTRATE_PUMP_MAX_SPEED - 3.0 ) * -1.0 )       ///< Reserver the concentrate speed to rinse out concentrate lines.
+
 // ********** private data **********
 
 static DG_DRAIN_STATE_T drainState;                                                           ///< Currently active drain state.
@@ -73,16 +73,17 @@
  * @brief
  * The initDrainMode function initializes the drain mode module.
  * @details Inputs: none
- * @details Outputs: drainState, drainEmptyTareTimerCtr, dialysateDrainStartTime
+ * @details Outputs: drainState, drainEmptyTareTimerCtr, dialysateDrainStartTime,
+ * rinseConcentrateLines, rinseConcentrateLinesTimerCtr
  * @return none
  *************************************************************************/
 void initDrainMode( void )
 {
-    drainState              = DG_DRAIN_STATE_START;
-    drainEmptyTareTimerCtr  = 0;
-    rinseConcentrateLines = FALSE;
+    drainState                    = DG_DRAIN_STATE_START;
+    drainEmptyTareTimerCtr        = 0;
+    rinseConcentrateLines         = FALSE;
     rinseConcentrateLinesTimerCtr = 0;
-    dialysateDrainStartTime = 0;
+    dialysateDrainStartTime       = 0;
 }
 
 /*********************************************************************//**
@@ -107,6 +108,9 @@
     {
         setValveStateDelayed( VRD2, VALVE_STATE_OPEN, DELAY_RES_DRAIN_VALVE_MS );
     }
+
+    initDrainParameters( inactiveReservoir );
+
     // set initial actuator states
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setDrainPumpTargetRPMDelayed( TARGET_DRAIN_PUMP_RPM, DELAY_DRAIN_PUMP_MS );
@@ -115,8 +119,9 @@
     // because the initial guess in the heaters driver needs the target flow to calculate
     // the new PWMs for the main and small primary heaters
 #ifndef DISABLE_FLOW_CONTROL_TREATMENT
-    setROPumpTargetFlowRate( TARGET_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
+    setROPumpTargetFlowRateLPM( TARGET_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
 #endif
+    setHeaterTargetTemperature( DG_PRIMARY_HEATER, getPrimaryHeaterTargetTemperature() );
     startHeater( DG_PRIMARY_HEATER );
 
     return drainState;
@@ -238,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;
@@ -247,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 );
     }