Index: firmware/App/Services/MsgQueues.c
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Services/MsgQueues.c	(.../MsgQueues.c)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Services/MsgQueues.c	(.../MsgQueues.c)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,7 +17,6 @@
  *
  **************************************************************************/
 
-#include "Common.h"
 #include "MsgQueues.h"
 
 // ********** private definitions **********
@@ -26,10 +25,10 @@
 
 // ********** 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 ];
+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 ];
 
 // ********** private function prototypes **********
 
@@ -49,12 +48,12 @@
     // reset message queues
     for ( q = 0; q < NUM_OF_MSG_QUEUES; q++ )
     {
-        msgQueueCounts[q] = 0;
-        msgQueueStarts[q] = 0;
-        msgQueueNexts[q] = 0;
+        msgQueueCounts[ q ] = 0;
+        msgQueueStarts[ q ] = 0;
+        msgQueueNexts[ q ] = 0;
         for ( m = 0; m < MAX_MSG_QUEUE_SIZE; m++ )
         {
-            blankMessageInWrapper( &msgQueues[q][m] );
+            blankMessageInWrapper( &msgQueues[ q ][ m ] );
         }
     }
 }
@@ -81,20 +80,20 @@
         {
             result = TRUE;
             // add message to queue
-            msgQueues[queue][msgQueueNexts[queue]] = *msg;
+            msgQueues[ queue ][ msgQueueNexts[ queue ] ] = *msg;
             // increment next index to add to
-            msgQueueNexts[queue] = INC_WRAP(msgQueueNexts[queue],0,MAX_MSG_QUEUE_SIZE-1);
+            msgQueueNexts[ queue ] = INC_WRAP( msgQueueNexts[ queue ], 0, MAX_MSG_QUEUE_SIZE - 1 );
             // increment queue count
-            msgQueueCounts[queue]++;
+            msgQueueCounts[ queue ]++;
         }
         else // msg queue is full
         {
-            // TODO - s/w fault?
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_ADD_QUEUE_FULL )
         }
     }
     else // invalid message queue
     {
-        // TODO - s/w fault
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_ADD_INVALID_QUEUE, queue )
     }
 
     return result;
@@ -123,11 +122,11 @@
         {
             result = TRUE;
             // get message from queue
-            *msg = msgQueues[queue][msgQueueStarts[queue]];
+            *msg = msgQueues[ queue ][ msgQueueStarts[ queue ] ];
             // increment queue next index to get from
-            msgQueueStarts[queue] = INC_WRAP(msgQueueStarts[queue],0,MAX_MSG_QUEUE_SIZE-1);
+            msgQueueStarts[ queue ] = INC_WRAP( msgQueueStarts[ queue ], 0, MAX_MSG_QUEUE_SIZE - 1 );
             // decrement queue count
-            msgQueueCounts[queue]--;
+            msgQueueCounts[ queue ]--;
         }
         else // message queue is empty
         {
@@ -136,7 +135,7 @@
     }
     else // invalid message queue
     {
-        // TODO - s/w fault
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_GET_INVALID_QUEUE, queue )
     }
 
     return result;
@@ -158,14 +157,14 @@
     // verify given message queue
     if ( queue < NUM_OF_MSG_QUEUES )
     {
-        if ( msgQueueCounts[queue] == 0 )
+        if ( msgQueueCounts[ queue ] == 0 )
         {
             result = TRUE;
         }
     }
     else // invalid message queue
     {
-        // TODO - s/w fault
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_IS_EMPTY_INVALID_QUEUE, queue )
     }
 
     return result;
@@ -187,14 +186,14 @@
     // verify given message queue
     if ( queue < NUM_OF_MSG_QUEUES )
     {
-        if ( msgQueueCounts[queue] < MAX_MSG_QUEUE_SIZE )
+        if ( msgQueueCounts[ queue ] < MAX_MSG_QUEUE_SIZE )
         {
             result = FALSE;
         }
     }
     else // invalid message queue
     {
-        // TODO - s/w fault
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_IS_FULL_INVALID_QUEUE, queue )
     }
 
     return result;
@@ -220,9 +219,6 @@
     {
         *msgContent++ = 0x0;
     }
-
-    // set msg ID out of bounds in case blank message goes somewhere
-    message->hdr.msgID = 0xFFFF;
 }
 
 /*************************************************************************