Index: firmware/App/Controllers/LoadCell.h =================================================================== diff -u -ra9315539f527b92523b1598ff91e47db4d71dae2 -r5e88efbadfacd95cbf2c3620a9520fe4f9b6fd46 --- firmware/App/Controllers/LoadCell.h (.../LoadCell.h) (revision a9315539f527b92523b1598ff91e47db4d71dae2) +++ firmware/App/Controllers/LoadCell.h (.../LoadCell.h) (revision 5e88efbadfacd95cbf2c3620a9520fe4f9b6fd46) @@ -7,8 +7,8 @@ * * @file LoadCell.h * -* @author (last) Sean Nash -* @date (last) 04-May-2021 +* @author (last) Dong Nguyen +* @date (last) 27-Sep-2022 * * @author (original) Saeed Nejatali * @date (original) 25-Feb-2020 @@ -31,17 +31,6 @@ // ********** 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. @@ -55,8 +44,8 @@ F32 getLoadCellLargeFilteredWeight( LOAD_CELL_ID_T loadCellID ); F32 getLoadCellVelocity( LOAD_CELL_ID_T loadCellID ); -BOOL testSetLoadCellOverride( U32 loadCellID, F32 value ); -BOOL testResetLoadCellOverride( U32 loadCellID ); +BOOL testSetLoadCellOverride( U32 loadCellID, F32 value, BOOL raw ); +BOOL testResetLoadCellOverride( U32 loadCellID, BOOL raw ); BOOL testSetLoadCellDataPublishIntervalOverride( U32 value ); BOOL testResetLoadCellDataPublishIntervalOverride( void );