Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -re9e339870c5ed01230963f00d400331ab879c91f -r42b82bcd2bb2c2fa07349108e6b2bd9995173fa4
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision e9e339870c5ed01230963f00d400331ab879c91f)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 42b82bcd2bb2c2fa07349108e6b2bd9995173fa4)
@@ -39,6 +39,7 @@
 #include "StateTxDialysis.h"
 #include "StateTxPaused.h"
 #include "Switches.h"
+#include "SyringePump.h"
 #include "SystemCommTD.h"
 #include "Temperatures.h"
 #include "TxParams.h"
@@ -183,6 +184,20 @@
     { MSG_ID_TD_BLOOD_PRIME_VOLUME_OVERRIDE,                            &testBloodPrimeVolumeOverride },
     { MSG_ID_TD_BLOOD_PRIME_PUBLISH_INTERVAL_OVERRIDE_REQUEST,          &testBloodPrimePublishIntervalOverride },
     { MSG_ID_TD_ENABLE_VENOUS_BUBBLE_ALARM,                             &testEnableVenousBubbleAlarm },
+    { MSG_ID_TD_SYRINGE_PUMP_OPERATION_REQUEST,                         &testSyringePumpOperationRequest },
+    { MSG_ID_HD_SYRINGE_PUMP_PUBLISH_INTERVAL_OVERRIDE,                 &testSyringePumpDataPublishIntervalOverride },
+    { MSG_ID_TD_SYRINGE_PUMP_RATE_OVERRIDE_REQUEST,                     &testSyringePumpMeasuredRateOverride },
+    { MSG_ID_TD_SYRINGE_PUMP_FORCE_OVERRIDE_REQUEST,                    &testSyringePumpMeasuredForceOverride },
+    { MSG_ID_TD_SYRINGE_PUMP_SYRINGE_DETECT_OVERRIDE_REQUEST,           &testSyringePumpMeasuredSyringeDetectOverride },
+    { MSG_ID_TD_SYRINGE_PUMP_HOME_OVERRIDE_REQUEST,                     &testSyringePumpMeasuredHomeOverride },
+    { MSG_ID_TD_SYRINGE_PUMP_POSITION_OVERRIDE_REQUEST,                 &testSyringePumpMeasuredPositionOverride },
+    { MSG_ID_TD_SYRINGE_PUMP_VOLUME_OVERRIDE_REQUEST,                   &testSyringePumpMeasuredVolumeOverride },
+    { MSG_ID_TD_SYRINGE_PUMP_STATUS_OVERRIDE_REQUEST,                   &testSyringePumpStatusOverride },
+    { MSG_ID_TD_SYRINGE_PUMP_ENCODER_STATUS_OVERRIDE_REQUEST,           &testSyringePumpEncoderStatusOverride },
+    { MSG_ID_TD_SYRINGE_PUMP_ADC_DAC_STATUS_OVERRIDE_REQUEST,           &testSyringePumpADCandDACStatusOverride },
+    { MSG_ID_TD_SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE_REQUEST,         &testSyringePumpADCReadCounterOverride },
+    { MSG_ID_TD_SYRINGE_PUMP_FORCE_SENSOR_DAC_OVERRIDE_REQUEST,         &testSyringePumpDACVrefOverride },
+    { MSG_ID_TD_HEPARIN_BOLUS_TARGET_RATE_OVERRIDE_REQUEST,             &testHeparinBolusTargetRateOverride },
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T))