Index: firmware/App/Controllers/LoadCell.c =================================================================== diff -u -r47205a5002f27add91d8548f31c8a6fa18993fea -r54e58f64179ea382d2e2c403c8c3b9a15a612636 --- firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision 47205a5002f27add91d8548f31c8a6fa18993fea) +++ firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision 54e58f64179ea382d2e2c403c8c3b9a15a612636) @@ -82,7 +82,6 @@ // ********** private function prototypes ********** -static U32 getLoadCellDataPublishInterval( void ); static BOOL processCalibrationData( void ); static void monitorLoadCellsWeightOutOfRange( LOAD_CELL_ID_T loadCell ); static void monitorLoadCellsPrimaryBackupDriftOutOfRange( void ); @@ -237,7 +236,7 @@ } // broadcast load cell data if we are at scheduled interval. - if ( ++loadCellDataPublicationTimerCounter >= getLoadCellDataPublishInterval() ) + if ( ++loadCellDataPublicationTimerCounter >= getU32OverrideValue( &loadCellDataPublishInterval ) ) { LOAD_CELL_DATA_T loadCellData; @@ -298,7 +297,7 @@ F32 weight = getLoadCellSmallFilteredWeight( loadCellID ); // Check if the load cell is being tared for the first time - if ( fabs(loadcells[ loadCellID ].autoCalOffset) < NEARLY_ZERO ) + if ( fabs(loadcells[ loadCellID ].autoCalOffset ) < NEARLY_ZERO ) { // 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 @@ -445,25 +444,6 @@ /*********************************************************************//** * @brief - * The getLoadCellDataPublishInterval function gets the load cell data publish interval. - * @details Inputs: loadCellDataPublishInterval - * @details Outputs: none - * @return the current load cell data publication interval (in ms/task interval). - *************************************************************************/ -static U32 getLoadCellDataPublishInterval( void ) -{ - U32 result = loadCellDataPublishInterval.data; - - if ( OVERRIDE_KEY == loadCellDataPublishInterval.override ) - { - result = loadCellDataPublishInterval.ovData; - } - - return result; -} - -/*********************************************************************//** - * @brief * 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.