Index: firmware/App/Services/CommBuffers.c
===================================================================
diff -u -r1d44cf33cf4461b81b19a8ab0e402c609649786b -r0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f
--- firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 1d44cf33cf4461b81b19a8ab0e402c609649786b)
+++ firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f)
@@ -1,24 +1,19 @@
-/**************************************************************************
- *
- *  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.
- *
- *  @file CommBuffers.c
- *
- *  @date 08-Oct-2019
- *  @author S. Nash
- *
- *  @brief CommBuffers service module.  Provides data buffering functionality. \n
- *  Data coming in via CAN/UART Rx interrupts can be placed in a buffer to \n
- *  be processed at a later time.  Data is double buffered to prevent \n
- *  contention between Rx/Tx interrupts and the processing thread(s). \n
- *  Data to be transmitted via CAN/UART can be placed in a buffer to be sent \n
- *  when the transmitter becomes available. \n
- *  If a buffer becomes too full to service more data, a s/w fault is triggered.
- *
- **************************************************************************/
+/**************************************************************************
+*
+* 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.
+*
+* @file CommBuffers.c
+*
+* @author (last) Quang Nguyen
+* @date (last) 21-Jul-2020
+*
+* @author (original) Dara Navaei
+* @date (original) 05-Nov-2019
+*
+***************************************************************************/
 
 #include <string.h>     // for memcpy()
 
@@ -159,7 +154,7 @@
                 // if buffer overflows persists, fault
                 if ( calcTimeSince( firstBufferOverflowTimeStamp ) > BUFFER_OVERFLOW_PERSISTENCE_MS )
                 {
-                    SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_TOO_MUCH_DATA, len )
+                    SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_TOO_MUCH_DATA, len )
                 }
             }
             else // first overflow - set time stamp for persistence check
@@ -185,7 +180,7 @@
     }
     else // invalid buffer given
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_INVALID_BUFFER, buffer )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_INVALID_BUFFER, buffer )
     }
 
     return result;
@@ -246,7 +241,7 @@
     }
     else // invalid buffer given
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_GET_INVALID_BUFFER, buffer )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_GET_INVALID_BUFFER, buffer )
     }
 
     return result;
@@ -304,7 +299,7 @@
     }
     else // invalid buffer given
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_PEEK_INVALID_BUFFER, buffer )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_PEEK_INVALID_BUFFER, buffer )
     }
 
     return numOfBytesPeeked;
@@ -342,7 +337,7 @@
     }
     else // invalid buffer
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_COUNT_INVALID_BUFFER, buffer )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_COUNT_INVALID_BUFFER, buffer )
     }
 
     return result;