Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rf7292cd3376119210980f14e8bdb0ec5e0cf5df5 -r497e910ca4972a1a993cb0ae1edf30d225283b34
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f7292cd3376119210980f14e8bdb0ec5e0cf5df5)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 497e910ca4972a1a993cb0ae1edf30d225283b34)
@@ -40,6 +40,7 @@
 #include "SafetyShutdown.h"
 #include "SystemCommMessages.h"
 #include "TemperatureSensors.h"
+#include "Thermistors.h"
 #include "Utilities.h"
 #include "Valves.h"
 #include "WatchdogMgmt.h"
@@ -151,101 +152,8 @@
     return result;
 }
 
-// ********** private data **********
-
-static BOOL testerLoggedIn = FALSE;                 ///< Flag indicates whether tester logged in or not.
-static volatile U16 nextSeqNo = 1;                  ///< Next sequence number.
-
-// ********** private function prototypes **********
-
-static U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq );
-static BOOL sendTestAckResponseMsg( MSG_ID_T msgID, BOOL ack );
-static BOOL sendAckResponseMsg( MSG_ID_T msgID, COMM_BUFFER_T buffer, BOOL ack );
-
 /*********************************************************************//**
  * @brief
- * The serializeMessage function serializes a given message into a given
- * array of bytes.  A sequence # is added to the message here and the ACK
- * bit of the sequence # is set if ACK is required per parameter.  A sync byte
- * is inserted at the beginning of the message and an 8-bit CRC is appended to
- * the end of the message. The message is queued for transmission in the given buffer.
- * @details Inputs: none
- * @details Outputs: given data array populated with serialized message data and queued for transmit.
- * @param msg message to serialize
- * @param buffer outgoing buffer that message should be queued in
- * @param ackReq is an acknowledgement from receiver required?
- * @return size (in bytes) of serialized message populated in given data array.
- *************************************************************************/
-static U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq )
-{
-    BOOL result = FALSE;
-    BOOL error = FALSE;
-    U32 msgSize = 0;
-    U32 sizeMod, sizePad;
-    U32 i;
-    U08 crc;
-    U08 data[ MAX_ACK_MSG_SIZE ];  // byte array to populate with message data
-
-    // prefix data with message sync byte
-    data[ msgSize++ ] = MESSAGE_SYNC_BYTE;
-
-    // set sequence # and ACK bit (unless this is an ACK to a received message)
-    if ( msg.hdr.msgID != MSG_ID_ACK )
-    {
-        // thread protect next sequence # access & increment
-        _disable_IRQ();
-            msg.hdr.seqNo = nextSeqNo;
-            nextSeqNo = INC_WRAP( nextSeqNo, MIN_MSG_SEQ_NO, MAX_MSG_SEQ_NO );
-        _enable_IRQ();
-        if ( TRUE == ackReq )
-        {
-            msg.hdr.seqNo *= -1;
-        }
-    }
-
-    // calculate message CRC
-    crc = crc8( (U08*)(&msg), sizeof( MESSAGE_HEADER_T ) + msg.hdr.payloadLen );
-
-    // serialize message header data
-    memcpy( &data[ msgSize ], &( msg.hdr ), sizeof( MESSAGE_HEADER_T ) );
-    msgSize += sizeof( MESSAGE_HEADER_T );
-
-    // serialize message payload (only used bytes per payloadLen field)
-    memcpy( &data[ msgSize ], &( msg.payload ), msg.hdr.payloadLen );
-    msgSize += msg.hdr.payloadLen;
-
-    // add 8-bit CRC
-    data[ msgSize++ ] = crc;
-
-    // pad with zero bytes to get length a multiple of CAN_MESSAGE_PAYLOAD_SIZE (8)
-    sizeMod = msgSize % CAN_MESSAGE_PAYLOAD_SIZE;
-    sizePad = ( sizeMod == 0 ? 0 : CAN_MESSAGE_PAYLOAD_SIZE - sizeMod );
-    for ( i = 0; i < sizePad; i++ )
-    {
-        data[ msgSize++ ] = 0;
-    }
-
-    // if ACK required, add to pending ACK list
-    if ( TRUE == ackReq )
-    {
-        if ( FALSE == addMsgToPendingACKList( &msg, buffer, data, msgSize ) )
-        {
-            error = TRUE;
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL )
-        }
-    }
-
-    if ( FALSE == error )
-    {
-        // add serialized message data to appropriate out-going comm buffer
-        result = addToCommBuffer( buffer, data, msgSize );
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The sendACKMsg function constructs and queues for transmit an ACK message
  * for a given received message.
  * @details Inputs: none
@@ -619,7 +527,7 @@
     msg.hdr.msgID = MSG_ID_RO_PUMP_DATA;
     msg.hdr.payloadLen = sizeof( RO_PUMP_DATA_T );
 
-    memcpy( payloadPtr, &payload, sizeof( RO_PUMP_DATA_T ) );
+    memcpy( payloadPtr, pumpData, sizeof( RO_PUMP_DATA_T ) );
 
     // 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 );
@@ -1551,38 +1459,6 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
-/*********************************************************************//**
- * @brief
- * The handleTestROPumpSetPointOverrideRequest function handles a request to
- * override the RO pump pressure set point (in PSI).
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleTestROPumpSetPointOverrideRequest( 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 = testSetTargetROPumpPressureOverride( payload.state.u32 );
-        }
-        else
-        {
-            result = testResetTargetROPumpPressureOverride();
-        }
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
 /*********************************************************************//**
  * @brief
  * The handleTestROMeasuredFlowOverrideRequest function handles a request to
@@ -2191,12 +2067,21 @@
         {
             result = testResetThermistorPublishIntervalOverride();
         }
-
-        // respond to request
-        sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
     }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*********************************************************************//**
+* @brief
+* The handleTestROPumpDutyCycleOverride function handles a request to override
+* the RO pumps duty cycle.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
 void handleTestROPumpDutyCycleOverride( MESSAGE_T *message )
 {
      BOOL result = FALSE;
@@ -2274,6 +2159,9 @@
             result = testResetMeasuredThermistorOverride( payload.index );
         }
     }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
 //*******************************************************************/
@@ -2321,6 +2209,9 @@
             result = testResetFanPublishIntervalOverride();
         }
     }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
 //*******************************************************************/