Index: WatchdogMgmt.c
===================================================================
diff -u -rcc8db062292cdcbdb29e4174af5976ccf150d0c0 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de
--- WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision cc8db062292cdcbdb29e4174af5976ccf150d0c0)
+++ WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de)
@@ -24,13 +24,9 @@
 #include "FpgaDD.h"
 #include "SafetyShutdown.h"
 #include "OperationModes.h"
-#endif
-#ifdef _RO_
-#include "FpgaFP.h"
-#include "SafetyShutdown.h"
 #include "FPOperationModes.h"
 #endif
-//#include "InternalADC.h"
+#include "InternalADC.h"
 #include "Messaging.h"
 #include "Timers.h"
 #include "WatchdogMgmt.h"
@@ -127,10 +123,6 @@
 // TODO : clean up once we get the clarity
     PIN_SIGNAL_STATE_T safetyShutdownFeedbackSignal = PIN_SIGNAL_HIGH;
 #endif
-#ifdef _RO_
-// TODO : clean up once we get the clarity
-    PIN_SIGNAL_STATE_T safetyShutdownFeedbackSignal = PIN_SIGNAL_HIGH;
-#endif
     PIN_SIGNAL_STATE_T safetyShutdownSoftwareCmd    = ( TRUE == isSafetyShutdownActivated() ? PIN_SIGNAL_LOW : PIN_SIGNAL_HIGH );
 
     // Called by background task, so give bg task credit for checking in
@@ -153,10 +145,6 @@
     // Check to see if watchdog has expired or safety shutdown feedback does not match s/w command (only after POST completed)
     if ( ( safetyShutdownSoftwareCmd != safetyShutdownFeedbackSignal ) && ( getCurrentOperationMode() != DD_MODE_INIT ) )
 #endif
-#ifdef _RO_
-    // Check to see if watchdog has expired or safety shutdown feedback does not match s/w command (only after POST completed)
-    if ( ( safetyShutdownSoftwareCmd != safetyShutdownFeedbackSignal ) && ( getCurrentOperationMode() != FP_MODE_INIT ) )
-#endif
     {
         if ( ( PIN_SIGNAL_LOW == safetyShutdownFeedbackSignal ) || ( TRUE == didTimeout( safetyShutdownFeedbackMismatchTS, MAX_SAFETY_SHUTDOWN_MISMATCH_MS ) ) )
         {
@@ -166,9 +154,6 @@
 #ifdef _DD_
             activateAlarmNoData( ALARM_ID_DD_WATCHDOG_EXPIRED );
 #endif
-#ifdef _RO_
-            //activateAlarmNoData( ALARM_ID_RO_WATCHDOG_EXPIRED );
-#endif
         }
     }
     else
@@ -412,9 +397,6 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_WATCHDOG_INVALID_TASK, task )
 #endif
-#ifdef _RO_
-        //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, TBD, task )
-#endif
     }
 
     return result;