Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r7e4b720b0f1067fb1d0714626ef6c058e7c68fef -re5ab3694e8a868f82c345d688c2944a84b07e0d5
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 7e4b720b0f1067fb1d0714626ef6c058e7c68fef)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e5ab3694e8a868f82c345d688c2944a84b07e0d5)
@@ -23,7 +23,6 @@
 #include "Compatible.h"
 #include "ConcentratePumps.h"
 #include "ConductivitySensors.h"
-#include "Fans.h"
 #include "FPGA.h"
 #include "Heaters.h"
 #include "ModeFill.h"
@@ -301,6 +300,9 @@
     payloadPtr += sizeof( U32 );
     data = almData2.data.uInt.data;
     memcpy( payloadPtr, &data, sizeof( U32 ) );
+    // Pad with space for 3 U32s - set to zero - unused for DG
+    payloadPtr += ( sizeof( U32) * 3 );
+    memset( payloadPtr, 0, sizeof( U32) * 3 );
 
     // 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_DG_ALARM, ACK_REQUIRED );
@@ -365,7 +367,6 @@
     return result;
 }
 
-
 // ***********************************************************************
 // **************** Message Handling Helper Functions ********************
 // ***********************************************************************
@@ -427,7 +428,6 @@
     if ( message->hdr.payloadLen == sizeof( DG_CMD_DIALYSATE_HEATING_PARAMS_T ) )
     {
         DG_CMD_DIALYSATE_HEATING_PARAMS_T payload;
-
         result = TRUE;
         memcpy( &payload, message->payload, sizeof( DG_CMD_DIALYSATE_HEATING_PARAMS_T ) );
         setDialysateHeatingParameters( payload );
@@ -1093,10 +1093,39 @@
     if ( message->hdr.payloadLen == sizeof( TRIMMER_HEATER_CMD_T ) )
     {
         TRIMMER_HEATER_CMD_T heaterCmd;
+        DG_CMD_RESPONSE_T cmdResponse;
+        cmdResponse.commandID  = DG_CMD_START_TRIMMER_HEATER;
+        cmdResponse.rejected   = FALSE;
+        cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE;
+        result                 = TRUE;
 
-        result = TRUE;
         memcpy( &heaterCmd, message->payload, sizeof( TRIMMER_HEATER_CMD_T ) );
-        handleTrimmerHeaterCmd( &heaterCmd );
+
+        if ( TRUE == heaterCmd.startHeater )
+        {
+            BOOL isSet = setHeaterTargetTemperature( DG_TRIMMER_HEATER, getTrimmerHeaterTargetTemperature() );
+
+            if ( TRUE == isSet )
+            {
+#ifndef _RELEASE_
+                if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_TRIMMER_HEATER ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+                {
+                    startHeater( DG_TRIMMER_HEATER );
+                }
+            }
+            else
+            {
+                cmdResponse.rejected   = TRUE;
+                cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_INVALID_PARAMETER;
+            }
+        }
+        else
+        {
+            stopHeater( DG_TRIMMER_HEATER );
+        }
+
+        sendCommandResponseMsg( &cmdResponse );
     }
 
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
@@ -3174,37 +3203,6 @@
 }
 
 /*********************************************************************//**
- * @brief
- * The handleFansRPMOverride function handles a request to override a fans RPM value.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleFansRPMOverride( MESSAGE_T *message )
-{
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-    BOOL result = FALSE;
-
-    // verify payload length
-    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
-    {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
-        if ( FALSE == payload.reset )
-        {
-            result = testSetFanRPMOverride( payload.index, payload.state.f32 );
-        }
-        else
-        {
-            result = testResetFanRPMOverride( payload.index );
-        }
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
 * @brief
 * The handleStopDGRTCClock function handles a request to stop the RTC clock.
 * @details Inputs: none
@@ -3343,10 +3341,41 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestFansRPMAlarmStartTimeOffsetRequest function handles a
- * request to set the fans RPM alarm start time offset.
+ * The handleFansRPMOverride function handles a request to override a fans RPM value.
  * @details Inputs: none
  * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleFansRPMOverride( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetFanRPMOverride( payload.index, payload.state.f32 );
+        }
+        else
+        {
+            result = testResetFanRPMOverride( payload.index );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestFansRPMAlarmStartTimeOverrideRequest function handles a
+ * request to override the fan RPM alarm start time.
+ * @details Inputs: none
+ * @details Outputs: message handled
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
@@ -3369,7 +3398,6 @@
 }
 
 /*********************************************************************//**
- * @brief
  * The handleTestUsedAcidVolumeMLOverrideRequest function handles a
  * request to override the acid volume.
  * @details Inputs: none
@@ -3726,4 +3754,29 @@
     serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_HD, ACK_REQUIRED );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The sendUIServiceModeResponse function sends out the DG response to a
+ * UI request to go to service mode.
+ * @details Inputs: none
+ * @details Outputs: Service mode request response msg constructed and queued
+ * @param accepted TRUE if request was accepted, FALSE if not
+ * @param rejCode Reject reason code explaining why request was rejected
+ * @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 );
+}
+
 /**@}*/