Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -rf7e3018ec6ab762fe08efb42b21fb2ca970174b0 -r45dc997839adb0eb305d6a82f5e17459e6e3eb05
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision f7e3018ec6ab762fe08efb42b21fb2ca970174b0)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 45dc997839adb0eb305d6a82f5e17459e6e3eb05)
@@ -14,7 +14,6 @@
  *
  **************************************************************************/
 
-#include "Common.h"
 #include "CPLD.h"
 #include "SafetyShutdown.h"
 #include "SystemCommMessages.h"
@@ -105,19 +104,23 @@
         petWatchdog();
         resetWDTaskCheckIns();
     }
-
+#ifndef RM46_EVAL_BOARD_TARGET
     // check to see if watchdog has expired
+#ifndef BREADBOARD_TARGET
+    if ( getCPLDWatchdogExpired() == PIN_SIGNAL_LOW )
+#else
     if ( getCPLDWatchdogExpired() == PIN_SIGNAL_HIGH )
+#endif
     {
         // ignore expired watchdog until after watchdog POST
         if ( WATCHDOG_SELF_TEST_STATE_COMPLETE == watchdogSelfTestState )
         {
 #ifndef DEBUG_ENABLED
-            activateSafetyShutdown();   // TODO - restore these - commented out now so that we don't get WD error with breakpoints while debugging
             activateAlarmNoData( ALARM_ID_WATCHDOG_EXPIRED );
 #endif
         }
     }
+#endif
 }
 
 /*************************************************************************
@@ -301,26 +304,4 @@
  * @param value : override state for the given task ID
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_ARRAY_OVERRIDE_FUNC( BOOL, testSetWatchdogTaskCheckInOverride, testResetWatchdogTaskCheckInOverride, watchdogTaskCheckedIn, task, NUM_OF_TASKS-1 )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+DATA_ARRAY_OVERRIDE_FUNC( BOOL, testSetWatchdogTaskCheckInOverride, testResetWatchdogTaskCheckInOverride, watchdogTaskCheckedIn, task, NUM_OF_TASKS )