Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r372f524a0baa83b446b7a69bd869cfdea59ce295 -rb36fc8801adfc9d2f402450abffe721e71f9a5e5
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 372f524a0baa83b446b7a69bd869cfdea59ce295)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision b36fc8801adfc9d2f402450abffe721e71f9a5e5)
@@ -8,7 +8,7 @@
 * @file    SystemCommMessages.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      25-May-2022
+* @date    (last)      14-Jun-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -41,6 +41,7 @@
 #include "Utilities.h"
 #include "Valves.h"
 #include "WatchdogMgmt.h"
+#include "HDDefs.h"
 
 /**
  *  @addtogroup SystemCommMessages
@@ -2644,114 +2645,111 @@
     return result;
 }
 
-
-
-/*********************************************************************//**
- * @brief
- * The handleChangeUFSettingsRequest function handles a ultrafiltration
- * change settings request message from the UI.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleChangeUFSettingsRequest( MESSAGE_T *message )
-{
-    if ( message->hdr.payloadLen == sizeof(F32) )
-    {
-        F32 uFVolume;
-
-        memcpy( &uFVolume, message->payload, sizeof(F32) );
-
-        verifyUFSettingsChange( uFVolume );
-    }
-    else
-    {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
-    }
-}
-
-/*********************************************************************//**
- * @brief
- * The handleChangeUFSettingsConfirmation function handles a ultrafiltration
- * change setting confirmation message from the UI.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleChangeUFSettingsConfirmation( MESSAGE_T *message )
-{
-    if ( message->hdr.payloadLen == sizeof(UF_SETTINGS_CHANGE_CONFIRMATION_PAYLOAD_T) )
-    {
-        UF_SETTINGS_CHANGE_CONFIRMATION_PAYLOAD_T payload;
-
-        memcpy( &payload, message->payload, sizeof(UF_SETTINGS_CHANGE_CONFIRMATION_PAYLOAD_T) );
-
-        verifyUFSettingsConfirmation( payload.volume_mL, payload.adjustType );
-    }
-    else
-    {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
-    }
-}
-
-/*********************************************************************//**
- * @brief
- * The handleChangeTreatmentDurationRequest function handles a treatment
- * duration setting change message from the UI.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleChangeTreatmentDurationRequest( MESSAGE_T *message )
-{
-    if ( message->hdr.payloadLen == sizeof(U32) )
-    {
+/*********************************************************************//**
+ * @brief
+ * The handleChangeUFSettingsRequest function handles a ultrafiltration
+ * change settings request message from the UI.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleChangeUFSettingsRequest( MESSAGE_T *message )
+{
+    if ( message->hdr.payloadLen == sizeof(F32) )
+    {
+        F32 uFVolume;
+
+        memcpy( &uFVolume, message->payload, sizeof(F32) );
+
+        verifyUFSettingsChange( uFVolume );
+    }
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleChangeUFSettingsConfirmation function handles a ultrafiltration
+ * change setting confirmation message from the UI.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleChangeUFSettingsConfirmation( MESSAGE_T *message )
+{
+    if ( message->hdr.payloadLen == sizeof(UF_SETTINGS_CHANGE_CONFIRMATION_PAYLOAD_T) )
+    {
+        UF_SETTINGS_CHANGE_CONFIRMATION_PAYLOAD_T payload;
+
+        memcpy( &payload, message->payload, sizeof(UF_SETTINGS_CHANGE_CONFIRMATION_PAYLOAD_T) );
+
+        verifyUFSettingsConfirmation( payload.volume_mL, payload.adjustType );
+    }
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleChangeTreatmentDurationRequest function handles a treatment
+ * duration setting change message from the UI.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleChangeTreatmentDurationRequest( MESSAGE_T *message )
+{
+    if ( message->hdr.payloadLen == sizeof(U32) )
+    {
         U32 timeInMin;
+
+        memcpy( &timeInMin, message->payload, sizeof(U32) );
+        verifyTreatmentDurationSettingChange( timeInMin );
+    }
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
+}
 
-        memcpy( &timeInMin, message->payload, sizeof(U32) );
-
-        verifyTreatmentDurationSettingChange( timeInMin );
-    }
-    else
-    {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
-    }
+/*********************************************************************//**
+ * @brief
+ * The handleChangeBloodDialysateRateChangeRequest function handles a blood
+ * and dialysate rate settings change message from the UI.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleChangeBloodDialysateRateChangeRequest( MESSAGE_T *message )
+{
+    U32  expPayloadSize = sizeof(U32) + sizeof(U32);
+
+    if ( expPayloadSize == message->hdr.payloadLen )
+    {
+        U32 bloodRate;
+        U32 dialRate;
+
+        memcpy( &bloodRate, &message->payload[0], sizeof(U32) );
+        memcpy( &dialRate, &message->payload[sizeof(U32)], sizeof(U32) );
+
+        verifyBloodAndDialysateRateSettingsChange( bloodRate, dialRate );
+    }
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**
  * @brief
- * The handleChangeBloodDialysateRateChangeRequest function handles a blood
- * and dialysate rate settings change message from the UI.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleChangeBloodDialysateRateChangeRequest( MESSAGE_T *message )
-{
-    U32  expPayloadSize = sizeof(U32) + sizeof(U32);
-
-    if ( expPayloadSize == message->hdr.payloadLen )
-    {
-        U32 bloodRate;
-        U32 dialRate;
-
-        memcpy( &bloodRate, &message->payload[0], sizeof(U32) );
-        memcpy( &dialRate, &message->payload[sizeof(U32)], sizeof(U32) );
-
-        verifyBloodAndDialysateRateSettingsChange( bloodRate, dialRate );
-    }
-    else
-    {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
-    }
-}
-
-/*********************************************************************//**
- * @brief
  * The handleChangePressureLimitsRequest function handles a pressure limits
  * change message from the UI.
  * @details Inputs: none