Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -r2eedd65c212a2eecbb61e2eca630603ea3d4a206 -r0d0a65cc7b3daef294349a176d7f603a06634aa8
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 2eedd65c212a2eecbb61e2eca630603ea3d4a206)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 0d0a65cc7b3daef294349a176d7f603a06634aa8)
@@ -8,7 +8,7 @@
 * @file    LoadCell.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      04-Apr-2024
+* @date    (last)      11-Apr-2024
 *
 * @author  (original)  Saeed Nejatali
 * @date    (original)  25-Feb-2020
@@ -208,11 +208,16 @@
         getNVRecord2Driver( GET_CAL_LOAD_CELL_SENSORS, (U08*)&loadCellsCalRecord, sizeof( DG_LOAD_CELLS_CAL_RECORD_T ),
                             NUM_OF_CAL_DATA_LOAD_CELLS, ALARM_ID_DG_LOAD_CELLS_INVALID_CAL_RECORD );
 
-        // Set the current tare values when the values are received from the cal record
-        loadcells[ LOAD_CELL_RESERVOIR_1_PRIMARY ].autoCalOffset = reservoirsCalRecord.reservoir[ CAL_DATA_RSRVR_1 ].rsrvrUnfilledWeight;
-        loadcells[ LOAD_CELL_RESERVOIR_1_BACKUP ].autoCalOffset  = reservoirsCalRecord.reservoir[ CAL_DATA_RSRVR_1 ].rsrvrUnfilledWeight;
-        loadcells[ LOAD_CELL_RESERVOIR_2_PRIMARY ].autoCalOffset = reservoirsCalRecord.reservoir[ CAL_DATA_RSRVR_2 ].rsrvrUnfilledWeight;
-        loadcells[ LOAD_CELL_RESERVOIR_2_BACKUP ].autoCalOffset  = reservoirsCalRecord.reservoir[ CAL_DATA_RSRVR_2 ].rsrvrUnfilledWeight;
+        if ( getCurrentOperationMode() != DG_MODE_SERV )
+        {
+            // In the service mode once the calibration values are set, the NV data management sends the signal to all the drivers and therefore the
+            // the offset values are set to what is in the calibration records. This is not wanted in the service mode
+            // Set the current tare values when the values are received from the cal record
+            loadcells[ LOAD_CELL_RESERVOIR_1_PRIMARY ].autoCalOffset = reservoirsCalRecord.reservoir[ CAL_DATA_RSRVR_1 ].rsrvrUnfilledWeight;
+            loadcells[ LOAD_CELL_RESERVOIR_1_BACKUP ].autoCalOffset  = reservoirsCalRecord.reservoir[ CAL_DATA_RSRVR_1 ].rsrvrUnfilledWeight;
+            loadcells[ LOAD_CELL_RESERVOIR_2_PRIMARY ].autoCalOffset = reservoirsCalRecord.reservoir[ CAL_DATA_RSRVR_2 ].rsrvrUnfilledWeight;
+            loadcells[ LOAD_CELL_RESERVOIR_2_BACKUP ].autoCalOffset  = reservoirsCalRecord.reservoir[ CAL_DATA_RSRVR_2 ].rsrvrUnfilledWeight;
+        }
     }
 
     // Rolling average of last 100 raw samples in small filter