Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -re54806da466a8c52e19fd272356dbbfde04171fd -r9d083454c3e951c3b598ceb9dd60cd7e62ad4999
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision e54806da466a8c52e19fd272356dbbfde04171fd)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 9d083454c3e951c3b598ceb9dd60cd7e62ad4999)
@@ -8,7 +8,7 @@
 * @file    SystemComm.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      14-Jun-2022
+* @date    (last)      03-Aug-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -54,7 +54,7 @@
 #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_MAX_RETRIES       3       ///< Maximum number of times a message that requires ACK that was not ACK'd can be re-sent before alarm
+#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
 
 #pragma pack(push, 1)
@@ -112,10 +112,6 @@
 static U32 timeOfLastUICheckIn = 0;                                         ///< Last time UI checked in
 static volatile BOOL uiDidCommunicate = FALSE;                              ///< Has UI every sent a message
 
-#ifdef EMC_TEST_BUILD
-    static U32 badCANCount; // Test code in support of EMC testing
-#endif
-
 // ********** private function prototypes **********
 
 static void clearCANXmitBuffers( void );
@@ -233,7 +229,11 @@
  * @return TRUE if UI has communicated since power up, FALSE if not
  *************************************************************************/
 BOOL uiCommunicated( void )
-{
+{
+#ifdef SIMULATE_UI
+    uiDidCommunicate = TRUE;
+#endif
+
     return uiDidCommunicate;
 }
 
@@ -592,10 +592,6 @@
                 else if ( -1 == msgSize ) // Candidate message with bad CRC found?
                 {
                     badCRCDetected = TRUE;
-#ifdef EMC_TEST_BUILD
-                    badCANCount++;
-                    broadcastCANErrorCount( badCANCount );
-#endif
                     getFromCommBuffer( MSG_IN_BUFFERS[ i ], data, 1 );  // Consume sync byte so we can re-sync
                     messagesInBuffer = TRUE;  // Keep processing this buffer
                 } // Looks like there is a complete message in the comm buffer
@@ -730,10 +726,6 @@
             }
             else // CRC failed
             {
-#ifdef EMC_TEST_BUILD
-                badCANCount++;
-                broadcastCANErrorCount( badCANCount );
-#endif
                 checkTooManyBadMsgCRCs();
             }
         }
@@ -751,7 +743,9 @@
 static void checkForCommTimeouts( void )
 {
     if ( TRUE == uiDidCommunicate )
-    {
+    {
+        HD_OP_MODE_T opMode = getCurrentOperationMode();
+
         if ( TRUE == didTimeout( timeOfLastUICheckIn, UI_COMM_TIMEOUT_IN_MS ) )
         {
 #ifndef _RELEASE_
@@ -762,13 +756,21 @@
             }
         }
 
-        if ( TRUE == didTimeout( timeOfLastDGCheckIn, DG_COMM_TIMEOUT_IN_MS ) )
+        // Only alarm on DG comm loss while in the treatment workflow
+        if ( MODE_PRET == opMode || MODE_TREA == opMode || MODE_POST == opMode )
         {
+            if ( TRUE == didTimeout( timeOfLastDGCheckIn, DG_COMM_TIMEOUT_IN_MS ) )
+            {
 #ifndef RUN_WITHOUT_DG
-            activateAlarmNoData( ALARM_ID_DG_COMM_TIMEOUT );
-            dgIsCommunicating = FALSE;
+                activateAlarmNoData( ALARM_ID_DG_COMM_TIMEOUT );
+                dgIsCommunicating = FALSE;
 #endif
+            }
         }
+        else // Otherwise clear the alarm
+        {
+            clearAlarm( ALARM_ID_DG_COMM_TIMEOUT );
+        }
     }
 }
 
@@ -879,13 +881,7 @@
     // Find expired messages pending ACK
     for ( i = 0; i < PENDING_ACK_LIST_SIZE; i++ )
     {   // Pending ACK expired?
-        U32 timeoutPeriod = MSG_NOT_ACKED_TIMEOUT_MS; // set the timeout as default
-
-        if ( MODE_INIT == getCurrentOperationMode() )
-        { // change it to longer timeout if the HD is in INIT state
-            timeoutPeriod = MSG_NOT_ACKED_TIMEOUT_MS_INIT;
-        }
-        if ( ( TRUE == pendingAckList[ i ].used ) && ( TRUE == didTimeout( pendingAckList[ i ].timeStamp, timeoutPeriod ) ) )
+        if ( ( TRUE == pendingAckList[ i ].used ) && ( TRUE == didTimeout( pendingAckList[ i ].timeStamp, MSG_NOT_ACKED_TIMEOUT_MS ) ) )
         {   // If retries left, reset and resend pending message
             if ( pendingAckList[ i ].retries > 0 )
             {   // Re-queue message for transmit
@@ -1151,7 +1147,6 @@
             handleTesterLogInRequest( message );
             break;
 
-        // The default cannot be reached in VectorCAST since the cases are run in a for loop
         default:
             // Un-recognized or un-handled message ID received - ignore
             break;
@@ -1616,10 +1611,6 @@
                 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;
@@ -1656,6 +1647,11 @@
                 handleResendAllAlarmsCommand( message );
                 break;
 
+            case MSG_ID_HD_REQ_CURRENT_TREATMENT_PARAMETERS:
+                handleTestCurrentTreamtmentParametersRequest( message );
+                break;
+
+
             // The default cannot be reached in VectorCAST since the cases are run in a for loop
             default:
                 // Unrecognized message ID received - ignore