Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -r6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1 -r6c90336ac2cd8cf34ac620cff431a847d9ddf557
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 6c90336ac2cd8cf34ac620cff431a847d9ddf557)
@@ -187,7 +187,11 @@
     MSG_ID_UI_RECIRCULATE_REQUEST = 0xA6
     MSG_ID_TD_RECIRCULATE_RESPONSE = 0xA7
     MSG_ID_TD_RECIRCULATE_DATA = 0xA8
+    MSG_ID_TD_SYRINGE_PUMP_DATA = 0xA9
 
+    MSG_ID_TD_WATER_SAMPLE_RESULT_RESPONSE = 0xAB
+    MSG_ID_TD_WATER_SAMPLE_DATA = 0xAC
+
     MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0
 
     MSG_ID_TD_TESTER_LOGIN_REQUEST = 0x8000
@@ -260,6 +264,19 @@
     MSG_ID_TD_TEMPERATURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8043
     MSG_ID_TD_EJECTOR_OPT_SENSOR_OVERRIDE_REQUEST = 0x8044
     MSG_ID_TD_ENABLE_VENOUS_BUBBLE_ALARM = 0x8047
+    MSG_ID_TD_SYRINGE_PUMP_OPERATION_REQUEST = 0x8048
+    MSG_ID_TD_SYRINGE_PUMP_PUBLISH_INTERVAL_OVERRIDE = 0x8049
+    MSG_ID_TD_SYRINGE_PUMP_RATE_OVERRIDE_REQUEST = 0x8050
+    MSG_ID_TD_SYRINGE_PUMP_FORCE_OVERRIDE_REQUEST = 0x8051
+    MSG_ID_TD_SYRINGE_PUMP_HOME_OVERRIDE_REQUEST = 0x8052
+    MSG_ID_TD_SYRINGE_PUMP_POSITION_OVERRIDE_REQUEST = 0x8053
+    MSG_ID_TD_SYRINGE_PUMP_VOLUME_OVERRIDE_REQUEST = 0x8054
+    MSG_ID_TD_SYRINGE_PUMP_STATUS_OVERRIDE_REQUEST = 0x8055
+    MSG_ID_TD_SYRINGE_PUMP_ENCODER_STATUS_OVERRIDE_REQUEST = 0x8056
+    MSG_ID_TD_SYRINGE_PUMP_ADC_DAC_STATUS_OVERRIDE_REQUEST = 0x8057
+    MSG_ID_TD_SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE_REQUEST = 0x8058
+    MSG_ID_TD_HEPARIN_BOLUS_TARGET_RATE_OVERRIDE_REQUEST = 0x8059
+    MSG_ID_TD_SYRINGE_PUMP_FORCE_SENSOR_CALIBRATION_REQUEST = 0x8060
 
     MSG_ID_TD_TRAINING_TEST_OVERRIDE_REQUEST = 0x8999
 
@@ -354,7 +371,6 @@
     MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST = 0xA059
     MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST = 0xA05A
     MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST = 0xA05B
-    MSG_ID_DD_FLOATER_LEVEL_OVERRIDE_REQUEST = 0xA05C
 
     MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA100
     MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA101
@@ -379,7 +395,7 @@
     MSG_ID_FP_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST = 0xB00D
     MSG_ID_FP_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB00E
     MSG_ID_FP_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB00F
-    MSG_ID_FP_FLOATER_LEVEL_OVERRIDE_REQUEST = 0xB010
+    MSG_ID_FP_LEVEL_OVERRIDE_REQUEST = 0xB010
     MSG_ID_FP_FLOWS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB011
     MSG_ID_FP_FLOW_RATE_OVERRIDE_REQUEST = 0xB012
     MSG_ID_FP_FLOW_TEMP_OVERRIDE_REQUEST = 0xB013