Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -re9e339870c5ed01230963f00d400331ab879c91f -rc1e18c14a172586f47ebcf027bce9669beded986
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision e9e339870c5ed01230963f00d400331ab879c91f)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision c1e18c14a172586f47ebcf027bce9669beded986)
@@ -8,7 +8,7 @@
 * @file    Messaging.c
 *
 * @author  (last)      Raghu Kallala
-* @date    (last)      06-Apr-2026
+* @date    (last)      30-Apr-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -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"
@@ -106,6 +107,7 @@
     { MSG_ID_FW_VERSIONS_REQUEST,                                       &handleVersionRequestMessage },
     { MSG_ID_UI_CHECK_IN,                                               &handleUICheckIn },
     { MSG_ID_DD_OP_MODE_DATA,                                           &setDDOpMode },
+    { MSG_ID_DD_GEN_DIALYSATE_MODE_DATA,                                &setDialysateData },
     { MSG_ID_DD_PRESSURES_DATA,                                         &setDialysatePressure },
     { MSG_ID_UI_TREATMENT_PARAMS_TO_VALIDATE,                           &validateAndSetTreatmentParameters },
     { MSG_ID_UI_INITIATE_TREATMENT_WORKFLOW,                            &signalUserInitiateTreatment },
@@ -183,6 +185,19 @@
     { 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_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_HEPARIN_BOLUS_TARGET_RATE_OVERRIDE_REQUEST,             &testHeparinBolusTargetRateOverride },
+    { MSG_ID_TD_SYRINGE_PUMP_FORCE_SENSOR_CALIBRATION_REQUEST,          &testCalibrateForceSensor },
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T))