Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -rf308cc4c35eab630ebbbde405cfe47d049afeafb
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision a7bf3ca23ea37a61000379facae628a31b3ecc59)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision f308cc4c35eab630ebbbde405cfe47d049afeafb)
@@ -7,8 +7,8 @@
 *
 * @file WatchdogMgmt.c
 *
-* @author (last) Sean
-* @date (last) 30-Apr-2020
+* @author (last) Quang Nguyen
+* @date (last) 21-Jul-2020
 *
 * @author (original) Dara Navaei
 * @date (original) 05-Nov-2019
@@ -58,7 +58,6 @@
  * @details
  * Inputs : none
  * Outputs : Watchdog mgmt. module initialized.
- * @param none
  * @return none
  *************************************************************************/
 void initWatchdogMgmt( void )
@@ -85,7 +84,6 @@
  * @details
  * Inputs : none
  * Outputs :
- * @param none
  * @return none
  *************************************************************************/
 void execWatchdogMgmt( void )
@@ -125,7 +123,7 @@
  * @details
  * Inputs : none
  * Outputs : task is checked in with the watchdog mgmt..
- * @param task : the task that is checking in with the watchdog mgmt.
+ * @param task the task that is checking in with the watchdog mgmt
  * @return none
  *************************************************************************/
 void checkInWithWatchdogMgmt( TASK_T task )
@@ -144,7 +142,6 @@
  * @details
  * Inputs :
  * Outputs :
- * @param none
  * @return in progress, passed, or failed
  *************************************************************************/
 SELF_TEST_STATUS_T execWatchdogTest( void )
@@ -192,7 +189,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;
     }
 
@@ -205,7 +202,6 @@
  * @details
  * Inputs : none
  * Outputs : watchdogTaskCheckedIn[] array reset to all false.
- * @param none
  * @return none
  *************************************************************************/
 static void resetWDTaskCheckIns( void )
@@ -226,7 +222,6 @@
  * @details
  * Inputs : watchdogTaskCheckedIn[]
  * Outputs : none
- * @param none
  * @return TRUE if all tasks have checked in since last watchdog pet, FALSE if not.
  *************************************************************************/
 static BOOL haveAllTasksCheckedIn( void )
@@ -254,7 +249,7 @@
  * @details
  * Inputs : watchdogTaskCheckedIn[]
  * Outputs : none
- * @param task : ID of task to check
+ * @param task ID of task to check
  * @return TRUE if given task has checked in, FALSE if not
  *************************************************************************/
 static DATA_ARRAY_GET( BOOL, hasTaskGeneralCheckedIn, task, NUM_OF_TASKS-1, watchdogTaskCheckedIn, FALSE )
@@ -266,7 +261,6 @@
  * @details
  * Inputs : none
  * Outputs : CPLD WD pet signal is pulsed
- * @param none
  * @return none
  *************************************************************************/
 static void petWatchdog( void )
@@ -293,8 +287,8 @@
  * @details
  * Inputs : none
  * Outputs : watchdogTaskCheckedIn[]
- * @param task : ID of task to override check-in state for
- * @param value : override state for the given task ID
+ * @param task ID of task to override check-in state for
+ * @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 )