Index: firmware/App/Controllers/LoadCell.h =================================================================== diff -u -r484b185f0cf4b2ea0ba9de331573952b1b5124b4 -r256d5cb05f1ef09e19e2f2733a111f600c73a7ee --- firmware/App/Controllers/LoadCell.h (.../LoadCell.h) (revision 484b185f0cf4b2ea0ba9de331573952b1b5124b4) +++ firmware/App/Controllers/LoadCell.h (.../LoadCell.h) (revision 256d5cb05f1ef09e19e2f2733a111f600c73a7ee) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +* Copyright (c) 2020-2022 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 +* @file LoadCell.h * -* @author (last) Quang Nguyen -* @date (last) 21-Aug-2020 +* @author (last) Dara Navaei +* @date (last) 19-Aug-2022 * -* @author (original) Saeed Nejatali -* @date (original) 25-Feb-2020 +* @author (original) Saeed Nejatali +* @date (original) 25-Feb-2020 * ***************************************************************************/ @@ -31,16 +31,29 @@ // ********** public definitions ********** +#pragma pack(push,1) +/// Loadcell measurements struct. +typedef struct +{ + F32 loadCellA1inGram; ///< Loadcell A1 measurement in gram + F32 loadCellA2inGram; ///< Loadcell A2 measurement in gram + F32 loadCellB1inGram; ///< Loadcell B1 measurement in gram + F32 loadCellB2inGram; ///< Loadcell B2 measurement in gram +} LOAD_CELL_DATA_T; +#pragma pack(pop) + // ********** 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 ); +F32 getLoadCellVelocity( LOAD_CELL_ID_T loadCellID ); BOOL testSetLoadCellOverride( U32 loadCellID, F32 value ); BOOL testResetLoadCellOverride( U32 loadCellID );