Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rd9cc76524777a12ba77b58ce95416dddfb032997 -r1bbf9da32e622975efed00b1a7589387a9829440
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision d9cc76524777a12ba77b58ce95416dddfb032997)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 1bbf9da32e622975efed00b1a7589387a9829440)
@@ -43,7 +43,7 @@
 
 // ********** private data **********
 
-const COMM_BUFFER_T CAN_OUT_BUFFERS[NUM_OF_CAN_OUT_BUFFERS] =
+const COMM_BUFFER_T CAN_OUT_BUFFERS[ NUM_OF_CAN_OUT_BUFFERS ] =
 {
     COMM_BUFFER_OUT_CAN_HD_ALARM,
     COMM_BUFFER_OUT_CAN_HD_2_DG,
@@ -52,7 +52,7 @@
     COMM_BUFFER_OUT_CAN_PC
 };
 
-const COMM_BUFFER_T MSG_IN_BUFFERS[NUM_OF_MSG_IN_BUFFERS] =
+const COMM_BUFFER_T MSG_IN_BUFFERS[ NUM_OF_MSG_IN_BUFFERS ] =
 {
     COMM_BUFFER_IN_CAN_DG_ALARM,
     COMM_BUFFER_IN_CAN_UI_ALARM,
@@ -64,8 +64,8 @@
     COMM_BUFFER_IN_UART_PC
 };
 
-static U08 pcXmitPacket[PC_MESSAGE_PACKET_SIZE] = {0,0,0,0,0,0,0,0};
-static U08 pcRecvPacket[PC_MESSAGE_PACKET_SIZE] = {0,0,0,0,0,0,0,0};
+static U08 pcXmitPacket[ PC_MESSAGE_PACKET_SIZE ] = {0,0,0,0,0,0,0,0};
+static U08 pcRecvPacket[ PC_MESSAGE_PACKET_SIZE ] = {0,0,0,0,0,0,0,0};
 
 // DMA control records
 static g_dmaCTRL pcDMAXmitControlRecord;            // DMA transmit control record (UART-debug)
@@ -268,7 +268,7 @@
     }
     else if ( TRUE == isCANBoxForRecv( srcCANBox ) )
     {
-        U08 data[CAN_MESSAGE_PAYLOAD_SIZE];
+        U08 data[ CAN_MESSAGE_PAYLOAD_SIZE ];
 
         // get CAN packet received on given CAN message box
         if ( FALSE != canIsRxMessageArrived( canREG1, srcCANBox ) )
@@ -406,7 +406,7 @@
 
     for ( i = 0; i < NUM_OF_CAN_OUT_BUFFERS; i++ )
     {
-        if ( CAN_OUT_BUFFERS[i] == srcCANBox )
+        if ( CAN_OUT_BUFFERS[ i ] == srcCANBox )
         {
             result = TRUE;
             break;
@@ -433,7 +433,7 @@
 
     for ( i = 0; i < NUM_OF_CAN_IN_BUFFERS; i++ )
     {
-        if ( MSG_IN_BUFFERS[i] == srcCANBox )
+        if ( MSG_IN_BUFFERS[ i ] == srcCANBox )
         {
             result = TRUE;
             break;
@@ -468,9 +468,9 @@
     // search for next priority CAN packet to transmit
     for ( i = 0; i < NUM_OF_CAN_OUT_BUFFERS; i++ )
     {
-        if ( numberOfBytesInCommBuffer( CAN_OUT_BUFFERS[i] ) >= CAN_MESSAGE_PAYLOAD_SIZE )
+        if ( numberOfBytesInCommBuffer( CAN_OUT_BUFFERS[ i ] ) >= CAN_MESSAGE_PAYLOAD_SIZE )
         {
-            result = CAN_OUT_BUFFERS[i];
+            result = CAN_OUT_BUFFERS[ i ];
             break; // found highest priority packet to transmit - we're done
         }
     }
@@ -496,7 +496,7 @@
     // if a buffer is found with a packet to transmit, get packet from buffer and transmit it
     if ( buffer != COMM_BUFFER_NOT_USED )
     {
-        U08 data[CAN_MESSAGE_PAYLOAD_SIZE];
+        U08 data[ CAN_MESSAGE_PAYLOAD_SIZE ];
         U32 dataSize = getFromCommBuffer( buffer, data, CAN_MESSAGE_PAYLOAD_SIZE );
         CAN_MESSAGE_BOX_T mBox = buffer;  // CAN message boxes and comm buffers are aligned
 
@@ -562,7 +562,7 @@
  *************************************************************************/
 static void processIncomingData( void )
 {
-    U08 data[sizeof(MESSAGE_WRAPPER_T)+1];
+    U08 data[ sizeof( MESSAGE_WRAPPER_T ) + 1 ];
     U32 i;
 
     // queue any received messages
@@ -578,18 +578,18 @@
             messagesInBuffer = FALSE;
 
             // since messages can have 8-byte alignment padding left unconsumed by last get, get padding out of buffer
-            consumeBufferPaddingBeforeSync( MSG_IN_BUFFERS[i] );
+            consumeBufferPaddingBeforeSync( MSG_IN_BUFFERS[ i ] );
             // do we have enough bytes in buffer for smallest message?
-            numOfBytesInBuffer = numberOfBytesInCommBuffer( MSG_IN_BUFFERS[i] );
+            numOfBytesInBuffer = numberOfBytesInCommBuffer( MSG_IN_BUFFERS[ i ] );
             if ( numOfBytesInBuffer >= MESSAGE_OVERHEAD_SIZE )
             {   // peek at minimum of all bytes available or max message size (+1 for sync byte)
-                U32 bytesPeeked = peekFromCommBuffer( MSG_IN_BUFFERS[i], data, MIN(numOfBytesInBuffer,sizeof(MESSAGE_WRAPPER_T)+1) );
+                U32 bytesPeeked = peekFromCommBuffer( MSG_IN_BUFFERS[ i ], data, MIN( numOfBytesInBuffer, sizeof( MESSAGE_WRAPPER_T ) + 1 ) );
                 U32 msgSize = parseMessageFromBuffer( data, bytesPeeked );
 
                 if ( msgSize > 0 )
                 {
                     // consume message (+sync byte)
-                    msgSize = getFromCommBuffer( MSG_IN_BUFFERS[i], data, msgSize+1 );
+                    msgSize = getFromCommBuffer( MSG_IN_BUFFERS[ i ], data, msgSize + 1 );
                     // if message data is at least minimum size, convert received message data to a message and add to message queue
                     if ( msgSize > MESSAGE_OVERHEAD_SIZE )
                     {
@@ -668,15 +668,15 @@
     for ( i = 0; i < len; i++ )
     {
         // find sync byte
-        if ( MESSAGE_SYNC_BYTE == data[i] )
+        if ( MESSAGE_SYNC_BYTE == data[ i ] )
         {
             U32 pos = i + 1;  // skip past sync byte implemented
             U32 remSize = len - pos;
 
             // if a minimum sized msg would fit in remaining, continue
             if ( remSize >= MESSAGE_OVERHEAD_SIZE )
             {
-                payloadSize = data[pos + sizeof(U16)];
+                payloadSize = data[ pos + sizeof( U16 ) ];
                 msgSize = MESSAGE_OVERHEAD_SIZE + payloadSize;
                 // we now know the size of the message - we can now know if full message is contained in buffer
                 if ( msgSize <= remSize )