Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r2c9bbece8057254f8389c26a818081002fb69a77 -r03843cd217e3beaa24f7ff17a892a44d05b43734
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 2c9bbece8057254f8389c26a818081002fb69a77)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 03843cd217e3beaa24f7ff17a892a44d05b43734)
@@ -340,8 +340,10 @@
         ALARM_TRIGGERED_PAYLOAD_T data;
 
         data.alarm = (U32)alarm;
-        data.almData1 = alarmData1;
-        data.almData2 = alarmData2;
+        data.almDataType1 = (U32)alarmData1.dataType;
+        data.almData1 = alarmData1.data.uInt.data;
+        data.almDataType2 = (U32)alarmData2.dataType;
+        data.almData2 = alarmData2.data.uInt.data;
 
         broadcastData( MSG_ID_ALARM_TRIGGERED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_TRIGGERED_PAYLOAD_T ) );
         // Send information for UI to log to treatment log