Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -ra9315539f527b92523b1598ff91e47db4d71dae2 -rc65551beea443f6fb5a50c5be5af73c97fe77cf5
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision a9315539f527b92523b1598ff91e47db4d71dae2)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision c65551beea443f6fb5a50c5be5af73c97fe77cf5)
@@ -273,9 +273,11 @@
     // Publish voltages monitor data on interval
     if ( ++alarmInfoPublicationTimerCounter >= getU32OverrideValue( &alarmInfoPublishInterval ) )
     {
-        U32 safetyActivated = (U32)isSafetyShutdownActivated();
+        SAFETY_SHUTDOWN_ACTIVATION_DATA_T data;
 
-        broadcastData( MSG_ID_DG_ALARM_INFO, COMM_BUFFER_OUT_CAN_DG_ALARM, (U08*)&safetyActivated, sizeof( U32 ) );
+        data.safetyShutdownStatus = (U32)isSafetyShutdownActivated();
+
+        broadcastData( MSG_ID_DG_ALARM_INFO, COMM_BUFFER_OUT_CAN_DG_ALARM, (U08*)&data, sizeof( SAFETY_SHUTDOWN_ACTIVATION_DATA_T ) );
         alarmInfoPublicationTimerCounter = 0;
     }
 }
@@ -401,9 +403,11 @@
             {
                 if ( TRUE == alarmIsActive[ a ] )
                 {
-                    U32 al = (U32)a;
+                    ALARM_NAME_DATA_T data;
 
-                    broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_DG_ALARM, (U08*)&al, sizeof( U32 ) );
+                    data.alarmName = (U32)a;
+
+                    broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_DG_ALARM, (U08*)&data, sizeof( ALARM_NAME_DATA_T ) );
                     alarmIsActive[ a ] = FALSE;
                 }
             }