Index: AlarmMgmt.c
===================================================================
diff -u -r6d80d69a210f45c733e5307859351f2cd820a8e7 -ra63f636c18858c8444d3e4908bb19755b4f2be27
--- AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 6d80d69a210f45c733e5307859351f2cd820a8e7)
+++ AlarmMgmt.c	(.../AlarmMgmt.c)	(revision a63f636c18858c8444d3e4908bb19755b4f2be27)
@@ -141,7 +141,7 @@
     }
     else
     {
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE, alarm )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE3, alarm )
     }
 }
 
@@ -205,7 +205,7 @@
     }
     else
     {
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR, alarm )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR2, alarm )
     }
 }
 
@@ -257,7 +257,7 @@
     }
     else
     {
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED, (U32)alarm );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED1, (U32)alarm );
     }
 
     return result;
@@ -285,7 +285,7 @@
     }
     else
     {
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED, (U32)alarm );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED2, (U32)alarm );
     }
 
     return result;
Index: FPGA.c
===================================================================
diff -u -r6d80d69a210f45c733e5307859351f2cd820a8e7 -ra63f636c18858c8444d3e4908bb19755b4f2be27
--- FPGA.c	(.../FPGA.c)	(revision 6d80d69a210f45c733e5307859351f2cd820a8e7)
+++ FPGA.c	(.../FPGA.c)	(revision a63f636c18858c8444d3e4908bb19755b4f2be27)
@@ -379,7 +379,7 @@
         default:
             if ( fpgaState >= NUM_OF_FPGA_STATES )
             {
-//                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_INVALID_IN_STATE, fpgaState )
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_INVALID_IN_STATE, fpgaState )
             }
             else
             {
@@ -423,7 +423,7 @@
         default:
             if ( fpgaState >= NUM_OF_FPGA_STATES )
             {
-//                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_INVALID_OUT_STATE, fpgaState )
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_INVALID_OUT_STATE, fpgaState )
             }
             else
             {
@@ -703,7 +703,7 @@
     }
     else
     {
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_WRITE_CMD_TOO_MUCH_DATA, bytes2Transmit )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_WRITE_CMD_TOO_MUCH_DATA, bytes2Transmit )
     }
 }
 
@@ -740,7 +740,7 @@
     }
     else
     {
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_WRITE_RSP_TOO_MUCH_DATA, bytes2Receive )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_WRITE_RSP_TOO_MUCH_DATA, bytes2Receive )
     }
 }
 
@@ -777,7 +777,7 @@
     }
     else
     {
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_READ_CMD_TOO_MUCH_DATA, bytes2Transmit )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_READ_CMD_TOO_MUCH_DATA, bytes2Transmit )
     }
 }
 
@@ -814,7 +814,7 @@
     }
     else
     {
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_READ_RSP_TOO_MUCH_DATA, bytes2Receive )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_READ_RSP_TOO_MUCH_DATA, bytes2Receive )
     }
 }
 
Index: PersistentAlarm.c
===================================================================
diff -u -r6d80d69a210f45c733e5307859351f2cd820a8e7 -ra63f636c18858c8444d3e4908bb19755b4f2be27
--- PersistentAlarm.c	(.../PersistentAlarm.c)	(revision 6d80d69a210f45c733e5307859351f2cd820a8e7)
+++ PersistentAlarm.c	(.../PersistentAlarm.c)	(revision a63f636c18858c8444d3e4908bb19755b4f2be27)
@@ -100,9 +100,9 @@
    else
    {
 #ifdef _DD_
-//       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX, alarmId );
+//       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX1, alarmId );
 #else
-//       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX, alarmId );
+       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX1, alarmId );
 #endif
    }
 }
@@ -183,9 +183,9 @@
     else
     {
 #ifdef _DD_
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX, alarmId );
+//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX2, alarmId );
 #else
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX, alarmId );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX2, alarmId );
 #endif
     }
 
@@ -226,10 +226,10 @@
     else
     {
 #ifdef _DD_
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX, alarmId )
+//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX3, alarmId )
 #endif
 #ifdef _TD_
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX, alarmId )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX3, alarmId )
 #endif
     }
 
@@ -307,10 +307,10 @@
     else
     {
 #ifdef _DD_
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED, (U32)group )
+//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED1, (U32)group )
 #endif
 #ifdef _TD_
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED, (U32)group )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED1, (U32)group )
 #endif
     }
 }
@@ -340,10 +340,10 @@
     else
     {
 #ifdef _DD_
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED, (U32)group )
+//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED2, (U32)group )
 #endif
 #ifdef _TD_
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED, (U32)group )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED2, (U32)group )
 #endif
     }
 }
@@ -377,10 +377,10 @@
 
         default:
 #ifdef _DD_
-//            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_ERROR_GROUP_SELECTED, errorType )
+//            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED3, errorType )
 #endif
 #ifdef _TD_
-//            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_ERROR_GROUP_SELECTED, errorType )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED3, errorType )
 #endif
             break;
     }
Index: SystemComm.c
===================================================================
diff -u -rfc0b755338e1ccd0cabe1965daf4ce2bd78c92e7 -ra63f636c18858c8444d3e4908bb19755b4f2be27
--- SystemComm.c	(.../SystemComm.c)	(revision fc0b755338e1ccd0cabe1965daf4ce2bd78c92e7)
+++ SystemComm.c	(.../SystemComm.c)	(revision a63f636c18858c8444d3e4908bb19755b4f2be27)
@@ -234,7 +234,7 @@
     else
     {
         // Should not get here - not an active message box
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX, srcCANBox )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX, srcCANBox )
     }
 }
 
@@ -359,12 +359,12 @@
             else
             {
                 signalCANXmitsCompleted();
-//                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_CMMM_CAN_TRANSMIT_REJECTED, (U32)mBox )
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_CMMM_CAN_TRANSMIT_REJECTED, (U32)mBox )
             }
         }
         else
         {
-//            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_COMM_INVALID_FRAME_SIZE, ((U32)buffer << 16) | dataSize )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_COMM_INVALID_FRAME_SIZE, ((U32)buffer << 16) | dataSize )
         }
     }
 
@@ -608,7 +608,7 @@
 {
     if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_BAD_MSG_CRC ) )
     {
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS, (U32)ALARM_SOURCE_HD );
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_COMM_TOO_MANY_BAD_CRCS, (U32)ALARM_SOURCE_HD );
     }
 }
 
@@ -724,11 +724,11 @@
 
                 if ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_TD_2_DD )
                 {
-//                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_BY_UI, (U32)msgID );
+                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_CAN_MESSAGE_NOT_ACKED_BY_UI, (U32)msgID );
                 }
                 else
                 {
-//                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_BY_DD, (U32)msgID );
+                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_CAN_MESSAGE_NOT_ACKED_BY_DD, (U32)msgID );
                 }
                 pendingAckList[ i ].used = FALSE;  // Take pending message off of list
             }
Index: TestSupport.c
===================================================================
diff -u -r6d80d69a210f45c733e5307859351f2cd820a8e7 -ra63f636c18858c8444d3e4908bb19755b4f2be27
--- TestSupport.c	(.../TestSupport.c)	(revision 6d80d69a210f45c733e5307859351f2cd820a8e7)
+++ TestSupport.c	(.../TestSupport.c)	(revision a63f636c18858c8444d3e4908bb19755b4f2be27)
@@ -182,10 +182,10 @@
     else
     {
 #ifdef _DD_
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_DG_INVALID_TEST_CONFIG_SELECTED, config )
+//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_DG_INVALID_TEST_CONFIG_SELECTED1, config )
 #endif
 #ifdef _TD_
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_TEST_CONFIG_SELECTED, config )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_TEST_CONFIG_SELECTED1, config )
 #endif
     }
 
@@ -213,10 +213,10 @@
     else
     {
 #ifdef _DD_
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_DG_INVALID_TEST_CONFIG_SELECTED, config )
+//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_DG_INVALID_TEST_CONFIG_SELECTED2, config )
 #endif
 #ifdef _TD_
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_TEST_CONFIG_SELECTED, config )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_TEST_CONFIG_SELECTED2, config )
 #endif
     }
 
Index: Utilities.c
===================================================================
diff -u -r6d80d69a210f45c733e5307859351f2cd820a8e7 -ra63f636c18858c8444d3e4908bb19755b4f2be27
--- Utilities.c	(.../Utilities.c)	(revision 6d80d69a210f45c733e5307859351f2cd820a8e7)
+++ Utilities.c	(.../Utilities.c)	(revision a63f636c18858c8444d3e4908bb19755b4f2be27)
@@ -397,15 +397,15 @@
 #ifdef _DD_
 //            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_INVALID_WIN_MAX_COUNT, maxCnt )
 #else
-//            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_INVALID_WIN_MAX_COUNT, maxCnt )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_INVALID_WIN_MAX_COUNT, maxCnt )
 #endif
         }
         else
         {
 #ifdef _DD_
 //            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_INVALID_WIN_COUNT, cnt )
 #else
-//            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_INVALID_WIN_COUNT, cnt )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_INVALID_WIN_COUNT, cnt )
 #endif
         }
     }
@@ -450,7 +450,7 @@
 #ifdef _DD_
 //        SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_TIME_WINDOWED_COUNT_ERROR, cnt );
 #else
-//        SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_TIME_WINDOWED_COUNT_ERROR, cnt );
+        SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_TIME_WINDOWED_COUNT_ERROR, cnt );
 #endif
     }
 
@@ -486,7 +486,7 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_CRITICAL_DATA_ERROR, (U32)&data[0], 0 )
 #else
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_CRITICAL_DATA_ERROR, (U32)&data[0], 0 )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_CRITICAL_DATA_ERROR, (U32)&data[0], 0 )
 #endif
     }
 
@@ -565,7 +565,7 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_CRITICAL_DATA_ERROR, (U32)&data[0], 1 )
 #else
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_CRITICAL_DATA_ERROR, (U32)&data[0], 1 )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_CRITICAL_DATA_ERROR, (U32)&data[0], 1 )
 #endif
     }
 
@@ -705,7 +705,7 @@
 //        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT, (U32)s )
 #endif
 #ifdef _TD_
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT, (U32)s )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT, (U32)s )
 #endif
     }
     _enable_IRQ();
Index: WatchdogMgmt.c
===================================================================
diff -u -r6d80d69a210f45c733e5307859351f2cd820a8e7 -ra63f636c18858c8444d3e4908bb19755b4f2be27
--- WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 6d80d69a210f45c733e5307859351f2cd820a8e7)
+++ WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision a63f636c18858c8444d3e4908bb19755b4f2be27)
@@ -270,7 +270,7 @@
 
         default:
             result = SELF_TEST_STATUS_FAILED;
-//            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_WATCHDOG_INVALID_SELF_TEST_STATE, watchdogSelfTestState )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_WATCHDOG_INVALID_SELF_TEST_STATE, watchdogSelfTestState )
             break;
     }
 
@@ -360,7 +360,7 @@
     else
     {
 #ifdef _TD_
-        //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, TBD, task )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_WATCHDOG_INVALID_TASK, task )
 #endif
 #ifdef _DD_
         //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, TBD, task )