Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r51c6a24b30643c8ce296ebfe1d703f289ffafe97 -ra0aca1a4d87df989303b4f7f41208a4916861afa
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 51c6a24b30643c8ce296ebfe1d703f289ffafe97)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision a0aca1a4d87df989303b4f7f41208a4916861afa)
@@ -365,7 +365,7 @@
         default:
             if ( fpgaState >= NUM_OF_FPGA_STATES )
             {
-                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 27, fpgaState )
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_INVALID_IN_STATE, fpgaState )
             }
             else
             {
@@ -415,7 +415,7 @@
         default:
             if ( fpgaState >= NUM_OF_FPGA_STATES )
             {
-                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 28, fpgaState )
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_INVALID_OUT_STATE, fpgaState )
             }
             else
             {
@@ -662,7 +662,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 29, bytes2Transmit )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_WRITE_CMD_TOO_MUCH_DATA, bytes2Transmit )
     }
 }
 
@@ -702,7 +702,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 30, bytes2Receive )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_WRITE_RSP_TOO_MUCH_DATA, bytes2Receive )
     }
 }
 
@@ -742,7 +742,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 31, bytes2Transmit )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_READ_CMD_TOO_MUCH_DATA, bytes2Transmit )
     }
 }
 
@@ -782,7 +782,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 32, bytes2Receive )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_READ_RSP_TOO_MUCH_DATA, bytes2Receive )
     }
 }