Index: dialin/common/msg_defs.py
===================================================================
diff -u -r3b8ec241845f0bfbeebc3f6e14160b9e7148fc3b -r5b8814a19b1691f263de795014f30cda2e8d72eb
--- dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 3b8ec241845f0bfbeebc3f6e14160b9e7148fc3b)
+++ dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 5b8814a19b1691f263de795014f30cda2e8d72eb)
@@ -91,8 +91,7 @@
     MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST = 0x46             # UI request to change pressure limits
     MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE = 0x47            # HD response to change pressure limits request
     MSG_ID_DG_FANS_DATA = 0x48                                  # DG broadcast fans data
-    MSG_ID_HD_CALIBRATION_DATA = 0x49                           # HD broadcast calibration data
-    MSG_ID_DG_CALIBRATION_DATA = 0x4A                           # DG broadcast calibration data
+    MSG_ID_HD_TREATMENT_STOP_TIMER_DATA = 0x49                  # HD broadcast of treatment stop timer (countdown to treatment stop - no rinseback alarm)
     MSG_ID_UI_HEPARIN_PAUSE_RESUME_REQUEST = 0x4B               # UI request to pause/resume Heparin delivery
     MSG_ID_HD_HEPARIN_PAUSE_RESUME_RESPONSE = 0x4C              # HD Heparin Pause/Resume Response
     MSG_ID_HD_HEPARIN_DATA = 0x4D                               # HD Broadcast heparin data
Index: dialin/dg/calibration.py
===================================================================
diff -u -r1b2e845397cd3f595eaaf743567f09742c737a6d -r5b8814a19b1691f263de795014f30cda2e8d72eb
--- dialin/dg/calibration.py	(.../calibration.py)	(revision 1b2e845397cd3f595eaaf743567f09742c737a6d)
+++ dialin/dg/calibration.py	(.../calibration.py)	(revision 5b8814a19b1691f263de795014f30cda2e8d72eb)
@@ -27,13 +27,7 @@
         if self.can_interface is not None:
 
             channel_id = DenaliChannels.dg_sync_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_DG_CALIBRATION_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
-                                                                       self._handler_dg_calibration_sync)
 
-    def _handler_dg_calibration_sync(self, message):
-        pass
-
     def set_dg_calibration_data(self, data):
 
         #test = {'sensors': {'ppi': {'gain': ['<f', 12.1], 'offset': ['<f', 2.2], 'cal_time': ['<i', 12345]}}}
Index: dialin/hd/hemodialysis_device.py
===================================================================
diff -u -r3b8ec241845f0bfbeebc3f6e14160b9e7148fc3b -r5b8814a19b1691f263de795014f30cda2e8d72eb
--- dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 3b8ec241845f0bfbeebc3f6e14160b9e7148fc3b)
+++ dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 5b8814a19b1691f263de795014f30cda2e8d72eb)
@@ -88,21 +88,10 @@
             msg_id = MsgIds.MSG_ID_HD_OP_MODE.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_hd_op_mode_sync)
-            msg_id = MsgIds.MSG_ID_HD_CALIBRATION_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
-                                                                       self._handler_hd_cal_data_sync)
 
         # create properties
         self.hd_operation_mode = self.HD_OP_MODE_INIT_POST
         self.hd_operation_sub_mode = 0
-        self.hd_calibration_data = {"Revision":0,
-                                    "AccelXOffset":0.0,
-                                    "AccelYOffset":0.0,
-                                    "AccelZOffset":0.0,
-                                    "BloodFlowGain":0.0,
-                                    "BloodFlowOffset":0.0,
-                                    "DialysateFlowGain":0.0,
-                                    "DialysateFlowOffset":0.0}
 
         # Create command groups
 
@@ -129,50 +118,6 @@
         """
         return self.hd_operation_mode
 
-    def get_hd_calibration_data(self):
-        """
-        Gets the HD calibration record
-
-        @return: The hd calibration record
-        """
-        return self.hd_calibration_data
-
-    @_publish(["hd_calibration_data"])
-    def _handler_hd_cal_data_sync(self, message):
-        """
-        Handles published HD calibration data messages.  Current HD calibration data
-        is captured for reference.  Call cmd_request_hd_calibration_data() method
-        to request HD to publish HD calibration data.
-
-        @param message:  published HD calibration data broadcast message
-        @return: None
-        """
-        rev = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))
-        acc_x = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))
-        acc_y = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))
-        acc_z = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))
-        bf_g = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))
-        bf_o = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))
-        df_g = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))
-        df_o = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))
-
-        self.hd_calibration_data["Revision"] = rev[0]
-        self.hd_calibration_data["AccelXOffset"] = acc_x[0]
-        self.hd_calibration_data["AccelYOffset"] = acc_y[0]
-        self.hd_calibration_data["AccelZOffset"] = acc_z[0]
-        self.hd_calibration_data["BloodFlowGain"] = bf_g[0]
-        self.hd_calibration_data["BloodFlowOffset"] = bf_o[0]
-        self.hd_calibration_data["DialysateFlowGain"] = df_g[0]
-        self.hd_calibration_data["DialysateFlowOffset"] = df_o[0]
-
     @_publish(["hd_operation_mode"])
     def _handler_hd_op_mode_sync(self, message):
         """
Index: dialin/hd/syringe_pump.py
===================================================================
diff -u -rc8e3d47e1c55e29eb03eb86207d2c99c2ddcf56d -r5b8814a19b1691f263de795014f30cda2e8d72eb
--- dialin/hd/syringe_pump.py	(.../syringe_pump.py)	(revision c8e3d47e1c55e29eb03eb86207d2c99c2ddcf56d)
+++ dialin/hd/syringe_pump.py	(.../syringe_pump.py)	(revision 5b8814a19b1691f263de795014f30cda2e8d72eb)
@@ -40,6 +40,14 @@
     SYRINGE_PUMP_HEP_CONTINUOUS_STATE = 6
     SYRINGE_PUMP_CONFIG_FORCE_SENSOR_STATE = 7
 
+    # Heparin states
+    HEPARIN_STATE_OFF = 0
+    HEPARIN_STATE_PAUSED = 1
+    HEPARIN_STATE_INITIAL_BOLUS = 2
+    HEPARIN_STATE_DISPENSING = 3
+    HEPARIN_STATE_COMPLETED = 4
+    HEPARIN_STATE_EMPTY = 5
+
     # Syringe pump operations
     SYRINGE_PUMP_OP_STOP = 0
     SYRINGE_PUMP_OP_RETRACT = 1
@@ -63,6 +71,7 @@
                                                                        self._handler_syringe_pump_data)
 
         self.syringe_pump_state = self.SYRINGE_PUMP_INIT_STATE
+        self.heparin_state = self.HEPARIN_STATE_OFF
         self.syringe_pump_set_rate_ml_hr = 0.0
         self.syringe_pump_meas_rate_ml_hr = 0.0
         self.syringe_pump_position = 0
@@ -87,6 +96,20 @@
         """
         return self.syringe_pump_set_rate_ml_hr
 
+    def get_heparin_state(self):
+        """
+        Gets the current Heparin state.
+
+        @return: latest published Heparin state.
+            HEPARIN_STATE_OFF = 0
+            HEPARIN_STATE_PAUSED = 1
+            HEPARIN_STATE_INITIAL_BOLUS = 2
+            HEPARIN_STATE_DISPENSING = 3
+            HEPARIN_STATE_COMPLETED = 4
+            HEPARIN_STATE_EMPTY = 5
+        """
+        return self.heparin_state
+
     def get_syringe_pump_set_rate(self):
         """
         Gets the current set syringe pump rate.
@@ -158,22 +181,25 @@
 
         sta = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))
-        srt = struct.unpack('f', bytearray(
+        hep = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))
-        mrt = struct.unpack('f', bytearray(
+        srt = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))
-        pos = struct.unpack('f', bytearray(
+        mrt = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))
-        vol = struct.unpack('f', bytearray(
+        pos = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))
-        hom = struct.unpack('f', bytearray(
+        vol = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))
-        det = struct.unpack('f', bytearray(
+        hom = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))
-        frc = struct.unpack('f', bytearray(
+        det = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))
+        frc = struct.unpack('f', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))
 
         self.syringe_pump_state = sta[0]
+        self.heparin_state = hep[0]
         self.syringe_pump_set_rate_ml_hr = srt[0]
         self.syringe_pump_meas_rate_ml_hr = mrt[0]
         self.syringe_pump_position = pos[0]
Index: tests/test_lc.py
===================================================================
diff -u -rc8e3d47e1c55e29eb03eb86207d2c99c2ddcf56d -r5b8814a19b1691f263de795014f30cda2e8d72eb
--- tests/test_lc.py	(.../test_lc.py)	(revision c8e3d47e1c55e29eb03eb86207d2c99c2ddcf56d)
+++ tests/test_lc.py	(.../test_lc.py)	(revision 5b8814a19b1691f263de795014f30cda2e8d72eb)
@@ -21,15 +21,11 @@
 from time import sleep
 
 if __name__ == "__main__":
-    # create an HD object called hd
-#    hd = HD(log_level="DEBUG")
     # create a DG object called dg
     dg = DG()
     sleep(2)
 
-    # log in to HD and DG as tester
-#    if hd.cmd_log_in_to_hd() == 0:
-#        exit(1)
+    # log in to DG as tester
 #    if dg.cmd_log_in_to_dg() == 0:
 #        exit(1)
 #    sleep(1)
@@ -43,21 +39,10 @@
             loadCells = "FILTERED:, A1, " + '{:8.2f}'.format(dg.load_cells.load_cell_A1) + \
                 ", B1, " + '{:8.2f}'.format(dg.load_cells.load_cell_B1) + \
                 ", A2, " + '{:8.2f}'.format(dg.load_cells.load_cell_A2) + \
-                ", B2, " + '{:8.2f}'.format(dg.load_cells.load_cell_B2) + "\n"
-            rawLC = "1," + '{:8.2f}'.format(dg.load_cells.rawA1[0]) + "\n" + \
-                "2," + '{:8.2f}'.format(dg.load_cells.rawA1[1]) + "\n" + \
-                "3," + '{:8.2f}'.format(dg.load_cells.rawA1[2]) + "\n" + \
-                "4," + '{:8.2f}'.format(dg.load_cells.rawA1[3]) + "\n" + \
-                "5," + '{:8.2f}'.format(dg.load_cells.rawA1[4]) + "\n" + \
-                "6," + '{:8.2f}'.format(dg.load_cells.rawA1[5]) + "\n" + \
-                "7," + '{:8.2f}'.format(dg.load_cells.rawA1[6]) + "\n" + \
-                "8," + '{:8.2f}'.format(dg.load_cells.rawA1[7]) + "\n" + \
-                "9," + '{:8.2f}'.format(dg.load_cells.rawA1[8]) + "\n" + \
-                "10," + '{:8.2f}'.format(dg.load_cells.rawA1[9]) + "\n"
+                ", B2, " + '{:8.2f}'.format(dg.load_cells.load_cell_B2)
 
             # log data
             f.write(loadCells)
-            f.write(rawLC)
             f.write("\n")
 
             # print to console