Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -raf2cd84d3319b1e298057fe2d329aa7824306507 -rd4bc221d9817b488c2dcd00868386d7036a5c9a1
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision af2cd84d3319b1e298057fe2d329aa7824306507)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d4bc221d9817b488c2dcd00868386d7036a5c9a1)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.c
 *
-* @author  (last)      Darren Cox
-* @date    (last)      13-Sep-2022
+* @author  (last)      Dong Nguyen
+* @date    (last)      27-Sep-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -43,6 +43,7 @@
 #include "Valves.h"
 #include "WatchdogMgmt.h"
 #include "HDDefs.h"
+#include "TaskPriority.h"
 
 /**
  *  @addtogroup SystemCommMessages
@@ -62,9 +63,9 @@
 #pragma pack(pop)
 
 // ********** private data **********
-
 static BOOL testerLoggedIn = FALSE;                         ///< Flag indicates whether an external tester (connected PC) has sent a valid login message.
 static volatile U16 nextSeqNo = 1;                          ///< Value of sequence number to use for next transmitted message.
+
 /// List of message IDs that are requested not to be transmitted.
 static BLOCKED_MSGS_DATA_T blockedMessagesForXmit = { 0, 0, 0, 0, 0, 0, 0, 0 };
 
@@ -1571,10 +1572,9 @@
  * @details Inputs: none
  * @details Outputs: DG start/stop trimmer heater command msg constructed and queued.
  * @param start TRUE indicates start heater, FALSE indicates stop heater
- * @param trimmerHtrTemp target temperature for trimmer heater
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL sendDGStartStopTrimmerHeaterCommand( BOOL start, F32 trimmerHtrTemp )
+BOOL sendDGStartStopTrimmerHeaterCommand( BOOL start )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -1583,11 +1583,9 @@
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD;
-    msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( F32 );
+    msg.hdr.payloadLen = sizeof( BOOL );
 
     memcpy( payloadPtr, &start, sizeof( BOOL ) );
-    payloadPtr += sizeof( BOOL );
-    memcpy( payloadPtr, &trimmerHtrTemp, sizeof( F32 ) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_DG, ACK_REQUIRED );
@@ -2005,35 +2003,6 @@
 }
 
 
-#ifdef EMC_TEST_BUILD
-/*********************************************************************//**
- * @brief
- * The broadcastCANErrorCount function handles the CAN error count
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-BOOL broadcastCANErrorCount( U32 count )
-{
-    BOOL result;
-    MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
-
-    // Create a message record
-    blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_CAN_ERROR_COUNT;
-    msg.hdr.payloadLen = sizeof( U32 );
-
-    memcpy( payloadPtr, &count, sizeof( U32 ) );
-
-    // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
-    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_BROADCAST, ACK_NOT_REQUIRED );
-
-    return result;
-}
-#endif
-
 // ***********************************************************************
 // **************** Message Handling Helper Functions ********************
 // ***********************************************************************
@@ -2272,7 +2241,6 @@
 {
     BOOL result;
     MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
 
     // Create a message record
     blankMessage( &msg );
@@ -2368,8 +2336,6 @@
         memcpy( &payload, message->payload, sizeof( TEMPERATURE_SENSORS_DATA_T ) );
         setDialysateTemperatureReadings( payload.inletDialysate, payload.outletRedundant );
     }
-    // TODO - what to do if invalid payload length?
-    // TODO - how to know if DG stops sending these?
 }
 
 /*********************************************************************//**
@@ -3626,38 +3592,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleHDSetArterialPressureOffsetRequest function handles a request to
- * set the arterial pressure offset.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleHDSetArterialPressureOffsetRequest( MESSAGE_T *message )
-{
-    TEST_OVERRIDE_PAYLOAD_T payload;
-    BOOL result = FALSE;
-
-    // Verify payload length
-    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
-    {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( FALSE == payload.reset )
-        {
-            result = testSetArterialPressureOffsetOverride( payload.state.f32 );
-        }
-        else
-        {
-            result = testResetArterialPressureOffsetOverride();
-        }
-    }
-
-    // Respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
- * @brief
  * The handleTestBloodPumpRotorMeasuredSpeedOverrideRequest function handles a request to
  * override the measured blood pump rotor speed (RPM).
  * @details Inputs: none
@@ -7133,6 +7067,30 @@
 }
 
 /*********************************************************************//**
+ * @brief
+ * The sendRequestForDGResendAlarms function sends out the HD request for
+ * DG re-send all active alarms.
+ * @details Inputs: none
+ * @details Outputs: DG alarms re-send request msg constructed and queued
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendRequestForDGResendAlarms( void )
+{
+    BOOL result;
+    MESSAGE_T msg;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_REQUEST_DG_ALARMS;
+    msg.hdr.payloadLen = 0;
+
+    // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_DG, ACK_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
 * @brief
 * The handleGetHDUsageInfoRecord function handles a request to get the HD
 * usage information record.
@@ -7288,15 +7246,15 @@
 
 /*********************************************************************//**
  * @brief
- * The handleSendBloodLeakEmbeddedModeCommandResponse function sends out
+ * The sendBloodLeakEmbeddedModeCommandResponse function sends out
  * the blood leak embedded mode command response.
  * @details Inputs: none
  * @details Outputs: blood leak embedded mode command response msg constructed and queued
  * @param responseLen: the length of the buffer
  * @param response: pointer to the response buffer
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL handleSendBloodLeakEmbeddedModeCommandResponse( U32 responseLen, U08* response )
+BOOL sendBloodLeakEmbeddedModeCommandResponse( U32 responseLen, U08* response )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -7318,6 +7276,30 @@
 }
 
 /*********************************************************************//**
+* @brief
+* The handleResendAllAlarmsCommand function handles a request to re-send
+* all active HD alarms.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleResendAllAlarmsCommand(  MESSAGE_T* message )
+{
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( 0 == message->hdr.payloadLen )
+    {
+        handleResendActiveAlarmsRequest();
+        result = TRUE;
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
  * @brief
  * The sendDGServiceModeRequest function constructs a service mode request msg
  * to the DG and queues the msg for transmit on the appropriate CAN channel.