Index: firmware/App/Services/FPGA.c =================================================================== diff -u -ra2bc96881a5fc3d8f779246b2abebf15a8de9384 -r42d74314fb54739936fb9d24d6245613cfab26a0 --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision a2bc96881a5fc3d8f779246b2abebf15a8de9384) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision 42d74314fb54739936fb9d24d6245613cfab26a0) @@ -641,7 +641,7 @@ fpgaCommRetryCount++; } - // Shouldn't be any data received at this time + // Should not be any data received at this time consumeUnexpectedData(); return result; @@ -688,7 +688,7 @@ // Set fpga comm flags for bulk write cmd and follow-up bulk read command fpgaWriteCommandInProgress = TRUE; fpgaBulkWriteAndReadInProgress = TRUE; - // Initiate bulk write command and it's receipt - read will follow + // Initiate bulk write command and its receipt - read will follow startDMAReceiptOfWriteResp(); startDMAWriteCmd(); @@ -750,7 +750,7 @@ fpgaCommRetryCount++; } - // Shouldn't be any data received at this time + // Should not be any data received at this time consumeUnexpectedData(); return result; @@ -833,7 +833,7 @@ fpgaCommRetryCount++; } - // Shouldn't be any data received at this time + // Should not be any data received at this time consumeUnexpectedData(); return result; Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -ra2bc96881a5fc3d8f779246b2abebf15a8de9384 -r42d74314fb54739936fb9d24d6245613cfab26a0 --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision a2bc96881a5fc3d8f779246b2abebf15a8de9384) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 42d74314fb54739936fb9d24d6245613cfab26a0) @@ -399,7 +399,7 @@ } else { - // Shouldn't get here - not an active message box + // Should not get here - not an active message box // TODO - s/w fault? } } @@ -631,10 +631,10 @@ U32 dataSize = getFromCommBuffer( buffer, data, CAN_MESSAGE_PAYLOAD_SIZE ); CAN_MESSAGE_BOX_T mBox = buffer; // CAN message boxes and comm buffers are aligned - // If there's another CAN packet to send, send it + // If there is another CAN packet to send, send it if ( dataSize == CAN_MESSAGE_PAYLOAD_SIZE ) { - // We're transmitting another packet - signal transmitter is busy + // We are transmitting another packet - signal transmitter is busy signalCANXmitsInitiated(); // Remember packet data being transmitted here in case transmission fails and we need to re-send memcpy( lastCANPacketSent, data, CAN_MESSAGE_PAYLOAD_SIZE ); @@ -647,12 +647,12 @@ else { signalCANXmitsCompleted(); - // TODO - shouldn't get here, but let's see if we do + // TODO - should not get here, but let's see if we do SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, (U32)mBox ) } } else - { // TODO - shouldn't get here - just testing - set first data to new s/w fault enum later + { // TODO - should not get here - just testing - set first data to new s/w fault enum later SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, (U32)buffer, (U32)dataSize ) } } @@ -678,7 +678,7 @@ { result = getFromCommBuffer( COMM_BUFFER_OUT_UART_PC, pcXmitPacket, dataPend ); - // If there's data to transmit, transmit it + // If there is data to transmit, transmit it if ( result > 0 ) { signalSCI1XmitsInitiated();