Index: dialin/dg/calibration_record.py
===================================================================
diff -u -r97c98d84604e3700dd446235e91a5ebe2db08022 -ra27383c252f0f2c4468ce2cd6bf1aed38a809fff
--- dialin/dg/calibration_record.py	(.../calibration_record.py)	(revision 97c98d84604e3700dd446235e91a5ebe2db08022)
+++ dialin/dg/calibration_record.py	(.../calibration_record.py)	(revision a27383c252f0f2c4468ce2cd6bf1aed38a809fff)
@@ -183,8 +183,11 @@
 
         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]}
+            hardware[i] = {'fourth_order': ['<f', self._DEFAULT_GAIN_VALUE],
+                           'third_order': ['<f', self._DEFAULT_GAIN_VALUE],
+                           'second_order': ['<f', self._DEFAULT_GAIN_VALUE], '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
@@ -205,8 +208,11 @@
 
         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]}
+            hardware[i] = {'fourth_order': ['<f', self._DEFAULT_GAIN_VALUE],
+                           'third_order': ['<f', self._DEFAULT_GAIN_VALUE],
+                           'second_order': ['<f', self._DEFAULT_GAIN_VALUE], '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])
@@ -228,8 +234,11 @@
 
         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]}
+            hardware[i] = {'fourth_order': ['<f', self._DEFAULT_GAIN_VALUE],
+                           'third_order': ['<f', self._DEFAULT_GAIN_VALUE],
+                           'second_order': ['<f', self._DEFAULT_GAIN_VALUE], '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])
@@ -254,8 +263,11 @@
 
         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]}
+            hardware[i] = {'fourth_order': ['<f', self._DEFAULT_GAIN_VALUE],
+                           'third_order': ['<f', self._DEFAULT_GAIN_VALUE],
+                           'second_order': ['<f', self._DEFAULT_GAIN_VALUE], '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])
@@ -277,8 +289,11 @@
 
         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]}
+            hardware[i] = {'fourth_order': ['<f', self._DEFAULT_GAIN_VALUE],
+                           'third_order': ['<f', self._DEFAULT_GAIN_VALUE],
+                           'second_order': ['<f', self._DEFAULT_GAIN_VALUE], '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])
Index: dialin/hd/calibration_record.py
===================================================================
diff -u -r97c98d84604e3700dd446235e91a5ebe2db08022 -ra27383c252f0f2c4468ce2cd6bf1aed38a809fff
--- dialin/hd/calibration_record.py	(.../calibration_record.py)	(revision 97c98d84604e3700dd446235e91a5ebe2db08022)
+++ dialin/hd/calibration_record.py	(.../calibration_record.py)	(revision a27383c252f0f2c4468ce2cd6bf1aed38a809fff)
@@ -223,8 +223,11 @@
         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]}
+            hardware[i] = {'fourth_order': ['<f', self._DEFAULT_GAIN_VALUE],
+                           'third_order': ['<f', self._DEFAULT_GAIN_VALUE],
+                           'second_order': ['<f', self._DEFAULT_GAIN_VALUE], '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
@@ -245,8 +248,11 @@
         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]}
+            hardware[i] = {'fourth_order': ['<f', self._DEFAULT_GAIN_VALUE],
+                           'third_order': ['<f', self._DEFAULT_GAIN_VALUE],
+                           'second_order': ['<f', self._DEFAULT_GAIN_VALUE], '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
@@ -267,11 +273,11 @@
         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]}
+            hardware[i] = {'fourth_order': ['<f', self._DEFAULT_GAIN_VALUE],
+                           'third_order': ['<f', self._DEFAULT_GAIN_VALUE],
+                           'second_order': ['<f', self._DEFAULT_GAIN_VALUE], '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
@@ -292,11 +298,11 @@
         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]}
+            hardware[i] = {'fourth_order': ['<f', self._DEFAULT_GAIN_VALUE],
+                           'third_order': ['<f', self._DEFAULT_GAIN_VALUE],
+                           'second_order': ['<f', self._DEFAULT_GAIN_VALUE], '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
@@ -317,11 +323,11 @@
         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]}
+            hardware[i] = {'fourth_order': ['<f', self._DEFAULT_GAIN_VALUE],
+                           'third_order': ['<f', self._DEFAULT_GAIN_VALUE],
+                           'second_order': ['<f', self._DEFAULT_GAIN_VALUE], '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
Index: dialin/hd/hemodialysis_device.py
===================================================================
diff -u -ra2cdbc7e007c6bd73e12344b4c89356a20b53f4f -ra27383c252f0f2c4468ce2cd6bf1aed38a809fff
--- dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision a2cdbc7e007c6bd73e12344b4c89356a20b53f4f)
+++ dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision a27383c252f0f2c4468ce2cd6bf1aed38a809fff)
@@ -91,9 +91,9 @@
             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)
+            #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
@@ -134,7 +134,7 @@
         """
         return self.hd_operation_mode
 
-    def get_hd_calibration_data(self):
+    def get_hd_calibration_data(self): #TODO remove
         """
         Gets the HD calibration_record record
 
@@ -143,7 +143,7 @@
         return self.hd_calibration_data
 
     @_publish(["hd_calibration_data"])
-    def _handler_hd_cal_data_sync(self, message):
+    def _handler_hd_cal_data_sync(self, message): #TODO remove
         """
         Handles published HD calibration_record data messages.  Current HD calibration_record data
         is captured for reference.  Call cmd_request_hd_calibration_data() method
Index: tests/hd_valves_test.py
===================================================================
diff -u -r6154b064dd181c32b09982c04ca9ddbca41bf509 -ra27383c252f0f2c4468ce2cd6bf1aed38a809fff
--- tests/hd_valves_test.py	(.../hd_valves_test.py)	(revision 6154b064dd181c32b09982c04ca9ddbca41bf509)
+++ tests/hd_valves_test.py	(.../hd_valves_test.py)	(revision a27383c252f0f2c4468ce2cd6bf1aed38a809fff)
@@ -39,15 +39,15 @@
     overall_time_seconds = 4
     loops = 5
     counter = 0
-    valve = ValvesEnum.VBV
+    valve = ValvesEnum.VBA
 
     valves.cmd_hd_valves_broadcast_interval_override(100)
     sleep(3)
 
     valves.cmd_home_hd_valve(valve.value)
     sleep(5)
 
-    f = open("Valves_Test_200.txt", "w")
+    f = open("Valves_Test_200.log", "w")
 
     while counter < loops:
 
Index: tests/test_dg_calibration.py
===================================================================
diff -u -r97c98d84604e3700dd446235e91a5ebe2db08022 -ra27383c252f0f2c4468ce2cd6bf1aed38a809fff
--- tests/test_dg_calibration.py	(.../test_dg_calibration.py)	(revision 97c98d84604e3700dd446235e91a5ebe2db08022)
+++ tests/test_dg_calibration.py	(.../test_dg_calibration.py)	(revision a27383c252f0f2c4468ce2cd6bf1aed38a809fff)
@@ -16,9 +16,9 @@
 
     f = open("DG_Calibration.log", "w")
 
-    status = True
+    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
@@ -29,8 +29,8 @@
     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.dg_calibration_record['accelerometer_sensor']['accelerometer']['y_offset'][1] = 678.9
-    """
 
+
     print(cal.dg_calibration_record)
 
     try:
Index: tests/test_dg_service_record.py
===================================================================
diff -u -r97c98d84604e3700dd446235e91a5ebe2db08022 -ra27383c252f0f2c4468ce2cd6bf1aed38a809fff
--- tests/test_dg_service_record.py	(.../test_dg_service_record.py)	(revision 97c98d84604e3700dd446235e91a5ebe2db08022)
+++ tests/test_dg_service_record.py	(.../test_dg_service_record.py)	(revision a27383c252f0f2c4468ce2cd6bf1aed38a809fff)
@@ -15,21 +15,21 @@
     utilities = Utils()
     srvc = dg.service_record
 
-    #srvc.dg_service_record['service_record']['service_date'][1] = utilities.get_current_time_in_epoch()
+    srvc.dg_service_record['service_record']['service_date'][1] = utilities.get_current_time_in_epoch()
     print((srvc.dg_service_record))
     #print(len(sys.dg_service_record['system_record']['top_level_pn'][1]))
 
-    srvc.get_dg_service_record()
+    #srvc.get_dg_service_record()
 
-    while True:
-        sleep(0.2)
-        if srvc.current_message == srvc.total_messages:
-            break
+    #while True:
+    #    sleep(0.2)
+    #    if srvc.current_message == srvc.total_messages:
+    #        break
 
     #print(srvc.dg_service_record)
     #print((sys.dg_service_record['system_record']['top_level_pn'][1]))
 
-    #srvc.set_dg_service_record()
+    srvc.set_dg_service_record()
     print(srvc.dg_service_record)
 
     #print(cal.dg_service_record['system_record']['top_level_sn'][1])
\ No newline at end of file