Index: WatchdogMgmt.c
===================================================================
diff -u -r7273e9a72eb54c971e4d0592d574b60fb9cecb01 -r1d8a4b375953587d3478d90ba303d54bebfc5797
--- WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 7273e9a72eb54c971e4d0592d574b60fb9cecb01)
+++ WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 1d8a4b375953587d3478d90ba303d54bebfc5797)
@@ -214,84 +214,84 @@
                 // Waiting here for w.d. test period to prevent this task from checking in - watchdog should expire
             }
 #ifdef _TD_
-            if ( PIN_SIGNAL_LOW == getCPLDSafety() )
+//            if ( PIN_SIGNAL_LOW == getCPLDSafety() )
 #else
-            if ( TBD )
+//            if ( TBD )
 #endif
-            {
-                F32 v24 = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS_1 );                     //ToDo confirmation from hardware
-                F32 audioCurrent = getFPGABackupAlarmAudioCurrent();
-
-                // Verify 24V is down when w.d. expired
-                if ( v24 > MAX_24V_LEVEL_ON_WATCHDOG_EXPIRED )
-                {
-                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_TD_WATCHDOG_POST_TEST_FAILED, 2.0F, v24 );
-                    watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
-                }
-                // Verify backup alarm audio is on when w.d. expired
-                else if ( audioCurrent < MIN_BACKUP_ALARM_CURRENT_MA )
-                {
-#ifndef _RELEASE_
+//            {
+//                F32 v24 = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS_1 );                     //ToDo confirmation from hardware
+//                F32 audioCurrent = getFPGABackupAlarmAudioCurrent();
+//
+//                // Verify 24V is down when w.d. expired
+//                if ( v24 > MAX_24V_LEVEL_ON_WATCHDOG_EXPIRED )
+//                {
+//                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_TD_WATCHDOG_POST_TEST_FAILED, 2.0F, v24 );
+//                    watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
+//                }
+//                // Verify backup alarm audio is on when w.d. expired
+//                else if ( audioCurrent < MIN_BACKUP_ALARM_CURRENT_MA )
+//                {
+//#ifndef _RELEASE_
                     //ToDo Below line have to uncomment after NVData implementation
 //                    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE )
-#endif
-                    {
-                        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_TD_WATCHDOG_POST_TEST_FAILED, 3.0F, audioCurrent );
-                        watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
-                    }
-                }
-            }
-            else
-            {
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_WATCHDOG_POST_TEST_FAILED, 1 );
-                watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
-            }
-            watchdogSelfTestTimerCount = getMSTimerCount();
-            watchdogSelfTestState = WATCHDOG_SELF_TEST_STATE_RECOVER;
+//#endif
+//                    {
+//                        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_TD_WATCHDOG_POST_TEST_FAILED, 3.0F, audioCurrent );
+//                        watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
+//                    }
+//                }
+//            }
+//            else
+//            {
+//                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_WATCHDOG_POST_TEST_FAILED, 1 );
+//                watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
+//            }
+//            watchdogSelfTestTimerCount = getMSTimerCount();
+//            watchdogSelfTestState = WATCHDOG_SELF_TEST_STATE_RECOVER;
             break;
 
         case WATCHDOG_SELF_TEST_STATE_RECOVER:
             if ( TRUE == didTimeout( watchdogSelfTestTimerCount, WATCHDOG_RECOVERY_TIME_MS ) )
             {   // Verify watchdog expired signal no longer active
 #ifdef _TD_
-                if ( PIN_SIGNAL_HIGH == getCPLDSafety() )
+//                if ( PIN_SIGNAL_HIGH == getCPLDSafety() )
 #else
-                if ( TBD )
+//                if ( TBD )
 #endif
-                {
-                    F32 v24 = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS_1 );                     //ToDo confirmation from hardware
-                    F32 audioCurrent = getFPGABackupAlarmAudioCurrent();
-
-                    // Verify 24V is down when w.d. recovered
-                    if ( v24 < MIN_24V_LEVEL_ON_WATCHDOG_RECOVER )
-                    {
-                        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_TD_WATCHDOG_POST_TEST_FAILED, 4.0F, v24 );
-                        watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
-                    }
-                    // Verify backup alarm audio is on when w.d. recovered
-                    else if ( audioCurrent > MAX_BACKUP_ALARM_CURRENT_MA )
-                    {
-#ifndef _RELEASE_
+//                {
+//                    F32 v24 = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS_1 );                     //ToDo confirmation from hardware
+//                    F32 audioCurrent = getFPGABackupAlarmAudioCurrent();
+//
+//                    // Verify 24V is down when w.d. recovered
+//                    if ( v24 < MIN_24V_LEVEL_ON_WATCHDOG_RECOVER )
+//                    {
+//                        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_TD_WATCHDOG_POST_TEST_FAILED, 4.0F, v24 );
+//                        watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
+//                    }
+//                    // Verify backup alarm audio is on when w.d. recovered
+//                    else if ( audioCurrent > MAX_BACKUP_ALARM_CURRENT_MA )
+//                    {
+//#ifndef _RELEASE_
                         //ToDo Below line have to uncomment after NVData implementation
 //                        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE )
-#endif
-                        {
-                            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_TD_WATCHDOG_POST_TEST_FAILED, 5.0F, audioCurrent );
-                            watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
-                        }
-                    }
-                    else
-                    {
-                        watchdogSelfTestStatus = SELF_TEST_STATUS_PASSED;
-                    }
-                }
-                else
-                {
-                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_WATCHDOG_POST_TEST_FAILED, 6 );
-                    watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
-                }
-                result = watchdogSelfTestStatus;
-                watchdogSelfTestState = WATCHDOG_SELF_TEST_STATE_COMPLETE;
+//#endif
+//                        {
+//                            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_TD_WATCHDOG_POST_TEST_FAILED, 5.0F, audioCurrent );
+//                            watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
+//                        }
+//                    }
+//                    else
+//                    {
+//                        watchdogSelfTestStatus = SELF_TEST_STATUS_PASSED;
+//                    }
+//                }
+//                else
+//                {
+//                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_WATCHDOG_POST_TEST_FAILED, 6 );
+//                    watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
+//                }
+//                result = watchdogSelfTestStatus;
+//                watchdogSelfTestState = WATCHDOG_SELF_TEST_STATE_COMPLETE;
             }
             break;