Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd -r0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f)
@@ -1,21 +1,21 @@
-/**************************************************************************
- *
- *  Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
- *
- *  THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
- *  WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
- *
- *  @file WatchdogMgmt.c
- *
- *  @date 20-Sep-2019
- *  @author S. Nash
- *
- *  @brief Monitor for the off and stop buttons.
- *
- **************************************************************************/
+/**************************************************************************
+*
+* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+*
+* THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+* WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+*
+* @file WatchdogMgmt.c
+*
+* @author (last) Quang Nguyen
+* @date (last) 21-Jul-2020
+*
+* @author (original) Dara Navaei
+* @date (original) 05-Nov-2019
+*
+***************************************************************************/
 
 #include "CPLD.h"
-#include "SafetyShutdown.h"
 #include "SystemCommMessages.h"
 #include "Timers.h"
 #include "WatchdogMgmt.h"
@@ -112,7 +112,6 @@
         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
         }
@@ -193,7 +192,7 @@
 
         default:
             result = SELF_TEST_STATUS_FAILED;
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_WATCHDOG_INVALID_SELF_TEST_STATE, watchdogSelfTestState )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_WATCHDOG_INVALID_SELF_TEST_STATE, watchdogSelfTestState )
             break;
     }
 
@@ -272,10 +271,8 @@
  *************************************************************************/
 static void petWatchdog( void )
 {
-#ifndef RM46_EVAL_BOARD_TARGET
     // pulse the watchdog signal
     toggleCPLDWatchdog();
-#endif
 
     // remember when we last pet the watchdog
     lastWatchdogPetTime = getMSTimerCount();