Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rb0e789c01065104761b860e8482c056bf2479916 -r6c1d6a3eaf065c2b2d537d9fef793d73ea328359
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision b0e789c01065104761b860e8482c056bf2479916)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6c1d6a3eaf065c2b2d537d9fef793d73ea328359)
@@ -7,8 +7,8 @@
 *
 * @file    SystemComm.c
 *
-* @author  (last)      Hung Nguyen
-* @date    (last)      17-Feb-2022
+* @author  (last)      Dara Navaei
+* @date    (last)      22-Feb-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -310,10 +310,10 @@
                     canXmitRetryCtr = MAX_XMIT_RETRIES;
                     signalCANXmitsCompleted();          // Clear pending xmit flag
                     clearCANXmitBuffers();              // Clear xmit buffers - nothing is going out right now
-                }
-            }
-        }
-    }
+                } // end - are we retrying xmit or are we alone on CAN bus
+            } // end - pending xmit timeout?
+        } // end - transmit in progress or not
+    } // end - DG not alone on CAN bus
 }
 
 /*********************************************************************//**
@@ -753,9 +753,12 @@
     {
         if ( TRUE == didTimeout( timeOfLastUICheckIn, UI_COMM_TIMEOUT_IN_MS ) )
         {
-#ifndef DISABLE_UI_COMM_TO_ALARM
-            activateAlarmNoData( ALARM_ID_UI_COMM_TIMEOUT );
-#endif
+#ifndef _RELEASE_
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_COMM_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+            {
+                activateAlarmNoData( ALARM_ID_UI_COMM_TIMEOUT );
+            }
         }
 
         if ( TRUE == didTimeout( timeOfLastDGCheckIn, DG_COMM_TIMEOUT_IN_MS ) )
@@ -781,9 +784,7 @@
 {
     if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_BAD_MSG_CRC ) )
     {
-#ifndef DISABLE_CRC_ERROR
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_COMM_TOO_MANY_BAD_CRCS, (U32)ALARM_SOURCE_HD );
-#endif
     }
 }
 
@@ -1616,6 +1617,22 @@
                 handleTestSyringePumpHeprinBolusTargetRateOverrideRequest( message );
                 break;
 
+            case MSG_ID_HD_REQ_CURRENT_TREATMENT_PARAMETERS:
+                handleTestCurrentTreamtmentParametersRequest( message );
+                break;
+
+            case MSG_ID_HD_FANS_DUTY_CYCLE_OVERRIDE:
+                handleSetFansDutyCycleOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_GET_SW_CONFIG_RECORD:
+                handleGetHDSoftwareConfigRecord( message );
+                break;
+
+            case MSG_ID_HD_SET_SW_CONFIG_RECORD:
+                handleSetHDSoftwareConfigRecord( message );
+                break;
+
             default:
                 // Unrecognized message ID received - ignore
                 break;