Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r09e6cf9de34acf18f6e1138bf56ac0edb4821186 -r03843cd217e3beaa24f7ff17a892a44d05b43734
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 09e6cf9de34acf18f6e1138bf56ac0edb4821186)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 03843cd217e3beaa24f7ff17a892a44d05b43734)
@@ -132,8 +132,10 @@
 typedef struct
 {
     U32 alarm;                      ///< ID of alarm that was triggered
-    ALARM_DATA_T almData1;          ///< Supporting data #1
-    ALARM_DATA_T almData2;          ///< Supporting data #2
+    U32 almDataType1;               ///< Supporting data type #1
+    U32 almData1;                   ///< Supporting data #1
+    U32 almDataType2;               ///< Supporting data type #2
+    U32 almData2;                   ///< Supporting data #2
 } ALARM_TRIGGERED_PAYLOAD_T;
 
 #pragma pack(pop)