Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rb94b9b2eef71c1fae4d9a3320a13ef81d5790aac -r9b64066d98f80589129c28618d07cf2c3645d1c9
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision b94b9b2eef71c1fae4d9a3320a13ef81d5790aac)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 9b64066d98f80589129c28618d07cf2c3645d1c9)
@@ -7,8 +7,8 @@
 *
 * @file    SystemComm.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
@@ -46,7 +46,7 @@
 #define MAX_XMIT_RETRIES                5       ///< Maximum number of retries on no transmit complete interrupt timeout
 
 #define UI_COMM_TIMEOUT_IN_MS           5000    ///< UI has not checked in for this much time
-#define DG_COMM_TIMEOUT_IN_MS           2000    ///< DG has not checked in for this much time
+#define DG_COMM_TIMEOUT_IN_MS           1000    ///< DG has not checked in for this much time
 
 #define MAX_COMM_CRC_FAILURES           5       ///< Maximum number of CRC errors within window period before alarm
 #define MAX_COMM_CRC_FAILURE_WINDOW_MS  (10 * SEC_PER_MIN * MS_PER_SECOND)  ///< CRC error window
@@ -55,7 +55,10 @@
 
 #define MSG_NOT_ACKED_MAX_RETRIES       20      ///< Maximum number of times a message that requires ACK that was not ACK'd can be re-sent before alarm
 #define PENDING_ACK_LIST_SIZE           25      ///< Maximum number of Denali messages that can be pending ACK at any given time
-
+
+#define MAX_FPGA_CLOCK_SPEED_ERRORS     3       ///< maximum number of FPGA clock speed errors within window period before alarm
+#define MAX_FPGA_CLOCK_SPEED_ERROR_WINDOW_MS    (10 * SEC_PER_MIN * MS_PER_SECOND)    ///< FPGA clock speed error window
+
 #pragma pack(push, 1)
 
 /// Record for transmitted message that is pending acknowledgment from receiver.
@@ -142,6 +145,9 @@
 
     // Initialize bad message CRC time windowed count
     initTimeWindowedCount( TIME_WINDOWED_COUNT_BAD_MSG_CRC, MAX_COMM_CRC_FAILURES, MAX_COMM_CRC_FAILURE_WINDOW_MS );
+
+    // Initialize FPGA clock speed error time windowed count
+    initTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CLOCK_SPEED_ERROR, MAX_FPGA_CLOCK_SPEED_ERRORS, MAX_FPGA_CLOCK_SPEED_ERROR_WINDOW_MS);
 
     // Initialize pending ACK list
     for ( i = 0; i < PENDING_ACK_LIST_SIZE; i++ )
@@ -256,7 +262,7 @@
  * @return none
  *************************************************************************/
 void execSystemCommRx( void )
-{
+{
     // Parse messages from comm buffers and queue them
     processIncomingData();
 
@@ -698,7 +704,7 @@
 {
     BOOL isThereMsgRcvd = TRUE;  // Assume TRUE at first to get into while loop
     MESSAGE_WRAPPER_T message;
-
+
     while ( TRUE == isThereMsgRcvd )
     {
         // See if any messages received
@@ -975,13 +981,17 @@
 
         case MSG_ID_DG_VERSION:
             handleDGVersionResponse( message );
+            break;
+
+        case MSG_ID_DG_HEATERS_DATA:
+            handleDGHeatersData( message );
             break;
 
         case MSG_ID_DG_TEMPERATURE_DATA:
             handleDGTemperatureData( message );
             break;
 
-        case MSG_ID_DG_DIALYSATE_FLOW_METER_DATA:
+        case MSG_ID_DG_FLOW_SENSORS_DATA:
             handleDialysateFlowData( message );
             break;
 
@@ -1141,6 +1151,18 @@
             handleUIServiceModeRequest( message );
             break;
 
+        case MSG_ID_DG_SERVICE_SCHEDULE_DATA:
+            handleDGServiceScheduleData( message );
+            break;
+
+        case MSG_ID_DG_USAGE_DATA:
+            handleDGUsageInfoData( message );
+            break;
+
+        case MSG_ID_UI_CONFIRMATION_RESULT:
+            handleUIConfirmationResponse( message );
+            break;
+
         // NOTE: this always must be the last case
         case MSG_ID_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
@@ -1650,6 +1672,18 @@
                 handleTestCurrentTreamtmentParametersRequest( message );
                 break;
 
+            case MSG_ID_HD_BLOOD_PUMP_SET_PWM:
+                handleTestBloodPumpSetPWM( message );
+                break;
+
+            case MSG_ID_HD_DIAL_IN_SET_PWM:
+                handleTestDialInSetPWM( message );
+                break;
+
+            case MSG_ID_HD_DIAL_OUT_SET_PWM:
+                handleTestDialOutSetPWM( message );
+                break;
+
             // The default cannot be reached in VectorCAST since the cases are run in a for loop
             default:
                 // Unrecognized message ID received - ignore