Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r663c6ccbe24d0adf734ca0684510eef70884cdee -rdcbd821e41803adc6e582d909207bc97f85ff939
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 663c6ccbe24d0adf734ca0684510eef70884cdee)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision dcbd821e41803adc6e582d909207bc97f85ff939)
@@ -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_DG_ALARM,
      COMM_BUFFER_OUT_CAN_DG_2_HD,
@@ -52,15 +52,15 @@
      COMM_BUFFER_OUT_UART_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_HD_2_DG,
      COMM_BUFFER_IN_CAN_PC_2_DG,
      COMM_BUFFER_IN_UART_PC
 };
 
-static U08 pcXmitPacket[PC_MESSAGE_PACKET_SIZE] = {0,0,0,0,0,0,0,0};// = {1,2,3,4,5,6,7,8};
-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 };// = { 1,2,3,4,5,6,7,8};
+static U08 pcRecvPacket[ PC_MESSAGE_PACKET_SIZE ] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 
 // DMA control records
 static g_dmaCTRL pcDMAXmitControlRecord;
@@ -622,12 +622,6 @@
 
     switch ( msgID )
     {
-        case MSG_ID_OFF_BUTTON_PRESS:
-            handleOffButtonConfirmMsgFromUI( message );
-#ifdef RM46_EVAL_BOARD_TARGET
-            setUserLED( TRUE );
-#endif
-            break;
 
         case MSD_ID_DG_FILL_START_STOP:
             handleDGFillStartStopMessages( message );
@@ -651,14 +645,6 @@
                 handleTestHDMessageRequest( message );
                 break;
 
-            case MSG_ID_OFF_BUTTON_STATE_OVERRIDE:
-                handleTestOffButtonStateOverrideRequest( message );
-                break;
-
-            case MSG_ID_STOP_BUTTON_STATE_OVERRIDE:
-                handleTestStopButtonStateOverrideRequest( message );
-                break;
-
             case MSG_ID_ALARM_LAMP_PATTERN_OVERRIDE:
                 handleTestAlarmLampPatternOverrideRequest( message );
                 break;