Index: dialin/common/msg_defs.py
===================================================================
diff -u -r18c04cbcd10619250868cec39470a2b29c86121b -r1b2e845397cd3f595eaaf743567f09742c737a6d
--- dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 18c04cbcd10619250868cec39470a2b29c86121b)
+++ dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 1b2e845397cd3f595eaaf743567f09742c737a6d)
@@ -216,6 +216,7 @@
     MSG_ID_DG_RO_FLOW_RATE_OVERRIDE = 0xA030                    # DG RO flow rate override
     MSG_ID_DG_RO_PUMP_TARGET_FLOW_OVERRIDE = 0xA031             # DG RO pump target flow rate override
     MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE = 0xA032         # DG RO pump target pressure override
+    MSG_ID_DG_SET_CALIBRATION_DATA = 0xA033                     # DG set calibration data
 
     MSG_ID_HD_DEBUG_EVENT = 0xFFF1                              # HD debug event text to be logged in event log
     MSG_ID_DG_DEBUG_EVENT = 0xFFF2                              # DG debug event text to be logged in event log
Index: dialin/dg/calibration.py
===================================================================
diff -u
--- dialin/dg/calibration.py	(revision 0)
+++ dialin/dg/calibration.py	(revision 1b2e845397cd3f595eaaf743567f09742c737a6d)
@@ -0,0 +1,61 @@
+
+import struct
+from ..common.msg_defs import MsgIds
+from ..protocols.CAN import (DenaliMessage, DenaliChannels)
+from ..utils.base import _AbstractSubSystem, _publish
+from logging import Logger
+
+
+class DGCalibration(_AbstractSubSystem):
+
+    """
+
+    Dialysate Generator (DG) Dialin API sub-class for calibration commands.
+    """
+
+    def __init__(self, can_interface, logger: Logger):
+        """
+
+        @param can_interface: Denali CAN Messenger object
+        """
+
+        super().__init__()
+
+        self.can_interface = can_interface
+        self.logger = logger
+
+        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]}}}
+
+        gain = struct.pack(data['sensors']['ppi']['gain'][0], data['sensors']['ppi']['gain'][1])
+        offset = struct.pack(data['sensors']['ppi']['offset'][0], data['sensors']['ppi']['offset'][1])
+        cal_time = struct.pack(data['sensors']['ppi']['cal_time'][0], data['sensors']['ppi']['cal_time'][1])
+        payload = gain + offset + cal_time
+
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
+                                              message_id=MsgIds.MSG_ID_DG_SET_CALIBRATION_DATA.value,
+                                              payload=payload)
+
+        self.logger.debug('DG calibration started')
+
+        received_message = self.can_interface.send(message)
+
+        # If there is content...
+        if received_message is not None:
+            # response payload is OK or not OK
+            return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
+        else:
+            self.logger.debug("Timeout!!!!")
+            return False
+
Index: dialin/dg/dialysate_generator.py
===================================================================
diff -u -rfffbd99bcd6d15ce790e490e3b455fda43e34b8d -r1b2e845397cd3f595eaaf743567f09742c737a6d
--- dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision fffbd99bcd6d15ce790e490e3b455fda43e34b8d)
+++ dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision 1b2e845397cd3f595eaaf743567f09742c737a6d)
@@ -31,6 +31,7 @@
 from .fans import Fans
 from .uv_reactors import UVReactors
 from .concentrate_pumps import ConcentratePumps
+from .calibration import DGCalibration
 from ..utils.conversions import integer_to_bytearray
 from ..protocols.CAN import (DenaliCanMessenger, DenaliMessage, DenaliChannels)
 from ..utils.base import _AbstractSubSystem, _publish, _LogManager
@@ -148,6 +149,7 @@
         self.thermistors = Thermistors(self.can_interface, self.logger)
         self.fans = Fans(self.can_interface, self.logger)
         self.uv_reactors = UVReactors(self.can_interface, self.logger)
+        self.calibration = DGCalibration(self.can_interface, self.logger)
 
     def get_version(self):
         """
Index: dialin/dg/drain_pump.py
===================================================================
diff -u -re851e75aa1d8f801324442b0cb034ba3e82325c9 -r1b2e845397cd3f595eaaf743567f09742c737a6d
--- dialin/dg/drain_pump.py	(.../drain_pump.py)	(revision e851e75aa1d8f801324442b0cb034ba3e82325c9)
+++ dialin/dg/drain_pump.py	(.../drain_pump.py)	(revision 1b2e845397cd3f595eaaf743567f09742c737a6d)
@@ -112,7 +112,7 @@
         self.drain_pump_state = state
         self.current_drain_pump_rpm = curr_rpm
 
-    def cmd_drain_pump_speed_set_point_override(self, speed, reset=NO_RESET):
+    def cmd_drain_pump_speed_set_point_override(self, speed):
         """
         Constructs and sends the drain pump speed set point override command
         Constraints:
@@ -123,9 +123,9 @@
         @return: 1 if successful, zero otherwise
         """
 
-        rst = integer_to_bytearray(reset)
+        #rst = integer_to_bytearray(reset)
         spd = integer_to_bytearray(speed)
-        payload = rst + spd
+        payload = spd #rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
                                               message_id=MsgIds.MSG_ID_DRAIN_PUMP_SET_RPM_OVERRIDE.value,
Index: tests/dg_heat_disinfect_test.py
===================================================================
diff -u -r94128c59d96218d3e1b3441f9e8cf9b6d77a4754 -r1b2e845397cd3f595eaaf743567f09742c737a6d
--- tests/dg_heat_disinfect_test.py	(.../dg_heat_disinfect_test.py)	(revision 94128c59d96218d3e1b3441f9e8cf9b6d77a4754)
+++ tests/dg_heat_disinfect_test.py	(.../dg_heat_disinfect_test.py)	(revision 1b2e845397cd3f595eaaf743567f09742c737a6d)
@@ -22,9 +22,17 @@
     #dg.thermistors.cmd_thermistors_value_override(52.2, ThermistorsNames.THERMISTOR_ONBOARD_NTC.value, reset=1)
     #sleep(2)
 
+    dg.drain_pump.cmd_drain_pump_speed_set_point_override(500)
+
     while True:
         sleep(0.5)
+        print(dg.drain_pump.drain_pump_state)
+        print(dg.drain_pump.target_drain_pump_rpm)
 
+
+    while True:
+        sleep(0.5)
+
         print('BoardT, {}, Inlet, {}, Outlet, {}, CP1, {}, CP2, {}, OutletR, {}, InletD, {}, '
               'PHThe, {}, THThe, {}, PHCJ, {}, THCJ, {}, PHInt, {}, THInt, {}, FPGA, {}, '
               'LCA1B1, {}, LCA2B2, {}, InTHDo, {}, IntTDi, {}, IntCond, {} Fan1, {}, Fan2, {}'
Index: tests/test_dg_calibration.py
===================================================================
diff -u
--- tests/test_dg_calibration.py	(revision 0)
+++ tests/test_dg_calibration.py	(revision 1b2e845397cd3f595eaaf743567f09742c737a6d)
@@ -0,0 +1,26 @@
+from ctypes import *
+import struct
+from dialin.dg.dialysate_generator import DG
+from dialin.dg.calibration import DGCalibration
+
+if __name__ == "__main__":
+    # Create an instance of the DG Class
+    dg = DG(log_level='DEBUG')
+
+    if dg.cmd_log_in_to_dg() == 0:
+        exit(1)
+
+    cal = dg.calibration
+
+    test = {'sensors': {'ppi': {'gain': ['<f', 12.1], 'offset': ['<f', 2.2], 'cal_time': ['<i', 12345]},
+                        'ppo': {'gain': ['<f', 12.1], 'offset': ['<f', 2.2], 'cal_time': ['<i', 12345]},
+                        }
+            }
+
+    cal.set_dg_calibration_data(test)
+
+#print(test['sensors']['ppi']['gain'])
+
+#s = struct.pack(test['sensors']['ppi']['gain'][0], test['sensors']['ppi']['gain'][1])
+
+#print(s)
\ No newline at end of file