Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r94dab74a6432263dc4569e0cf8f9fa0b01bf1917 -r80a6638b362f5f613c0665200023d181f614d1bc
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 94dab74a6432263dc4569e0cf8f9fa0b01bf1917)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 80a6638b362f5f613c0665200023d181f614d1bc)
@@ -53,10 +53,9 @@
 
 #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)
 
 /// Record for transmitted message that is pending acknowledgment from receiver.
@@ -96,6 +95,7 @@
     COMM_BUFFER_IN_CAN_UI_BROADCAST,
     COMM_BUFFER_IN_CAN_PC,
 };
+//extern U32 loadcellDataMessageFreshStatusCounter = 0;                       ///< Counter use to trigger alarm if no fresh load cell data message is received - DN-22AUG2022
 
 static U08 lastCANPacketSent[ CAN_MESSAGE_PAYLOAD_SIZE ];                   ///< Keep last packet sent on CAN bus in case we need to re-send.
 static CAN_MESSAGE_BOX_T lastCANPacketSentChannel = (CAN_MESSAGE_BOX_T)0;   ///< Keep channel last packet was sent on CAN bus in case we need to re-send.
@@ -111,10 +111,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 );
@@ -227,12 +223,16 @@
 /*********************************************************************//**
  * @brief
  * The uiCommunicated function determines whether the UI has communicated.
- * @details Inputs: uiDidCommunicate
+ * @details Inputs: none
  * @details Outputs: none
  * @return TRUE if UI has communicated since power up, FALSE if not
  *************************************************************************/
 BOOL uiCommunicated( void )
-{
+{
+#ifdef SIMULATE_UI
+    uiDidCommunicate = TRUE;
+#endif
+
     return uiDidCommunicate;
 }
 
@@ -257,7 +257,7 @@
  * @return none
  *************************************************************************/
 void execSystemCommRx( void )
-{
+{
     // Parse messages from comm buffers and queue them
     processIncomingData();
 
@@ -526,8 +526,9 @@
  * @brief
  * The processIncomingData function parses out messages from the Input
  * Comm Buffers and adds them to the Received Message Queue.
- * @details Inputs: Input Comm Buffers
- * @details Outputs: Parsed message(s) added to Received Message Queue
+ * @details Inputs: none
+ * @details Outputs:hdIsOnlyCANNode, rcvMsg, dgIsCommunicating,
+ * timeOfLastDGCheckIn
  * @return none
  *************************************************************************/
 static void processIncomingData( void )
@@ -572,8 +573,8 @@
                     // Blank the new message record
                     blankMessageInWrapper( &rcvMsg );
                     // Copy message header portion of message data to the new message
-                    memcpy( &(rcvMsg.msg.hdr), dataPtr, sizeof(MESSAGE_HEADER_T) );
-                    dataPtr += sizeof(MESSAGE_HEADER_T);
+                    memcpy( &(rcvMsg.msg.hdr), dataPtr, sizeof( MESSAGE_HEADER_T ) );
+                    dataPtr += sizeof( MESSAGE_HEADER_T );
                     // Copy message payload portion of message data to the new message
                     memcpy( &(rcvMsg.msg.payload), dataPtr, rcvMsg.msg.hdr.payloadLen );
                     dataPtr += rcvMsg.msg.hdr.payloadLen;
@@ -591,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
@@ -702,7 +699,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
@@ -729,10 +726,6 @@
             }
             else // CRC failed
             {
-#ifdef EMC_TEST_BUILD
-                badCANCount++;
-                broadcastCANErrorCount( badCANCount );
-#endif
                 checkTooManyBadMsgCRCs();
             }
         }
@@ -750,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_
@@ -761,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 );
+        }
     }
 }
 
@@ -878,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
@@ -979,6 +976,10 @@
 
         case MSG_ID_DG_VERSION:
             handleDGVersionResponse( message );
+            break;
+
+        case MSG_ID_DG_HEATERS_DATA:
+            handleDGHeatersData( message );
             break;
 
         case MSG_ID_DG_TEMPERATURE_DATA: