Index: dialin/common/msg_defs.py
===================================================================
diff -u -re36d87e663d95c79214f66b5db9aa6d6e8b47adf -ra2cdbc7e007c6bd73e12344b4c89356a20b53f4f
--- dialin/common/msg_defs.py	(.../msg_defs.py)	(revision e36d87e663d95c79214f66b5db9aa6d6e8b47adf)
+++ dialin/common/msg_defs.py	(.../msg_defs.py)	(revision a2cdbc7e007c6bd73e12344b4c89356a20b53f4f)
@@ -92,8 +92,8 @@
     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_CALIBRATION_DATA = 0x49                           # HD broadcast calibration_record data
+    MSG_ID_DG_CALIBRATION_DATA = 0x4A                           # DG broadcast calibration_record data
     MSG_ID_UI_HEPARIN_PAUSE_RESUME_REQUEST = 0x4B               # UI request to pause/resume Heparin delivery
     MSG_ID_HD_HEPARIN_PAUSE_RESUME_RESPONSE = 0x4C              # HD response to pause/resume Heparing delivery request
     MSG_ID_HD_HEPARIN_DATA_BROADCAST = 0x4D                     # HD broadcast of Heparin delivery data
@@ -146,9 +146,9 @@
     MSG_ID_HD_ACCEL_OVERRIDE = 0x8027                           # HD accelerometer sensor override request
     MSG_ID_HD_ACCEL_MAX_OVERRIDE = 0x8028                       # HD accelerometer sensor max. override request
     MSG_ID_HD_ACCEL_SEND_INTERVAL_OVERRIDE = 0x8029             # HD accelerometer data broadcast interval override request
-    MSG_ID_HD_ACCEL_SET_CALIBRATION = 0x802A                    # HD accelerometer set calibration factors request
-    MSG_ID_HD_BLOOD_FLOW_SET_CALIBRATION = 0x802B               # Blood flow set calibration factors request
-    MSG_ID_HD_DIALYSATE_FLOW_SET_CALIBRATION = 0x802C           # Dialysate flow set calibration factors request
+    MSG_ID_HD_ACCEL_SET_CALIBRATION = 0x802A                    # HD accelerometer set calibration_record factors request
+    MSG_ID_HD_BLOOD_FLOW_SET_CALIBRATION = 0x802B               # Blood flow set calibration_record factors request
+    MSG_ID_HD_DIALYSATE_FLOW_SET_CALIBRATION = 0x802C           # Dialysate flow set calibration_record factors request
     MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER = 0x802D        # Set a treatment parameter (will change actual setting, not an override)
     MSG_ID_HD_VALVES_HOME = 0x802E                              # Home an HD Valve
     MSG_ID_HD_VALVES_POSITION_OVERRIDE = 0x802F                 # Set an HD valve to a position in counts
@@ -163,8 +163,17 @@
     MSG_ID_DIAL_IN_PUMP_HOME_CMD = 0x8038                       # Dialysate inlet pump home command
     MSG_ID_DIAL_OUT_PUMP_HOME_CMD = 0x8039                      # Dialysate outlet pump home command
     MSG_ID_SUPER_CLEAR_ALARMS_CMD = 0x803A                      # Clears all alarms (even if non-recoverable or fault)
-    MSG_ID_HD_REQUEST_CALIBRATION_DATA = 0x803B                 # Requests calibration data from HD
-    MSG_ID_HD_ERASE_CALIBRATION_DATA = 0x803C                   # Requests calibration data on HD be erased
+    MSG_ID_HD_REQUEST_CALIBRATION_DATA = 0x803B                 # Requests calibration_record data from HD
+    MSG_ID_HD_ERASE_CALIBRATION_DATA = 0x803C                   # Requests calibration_record data on HD be erased
+    MSG_ID_HD_SET_CALIBRATION_RECORD = 0x803D                   # HD set calibration_record record that is received from Dialin
+    MSG_ID_HD_GET_CALIBRATION_RECORD = 0x803E                   # HD get calibration_record record that is requested from Dialin
+    MSG_ID_HD_SEND_CALIBRATION_RECORD = 0x803F                  # HD send calibration_record record to CAN bus to be received in Dialin (equivalent to publish)
+    MSG_ID_HD_SET_SYSTEM_RECORD = 0x8040                        # HD set system record that is received from Dialin
+    MSG_ID_HD_GET_SYSTEM_RECORD = 0x8041                        # HD get system record that is requested from Dialin
+    MSG_ID_HD_SEND_SYSTEM_RECORD = 0x8042                       # HD send system record to CAN bus to be received in Dialin (equivalent to publish)
+    MSG_ID_HD_GET_SERVICE_RECORD = 0x8043                       # HD get service record that is requested from Dialin
+    MSG_ID_HD_SET_SERVICE_RECORD = 0x8044                       # HD set service record that is received from Dialin
+    MSG_ID_Hd_SEND_SERVICE_RECORD = 0x8045                      # HD send service record to CAN bus to be received in Dialin (equivalent to publish)
 
     MSG_ID_DG_TESTER_LOGIN_REQUEST = 0XA000                     # DG tester log-in
     MSG_ID_DG_ALARM_STATE_OVERRIDE = 0xA001                     # DG alarm state override message ID
@@ -191,7 +200,7 @@
     MSG_ID_DG_ACCEL_OVERRIDE = 0xA017                           # DG accelerometer sensor override request
     MSG_ID_DG_ACCEL_MAX_OVERRIDE = 0xA018                       # DG accelerometer sensor max. override request
     MSG_ID_DG_ACCEL_SEND_INTERVAL_OVERRIDE = 0xA019             # DG accelerometer data broadcast interval override request
-    MSG_ID_DG_ACCEL_SET_CALIBRATION = 0xA01A                    # DG accelerometer set calibration factors request
+    MSG_ID_DG_ACCEL_SET_CALIBRATION = 0xA01A                    # DG accelerometer set calibration_record factors request
     MSG_ID_RO_PUMP_SET_PWM = 0xA01B                             # RO pump set PWM for open loop
     MSG_ID_DRAIN_PUMP_SET_DELTA_PRESSURE_OVERRIDE = 0xA01C      # Drain pump set delta pressure override
     MSG_ID_HEAT_DISINFECT_RECIRC_PATH_DURATION_MINS = 0xA01D    # Heat disinfection recirculation path duration in minutes
@@ -206,7 +215,7 @@
     MSG_ID_CONCENTRATE_PUMP_STATE_CHANGE_REQUEST = 0xA026       # Concentrate pumps' state change request (on / off)
     MSG_ID_CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE = 0xA027  # Concentrate pumps' data publish interval override request
     MSG_ID_DG_START_STOP_INLET_UV_REACTOR = 0xA028              # DG start/stop inlet UV reactor
-    MSG_ID_DG_REQUEST_CALIBRATION_DATA = 0xA029                 # Requests calibration data from DG
+    MSG_ID_DG_REQUEST_CALIBRATION_DATA = 0xA029                 # Requests calibration_record data from DG
     MSG_ID_DG_FANS_DATA_PUBLISH_OVERRIDE = 0xA02A               # Fans data publish interval override request
     MSG_ID_DG_START_STOP_OUTLET_UV_REACTOR = 0xA02B             # DG start/stop outlet UV reactor
     MSG_ID_DG_UV_REACTORS_HEALTH_OVERRIDE = 0xA02C              # DG UV reactors health override request
@@ -216,9 +225,9 @@
     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_RECORD = 0xA033                   # DG set calibration record
-    MSG_ID_DG_GET_CALIBRATION_RECORD = 0xA034                   # DG get calibration record
-    MSG_ID_DG_SEND_CALIBRATION_RECORD = 0xA035                  # DG send calibration record from firmware
+    MSG_ID_DG_SET_CALIBRATION_RECORD = 0xA033                   # DG set calibration_record record
+    MSG_ID_DG_GET_CALIBRATION_RECORD = 0xA034                   # DG get calibration_record record
+    MSG_ID_DG_SEND_CALIBRATION_RECORD = 0xA035                  # DG send calibration_record record from firmware
     MSG_ID_DG_SET_SYSTEM_RECORD = 0xA036                        # DG send system record
     MSG_ID_DG_GET_SYSTEM_RECORD = 0xA037                        # DG get system record
     MSG_ID_DG_SEND_SYSTEM_RECORD = 0xA038                       # DG send system record from firmware
Index: dialin/dg/accelerometer.py
===================================================================
diff -u -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 -ra2cdbc7e007c6bd73e12344b4c89356a20b53f4f
--- dialin/dg/accelerometer.py	(.../accelerometer.py)	(revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3)
+++ dialin/dg/accelerometer.py	(.../accelerometer.py)	(revision a2cdbc7e007c6bd73e12344b4c89356a20b53f4f)
@@ -242,11 +242,11 @@
 
     def cmd_set_accel_calibration(self, x_offset, y_offset, z_offset):
         """
-            Constructs and sends the DG accelerometer axis calibration offsets message to the DG.
+            Constructs and sends the DG accelerometer axis calibration_record offsets message to the DG.
 
-            @param x_offset:  float - calibration offset for X axis
-            @param y_offset:  float - calibration offset for Y axis
-            @param z_offset:  float - calibration offset for Z axis
+            @param x_offset:  float - calibration_record offset for X axis
+            @param y_offset:  float - calibration_record offset for Y axis
+            @param z_offset:  float - calibration_record offset for Z axis
 
             @return: 1 if successful, zero otherwise
         """
@@ -259,7 +259,7 @@
                                               message_id=MsgIds.MSG_ID_DG_ACCEL_SET_CALIBRATION.value,
                                               payload=payload)
 
-        self.logger.debug("Setting DG accelerometer axis calibration offsets")
+        self.logger.debug("Setting DG accelerometer axis calibration_record offsets")
 
         # Send message
         received_message = self.can_interface.send(message)
@@ -268,7 +268,7 @@
         if received_message is not None:
             self.logger.debug(received_message)
             # str_res = str(flow)
-            self.logger.debug("DG accelerometer calibration axis offsets set to : " + str(x_offset) + ", " + str(y_offset) + ", " +
+            self.logger.debug("DG accelerometer calibration_record axis offsets set to : " + str(x_offset) + ", " + str(y_offset) + ", " +
                   str(z_offset) + ".  " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]))
             # response payload is OK or not OK
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
Index: dialin/dg/calibration_record.py
===================================================================
diff -u -ra26b886c2bbe75c1292afa150a63d1d9b8026b3b -ra2cdbc7e007c6bd73e12344b4c89356a20b53f4f
--- dialin/dg/calibration_record.py	(.../calibration_record.py)	(revision a26b886c2bbe75c1292afa150a63d1d9b8026b3b)
+++ dialin/dg/calibration_record.py	(.../calibration_record.py)	(revision a2cdbc7e007c6bd73e12344b4c89356a20b53f4f)
@@ -2,7 +2,6 @@
 import struct
 import datetime
 import time
-import math
 from collections import OrderedDict
 from ..ui.crc import crc_16
 from ..common.msg_defs import MsgIds, MsgFieldPositions
@@ -15,17 +14,17 @@
 class DGCalibration(_AbstractSubSystem):
     """
 
-    Dialysate Generator (DG) Dialin API sub-class for calibration commands.
+    Dialysate Generator (DG) Dialin API sub-class for calibration_record commands.
     """
 
     _RECORD_START_INDEX = 6
     _RECORD_SPECS_BYTES = 12
     CALIBRATION_RECORDS_SPECS_BYTE_ARRAY = 3
     _DEFAULT_GAIN_VALUE = 1
     _DEFAULT_OFFSET_VALUE = 0
-    DEFAULT_RATIO_VALUE = 1
-    DEFAULT_VOLUME_VALUE = 0
-    DEFAULT_CONCENTRATE_VALUE = 1
+    _DEFAULT_RATIO_VALUE = 1
+    _DEFAULT_VOLUME_VALUE = 0
+    _DEFAULT_CONCENTRATE_VALUE = 1
     DEFAULT_BICARB_VALUE = 1
     _DEFAULT_CALIBRATION_VALUE = 1
     _DEFAULT_TIME_VALUE = 0
@@ -44,9 +43,6 @@
 
     _EEPROM_MAX_BYTES_TO_WRITE = 16
 
-    PAYLOAD_CURRENT_MSG_INDEX = 0
-    PAYLOAD_TOTAL_MSG_INDEX = 1
-    PAYLOAD_CAL_BYTES_INDEX = 2
     _PAYLOAD_TRANSFER_DELAY = 0.2
 
     def __init__(self, can_interface, logger: Logger):
@@ -65,7 +61,7 @@
         self.cal_data = 0
         self.raw_cal_record = []
         self.utilities = Utils()
-        # DG calibration main record
+        # DG calibration_record main record
         self.dg_calibration_record = OrderedDict()
 
         if self.can_interface is not None:
@@ -74,30 +70,30 @@
             msg_id = MsgIds.MSG_ID_DG_SEND_CALIBRATION_RECORD.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_dg_calibration_sync)
-        # Prepare the calibration record by putting sub-dictionaries together
+        # Prepare the calibration_record record by putting sub-dictionaries together
         self._prepare_dg_calibration_record()
 
     def get_dg_calibration_record(self):
         """
-        Handles getting DG calibration data from firmware.
+        Handles getting DG calibration_record data from firmware.
 
         @return: None
         """
         # Clear the list for the next call
         self.raw_cal_record.clear()
-        # Run the firmware commands to get the calibration record
+        # Run the firmware commands to get the calibration_record record
         self._request_dg_fw_calibration_record()
 
     def _request_dg_fw_calibration_record(self):
         """
-        Handles getting DG calibration record from firmware.
+        Handles getting DG calibration_record record from firmware.
 
         @return: None
         """
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
                                               message_id=MsgIds.MSG_ID_DG_GET_CALIBRATION_RECORD.value)
 
-        self.logger.debug('Getting DG calibration record')
+        self.logger.debug('Getting DG calibration_record record')
 
         received_message = self.can_interface.send(message)
 
@@ -109,13 +105,13 @@
             self.logger.debug("Timeout!!!!")
             return False
 
-    @_publish(["current_message", "total_messages", "length", "cal_data"]) #TODO do we need to publish these?
+    @_publish(["current_message", "total_messages", "length", "cal_data"])
     def _handler_dg_calibration_sync(self, message):
         """
-        Handles published DG calibration record messages. DG calibration records are captured for processing and
-        updating the DG calibration record.
+        Handles published DG calibration_record record messages. DG calibration_record records are captured for
+        processing and updating the DG calibration_record record.
 
-        @param message:  published DG calibration record data message
+        @param message:  published DG calibration_record record data message
 
         @return: None
         """
@@ -129,15 +125,15 @@
         self.current_message = curr
         self.total_messages = total
         self.length = length
-        # The end of calibration record payload is from the start index + 12 bytes for the current message + total
-        # messages + the length of calibration. The rest is the CAN messaging CRC that is not needed to be kept
+        # The end of calibration_record record payload is from the start index + 12 bytes for the current message + total
+        # messages + the length of calibration_record. The rest is the CAN messaging CRC that is not needed to be kept
         end_of_data_index = self._RECORD_START_INDEX + self._RECORD_SPECS_BYTES + self.length
 
-        # Get the calibration data only
+        # Get the calibration_record data only
         self.cal_data = message['message'][self._RECORD_START_INDEX:end_of_data_index]
 
-        # Continue getting calibration records until the all the calibration messages are received. Concatenate the
-        # calibration records to each other
+        # Continue getting calibration_record records until the all the calibration_record messages are received. Concatenate the
+        # calibration_record records to each other
         if self.current_message <= self.total_messages:
             self.raw_cal_record += (message['message'][self._RECORD_START_INDEX +
                                                        self._RECORD_SPECS_BYTES:end_of_data_index])
@@ -147,7 +143,7 @@
 
     def _prepare_dg_calibration_record(self):
         """
-        Handles assembling the sub dictionaries of each hardware group to make the main DG calibration record.
+        Handles assembling the sub dictionaries of each hardware group to make the main DG calibration_record record.
 
         @return: None
         """
@@ -165,7 +161,7 @@
         bicarb = self._prepare_bicarb_concentrates_record()
         filters = self._prepare_filters_record()
         fans = self._prepare_fans_record()
-        # Build the CRC of the main calibration record
+        # Build the CRC of the main calibration_record record
         record_crc = OrderedDict({'crc': ['<H', self._DEFAULT_CRC_VALUE]})
 
         # The second element of the hardware groups are the byte sizes, add them to calculate the overall byte size.
@@ -181,15 +177,15 @@
         # Create the padding dictionary as list of unsigned char. All the elements are 0.
         padding = OrderedDict({'padding': ['<B', [self._DEFAULT_CRC_VALUE] * padding_size]})
 
-        # Insert the sub dictionaries into the main calibration record. The dictionaries are the element 0.
+        # Insert the sub dictionaries into the main calibration_record record. The dictionaries are the element 0.
         # The padding and CRC dictionaries are created without using tuples.
         self.dg_calibration_record = {**pressure[0], **flow[0], **load_cells[0], **temperature[0], **conductivity[0],
                                       **pumps[0], **volumes[0], **acid[0], **bicarb[0], **filters[0], **fans[0],
                                       **padding, **record_crc}
 
     def _prepare_pressure_sensors_cal_record(self):
         """
-        Handles creating the calibration dictionary of the pressure sensors hardware group.
+        Handles creating the calibration_record dictionary of the pressure sensors hardware group.
 
         @return: pressure sensors hardware group dictionary and the byte size of this hardware group
         """
@@ -212,7 +208,7 @@
 
     def _prepare_flow_sensors_cal_record(self):
         """
-        Handles creating the calibration dictionary of the flow sensors hardware group.
+        Handles creating the calibration_record dictionary of the flow sensors hardware group.
 
         @return: flow sensors hardware group dictionary and the byte size of this hardware group
         """
@@ -235,7 +231,7 @@
 
     def _prepare_load_cells_record(self):
         """
-        Handles creating the calibration dictionary of the load cells hardware group.
+        Handles creating the calibration_record dictionary of the load cells hardware group.
 
         @return: load cells hardware group dictionary and the byte size of this hardware group
         """
@@ -258,7 +254,7 @@
 
     def _prepare_temperature_sensors_record(self):
         """
-        Handles creating the calibration dictionary of the temperature sensors hardware group.
+        Handles creating the calibration_record dictionary of the temperature sensors hardware group.
 
         @return: temperature sensors hardware group dictionary and the byte size of this hardware group
         """
@@ -284,7 +280,7 @@
 
     def _prepare_conductivity_sensors_record(self):
         """
-        Handles creating the calibration dictionary of the conductivity sensors hardware group.
+        Handles creating the calibration_record dictionary of the conductivity sensors hardware group.
 
         @return: conductivity sensors hardware group dictionary and the byte size of this hardware group
         """
@@ -307,7 +303,7 @@
 
     def _prepare_pumps_record(self):
         """
-        Handles creating the calibration dictionary of the DG pumps.
+        Handles creating the calibration_record dictionary of the DG pumps.
 
         @return: DG pumps hardware group dictionary and the byte size of this hardware group
         """
@@ -318,20 +314,20 @@
         hardware = OrderedDict()
 
         for i in hardware_names:
-            # Different pumps have different calibration values
+            # Different pumps have different calibration_record values
             if i == 'concentrate_1' or i == 'concentrate_2':
-                hardware[i] = {'step_speed_2_flow_ratio': ['<f', self.DEFAULT_RATIO_VALUE],
+                hardware[i] = {'step_speed_2_flow_ratio': ['<f', self._DEFAULT_RATIO_VALUE],
                                'cal_time': ['<i', self._DEFAULT_TIME_VALUE],
                                'crc': ['<H', self._DEFAULT_CRC_VALUE]}
             elif i == 'drain':
-                hardware[i] = {'voltage_2_speed_ratio': ['<f', self.DEFAULT_RATIO_VALUE],
-                               'step_speed_2_flow_ratio': ['<f', self.DEFAULT_RATIO_VALUE],
+                hardware[i] = {'voltage_2_speed_ratio': ['<f', self._DEFAULT_RATIO_VALUE],
+                               'step_speed_2_flow_ratio': ['<f', self._DEFAULT_RATIO_VALUE],
                                'cal_time': ['<i', self._DEFAULT_TIME_VALUE],
                                'crc': ['<H', self._DEFAULT_CRC_VALUE]}
             elif i == 'ro':
-                hardware[i] = {'gain_1_ratio': ['<f', self.DEFAULT_RATIO_VALUE],
-                               'gain_2_ratio': ['<f', self.DEFAULT_RATIO_VALUE],
-                               'gain_3_ratio': ['<f', self.DEFAULT_RATIO_VALUE],
+                hardware[i] = {'gain_1_ratio': ['<f', self._DEFAULT_RATIO_VALUE],
+                               'gain_2_ratio': ['<f', self._DEFAULT_RATIO_VALUE],
+                               'gain_3_ratio': ['<f', self._DEFAULT_RATIO_VALUE],
                                'cal_time': ['<i', self._DEFAULT_TIME_VALUE],
                                'crc': ['<H', self._DEFAULT_CRC_VALUE]}
 
@@ -342,7 +338,7 @@
 
     def _prepare_volume_record(self):
         """
-        Handles creating the calibration dictionary of the DG volumes.
+        Handles creating the calibration_record dictionary of the DG volumes.
 
         @return: DG volumes hardware group dictionary and the byte size of this hardware group
         """
@@ -355,23 +351,23 @@
 
         for i in hardware_names:
             if i == 'drain_line':
-                hardware[i] = {'volume': ['<f', self.DEFAULT_VOLUME_VALUE],
+                hardware[i] = {'volume': ['<f', self._DEFAULT_VOLUME_VALUE],
                                'cal_time': ['<i', self._DEFAULT_TIME_VALUE],
                                'crc': ['<H', self._DEFAULT_CRC_VALUE]}
             elif i == 'pre_ro_purge':
-                hardware[i] = {'pressure_2_flow_ratio': ['<f', self.DEFAULT_RATIO_VALUE],
-                               'volume': ['<f', self.DEFAULT_VOLUME_VALUE],
+                hardware[i] = {'pressure_2_flow_ratio': ['<f', self._DEFAULT_RATIO_VALUE],
+                               'volume': ['<f', self._DEFAULT_VOLUME_VALUE],
                                'cal_time': ['<i', self._DEFAULT_TIME_VALUE],
                                'crc': ['<H', self._DEFAULT_CRC_VALUE]}
             elif i == 'reservoir_1' or i == 'reservoir_2':
-                hardware[i] = {'reservoir_volume': ['<f', self.DEFAULT_VOLUME_VALUE],
-                               'normal_fill_volume': ['<f', self.DEFAULT_VOLUME_VALUE],
-                               'max_residual_fluid': ['<f', self.DEFAULT_VOLUME_VALUE],
-                               'reservoir_unfilled_weight': ['<f', self.DEFAULT_VOLUME_VALUE],
+                hardware[i] = {'reservoir_volume': ['<f', self._DEFAULT_VOLUME_VALUE],
+                               'normal_fill_volume': ['<f', self._DEFAULT_VOLUME_VALUE],
+                               'max_residual_fluid': ['<f', self._DEFAULT_VOLUME_VALUE],
+                               'reservoir_unfilled_weight': ['<f', self._DEFAULT_VOLUME_VALUE],
                                'cal_time': ['<i', self._DEFAULT_TIME_VALUE],
                                'crc': ['<H', self._DEFAULT_CRC_VALUE]}
             else:
-                hardware[i] = {'volume': ['<f', self.DEFAULT_VOLUME_VALUE],
+                hardware[i] = {'volume': ['<f', self._DEFAULT_VOLUME_VALUE],
                                'cal_time': ['<i', self._DEFAULT_TIME_VALUE],
                                'crc': ['<H', self._DEFAULT_CRC_VALUE]}
 
@@ -382,7 +378,7 @@
 
     def _prepare_acid_concentrates_record(self):
         """
-        Handles creating the calibration dictionary of the DG acid concentrates.
+        Handles creating the calibration_record dictionary of the DG acid concentrates.
 
         @return: DG acid concentrates hardware group dictionary and the byte size of this hardware group
         """
@@ -393,9 +389,9 @@
         hardware = OrderedDict()
 
         for i in hardware_names:
-            hardware[i] = {'acid_conc_mix_ratio': ['<f', self.DEFAULT_CONCENTRATE_VALUE],
-                           'start_volume': ['<f', self.DEFAULT_VOLUME_VALUE],
-                           'reserved_space': ['<f', self.DEFAULT_VOLUME_VALUE],
+            hardware[i] = {'acid_conc_mix_ratio': ['<f', self._DEFAULT_CONCENTRATE_VALUE],
+                           'start_volume': ['<f', self._DEFAULT_VOLUME_VALUE],
+                           'reserved_space': ['<f', self._DEFAULT_VOLUME_VALUE],
                            'cal_time': ['<i', self._DEFAULT_TIME_VALUE], 'crc': ['<H', self._DEFAULT_CRC_VALUE]}
 
             group_byte_size += self.utilities.calculate_group_byte_size(hardware[i])
@@ -405,7 +401,7 @@
 
     def _prepare_bicarb_concentrates_record(self):
         """
-        Handles creating the calibration dictionary of the DG bicarb concentrates.
+        Handles creating the calibration_record dictionary of the DG bicarb concentrates.
 
         @return: DG bicarb concentrates hardware group dictionary and the byte size of this hardware group
         """
@@ -416,9 +412,9 @@
         hardware = OrderedDict()
 
         for i in hardware_names:
-            hardware[i] = {'bicarb_conc_mix_ratio': ['<f', self.DEFAULT_CONCENTRATE_VALUE],
-                           'start_volume': ['<f', self.DEFAULT_VOLUME_VALUE],
-                           'reserved_space': ['<f', self.DEFAULT_VOLUME_VALUE],
+            hardware[i] = {'bicarb_conc_mix_ratio': ['<f', self._DEFAULT_CONCENTRATE_VALUE],
+                           'start_volume': ['<f', self._DEFAULT_VOLUME_VALUE],
+                           'reserved_space': ['<f', self._DEFAULT_VOLUME_VALUE],
                            'cal_time': ['<i', self._DEFAULT_TIME_VALUE], 'crc': ['<H', self._DEFAULT_CRC_VALUE]}
 
             group_byte_size += self.utilities.calculate_group_byte_size(hardware[i])
@@ -428,7 +424,7 @@
 
     def _prepare_filters_record(self):
         """
-        Handles creating the calibration dictionary of the DG filters.
+        Handles creating the calibration_record dictionary of the DG filters.
 
         @return: DG filters hardware group dictionary and the byte size of this hardware group
         """
@@ -451,7 +447,7 @@
 
     def _prepare_fans_record(self):
         """
-        Handles creating the calibration dictionary of the DG fans.
+        Handles creating the calibration_record dictionary of the DG fans.
 
         @return: DG fans hardware group dictionary and the byte size of this hardware group
         """
@@ -471,9 +467,10 @@
 
         return hardware_group, group_byte_size
 
-    def set_dg_calibration_data(self):
+    def set_dg_calibration_record(self):
         """
-        Handles updating the DG calibration record with the newest calibration data of a hardware and sends it to FW.
+        Handles updating the DG calibration_record record with the newest calibration_record data of a hardware and
+        sends it to FW.
 
         @return: none
         """
@@ -498,7 +495,7 @@
 
         record_packets = self.utilities.prepare_record_to_send_to_fw(self.dg_calibration_record)
 
-        self.logger.debug('DG calibration started')
+        self.logger.debug('DG calibration_record started')
 
         # Update all the data packets with the last message count since is the number of messages that firmware
         # should receive
Index: dialin/dg/dialysate_generator.py
===================================================================
diff -u -re36d87e663d95c79214f66b5db9aa6d6e8b47adf -ra2cdbc7e007c6bd73e12344b4c89356a20b53f4f
--- dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision e36d87e663d95c79214f66b5db9aa6d6e8b47adf)
+++ dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision a2cdbc7e007c6bd73e12344b4c89356a20b53f4f)
@@ -33,7 +33,7 @@
 from .concentrate_pumps import ConcentratePumps
 from .calibration_record import DGCalibration
 from .system_record import DGSystemRecord
-from .service_record import DGServicRecord
+from .service_record import DGService
 from .scheduled_runs_record import DGScheduledRunsRecord
 from ..utils.conversions import integer_to_bytearray
 from ..protocols.CAN import (DenaliCanMessenger, DenaliMessage, DenaliChannels)
@@ -152,9 +152,9 @@
         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)
+        self.calibration_record = DGCalibration(self.can_interface, self.logger)
         self.system_record = DGSystemRecord(self.can_interface, self.logger)
-        self.service_record = DGServicRecord(self.can_interface, self.logger)
+        self.service_record = DGService(self.can_interface, self.logger)
         self.scheduled_runs_record = DGScheduledRunsRecord(self.can_interface, self.logger)
 
     def get_version(self):
Index: dialin/dg/scheduled_runs_record.py
===================================================================
diff -u -re36d87e663d95c79214f66b5db9aa6d6e8b47adf -ra2cdbc7e007c6bd73e12344b4c89356a20b53f4f
--- dialin/dg/scheduled_runs_record.py	(.../scheduled_runs_record.py)	(revision e36d87e663d95c79214f66b5db9aa6d6e8b47adf)
+++ dialin/dg/scheduled_runs_record.py	(.../scheduled_runs_record.py)	(revision a2cdbc7e007c6bd73e12344b4c89356a20b53f4f)
@@ -131,8 +131,8 @@
         # Get the scheduled runs data only
         self.cal_data = message['message'][self.SCHEDULED_RUNS_RECORD_START_INDEX:end_of_data_index]
 
-        # Continue getting calibration records until the all the messages are received. Concatenate the
-        # calibration records to each other
+        # Continue getting calibration_record records until the all the messages are received. Concatenate the
+        # calibration_record records to each other
         if self.current_message <= self.total_messages:
             self.raw_scheduled_runs_record += (message['message'][self.SCHEDULED_RUNS_RECORD_START_INDEX +
                                                                   self.SCHEDULED_RECORD_SPECS_BYTES:end_of_data_index])
@@ -150,7 +150,7 @@
         # Convert the concatenated raw data into a byte array since the struct library requires byte arrays.
         self.raw_scheduled_runs_record = bytearray(self.raw_scheduled_runs_record)
 
-        # Loop through the keys for the main calibration dictionary
+        # Loop through the keys for the main calibration_record dictionary
         # DG_Calibration : {pressure_sensors : { ppi : { gain: ['<f', 12.3], offset: ['<f', 5.67]}}, ...}
         # Get the list of keys of the main dictionary (i.e. pressure_sensors, temperature_sensors, ....}
         # These keys are the list of hardware groups
@@ -181,7 +181,7 @@
                 # Loop through the values of each key to get the list of the hardware in a hardware group (i.e
                 # pressure_sensors have ppi, ppo, ...)
                 for hardware_group in self.DG_SCHEDULED_RUNS_RECORD[group].keys():
-                    # Each hardware has a set of calibration values (i.e ppi: {gain: ['<f',  12.3]}. Loop though those
+                    # Each hardware has a set of calibration_record values (i.e ppi: {gain: ['<f',  12.3]}. Loop though those
                     for hardware in self.DG_SCHEDULED_RUNS_RECORD[group][hardware_group]:
                         # The values of the dictionary of each hardware is a list of its data type as well as its value
                         # which the first index is data type
@@ -288,7 +288,7 @@
 
     def set_dg_scheduled_runs_record(self):
         """
-        Handles updating the DG system record with the newest calibration data of a hardware and sends it to FW.
+        Handles updating the DG system record with the newest calibration_record data of a hardware and sends it to FW.
 
         @return: none
         """
@@ -300,7 +300,7 @@
         current_message_count = 1
         temp_buffer = [0, 0, 0]
 
-        # Loop through the DG calibration dictionary
+        # Loop through the DG calibration_record dictionary
         for group in self.DG_SCHEDULED_RUNS_RECORD.keys():
 
             # NOTE: crc and padding are checked separately since they do not have layered dictionaries
@@ -383,7 +383,7 @@
             # If the data packet is the last one in the list, ignore the last element of the
             # packet since it is the final CRC of the entire dictionary. The final CRC itself
             # is not included in the CRC calculations.
-            # The actual calibration data is started from the 3rd element of the data packet.
+            # The actual calibration_record data is started from the 3rd element of the data packet.
             # The first 3 are current message, total messages, and the payload length of the current packet.
             if scheduled_runs_record_packets.index(cal) == len(scheduled_runs_record_packets) - 1:
                 data += b''.join(cal[self.SCHEDULED_RECORDS_SPECS_BYTE_ARRAY:-1])
@@ -409,7 +409,7 @@
             time.sleep(0.2)
             # Add the number of total messages to each data packet. This was delayed
             # until now since it was not known how many message will it take to pack all the
-            # calibration data.
+            # calibration_record data.
             packet[1] = struct.pack('<i', current_message_count)
             # Convert the list packet to a bytearray
             payload = b''.join(packet)
Index: dialin/dg/service_record.py
===================================================================
diff -u -ra26b886c2bbe75c1292afa150a63d1d9b8026b3b -ra2cdbc7e007c6bd73e12344b4c89356a20b53f4f
--- dialin/dg/service_record.py	(.../service_record.py)	(revision a26b886c2bbe75c1292afa150a63d1d9b8026b3b)
+++ dialin/dg/service_record.py	(.../service_record.py)	(revision a2cdbc7e007c6bd73e12344b4c89356a20b53f4f)
@@ -16,7 +16,7 @@
     SERVICE_LOCATION_FIELD = 1
 
 
-class DGServicRecord(_AbstractSubSystem):
+class DGService(_AbstractSubSystem):
     """
 
     Dialysate Generator (DG) Dialin API sub-class for service record commands.
@@ -133,11 +133,11 @@
         # messages + the length of system record. The rest is the CAN messaging CRC that is not needed to be kept.
         end_of_data_index = self.SERVICE_RECORD_START_INDEX + self.SERVICE_RECORD_SPECS_BYTES + self.length
 
-        # Get the calibration data only
+        # Get the calibration_record data only
         self.cal_data = message['message'][self.SERVICE_RECORD_START_INDEX:end_of_data_index]
 
-        # Continue getting calibration records until the all the calibration messages are received. Concatenate the
-        # calibration records to each other
+        # Continue getting calibration_record records until the all the calibration_record messages are received. Concatenate the
+        # calibration_record records to each other
         if self.current_message <= self.total_messages:
             self.raw_service_record += (message['message'][self.SERVICE_RECORD_START_INDEX +
                                                            self.SERVICE_RECORD_SPECS_BYTES:end_of_data_index])
Index: dialin/dg/system_record.py
===================================================================
diff -u -ra3be707a0f11b8f01ff32199b60b6162238b6e64 -ra2cdbc7e007c6bd73e12344b4c89356a20b53f4f
--- dialin/dg/system_record.py	(.../system_record.py)	(revision a3be707a0f11b8f01ff32199b60b6162238b6e64)
+++ dialin/dg/system_record.py	(.../system_record.py)	(revision a2cdbc7e007c6bd73e12344b4c89356a20b53f4f)
@@ -138,11 +138,11 @@
         # messages + the length of system record. The rest is the CAN messaging CRC that is not needed to be kept.
         end_of_data_index = self.SYSTEM_RECORD_START_INDEX + self.SYSTEM_RECORD_SPECS_BYTES + self.length
 
-        # Get the calibration data only
+        # Get the calibration_record data only
         self.cal_data = message['message'][self.SYSTEM_RECORD_START_INDEX:end_of_data_index]
 
-        # Continue getting calibration records until the all the calibration messages are received. Concatenate the
-        # calibration records to each other
+        # Continue getting calibration_record records until the all the calibration_record messages are received. Concatenate the
+        # calibration_record records to each other
         if self.current_message <= self.total_messages:
             self.raw_sys_record += (message['message'][self.SYSTEM_RECORD_START_INDEX +
                                                        self.SYSTEM_RECORD_SPECS_BYTES:end_of_data_index])
@@ -160,7 +160,7 @@
         # Convert the concatenated raw data into a byte array since the struct library requires byte arrays.
         self.raw_sys_record = bytearray(self.raw_sys_record)
 
-        # Loop through the keys for the main calibration dictionary
+        # Loop through the keys for the main calibration_record dictionary
         # DG_Calibration : {pressure_sensors : { ppi : { gain: ['<f', 12.3], offset: ['<f', 5.67]}}, ...}
         # Get the list of keys of the main dictionary (i.e. pressure_sensors, temperature_sensors, ....}
         # These keys are the list of hardware groups
@@ -292,7 +292,7 @@
 
     def set_dg_system_record(self):
         """
-        Handles updating the DG system record with the newest calibration data of a hardware and sends it to FW.
+        Handles updating the DG system record with the newest calibration_record data of a hardware and sends it to FW.
 
         @return: none
         """
@@ -304,7 +304,7 @@
         current_message_count = 1
         temp_buffer = [0, 0, 0]
 
-        # Loop through the DG calibration dictionary
+        # Loop through the DG calibration_record dictionary
         for group in self.DG_SYSTEM_RECORD.keys():
 
             # NOTE: crc and padding are checked separately since they do not have layered dictionaries
@@ -394,7 +394,7 @@
             # If the data packet is the last one in the list, ignore the last element of the
             # packet since it is the final CRC of the entire dictionary. The final CRC itself
             # is not included in the CRC calculations.
-            # The actual calibration data is started from the 3rd element of the data packet.
+            # The actual calibration_record data is started from the 3rd element of the data packet.
             # The first 3 are current message, total messages, and the payload length of the current packet.
             if sys_record_packets.index(cal) == len(sys_record_packets) - 1:
                 data += b''.join(cal[self.SYSTEM_RECORDS_SPECS_BYTE_ARRAY:-1])
@@ -420,7 +420,7 @@
             time.sleep(0.2)
             # Add the number of total messages to each data packet. This was delayed
             # until now since it was not known how many message will it take to pack all the
-            # calibration data.
+            # calibration_record data.
             packet[1] = struct.pack('<i', current_message_count)
             # Convert the list packet to a bytearray
             payload = b''.join(packet)
Index: dialin/hd/accelerometer.py
===================================================================
diff -u -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 -ra2cdbc7e007c6bd73e12344b4c89356a20b53f4f
--- dialin/hd/accelerometer.py	(.../accelerometer.py)	(revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3)
+++ dialin/hd/accelerometer.py	(.../accelerometer.py)	(revision a2cdbc7e007c6bd73e12344b4c89356a20b53f4f)
@@ -242,11 +242,11 @@
 
     def cmd_set_accel_calibration(self, x_offset, y_offset, z_offset):
         """
-            Constructs and sends the HD accelerometer axis calibration offsets message to the HD.
+            Constructs and sends the HD accelerometer axis calibration_record offsets message to the HD.
 
-            @param x_offset:  float - calibration offset for X axis
-            @param y_offset:  float - calibration offset for Y axis
-            @param z_offset:  float - calibration offset for Z axis
+            @param x_offset:  float - calibration_record offset for X axis
+            @param y_offset:  float - calibration_record offset for Y axis
+            @param z_offset:  float - calibration_record offset for Z axis
 
             @return: 1 if successful, zero otherwise
         """
@@ -259,7 +259,7 @@
                                               message_id=MsgIds.MSG_ID_HD_ACCEL_SET_CALIBRATION.value,
                                               payload=payload)
 
-        self.logger.debug("Setting HD accelerometer axis calibration offsets")
+        self.logger.debug("Setting HD accelerometer axis calibration_record offsets")
 
         # Send message
         received_message = self.can_interface.send(message)
@@ -268,7 +268,7 @@
         if received_message is not None:
             self.logger.debug(received_message)
             # str_res = str(flow)
-            self.logger.debug("HD accelerometer calibration axis offsets set to : " + str(x_offset) + ", " + str(y_offset) + ", " +
+            self.logger.debug("HD accelerometer calibration_record axis offsets set to : " + str(x_offset) + ", " + str(y_offset) + ", " +
                   str(z_offset) + ".  " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]))
             # response payload is OK or not OK
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
Index: dialin/hd/blood_flow.py
===================================================================
diff -u -r363867c876456821000c189f86fbb55b4d583c50 -ra2cdbc7e007c6bd73e12344b4c89356a20b53f4f
--- dialin/hd/blood_flow.py	(.../blood_flow.py)	(revision 363867c876456821000c189f86fbb55b4d583c50)
+++ dialin/hd/blood_flow.py	(.../blood_flow.py)	(revision a2cdbc7e007c6bd73e12344b4c89356a20b53f4f)
@@ -486,7 +486,7 @@
 
     def cmd_set_blood_flow_calibration(self, gain, offset):
         """
-            Constructs and sends a blood flow calibration message to the HD.
+            Constructs and sends a blood flow calibration_record message to the HD.
 
             @return: 1 if successful, zero otherwise
         """
@@ -498,14 +498,14 @@
                                               message_id=MsgIds.MSG_ID_HD_BLOOD_FLOW_SET_CALIBRATION.value,
                                               payload=payload)
 
-        self.logger.debug("Setting blood flow calibration factors")
+        self.logger.debug("Setting blood flow calibration_record factors")
 
         # Send message
         received_message = self.can_interface.send(message)
 
         # If there is content...
         if received_message is not None:
-            self.logger.debug("Blood flow calibration factors set to : " + str(gain) + ", " + str(offset) + ".  " +
+            self.logger.debug("Blood flow calibration_record factors set to : " + str(gain) + ", " + str(offset) + ".  " +
                   str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]))
             # response payload is OK or not OK
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
Index: dialin/hd/calibration_record.py
===================================================================
diff -u
--- dialin/hd/calibration_record.py	(revision 0)
+++ dialin/hd/calibration_record.py	(revision a2cdbc7e007c6bd73e12344b4c89356a20b53f4f)
@@ -0,0 +1,361 @@
+import struct
+import datetime
+import time
+from collections import OrderedDict
+from ..ui.crc import crc_16
+from ..common.msg_defs import MsgIds, MsgFieldPositions
+from ..protocols.CAN import (DenaliMessage, DenaliChannels)
+from ..utils.base import _AbstractSubSystem, _publish
+from ..utils.utils import Utils
+from logging import Logger
+
+
+class HDCalibration(_AbstractSubSystem):
+    """
+
+    Hemodialysis Device (HD) Dialin API sub-class for calibration_record commands.
+    """
+
+    _RECORD_START_INDEX = 6
+    _RECORD_SPECS_BYTES = 12
+    _DEFAULT_GAIN_VALUE = 1
+    _DEFAULT_OFFSET_VALUE = 0
+    _DEFAULT_RATIO_VALUE = 1
+    _DEFAULT_VOLUME_VALUE = 0
+    _DEFAULT_CONCENTRATE_VALUE = 1
+    _DEFAULT_CALIBRATION_VALUE = 1
+    _DEFAULT_TIME_VALUE = 0
+    _DEFAULT_CRC_VALUE = 0
+
+    _EEPROM_MAX_BYTES_TO_WRITE = 16
+    _PAYLOAD_TRANSFER_DELAY = 0.2
+
+    def __init__(self, can_interface, logger: Logger):
+        """
+
+        @param can_interface: Denali CAN Messenger object
+        """
+
+        super().__init__()
+
+        self.can_interface = can_interface
+        self.logger = logger
+        self.current_message = 0
+        self.total_messages = 0
+        self.length = 0
+        self.cal_data = 0
+        self.raw_cal_record = []
+        self.utilities = Utils()
+        # Calibration main record
+        self.hd_calibration_record = OrderedDict()
+
+        if self.can_interface is not None:
+
+            channel_id = DenaliChannels.hd_to_dialin_ch_id
+            msg_id = MsgIds.MSG_ID_HD_SEND_CALIBRATION_RECORD.value
+            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
+                                                                       self._handler_hd_calibration_sync)
+        # Prepare the calibration_record record by putting sub-dictionaries together
+        self._prepare_hd_calibration_record()
+
+    def get_hd_calibration_record(self):
+        """
+        Handles getting HD calibration_record data from firmware.
+
+        @return: None
+        """
+        # Clear the list for the next call
+        self.raw_cal_record.clear()
+        # Run the firmware commands to get the calibration_record record
+        self._request_hd_fw_calibration_record()
+
+    def _request_hd_fw_calibration_record(self):
+        """
+        Handles getting HD calibration_record record from firmware.
+
+        @return: None
+        """
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
+                                              message_id=MsgIds.MSG_ID_HD_GET_CALIBRATION_RECORD.value)
+
+        self.logger.debug('Getting HD calibration record')
+
+        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
+
+    @_publish(["current_message", "total_messages", "length", "cal_data"])
+    def _handler_hd_calibration_sync(self, message):
+        """
+        Handles published HD calibration_record record messages. DG calibration_record records are captured for
+        processing and updating the HD calibration_record record.
+
+        @param message:  published HD calibration_record record data message
+
+        @return: None
+        """
+        curr = struct.unpack('i', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
+        total = struct.unpack('i', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
+        length = struct.unpack('i', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
+
+        self.current_message = curr
+        self.total_messages = total
+        self.length = length
+        # The end of calibration_record record payload is from the start index + 12 bytes for the current message +total
+        # messages + the length of calibration_record. The rest is the CAN messaging CRC that is not needed to be kept
+        end_of_data_index = self._RECORD_START_INDEX + self._RECORD_SPECS_BYTES + self.length
+
+        # Get the calibration_record data only
+        self.cal_data = message['message'][self._RECORD_START_INDEX:end_of_data_index]
+
+        # Continue getting calibration_record records until the all the calibration_record messages are received.
+        # Concatenate the calibration_record records to each other
+        if self.current_message <= self.total_messages:
+            self.raw_cal_record += (message['message'][self._RECORD_START_INDEX +
+                                                       self._RECORD_SPECS_BYTES:end_of_data_index])
+            if self.current_message == self.total_messages:
+                # If all the messages have been received, call another function to process the raw data
+                self.utilities.process_received_record_from_fw(self.hd_calibration_record, self.raw_cal_record)
+
+    def _prepare_hd_calibration_record(self):
+        """
+        Handles assembling the sub dictionaries of each hardware group to make the main HD calibration_record record.
+
+        @return: None
+        """
+        groups_byte_size = 0
+        # create a list of the functions of the sub dictionaries
+        functions = [self._prepare_pumps_record(), self._prepare_valves_record(),
+                     self._prepare_occlusion_sensors_record(), self._prepare_flow_sensors_record(),
+                     self._prepare_pressure_sensors_record(), self._prepare_temperature_sensors_record(),
+                     self._prepare_heparin_force_record()]
+
+        for function in functions:
+            # Update the groups bytes size so far to be use to padding later
+            groups_byte_size += function[1]
+            # Update the calibration record
+            self.hd_calibration_record.update(function[0])
+
+        # Build the CRC of the main calibration_record record
+        record_crc = OrderedDict({'crc': ['<H', self._DEFAULT_CRC_VALUE]})
+
+        # Get the groups byte size
+        groups_byte_size += self.utilities.calculate_group_byte_size(record_crc)
+
+        # Get the padding size to create a dictionary from it
+        padding_size = self.utilities.calculate_padding_byte_size(groups_byte_size, self._EEPROM_MAX_BYTES_TO_WRITE)
+
+        # Create the padding dictionary as list of unsigned char. All the elements are 0.
+        padding = OrderedDict({'padding': ['<B', [self._DEFAULT_CRC_VALUE] * padding_size]})
+
+        # Update the dictionary with the padding and record crc dictionaries
+        self.hd_calibration_record.update(padding)
+        self.hd_calibration_record.update(record_crc)
+
+    def _prepare_pumps_record(self):
+        """
+        Handles creating the calibration_record dictionary of the pumps hardware group.
+
+        @return: pump hardware group dictionary and the byte size of this hardware group
+        """
+        hardware_names = ['bp', 'dpi', 'dpo']
+
+        group_byte_size = 0
+        group_name = 'pumps'
+        hardware_group = OrderedDict({group_name: OrderedDict()})
+        hardware = OrderedDict()
+
+        for i in hardware_names:
+
+            hardware[i] = {'pwm_to_speed': ['<f', self._DEFAULT_RATIO_VALUE],
+                           'speed_to_flow': ['<f', self._DEFAULT_RATIO_VALUE],
+                           'min_current_limit': ['<f', self._DEFAULT_OFFSET_VALUE],
+                           'max_current_limit': ['<f', self._DEFAULT_OFFSET_VALUE],
+                           'cal_time': ['<i', self._DEFAULT_TIME_VALUE], 'crc': ['<H', self._DEFAULT_CRC_VALUE]}
+            # Calculate the size of the bytes in this hardware group
+            group_byte_size += self.utilities.calculate_group_byte_size(hardware[i])
+        hardware_group[group_name] = hardware
+
+        return hardware_group, group_byte_size
+
+    def _prepare_valves_record(self):
+        """
+        Handles creating the calibration_record dictionary of the valves hardware group.
+
+        @return: valves hardware group dictionary and the byte size of this hardware group
+        """
+        hardware_names = ['vbv', 'vba', 'vdi', 'vdo']
+
+        group_byte_size = 0
+        group_name = 'vales'
+        hardware_group = OrderedDict({group_name: OrderedDict()})
+        hardware = OrderedDict()
+
+        for i in hardware_names:
+            hardware[i] = {'counts_to_position': ['<f', self._DEFAULT_RATIO_VALUE],
+                           'cal_time': ['<i', self._DEFAULT_TIME_VALUE], 'crc': ['<H', self._DEFAULT_CRC_VALUE]}
+            # Calculate the size of the bytes in this hardware group
+            group_byte_size += self.utilities.calculate_group_byte_size(hardware[i])
+        hardware_group[group_name] = hardware
+
+        return hardware_group, group_byte_size
+
+    def _prepare_occlusion_sensors_record(self):
+        """
+        Handles creating the calibration_record dictionary of the occlusion sensors hardware group.
+
+        @return: occlusion sensors hardware group dictionary and the byte size of this hardware group
+        """
+        hardware_names = ['ob', 'odi', 'odo']
+
+        group_byte_size = 0
+        group_name = 'occlusion_sensors'
+        hardware_group = OrderedDict({group_name: OrderedDict()})
+        hardware = OrderedDict()
+
+        for i in hardware_names:
+            hardware[i] = {'gain': ['<f', self._DEFAULT_GAIN_VALUE], 'offset': ['<f', self._DEFAULT_OFFSET_VALUE],
+                           'cal_time': ['<i', self._DEFAULT_TIME_VALUE], 'crc': ['<H', self._DEFAULT_CRC_VALUE]}
+            # Calculate the size of the bytes in this hardware group
+            group_byte_size += self.utilities.calculate_group_byte_size(hardware[i])
+        hardware_group[group_name] = hardware
+
+        return hardware_group, group_byte_size
+
+    def _prepare_flow_sensors_record(self):
+        """
+        Handles creating the calibration_record dictionary of the flow sensors hardware group.
+
+        @return: flow sensors hardware group dictionary and the byte size of this hardware group
+        """
+        hardware_names = ['fmb', 'fmd']
+
+        group_byte_size = 0
+        group_name = 'flow_sensors'
+        hardware_group = OrderedDict({group_name: OrderedDict()})
+        hardware = OrderedDict()
+
+        for i in hardware_names:
+            hardware[i] = {'gain': ['<f', self._DEFAULT_GAIN_VALUE], 'offset': ['<f', self._DEFAULT_OFFSET_VALUE],
+                           'cal_time': ['<i', self._DEFAULT_TIME_VALUE], 'crc': ['<H', self._DEFAULT_CRC_VALUE]}
+            # Calculate the size of the bytes in this hardware group
+            group_byte_size += self.utilities.calculate_group_byte_size(hardware[i])
+        hardware_group[group_name] = hardware
+
+        return hardware_group, group_byte_size
+
+    def _prepare_pressure_sensors_record(self):
+        """
+        Handles creating the calibration_record dictionary of the pressure sensors hardware group.
+
+        @return: pressure sensors hardware group dictionary and the byte size of this hardware group
+        """
+        hardware_names = ['pba', 'pbv']
+
+        group_byte_size = 0
+        group_name = 'pressure_sensors'
+        hardware_group = OrderedDict({group_name: OrderedDict()})
+        hardware = OrderedDict()
+
+        for i in hardware_names:
+            hardware[i] = {'gain': ['<f', self._DEFAULT_GAIN_VALUE], 'offset': ['<f', self._DEFAULT_OFFSET_VALUE],
+                           'reserved_param_1': ['<f', self._DEFAULT_OFFSET_VALUE],
+                           'reserved_param_2': ['<f', self._DEFAULT_OFFSET_VALUE],
+                           'reserved_param_3': ['<f', self._DEFAULT_OFFSET_VALUE],
+                           'cal_time': ['<i', self._DEFAULT_TIME_VALUE], 'crc': ['<H', self._DEFAULT_CRC_VALUE]}
+            # Calculate the size of the bytes in this hardware group
+            group_byte_size += self.utilities.calculate_group_byte_size(hardware[i])
+        hardware_group[group_name] = hardware
+
+        return hardware_group, group_byte_size
+
+    def _prepare_temperature_sensors_record(self):
+        """
+        Handles creating the calibration_record dictionary of the temperature sensors hardware group.
+
+        @return: temperature sensors hardware group dictionary and the byte size of this hardware group
+        """
+        hardware_names = ['board_temp_1', 'board_temp_2', 'board_temp_3', 'power_supply']
+
+        group_byte_size = 0
+        group_name = 'temperature_sensors'
+        hardware_group = OrderedDict({group_name: OrderedDict()})
+        hardware = OrderedDict()
+
+        for i in hardware_names:
+            hardware[i] = {'gain': ['<f', self._DEFAULT_GAIN_VALUE], 'offset': ['<f', self._DEFAULT_OFFSET_VALUE],
+                           'reserved_param_1': ['<f', self._DEFAULT_OFFSET_VALUE],
+                           'reserved_param_2': ['<f', self._DEFAULT_OFFSET_VALUE],
+                           'reserved_param_3': ['<f', self._DEFAULT_OFFSET_VALUE],
+                           'cal_time': ['<i', self._DEFAULT_TIME_VALUE], 'crc': ['<H', self._DEFAULT_CRC_VALUE]}
+            # Calculate the size of the bytes in this hardware group
+            group_byte_size += self.utilities.calculate_group_byte_size(hardware[i])
+        hardware_group[group_name] = hardware
+
+        return hardware_group, group_byte_size
+
+    def _prepare_heparin_force_record(self):
+        """
+        Handles creating the calibration_record dictionary of the heparin force sensor hardware group.
+
+        @return: heparin force sensor hardware group dictionary and the byte size of this hardware group
+        """
+        hardware_names = ['heparin_force']
+
+        group_byte_size = 0
+        group_name = 'heparin_force_sensor'
+        hardware_group = OrderedDict({group_name: OrderedDict()})
+        hardware = OrderedDict()
+
+        for i in hardware_names:
+            hardware[i] = {'gain': ['<f', self._DEFAULT_GAIN_VALUE], 'offset': ['<f', self._DEFAULT_OFFSET_VALUE],
+                           'reserved_param_1': ['<f', self._DEFAULT_OFFSET_VALUE],
+                           'reserved_param_2': ['<f', self._DEFAULT_OFFSET_VALUE],
+                           'reserved_param_3': ['<f', self._DEFAULT_OFFSET_VALUE],
+                           'cal_time': ['<i', self._DEFAULT_TIME_VALUE], 'crc': ['<H', self._DEFAULT_CRC_VALUE]}
+            # Calculate the size of the bytes in this hardware group
+            group_byte_size += self.utilities.calculate_group_byte_size(hardware[i])
+        hardware_group[group_name] = hardware
+
+        return hardware_group, group_byte_size
+
+    def set_hd_calibration_record(self):
+        """
+        Handles updating the HD calibration_record record with the newest calibration_record data of a hardware and
+        sends it to FW.
+
+        @return: none
+        """
+        record_packets = self.utilities.prepare_record_to_send_to_fw(self.hd_calibration_record)
+
+        self.logger.debug('HD calibration_record started')
+
+        # Update all the data packets with the last message count since is the number of messages that firmware
+        # should receive
+        for packet in record_packets:
+            # Sleep to let the firmware receive and process the data
+            time.sleep(self._PAYLOAD_TRANSFER_DELAY)
+
+            # Convert the list packet to a bytearray
+            payload = b''.join(packet)
+            #print(len(payload), payload) # TODO remove
+
+            message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
+                                                  message_id=MsgIds.MSG_ID_HD_SET_CALIBRATION_RECORD.value,
+                                                  payload=payload)
+
+            received_message = self.can_interface.send(message)
+
+            # If there is no content...
+            if received_message is None:
+                self.logger.debug("Timeout!!!!")
+                return False
\ No newline at end of file
Index: dialin/hd/dialysate_inlet_flow.py
===================================================================
diff -u -r363867c876456821000c189f86fbb55b4d583c50 -ra2cdbc7e007c6bd73e12344b4c89356a20b53f4f
--- dialin/hd/dialysate_inlet_flow.py	(.../dialysate_inlet_flow.py)	(revision 363867c876456821000c189f86fbb55b4d583c50)
+++ dialin/hd/dialysate_inlet_flow.py	(.../dialysate_inlet_flow.py)	(revision a2cdbc7e007c6bd73e12344b4c89356a20b53f4f)
@@ -490,7 +490,7 @@
 
     def cmd_set_dialysate_flow_calibration(self, gain, offset):
         """
-            Constructs and sends a dialysate flow calibration message to the HD.
+            Constructs and sends a dialysate flow calibration_record message to the HD.
 
             @return: 1 if successful, zero otherwise
         """
@@ -502,15 +502,15 @@
                                               message_id=MsgIds.MSG_ID_HD_DIALYSATE_FLOW_SET_CALIBRATION.value,
                                               payload=payload)
 
-        self.logger.debug("Setting dialysate flow calibration factors")
+        self.logger.debug("Setting dialysate flow calibration_record factors")
 
         # Send message
         received_message = self.can_interface.send(message)
 
         # If there is content...
         if received_message is not None:
             # str_res = str(flow)
-            self.logger.debug("Dialysate flow calibration factors set to : " + str(gain) + ", " + str(offset) + ".  " +
+            self.logger.debug("Dialysate flow calibration_record factors set to : " + str(gain) + ", " + str(offset) + ".  " +
                   str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]))
             # response payload is OK or not OK
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
Index: dialin/hd/hemodialysis_device.py
===================================================================
diff -u -r363867c876456821000c189f86fbb55b4d583c50 -ra2cdbc7e007c6bd73e12344b4c89356a20b53f4f
--- dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 363867c876456821000c189f86fbb55b4d583c50)
+++ dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision a2cdbc7e007c6bd73e12344b4c89356a20b53f4f)
@@ -26,6 +26,9 @@
 from .dialysate_outlet_flow import HDDialysateOutletFlow
 from .treatment import HDTreatment
 from .valves import HDValves
+from .calibration_record import HDCalibration
+from .system_record import HDSystem
+from .service_record import HDService
 from .pressure_occlusion import HDPressureOcclusion
 from ..protocols.CAN import (DenaliMessage,
                              DenaliCanMessenger,
@@ -119,6 +122,9 @@
         self.treatment = HDTreatment(self.can_interface, self.logger)
         self.pressure_occlusion = HDPressureOcclusion(self.can_interface, self.logger)
         self.valves = HDValves(self.can_interface, self.logger)
+        self.calibration_record = HDCalibration(self.can_interface, self.logger)
+        self.system_record = HDSystem(self.can_interface, self.logger)
+        self.service_record = HDService(self.can_interface, self.logger)
 
     def get_operation_mode(self):
         """
@@ -130,20 +136,20 @@
 
     def get_hd_calibration_data(self):
         """
-        Gets the HD calibration record
+        Gets the HD calibration_record record
 
-        @return: The hd calibration record
+        @return: The hd calibration_record 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
+        Handles published HD calibration_record data messages.  Current HD calibration_record data
         is captured for reference.  Call cmd_request_hd_calibration_data() method
-        to request HD to publish HD calibration data.
+        to request HD to publish HD calibration_record data.
 
-        @param message:  published HD calibration data broadcast message
+        @param message:  published HD calibration_record data broadcast message
         @return: None
         """
         rev = struct.unpack('i', bytearray(
@@ -218,7 +224,7 @@
 
     def cmd_hd_request_calibration_data(self):
         """
-        Constructs and sends an HD calibration data request command via CAN bus.
+        Constructs and sends an HD calibration_record data request command via CAN bus.
         Constraints:
             Must be logged into HD.
 
@@ -230,24 +236,24 @@
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
                                               message_id=MsgIds.MSG_ID_HD_REQUEST_CALIBRATION_DATA.value)
 
-        self.logger.debug("requesting HD calibration data.")
+        self.logger.debug("requesting HD calibration_record data.")
 
         # Send message
         received_message = self.can_interface.send(message)
 
         if received_message is not None:
             if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1:
-                self.logger.debug("HD calibration data request accepted.")
+                self.logger.debug("HD calibration_record data request accepted.")
             else:
-                self.logger.debug("HD calibration data request failed.")
+                self.logger.debug("HD calibration_record data request failed.")
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
         else:
             self.logger.debug("Timeout!!!!")
             return False
 
     def cmd_hd_erase_calibration_data(self):
         """
-        Constructs and sends an erase HD calibration data request command via CAN bus.
+        Constructs and sends an erase HD calibration_record data request command via CAN bus.
         Constraints:
             Must be logged into HD.
 
@@ -262,16 +268,16 @@
                                               message_id=MsgIds.MSG_ID_HD_ERASE_CALIBRATION_DATA.value,
                                               payload=key)
 
-        self.logger.debug("requesting HD calibration data be erased.")
+        self.logger.debug("requesting HD calibration_record data be erased.")
 
         # Send message
         received_message = self.can_interface.send(message)
 
         if received_message is not None:
             if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1:
-                self.logger.debug("HD calibration data erasure request accepted.")
+                self.logger.debug("HD calibration_record data erasure request accepted.")
             else:
-                self.logger.debug("HD calibration data erasure request failed.")
+                self.logger.debug("HD calibration_record data erasure request failed.")
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
         else:
             self.logger.debug("Timeout!!!!")
Index: dialin/hd/service_record.py
===================================================================
diff -u
--- dialin/hd/service_record.py	(revision 0)
+++ dialin/hd/service_record.py	(revision a2cdbc7e007c6bd73e12344b4c89356a20b53f4f)
@@ -0,0 +1,59 @@
+import struct
+import datetime
+import time
+from collections import OrderedDict
+from ..common.msg_defs import MsgIds, MsgFieldPositions
+from ..protocols.CAN import (DenaliMessage, DenaliChannels)
+from ..utils.base import _AbstractSubSystem, DialinEnum
+from ..utils.utils import Utils
+from logging import Logger
+from enum import unique
+
+
+@unique
+class ServiceLocation(DialinEnum):
+    SERVICE_LOCATION_FACTORY = 0
+    SERVICE_LOCATION_FIELD = 1
+
+
+class HDService(_AbstractSubSystem):
+    """
+
+    Dialysate Generator (DG) Dialin API sub-class for service record commands.
+    """
+
+    SERVICE_RECORD_START_INDEX = 6
+    SERVICE_RECORD_SPECS_BYTES = 12
+    SERVICE_RECORDS_SPECS_BYTE_ARRAY = 3
+
+    _DEFAULT_SERVICE_LOCATION = ServiceLocation.SERVICE_LOCATION_FACTORY.value
+    DEFAULT_MFG_DATE = 0
+    _DEFAULT_DATE_VALUE = 0
+    _DEFAULT_CRC_VALUE = 0
+    DEFAULT_SYS_PADDING_VALUE = 0
+
+    CURRENT_MESSAGE_NUM_INDEX = 0
+    TOTAL_MESSAGES_NUM_INDEX = 4
+    PAYLOAD_LENGTH_INDEX = 8
+    PAYLOAD_START_INDEX = 12
+
+    SERVICE_DATA_TYPE_INDEX = 0
+    SERVICE_VALUE_INDEX = 1
+
+    TARGET_BYTES_TO_SEND_TO_FW = 150
+    MIN_PAYLOAD_BYTES_SPACE = 4
+
+    _RTC_RAM_MAX_BYTES_TO_WRITE = 64
+
+    _PAYLOAD_TRANSFER_DELAY = 0.2
+    PAYLOAD_CURRENT_MSG_INDEX = 0
+    PAYLOAD_TOTAL_MSG_INDEX = 1
+    PAYLOAD_SERVICE_BYTES_INDEX = 2
+
+    def __init__(self, can_interface, logger: Logger):
+        """
+
+        @param can_interface: Denali CAN Messenger object
+        """
+
+        super().__init__()
Index: dialin/hd/system_record.py
===================================================================
diff -u
--- dialin/hd/system_record.py	(revision 0)
+++ dialin/hd/system_record.py	(revision a2cdbc7e007c6bd73e12344b4c89356a20b53f4f)
@@ -0,0 +1,39 @@
+import struct
+import datetime
+import time
+from collections import OrderedDict
+from ..ui.crc import crc_16
+from ..common.msg_defs import MsgIds, MsgFieldPositions
+from ..protocols.CAN import (DenaliMessage, DenaliChannels)
+from ..utils.base import _AbstractSubSystem, _publish
+from ..utils.utils import Utils
+from logging import Logger
+
+
+class HDSystem(_AbstractSubSystem):
+    """
+
+    Hemodialysis Device (HD) Dialin API sub-class for calibration_record commands.
+    """
+
+    _RECORD_START_INDEX = 6
+    _RECORD_SPECS_BYTES = 12
+    _DEFAULT_GAIN_VALUE = 1
+    _DEFAULT_OFFSET_VALUE = 0
+    _DEFAULT_RATIO_VALUE = 1
+    _DEFAULT_VOLUME_VALUE = 0
+    _DEFAULT_CONCENTRATE_VALUE = 1
+    _DEFAULT_CALIBRATION_VALUE = 1
+    _DEFAULT_TIME_VALUE = 0
+    _DEFAULT_CRC_VALUE = 0
+
+    _EEPROM_MAX_BYTES_TO_WRITE = 16
+    _PAYLOAD_TRANSFER_DELAY = 0.2
+
+    def __init__(self, can_interface, logger: Logger):
+        """
+
+        @param can_interface: Denali CAN Messenger object
+        """
+
+        super().__init__()
Index: dialin/utils/utils.py
===================================================================
diff -u -ra26b886c2bbe75c1292afa150a63d1d9b8026b3b -ra2cdbc7e007c6bd73e12344b4c89356a20b53f4f
--- dialin/utils/utils.py	(.../utils.py)	(revision a26b886c2bbe75c1292afa150a63d1d9b8026b3b)
+++ dialin/utils/utils.py	(.../utils.py)	(revision a2cdbc7e007c6bd73e12344b4c89356a20b53f4f)
@@ -9,7 +9,7 @@
     """
 
     Dialysate Generator (DG) Dialin API sub-class for utilities commands. The commands are used to process
-    the calibration records, service records, system records, and the scheduled runs records. The records are prepared
+    the calibration_record records, service records, system records, and the scheduled runs records. The records are prepared
     to be sent to firmware to be received from firmware.
     """
     _RECORD_START_INDEX = 6
@@ -47,7 +47,7 @@
         # Convert the concatenated raw data into a byte array since the struct library requires byte arrays.
         fw_raw_records_bytes = bytearray(fw_raw_records_bytes)
 
-        # Loop through the keys for the main calibration dictionary
+        # Loop through the keys for the main calibration_record dictionary
         # DG_Calibration : {pressure_sensors : { ppi : { gain: ['<f', 12.3], offset: ['<f', 5.67]}}, ...}
         # Get the list of keys of the main dictionary (i.e. pressure_sensors, temperature_sensors, ....}
         # These keys are the list of hardware groups
@@ -138,7 +138,7 @@
         current_message_count = 1
         temp_buffer = [0, 0, 0]
 
-        # Loop through the DG calibration dictionary
+        # Loop through the DG calibration_record dictionary
         for group in dialin_record.keys():
 
             # NOTE: crc and padding are checked separately since they do not have layered dictionaries
@@ -206,7 +206,7 @@
             # If the data packet is the last one in the list, ignore the last element of the
             # packet since it is the final CRC of the entire dictionary. The final CRC itself
             # is not included in the CRC calculations.
-            # The actual calibration data is started from the 3rd element of the data packet.
+            # The actual calibration_record data is started from the 3rd element of the data packet.
             # The first 3 are current message, total messages, and the payload length of the current packet.
             if self._record_packets_to_send_to_fw.index(svc) == len(self._record_packets_to_send_to_fw) - 1:
                 data += b''.join(svc[self._RECORD_SPECS_BYTE_ARRAY:-1])
Index: tests/set_accels_cal.py
===================================================================
diff -u -rfbe3580dfcda2338d9fa33d09bee85099ea7b801 -ra2cdbc7e007c6bd73e12344b4c89356a20b53f4f
--- tests/set_accels_cal.py	(.../set_accels_cal.py)	(revision fbe3580dfcda2338d9fa33d09bee85099ea7b801)
+++ tests/set_accels_cal.py	(.../set_accels_cal.py)	(revision a2cdbc7e007c6bd73e12344b4c89356a20b53f4f)
@@ -38,7 +38,7 @@
     hd.accel.cmd_set_accel_calibration(0, 0, 0)
     #dg.accel.cmd_set_accel_calibration(0, 0, 0)
 
-    #wait for new readings after calibration reset
+    #wait for new readings after calibration_record reset
     sleep(5)
 
     #calculate offsets (assuming HD and DG systems are level)
Index: tests/test_dg_calibration.py
===================================================================
diff -u -ra26b886c2bbe75c1292afa150a63d1d9b8026b3b -ra2cdbc7e007c6bd73e12344b4c89356a20b53f4f
--- tests/test_dg_calibration.py	(.../test_dg_calibration.py)	(revision a26b886c2bbe75c1292afa150a63d1d9b8026b3b)
+++ tests/test_dg_calibration.py	(.../test_dg_calibration.py)	(revision a2cdbc7e007c6bd73e12344b4c89356a20b53f4f)
@@ -12,7 +12,7 @@
     if dg.cmd_log_in_to_dg() == 0:
         exit(1)
     sleep(2)
-    cal = dg.calibration
+    cal = dg.calibration_record
 
     f = open("DG_Calibration.log", "w")
 
@@ -21,22 +21,22 @@
 
     status = False
 
-    cal.dg_calibration_record['pumps']['concentrate_1']['step_speed_2_flow_ratio'][1] = 34.2
-    cal.dg_calibration_record['pumps']['drain']['cal_time'][1] = 96321
-    cal.dg_calibration_record['pumps']['ro']['gain_3_ratio'][1] = 45.69
-    cal.dg_calibration_record['volumes']['drain_line']['volume'][1] = 125.8
-    cal.dg_calibration_record['volumes']['drain_line']['crc'][1] = 78
-    cal.dg_calibration_record['volumes']['pre_ro_purge']['volume'][1] = 125.8
-    cal.dg_calibration_record['volumes']['reservoir_1']['max_residual_fluid'][1] = 85.36
-    cal.dg_calibration_record['bicarb_concentrates']['bicarb_conc_3']['reserved_space'][1] = 85.36
-    cal.dg_calibration_record['fans']['fan_2']['reserved_space_2'][1] = 456.25
+    cal.hd_calibration_record['pumps']['concentrate_1']['step_speed_2_flow_ratio'][1] = 34.2
+    cal.hd_calibration_record['pumps']['drain']['cal_time'][1] = 96321
+    cal.hd_calibration_record['pumps']['ro']['gain_3_ratio'][1] = 45.69
+    cal.hd_calibration_record['volumes']['drain_line']['volume'][1] = 125.8
+    cal.hd_calibration_record['volumes']['drain_line']['crc'][1] = 78
+    cal.hd_calibration_record['volumes']['pre_ro_purge']['volume'][1] = 125.8
+    cal.hd_calibration_record['volumes']['reservoir_1']['max_residual_fluid'][1] = 85.36
+    cal.hd_calibration_record['bicarb_concentrates']['bicarb_conc_3']['reserved_space'][1] = 85.36
+    cal.hd_calibration_record['fans']['fan_2']['reserved_space_2'][1] = 456.25
 
-    print(cal.dg_calibration_record)
+    print(cal.hd_calibration_record)
 
     try:
         if status:
             dara = []
-            cal.get_dg_calibration_record()
+            cal.get_hd_calibration_record()
             while True:
                 sleep(0.2)
                 #print(cal.current_message, cal.total_messages, cal.cal_data)
@@ -49,9 +49,9 @@
                         f.close()
                         break
         else:
-            cal.set_dg_calibration_data()
+            cal.set_hd_calibration_record()
 
-        print(cal.dg_calibration_record)
+        print(cal.hd_calibration_record)
 
     except KeyboardInterrupt:
         f.close()
Index: tests/test_hd_records.py
===================================================================
diff -u
--- tests/test_hd_records.py	(revision 0)
+++ tests/test_hd_records.py	(revision a2cdbc7e007c6bd73e12344b4c89356a20b53f4f)
@@ -0,0 +1,48 @@
+import sys
+sys.path.append("..")
+from dialin.hd.hemodialysis_device import HD
+
+from time import sleep
+
+if __name__ == "__main__":
+    # create an HD object called hd
+    hd = HD(log_level='DEBUG')
+
+    if hd.cmd_log_in_to_hd() == 0:
+        exit(1)
+    sleep(2)
+
+    cal = hd.calibration_record
+
+    print(cal.hd_calibration_record)
+
+    #cal.hd_calibration_record['pumps']['bp']['pwm_to_speed'][1] = 17.0
+
+    #print(cal.hd_calibration_record)
+
+    status = False
+    try:
+        if status:
+            dara = []
+            cal.get_hd_calibration_record()
+            while True:
+                sleep(0.2)
+                #print(cal.current_message, cal.total_messages, cal.cal_data)
+
+                if cal.cal_data != 0:
+                    #f.write(str(cal.cal_data) + '\r')
+                    dara.append(cal.cal_data)
+
+                    if cal.current_message == cal.total_messages:
+                        #f.close()
+                        break
+        else:
+            cal.set_hd_calibration_record()
+
+        print(cal.hd_calibration_record)
+
+    except KeyboardInterrupt:
+        #f.close()
+        pass
+
+    #cal.set_hd_calibration_record()
\ No newline at end of file