Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -r89259a1e69799a051874afaf351c37091bef26da -rc127dcd204e97f487256c3f14e1998bde0b7823d
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 89259a1e69799a051874afaf351c37091bef26da)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision c127dcd204e97f487256c3f14e1998bde0b7823d)
@@ -34,17 +34,18 @@
 // TODO check the maximum weight on the load cells in tare. There was 1500 grams limit
 // but it has been removed. Check the load cells data sheet.
 
-#define LOAD_CELL_REPORT_PERIOD                       (100 / TASK_PRIORITY_INTERVAL)        ///< Broadcast load cell values message every 100 ms.
+#define LOAD_CELL_REPORT_PERIOD                             (100 / TASK_PRIORITY_INTERVAL)        ///< Broadcast load cell values message every 100 ms.
 /// Conversion factor from ADC counts to grams.
-static const F32 ADC2GRAM =                           (0.0894 * 1.1338);
-#define LOAD_CELL_FILTER_ALPHA                        0.05                                  ///< Alpha factor for the alpha filter used on load cell readings.
+static const F32 ADC2GRAM =                                 (0.0894 * 1.1338);
+#define LOAD_CELL_FILTER_ALPHA                              0.05                                  ///< Alpha factor for the alpha filter used on load cell readings.
 
-#define SIZE_OF_SMALL_LOAD_CELL_AVG                   100                                   ///< Small load cell moving average has 100 raw samples @ 10ms intervals (1-second).
-#define SIZE_OF_LARGE_LOAD_CELL_AVG                   40                                    ///< Large load cell moving average has 40 samples from small filter @ 100ms intervals (4-second).
+#define SIZE_OF_SMALL_LOAD_CELL_AVG                         100                                   ///< Small load cell moving average has 100 raw samples @ 10ms intervals (1-second).
+#define SIZE_OF_LARGE_LOAD_CELL_AVG                         40                                    ///< Large load cell moving average has 40 samples from small filter @ 100ms intervals (4-second).
 
-#define LOAD_CELL_ADC_ERROR_PERSISTENCE               500                                   ///< Alarm persistence period (in ms) for load cell ADC errors.
-#define EMPTY_RESERVOIR_WEIGHT_GRAMS                  1600                                  ///< Reservoirs empty weight in grams.
-#define MAX_ALLOWED_EXTRA_WEIGHT_BEFORE_TARE_GRAMS    150                                   ///< Max allowed extra weight before tare in grams.
+#define LOAD_CELL_ADC_ERROR_PERSISTENCE                     500                                   ///< Alarm persistence period (in ms) for load cell ADC errors.
+#define EMPTY_RESERVOIR_WEIGHT_GRAMS                        1600                                  ///< Reservoirs empty weight in grams.
+#define MAX_ALLOWED_EXTRA_WEIGHT_BEFORE_FIRST_TARE_GRAMS    300                                   ///< Max allowed extra weight before first tare in grams.
+#define MAX_ALLOWED_EXTRA_WEIGHT_BEFORE_TARE_GRAMS          15                                    ///< Max allowed extra weight before tare in grams.
 
 /// Load cell data structure.
 typedef struct
@@ -286,7 +287,7 @@
         // For the first tare, the weight of the reservoir should be considered
         // The current weight of the load cell should not be greater than the weight of the reservoir + the extra weight
         F32 deltaWeight = fabs( weight - EMPTY_RESERVOIR_WEIGHT_GRAMS );
-        isWeightOutOfRange = ( deltaWeight > MAX_ALLOWED_EXTRA_WEIGHT_BEFORE_TARE_GRAMS ? TRUE : FALSE );
+        isWeightOutOfRange = ( deltaWeight > MAX_ALLOWED_EXTRA_WEIGHT_BEFORE_FIRST_TARE_GRAMS ? TRUE : FALSE );
     }
     else
     {