Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r6d2d8f0267c57135554e5a1acaca9aef37f27949 -r0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 6d2d8f0267c57135554e5a1acaca9aef37f27949)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f)
@@ -1,20 +1,19 @@
-/**********************************************************************//**
- *
- *  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 Timers.c
- *
- *  @date 07-Nov-2019
- *  @author S. Nash
- *
- *  @brief Alarm Management service module.  Provides general alarm management \n
- *  functionality including support functions for triggering and clearing \n
- *  specific alarms.
- *
- **************************************************************************/
+/**************************************************************************
+*
+* 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 AlarmMgmt.c
+*
+* @author (last) Quang Nguyen
+* @date (last) 22-Jul-2020
+*
+* @author (original) Sean
+* @date (original) 04-Feb-2020
+*
+***************************************************************************/
 
 #include "AlarmMgmt.h"
 #include "OperationModes.h"
@@ -40,7 +39,6 @@
 // ********** private function prototypes **********
 
 static void activateAlarm( ALARM_ID_T alarm );
-
 static DATA_ARRAY_GET_PROTOTYPE( BOOL, getAlarmActive, alarmID );
 
 /*************************************************************************
@@ -100,19 +98,11 @@
         {
             // activate alarm
             alarmIsActive[ alarm ].data = TRUE;
-#ifdef DEBUG_ENABLED
-            {
-                // TODO - temporary debug code - remove later
-                char debugStr[ 256 ];
-                sprintf( debugStr, "ALARM triggered:%5d \n", alarm );
-                sendDebugData( (U08*)debugStr, strlen(debugStr) );
-            }
-#endif
         }
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE, alarm )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE, alarm )
     }
 }
 
@@ -136,6 +126,16 @@
         broadcastAlarmTriggered( (U16)alarm, blankAlarmData, blankAlarmData );
     }
     activateAlarm( alarm );
+#ifdef DEBUG_ENABLED
+#ifdef ALARMS_DEBUG
+    {
+        // TODO - temporary debug code - remove later
+        char debugStr[ 256 ];
+        sprintf( debugStr, "ALARM triggered:%5d \n", alarm );
+        sendDebugData( (U08*)debugStr, strlen(debugStr) );
+    }
+#endif
+#endif
 }
 
 /*************************************************************************
@@ -158,6 +158,16 @@
         broadcastAlarmTriggered( (U16)alarm, alarmData, blankAlarmData );
     }
     activateAlarm( alarm );
+#ifdef DEBUG_ENABLED
+#ifdef ALARMS_DEBUG
+    {
+        // TODO - temporary debug code - remove later
+        char debugStr[ 256 ];
+        sprintf( debugStr, "ALARM triggered:%5d %8X \n", alarm, alarmData.data.uInt.data );
+        sendDebugData( (U08*)debugStr, strlen(debugStr) );
+    }
+#endif
+#endif
 }
 
 /*************************************************************************
@@ -181,6 +191,16 @@
         broadcastAlarmTriggered( (U16)alarm, alarmData1, alarmData2 );
     }
     activateAlarm( alarm );
+#ifdef DEBUG_ENABLED
+#ifdef ALARMS_DEBUG
+    {
+        // TODO - temporary debug code - remove later
+        char debugStr[ 256 ];
+        sprintf( debugStr, "ALARM triggered:%5d %8X %8X \n", alarm, alarmData1.data.uInt.data, alarmData2.data.uInt.data );
+        sendDebugData( (U08*)debugStr, strlen(debugStr) );
+    }
+#endif
+#endif
 }
 
 /*************************************************************************
@@ -203,11 +223,21 @@
         {
             broadcastAlarmCleared( alarm );
             alarmIsActive[ alarm ].data = FALSE;
+#ifdef DEBUG_ENABLED
+#ifdef ALARMS_DEBUG
+            {
+                // TODO - temporary debug code - remove later
+                char debugStr[ 256 ];
+                sprintf( debugStr, "ALARM cleared:%5d \n", alarm );
+                sendDebugData( (U08*)debugStr, strlen(debugStr) );
+            }
+#endif
+#endif
         }
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR, alarm )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR, alarm )
     }
 }
 
@@ -307,6 +337,3 @@
 
     return result;
 }
-
-
-