Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r40e0116bbada6d1780bfa832a9c4684ba9fcfcc8 -red6e1e131ccb7a9a586cfb766ea270fc3cbdc1c9
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 40e0116bbada6d1780bfa832a9c4684ba9fcfcc8)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ed6e1e131ccb7a9a586cfb766ea270fc3cbdc1c9)
@@ -580,8 +580,10 @@
     {
         signalUserConfirmPatientDisconnection();
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**
@@ -599,8 +601,10 @@
     {
         signalUserConfirmDisposableRemoval();
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**
@@ -633,8 +637,10 @@
     {
         handleTreatmentLogDataRequest();
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**
@@ -643,6 +649,8 @@
  * for UI and queues the msg for transmit on the appropriate CAN channel.
  * @details Inputs: none
  * @details Outputs: Treatment log data msg constructed and queued.
+ * @param accepted T/F - was treatment log request accepted?
+ * @param reason reason why request was rejected (or zero if accepted)
  * @param logDataPtr treatment log data record pointer
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
@@ -665,6 +673,58 @@
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     return serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED );
 }
+
+/*********************************************************************//**
+ * @brief
+ * The handleUIActiveAlarmsListRequest function handles UI active alarms list request.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none.
+ *************************************************************************/
+void handleUIActiveAlarmsListRequest( MESSAGE_T *message )
+{
+    if ( 0 == message->hdr.payloadLen )
+    {
+        handleActiveAlarmListRequest();
+    }
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
+}
+
+/*********************************************************************//**
+ * @brief
+ * The sendTreatmentLogData function constructs a treatment log data message
+ * for UI and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: Treatment log data msg constructed and queued.
+ * @details Outputs: Treatment log data msg constructed and queued.
+ * @param accepted T/F - was treatment log request accepted?
+ * @param alarmList pointer to active alarms list record
+ * @param size the size of active alarms list
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendActiveAlarmsList( BOOL accepted, U32 reason, U32 *alarmList, U32 size )
+{
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_ACTIVE_ALARMS_LIST_REQUEST_RESPONSE;
+    msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( U32 ) + size;
+
+    memcpy( payloadPtr, &accepted, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &reason, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, alarmList, size );
+
+    // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+    return serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED );
+}
 
 /*********************************************************************//**
  * @brief
@@ -684,8 +744,10 @@
         memcpy( &cmd, &message->payload[0], sizeof( U32 ) );
         signalSampleWaterUserAction( (REQUESTED_SAMPLE_WATER_USER_ACTIONS_T)cmd );
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**
@@ -720,8 +782,10 @@
         memcpy( &result, &message->payload[0], sizeof( U32 ) );
         setSampleWaterResult( (BOOL) result );
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**
@@ -739,8 +803,10 @@
     {
         signalUserConfirmConsumableInstall();
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**
@@ -758,8 +824,10 @@
     {
         signalUserConfirmInstallation();
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**
@@ -777,8 +845,10 @@
     {
         signalStartPrime();
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**
@@ -811,8 +881,10 @@
     {
         signalUserContinueToTreatment();
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**
@@ -845,8 +917,10 @@
     {
         signalUserConfirmPatientConnection();
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**
@@ -878,8 +952,10 @@
     {
         signalUserStartTreatment();
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**