Index: RTC.c
===================================================================
diff -u -r6debb526b7d4fc80cdad6a26e14e4522cb00bec2 -r7deab66e16200dd4b7c8214929fdb36fc6cb8a90
--- RTC.c	(.../RTC.c)	(revision 6debb526b7d4fc80cdad6a26e14e4522cb00bec2)
+++ RTC.c	(.../RTC.c)	(revision 7deab66e16200dd4b7c8214929fdb36fc6cb8a90)
@@ -770,7 +770,7 @@
                 numberOfFailedRTCTransfers++;
                 memset( debugEventBuffer, 0x00, sizeof(debugEventBuffer) );
                 snprintf( debugEventBuffer, sizeof( debugEventBuffer ), "$RTC SPI: %d, %d", RTCServiceState, numberOfFailedRTCTransfers );
-                broadcastData( MSG_ID_DG_DEBUG_EVENT, COMM_BUFFER_OUT_CAN_DG_BROADCAST, debugEventBuffer, sizeof( debugEventBuffer ) );
+                broadcastData( DEBUG_EVENT_MSG_ID, COMM_BUFFER_OUT_CAN_BROADCAST, debugEventBuffer, sizeof( debugEventBuffer ) );
             }
             // Done with read (successful of failed)
             // get ready for another call
@@ -1373,7 +1373,7 @@
             data.epochTime = lastEpochTime;
 
 #ifdef _DG_
-            broadcastData( MSG_ID_DG_RTC_EPOCH_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( RTC_DATA_T ) );
+            broadcastData( MSG_ID_DG_RTC_EPOCH_DATA, COMM_BUFFER_OUT_CAN_BROADCAST, (U08*)&data, sizeof( RTC_DATA_T ) );
 #endif
 #ifdef _HD_
             broadcastData( MSG_ID_RTC_EPOCH_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( RTC_DATA_T ) );
@@ -1422,17 +1422,17 @@
             memset(debugEventBuffer, 0x00, sizeof(debugEventBuffer));
             snprintf( debugEventBuffer, sizeof( debugEventBuffer ), "$RTC Verify: %02X:%02X, %02X:%02X, %02X:%02X, %02X:%02X",
                       rxBuffer[0], writeSaveBuffer[0], rxBuffer[1], writeSaveBuffer[1], rxBuffer[2], writeSaveBuffer[2], rxBuffer[3], writeSaveBuffer[3] );
-            broadcastData( MSG_ID_DG_DEBUG_EVENT, COMM_BUFFER_OUT_CAN_DG_BROADCAST, debugEventBuffer, sizeof( debugEventBuffer ) );
+            broadcastData( DEBUG_EVENT_MSG_ID, COMM_BUFFER_OUT_CAN_BROADCAST, debugEventBuffer, sizeof( debugEventBuffer ) );
 
             memset(debugEventBuffer, 0x00, sizeof(debugEventBuffer));
             snprintf( debugEventBuffer, sizeof( debugEventBuffer ), "$RTC Verify: %02X:%02X, %02X:%02X, %02X:%02X, %02X:%02X",
                       rxBuffer[4], writeSaveBuffer[4], rxBuffer[5], writeSaveBuffer[5], rxBuffer[6], writeSaveBuffer[6], rxBuffer[7], writeSaveBuffer[7] );
-            broadcastData( MSG_ID_DG_DEBUG_EVENT, COMM_BUFFER_OUT_CAN_DG_BROADCAST, debugEventBuffer, sizeof( debugEventBuffer ) );
+            broadcastData( DEBUG_EVENT_MSG_ID, COMM_BUFFER_OUT_CAN_BROADCAST, debugEventBuffer, sizeof( debugEventBuffer ) );
 
             memset(debugEventBuffer, 0x00, sizeof(debugEventBuffer));
             snprintf( debugEventBuffer, sizeof( debugEventBuffer ), "$RTC Verify: %02X:%02X, %02X:%02X, %02X:%02X",
                       rxBuffer[8], writeSaveBuffer[8], rxBuffer[9], writeSaveBuffer[9], rxBuffer[10], writeSaveBuffer[10] );
-            broadcastData( MSG_ID_DG_DEBUG_EVENT, COMM_BUFFER_OUT_CAN_DG_BROADCAST, debugEventBuffer, sizeof( debugEventBuffer ) );
+            broadcastData( DEBUG_EVENT_MSG_ID, COMM_BUFFER_OUT_CAN_BROADCAST, debugEventBuffer, sizeof( debugEventBuffer ) );
 
         }
 
@@ -1815,13 +1815,17 @@
 {
     BOOL result = TRUE;
 
+    memset(debugEventBuffer, 0x00, sizeof(debugEventBuffer));
+    snprintf( debugEventBuffer, sizeof( debugEventBuffer ), "$RTC HD epoch check");
+    broadcastData( DEBUG_EVENT_MSG_ID, COMM_BUFFER_OUT_CAN_BROADCAST, debugEventBuffer, sizeof( debugEventBuffer ) );
+
     if ( epoch < 1689958503 )
     {
         result = FALSE;
 
         memset(debugEventBuffer, 0x00, sizeof(debugEventBuffer));
         snprintf( debugEventBuffer, sizeof( debugEventBuffer ), "$RTC HD epoch: %d", epoch);
-        broadcastData( MSG_ID_DG_DEBUG_EVENT, COMM_BUFFER_OUT_CAN_DG_BROADCAST, debugEventBuffer, sizeof( debugEventBuffer ) );
+        broadcastData( DEBUG_EVENT_MSG_ID, COMM_BUFFER_OUT_CAN_BROADCAST, debugEventBuffer, sizeof( debugEventBuffer ) );
     }
 
     return result;