Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r787312bd901f9c4c9d9e91591ecadca9f22fbeb6 -rbbd5ac2589c8093f681f2284367975ddd220b553
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 787312bd901f9c4c9d9e91591ecadca9f22fbeb6)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision bbd5ac2589c8093f681f2284367975ddd220b553)
@@ -227,7 +227,7 @@
  * @param almData2 2nd data associated with alarm
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL broadcastAlarmTriggered( U16 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 )
+BOOL broadcastAlarmTriggered( U32 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -236,10 +236,10 @@
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_ALARM_TRIGGERED;
-    msg.hdr.payloadLen = sizeof( U16 ) + sizeof( ALARM_DATA_T ) + sizeof( ALARM_DATA_T );
+    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( ALARM_DATA_T ) + sizeof( ALARM_DATA_T );
 
-    memcpy( payloadPtr, &alarm, sizeof( U16 ) );
-    payloadPtr += sizeof( U16 );
+    memcpy( payloadPtr, &alarm, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
     memcpy( payloadPtr, &almData1, sizeof( ALARM_DATA_T ) );
     payloadPtr += sizeof( ALARM_DATA_T );
     memcpy( payloadPtr, &almData2, sizeof( ALARM_DATA_T ) );
@@ -259,7 +259,7 @@
  * @param alarm ID of alarm cleared
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL broadcastAlarmCleared( U16 alarm )
+BOOL broadcastAlarmCleared( U32 alarm )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -268,9 +268,9 @@
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_ALARM_CLEARED;
-    msg.hdr.payloadLen = sizeof( U16 );
+    msg.hdr.payloadLen = sizeof( U32 );
 
-    memcpy( payloadPtr, &alarm, sizeof( U16 ) );
+    memcpy( payloadPtr, &alarm, 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_DG_ALARM, ACK_REQUIRED );
@@ -280,6 +280,35 @@
 
 /*********************************************************************//**
  * @brief
+ * The broadcastAlarmConditionCleared function constructs an alarm condition
+ * cleared msg to be broadcast and queues the msg for transmit on the
+ * appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: alarm condition cleared msg constructed and queued.
+ * @param alarm ID of alarm which alarm condition is cleared
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastAlarmConditionCleared( U32 alarm )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_ALARM_CONDITION_CLEARED;
+    msg.hdr.payloadLen = sizeof( U32 );
+
+    memcpy( payloadPtr, &alarm, 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_DG_ALARM, ACK_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The broadcastAccelData function constructs an accelerometer data msg to
  * be broadcast and queues the msg for transmit on the appropriate CAN channel.
  * @details Inputs: none
@@ -893,6 +922,35 @@
     return result;
 }
 
+/***********************************************************************//**
+ * @brief
+ * The broadcastFluidLeakState function constructs a DG fluid leak state msg to \n
+ * be broadcasted and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: fluid leak state msg constructed and queued
+ * @param state fluid leak state
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastFluidLeakState( FLUID_LEAK_STATES_T state )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+    U32 leakState = (U32)state;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_DG_FLUID_LEAK_STATE;
+    msg.hdr.payloadLen = sizeof( U32 );
+
+    memcpy( payloadPtr, &leakState, 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_DG_BROADCAST, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
 /*********************************************************************//**
  * @brief
  * The sendDGSystemRecord function sends out the DG system record.
@@ -1010,6 +1068,30 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The sendCommandResponseMsg function constructs a command response to HD
+ * and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: Command response msg constructed and queued.
+ * @param cmdResponsePtr pointer to command response data record
+ * @return none
+ *************************************************************************/
+void sendCommandResponseMsg( DG_CMD_RESPONSE_T *cmdResponsePtr )
+{
+    MESSAGE_T msg;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_DG_COMMAND_RESPONSE;
+    msg.hdr.payloadLen = sizeof( DG_CMD_RESPONSE_T );
+
+    memcpy( msg.payload, cmdResponsePtr, sizeof( DG_CMD_RESPONSE_T ) );
+
+    // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+    serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_HD, ACK_REQUIRED );
+}
+
 // ***********************************************************************
 // **************** Message Handling Helper Functions ********************
 // ***********************************************************************
@@ -1029,20 +1111,46 @@
 
     if ( message->hdr.payloadLen == sizeof( U32 ) )
     {
-        RESERVOIR_ID_T reservoirID;
+        DG_RESERVOIR_ID_T reservoirID;
         U32 resID;
 
         result = TRUE;
         memcpy( &resID, message->payload, sizeof( U32 ) );
-        reservoirID = (RESERVOIR_ID_T)resID;
+        reservoirID = (DG_RESERVOIR_ID_T)resID;
         setActiveReservoirCmd( reservoirID );
     }
 
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
 }
 
+
 /*********************************************************************//**
  * @brief
+ * The handleChangeValveSettingCmd function handles a switch reservoirs command
+ * from the HD.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleChangeValveSettingCmd( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    if ( message->hdr.payloadLen == sizeof( U32 ) )
+    {
+        DG_VALVE_SETTING_ID_T valveSettingID;
+
+        result = TRUE;
+        memcpy( &valveSettingID, message->payload, sizeof( U32 ) );
+        changeValveSettingCmd( valveSettingID );
+    }
+
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleFillCmd function handles a fill command from the HD.
  * @details Inputs: none
  * @details Outputs: message handled
@@ -1135,20 +1243,13 @@
 {
     BOOL result = FALSE;
 
-    if ( message->hdr.payloadLen == sizeof( U32 ) )
+    if ( message->hdr.payloadLen == sizeof( TRIMMER_HEATER_CMD_T ) )
     {
-        BOOL startingHeater;
+        TRIMMER_HEATER_CMD_T heaterCmd;
 
-        memcpy( &startingHeater, message->payload, sizeof( U32 ) );
-
-        if ( TRUE == startingHeater )
-        {
-            result = startTrimmerHeaterCmd();
-        }
-        else
-        {
-            result = stopTrimmerHeaterCmd();
-        }
+        result = TRUE;
+        memcpy( &heaterCmd, message->payload, sizeof( TRIMMER_HEATER_CMD_T ) );
+        handleTrimmerHeaterCmd( &heaterCmd );
     }
 
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
@@ -2155,6 +2256,70 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleSetFluidLeakBroadcastIntervalOverrideRequest function handles a
+ * request to override the fluid leak state broadcast interval.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleSetFluidLeakBroadcastIntervalOverrideRequest( 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 = testSetFluidLeakStatePublishIntervalOverride( (U32)( payload.state.u32 ) );
+        }
+        else
+        {
+            result = testResetFluidLeakStatePublishIntervalOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleSetFluidLeakStateDetectorOverrideRequest function handles a request to
+ * override the fluid leak detector state.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleSetFluidLeakStateDetectorOverrideRequest( 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 = testSetFluidLeakStateOverride( ( FLUID_LEAK_STATES_T)( payload.state.u32 ) );
+        }
+        else
+        {
+            result = testResetFluidLeakStateOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleDGSoftwareResetRequest function handles a request to
  * perform a software reset on DG.
  * @details Inputs: none