Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -re319bb5b8fd8a5320c0bb30986764f9b8f3c0814 -r9b64066d98f80589129c28618d07cf2c3645d1c9
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e319bb5b8fd8a5320c0bb30986764f9b8f3c0814)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 9b64066d98f80589129c28618d07cf2c3645d1c9)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      22-Sep-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      12-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 };
 
@@ -2308,17 +2310,36 @@
  *************************************************************************/
 void handleLoadCellReadingsFromDG( MESSAGE_T *message )
 {
-    if ( message->hdr.payloadLen == sizeof(LOAD_CELL_READINGS_PAYLOAD_T) )
+    if ( message->hdr.payloadLen == sizeof( LOAD_CELL_DATA_T ) )
     {
-        LOAD_CELL_READINGS_PAYLOAD_T payload;
+        LOAD_CELL_DATA_T payload;
 
-        memcpy( &payload, message->payload, sizeof(LOAD_CELL_READINGS_PAYLOAD_T) );
-        setNewLoadCellReadings( payload.res1PrimaryLoadCell, payload.res1BackupLoadCell, payload.res2PrimaryLoadCell, payload.res2BackupLoadCell );
+        memcpy( &payload, message->payload, sizeof( LOAD_CELL_DATA_T ) );
+        setNewLoadCellReadings( payload.loadCellA1inGram, payload.loadCellA2inGram, payload.loadCellB1inGram, payload.loadCellB2inGram );
     }
 }
 
 /*********************************************************************//**
  * @brief
+ * The handleDGHeatersData function handles the heaters data reading from DG.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleDGHeatersData( MESSAGE_T *message )
+{
+    if ( message->hdr.payloadLen == sizeof( HEATERS_DATA_T ) )
+    {
+        HEATERS_DATA_T payload;
+
+        memcpy( &payload, message->payload, sizeof( HEATERS_DATA_T ) );
+        setDGHeatersData( &payload );
+    }
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleDGTemperatureData function handles a temperature readings
  * broadcast message from the DG.
  * @details Inputs: none
@@ -2335,8 +2356,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?
 }
 
 /*********************************************************************//**
@@ -2350,12 +2369,12 @@
  *************************************************************************/
 void handleDialysateFlowData( MESSAGE_T *message )
 {
-    if ( message->hdr.payloadLen == sizeof( DIALYSATE_FLOW_METER_DATA_T ) )
+    if ( message->hdr.payloadLen == sizeof( FLOW_SENSORS_DATA_T ) )
     {
-        DIALYSATE_FLOW_METER_DATA_T payload;
+        FLOW_SENSORS_DATA_T payload;
 
-        memcpy( &payload, message->payload, sizeof( DIALYSATE_FLOW_METER_DATA_T ) );
-        setDialysateFlowData( payload.measuredDialysateFlowRate );
+        memcpy( &payload, message->payload, sizeof( FLOW_SENSORS_DATA_T ) );
+        setDialysateFlowData( payload.dialysateFlowRateLPM );
     }
 }
 
@@ -3186,23 +3205,26 @@
 {
     MESSAGE_T msg;
     HD_SERVICE_RECORD_T service;
+    DG_SERVICE_AND_USAGE_DATA_T dgData;
 
     getNVRecord2Driver( GET_SRV_RECORD, (U08*)&service, sizeof( HD_SERVICE_RECORD_T ), 0, ALARM_ID_NO_ALARM );
+    getHDVersionDGServiceAndUsageData( &dgData );
 
     U08 *payloadPtr = msg.payload;
 
-    if ( message->hdr.payloadLen == sizeof( U32 ) + sizeof( U32 ) )
-    {
-        // Create a message record
-        blankMessage( &msg );
-        msg.hdr.msgID = MSG_ID_HD_SERVICE_SCHEDULE_DATA;
-        msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 );
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID      = MSG_ID_HD_SERVICE_SCHEDULE_DATA;
+    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 );
 
-        // Fill message payload
-        memcpy( payloadPtr, &service.lastServiceEpochDate, sizeof( U32 ) );
-        payloadPtr += sizeof( U32 );
-        memcpy( payloadPtr, &service.serviceIntervalSeconds, sizeof( U32 ) );
-    }
+    // Fill message payload
+    memcpy( payloadPtr, &service.lastServiceEpochDate, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &service.serviceIntervalSeconds, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &dgData.dgServiceRecord.lastServiceDateEpoch, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &dgData.dgServiceRecord.serviceIntervalSeconds, 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_REQUIRED );
@@ -5128,6 +5150,7 @@
     if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+
         if ( FALSE == payload.reset )
         {
             result = testSetBatteryRemainingPercentOverride( payload.state.f32 );
@@ -6366,14 +6389,11 @@
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( sizeof( F32 ) == message->hdr.payloadLen )
+    if ( sizeof( 0 ) == message->hdr.payloadLen )
     {
         if ( TRUE == isTestingActivated() )
         {
-            F32 dacVRef;
-
-            memcpy( &dacVRef, message->payload, sizeof( F32 ) );  // TODO - Payload no longer used.  Update Dialin command and expected payload len in f/w.
-            result = setSyringePumpDACVref();
+           result = setSyringePumpDACVref();
         }
     }
 
@@ -7092,6 +7112,96 @@
 }
 
 /*********************************************************************//**
+ * @brief
+ * The sendDGUsageInfoRequestToDG function constructs a request msg
+ * to the DG to request the DG usage info and queues the msg for transmit
+ * on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: DG usage info result request msg constructed and queued.
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendDGUsageInfoRequestToDG( void )
+{
+    BOOL result;
+    MESSAGE_T msg;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID      = MSG_ID_HD_REQUEST_DG_USAGE_INFO;
+    msg.hdr.payloadLen = 0;
+
+    // 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 sendDGServiceRequestToDG function constructs a request msg
+ * to the DG to request the DG service record and queues the msg for transmit
+ * on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: DG usage info result request msg constructed and queued.
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendDGServiceRequestToDG( void )
+{
+    BOOL result;
+    MESSAGE_T msg;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID      = MSG_ID_HD_REQUEST_DG_SERVICE_RECORD;
+    msg.hdr.payloadLen = 0;
+
+    // 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 handleDGServiceScheduleData function receives the HD version of the
+ * DG service record.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleDGServiceScheduleData( MESSAGE_T *message )
+{
+    if ( message->hdr.payloadLen == sizeof( HD_VERSION_DG_SERVICE_RECORD_T ) )
+    {
+        HD_VERSION_DG_SERVICE_RECORD_T payload;
+
+        memcpy( &payload, message->payload, sizeof( HD_VERSION_DG_SERVICE_RECORD_T ) );
+        setHDVersionDGServiceRecord( &payload );
+    }
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleDGUsageInfoData function receives the HD version of the
+ * DG usage info.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleDGUsageInfoData( MESSAGE_T *message )
+{
+    if ( message->hdr.payloadLen == sizeof( HD_VERSION_DG_USAGE_INFO_T ) )
+    {
+        HD_VERSION_DG_USAGE_INFO_T payload;
+
+        memcpy( &payload, message->payload, sizeof( HD_VERSION_DG_USAGE_INFO_T ) );
+        setHDVersionDGUsageInfo( &payload );
+    }
+}
+
+/*********************************************************************//**
 * @brief
 * The handleGetHDUsageInfoRecord function handles a request to get the HD
 * usage information record.
@@ -7324,4 +7434,158 @@
     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 );
+}
+
+
+/*********************************************************************//**
+ * @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 );
+        }
+        else
+        {
+            // illegal response param
+            // TODO set alarm?  No Ack?
+        }
+    }
+
+    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;
+
+    // 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 );
+
+    temp_request = request_id;
+    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 );
+}
+
 /**@}*/