Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r05d1dea95ddc57c416a1bbf80ac442fc2e972d54 -rc37161ede44498a31daddc9a309a963a0bed4ded
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 05d1dea95ddc57c416a1bbf80ac442fc2e972d54)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision c37161ede44498a31daddc9a309a963a0bed4ded)
@@ -7,8 +7,8 @@
 *
 * @file    AlarmMgmtSWFaults.h
 *
-* @author  (last)      Raghu Kallala
-* @date    (last)      30-Apr-2026
+* @author  (last)      Arpita Srivastava
+* @date    (last)      12-May-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -187,6 +187,10 @@
     SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER = 156,
     SW_FAULT_ID_INVALID_TREATMENT_MODALITY = 157,
     SW_FAULT_ID_INVALID_DD_DIALYSATE_DATA = 158,
+    SW_FAULT_ID_TD_SYRINGE_INVALID_BOLUS_CMD = 159,
+    SW_FAULT_ID_TD_SYRINGE_INVALID_CONT_CMD = 160,
+    SW_FAULT_ID_TD_SYRINGE_INVALID_STATE = 161,
+    SW_FAULT_ID_TD_SYRINGE_INVALID_VREF = 162,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;
 
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r05d1dea95ddc57c416a1bbf80ac442fc2e972d54 -rc37161ede44498a31daddc9a309a963a0bed4ded
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 05d1dea95ddc57c416a1bbf80ac442fc2e972d54)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision c37161ede44498a31daddc9a309a963a0bed4ded)
@@ -7,8 +7,8 @@
 *
 * @file    Messaging.c
 *
-* @author  (last)      Raghu Kallala
-* @date    (last)      30-Apr-2026
+* @author  (last)      Arpita Srivastava
+* @date    (last)      18-May-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"
@@ -184,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 },
     { MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE,                            &handleUpdateAvailable },
 };
 
Index: firmware/source/sys_main.c
===================================================================
diff -u -r86d861623e84ebdebae69d710fef89fa86f96712 -rc37161ede44498a31daddc9a309a963a0bed4ded
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 86d861623e84ebdebae69d710fef89fa86f96712)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision c37161ede44498a31daddc9a309a963a0bed4ded)
@@ -78,6 +78,7 @@
 #include "OperationModes.h"
 #include "Pressures.h"
 #include "Switches.h"
+#include "SyringePump.h"
 #include "SystemCommTD.h"
 #include "TaskBG.h"
 #include "Temperatures.h"
@@ -203,6 +204,7 @@
     initAirTrap();
     initBloodFlow();
     initEjector();
+    initSyringePump();
     initValves();
     // Initialize modes
     initOperationModes();