Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r711e8c1a6d5024fa7d013ae37e632f59dc2268fe -r2346a0cb59957d90fe61cb3bff4ec7ffc3df10a4
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 711e8c1a6d5024fa7d013ae37e632f59dc2268fe)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 2346a0cb59957d90fe61cb3bff4ec7ffc3df10a4)
@@ -128,8 +128,7 @@
     signalDialOutPumpHardStop();
     signalDialInPumpHardStop();
 
-    // TODO: Enable when have syringe pump driver
-    // stopSyringePump();
+    stopSyringePump();
 
     // Send treatment log data to UI
     sendTreatmentLogData( &treatmentLogData );
@@ -240,8 +239,7 @@
 
             if ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) )
             {
-                // TODO: Enable when have syringe pump driver
-                //  retractSyringePump();
+                retractSyringePump();
             }
         }
     }
@@ -296,18 +294,16 @@
     {
         if ( FALSE == isCartridgeUnloaded() )
         {
-            activateAlarmNoData( ALARM_ID_CARTRIDGE_REMOVAL_FAILURE );
+            activateAlarmNoData( ALARM_ID_HD_SYRINGE_DETECTED );
         }
 
-        // TODO: Enable when have syringe pump driver
-//        if ( TRUE == isSyringeDetected() )
-//        {
-//            // TODO: alarm
-//        }
+        if ( TRUE == isSyringeDetected() )
+        {
+            activateAlarmNoData( ALARM_ID_HD_SYRINGE_DETECTED );
+        }
 
-        // TODO: Add checks for syringe removed
         if ( ( TRUE == isReservoirOneEmpty ) && ( TRUE == isReservoirTwoEmpty ) &&
-             ( TRUE == isCartridgeUnloaded() ) )
+             ( TRUE == isCartridgeUnloaded() ) && ( FALSE == isSyringeDetected() ) )
         {
             cmdStopDG();
             requestNewOperationMode( MODE_STAN );