Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -rf068446fdb7889d320ddb6ffbd58f347ce0501e7
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision f068446fdb7889d320ddb6ffbd58f347ce0501e7)
@@ -23,23 +23,48 @@
 // ********** public definitions **********
 
 typedef enum Msg_IDs
-{
+{   // normal CAN messages
     MSG_ID_UNUSED = 0,
-    MSD_ID_DG_FILL_START_STOP = 0x2000,
-    MSG_ID_FIRST_TESTER_MESSAGE = 0xA000,
+    MSG_ID_OFF_BUTTON_PRESS,                    // 1
+    MSG_ID_ALARM_STATUS,                        // 2
+    MSG_ID_ALARM_TRIGGERED,                     // 3
+    MSG_ID_ALARM_CLEARED,                       // 4
+    MSG_ID_BLOOD_FLOW_DATA,                     // 5
+    MSG_ID_DG_CHECK_IN,                         // 6
+    MSG_ID_UI_CHECK_IN,                         // 7
+    MSG_ID_DIALYSATE_FLOW_DATA,                 // 8
+    MSG_ID_PRESSURE_OCCLUSION_DATA,             // 9
+    MSG_ID_RTC_EPOCH,                           // 10
+    MSG_ID_DIALYSATE_OUT_FLOW_DATA,             // 11
+    MSG_ID_LOAD_CELL_READINGS,                  // 12
+    MSG_ID_TREATMENT_TIME,                      // 13
+
+    // service/test CAN messages
+
+    MSG_ID_FIRST_TESTER_MESSAGE = 0xA000,                       // 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_DG_MESSAGE,                                          // 0xA001
+    MSG_ID_WATCHDOG_TASK_CHECKIN_OVERRIDE,                      // 0xA002
+    MSG_ID_ALARM_STATE_OVERRIDE,                                // 0xA003
+    MSG_ID_SET_RTC_DATE_TIME,                                   // 0xA004
+    END_OF_MSG_IDS
 } MSG_ID_T;
 
 // ********** public function prototypes **********
 
-// MSG_ID_OFF_BUTTON_PRESS
-BOOL sendOffButtonMsgToUI( void );
-void handleDGFillStartStopMessages( MESSAGE_T *message );
+#ifndef ACK_NOT_IMPLEMENTED
+// ACK MSG
+BOOL sendACKMsg( MESSAGE_T *message );
+#endif
 
+// 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
+
 // *********** public test support message functions **********
 
 // DEBUG OUTPUT
@@ -49,16 +74,17 @@
 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_SET_RTC_TIMESTAMP
+void handleSetRTCTimestamp( MESSAGE_T *message );
+
 #endif
+