Index: firmware/App/Controllers/LoadCell.c =================================================================== diff -u -r479cebb3c254ed13bca26f361c8b5266f8eae408 -r4350ecc2f6581e5b9aa584028f2facbf2a81054f --- firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision 479cebb3c254ed13bca26f361c8b5266f8eae408) +++ firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision 4350ecc2f6581e5b9aa584028f2facbf2a81054f) @@ -27,8 +27,8 @@ static F32 Load_cell_a2_ave; static F32 Load_cell_b1_ave; static F32 Load_cell_b2_ave; -// /**@}*/ + /*********************************************************************//** * @brief * The execLoadCell function gets load cell data from FPGA and advertises them over CAN. @@ -49,11 +49,21 @@ static U32 Load_cell_b2 = 0; BOOL result; - Load_cell_a1 += getFPGALoadCellA1(); // No overflow since ADC output is 24 bits. - Load_cell_a2 += getFPGALoadCellA2(); - Load_cell_b1 += getFPGALoadCellB1(); - Load_cell_b2 += getFPGALoadCellB2(); + //Load_cell_a1 += getFPGALoadCellA1(); // No overflow since ADC output is 24 bits. + //Load_cell_a2 += getFPGALoadCellA2(); + //Load_cell_b1 += getFPGALoadCellB1(); + //Load_cell_b2 += getFPGALoadCellB2(); + loadCellA1raw.data = getFPGALoadCellA1(); + loadCellA2raw.data = getFPGALoadCellA2(); + loadCellB1raw.data = getFPGALoadCellB1(); + loadCellB2raw.data = getFPGALoadCellB2(); + + Load_cell_a1 += getLoadCellA1raw(); + Load_cell_a2 += getLoadCellA2raw(); + Load_cell_b1 += getLoadCellB1raw(); + Load_cell_b2 += getLoadCellB2raw(); + Counter++; if (Counter == LOAD_CELL_REPORT_PERIOD) { @@ -165,7 +175,6 @@ *************************************************************************/ DATA_GET( U32, getLoadCellA1raw, loadCellA1raw ) - /************************************************************************* * @brief getLoadCellA2raw * The getLoadCellA2raw function gets the measured load cell A2 \n