Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -reff7b1575f008f81b29ef906f6346fac6012d3ab -r52863cba9685f31136ab3f4b4764a17ccf34fc05
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision eff7b1575f008f81b29ef906f6346fac6012d3ab)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
@@ -1,6 +1,6 @@
 /**************************************************************************
  *
- *  Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved.
+ *  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.
@@ -69,10 +69,10 @@
     // initialize task check-ins to false
     for ( i = 0; i < NUM_OF_TASKS; i++ )
     {
-        watchdogTaskCheckedIn[i].data = FALSE;
-        watchdogTaskCheckedIn[i].ovData = FALSE;
-        watchdogTaskCheckedIn[i].ovInitData = FALSE;
-        watchdogTaskCheckedIn[i].override = OVERRIDE_RESET;
+        watchdogTaskCheckedIn[ i ].data = FALSE;
+        watchdogTaskCheckedIn[ i ].ovData = FALSE;
+        watchdogTaskCheckedIn[ i ].ovInitData = FALSE;
+        watchdogTaskCheckedIn[ i ].override = OVERRIDE_RESET;
     }
 }
 
@@ -123,7 +123,7 @@
 {
     if ( task < NUM_OF_TASKS )
     {
-        watchdogTaskCheckedIn[task].data = TRUE;
+        watchdogTaskCheckedIn[ task ].data = TRUE;
     }
 }
 
@@ -160,8 +160,8 @@
             }
             else
             {
+                activateAlarmNoData( ALARM_ID_WATCHDOG_POST_TEST_FAILED );
                 result = SELF_TEST_STATUS_FAILED;
-                // TODO - trigger watchdog POST failure
             }
             watchdogSelfTestState = WATCHDOG_SELF_TEST_STATE_COMPLETE;
             break;
@@ -173,7 +173,7 @@
 
         default:
             result = SELF_TEST_STATUS_FAILED;
-            // TODO - s/w fault
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_WATCHDOG_INVALID_SELF_TEST_STATE, watchdogSelfTestState )
             break;
     }
 
@@ -196,7 +196,7 @@
     // initialize task check-ins to false
     for ( i = 0; i < NUM_OF_TASKS; i++ )
     {
-        watchdogTaskCheckedIn[i].data = FALSE;
+        watchdogTaskCheckedIn[ i ].data = FALSE;
     }
 }