Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r6a8d904f4316ed9d9f2f14f99afde63bef38eace -rf760ffc4b10556e5186e9ceb90294262063440ca
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6a8d904f4316ed9d9f2f14f99afde63bef38eace)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f760ffc4b10556e5186e9ceb90294262063440ca)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      21-Dec-2022
+* @author  (last)      Sean Nash
+* @date    (last)      27-Jan-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -94,7 +94,6 @@
 U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq )
 {
     BOOL result = 0;
-    BOOL error = FALSE;
     BOOL blocked = FALSE;
     U32 msgSize = 0;
     U32 sizeMod, sizePad;
@@ -167,17 +166,13 @@
             {
                 if ( FALSE == addMsgToPendingACKList( &msg, buffer, data, msgSize ) )
                 {
-                    error = TRUE;
-                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL )
+                    SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL, (U32)(msg.hdr.msgID) )
                 }
             }
         }
 
-        if ( FALSE == error )
-        {
-            // Add serialized message data to appropriate out-going comm buffer
-            result = addToCommBuffer( buffer, data, msgSize );
-        }
+        // Add serialized message data to appropriate out-going comm buffer
+        result = addToCommBuffer( buffer, data, msgSize );
     }
     else
     {
@@ -796,14 +791,14 @@
  *************************************************************************/
 void handleUITreatmentLogDataRequest( MESSAGE_T *message )
 {
+    BOOL ack = FALSE;
+
     if ( 0 == message->hdr.payloadLen )
     {
+        ack = TRUE;
         sendTreatmentLogDataToUI();
     }
-    else
-    {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
-    }
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ack );
 }
 
 /*********************************************************************//**
@@ -3117,6 +3112,30 @@
 
 /*********************************************************************//**
  * @brief
+ * The sendFWVersionRequest function constructs a firmware version request
+ * message and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: Firmware version request msg constructed and queued.
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendFWVersionRequest( void )
+{
+    BOOL result;
+    MESSAGE_T msg;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_REQUEST_FW_VERSIONS;
+    msg.hdr.payloadLen = sizeof( UI_VERSIONS_T );  // usually UI sends this request w/ UI version info - we will leave that blank
+
+    // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_DG, ACK_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleUIVersionResponse function handles a response to request for
  * UI version information.
  * @details Inputs: none
@@ -3272,7 +3291,6 @@
  *************************************************************************/
 void handleUIConfirmationResponse( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
     U08* payloadPtr = message->payload;
 
     if ( message->hdr.payloadLen == 2 * sizeof(U32) )
@@ -3291,7 +3309,7 @@
         }
     }
 
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, result );
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
 }
 
 /*********************************************************************//**
@@ -7520,11 +7538,12 @@
  * the blood leak embedded mode command response.
  * @details Inputs: none
  * @details Outputs: blood leak embedded mode command response msg constructed and queued
+ * @param cmd: the command its response is being sent
  * @param responseLen: the length of the buffer
  * @param response: pointer to the response buffer
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL sendBloodLeakEmbeddedModeCommandResponse( U32 responseLen, U08* response )
+BOOL sendBloodLeakEmbeddedModeCommandResponse( U08 cmd, U32 responseLen, U08* response )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -7533,8 +7552,10 @@
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID      = MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE;
-    msg.hdr.payloadLen = sizeof( U32 ) + responseLen;
+    msg.hdr.payloadLen = sizeof( U08 ) + sizeof( U32 ) + responseLen;
 
+    memcpy( payloadPtr, &cmd, sizeof( U08 ) );
+    payloadPtr += sizeof( U08 );
     memcpy( payloadPtr, &responseLen, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
     memcpy( payloadPtr, response, responseLen );