Index: firmware/App/Controllers/LoadCell.c =================================================================== diff -u -r4c7ef2a9a07569d02844f58b74c4fbdc96a06999 -r47ac2fffcf33a27396bc924068d9e320cd1cd684 --- firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision 4c7ef2a9a07569d02844f58b74c4fbdc96a06999) +++ firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision 47ac2fffcf33a27396bc924068d9e320cd1cd684) @@ -7,8 +7,8 @@ * * @file LoadCell.c * -* @author (last) Dara Navaei -* @date (last) 20-Jan-2023 +* @author (last) Michael Garthwaite +* @date (last) 01-Mar-2023 * * @author (original) Saeed Nejatali * @date (original) 25-Feb-2020 @@ -195,8 +195,8 @@ loadcells[ LOAD_CELL_RESERVOIR_2_PRIMARY ].rawReading = ( 0 == b1Err ? b1Signed : loadcells[ LOAD_CELL_RESERVOIR_2_PRIMARY ].rawReading ); loadcells[ LOAD_CELL_RESERVOIR_2_BACKUP ].rawReading = ( 0 == b2Err ? b2Signed : loadcells[ LOAD_CELL_RESERVOIR_2_BACKUP ].rawReading ); - checkFPGAPersistentAlarms( FPGA_PERS_ERROR_LOAD_CELL_A1_B1_SENSORS, getFPGAADC1ErrorCount(), getFPGAADC1ReadCount() ); - checkFPGAPersistentAlarms( FPGA_PERS_ERROR_LOAD_CELL_A2_B2_SENSORS, getFPGAADC2ErrorCount(), getFPGAADC2ReadCount() ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_LOAD_CELL_A1_B1_SENSORS, getFPGAADC1ReadCount() ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_LOAD_CELL_A2_B2_SENSORS, getFPGAADC2ReadCount() ); // Check if a new calibration is available if ( TRUE == isNewCalibrationRecordAvailable() ) @@ -281,7 +281,7 @@ loadCellData.loadCellB2inGram = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_2_BACKUP ); // Broadcast small filtered load cell data - broadcastData( MSG_ID_LOAD_CELL_READINGS, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&loadCellData, sizeof( LOAD_CELL_DATA_T ) ); + broadcastData( MSG_ID_LOAD_CELL_READINGS_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&loadCellData, sizeof( LOAD_CELL_DATA_T ) ); loadCellDataPublicationTimerCounter = 0; }