Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rd71d1e6c2be627158cac9a8bc56adac7cdefd1c8 -ref0b3f0ec00fadc50f95e0db1a6477fb4b076ea1
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d71d1e6c2be627158cac9a8bc56adac7cdefd1c8)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ef0b3f0ec00fadc50f95e0db1a6477fb4b076ea1)
@@ -193,7 +193,7 @@
     payload.alarmsFlags |= ( almStatus.noEndTreatment ? BIT_BY_POS(6) : 0 );
     payload.alarmsFlags |= ( almStatus.bypassDialyzer ? BIT_BY_POS(7) : 0 );
 
-    memcpy( payloadPtr, &almStatus, sizeof( ALARM_COMP_STATUS_PAYLOAD_T ) );
+    memcpy( payloadPtr, &payload, sizeof( ALARM_COMP_STATUS_PAYLOAD_T ) );
 
     // serialize the message (w/ sync, CRC, and appropriate CAN padding)
     msgSize = serializeMessage( msg, data );
@@ -216,7 +216,7 @@
  * @param almData2 : 2nd data associated with alarm
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL broadcastAlarmTriggered( ALARM_ID_T alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 )
+BOOL broadcastAlarmTriggered( U16 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -227,10 +227,10 @@
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_ALARM_TRIGGERED;
-    msg.hdr.payloadLen = sizeof( ALARM_ID_T ) + sizeof( ALARM_DATA_T ) + sizeof( ALARM_DATA_T );
+    msg.hdr.payloadLen = sizeof( U16 ) + sizeof( ALARM_DATA_T ) + sizeof( ALARM_DATA_T );
 
-    memcpy( payloadPtr, &alarm, sizeof( ALARM_ID_T ) );
-    payloadPtr += sizeof( ALARM_ID_T );
+    memcpy( payloadPtr, &alarm, sizeof( U16 ) );
+    payloadPtr += sizeof( U16 );
     memcpy( payloadPtr, &almData1, sizeof( ALARM_DATA_T ) );
     payloadPtr += sizeof( ALARM_DATA_T );
     memcpy( payloadPtr, &almData2, sizeof( ALARM_DATA_T ) );
@@ -254,7 +254,7 @@
  * @param alarm : ID of alarm cleared
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL broadcastAlarmCleared( ALARM_ID_T alarm )
+BOOL broadcastAlarmCleared( U16 alarm )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -265,9 +265,9 @@
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_ALARM_CLEARED;
-    msg.hdr.payloadLen = sizeof( ALARM_ID_T );
+    msg.hdr.payloadLen = sizeof( U16 );
 
-    memcpy( payloadPtr, &alarm, sizeof( ALARM_ID_T ) );
+    memcpy( payloadPtr, &alarm, sizeof( U16 ) );
 
     // serialize the message (w/ sync, CRC, and appropriate CAN padding)
     msgSize = serializeMessage( msg, data );