Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r19a8bf98a7154e24c35da25225d4b55bf70ddd09 -r28cd9da453de6282baea3113cf9f787810aae1e5
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 19a8bf98a7154e24c35da25225d4b55bf70ddd09)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 28cd9da453de6282baea3113cf9f787810aae1e5)
@@ -41,6 +41,7 @@
 #include "Utilities.h"
 #include "Valves.h"
 #include "WatchdogMgmt.h"
+#include "HDDefs.h"
 
 /**
  *  @addtogroup SystemCommMessages
@@ -2636,105 +2637,127 @@
     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.
+ * The handleChangePressureLimitsRequest function handles a pressure limits
+ * 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 )
+void handleChangePressureLimitsRequest( MESSAGE_T *message )
 {
-    U32  expPayloadSize = sizeof(U32) + sizeof(U32);
-
-    if ( expPayloadSize == message->hdr.payloadLen )
+    if ( sizeof( PRESSURE_LIMIT_CHANGE_REQUEST_T ) == message->hdr.payloadLen )
     {
-        U32 bloodRate;
-        U32 dialRate;
+        PRESSURE_LIMIT_CHANGE_REQUEST_T data;
 
-        memcpy( &bloodRate, &message->payload[0], sizeof(U32) );
-        memcpy( &dialRate, &message->payload[sizeof(U32)], sizeof(U32) );
+        memcpy( &data, &message->payload[0], sizeof(PRESSURE_LIMIT_CHANGE_REQUEST_T) );
 
-        verifyBloodAndDialysateRateSettingsChange( bloodRate, dialRate );
+        verifyPressureLimitsChange( &data );
     }
     else
     {
@@ -2744,22 +2767,22 @@
 
 /*********************************************************************//**
  * @brief
- * The handleChangePressureLimitsRequest function handles a pressure limits
- * change message from the UI.
+ * The handleHeparinCommandRequest function handles a Heparin command
+ * request message from the UI.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleChangePressureLimitsRequest( MESSAGE_T *message )
+void handleHeparinCommandRequest( MESSAGE_T *message )
 {
-    if ( sizeof( PRESSURE_LIMIT_CHANGE_REQUEST_T ) == message->hdr.payloadLen )
+    if ( sizeof( U32 ) == message->hdr.payloadLen )
     {
-        PRESSURE_LIMIT_CHANGE_REQUEST_T data;
+        U32 payload;
 
-        memcpy( &data, &message->payload[0], sizeof(PRESSURE_LIMIT_CHANGE_REQUEST_T) );
+        memcpy( &payload, &message->payload[0], sizeof( U32 ) );
 
-        verifyPressureLimitsChange( &data );
+        userHeparinRequest( (HEPARIN_CMD_T)payload );
     }
     else
     {
@@ -2769,22 +2792,22 @@
 
 /*********************************************************************//**
  * @brief
- * The handleHeparinCommandRequest function handles a Heparin command
- * request message from the UI.
+ * The handleAlarmAudioVolumeSetCmd function handles a alarm audio volume
+ * set request message from the UI.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleHeparinCommandRequest( MESSAGE_T *message )
+void handleAlarmAudioVolumeSetCmd( MESSAGE_T *message )
 {
     if ( sizeof( U32 ) == message->hdr.payloadLen )
     {
         U32 payload;
 
         memcpy( &payload, &message->payload[0], sizeof( U32 ) );
 
-        userHeparinRequest( (HEPARIN_CMD_T)payload );
+        setAlarmAudioVolume( payload );
     }
     else
     {
@@ -2794,22 +2817,21 @@
 
 /*********************************************************************//**
  * @brief
- * The handleAlarmAudioVolumeSetCmd function handles a alarm audio volume
- * set request message from the UI.
+ * The handleUIChangedScreenBrightness function handles a screen brightness change
+ *  message from the UI.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleAlarmAudioVolumeSetCmd( MESSAGE_T *message )
+void handleUIChangedScreenBrightness( MESSAGE_T *message )
 {
     if ( sizeof( U32 ) == message->hdr.payloadLen )
     {
         U32 payload;
 
         memcpy( &payload, &message->payload[0], sizeof( U32 ) );
-
-        setAlarmAudioVolume( payload );
+        sendTreatmentLogEventData( SCREEN_BRIGHTNESS_CHANGED_EVENT, (F32)0.0, (F32)payload );
     }
     else
     {