Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -re4cc37257141c5227186ac6d8ca3d6c87d009042 -rc62b21415ad7b2a77be6d0b0adf06316d2ccb51b
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision e4cc37257141c5227186ac6d8ca3d6c87d009042)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision c62b21415ad7b2a77be6d0b0adf06316d2ccb51b)
@@ -1098,7 +1098,7 @@
     {
         if ( MODE_TREA != currMode )
         {
-            rejectReason = REQUEST_REJECT_REASON_TREATMENT_TIME_OUT_OF_RANGE;
+            rejectReason = REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE;
         }
         else if ( ( currentTreatmentState <= TREATMENT_START_STATE ) ||
                   ( currentTreatmentState >= TREATMENT_END_STATE ) )
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r61222dea4dcdad959cf343b65a6f92216b252f30 -rc62b21415ad7b2a77be6d0b0adf06316d2ccb51b
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 61222dea4dcdad959cf343b65a6f92216b252f30)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision c62b21415ad7b2a77be6d0b0adf06316d2ccb51b)
@@ -1783,6 +1783,10 @@
                 handleTestBlockMessagesRequest( message );
                 break;
 
+            case MSG_ID_HD_SYRINGE_PUMP_FORCE_SENSOR_DAC_CALIBRATE:
+                handleTestSyringePumpForceSensorCalibrateRequest( message );
+                break;
+
             default:
                 // Unrecognized message ID received - ignore
                 break;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -re4cc37257141c5227186ac6d8ca3d6c87d009042 -rc62b21415ad7b2a77be6d0b0adf06316d2ccb51b
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e4cc37257141c5227186ac6d8ca3d6c87d009042)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c62b21415ad7b2a77be6d0b0adf06316d2ccb51b)
@@ -6464,12 +6464,12 @@
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( sizeof(BLOCKED_MSGS_DATA_T) == message->hdr.payloadLen )
+    if ( sizeof( BLOCKED_MSGS_DATA_T ) == message->hdr.payloadLen )
     {
         if ( TRUE == isTestingActivated() )
         {
             result = TRUE;
-            memcpy( &blockedMessagesForXmit.blockedMessages[0], message->payload, sizeof(BLOCKED_MSGS_DATA_T) );
+            memcpy( &blockedMessagesForXmit.blockedMessages[0], message->payload, sizeof( BLOCKED_MSGS_DATA_T ) );
         }
     }
 
@@ -6479,6 +6479,36 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleTestSyringePumpForceSensorCalibrateRequest function handles a
+ * request message to set the syringe pump DAC reference voltage.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestSyringePumpForceSensorCalibrateRequest( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof( F32 ) == message->hdr.payloadLen )
+    {
+        if ( TRUE == isTestingActivated() )
+        {
+            F32 dacVRef;
+
+            result = TRUE;
+            memcpy( &dacVRef, message->payload, sizeof( F32 ) );
+            setSyringePumpDACVref( dacVRef );
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleTestAlarmAudioVolumeOverrideRequest function handles a
  * request to override the alarm audio volume level.
  * @details Inputs: none
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -re4cc37257141c5227186ac6d8ca3d6c87d009042 -rc62b21415ad7b2a77be6d0b0adf06316d2ccb51b
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision e4cc37257141c5227186ac6d8ca3d6c87d009042)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision c62b21415ad7b2a77be6d0b0adf06316d2ccb51b)
@@ -759,6 +759,8 @@
 // MSG_ID_HD_BLOCK_MESSAGE_TRANSMISSION
 void handleTestBlockMessagesRequest( MESSAGE_T *message );
 
+// MSG_ID_HD_SYRINGE_PUMP_FORCE_SENSOR_DAC_CALIBRATE
+void handleTestSyringePumpForceSensorCalibrateRequest( MESSAGE_T *message );
 
 /**@}*/