Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rdcbd821e41803adc6e582d909207bc97f85ff939 -r57007cd9fc64466a979f6613763a243d77743117
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision dcbd821e41803adc6e582d909207bc97f85ff939)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 57007cd9fc64466a979f6613763a243d77743117)
@@ -1,6 +1,6 @@
 /**************************************************************************
  *
- *  Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved.
+ *  Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
  *
  *  THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  *  WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
@@ -17,48 +17,67 @@
 #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 );
+
+// MSG_ID_HEATERS_READINGS
+BOOL broadcastHeatersData ( U32 mainPrimaryDC, U32 smallPrimaryDC, U32 trimmerDC );
+
+// MSG_ID_TEMPERATURE_SENSORS_READINGS
+BOOL broadcastTemperatureSensorsData ( U08 *sensorsValue, U32 byteLength );
+
 // *********** 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_OVERRIDE
+void handleTestLoadCellOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_TEMPERATURE_SENSORS_OVERRIDE
+void handleTestTemperatureSensorsOverrideRequest ( MESSAGE_T *message );
+
+// MSG_ID_PUBLSIH_HEATERS_DATA_OVERRIDE
+void handleTestHeatersDataPublishOverrideRequest ( MESSAGE_T *message );
+
+// MSG_ID_SET_RTC_TIMESTAMP
+void handleSetRTCTimestamp( MESSAGE_T *message );
+
+// MSG_ID_START_STOP_PRIMARY_HEATER
+BOOL handleStartStopPrimaryHeater( MESSAGE_T * message );
+
 #endif
+