Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r46b163d19c65e8c21db7b0247bbb1af0dba1ece5 -r38ae50a0d448d90c876fb9a38f24a488d315e119
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 46b163d19c65e8c21db7b0247bbb1af0dba1ece5)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 38ae50a0d448d90c876fb9a38f24a488d315e119)
@@ -8,7 +8,7 @@
 * @file    SystemCommMessages.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      22-Sep-2022
+* @date    (last)      18-Oct-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -36,13 +36,15 @@
 #include "SystemComm.h"
 #include "SystemCommMessages.h"
 #include "Temperatures.h"
+#include "Timers.h"
 #include "TreatmentEnd.h"
 #include "TreatmentRecirc.h"
 #include "TreatmentStop.h"
 #include "Utilities.h"
 #include "Valves.h"
 #include "WatchdogMgmt.h"
 #include "HDDefs.h"
+#include "TaskPriority.h"
 
 /**
  *  @addtogroup SystemCommMessages
@@ -62,9 +64,9 @@
 #pragma pack(pop)
 
 // ********** private data **********
-
 static BOOL testerLoggedIn = FALSE;                         ///< Flag indicates whether an external tester (connected PC) has sent a valid login message.
 static volatile U16 nextSeqNo = 1;                          ///< Value of sequence number to use for next transmitted message.
+
 /// List of message IDs that are requested not to be transmitted.
 static BLOCKED_MSGS_DATA_T blockedMessagesForXmit = { 0, 0, 0, 0, 0, 0, 0, 0 };
 
@@ -2335,8 +2337,6 @@
         memcpy( &payload, message->payload, sizeof( TEMPERATURE_SENSORS_DATA_T ) );
         setDialysateTemperatureReadings( payload.inletDialysate, payload.outletRedundant );
     }
-    // TODO - what to do if invalid payload length?
-    // TODO - how to know if DG stops sending these?
 }
 
 /*********************************************************************//**
@@ -3236,7 +3236,73 @@
     serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleUIConfirmationResponse function handles a UI response for
+ * confirmation request.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleUIConfirmationResponse( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+    U08* payloadPtr = message->payload;
 
+    if ( message->hdr.payloadLen == 2 * sizeof(U32) )
+    {
+        U32 request_id;
+        U32 status;
+
+        memcpy( &request_id, payloadPtr, sizeof(U32) );
+        payloadPtr += sizeof(U32);
+        memcpy( &status, payloadPtr, sizeof(U32) );
+
+        if ( ( CONFIRMATION_REQUEST_STATUS_REJECTED == status ) ||
+             ( CONFIRMATION_REQUEST_STATUS_ACCEPTED == status ) )
+        {
+            setConfirmationRequestStatus( (GENERIC_CONFIRM_ID_T) request_id, (CONFIRMATION_REQUEST_STATUS_T) status );
+        }
+    }
+
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * 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
+ *************************************************************************/
+void sendConfirmationRequest( GENERIC_CONFIRM_ID_T request_id, GENERIC_CONFIRM_COMMAND_T request_type, U32 reject_reason )
+{
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+    U32 temp_request = request_id;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_REQUEST_UI_CONFIRMATION;
+    // The payload length is U32 Request ID, U32 Type, U32 Reject Reason
+    msg.hdr.payloadLen = 3 * sizeof( U32 );
+
+    memcpy( payloadPtr, &temp_request, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    temp_request = request_type;
+    memcpy( payloadPtr, &temp_request, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &reject_reason, sizeof( U32 ) );
+
+    // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+    serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
+}
+
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
@@ -5130,7 +5196,7 @@
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
-            result = testSetBatteryRemainingPercentOverride( payload.state.u32 );
+            result = testSetBatteryRemainingPercentOverride( payload.state.f32 );
         }
         else
         {
@@ -7324,4 +7390,85 @@
     return result;
 }
 
+/*********************************************************************//**
+* @brief
+* The handleTestBloodPumpSetPWM function handles a request to override
+* the Blood pumps duty cycle.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleTestBloodPumpSetPWM( MESSAGE_T *message )
+{
+     BOOL result = FALSE;
+
+     // verify payload length
+     if ( sizeof( F32 ) == message->hdr.payloadLen )
+     {
+         F32 payLoad;
+
+         memcpy( &payLoad, message->payload, sizeof( F32 ) );
+
+         result = testSetBloodPumpTargetDutyCycle( payLoad );
+     }
+
+     // respond to request
+     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+* @brief
+* The handleTestDialInSetPWM function handles a request to override
+* the Dialysate Inlet pumps duty cycle.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleTestDialInSetPWM( MESSAGE_T *message )
+{
+     BOOL result = FALSE;
+
+     // verify payload length
+     if ( sizeof( F32 ) == message->hdr.payloadLen )
+     {
+         F32 payLoad;
+
+         memcpy( &payLoad, message->payload, sizeof( F32 ) );
+
+         result = testSetDialInPumpTargetDutyCycle( payLoad );
+     }
+
+     // respond to request
+     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+* @brief
+* The handleTestDialOutSetPWM function handles a request to override
+* the Dialysate Outlet pumps duty cycle.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleTestDialOutSetPWM( MESSAGE_T *message )
+{
+     BOOL result = FALSE;
+
+     // verify payload length
+     if ( sizeof( F32 ) == message->hdr.payloadLen )
+     {
+         F32 payLoad;
+
+         memcpy( &payLoad, message->payload, sizeof( F32 ) );
+
+         result = testSetDialOutPumpTargetDutyCycle( payLoad );
+     }
+
+     // respond to request
+     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /**@}*/