Index: firmware/App/Controllers/LoadCell.c =================================================================== diff -u -rd1a2620817a1147edbeceb96de37bbbdfb5ff079 -r4350ecc2f6581e5b9aa584028f2facbf2a81054f --- firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision d1a2620817a1147edbeceb96de37bbbdfb5ff079) +++ firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision 4350ecc2f6581e5b9aa584028f2facbf2a81054f) @@ -19,18 +19,16 @@ #include "FPGA.h" #include "TaskPriority.h" +DATA_DECL( U32, MeasuredLoadCellA1, loadCellA1raw, 0, 0 ); +DATA_DECL( U32, MeasuredLoadCellA2, loadCellA2raw, 0, 0 ); +DATA_DECL( U32, MeasuredLoadCellB1, loadCellB1raw, 0, 0 ); +DATA_DECL( U32, MeasuredLoadCellB2, loadCellB2raw, 0, 0 ); static F32 Load_cell_a1_ave; static F32 Load_cell_a2_ave; static F32 Load_cell_b1_ave; static F32 Load_cell_b2_ave; -DATA_DECL( U32, MeasuredLoadCellA1, loadCellA1raw, 0.0, 0.0 );// measured load cell A1 raw -DATA_DECL( U32, MeasuredLoadCellA2, loadCellA2raw, 0.0, 0.0 );// measured load cell A2 raw -DATA_DECL( U32, MeasuredLoadCellB1, loadCellB1raw, 0.0, 0.0 );// measured load cell B1 raw -DATA_DECL( U32, MeasuredLoadCellB2, loadCellB2raw, 0.0, 0.0 );// measured load cell B2 raw - /**@}*/ - /*********************************************************************//** * @brief * The execLoadCell function gets load cell data from FPGA and advertises them over CAN.