Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -rc53ee66322d78c6c7558731de102424108b480a0 -r8fbb7b6eda15b41620cccfbc4760047ccc9d1043
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision c53ee66322d78c6c7558731de102424108b480a0)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 8fbb7b6eda15b41620cccfbc4760047ccc9d1043)
@@ -272,8 +272,8 @@
     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_SYRINGE_PUMP_FORCE_SENSOR_DAC_OVERRIDE_REQUEST = 0x8059
-    MSG_ID_TD_HEPARIN_BOLUS_TARGET_RATE_OVERRIDE_REQUEST = 0x8060
+    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
 
Index: leahi_dialin/td/modules/syringe_pump.py
===================================================================
diff -u -rb6128620bc2faa9f6c8737a352843869ab1068f0 -r8fbb7b6eda15b41620cccfbc4760047ccc9d1043
--- leahi_dialin/td/modules/syringe_pump.py	(.../syringe_pump.py)	(revision b6128620bc2faa9f6c8737a352843869ab1068f0)
+++ leahi_dialin/td/modules/syringe_pump.py	(.../syringe_pump.py)	(revision 8fbb7b6eda15b41620cccfbc4760047ccc9d1043)
@@ -208,7 +208,7 @@
             reset = NO_RESET,
             channel_id = DenaliChannels.dialin_to_td_ch_id,
             msg_id = MsgIds.MSG_ID_TD_SYRINGE_PUMP_RATE_OVERRIDE_REQUEST,
-            entity_name = f'Override TD syringe pump measured rate',
+            entity_name = f'TD syringe pump measured rate',
             override_text = f'{rate} ',
             logger = self.logger,
             can_interface = self.can_interface)
@@ -234,7 +234,7 @@
             reset = NO_RESET,
             channel_id = DenaliChannels.dialin_to_td_ch_id,
             msg_id = MsgIds.MSG_ID_TD_SYRINGE_PUMP_FORCE_OVERRIDE_REQUEST,
-            entity_name = f'Override TD syringe pump measured force',
+            entity_name = f'TD syringe pump measured force',
             override_text = f'{volts} ',
             logger = self.logger,
             can_interface = self.can_interface)
@@ -260,7 +260,7 @@
             reset = NO_RESET,
             channel_id = DenaliChannels.dialin_to_td_ch_id,
             msg_id = MsgIds.MSG_ID_TD_SYRINGE_PUMP_HOME_OVERRIDE_REQUEST,
-            entity_name = f'Override TD syringe pump measured home',
+            entity_name = f'TD syringe pump measured home',
             override_text = f'{volts} ',
             logger = self.logger,
             can_interface = self.can_interface)
@@ -286,7 +286,7 @@
             reset = NO_RESET,
             channel_id = DenaliChannels.dialin_to_td_ch_id,
             msg_id = MsgIds.MSG_ID_TD_SYRINGE_PUMP_POSITION_OVERRIDE_REQUEST,
-            entity_name = f'Override TD syringe pump measured position',
+            entity_name = f'TD syringe pump measured position',
             override_text = f'{position} ',
             logger = self.logger,
             can_interface = self.can_interface)
@@ -312,7 +312,7 @@
             reset = NO_RESET,
             channel_id = DenaliChannels.dialin_to_td_ch_id,
             msg_id = MsgIds.MSG_ID_TD_SYRINGE_PUMP_VOLUME_OVERRIDE_REQUEST,
-            entity_name = f'Override TD syringe pump volume delivered',
+            entity_name = f'TD syringe pump volume delivered',
             override_text = f'{volume} ',
             logger = self.logger,
             can_interface = self.can_interface)
@@ -338,7 +338,7 @@
             reset = NO_RESET,
             channel_id = DenaliChannels.dialin_to_td_ch_id,
             msg_id = MsgIds.MSG_ID_TD_SYRINGE_PUMP_STATUS_OVERRIDE_REQUEST,
-            entity_name = f'Override TD syringe pump status',
+            entity_name = f'TD syringe pump status',
             override_text = f'{status} ',
             logger = self.logger,
             can_interface = self.can_interface)
@@ -364,7 +364,7 @@
             reset = NO_RESET,
             channel_id = DenaliChannels.dialin_to_td_ch_id,
             msg_id = MsgIds.MSG_ID_TD_SYRINGE_PUMP_ENCODER_STATUS_OVERRIDE_REQUEST,
-            entity_name = f'Override TD syringe pump encoder status',
+            entity_name = f'TD syringe pump encoder status',
             override_text = f'{status} ',
             logger = self.logger,
             can_interface = self.can_interface)
@@ -390,7 +390,7 @@
             reset=NO_RESET,
             channel_id=DenaliChannels.dialin_to_td_ch_id,
             msg_id=MsgIds.MSG_ID_TD_SYRINGE_PUMP_ADC_DAC_STATUS_OVERRIDE_REQUEST,
-            entity_name=f'Override TD syringe pump ADC & DAC status',
+            entity_name=f'TD syringe pump ADC & DAC status',
             override_text=f'{status} ',
             logger=self.logger,
             can_interface=self.can_interface)
@@ -416,59 +416,53 @@
             reset=NO_RESET,
             channel_id=DenaliChannels.dialin_to_td_ch_id,
             msg_id=MsgIds.MSG_ID_TD_SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE_REQUEST,
-            entity_name=f'Override TD syringe pump ADC read counter',
+            entity_name=f'TD syringe pump ADC read counter',
             override_text=f'{counter} ',
             logger=self.logger,
             can_interface=self.can_interface)
 
 
-    def cmd_set_syringe_pump_dac_ref_voltage_override(self, vref: float = 0.0, reset: int = NO_RESET) -> int:
+    def cmd_heparin_target_rate_override(self, rate: float, reset: int = NO_RESET) -> int:
         """
-        Constructs and sends the set syringe pump DAC vRef. The value the DAC is set to is within TD Calibration Record.
+        Constructs and sends the heparin bolus target rate value override command
         Constraints:
             Must be logged into TD.
 
-        @param vref:  float - vref to override with
-        @param reset:  integer - 1 to reset a previous override, 0 to override
-
-        @return: 1 if successful, zero otherwise
+        @param rate: (float) the heparin bolus target rate to be set in mL/hour
+        @param reset: (int) 1 to reset a previous override, 0 to override
+        @return 1 if successful, zero otherwise
         """
+        reset_value = integer_to_bytearray(reset)
+        vlu = float_to_bytearray(rate)    # TD expects the rate in mL/hour
+        payload = reset_value + vlu
 
-        rst = integer_to_bytearray(reset)
-        ref = float_to_bytearray(vref)
-        payload = rst + ref
-
         return cmd_generic_override(
             payload=payload,
             reset=NO_RESET,
             channel_id=DenaliChannels.dialin_to_td_ch_id,
-            msg_id=MsgIds.MSG_ID_TD_SYRINGE_PUMP_FORCE_SENSOR_DAC_OVERRIDE_REQUEST,
-            entity_name=f'Override TD syringe pump DAC reference voltage',
-            override_text=f'{vref} ',
+            msg_id=MsgIds.MSG_ID_TD_HEPARIN_BOLUS_TARGET_RATE_OVERRIDE_REQUEST,
+            entity_name=f'TD heparin bolus target rate value',
+            override_text=f'{rate} ',
             logger=self.logger,
             can_interface=self.can_interface)
 
-
-    def cmd_heparin_target_rate_override(self, rate: float, reset: int = NO_RESET) -> int:
+    def cmd_calibrate_force_sensor(self) -> int:
         """
-        Constructs and sends the heparin bolus target rate value override command
+        Constructs and sends the set syringe pump DAC vRef. The value the DAC is set to is within TD Calibration Record.
         Constraints:
             Must be logged into TD.
+            TD NVM heparin calibration record must be up to date (min: 0.0, max: 3.3)
+            Syringe Pump must be in off state
 
-        @param rate: (float) the heparin bolus target rate to be set in mL/hour
-        @param reset: (int) 1 to reset a previous override, 0 to override
-        @return 1 if successful, zero otherwise
+        @return: 1 if successful, zero otherwise
         """
-        reset_value = integer_to_bytearray(reset)
-        vlu = float_to_bytearray(rate)    # TD expects the rate in mL/hour
-        payload = reset_value + vlu
 
         return cmd_generic_override(
-            payload=payload,
+            payload=None,
             reset=NO_RESET,
             channel_id=DenaliChannels.dialin_to_td_ch_id,
-            msg_id=MsgIds.MSG_ID_TD_HEPARIN_BOLUS_TARGET_RATE_OVERRIDE_REQUEST,
-            entity_name=f'Override TD heparin bolus target rate value override"',
-            override_text=f'{rate} ',
+            msg_id=MsgIds.MSG_ID_TD_SYRINGE_PUMP_FORCE_SENSOR_CALIBRATION_REQUEST,
+            entity_name=f'TD syringe pump calibrate force sensor',
+            override_text=f' ',
             logger=self.logger,
             can_interface=self.can_interface)