Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r0bce81180c0ba2b25f5d501ed6aa6b2f9a8b2500 -r2cb4ff0f8a0ad74826c5c9b4d0e84c6334c960d6
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 0bce81180c0ba2b25f5d501ed6aa6b2f9a8b2500)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 2cb4ff0f8a0ad74826c5c9b4d0e84c6334c960d6)
@@ -7,8 +7,8 @@
 *
 * @file    SystemComm.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      03-Aug-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      07-Sep-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -55,7 +55,7 @@
 
 #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.
@@ -95,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.
@@ -256,7 +257,7 @@
  * @return none
  *************************************************************************/
 void execSystemCommRx( void )
-{
+{
     // Parse messages from comm buffers and queue them
     processIncomingData();
 
@@ -698,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
@@ -1622,10 +1623,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;
@@ -1658,10 +1655,11 @@
                 handleSetBloodLeakEmbeddedModeCommand( message );
                 break;
 
-            case MSG_ID_HD_SEND_ALARMS_COMMAND:
-                handleResendAllAlarmsCommand( message );
+            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