Index: firmware/.launches/DG.launch
===================================================================
diff -u -r787312bd901f9c4c9d9e91591ecadca9f22fbeb6 -rd4b046813eb5b680702ba2a8376efe793607a0ea
--- firmware/.launches/DG.launch	(.../DG.launch)	(revision 787312bd901f9c4c9d9e91591ecadca9f22fbeb6)
+++ firmware/.launches/DG.launch	(.../DG.launch)	(revision d4b046813eb5b680702ba2a8376efe793607a0ea)
@@ -6,7 +6,7 @@
 </mapAttribute>
 <mapAttribute key="ccs.memoryview.pageexpr">
 <mapEntry key="org.eclipse.cdt.debug.ui.memory.memorybrowser.MemoryBrowser.PIN_CLONE_VIEW_1@#$Texas Instruments XDS110 USB Debug Probe/CortexR4" value="@@0x08011EAC"/>
-<mapEntry key="org.eclipse.cdt.debug.ui.memory.memorybrowser.MemoryBrowser@#$Texas Instruments XDS110 USB Debug Probe/CortexR4" value="@@0x080132EC"/>
+<mapEntry key="org.eclipse.cdt.debug.ui.memory.memorybrowser.MemoryBrowser@#$Texas Instruments XDS110 USB Debug Probe/CortexR4" value="@@0xF0200000"/>
 </mapAttribute>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES./home/fw/workspace_dg/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;FlashEraseSelection&quot;&gt;&#10;    &lt;curValue&gt;Necessary Sectors Only (for Program Load)&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES./home/fw/wsdg/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;FlashEraseSelection&quot;&gt;&#10;    &lt;curValue&gt;Necessary Sectors Only (for Program Load)&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -r87a22cbaa87daab0d7cedabc67452cead83d8630 -rd4b046813eb5b680702ba2a8376efe793607a0ea
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 87a22cbaa87daab0d7cedabc67452cead83d8630)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision d4b046813eb5b680702ba2a8376efe793607a0ea)
@@ -90,10 +90,10 @@
     U32 ii;
 
     // update sums for load cell average calculations
-    loadcells[ LOAD_CELL_A1 ].measuredReadingSum += getFPGALoadCellA1();
-    loadcells[ LOAD_CELL_A2 ].measuredReadingSum += getFPGALoadCellA2();
-    loadcells[ LOAD_CELL_B1 ].measuredReadingSum += getFPGALoadCellB1();
-    loadcells[ LOAD_CELL_B2 ].measuredReadingSum += getFPGALoadCellB2();
+    loadcells[ LOAD_CELL_RESERVOIR_1_PRIMARY ].measuredReadingSum += getFPGALoadCellA1();
+    loadcells[ LOAD_CELL_RESERVOIR_1_BACKUP ].measuredReadingSum += getFPGALoadCellA2();
+    loadcells[ LOAD_CELL_RESERVOIR_2_PRIMARY ].measuredReadingSum += getFPGALoadCellB1();
+    loadcells[ LOAD_CELL_RESERVOIR_2_BACKUP ].measuredReadingSum += getFPGALoadCellB2();
 
     // filter every 100ms
     if ( ++loadCellFilterTimerCount >= LOAD_CELL_SAMPLES_TO_AVERAGE )
@@ -117,8 +117,8 @@
         loadCellDataPublicationTimerCounter = 0;
 
         // broadcast load cell data
-        broadcastLoadCellData( getLoadCellFilteredWeight( LOAD_CELL_A1 ), getLoadCellFilteredWeight( LOAD_CELL_A2 ),
-                               getLoadCellFilteredWeight( LOAD_CELL_B1 ), getLoadCellFilteredWeight( LOAD_CELL_B2 ) );
+        broadcastLoadCellData( getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY ), getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_1_BACKUP ),
+                               getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY ), getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_2_BACKUP ) );
     }
 }
 
Index: firmware/App/Controllers/LoadCell.h
===================================================================
diff -u -r87a22cbaa87daab0d7cedabc67452cead83d8630 -rd4b046813eb5b680702ba2a8376efe793607a0ea
--- firmware/App/Controllers/LoadCell.h	(.../LoadCell.h)	(revision 87a22cbaa87daab0d7cedabc67452cead83d8630)
+++ firmware/App/Controllers/LoadCell.h	(.../LoadCell.h)	(revision d4b046813eb5b680702ba2a8376efe793607a0ea)
@@ -19,6 +19,7 @@
 #define __LOADCELL_H__
 
 #include "DGCommon.h"
+#include "DGDefs.h"
 
 /**
  *  @defgroup LoadCells LoadCells
@@ -30,16 +31,6 @@
 
 // ********** public definitions **********
 
-/// Enumeration of load cells.
-typedef enum LoadCells
-{
-    LOAD_CELL_A1 = 0,       ///< Load cell A1
-    LOAD_CELL_A2,           ///< Load cell A2
-    LOAD_CELL_B1,           ///< Load cell B1
-    LOAD_CELL_B2,           ///< Load cell B2
-    NUM_OF_LOAD_CELLS       ///< Number of reservoirs
-} LOAD_CELL_ID_T;
-
 // ********** public function prototypes **********
 
 void initLoadCell( void );                      // Initialize the LoadCell module.
Index: firmware/App/DGCommon.h
===================================================================
diff -u -r2059f906368ba0bf0ac280b80fecee61aba1846b -rd4b046813eb5b680702ba2a8376efe793607a0ea
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 2059f906368ba0bf0ac280b80fecee61aba1846b)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision d4b046813eb5b680702ba2a8376efe793607a0ea)
@@ -38,6 +38,7 @@
 //    #define DISABLE_HEATERS_AND_TEMPS       1
     #define DISABLE_ACCELS                  1
     #define SKIP_POST                       1
+    #define DISABLE_CAL_CHECK               1
 //    #define ENABLE_DIP_SWITCHES             1
 //    #define EMC_TEST_BUILD                  1
     #define ALARMS_DEBUG                    1
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -rdd7fad816b77aee7febdc79785eb74102b844370 -rd4b046813eb5b680702ba2a8376efe793607a0ea
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision dd7fad816b77aee7febdc79785eb74102b844370)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision d4b046813eb5b680702ba2a8376efe793607a0ea)
@@ -55,10 +55,12 @@
 static OVERRIDE_U32_T fillVolumeTargetMl = { 0, 0, 0, 0 };                              ///< The target reservoir fill volume (in mL).
 static OVERRIDE_U32_T drainVolumeTargetMl = { 0, 0, 0, 0 };                             ///< The target reservoir drain volume (in mL).
 
-static LOAD_CELL_ID_T associatedLoadCell[ NUM_OF_RESERVOIRS ] = { LOAD_CELL_A1,
-                                                                  LOAD_CELL_B1 };       ///< The reservoirs' associate load cell.
-static LOAD_CELL_ID_T redundantLoadCell[ NUM_OF_RESERVOIRS ] = { LOAD_CELL_A2,
-                                                                 LOAD_CELL_B2 };        ///< The reservoirs' associate redundant load cell.
+/// The reservoirs' associate load cell.
+static LOAD_CELL_ID_T associatedLoadCell[ NUM_OF_RESERVOIRS ] = { LOAD_CELL_RESERVOIR_1_PRIMARY,
+                                                                  LOAD_CELL_RESERVOIR_2_PRIMARY };
+/// The reservoirs' associate redundant load cell.
+static LOAD_CELL_ID_T redundantLoadCell[ NUM_OF_RESERVOIRS ] = { LOAD_CELL_RESERVOIR_1_BACKUP,
+                                                                 LOAD_CELL_RESERVOIR_2_BACKUP };
 
 static F32 reservoirLowestWeight[ NUM_OF_RESERVOIRS ] = { MAX_RESERVOIR_WEIGHT,
                                                           MAX_RESERVOIR_WEIGHT };       ///< The reservoirs' lowest weight during draining.