Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r3d211bbf5607fb42f003d074caa58f75069774e9 -rf1dc6eb108b54d0187f26a44d2e5784a1a4f46df
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3d211bbf5607fb42f003d074caa58f75069774e9)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f1dc6eb108b54d0187f26a44d2e5784a1a4f46df)
@@ -94,97 +94,97 @@
 static volatile U16 nextSeqNo = 1;                  ///< Next sequence number.
 /// List of message IDs that are requested not to be transmitted.
 static BLOCKED_MSGS_DATA_T blockedMessagesForXmit = { 0, 0, 0, 0, 0, 0, 0, 0 };
-
-// ********** private function prototypes **********
-
-static BOOL sendTestAckResponseMsg( MSG_ID_T msgID, BOOL ack );
+
+// ********** private function prototypes **********
+
+static BOOL sendTestAckResponseMsg( MSG_ID_T msgID, BOOL ack );
 static BOOL sendAckResponseMsg( MSG_ID_T msgID, COMM_BUFFER_T buffer, BOOL ack );
-static BOOL sendUIResponseMsg( MSG_ID_T msgID, BOOL accepted, U32 reason );
+static BOOL sendUIResponseMsg( MSG_ID_T msgID, BOOL accepted, U32 reason );
+
+/*********************************************************************//**
+ * @brief
+ * The serializeMessage function serializes a given message into a given
+ * array of bytes.  A sequence # is added to the message here and the ACK
+ * bit of the sequence # is set if ACK is required per parameter.  A sync byte
+ * is inserted at the beginning of the message and an 8-bit CRC is appended to
+ * the end of the message. The message is queued for transmission in the given buffer.
+ * @details Inputs: none
+ * @details Outputs: given data array populated with serialized message data and queued for transmit.
+ * @param msg message to serialize
+ * @param buffer outgoing buffer that message should be queued in
+ * @param ackReq is an acknowledgement from receiver required?
+ * @return size (in bytes) of serialized message populated in given data array.
+ *************************************************************************/
+U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq )
+{
+    BOOL result = FALSE;
+    BOOL error = FALSE;
+    U32 msgSize = 0;
+    U32 sizeMod, sizePad;
+    U32 i;
+    U08 crc;
+    U08 data[ MAX_ACK_MSG_SIZE ];  // byte array to populate with message data
+
+    // prefix data with message sync byte
+    data[ msgSize++ ] = MESSAGE_SYNC_BYTE;
+
+    // set sequence # and ACK bit (unless this is an ACK to a received message)
+    if ( msg.hdr.msgID != MSG_ID_ACK_MESSAGE_THAT_REQUIRES_ACK )
+    {
+        // thread protect next sequence # access & increment
+        _disable_IRQ();
+            msg.hdr.seqNo = nextSeqNo;
+            nextSeqNo = INC_WRAP( nextSeqNo, MIN_MSG_SEQ_NO, MAX_MSG_SEQ_NO );
+        _enable_IRQ();
+        if ( TRUE == ackReq )
+        {
+            msg.hdr.seqNo *= -1;
+        }
+    }
+
+    // calculate message CRC
+    crc = crc8( (U08*)(&msg), sizeof( MESSAGE_HEADER_T ) + msg.hdr.payloadLen );
+
+    // serialize message header data
+    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 );
+    msgSize += msg.hdr.payloadLen;
+
+    // add 8-bit CRC
+    data[ msgSize++ ] = crc;
+
+    // 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;
+    }
+
+    // if ACK required, add to pending ACK list
+    if ( TRUE == ackReq )
+    {
+        if ( FALSE == addMsgToPendingACKList( &msg, buffer, data, msgSize ) )
+        {
+            error = TRUE;
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL )
+        }
+    }
+
+    if ( FALSE == error )
+    {
+        // add serialized message data to appropriate out-going comm buffer
+        result = addToCommBuffer( buffer, data, msgSize );
+    }
+
+    return result;
+}
 
 /*********************************************************************//**
  * @brief
- * The serializeMessage function serializes a given message into a given
- * array of bytes.  A sequence # is added to the message here and the ACK
- * bit of the sequence # is set if ACK is required per parameter.  A sync byte
- * is inserted at the beginning of the message and an 8-bit CRC is appended to
- * the end of the message. The message is queued for transmission in the given buffer.
- * @details Inputs: none
- * @details Outputs: given data array populated with serialized message data and queued for transmit.
- * @param msg message to serialize
- * @param buffer outgoing buffer that message should be queued in
- * @param ackReq is an acknowledgement from receiver required?
- * @return size (in bytes) of serialized message populated in given data array.
- *************************************************************************/
-U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq )
-{
-    BOOL result = FALSE;
-    BOOL error = FALSE;
-    U32 msgSize = 0;
-    U32 sizeMod, sizePad;
-    U32 i;
-    U08 crc;
-    U08 data[ MAX_ACK_MSG_SIZE ];  // byte array to populate with message data
-
-    // prefix data with message sync byte
-    data[ msgSize++ ] = MESSAGE_SYNC_BYTE;
-
-    // set sequence # and ACK bit (unless this is an ACK to a received message)
-    if ( msg.hdr.msgID != MSG_ID_ACK_MESSAGE_THAT_REQUIRES_ACK )
-    {
-        // thread protect next sequence # access & increment
-        _disable_IRQ();
-            msg.hdr.seqNo = nextSeqNo;
-            nextSeqNo = INC_WRAP( nextSeqNo, MIN_MSG_SEQ_NO, MAX_MSG_SEQ_NO );
-        _enable_IRQ();
-        if ( TRUE == ackReq )
-        {
-            msg.hdr.seqNo *= -1;
-        }
-    }
-
-    // calculate message CRC
-    crc = crc8( (U08*)(&msg), sizeof( MESSAGE_HEADER_T ) + msg.hdr.payloadLen );
-
-    // serialize message header data
-    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 );
-    msgSize += msg.hdr.payloadLen;
-
-    // add 8-bit CRC
-    data[ msgSize++ ] = crc;
-
-    // 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;
-    }
-
-    // if ACK required, add to pending ACK list
-    if ( TRUE == ackReq )
-    {
-        if ( FALSE == addMsgToPendingACKList( &msg, buffer, data, msgSize ) )
-        {
-            error = TRUE;
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL )
-        }
-    }
-
-    if ( FALSE == error )
-    {
-        // add serialized message data to appropriate out-going comm buffer
-        result = addToCommBuffer( buffer, data, msgSize );
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The sendACKMsg function constructs and queues for transmit an ACK message
  * for a given received message.
  * @details Inputs: none
@@ -3998,7 +3998,7 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestHDCommunicationStatusOverrideRequest function handles a request
+ * The handleTestHDCommunicationStatusOverrideRequest function handles a request 
  * request to override the HD Communication Status.
  * @details Inputs: none
  * @details Outputs: message handled
@@ -5165,29 +5165,4 @@
     // respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
-
-/*********************************************************************//**
- * @brief
- * The handleRebootNowRequest function handles a
- * request to reboot the system. A software reset will cause the bootloader
- * to stay active.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message : a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleRebootNowRequest( MESSAGE_T *message )
-{
-    BOOL result = (0 == message->hdr.payloadLen);
-
-    if (result)
-    {
-        // Trigger a software reset.
-        systemREG1->SYSECR = (0x2) << 14;
-    }
-
-    // respond to request immediately with whether it was formatted correctly
-    sendTestAckResponseMsg((MSG_ID_T)message->hdr.msgID, result);
-}
-
 /**@}*/