Index: firmware/App/Controllers/LoadCell.h
===================================================================
diff -u -r87a22cbaa87daab0d7cedabc67452cead83d8630 -r72dd42b6a116e62d1b3ad5d60088c29e067d10d4
--- firmware/App/Controllers/LoadCell.h	(.../LoadCell.h)	(revision 87a22cbaa87daab0d7cedabc67452cead83d8630)
+++ firmware/App/Controllers/LoadCell.h	(.../LoadCell.h)	(revision 72dd42b6a116e62d1b3ad5d60088c29e067d10d4)
@@ -19,6 +19,7 @@
 #define __LOADCELL_H__
 
 #include "DGCommon.h"
+#include "DGDefs.h"
 
 /**
  *  @defgroup LoadCells LoadCells
@@ -30,24 +31,17 @@
 
 // ********** 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.
 void execLoadCell( void );                      // Execute the LoadCell monitor.
+SELF_TEST_STATUS_T execLoadCellsSelfTest ( void );
 
 void tareLoadCell( LOAD_CELL_ID_T loadCellID );
 void resetLoadCellOffset( LOAD_CELL_ID_T loadCellID );
-F32  getLoadCellFilteredWeight( LOAD_CELL_ID_T loadCellID );
+F32  getLoadCellWeight( LOAD_CELL_ID_T loadCellID );
+F32  getLoadCellSmallFilteredWeight( LOAD_CELL_ID_T loadCellID );
+F32  getLoadCellLargeFilteredWeight( LOAD_CELL_ID_T loadCellID );
 
 BOOL testSetLoadCellOverride( U32 loadCellID, F32 value );
 BOOL testResetLoadCellOverride( U32 loadCellID );