Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -rcea079b61dbd17b2ddaec99b1124248147d14e72 -r6f1f269cd7d91f41c51797d17a85a7ea249e21f3
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision cea079b61dbd17b2ddaec99b1124248147d14e72)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 6f1f269cd7d91f41c51797d17a85a7ea249e21f3)
@@ -66,14 +66,14 @@
 // ********** private data **********
 
 static OVERRIDE_U32_T loadCellDataPublishInterval = { LOAD_CELL_REPORT_PERIOD,
-                                                      LOAD_CELL_REPORT_PERIOD, 0, 0 };  ///< Broadcast load cell data publish interval.
-static LOADCELL_T loadcells[ NUM_OF_LOAD_CELLS ];                                       ///< Load cell data structures.
-static U32 loadCellFilterTimerCount = 0;                                                ///< Load cell filtering timer count.
-static U32 loadCellDataPublicationTimerCounter = 0;                                     ///< Load cell data publication timer counter to CAN bus.
+                                                      LOAD_CELL_REPORT_PERIOD, 0, 0 };      ///< Broadcast load cell data publish interval.
+static LOADCELL_T loadcells[ NUM_OF_LOAD_CELLS ];                                           ///< Load cell data structures.
+static U32 loadCellFilterTimerCount = 0;                                                    ///< Load cell filtering timer count.
+static U32 loadCellDataPublicationTimerCounter = 0;                                         ///< Load cell data publication timer counter to CAN bus.
 
-static U32 smallReadingsIdx;                                                            ///< Index for next sample in load cell small rolling average sample array.
-static U32 largeReadingsIdx;                                                            ///< Index for next sample in load cell large rolling average sample array.
-static DG_LOAD_CELLS_CAL_RECORD_T loadCellsCalRecord;                                   ///< Load cells calibration record.
+static U32 smallReadingsIdx;                                                                ///< Index for next sample in load cell small rolling average sample array.
+static U32 largeReadingsIdx;                                                                ///< Index for next sample in load cell large rolling average sample array.
+static DG_LOAD_CELLS_CAL_RECORD_T loadCellsCalRecord;                                       ///< Load cells calibration record.
 
 // ********** private function prototypes **********
 
@@ -174,7 +174,7 @@
     }
 
     // Check if a new calibration is available
-    if ( isNewCalibrationRecordAvailable() == TRUE )
+    if ( TRUE == isNewCalibrationRecordAvailable() )
     {
         // Get the new calibration data and check its validity
         processCalibrationData();
@@ -190,13 +190,7 @@
     for ( ii = 0; ii < NUM_OF_LOAD_CELLS; ++ii )
     {
         loadcells[ ii ].weight.data = (F32)loadcells[ ii ].rawReading * ADC2GRAM;
-        // Apply the calibration factors to the data.
-        // load_cell_weight = fourth_order_coeff * (load_cell^4) + third_order_coeff * (load_cell^3) + second_order_coeff * (load_cell^2) + gain * load_cell + offset
-        loadcells[ ii ].weight.data = pow(loadcells[ ii ].weight.data, 4) * loadCellsCalRecord.loadCells[ (CAL_DATA_DG_LOAD_CELLS_T)ii ].fourthOrderCoeff +
-                                      pow(loadcells[ ii ].weight.data, 3) * loadCellsCalRecord.loadCells[ (CAL_DATA_DG_LOAD_CELLS_T)ii ].thirdOrderCoeff  +
-                                      pow(loadcells[ ii ].weight.data, 2) * loadCellsCalRecord.loadCells[ (CAL_DATA_DG_LOAD_CELLS_T)ii ].secondOrderCoeff +
-                                          loadcells[ ii ].weight.data     * loadCellsCalRecord.loadCells[ (CAL_DATA_DG_LOAD_CELLS_T)ii ].gain +
-                                          loadCellsCalRecord.loadCells[ (CAL_DATA_DG_LOAD_CELLS_T)ii ].offset;
+
         loadcells[ ii ].weight.data = loadcells[ ii ].weight.data - loadcells[ ii ].autoCalOffset;
 
         loadcells[ ii ].loadCellVelocity_g_min = ( getLoadCellWeight( (LOAD_CELL_ID_T)ii ) - loadcells[ ii ].smallFilterReadings[ smallReadingsIdx ] ) * (F32)SEC_PER_MIN;
@@ -205,7 +199,16 @@
         loadcells[ ii ].smallFilterTotal -= loadcells[ ii ].smallFilterReadings[ smallReadingsIdx ];
         loadcells[ ii ].smallFilterReadings[ smallReadingsIdx ] = getLoadCellWeight( (LOAD_CELL_ID_T)ii );
         loadcells[ ii ].smallFilterTotal += getLoadCellWeight( (LOAD_CELL_ID_T)ii );
-        loadcells[ ii ].smallFilteredWeight = (F32)( loadcells[ ii ].smallFilterTotal / (F64)SIZE_OF_SMALL_LOAD_CELL_AVG );
+
+        // Calculate the load cell value before appyling calibration to it
+        F32 loadCell = (F32)( loadcells[ ii ].smallFilterTotal / (F64)SIZE_OF_SMALL_LOAD_CELL_AVG );
+        // Apply the calibration factors to the data.
+        // load_cell_weight = fourth_order_coeff * (load_cell^4) + third_order_coeff * (load_cell^3) + second_order_coeff * (load_cell^2) + gain * load_cell + offset
+        loadcells[ ii ].smallFilteredWeight = pow(loadCell, 4) * loadCellsCalRecord.loadCells[ (CAL_DATA_DG_LOAD_CELLS_T)ii ].fourthOrderCoeff +
+                                              pow(loadCell, 3) * loadCellsCalRecord.loadCells[ (CAL_DATA_DG_LOAD_CELLS_T)ii ].thirdOrderCoeff  +
+                                              pow(loadCell, 2) * loadCellsCalRecord.loadCells[ (CAL_DATA_DG_LOAD_CELLS_T)ii ].secondOrderCoeff +
+                                                  loadCell     * loadCellsCalRecord.loadCells[ (CAL_DATA_DG_LOAD_CELLS_T)ii ].gain +
+                                                                 loadCellsCalRecord.loadCells[ (CAL_DATA_DG_LOAD_CELLS_T)ii ].offset;
     }
 
     smallReadingsIdx = INC_WRAP( smallReadingsIdx, 0, SIZE_OF_SMALL_LOAD_CELL_AVG - 1 );
@@ -448,7 +451,7 @@
  * The processCalibrationData function gets the calibration data and makes
  * sure it is valid by checking the calibration date. The calibration date
  * should not be 0.
- * @details Inputs: loadCellsCalRecord
+ * @details Inputs: none
  * @details Outputs: loadCellsCalRecord
  * @return TRUE if the calibration record is valid, otherwise FALSE
  *************************************************************************/
@@ -465,7 +468,7 @@
         // Check if the calibration data that was received from NVDataMgmt is legitimate
         // The calibration date item should not be zero. If the calibration date is 0,
         // then the load cells data is not stored in the NV memory or it was corrupted.
-        if ( calData.loadCells[ cell ].calibrationTime == 0 )
+        if ( 0 == calData.loadCells[ cell ].calibrationTime )
         {
 #ifndef DISABLE_CAL_CHECK
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_LOAD_CELLS_INVALID_CALIBRATION, (U32)cell );