Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r002e261b37e29e110396e258a25eca4f9f97738f -r74f1e95eb10f9086c08d9f122426f81411485c98
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 002e261b37e29e110396e258a25eca4f9f97738f)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 74f1e95eb10f9086c08d9f122426f81411485c98)
@@ -52,8 +52,7 @@
 #define MAX_COMM_CRC_FAILURE_WINDOW_MS  (10 * SEC_PER_MIN * MS_PER_SECOND)  ///< CRC error window
 
 #define MSG_NOT_ACKED_TIMEOUT_MS        150     ///< Maximum time for a Denali message that requires ACK to be ACK'd
-
-#define MSG_NOT_ACKED_TIMEOUT_MS_INIT   5000    ///< Maximum time for a Denali message that requires ACK to be ACK'd on the INIT state for the first (UI version request) message of the POST
+#define MSG_NOT_ACKED_TIMEOUT_MS_INIT   5000    ///< Maximum time for a Denali message that requires ACK to be ACK'd on the INIT state for the first (UI version request) message of the POST
 #define MSG_NOT_ACKED_MAX_RETRIES       3       ///< 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
 
@@ -310,10 +309,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 +752,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 +783,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 +1616,22 @@
                 handleTestSyringePumpHeprinBolusTargetRateOverrideRequest( 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;
+
+            case MSG_ID_HD_REQ_CURRENT_TREATMENT_PARAMETERS:
+                handleTestCurrentTreamtmentParametersRequest( message );
+                break;
+
             default:
                 // Unrecognized message ID received - ignore
                 break;