Index: firmware/App/Services/AlarmMgmtFP.c
===================================================================
diff -u -r6dd382e3988fac2f9ee041b4738d67305e17a6a2 -rcabd756f9087a6e24e594d9a468bdb37bbf9beaa
--- firmware/App/Services/AlarmMgmtFP.c	(.../AlarmMgmtFP.c)	(revision 6dd382e3988fac2f9ee041b4738d67305e17a6a2)
+++ firmware/App/Services/AlarmMgmtFP.c	(.../AlarmMgmtFP.c)	(revision cabd756f9087a6e24e594d9a468bdb37bbf9beaa)
@@ -18,7 +18,8 @@
 
 #include "AlarmMgmtFP.h"
 #include "Messaging.h"
-#include <FPOperationModes.h>
+#include "FPDefs.h"
+#include "FPOperationModes.h"
 #include "PersistentAlarm.h"
 #include "SafetyShutdown.h"
 #include "SystemCommFP.h"
@@ -113,7 +114,10 @@
                 if ( TRUE == isTransitionToFaultRequired() )
                 {
                     // If alarm is a FP fault and the alarm manager can transition to fault immediately, go to fault mode
-                    requestNewOperationMode( FP_MODE_FAUL );
+                    // TODO: alpha hw causing bad crc alarms when integrated with other subunits.
+                    // TODO: if 2nd event field can be used. Alarm Trigger message will still be sent with debug data.
+                    SEND_EVENT_WITH_2_U32_DATA( FP_EVENT_FAULT_ALARM_TRIGGER, (U32)alarm, 0 )
+                    //requestNewOperationMode( FP_MODE_FAUL );
                 }
             }
         }