Index: firmware/App/Services/CommBuffers.c
===================================================================
diff -u -r51c6a24b30643c8ce296ebfe1d703f289ffafe97 -ra0aca1a4d87df989303b4f7f41208a4916861afa
--- firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 51c6a24b30643c8ce296ebfe1d703f289ffafe97)
+++ firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision a0aca1a4d87df989303b4f7f41208a4916861afa)
@@ -119,12 +119,12 @@
         {
             // release thread protection
             _enable_IRQ();
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 20, len )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_TOO_MUCH_DATA, len )
         }
     }
     else // invalid buffer given
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 21, buffer )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_INVALID_BUFFER, buffer )
     }
 
     return result;
@@ -180,12 +180,12 @@
         }
         else // invalid peek size given
         {
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 22, len )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_GET_TOO_MUCH_DATA, len )
         }
     }
     else // invalid buffer given
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 23, buffer )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_GET_INVALID_BUFFER, buffer )
     }
 
     return result;
@@ -238,12 +238,12 @@
         }
         else // invalid peek size given
         {
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 24, len )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_PEEK_TOO_MUCH_DATA, len )
         }
     }
     else // invalid buffer given
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 25, buffer )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_PEEK_INVALID_BUFFER, buffer )
     }
 
     return numOfBytesPeeked;
@@ -271,7 +271,7 @@
     }
     else // invalid buffer
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 26, buffer )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_COUNT_INVALID_BUFFER, buffer )
     }
 
     return result;