Index: firmware/App/Drivers/Comm.h
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Drivers/Comm.h	(.../Comm.h)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Drivers/Comm.h	(.../Comm.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,7 +17,7 @@
 #ifndef __COMM_H__
 #define __COMM_H__
 
-#include "Common.h"
+#include "DGCommon.h"
 
 // ********** public definitions **********
 
@@ -26,18 +26,26 @@
 
 // ********** public function prototypes **********
 
-void setSCI1DMAReceiveInterrupt( void );
-void setSCI1DMATransmitInterrupt( void );
-void clearSCI1DMAReceiveInterrupt( void );
-void clearSCI1DMATransmitInterrupt( void );
+void signalCANXmitsInitiated( void );
+void signalCANXmitsCompleted( void );
+BOOL isCAN1TransmitInProgress( void );
+
+#ifdef DEBUG_ENABLED
+    void signalSCI1XmitsInitiated( void );
+    void signalSCI1XmitsCompleted( void );
+    void setSCI1DMAReceiveInterrupt( void );
+    void setSCI1DMATransmitInterrupt( void );
+    void clearSCI1DMAReceiveInterrupt( void );
+    void clearSCI1DMATransmitInterrupt( void );
+    void clearSCI1CommErrors( void );
+    BOOL isSCI1DMATransmitInProgress( void );
+#endif
+
 void setSCI2DMAReceiveInterrupt( void );
 void setSCI2DMATransmitInterrupt( void );
 void clearSCI2DMAReceiveInterrupt( void );
 void clearSCI2DMATransmitInterrupt( void );
-
-BOOL isSCI1DMATransmitInProgress( void );
+void clearSCI2CommErrors( void );
 BOOL isSCI2DMATransmitInProgress( void );
 
-BOOL isCAN1TransmitInProgress( void );
-
 #endif