Index: firmware/App/Controllers/LoadCell.c =================================================================== diff -u -rfa3ad11dca8c505783e69174368f1d1f72e6dd18 -r497aa8998a8d3c84e735747e2d10596abdf36cf7 --- firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision fa3ad11dca8c505783e69174368f1d1f72e6dd18) +++ firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision 497aa8998a8d3c84e735747e2d10596abdf36cf7) @@ -203,10 +203,10 @@ // Apply the calibration factors to the data. // load_cell_weight = fourth_order_coeff * (load_cell^4) + third_order_coeff * (load_cell^3) + second_order_coeff * (load_cell^2) + gain * load_cell + offset loadcells[ ii ].weight = pow(loadCell, 4) * loadCellsCalRecord.loadCells[ (CAL_DATA_DG_LOAD_CELLS_T)ii ].fourthOrderCoeff + - pow(loadCell, 3) * loadCellsCalRecord.loadCells[ (CAL_DATA_DG_LOAD_CELLS_T)ii ].thirdOrderCoeff + - pow(loadCell, 2) * loadCellsCalRecord.loadCells[ (CAL_DATA_DG_LOAD_CELLS_T)ii ].secondOrderCoeff + - loadCell * loadCellsCalRecord.loadCells[ (CAL_DATA_DG_LOAD_CELLS_T)ii ].gain + - loadCellsCalRecord.loadCells[ (CAL_DATA_DG_LOAD_CELLS_T)ii ].offset; + pow(loadCell, 3) * loadCellsCalRecord.loadCells[ (CAL_DATA_DG_LOAD_CELLS_T)ii ].thirdOrderCoeff + + pow(loadCell, 2) * loadCellsCalRecord.loadCells[ (CAL_DATA_DG_LOAD_CELLS_T)ii ].secondOrderCoeff + + loadCell * loadCellsCalRecord.loadCells[ (CAL_DATA_DG_LOAD_CELLS_T)ii ].gain + + loadCellsCalRecord.loadCells[ (CAL_DATA_DG_LOAD_CELLS_T)ii ].offset; loadcells[ ii ].loadCellVelocity_g_min = ( getLoadCellWeight( (LOAD_CELL_ID_T)ii ) - loadcells[ ii ].smallFilterReadings[ smallReadingsIdx ] ) * (F32)SEC_PER_MIN; Index: firmware/App/Modes/ModeService.c =================================================================== diff -u -r849d55bf09a76e59424878b1ae4dac4b51ead3a9 -r497aa8998a8d3c84e735747e2d10596abdf36cf7 --- firmware/App/Modes/ModeService.c (.../ModeService.c) (revision 849d55bf09a76e59424878b1ae4dac4b51ead3a9) +++ firmware/App/Modes/ModeService.c (.../ModeService.c) (revision 497aa8998a8d3c84e735747e2d10596abdf36cf7) @@ -57,7 +57,6 @@ initServiceMode(); return serviceState; - } /*********************************************************************//** Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r849d55bf09a76e59424878b1ae4dac4b51ead3a9 -r497aa8998a8d3c84e735747e2d10596abdf36cf7 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 849d55bf09a76e59424878b1ae4dac4b51ead3a9) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 497aa8998a8d3c84e735747e2d10596abdf36cf7) @@ -3737,7 +3737,7 @@ * @param rejCode Reject reason code explaining why request was rejected * @return none *************************************************************************/ -void sendServiceModeResponse( BOOL accepted, U32 rejCode ) +BOOL sendServiceModeResponse( BOOL accepted, U32 rejCode ) { MESSAGE_T msg; U08 *payloadPtr = msg.payload; @@ -3752,7 +3752,9 @@ memcpy( payloadPtr, &rejCode, sizeof( U32 ) ); // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer - serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_HD, ACK_REQUIRED ); + result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_HD, ACK_REQUIRED ); + + return result; } /**@}*/