Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -reff7b1575f008f81b29ef906f6346fac6012d3ab -rdcbd821e41803adc6e582d909207bc97f85ff939
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision eff7b1575f008f81b29ef906f6346fac6012d3ab)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision dcbd821e41803adc6e582d909207bc97f85ff939)
@@ -25,12 +25,10 @@
 typedef enum Msg_IDs
 {
     MSG_ID_UNUSED = 0,
-    MSG_ID_OFF_BUTTON_PRESS,
-    MSG_ID_FIRST_TESTER_MESSAGE = 8000,
+    MSD_ID_DG_FILL_START_STOP = 0x2000,
+    MSG_ID_FIRST_TESTER_MESSAGE = 0xA000,
     MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TESTER_MESSAGE,
     MSG_ID_HD_MESSAGE,
-    MSG_ID_OFF_BUTTON_STATE_OVERRIDE,
-    MSG_ID_STOP_BUTTON_STATE_OVERRIDE,
     MSG_ID_ALARM_LAMP_PATTERN_OVERRIDE,
     MSG_ID_WATCHDOG_TASK_CHECKIN_OVERRIDE,
     NUM_OF_MSG_IDS
@@ -40,7 +38,7 @@
 
 // MSG_ID_OFF_BUTTON_PRESS
 BOOL sendOffButtonMsgToUI( void );
-void handleOffButtonConfirmMsgFromUI( MESSAGE_T *message );
+void handleDGFillStartStopMessages( MESSAGE_T *message );
 
 // *********** public test support message functions **********
 
@@ -57,9 +55,6 @@
 // MSG_ID_OFF_BUTTON_STATE_OVERRIDE
 void handleTestOffButtonStateOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_STOP_BUTTON_STATE_OVERRIDE
-void handleTestStopButtonStateOverrideRequest( MESSAGE_T *message );
-
 // MSG_ID_ALARM_LAMP_PATTERN_OVERRIDE
 void handleTestAlarmLampPatternOverrideRequest( MESSAGE_T *message );