Index: firmware/App/Controllers/LoadCell.c =================================================================== diff -u -rbcd2887a992f73548dc0d9603595b57523b31902 -r05f42ecd223cf512e9e8f3434dd01bdac3aca86d --- firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision bcd2887a992f73548dc0d9603595b57523b31902) +++ firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision 05f42ecd223cf512e9e8f3434dd01bdac3aca86d) @@ -20,6 +20,10 @@ #include "FPGA.h" #include "TaskPriority.h" +static F32 Load_cell_a1_ave; +static F32 Load_cell_a2_ave; +static F32 Load_cell_b1_ave; +static F32 Load_cell_b2_ave; /**@}*/ /*********************************************************************//** @@ -56,11 +60,11 @@ { Counter = 0; - load_cell_a1_f = (F32)(Load_cell_a1)*ADC2GRAM; // division for averaging folded into ADC2GRAM - load_cell_a2_f = (F32)(Load_cell_a2)*ADC2GRAM; - load_cell_b1_f = (F32)(Load_cell_b1)*ADC2GRAM; - load_cell_b2_f = (F32)(Load_cell_b2)*ADC2GRAM; - result = broadcastLoadCellData( load_cell_a1_f, load_cell_a2_f, load_cell_b1_f, load_cell_b2_f ); + Load_cell_a1_ave = (F32)(Load_cell_a1)*ADC2GRAM; // division for averaging folded into ADC2GRAM + Load_cell_a2_ave = (F32)(Load_cell_a2)*ADC2GRAM; + Load_cell_b1_ave = (F32)(Load_cell_b1)*ADC2GRAM; + Load_cell_b2_ave = (F32)(Load_cell_b2)*ADC2GRAM; + result = broadcastLoadCellData( Load_cell_a1_ave, Load_cell_a2_ave, Load_cell_b1_ave, Load_cell_b2_ave ); #ifdef DEBUG_ENABLED if (result == FALSE) sprintf( debugStr, "Adding load cell data to CAN buffer failed" ); @@ -74,5 +78,23 @@ } } +F32 getLoadCellA1Ave(void) +{ + return Load_cell_a1_ave; +} +F32 getLoadCellA2Ave(void) +{ + return Load_cell_a2_ave; +} +F32 getLoadCellB1Ave(void) +{ + return Load_cell_b1_ave; +} + +F32 getLoadCellB2Ave(void) +{ + return Load_cell_b2_ave; +} +