Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r1a5aa1dff6978966ecda860b09c07a84e80399fe -rd6c75118f4e5792b40b744a0b29e44c78368a469
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 1a5aa1dff6978966ecda860b09c07a84e80399fe)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d6c75118f4e5792b40b744a0b29e44c78368a469)
@@ -27,14 +27,17 @@
 #include "ModePreTreat.h"
 #include "ModeStandby.h"
 #include "ModeTreatment.h"
-#include "ModeTreatmentParams.h"
-#include "PresOccl.h"
+#include "ModeTreatmentParams.h"
+#include "OperationModes.h"
+#include "PresOccl.h"
 #include "RTC.h"
 #include "SafetyShutdown.h"
 #include "SystemComm.h"
-#include "SystemCommMessages.h"
+#include "SystemCommMessages.h"
+#include "TreatmentEnd.h"
+#include "TreatmentRecirc.h"
 #include "Utilities.h"
-#include "Valves.h"
+#include "Valves.h"
 #include "WatchdogMgmt.h"
 
 /**
@@ -361,8 +364,8 @@
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED );
 
     return result;
-}
-
+}
+
 /*********************************************************************//**
  * @brief
  * The sendChangeBloodDialysateRateChangeResponse function constructs a change
@@ -430,6 +433,38 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The sendHeparinCommandResponse function constructs a Heparin command response
+ * to the UI and queues the msg for transmit on the
+ * appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: Heparin command response msg constructed and queued.
+ * @param accepted flag indicating whether request was accepted
+ * @param rejReason rejection reason code
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendHeparinCommandResponse( U32 accepted, U32 rejReason )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_HEPARIN_PAUSE_RESUME_RESPONSE;
+    msg.hdr.payloadLen = sizeof( U32 ) * 2;
+
+    memcpy( payloadPtr, &accepted, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &rejReason, 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_HD_2_UI, ACK_REQUIRED );
+
+    return result;
+}
+
 /*********************************************************************//**
  * @brief
  * The sendTreatmentParamsRangesToUI function constructs a treatment parameter
@@ -531,6 +566,34 @@
 
     return result;
 }
+
+/*********************************************************************//**
+ * @brief
+ * The sendDGChangeValveSettingCommand function constructs a DG change valve
+ * setting message for DG and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: DG change valve setting msg constructed and queued.
+ * @param valveSettingCmd valve setting ID to change to
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendDGChangeValveSettingCommand( U32 valveSettingCmd )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_DG_CHANGE_VALVE_SETTING_CMD;
+    msg.hdr.payloadLen = sizeof( U32 );
+
+    memcpy( payloadPtr, &valveSettingCmd, 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_HD_2_DG, ACK_REQUIRED );
+
+    return result;
+}
 
 /*********************************************************************//**
  * @brief
@@ -686,8 +749,11 @@
 
     if ( messagePtr->hdr.payloadLen == sizeof( DG_CMD_RESPONSE_T ) )
     {
+        DG_CMD_RESPONSE_T dgCmdResponse;
+
         result = TRUE;
-        handleDGCommandResponse( messagePtr->payload );
+        memcpy( &dgCmdResponse,  messagePtr->payload, sizeof( DG_CMD_RESPONSE_T ) );
+        handleDGCommandResponse( &dgCmdResponse );
     }
 
     sendAckResponseMsg( (MSG_ID_T)messagePtr->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_DG, result );
@@ -987,6 +1053,62 @@
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_BROADCAST, ACK_NOT_REQUIRED );
 
     return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The broadcastSyringePumpData function constructs a syringe pump data
+ * msg to be broadcast and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: syringe pump data msg constructed and queued.
+ * @param data syringe pump data record
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastSyringePumpData( SYRINGE_PUMP_DATA_PAYLOAD_T data )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_SYRINGE_PUMP_DATA;
+    msg.hdr.payloadLen = sizeof( SYRINGE_PUMP_DATA_PAYLOAD_T );
+
+    memcpy( payloadPtr, &data, sizeof( SYRINGE_PUMP_DATA_PAYLOAD_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_HD_BROADCAST, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The broadcastHeparinData function constructs a Heparin data message
+ * to be broadcast and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: Heparin data msg constructed and queued.
+ * @param data Heparin data record
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastHeparinData( F32 volume )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_HEPARIN_DATA_BROADCAST;
+    msg.hdr.payloadLen = sizeof( F32 );
+
+    memcpy( payloadPtr, &volume, sizeof( F32 ) );
+
+    // 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_HD_BROADCAST, ACK_NOT_REQUIRED );
+
+    return result;
 }
 
 /*********************************************************************//**
@@ -1086,28 +1208,19 @@
  * be broadcast and queues the msg for transmit on the appropriate CAN channel.
  * @details Inputs: none
  * @details Outputs: treatment state msg constructed and queued
- * @param subMode Current state (sub-mode) of treatment
- * @param uFState Current state of ultrafiltration
- * @param salineBolusState 1=saline bolus in progress, 0=not, 2=max bolus volume reached
+ * @param payload Record with treatment state data
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL broadcastTreatmentState( U32 subMode, U32 uFState, U32 salineBolusState )
+BOOL broadcastTreatmentState( TREATMENT_STATE_DATA_T payload )
 {
     BOOL result;
     MESSAGE_T msg;
     U08 *payloadPtr = msg.payload;
-    TREATMENT_STATE_DATA_T payload;
 
-    // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_TREATMENT_STATE;
     msg.hdr.payloadLen = sizeof( TREATMENT_STATE_DATA_T );
 
-    payload.treatmentSubMode = subMode;
-    payload.uFState = uFState;
-    payload.salineBolusState = salineBolusState;
-    payload.heparinState = 0;  // TODO - add this later
-
     memcpy( payloadPtr, &payload, sizeof( TREATMENT_STATE_DATA_T ) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
@@ -1229,6 +1342,124 @@
 
 /***********************************************************************//**
  * @brief
+ * The broadcastTreatmentStopData function constructs a treatment stop data msg to
+ * be broadcast and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: treatment stop data msg constructed and queued
+ * @param timeout treatment stop timeout (in sec)
+ * @param countdown treatment stop timeout count down (in sec)
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastTreatmentStopData(  U32 timeout, U32 countdown  )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_TREATMENT_STOP_TIMER_DATA;
+    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 );
+
+    memcpy( payloadPtr, &timeout, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &countdown, 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_HD_BROADCAST, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
+/***********************************************************************//**
+ * @brief
+ * The broadcastRinsebackData function constructs a rinseback data msg to
+ * be broadcast and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: rinseback data msg constructed and queued
+ * @param data rinseback data record
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastRinsebackData( RINSEBACK_DATA_PAYLOAD_T data )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_RINSEBACK_PROGRESS;
+    msg.hdr.payloadLen = sizeof( RINSEBACK_DATA_PAYLOAD_T );
+
+    memcpy( payloadPtr, &data, sizeof( RINSEBACK_DATA_PAYLOAD_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_HD_BROADCAST, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
+/***********************************************************************//**
+ * @brief
+ * The broadcastRecircData function constructs a treatment re-circ data msg to
+ * be broadcast and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: treatment re-circ data msg constructed and queued
+ * @param timeout re-circulation timeout (in sec)
+ * @param countdown re-circulation timeout count down (in sec)
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastRecircData( U32 timeout, U32 countdown )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_RECIRC_PROGRESS;
+    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 );
+
+    memcpy( payloadPtr, &timeout, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &countdown, 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_HD_BROADCAST, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
+/***********************************************************************//**
+ * @brief
+ * The broadcastBloodPrimeData function constructs a blood prime data msg to
+ * be broadcast and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: blood prime data msg constructed and queued
+ * @param data blood prime data record
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastBloodPrimeData( BLOOD_PRIME_DATA_PAYLOAD_T data )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_BLOOD_PRIME_PROGRESS;
+    msg.hdr.payloadLen = sizeof( BLOOD_PRIME_DATA_PAYLOAD_T );
+
+    memcpy( payloadPtr, &data, sizeof( BLOOD_PRIME_DATA_PAYLOAD_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_HD_BROADCAST, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
+/***********************************************************************//**
+ * @brief
  * The broadcastAirTrapData function constructs an HD air trap data msg to \n
  * be broadcast and queues the msg for transmit on the appropriate CAN channel.
  * @details Inputs: none
@@ -1262,10 +1493,39 @@
 
 /***********************************************************************//**
  * @brief
- * The broadcastAirTrapData function constructs an HD air trap data msg to \n
+ * The broadcastFluidLeakState function constructs an HD 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_HD_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_HD_BROADCAST, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
+/***********************************************************************//**
+ * @brief
+ * The broadcastPrimeData function constructs a prime data msg to \n
  * be broadcast and queues the msg for transmit on the appropriate CAN channel.
  * @details Inputs: none
- * @details Outputs: air trap data msg constructed and queued
+ * @details Outputs: prime data msg constructed and queued
  * @param primeDataPtr prime data record pointer
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
@@ -1288,6 +1548,124 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The sendHDCalibrationRecord function sends out the HD calibration
+ * record.
+ * @details Inputs: none
+ * @details Outputs: HD calibration record msg constructed and queued
+ * @param msgCurrNum: current payload number
+ * @param msgTotalNum: total number of payloads
+ * @param length: buffer length to be written
+ * @param calRcrdAddress: start address of the calibration record
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendHDCalibrationRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* calRcrdAddress )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_SEND_CALIBRATION_RECORD;
+    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ) + length;
+
+    memcpy( payloadPtr, &payloadCurrNum, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+
+    memcpy( payloadPtr, &payloadTotalNum, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+
+    memcpy( payloadPtr, &length, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+
+    memcpy( payloadPtr, calRcrdAddress, length );
+
+    // 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_PC, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The sendHDSystemRecord function sends out the HD system record.
+ * @details Inputs: none
+ * @details Outputs: HD system record msg constructed and queued
+ * @param msgCurrNum: current payload number
+ * @param msgTotalNum: total number of payloads
+ * @param length: buffer length to be written
+ * @param sysRcrdAddress: start address of the system record
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendHDSystemRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* sysRcrdAddress )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_SEND_SYSTEM_RECORD;
+    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ) + length;
+
+    memcpy( payloadPtr, &payloadCurrNum, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+
+    memcpy( payloadPtr, &payloadTotalNum, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+
+    memcpy( payloadPtr, &length, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+
+    memcpy( payloadPtr, sysRcrdAddress, length );
+
+    // 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_PC, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The sendHDServiceRecord function sends out the HD service record.
+ * @details Inputs: none
+ * @details Outputs: HD system record msg constructed and queued
+ * @param msgCurrNum: current payload number
+ * @param msgTotalNum: total number of payloads
+ * @param length: buffer length to be written
+ * @param srvcRcrdAddress: start address of the service record
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendHDServiceRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* srvcRcrdAddress )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_SEND_SERVICE_RECORD;
+    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ) + length;
+
+    memcpy( payloadPtr, &payloadCurrNum, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+
+    memcpy( payloadPtr, &payloadTotalNum, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+
+    memcpy( payloadPtr, &length, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+
+    memcpy( payloadPtr, srvcRcrdAddress, length );
+
+    // 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_PC, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
 #ifdef EMC_TEST_BUILD
 BOOL broadcastCANErrorCount( U32 count )
 {
@@ -1414,7 +1792,7 @@
 
         memcpy( &cmd, payloadPtr, sizeof( U32 ) );
 
-        signalAlarmSilence( cmd );
+        signalAlarmSilence( (ALARM_SILENCE_CMD_T)cmd );
     }
     else
     {
@@ -1488,8 +1866,6 @@
         memcpy( &payload, message->payload, sizeof(LOAD_CELL_READINGS_PAYLOAD_T) );
         setNewLoadCellReadings( payload.res1PrimaryLoadCell, payload.res1BackupLoadCell, payload.res2PrimaryLoadCell, payload.res2BackupLoadCell );
     }
-    // TODO - what to do if invalid payload length?
-    // TODO - how to know if DG stops sending these?
 }
 
 /*********************************************************************//**
@@ -1532,7 +1908,6 @@
         memcpy( &payload, message->payload, sizeof(DG_RO_PUMP_DATA_PAYLOAD_T) );
         setDGROPumpData( payload.setPtPSI, payload.measFlowRateMlMin );
     }
-    // TODO - what to do if invalid payload length?
 }
 
 /*********************************************************************//**
@@ -1553,7 +1928,6 @@
          memcpy( &payload, message->payload, sizeof(DG_DRAIN_PUMP_DATA_PAYLOAD_T) );
          setDGDrainPumpData( payload.setPtRPM );
      }
-     // TODO - what to do if invalid payload length?
 }
 
 /*********************************************************************//**
@@ -1574,7 +1948,6 @@
          memcpy( &payload, message->payload, sizeof(DG_PRESSURES_DATA_PAYLOAD_T) );
          setDGPressures( payload.roInPSI, payload.roOutPSI, payload.drainInPSI, payload.drainOutPSI );
      }
-     // TODO - what to do if invalid payload length?
 }
 
 /*********************************************************************//**
@@ -1595,7 +1968,6 @@
          memcpy( &payload, message->payload, sizeof(DG_RESERVOIRS_DATA_PAYLOAD_T) );
          setDGReservoirsData( (DG_RESERVOIR_ID_T)payload.resID, payload.setFillToVolumeMl, payload.setDrainToVolumeMl );
      }
-     // TODO - what to do if invalid payload length?
 }
 
 /*********************************************************************//**
@@ -1666,14 +2038,14 @@
 
 /*********************************************************************//**
  * @brief
- * The handleUIStartTreatmentMsg function handles a treatment start/cancel
+ * The handleInitiateTreatmentRequest function handles a treatment initiate/cancel
  * message from the UI.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleUIStartTreatmentMsg( MESSAGE_T *message )
+void handleInitiateTreatmentRequest( MESSAGE_T *message )
 {
     BOOL result = FALSE;
 
@@ -1683,17 +2055,13 @@
 
         memcpy( &cmd, message->payload, sizeof(U32) );
 
-        if ( 0 == cmd )         // Initiate treatment (go to treatment params mode)
+        if ( 0 == cmd )         // Cancel treatment (return from aborted treatment params mode)
         {
-            result = signalUserStartingTreatment();
-        }
-        else if ( 1 == cmd )    // Cancel treatment (return from aborted treatment params mode)
-        {
             result = signalUserCancelTreatment();
         }
-        else if ( 2 == cmd )    // Start treatment
+        else if ( 1 == cmd )    // Initiate treatment (go to treatment params mode)
         {
-            result = signalUserBeginningTreatment();
+            result = signalUserStartingTreatment();
         }
     }
 
@@ -1702,79 +2070,50 @@
 
 /*********************************************************************//**
  * @brief
- * The sendTreatmentStartResponseMsg function constructs a treatment start
- * request response message to the UI and queues the msg for transmit on
- * the appropriate CAN channel.
+ * The handleStartTreatmentRequest function handles a treatment start
+ * message from the UI.
  * @details Inputs: none
- * @details Outputs: Treatment start response msg constructed and queued.
- * @param accepted T/F - request accepted?
- * @param reason reason code if rejected
- * @return TRUE if msg successfully queued for transmit, FALSE if not
- *************************************************************************/
-BOOL sendTreatmentStartResponseMsg( BOOL accepted, U32 reason )
-{
-    BOOL result;
-    MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
-
-    // Create a message record
-    blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_HD_START_TREATMENT_RESPONSE;
-    msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( U32 );
-
-    memcpy( payloadPtr, &accepted, sizeof( BOOL ) );
-    payloadPtr += sizeof( BOOL );
-    memcpy( payloadPtr, &reason, 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_HD_2_UI, ACK_REQUIRED );
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The handleUIUserEndTreatmentRequest function handles a treatment end
- * request message from the UI.
- * @details Inputs: none
  * @details Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleUIUserEndTreatmentRequest( MESSAGE_T *message )
+void handleStartTreatmentRequest( MESSAGE_T *message )
 {
     BOOL result = FALSE;
 
-    if ( message->hdr.payloadLen == 0 )
+    if ( 0 == message->hdr.payloadLen )
     {
-        result = userRequestEndTreatment();
+        result = signalUserBeginningTreatment();
     }
 
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, result );
 }
 
 /*********************************************************************//**
  * @brief
- * The sendTreatmentEndResponseMsg function constructs a treatment end
+ * The sendTreatmentStartResponseMsg function constructs a treatment start
  * request response message to the UI and queues the msg for transmit on
  * the appropriate CAN channel.
  * @details Inputs: none
- * @details Outputs: Treatment end response msg constructed and queued.
+ * @details Outputs: Treatment start response msg constructed and queued.
  * @param accepted T/F - request accepted?
+ * @param reason reason code if rejected
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL sendTreatmentEndResponseMsg( BOOL accepted )
+BOOL sendTreatmentStartResponseMsg( BOOL accepted, U32 reason )
 {
     BOOL result;
     MESSAGE_T msg;
     U08 *payloadPtr = msg.payload;
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_HD_TREATMENT_END_RESPONSE;
-    msg.hdr.payloadLen = sizeof( BOOL );
+    msg.hdr.msgID = MSG_ID_HD_START_TREATMENT_RESPONSE;
+    msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( U32 );
 
     memcpy( payloadPtr, &accepted, sizeof( BOOL ) );
+    payloadPtr += sizeof( BOOL );
+    memcpy( payloadPtr, &reason, 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_HD_2_UI, ACK_REQUIRED );
@@ -1844,12 +2183,12 @@
  * response to the UI and queues the msg for transmit on the appropriate CAN channel.
  * @details Inputs: none
  * @details Outputs: Treatment parameters response msg constructed and queued.
- * @param rejected T/F - are settings rejected?
+ * @param accepted T/F - are settings accepted?
  * @param rejectReasons reasons each parameter was rejected (if not accepted)
  * @param byteLength number of bytes that array of reject reasons takes
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL sendTreatmentParametersResponseMsg( BOOL rejected, U08 *rejectReasons, U32 byteLength )
+BOOL sendTreatmentParametersResponseMsg( BOOL accepted, U08 *rejectReasons, U32 byteLength )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -1860,7 +2199,7 @@
     msg.hdr.msgID = MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE;
     msg.hdr.payloadLen = sizeof( BOOL ) + byteLength;
 
-    memcpy( payloadPtr, &rejected, sizeof( BOOL ) );
+    memcpy( payloadPtr, &accepted, sizeof( BOOL ) );
     payloadPtr += sizeof( BOOL );
     memcpy( payloadPtr, rejectReasons, byteLength );
 
@@ -2003,7 +2342,7 @@
         sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
     }
 }
-
+
 /*********************************************************************//**
  * @brief
  * The handleChangeBloodDialysateRateChangeRequest function handles a blood
@@ -2060,6 +2399,31 @@
 
 /*********************************************************************//**
  * @brief
+ * 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 handleHeparinCommandRequest( MESSAGE_T *message )
+{
+    if ( sizeof( U32 ) == message->hdr.payloadLen )
+    {
+        U32 payload;
+
+        memcpy( &payload, &message->payload[0], sizeof( U32 ) );
+
+        userHeparinRequest( (HEPARIN_CMD_T)payload );
+    }
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleSalineBolusRequest function handles a saline bolus request
  * message from the UI.
  * @details Inputs: none
@@ -2122,7 +2486,177 @@
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED );
 
     return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handlRinsebackCmd function handles a rinseback user action command
+ * message from the UI.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handlRinsebackCmd( MESSAGE_T *message )
+{
+    if ( sizeof(U32) == message->hdr.payloadLen )
+    {
+        U32 cmd;
+
+        memcpy( &cmd, &message->payload[0], sizeof(U32) );
+
+        signalRinsebackUserAction( (REQUESTED_RINSEBACK_USER_ACTIONS_T)cmd );
+    }
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
+}
+
+/*********************************************************************//**
+ * @brief
+ * The sendRinsebackCmdResponse function constructs a rinseback user action
+ * response to the UI and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: Rinseback command response msg constructed and queued.
+ * @param accepted T/F - was rinseback user action accepted?
+ * @param rejReason reason why action was rejected (or zero if accepted)
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendRinsebackCmdResponse( BOOL accepted, U32 rejReason )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_RINSEBACK_CMD_RESPONSE;
+    msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( U32 );
+
+    memcpy( payloadPtr, &accepted, sizeof( BOOL ) );
+    payloadPtr += sizeof( BOOL );
+    memcpy( payloadPtr, &rejReason, 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_HD_2_UI, ACK_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTreatmentRecircCmd function handles a treatment re-circ user action command
+ * message from the UI.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTreatmentRecircCmd( MESSAGE_T *message )
+{
+    if ( sizeof(U32) == message->hdr.payloadLen )
+    {
+        U32 cmd;
+
+        memcpy( &cmd, &message->payload[0], sizeof(U32) );
+
+        signalTreatmentRecircUserAction( (REQUESTED_TREATMENT_RECIRC_USER_ACTIONS_T)cmd );
+    }
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
+}
+
+/*********************************************************************//**
+ * @brief
+ * The sendTreatmentRecircCmdResponse function constructs a treatment re-circulation
+ * user action response to the UI and queues the msg for transmit on the appropriate
+ * CAN channel.
+ * @details Inputs: none
+ * @details Outputs: Treatment re-circ command response msg constructed and queued.
+ * @param accepted T/F - was re-circ user action accepted?
+ * @param rejReason reason why action was rejected (or zero if accepted)
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendTreatmentRecircCmdResponse( BOOL accepted, U32 rejReason )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_RECIRC_CMD_RESPONSE;
+    msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( U32 );
+
+    memcpy( payloadPtr, &accepted, sizeof( BOOL ) );
+    payloadPtr += sizeof( BOOL );
+    memcpy( payloadPtr, &rejReason, 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_HD_2_UI, ACK_REQUIRED );
+
+    return result;
 }
+
+/*********************************************************************//**
+ * @brief
+ * The handleTreatmentEndCmd function handles a treatment end user action command
+ * message from the UI.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTreatmentEndCmd( MESSAGE_T *message )
+{
+    if ( sizeof(U32) == message->hdr.payloadLen )
+    {
+        U32 cmd;
+
+        memcpy( &cmd, &message->payload[0], sizeof(U32) );
+
+        signalTreatmentEndUserAction( (REQUESTED_TREATMENT_END_USER_ACTIONS_T)cmd );
+    }
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
+}
+
+/*********************************************************************//**
+ * @brief
+ * The sendTreatmentEndCmdResponse function constructs a treatment end
+ * user action response to the UI and queues the msg for transmit on the
+ * appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: Treatment end command response msg constructed and queued.
+ * @param accepted T/F - was user action accepted?
+ * @param rejReason reason why action was rejected (or zero if accepted)
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendTreatmentEndCmdResponse( BOOL accepted, U32 rejReason )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_TX_END_CMD_RESPONSE;
+    msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( U32 );
+
+    memcpy( payloadPtr, &accepted, sizeof( BOOL ) );
+    payloadPtr += sizeof( BOOL );
+    memcpy( payloadPtr, &rejReason, 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_HD_2_UI, ACK_REQUIRED );
+
+    return result;
+}
 
 /*********************************************************************//**
  * @brief
@@ -3080,7 +3614,7 @@
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
         if ( FALSE == payload.reset )
         {
-            result = testSetBloodPumpOcclusionOverride( payload.state.f32 );
+            result = testSetBloodPumpOcclusionOverride( payload.state.u32 );
         }
         else
         {
@@ -3112,7 +3646,7 @@
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
         if ( FALSE == payload.reset )
         {
-            result = testSetDialInPumpOcclusionOverride( payload.state.f32 );
+            result = testSetDialInPumpOcclusionOverride( payload.state.u32 );
         }
         else
         {
@@ -3144,7 +3678,7 @@
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
         if ( FALSE == payload.reset )
         {
-            result = testSetDialOutPumpOcclusionOverride( payload.state.f32 );
+            result = testSetDialOutPumpOcclusionOverride( payload.state.u32 );
         }
         else
         {
@@ -3478,6 +4012,31 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleTestTreatmentTimeRemainingOverrideRequest function handles a treatment
+ * time remaining override request message.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestTreatmentTimeRemainingOverrideRequest( MESSAGE_T *message )
+{
+    U32  payload;
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof(U32) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(U32) );
+        result = testSetTreatmentTimeRemainingOverride( payload );
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleTestHDSafetyShutdownOverrideRequest function handles a
@@ -3608,84 +4167,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleSetAccelCalibration function handles a request to set
- * accelerometer calibration factors.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleSetAccelCalibration( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-
-    // Verify payload length
-    if ( message->hdr.payloadLen == sizeof(ACCEL_CAL_PAYLOAD_T) )
-    {
-        ACCEL_CAL_PAYLOAD_T payload;
-
-        memcpy( &payload, message->payload, sizeof(ACCEL_CAL_PAYLOAD_T) );
-        result = setAccelCalibration( payload.xOffset, payload.yOffset, payload.zOffset );
-    }
-
-    // Respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
- * @brief
- * The handleSetBloodFlowCalibration function handles a request to set
- * blood flow calibration factors.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleSetBloodFlowCalibration( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-
-    // Verify payload length
-    if ( message->hdr.payloadLen == sizeof(LINEAR_F32_CAL_PAYLOAD_T) )
-    {
-        LINEAR_F32_CAL_PAYLOAD_T payload;
-
-        memcpy( &payload, message->payload, sizeof(LINEAR_F32_CAL_PAYLOAD_T) );
-        result = setBloodFlowCalibration( payload.gain, payload.offset );
-    }
-
-    // Respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
- * @brief
- * The handleSetDialysateFlowCalibration function handles a request to set
- * dialysate flow calibration factors.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleSetDialysateFlowCalibration( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-
-    // Verify payload length
-    if ( message->hdr.payloadLen == sizeof(LINEAR_F32_CAL_PAYLOAD_T) )
-    {
-        LINEAR_F32_CAL_PAYLOAD_T payload;
-
-        memcpy( &payload, message->payload, sizeof(LINEAR_F32_CAL_PAYLOAD_T) );
-        result = setDialInFlowCalibration( payload.gain, payload.offset );
-    }
-
-    // Respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
- * @brief
  * The handleTestSetTreatmentParameter function handles a request to set
  * a specific treatment parameter value.
  * @details Inputs: none
@@ -3909,12 +4390,12 @@
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
-            result = testSetAirTrapLevelOverride( (AIR_TRAP_LEVEL_SENSORS_T)payload.index, (AIR_TRAP_LEVELS_T)(payload.state.u32) );
+            result = testSetAirTrapLevelOverride( (AIR_TRAP_LEVEL_SENSORS_T)payload.index, (AIR_TRAP_LEVELS_T)( payload.state.u32 ) );
         }
         else
         {
@@ -3928,6 +4409,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 handleHDSoftwareResetRequest function handles a request to reset the
  * HD firmware processor.
  * @details Inputs: none
@@ -3960,9 +4505,8 @@
  * @brief
  * The handleTestBloodPumpHomeRequest function handles a request to home
  * the blood pump.
- * @details
- * Inputs : none
- * Outputs : message handled
+ * @details Inputs: none
+ * @details Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
@@ -3983,9 +4527,8 @@
  * @brief
  * The handleTestDialInPumpHomeRequest function handles a request to home
  * the dialysate inlet pump.
- * @details
- * Inputs : none
- * Outputs : message handled
+ * @details Inputs: none
+ * @details Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
@@ -4006,9 +4549,8 @@
  * @brief
  * The handleTestDialOutPumpHomeRequest function handles a request to home
  * the dialysate outlet pump.
- * @details
- * Inputs : none
- * Outputs : message handled
+ * @details Inputs: none
+ * @details Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
@@ -4029,9 +4571,8 @@
  * @brief
  * The handleTestSuperClearAlarmsRequest function handles a request to clear
  * all active alarms.
- * @details
- * Inputs : none
- * Outputs : message handled
+ * @details Inputs: none
+ * @details Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
@@ -4045,8 +4586,6 @@
 
         memcpy( &key, message->payload, sizeof(U32) );
         result = testClearAllAlarms( key );
-
-        result = TRUE;
     }
 
     // Respond to request
@@ -4055,69 +4594,453 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestHDCalibrationDataRequest function handles a request for
- * HD calibration data.
- * @details
- * Inputs : none
- * Outputs : message handled
+ * The handleTestSetOpModeRequest function handles a request to set the
+ * HD operation mode.
+ * @details Inputs: none
+ * @details Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleTestHDCalibrationDataRequest( MESSAGE_T *message )
+void handleTestSetOpModeRequest( MESSAGE_T *message )
 {
     BOOL result = FALSE;
 
+    if ( message->hdr.payloadLen == sizeof(U32) )
+    {
+        U32 mode;
+
+        memcpy( &mode, message->payload, sizeof(U32) );
+        result = testSetOperationMode( (HD_OP_MODE_T)mode );
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+* @brief
+* The handleSetHDCalibrationRecord function handles a request to set the HD
+* calibration data record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleSetHDCalibrationRecord( MESSAGE_T *message )
+{
+    BOOL status = FALSE;
+    U08* payloadPtr = message->payload;
+    U32 currentMessage;
+    U32 totalMessages;
+    U32 payloadLength;
+
+    memcpy(&currentMessage, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
+
+    memcpy(&totalMessages, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
+
+    memcpy(&payloadLength, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
+
+    status = setCalibrationRecord( currentMessage, totalMessages, payloadLength, payloadPtr );
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
+}
+
+/*********************************************************************//**
+* @brief
+* The handleGetHDCalibrationRecord function handles a request to get the HD
+* calibration data record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleGetHDCalibrationRecord( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    // verify payload length
     if ( 0 == message->hdr.payloadLen )
     {
-        CALIBRATION_DATA_T cal;
-        MESSAGE_T msg;
-        U08 *payloadPtr = msg.payload;
+        // Tester must be logged in
+        if ( TRUE == isTestingActivated() )
+        {
+            result = getCalibrationRecord();
+        }
+    }
 
-        // Get calibration data
-        result = getCalibrationData( &cal );
-        if ( TRUE == result )
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestSyringePumpDataBroadcastIntervalOverrideRequest function handles a
+ * request to override the syringe pump data broadcast interval.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestSyringePumpDataBroadcastIntervalOverrideRequest( 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 )
         {
-            // Create a message record
-            blankMessage( &msg );
-            msg.hdr.msgID = MSG_ID_HD_CALIBRATION_DATA;
-            msg.hdr.payloadLen = sizeof( CALIBRATION_DATA_T );
+            result = testSetSyringePumpDataPublishIntervalOverride( (U32)(payload.state.u32) );
+        }
+        else
+        {
+            result = testResetSyringePumpDataPublishIntervalOverride();
+        }
+    }
 
-            memcpy( payloadPtr, &cal, sizeof( CALIBRATION_DATA_T ) );
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
 
-            // 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_HD_BROADCAST, ACK_NOT_REQUIRED );
+/*********************************************************************//**
+ * @brief
+ * The handleTestSyringePumpOperationRequest function handles a
+ * request to initiate a syringe pump operation.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestSyringePumpOperationRequest( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    if ( message->hdr.payloadLen == sizeof(SYRINGE_PUMP_OP_PAYLOAD_T) )
+    {
+        SYRINGE_PUMP_OP_PAYLOAD_T payload;
+
+        memcpy( &payload, message->payload, sizeof(SYRINGE_PUMP_OP_PAYLOAD_T) );
+        result = testSyringePumpOperationRequest( payload );
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestSyringePumpMeasuredRateOverrideRequest function handles a
+ * request to override the syringe pump measured rate.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestSyringePumpMeasuredRateOverrideRequest( 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 = testSetSyringePumpMeasuredRateOverride( payload.state.f32 );
         }
+        else
+        {
+            result = testResetSyringePumpMeasuredRateOverride();
+        }
     }
 
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
 /*********************************************************************//**
+* @brief
+* The handleSetHDSystemRecord function handles a request to set the HD
+* system data record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleSetHDSystemRecord( MESSAGE_T *message )
+{
+    BOOL status = FALSE;
+    U08* payloadPtr = message->payload;
+    U32 currentMessage;
+    U32 totalMessages;
+    U32 payloadLength;
+
+    memcpy(&currentMessage, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
+
+    memcpy(&totalMessages, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
+
+    memcpy(&payloadLength, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
+
+    status = setSystemRecord( currentMessage, totalMessages, payloadLength, payloadPtr );
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
+}
+
+/*********************************************************************//**
+* @brief
+* The handleGetHDSystemRecord function handles a request to get the HD
+* system data record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleGetHDSystemRecord( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( 0 == message->hdr.payloadLen )
+    {
+        // Tester must be logged in
+        if ( TRUE == isTestingActivated() )
+        {
+            result = getSystemRecord();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
  * @brief
- * The handleTestEraseHDCalibrationDataRequest function handles a request for
- * HD calibration data erasure.
- * @details
- * Inputs : none
- * Outputs : message handled
- * @param message a pointer to the message to handle
+ * The handleTestSyringePumpMeasuredForceOverrideRequest function handles a
+ * request to override the syringe pump measured force analog signal.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleTestEraseHDCalibrationDataRequest( MESSAGE_T *message )
+void handleTestSyringePumpMeasuredForceOverrideRequest( MESSAGE_T *message )
 {
+    TEST_OVERRIDE_PAYLOAD_T payload;
     BOOL result = FALSE;
 
-    if ( message->hdr.payloadLen == sizeof(U32) )
+    // Verify payload length
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
-        U32 key;
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetSyringePumpMeasuredForceOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetSyringePumpMeasuredForceOverride();
+        }
+    }
 
-        memcpy( &key, message->payload, sizeof(U32) );
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
 
-        result = testResetCalibrationData( key );
+/*********************************************************************//**
+ * @brief
+ * The handleTestSyringePumpMeasuredSyringeDetectOverrideRequest function handles a
+ * request to override the syringe pump syringe detected analog signal.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestSyringePumpMeasuredSyringeDetectOverrideRequest( 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 = testSetSyringePumpMeasuredSyringeDetectOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetSyringePumpMeasuredSyringeDetectOverride();
+        }
     }
 
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*********************************************************************//**
+* @brief
+* The handleGetHDServiceRecord function handles a request to get the HD
+* service data record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleGetHDServiceRecord( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( 0 == message->hdr.payloadLen )
+    {
+        // Tester must be logged in
+        if ( TRUE == isTestingActivated() )
+        {
+            result = getServiceRecord();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestSyringePumpMeasuredHomeOverrideRequest function handles a
+ * request to override the syringe pump measured home analog signal.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestSyringePumpMeasuredHomeOverrideRequest( 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 = testSetSyringePumpMeasuredHomeOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetSyringePumpMeasuredHomeOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+* @brief
+* The handleSetHDServiceRecord function handles a request to set the HD
+* service data record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleSetHDServiceRecord( MESSAGE_T *message )
+{
+    BOOL status = FALSE;
+    U08* payloadPtr = message->payload;
+    U32 currentMessage;
+    U32 totalMessages;
+    U32 payloadLength;
+
+    memcpy(&currentMessage, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
+
+    memcpy(&totalMessages, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
+
+    memcpy(&payloadLength, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
+
+    status = setServiceRecord( currentMessage, totalMessages, payloadLength, payloadPtr );
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestSyringePumpMeasuredPositionOverrideRequest function handles a
+ * request to override the syringe pump measured position.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestSyringePumpMeasuredPositionOverrideRequest( 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 = testSetSyringePumpMeasuredPositionOverride( (S32)(payload.state.u32) );
+        }
+        else
+        {
+            result = testResetSyringePumpMeasuredPositionOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestSyringePumpMeasuredVolumeOverrideRequest function handles a
+ * request to override the syringe pump measured volume delivered.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestSyringePumpMeasuredVolumeOverrideRequest( 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 = testSetSyringePumpMeasuredVolumeOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetSyringePumpMeasuredVolumeOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /**@}*/