Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r908d078b2a7bad32ffe52ca6b7472b61225b25c8 -r0a4dcd288d4347b85baaa0b07da568b6add5eac7
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 908d078b2a7bad32ffe52ca6b7472b61225b25c8)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 0a4dcd288d4347b85baaa0b07da568b6add5eac7)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2023 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    SystemCommMessages.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      18-Oct-2022
+* @date    (last)      21-Dec-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -1429,7 +1429,7 @@
  * @param activeReservoir reservoir ID to set as active
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL sendDGSwitchReservoirCommand( U32 activeReservoir )
+BOOL sendDGSwitchReservoirCommand( DG_SWITCH_RSRVRS_CMD_T *cmd )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -1438,9 +1438,9 @@
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_DG_SWITCH_RESERVOIR_CMD;
-    msg.hdr.payloadLen = sizeof( U32 );
+    msg.hdr.payloadLen = sizeof( DG_SWITCH_RSRVRS_CMD_T );
 
-    memcpy( payloadPtr, &activeReservoir, sizeof( U32 ) );
+    memcpy( payloadPtr, cmd, sizeof( DG_SWITCH_RSRVRS_CMD_T ) );
 
     // 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 );
@@ -1584,7 +1584,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD;
+    msg.hdr.msgID = MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD;
     msg.hdr.payloadLen = sizeof( BOOL );
 
     memcpy( payloadPtr, &start, sizeof( BOOL ) );
@@ -2355,7 +2355,7 @@
         TEMPERATURE_SENSORS_DATA_T payload;
 
         memcpy( &payload, message->payload, sizeof( TEMPERATURE_SENSORS_DATA_T ) );
-        setDialysateTemperatureReadings( payload.inletDialysate, payload.outletRedundant );
+        setDialysateTemperatureReadings( payload.inletDialysate, payload.outletRedundant, payload.heatDisinfect );
     }
 }
 
@@ -3224,7 +3224,7 @@
         payloadPtr += sizeof( U32 );
         memcpy( payloadPtr, &service.serviceIntervalSeconds, sizeof( U32 ) );
         payloadPtr += sizeof( U32 );
-        memcpy( payloadPtr, &dgData.dgServiceRecord.lastServiceDateEpoch, sizeof( U32 ) );
+        memcpy( payloadPtr, &dgData.dgServiceRecord.lastServiceEpochDate, sizeof( U32 ) );
         payloadPtr += sizeof( U32 );
         memcpy( payloadPtr, &dgData.dgServiceRecord.serviceIntervalSeconds, sizeof( U32 ) );
     }
@@ -3684,6 +3684,38 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleHDDialInPumpRotorCountOverrideRequest function handles a request to
+ * override the dialysate inlet pump rotor count.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleHDDialInPumpRotorCountOverrideRequest( 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 = testSetDialysateInPumpRotorCountOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetDialysateInPumpRotorCountOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleTestBloodPumpRotorMeasuredSpeedOverrideRequest function handles a request to
  * override the measured blood pump rotor speed (RPM).
  * @details Inputs: none
@@ -7079,6 +7111,45 @@
 }
 
 /*********************************************************************//**
+ * @brief
+ * The sendHDUsageRecord function sends out the HD service record.
+ * @details Inputs: none
+ * @details Outputs: HD system record msg constructed and queued
+ * @param payloadCurrNum: current payload number
+ * @param payloadTotalNum: total number of payloads
+ * @param length: buffer length to be written
+ * @param srvcRcrdAddress: start address of the usage record
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendHDUsageRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* sysRcrdAddress )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_SEND_USAGE_INFO_RECORD;
+    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ) + length;
+
+    memcpy( payloadPtr, &payloadCurrNum, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+
+    memcpy( payloadPtr, &payloadTotalNum, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+
+    memcpy( payloadPtr, &length, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+
+    memcpy( payloadPtr, sysRcrdAddress, length );
+
+    // 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_PC, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
 * @brief
 * The handleUIServiceModeRequest function handles a request to enter service
 * mode.
@@ -7098,10 +7169,9 @@
     {
         if ( ( MODE_STAN == currentMode ) || ( MODE_FAUL == currentMode ) )
         {
-
             requestNewOperationMode( MODE_SERV );
 
-            if ( (DG_MODE_STAN == currentDGMode) || (DG_MODE_FAUL == currentDGMode) )
+            if ( ( DG_MODE_STAN == currentDGMode ) || ( DG_MODE_FAUL == currentDGMode ) )
             {
                 status = TRUE;
                 cmdSetDGToServiceMode();
@@ -7240,11 +7310,11 @@
  *************************************************************************/
 void handleDGServiceScheduleData( MESSAGE_T *message )
 {
-    if ( message->hdr.payloadLen == sizeof( HD_VERSION_DG_SERVICE_RECORD_T ) )
+    if ( message->hdr.payloadLen == sizeof( DG_SERVICE_RECORD_T ) )
     {
-        HD_VERSION_DG_SERVICE_RECORD_T payload;
+        DG_SERVICE_RECORD_T payload;
 
-        memcpy( &payload, message->payload, sizeof( HD_VERSION_DG_SERVICE_RECORD_T ) );
+        memcpy( &payload, message->payload, sizeof( DG_SERVICE_RECORD_T ) );
         setHDVersionDGServiceRecord( &payload );
     }
 }
@@ -7260,16 +7330,37 @@
  *************************************************************************/
 void handleDGUsageInfoData( MESSAGE_T *message )
 {
-    if ( message->hdr.payloadLen == sizeof( HD_VERSION_DG_USAGE_INFO_T ) )
+    if ( message->hdr.payloadLen == sizeof( DG_USAGE_INFO_RECORD_T ) )
     {
-        HD_VERSION_DG_USAGE_INFO_T payload;
+        DG_USAGE_INFO_RECORD_T payload;
 
-        memcpy( &payload, message->payload, sizeof( HD_VERSION_DG_USAGE_INFO_T ) );
+        memcpy( &payload, message->payload, sizeof( DG_USAGE_INFO_RECORD_T ) );
         setHDVersionDGUsageInfo( &payload );
     }
 }
 
 /*********************************************************************//**
+ * @brief
+ * The handleSetHDServiceTime function sets the HD service time once the
+ * command is received from UI
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleSetHDServiceTime( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    if ( 0 == message->hdr.payloadLen )
+    {
+        result = setServiceTime();
+    }
+
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, result );
+}
+
+/*********************************************************************//**
 * @brief
 * The handleGetHDUsageInfoRecord function handles a request to get the HD
 * usage information record.
@@ -7583,4 +7674,29 @@
      sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*********************************************************************//**
+* @brief
+* The handleTestHDNVRecordCRCOverride function handles a request to override
+* the selected NV record's CRC.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleTestHDNVRecordCRCOverride( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
+        result = testSetNVRecordCRCOverride( payload.index, (U16)payload.state.u32 );
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /**@}*/