Index: firmware/App/Controllers/LoadCell.c =================================================================== diff -u -r87a22cbaa87daab0d7cedabc67452cead83d8630 -rc20d71064bad67c2db392c6383bb410e8a7dfa2a --- firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision 87a22cbaa87daab0d7cedabc67452cead83d8630) +++ firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision c20d71064bad67c2db392c6383bb410e8a7dfa2a) @@ -90,10 +90,10 @@ U32 ii; // update sums for load cell average calculations - loadcells[ LOAD_CELL_A1 ].measuredReadingSum += getFPGALoadCellA1(); - loadcells[ LOAD_CELL_A2 ].measuredReadingSum += getFPGALoadCellA2(); - loadcells[ LOAD_CELL_B1 ].measuredReadingSum += getFPGALoadCellB1(); - loadcells[ LOAD_CELL_B2 ].measuredReadingSum += getFPGALoadCellB2(); + loadcells[ LOAD_CELL_RESERVOIR_1_PRIMARY ].measuredReadingSum += getFPGALoadCellA1(); + loadcells[ LOAD_CELL_RESERVOIR_1_BACKUP ].measuredReadingSum += getFPGALoadCellA2(); + loadcells[ LOAD_CELL_RESERVOIR_2_PRIMARY ].measuredReadingSum += getFPGALoadCellB1(); + loadcells[ LOAD_CELL_RESERVOIR_2_BACKUP ].measuredReadingSum += getFPGALoadCellB2(); // filter every 100ms if ( ++loadCellFilterTimerCount >= LOAD_CELL_SAMPLES_TO_AVERAGE ) @@ -117,8 +117,8 @@ loadCellDataPublicationTimerCounter = 0; // broadcast load cell data - broadcastLoadCellData( getLoadCellFilteredWeight( LOAD_CELL_A1 ), getLoadCellFilteredWeight( LOAD_CELL_A2 ), - getLoadCellFilteredWeight( LOAD_CELL_B1 ), getLoadCellFilteredWeight( LOAD_CELL_B2 ) ); + broadcastLoadCellData( getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY ), getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_1_BACKUP ), + getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY ), getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_2_BACKUP ) ); } }