Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r62edd712238d8f8406e1e20e7cc218676d2470b2 -r99ec83eff4683ad69a249f935d74cb9226984d21
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 62edd712238d8f8406e1e20e7cc218676d2470b2)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 99ec83eff4683ad69a249f935d74cb9226984d21)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      03-Jan-2023
+* @author  (last)      Sean Nash
+* @date    (last)      13-Mar-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 );
 }
 
 /*********************************************************************//**
@@ -2375,7 +2370,7 @@
         FLOW_SENSORS_DATA_T payload;
 
         memcpy( &payload, message->payload, sizeof( FLOW_SENSORS_DATA_T ) );
-        setDialysateFlowData( payload.dialysateFlowRateLPM );
+        setDialysateFlowData( payload );
     }
 }
 
@@ -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
@@ -3298,10 +3317,10 @@
  * The sendConfirmationRequest function sends a confirmation request to UI
  * @details Inputs: none
  * @details Outputs: none
- * @param request ID
- * @param request type
- * @param reject reason
- * @return request ID - will be non-zero if sent
+ * @param request_id ID of confirmation being requested
+ * @param request_type Type of confirmation being requested
+ * @param reject_reason Reason Reason for reject if type is reject
+ * @return none
  *************************************************************************/
 void sendConfirmationRequest( GENERIC_CONFIRM_ID_T request_id, GENERIC_CONFIRM_COMMAND_T request_type, U32 reject_reason )
 {
@@ -5033,13 +5052,13 @@
  *************************************************************************/
 void handleSetBloodLeakStatusOverrideRequest( MESSAGE_T *message )
 {
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    TEST_OVERRIDE_PAYLOAD_T payload;
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
             result = testSetBloodLeakStatusOverride( (BLOOD_LEAK_STATUS_T)( payload.state.u32 ) );
@@ -5252,11 +5271,11 @@
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
-            result = testSetBatteryRemainingPercentOverride( payload.state.f32 );
+            result = testSetBatteryRemainingCapacityOverride( payload.state.f32 );
         }
         else
         {
-            result = testResetSetBatteryRemainingPercentOverride();
+            result = testResetBatteryRemainingCapacityOverride();
         }
     }
 
@@ -7760,4 +7779,164 @@
      sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleHDRTCControlReg1StatusOverrideRequest function handles a
+ * request to override RTC control register 1.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleHDRTCControlReg1StatusOverrideRequest( MESSAGE_T * message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetRTCCtlReg1Status( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetRTCCtlReg1Status();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleHDRTCControlReg3StatusOverrideRequest function handles a
+ * request to override RTC control register 3.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleHDRTCControlReg3StatusOverrideRequest( MESSAGE_T * message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetRTCCtlReg3Status( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetRTCCtlReg3Status();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleBatteryStatusOverrideRequest function handles a
+ * request to override battery status.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleBatteryStatusOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetBatteryStatusOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetBatteryStatusOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleBatteryChargerStatusOverrideRequest function handles a
+ * request to override battery charger status.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleBatteryChargerStatusOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetBatteryChargerStatusOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetBatteryChargerStatusOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleBatteryStatusOverrideRequest function handles a
+ * request to override battery status.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleBatteryI2CStatusOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetBatteryI2CStatusOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetBatteryI2CStatusOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /**@}*/