Index: dialin/dg/calibration.py
===================================================================
diff -u -r5dabfb699311d0b04353c3db846aba742568bcc1 -ra2c50fa966d483afdcff983ef80b03d2d0e77b5b
--- dialin/dg/calibration.py	(.../calibration.py)	(revision 5dabfb699311d0b04353c3db846aba742568bcc1)
+++ dialin/dg/calibration.py	(.../calibration.py)	(revision a2c50fa966d483afdcff983ef80b03d2d0e77b5b)
@@ -23,7 +23,7 @@
     DEFAULT_GAIN_VALUE = 1
     DEFAULT_OFFSET_VALUE = 0
     DEFAULT_RATIO_VALUE = 1
-    DEFAULT_CONSTANT_VALUE = 0
+    DEFAULT_VOLUME_VALUE = 0
     DEFAULT_CAL_TIME_VALUE = 0
     DEFAULT_CAL_CRC_VALUE = 0
 
@@ -136,9 +136,8 @@
         if self.current_message <= self.total_messages:
             self.raw_cal_record += (message['message'][self.CALIBRATION_RECORD_START_INDEX +
                                                        self.CALIBRATION_RECORD_SPECS_BYTES:end_of_data_index])
-            # If all the messages have been received, call another function to process the raw data
             if self.current_message == self.total_messages:
-
+                # If all the messages have been received, call another function to process the raw data
                 self._update_dg_calibration_record_from_fw()
 
     def _update_dg_calibration_record_from_fw(self):
@@ -211,16 +210,18 @@
         load_cells = self._prepare_load_cells_record()
         temperature = self._prepare_temperature_sensors_record()
         conductivity = self._prepare_conductivity_sensors_record()
+        pumps = self._prepare_pumps_record()
+        volumes = self._prepare_volume_records()
         # Build the CRC of the main calibration record
         cal_record_crc = OrderedDict({'crc': ['<H', self.DEFAULT_CAL_CRC_VALUE]})
 
         # The second element of the hardware groups are the byte sizes, add them to calculate the overall byte size.
-        groups_byte_size = pressure[1] + flow[1] + load_cells[1] + temperature[1] + conductivity[1] + \
-                           self._get_data_type_bytes(cal_record_crc['crc'][self.CALIBRATION_DATA_TYPE_INDEX])
+        groups_byte_size = pressure[1] + flow[1] + load_cells[1] + temperature[1] + conductivity[1] + pumps[1] + \
+            volumes[1] + self._get_data_type_bytes(cal_record_crc['crc'][self.CALIBRATION_DATA_TYPE_INDEX])
         # Calculate the padding size:
         # If bytes in the dictionary % max write bytes to EEPROM (16) is 0, not padding is needed
         # Else padding = (ceil(dictionary bytes/max write to EEPROM (16)) * max write to EEPROM (16)) - dictionary bytes
-        if groups_byte_size % self.EEPROM_MAX_BYTES_TO_WRITE == 0:
+        if (groups_byte_size % self.EEPROM_MAX_BYTES_TO_WRITE) == 0:
             padding_size = 0
         else:
             padding_size = (math.ceil(groups_byte_size / self.EEPROM_MAX_BYTES_TO_WRITE) *
@@ -229,8 +230,9 @@
         padding = OrderedDict({'padding': ['<B', [self.DEFAULT_CAL_CRC_VALUE] * padding_size]})
 
         # Insert the sub dictionaries into the main calibration 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],
-                                      **padding, **cal_record_crc}
+                                      **pumps[0], **volumes[0], **padding, **cal_record_crc}
 
     def _prepare_pressure_sensors_cal_record(self):
         """
@@ -251,7 +253,6 @@
                            'cal_time': ['<i', self.DEFAULT_CAL_TIME_VALUE], 'crc': ['<H', self.DEFAULT_CAL_CRC_VALUE]}
             # Calculate the size of the bytes in this hardware group
             group_byte_size += self._calculate_group_byte_size(hardware[i])
-
         hardware_group[group_name] = hardware
 
         return hardware_group, group_byte_size
@@ -275,7 +276,6 @@
 
             # Calculate the size of the bytes in this hardware group
             group_byte_size += self._calculate_group_byte_size(hardware[i])
-
         hardware_group[group_name] = hardware
 
         return hardware_group, group_byte_size
@@ -299,7 +299,6 @@
 
             # Calculate the size of the bytes in this hardware group
             group_byte_size += self._calculate_group_byte_size(hardware[i])
-
         hardware_group[group_name] = hardware
 
         return hardware_group, group_byte_size
@@ -326,7 +325,6 @@
 
             # Calculate the size of the bytes in this hardware group
             group_byte_size += self._calculate_group_byte_size(hardware[i])
-
         hardware_group[group_name] = hardware
 
         return hardware_group, group_byte_size
@@ -350,11 +348,85 @@
 
             # Calculate the size of the bytes in this hardware group
             group_byte_size += self._calculate_group_byte_size(hardware[i])
+        hardware_group[group_name] = hardware
 
+        return hardware_group, group_byte_size
+
+    def _prepare_pumps_record(self):
+        """
+        Handles creating the calibration dictionary of the DG pumps.
+
+        @return: DG pumps hardware group dictionary and the byte size of this hardware group
+        """
+        hardware_names = ['concentrate_1', 'concentrate_2', 'drain', 'ro']
+        group_byte_size = 0
+        group_name = 'pumps'
+        hardware_group = OrderedDict({group_name: OrderedDict()})
+        hardware = OrderedDict()
+
+        for i in hardware_names:
+            # Different pumps have different calibration values
+            if i == 'concentrate_1' or i == 'concentrate_2':
+                hardware[i] = {'step_speed_2_flow_ratio': ['<f', self.DEFAULT_RATIO_VALUE],
+                               'cal_time': ['<i', self.DEFAULT_CAL_TIME_VALUE],
+                               'crc': ['<H', self.DEFAULT_CAL_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],
+                               'cal_time': ['<i', self.DEFAULT_CAL_TIME_VALUE],
+                               'crc': ['<H', self.DEFAULT_CAL_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],
+                               'cal_time': ['<i', self.DEFAULT_CAL_TIME_VALUE],
+                               'crc': ['<H', self.DEFAULT_CAL_CRC_VALUE]}
+
+            group_byte_size += self._calculate_group_byte_size(hardware[i])
         hardware_group[group_name] = hardware
 
         return hardware_group, group_byte_size
 
+    def _prepare_volume_records(self):
+        """
+        Handles creating the calibration dictionary of the DG volumes.
+
+        @return: DG volumes hardware group dictionary and the byte size of this hardware group
+        """
+        hardware_names = ['drain_line', 'pre_ro_purge', 'reservoir_1', 'reservoir_2', 'reserved_1', 'reserved_2',
+                          'reserved_3', 'reserved_4']
+        group_byte_size = 0
+        group_name = 'volumes'
+        hardware_group = OrderedDict({group_name: OrderedDict()})
+        hardware = OrderedDict()
+
+        for i in hardware_names:
+            if i == 'drain_line':
+                hardware[i] = {'volume': ['<f', self.DEFAULT_VOLUME_VALUE],
+                               'cal_time': ['<i', self.DEFAULT_CAL_TIME_VALUE],
+                               'crc': ['<H', self.DEFAULT_CAL_CRC_VALUE]}
+            elif i == 'pre_ro_purge':
+                hardware[i] = {'pressure_2_flow_ratio': ['<f', self.DEFAULT_RATIO_VALUE],
+                               'volume': ['<f', self.DEFAULT_VOLUME_VALUE],
+                               'cal_time': ['<i', self.DEFAULT_CAL_TIME_VALUE],
+                               'crc': ['<H', self.DEFAULT_CAL_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],
+                               'cal_time': ['<i', self.DEFAULT_CAL_TIME_VALUE],
+                               'crc': ['<H', self.DEFAULT_CAL_CRC_VALUE]}
+            else:
+                hardware[i] = {'volume': ['<f', self.DEFAULT_VOLUME_VALUE],
+                               'cal_time': ['<i', self.DEFAULT_CAL_TIME_VALUE],
+                               'crc': ['<H', self.DEFAULT_CAL_CRC_VALUE]}
+
+            group_byte_size += self._calculate_group_byte_size(hardware[i])
+        hardware_group[group_name] = hardware
+
+        return hardware_group, group_byte_size
+
     def _calculate_group_byte_size(self, group):
         """
         Handles calculating the byte size of the values of the provided dictionary.
Index: tests/test_dg_calibration.py
===================================================================
diff -u -r5dabfb699311d0b04353c3db846aba742568bcc1 -ra2c50fa966d483afdcff983ef80b03d2d0e77b5b
--- tests/test_dg_calibration.py	(.../test_dg_calibration.py)	(revision 5dabfb699311d0b04353c3db846aba742568bcc1)
+++ tests/test_dg_calibration.py	(.../test_dg_calibration.py)	(revision a2c50fa966d483afdcff983ef80b03d2d0e77b5b)
@@ -17,10 +17,16 @@
     f = open("DG_Calibration.log", "w")
 
     #print(cal.DG_CALIBRATION_RECORD)
+    #exit(0)
 
-    status = True
-
-    #cal.DG_CALIBRATION_RECORD['pressure_sensors']['ppi']['gain'][1] = 34.2
+    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
     #print(cal.DG_CALIBRATION_RECORD)
 
     try: