Index: firmware/App/Controllers/LoadCell.c =================================================================== diff -u -r6bf297b685487355fd581f221c59cf9d5a4fa53e -r011aa9c2df785a0fdcb69e30f7145b959084f472 --- firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision 6bf297b685487355fd581f221c59cf9d5a4fa53e) +++ firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision 011aa9c2df785a0fdcb69e30f7145b959084f472) @@ -7,8 +7,8 @@ * * @file LoadCell.c * -* @author (last) Sean Nash -* @date (last) 05-Jan-2023 +* @author (last) Michael Garthwaite +* @date (last) 01-Mar-2023 * * @author (original) Saeed Nejatali * @date (original) 25-Feb-2020 @@ -228,7 +228,7 @@ // Since there is a single alarm value for all 4 load cells the persistence check must be // executed if ANY of the load cell values are out of range. Only when all of the load // cells are in range should the persistence for the alarm be cleared. - weight = getLoadCellWeight( ( LOAD_CELL_ID_T) sensorId ); + weight = getLoadCellWeight( ( LOAD_CELL_ID_T) sensorId ); if ( ( weight < LOAD_CELL_MIN_ALLOWED_WEIGHT_GRAMS ) || ( weight > LOAD_CELL_MAX_ALLOWED_WEIGHT_GRAMS ) ) { isLoadCellOutOfRange = TRUE; @@ -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; } @@ -371,7 +371,7 @@ { // Add old auto calibration offset to get back to actual weight value loadcells[ loadCellID ].autoCalOffset = ( loadcells[ loadCellID ].smallFilteredWeight.data + loadcells[ loadCellID ].autoCalOffset ); - hasLoadCellBeenTared[ loadCellID ] = TRUE; + hasLoadCellBeenTared[ loadCellID ] = TRUE; } else {