Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r7b01b5dcd06f968bbecf0e1aae67e343847d765b -r2b60564ac818a6692b714dfd9920d2e2fcf0937d
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 7b01b5dcd06f968bbecf0e1aae67e343847d765b)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 2b60564ac818a6692b714dfd9920d2e2fcf0937d)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2021 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 ModeFill.c
+* @file    ModeFill.c
 *
-* @author (last) Quang Nguyen
-* @date (last) 25-Aug-2020
+* @author  (last)      Dara Navaei
+* @date    (last)      06-Nov-2021
 *
-* @author (original) Leonardo Baloa
-* @date (original) 19-Nov-2019
+* @author  (original)  Leonardo Baloa
+* @date    (original)  19-Nov-2019
 *
 ***************************************************************************/
 
@@ -130,7 +130,7 @@
     // Get the heaters info form the NV data management
     DG_HEATERS_RECORD_T heaterInfo       = getHeatersInfoReocrd();
     // If the data in the NV data management was not initialized properly, set it to 0 otherwise, set the average flow rate
-    fillStatus.fillFlowRateAverage       = ( heaterInfo.averageFillFlow - 0.0 < NEARLY_ZERO ? 0.0 : heaterInfo.averageFillFlow );
+    fillStatus.fillFlowRateAverage       = ( heaterInfo.averageFillFlow < NEARLY_ZERO ? 0.0 : heaterInfo.averageFillFlow );
     fillStatus.fillFlowRateRunningSum    = 0.0;
     fillStatus.fillSampleCounter         = 0;
     fillStatus.fillTemperatureRunningSum = 0.0;
@@ -252,19 +252,6 @@
 
 /*********************************************************************//**
  * @brief
- * The setAvgFillFlowRateToRTCRAM function sets the average fill flow rate
- * at the end of the treatment.
- * @details Inputs: none
- * @details Outputs: averageFillFlowRate
- * @return none
- *************************************************************************/
-void setAvgFillFlowRateToRTCRAM( void )
-{
-
-}
-
-/*********************************************************************//**
- * @brief
  * The getAverageFillTemperature function returns the average fill temperature
  * in each fill.
  * @details Inputs: none