Index: firmware/App/Controllers/LoadCell.h =================================================================== diff -u -r8b56b0c617ac49536b8d53852b9621be873bade6 -r25770b4b27e75e730d89ac046f7db405b1bfe39f --- firmware/App/Controllers/LoadCell.h (.../LoadCell.h) (revision 8b56b0c617ac49536b8d53852b9621be873bade6) +++ firmware/App/Controllers/LoadCell.h (.../LoadCell.h) (revision 25770b4b27e75e730d89ac046f7db405b1bfe39f) @@ -1,56 +1,50 @@ -/**********************************************************************//** - * - * Copyright (c) 2020 Diality Inc. - All Rights Reserved. - * - * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN - * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. - * - * @file LoadCell.h - * - * @date 25-Feb-2020 - * @author S. Nejatali - * - * @brief Processing sensor data. - * - **************************************************************************/ +/************************************************************************** +* +* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +* +* THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN +* WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. +* +* @file LoadCell.h +* +* @author (last) Quang Nguyen +* @date (last) 21-Aug-2020 +* +* @author (original) Saeed Nejatali +* @date (original) 25-Feb-2020 +* +***************************************************************************/ #ifndef __LOADCELL_H__ #define __LOADCELL_H__ #include "DGCommon.h" +#include "DGDefs.h" /** * @defgroup LoadCells LoadCells - * @brief LoadCells monitor module. - * Monitors and filters load cell sensor readings. + * @brief LoadCells monitor module. Monitors and filters load cell sensor readings. * * @addtogroup LoadCells * @{ */ // ********** 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. -DATA_ARRAY_GET_PROTOTYPE( U32, getMeasuredRawLoadCellReading, loadCellID ); -F32 getLoadCellFilteredWeight( LOAD_CELL_ID_T loadCellID ); +void tareLoadCell( LOAD_CELL_ID_T loadCellID ); +void resetLoadCellOffset( LOAD_CELL_ID_T loadCellID ); +F32 getLoadCellFilteredWeight( LOAD_CELL_ID_T loadCellID ); -BOOL testSetLoadCellOverride( U32 value, U32 loadCellID ); +BOOL testSetLoadCellOverride( U32 loadCellID, F32 value ); BOOL testResetLoadCellOverride( U32 loadCellID ); +BOOL testSetLoadCellDataPublishIntervalOverride( U32 value ); +BOOL testResetLoadCellDataPublishIntervalOverride( void ); /**@}*/ -#endif /* APP_CONTROLLERS_LOADCELL_H_ */ +#endif