Index: AlarmMgmt.c
===================================================================
diff -u -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57 -r68babd71d4e4fe088d302e4bf022868e23a88f40
--- AlarmMgmt.c	(.../AlarmMgmt.c)	(revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57)
+++ AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 68babd71d4e4fe088d302e4bf022868e23a88f40)
@@ -19,8 +19,12 @@
 
 #define __ALARM_MGMT_C__
 
-#include "Messaging.h"
+#ifdef _RO_
+#include "FPOperationModes.h"
+#else
 #include "OperationModes.h"
+#endif
+#include "Messaging.h"
 #include "TaskGeneral.h"
 #include "Timers.h"
 
@@ -199,12 +203,13 @@
             alarmIsDetected[ alarm ] = FALSE;
 #ifdef _TD_
             broadcastData( MSG_ID_ALARM_CONDITION_CLEARED, COMM_BUFFER_OUT_CAN_TD_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) );
+            handleAutoResumeAlarm( alarm );
 #endif
 #ifdef _DD_
             broadcastData( MSG_ID_ALARM_CONDITION_CLEARED, COMM_BUFFER_OUT_CAN_DD_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) );
 #endif
 #ifdef _RO_
-            broadcastData( MSG_ID_ALARM_CONDITION_CLEARED, COMM_BUFFER_OUT_CAN_RO_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) );
+            broadcastData( MSG_ID_ALARM_CONDITION_CLEARED, COMM_BUFFER_OUT_CAN_FP_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) );
 #endif
         }
     }
@@ -257,7 +262,7 @@
                 broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_DD_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) );
 #endif
 #ifdef _RO_
-                broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_RO_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) );
+                broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_FP_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) );
 #endif
             }
         }
@@ -455,7 +460,7 @@
                 clearAlarmDD( (ALARM_ID_T)alarmID );
 #endif
 #ifdef _RO_
-                clearAlarmRO( (ALARM_ID_T)alarmID );
+                clearAlarmFP( (ALARM_ID_T)alarmID );
 #endif
             }
             result = TRUE;