Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r16efeb7b3a19e02ae83a553a77f01a3550ff7850 -r1bbf9da32e622975efed00b1a7589387a9829440
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 16efeb7b3a19e02ae83a553a77f01a3550ff7850)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 1bbf9da32e622975efed00b1a7589387a9829440)
@@ -68,25 +68,25 @@
     U32 i;
 
     // prefix data with message sync byte
-    data[msgSize++] = MESSAGE_SYNC_BYTE;
+    data[ msgSize++ ] = MESSAGE_SYNC_BYTE;
 
     // serialize message header data
-    memcpy( &data[msgSize], &(msg.hdr), sizeof(MESSAGE_HEADER_T) );
-    msgSize += sizeof(MESSAGE_HEADER_T);
+    memcpy( &data[ msgSize ], &( msg.hdr ), sizeof( MESSAGE_HEADER_T ) );
+    msgSize += sizeof( MESSAGE_HEADER_T );
 
     // serialize message payload (only used bytes per payloadLen field)
-    memcpy( &data[msgSize], &(msg.payload), msg.hdr.payloadLen );
+    memcpy( &data[ msgSize ], &( msg.payload ), msg.hdr.payloadLen );
     msgSize += msg.hdr.payloadLen;
 
     // TODO - calculate 8-bit CRC
-    data[msgSize++] = 0;  // TODO - s/b 8-bit CRC when calc is available
+    data[ msgSize++ ] = 0;  // TODO - s/b 8-bit CRC when calc is available
 
     // pad with zero bytes to get length a multiple of CAN_MESSAGE_PAYLOAD_SIZE (8)
     sizeMod = msgSize % CAN_MESSAGE_PAYLOAD_SIZE;
     sizePad = ( sizeMod == 0 ? 0 : CAN_MESSAGE_PAYLOAD_SIZE - sizeMod );
     for ( i = 0; i < sizePad; i++ )
     {
-        data[msgSize++] = 0;
+        data[ msgSize++ ] = 0;
     }
 
     return msgSize;
@@ -103,22 +103,22 @@
  * @details
  * Inputs : none
  * Outputs : Off button msg constructed and queued.
- * @param promptUser : TRUE if UI should prompt user to confirm power off \n
- * request, FALSE if UI should cancel the prompt.
+ * @param cmd : 0=prompt user to confirm, 1=cancel prompt, 2=reject user off \n
+ * request.
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL sendOffButtonMsgToUI( BOOL promptUser )
+BOOL sendOffButtonMsgToUI( U08 cmd )
 {
     BOOL result;
     MESSAGE_T msg;
     U32 msgSize;
-    U08  data[sizeof(MESSAGE_WRAPPER_T) + 1 + CAN_MESSAGE_PAYLOAD_SIZE];  // must hold full (wrapped) message + sync + any CAN padding
+    U08  data[ sizeof( MESSAGE_WRAPPER_T ) + 1 + CAN_MESSAGE_PAYLOAD_SIZE ];  // must hold full (wrapped) message + sync + any CAN padding
 
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_OFF_BUTTON_PRESS;
     msg.hdr.payloadLen = 1;
-    msg.payload[0] = (U08)promptUser;
+    msg.payload[ 0 ] = cmd;
 
     // serialize the message (w/ sync, CRC, and appropriate CAN padding)
     msgSize = serializeMessage( msg, data );
@@ -162,15 +162,15 @@
     BOOL result;
     MESSAGE_T msg;
     U32 msgSize;
-    U08 data[sizeof(MESSAGE_WRAPPER_T) + 1 + CAN_MESSAGE_PAYLOAD_SIZE];  // must hold full (wrapped) message + sync + any CAN padding
+    U08 data[ sizeof( MESSAGE_WRAPPER_T ) + 1 + CAN_MESSAGE_PAYLOAD_SIZE ];  // must hold full (wrapped) message + sync + any CAN padding
     U08 *payloadPtr = msg.payload;
 
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_ALARM_STATUS;
-    msg.hdr.payloadLen = sizeof(COMP_ALARM_STATUS_T);
+    msg.hdr.payloadLen = sizeof( COMP_ALARM_STATUS_T );
 
-    memcpy( payloadPtr, &almStatus, sizeof(COMP_ALARM_STATUS_T) );
+    memcpy( payloadPtr, &almStatus, sizeof( COMP_ALARM_STATUS_T ) );
 
     // serialize the message (w/ sync, CRC, and appropriate CAN padding)
     msgSize = serializeMessage( msg, data );
@@ -198,19 +198,19 @@
     BOOL result;
     MESSAGE_T msg;
     U32 msgSize;
-    U08 data[sizeof(MESSAGE_WRAPPER_T) + 1 + CAN_MESSAGE_PAYLOAD_SIZE];  // must hold full (wrapped) message + sync + any CAN padding
+    U08 data[ sizeof( MESSAGE_WRAPPER_T ) + 1 + CAN_MESSAGE_PAYLOAD_SIZE ];  // must hold full (wrapped) message + sync + any CAN padding
     U08 *payloadPtr = msg.payload;
 
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_ALARM_TRIGGERED;
-    msg.hdr.payloadLen = sizeof(ALARM_ID_T) + sizeof(ALARM_DATA_T) + sizeof(ALARM_DATA_T);
+    msg.hdr.payloadLen = sizeof( ALARM_ID_T ) + sizeof( ALARM_DATA_T ) + sizeof( ALARM_DATA_T );
 
-    memcpy( payloadPtr, &alarm, sizeof(ALARM_ID_T) );
-    payloadPtr += sizeof(ALARM_ID_T);
-    memcpy( payloadPtr, &almData1, sizeof(ALARM_DATA_T) );
-    payloadPtr += sizeof(ALARM_DATA_T);
-    memcpy( payloadPtr, &almData2, sizeof(ALARM_DATA_T) );
+    memcpy( payloadPtr, &alarm, sizeof( ALARM_ID_T ) );
+    payloadPtr += sizeof( ALARM_ID_T );
+    memcpy( payloadPtr, &almData1, sizeof( ALARM_DATA_T ) );
+    payloadPtr += sizeof( ALARM_DATA_T );
+    memcpy( payloadPtr, &almData2, sizeof( ALARM_DATA_T ) );
 
     // serialize the message (w/ sync, CRC, and appropriate CAN padding)
     msgSize = serializeMessage( msg, data );
@@ -236,15 +236,15 @@
     BOOL result;
     MESSAGE_T msg;
     U32 msgSize;
-    U08 data[sizeof(MESSAGE_WRAPPER_T) + 1 + CAN_MESSAGE_PAYLOAD_SIZE];  // must hold full (wrapped) message + sync + any CAN padding
+    U08 data[ sizeof( MESSAGE_WRAPPER_T ) + 1 + CAN_MESSAGE_PAYLOAD_SIZE ];  // must hold full (wrapped) message + sync + any CAN padding
     U08 *payloadPtr = msg.payload;
 
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_ALARM_CLEARED;
-    msg.hdr.payloadLen = sizeof(ALARM_ID_T);
+    msg.hdr.payloadLen = sizeof( ALARM_ID_T );
 
-    memcpy( payloadPtr, &alarm, sizeof(ALARM_ID_T) );
+    memcpy( payloadPtr, &alarm, sizeof( ALARM_ID_T ) );
 
     // serialize the message (w/ sync, CRC, and appropriate CAN padding)
     msgSize = serializeMessage( msg, data );
@@ -275,25 +275,25 @@
     BOOL result;
     MESSAGE_T msg;
     U32 msgSize;
-    U08 data[sizeof(MESSAGE_WRAPPER_T) + 1 + CAN_MESSAGE_PAYLOAD_SIZE];  // must hold full (wrapped) message + sync + any CAN padding
+    U08 data[ sizeof( MESSAGE_WRAPPER_T ) + 1 + CAN_MESSAGE_PAYLOAD_SIZE ];  // must hold full (wrapped) message + sync + any CAN padding
     U08 *payloadPtr = msg.payload;
 
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_BLOOD_FLOW_DATA;
-    msg.hdr.payloadLen = sizeof(U32) + sizeof(F32) + sizeof(F32) + sizeof(F32) + sizeof(F32) + sizeof(F32);
+    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( F32 ) + sizeof( F32 ) + sizeof( F32 ) + sizeof( F32 ) + sizeof( F32 );
 
-    memcpy( payloadPtr, &flowStPt, sizeof(U32) );
-    payloadPtr += sizeof(U32);
-    memcpy( payloadPtr, &measFlow, sizeof(F32) );
-    payloadPtr += sizeof(F32);
-    memcpy( payloadPtr, &measRotorSpd, sizeof(F32) );
-    payloadPtr += sizeof(F32);
-    memcpy( payloadPtr, &measSpd, sizeof(F32) );
-    payloadPtr += sizeof(F32);
-    memcpy( payloadPtr, &measMCSpd, sizeof(F32) );
-    payloadPtr += sizeof(F32);
-    memcpy( payloadPtr, &measMCCurr, sizeof(F32) );
+    memcpy( payloadPtr, &flowStPt, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &measFlow, sizeof( F32 ) );
+    payloadPtr += sizeof( F32 );
+    memcpy( payloadPtr, &measRotorSpd, sizeof( F32 ) );
+    payloadPtr += sizeof( F32 );
+    memcpy( payloadPtr, &measSpd, sizeof( F32 ) );
+    payloadPtr += sizeof( F32 );
+    memcpy( payloadPtr, &measMCSpd, sizeof( F32 ) );
+    payloadPtr += sizeof( F32 );
+    memcpy( payloadPtr, &measMCCurr, sizeof( F32 ) );
 
     // serialize the message (w/ sync, CRC, and appropriate CAN padding)
     msgSize = serializeMessage( msg, data );
@@ -402,13 +402,13 @@
     BOOL result;
     MESSAGE_T msg;
     U32 msgSize;
-    U08  data[PC_MESSAGE_PACKET_SIZE];
+    U08  data[ PC_MESSAGE_PACKET_SIZE ];
 
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = msgID;
     msg.hdr.payloadLen = 1;
-    msg.payload[0] = (U08)ack;
+    msg.payload[ 0 ] = (U08)ack;
 
     // serialize the message (w/ sync, CRC, and appropriate CAN padding)
     msgSize = serializeMessage( msg, data );
@@ -433,7 +433,7 @@
 {
     // verify pass code
     // TODO - placeholder - how do we want to authenticate tester?
-    if ( ( 3 == message->hdr.payloadLen ) && ( 0x31 == message->payload[0] ) && ( 0x32 == message->payload[1] ) && ( 0x33 == message->payload[2] ) )
+    if ( ( 3 == message->hdr.payloadLen ) && ( 0x31 == message->payload[ 0 ] ) && ( 0x32 == message->payload[ 1 ] ) && ( 0x33 == message->payload[ 2 ] ) )
     {
         testerLoggedIn = TRUE;
     }