Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -r479cebb3c254ed13bca26f361c8b5266f8eae408
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 479cebb3c254ed13bca26f361c8b5266f8eae408)
@@ -17,48 +17,66 @@
 #ifndef __SYSTEM_COMM_MESSAGES_H__
 #define __SYSTEM_COMM_MESSAGES_H__
 
-#include "Common.h"
+#include "DGCommon.h"
 #include "MsgQueues.h"
 
 // ********** public definitions **********
 
-typedef enum Msg_IDs
-{
-    MSG_ID_UNUSED = 0,
-    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_ALARM_LAMP_PATTERN_OVERRIDE,
-    MSG_ID_WATCHDOG_TASK_CHECKIN_OVERRIDE,
-    NUM_OF_MSG_IDS
-} MSG_ID_T;
-
 // ********** public function prototypes **********
 
-// MSG_ID_OFF_BUTTON_PRESS
-BOOL sendOffButtonMsgToUI( void );
-void handleDGFillStartStopMessages( MESSAGE_T *message );
+// ACK MSG
+BOOL sendACKMsg( MESSAGE_T *message );
 
+// MSG_ID_ALARM_TRIGGERED
+BOOL broadcastAlarmTriggered( U16 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 );
+// MSG_ID_ALARM_CLEARED
+BOOL broadcastAlarmCleared( U16 alarm );
+
+// MSG_ID_RTC_EPOCH
+BOOL broadcastRTCEpoch( U32 epoch );  // TODO - probably don't want DG to broadcast these
+
+// MSG_ID_LOAD_CELL_READINGS
+BOOL broadcastLoadCellData( F32 loadCellA1, F32 loadCellA2, F32 loadCellB1, F32 loadCellB2 );
+
+#ifdef CAN_TEST
+// MSG_ID_DG_CAN_TEST_1_LARGE_FREQ
+void broadcastCANTest1LargeFrequentMessage();
+#endif
+
 // *********** public test support message functions **********
 
+#ifdef DEBUG_ENABLED
 // DEBUG OUTPUT
 BOOL sendDebugData( U08 *dbgData, U32 len );
+#endif
 
 // MSG_TESTER_LOG_IN
 void handleTesterLogInRequest( MESSAGE_T *message );
 BOOL isTestingActivated( void );
 
-// MSG_ID_HD_MESSAGE
-void handleTestHDMessageRequest( MESSAGE_T *message );
+// MSG_ID_DG_MESSAGE
+void handleTestDGMessageRequest( MESSAGE_T *message );
 
-// MSG_ID_OFF_BUTTON_STATE_OVERRIDE
-void handleTestOffButtonStateOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_ALARM_LAMP_PATTERN_OVERRIDE
-void handleTestAlarmLampPatternOverrideRequest( MESSAGE_T *message );
-
 // MSG_ID_WATCHDOG_TASK_CHECKIN_OVERRIDE:
 void handleTestWatchdogCheckInStateOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_ALARM_STATE_OVERRIDE
+void handleTestAlarmStateOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_LOAD_CELL_A1_OVERRIDE
+void handleTestLoadCellA1OverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_LOAD_CELL_A2_OVERRIDE
+void handleTestLoadCellA2OverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_LOAD_CELL_B1_OVERRIDE
+void handleTestLoadCellB1OverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_LOAD_CELL_B2_OVERRIDE
+void handleTestLoadCellB2OverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_SET_RTC_TIMESTAMP
+void handleSetRTCTimestamp( MESSAGE_T *message );
+
 #endif
+