Index: firmware/App/Services/MsgQueues.c
===================================================================
diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -r7a1867c42c016fe547154fa278df0b04d1e6f241
--- firmware/App/Services/MsgQueues.c	(.../MsgQueues.c)	(revision a7bf3ca23ea37a61000379facae628a31b3ecc59)
+++ firmware/App/Services/MsgQueues.c	(.../MsgQueues.c)	(revision 7a1867c42c016fe547154fa278df0b04d1e6f241)
@@ -19,14 +19,14 @@
 
 // ********** private definitions **********
 
-#define MAX_MSG_QUEUE_SIZE          100      // messages
+#define MAX_MSG_QUEUE_SIZE          100                                             ///< Maximum message queue size
 
 // ********** private data **********
 
-static U32 msgQueueCounts[ NUM_OF_MSG_QUEUES ];
-static U32 msgQueueStarts[ NUM_OF_MSG_QUEUES ];
-static U32 msgQueueNexts[ NUM_OF_MSG_QUEUES ];
-static MESSAGE_WRAPPER_T msgQueues[ NUM_OF_MSG_QUEUES ][ MAX_MSG_QUEUE_SIZE ];
+static U32 msgQueueCounts[ NUM_OF_MSG_QUEUES ];                                     ///< Message queue count
+static U32 msgQueueStarts[ NUM_OF_MSG_QUEUES ];                                     ///< Start index of a queue
+static U32 msgQueueNexts[ NUM_OF_MSG_QUEUES ];                                      ///< Index to add new message to a queue
+static MESSAGE_WRAPPER_T msgQueues[ NUM_OF_MSG_QUEUES ][ MAX_MSG_QUEUE_SIZE ];      ///< Message queues
 
 // ********** private function prototypes **********
 
@@ -86,12 +86,12 @@
         }
         else // msg queue is full
         {
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_ADD_QUEUE_FULL )
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_ADD_QUEUE_FULL )
         }
     }
     else // invalid message queue
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_ADD_INVALID_QUEUE, queue )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_ADD_INVALID_QUEUE, queue )
     }
 
     return result;
@@ -133,7 +133,7 @@
     }
     else // invalid message queue
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_GET_INVALID_QUEUE, queue )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_GET_INVALID_QUEUE, queue )
     }
 
     return result;
@@ -162,7 +162,7 @@
     }
     else // invalid message queue
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_IS_EMPTY_INVALID_QUEUE, queue )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_IS_EMPTY_INVALID_QUEUE, queue )
     }
 
     return result;
@@ -191,7 +191,7 @@
     }
     else // invalid message queue
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_IS_FULL_INVALID_QUEUE, queue )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_IS_FULL_INVALID_QUEUE, queue )
     }
 
     return result;
@@ -243,6 +243,3 @@
     // set msg ID out of bounds in case blank message goes somewhere
     message->msg.hdr.msgID = 0xFFFF;
 }
-
-
-