Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r4828ff8bd5b5ff97f36de33101d8ca4b9e54bfa1 -r05db2649fc3ffe396ef21e1adf7939440a56e404
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 4828ff8bd5b5ff97f36de33101d8ca4b9e54bfa1)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 05db2649fc3ffe396ef21e1adf7939440a56e404)
@@ -2115,25 +2115,22 @@
  *************************************************************************/
 void handleAlarmTriggered( MESSAGE_T *message )
 {
-    if ( message->hdr.payloadLen == ( sizeof( U32 ) + sizeof( U32 ) * 2 * 2 ) )  // 2 data records w/ 2 U32s each
+    if ( message->hdr.payloadLen == sizeof( ALARM_TRIGGERED_PAYLOAD_T ) )
     {
+        ALARM_TRIGGERED_PAYLOAD_T payload;
         U08 *payloadPtr = message->payload;
-        U32 alarmID;
-        ALARM_DATA_T alm1, alm2;
 
-        memcpy( &alarmID, payloadPtr, sizeof( U32 ) );
-        payloadPtr += sizeof( U32 );
-        memcpy( &alm1.dataType, payloadPtr, sizeof( U32 ) );
-        payloadPtr += sizeof( U32 );
-        memcpy( &alm1.data, payloadPtr, sizeof( U32 ) );
-        payloadPtr += sizeof( U32 );
-        memcpy( &alm2.dataType, payloadPtr, sizeof( U32 ) );
-        payloadPtr += sizeof( U32 );
-        memcpy( &alm2.data, payloadPtr, sizeof( U32 ) );
+        memcpy( &payload, payloadPtr, sizeof( ALARM_TRIGGERED_PAYLOAD_T ) );
 
-        if ( (ALARM_ID_T)alarmID < NUM_OF_ALARM_IDS )
+        if ( (ALARM_ID_T)(payload.alarm) < NUM_OF_ALARM_IDS )
         {
-            activateAlarm2Data( (ALARM_ID_T)alarmID, alm1, alm2 );
+            ALARM_DATA_T alm1, alm2;
+
+            alm1.dataType       = (ALARM_DATA_TYPES_T)(payload.almDataType1);
+            alm1.data.uInt.data = payload.almData1;
+            alm2.dataType       = (ALARM_DATA_TYPES_T)(payload.almDataType2);
+            alm2.data.uInt.data = payload.almData2;
+            activateAlarm2Data( (ALARM_ID_T)(payload.alarm), alm1, alm2, TRUE );
         }
     }
 }
@@ -5529,6 +5526,7 @@
     if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+
         if ( FALSE == payload.reset )
         {
             result = testSetBatteryRemainingCapacityOverride( payload.state.f32 );
@@ -8357,11 +8355,8 @@
  *************************************************************************/
 void handleTestHDDialinCheckIn( MESSAGE_T* message )
 {
-    BOOL status = FALSE;
-
     if ( 0 == message->hdr.payloadLen )
     {
-        status = TRUE;
         setDialinCheckInTimeStamp();
     }
 }