Index: dialin/dg/calibration_record.py
===================================================================
diff -u -radae506afce35a0063c6c2baf7e8580986f3bee7 -r42100367185571479b8e07191b2c423314f23aef
--- dialin/dg/calibration_record.py	(.../calibration_record.py)	(revision adae506afce35a0063c6c2baf7e8580986f3bee7)
+++ dialin/dg/calibration_record.py	(.../calibration_record.py)	(revision 42100367185571479b8e07191b2c423314f23aef)
@@ -43,6 +43,9 @@
     _DEFAULT_TIME_VALUE = 0
     _DEFAULT_CRC_VALUE = 0
     _DEFAULT_FLUSH_LINES_VOLUME = 0.01
+    _DEFAULT_ULTRAFILTER_TAU_C_PER_MIN = -4.565
+    _DEFAULT_RESERVOIR_TAU_C_PER_MIN = -0.512
+    _DEFAULT_ULTRAFILTER_VOLUME_ML = 700
 
     # Maximum allowed bytes that are allowed to be written to EEPROM in firmware
     # The padding size then is calculated to be divisions of 16
@@ -218,7 +221,8 @@
                               self._prepare_conductivity_sensors_record(), self._prepare_pumps_record(),
                               self._prepare_volume_record(), self._prepare_acid_concentrates_record(),
                               self._prepare_bicarb_concentrates_record(), self._prepare_filters_record(),
-                              self._prepare_fans_record(), self._prepare_accelerometer_sensor_record()]
+                              self._prepare_fans_record(), self._prepare_accelerometer_sensor_record(),
+                              self._prepare_heating_constants_record()]
 
         for record, byte_size in records_with_sizes:
             # Update the groups bytes size so far to be use to padding later
@@ -249,16 +253,8 @@
 
         @return: pressure sensors hardware group dictionary and the byte size of this hardware group
         """
-        hardware_names = ['ppi',
-                          'ppo',
-                          'prd',
-                          'pdr',
-                          'reserved_1',
-                          'reserved_2',
-                          'reserved_3',
-                          'reserved_4',
-                          'reserved_5',
-                          'reserved_6']
+        hardware_names = ['ppi', 'ppo', 'prd', 'pdr', 'reserved_1', 'reserved_2', 'reserved_3', 'reserved_4',
+                          'reserved_5', 'reserved_6']
         group_byte_size = 0
         group_name = 'pressure_sensors'
         hardware_group = OrderedDict({group_name: OrderedDict()})
@@ -557,7 +553,6 @@
         @return: accelerometer sensor hardware group dictionary and the byte size of this hardware group
         """
         hardware_names = ['accelerometer']
-
         group_byte_size = 0
         group_name = 'accelerometer_sensor'
         hardware_group = OrderedDict({group_name: OrderedDict()})
@@ -573,3 +568,26 @@
         hardware_group[group_name] = hardware
 
         return hardware_group, group_byte_size
+
+    def _prepare_heating_constants_record(self):
+        """
+        Handles creating the calibration dictionary of the heating constants group.
+
+        @return: Heating hardware group dictionary and the byte size of this hardware group
+        """
+        hardware_names = ['heating']
+        group_byte_size = 0
+        group_name = 'heating_constants'
+        hardware_group = OrderedDict({group_name: OrderedDict()})
+        hardware = OrderedDict()
+
+        for i in hardware_names:
+            hardware[i] = {'rsrvr_temp_tau_c_per_min': ['<f', self._DEFAULT_RESERVOIR_TAU_C_PER_MIN],
+                           'ultrafilter_temp_tau_c_per_min': ['<f', self._DEFAULT_ULTRAFILTER_TAU_C_PER_MIN],
+                           'ultrafilter_vol_ml': ['<i', self._DEFAULT_ULTRAFILTER_VOLUME_ML],
+                           '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
Index: dialin/dg/fans.py
===================================================================
diff -u -radae506afce35a0063c6c2baf7e8580986f3bee7 -r42100367185571479b8e07191b2c423314f23aef
--- dialin/dg/fans.py	(.../fans.py)	(revision adae506afce35a0063c6c2baf7e8580986f3bee7)
+++ dialin/dg/fans.py	(.../fans.py)	(revision 42100367185571479b8e07191b2c423314f23aef)
@@ -64,6 +64,7 @@
         self.outlet_1_rpm = 0.0
         self.outlet_2_rpm = 0.0
         self.outlet_3_rpm = 0.0
+        self.rpm_alarm_time_offset = 0
 
     def get_fans_target_duty_cycle(self):
         """
@@ -129,16 +130,16 @@
         """
         return self.dg_fans_target_rpm
 
-    @publish(['target_duty_cycle', 'inlet_1_rpm', 'inlet_2_rpm', 'inlet_3_rpm', 'outlet_1_rpm', 'outlet_2_rpm',
-              'outlet_3_rpm'])
+    @publish(['target_duty_cycle', 'dg_fans_target_rpm', 'inlet_1_rpm', 'inlet_2_rpm', 'inlet_3_rpm', 'outlet_1_rpm',
+              'outlet_2_rpm', 'outlet_3_rpm', 'rpm_alarm_time_offset'])
     def _handler_fans_sync(self, message):
         """
         Handles published thermistors message.
 
         @param message:  published thermistors message
         @return: none
         """
-        self.dg_fans_duty_cycle = struct.unpack('f', bytearray(
+        self.target_duty_cycle = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
         self.dg_fans_target_rpm = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
@@ -154,6 +155,8 @@
             message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
         self.outlet_3_rpm = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]
+        self.rpm_alarm_time_offset = struct.unpack('f', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
 
     def cmd_fans_rpm_override(self, fan: int, rpm: float, reset: int = NO_RESET) -> int:
         """
Index: tests/dg_heat_and_chemical_disinfect_test.py
===================================================================
diff -u -radae506afce35a0063c6c2baf7e8580986f3bee7 -r42100367185571479b8e07191b2c423314f23aef
--- tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision adae506afce35a0063c6c2baf7e8580986f3bee7)
+++ tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision 42100367185571479b8e07191b2c423314f23aef)
@@ -637,8 +637,11 @@
     #hd.fans.cmd_fans_rpm_alarm_start_time_override(24, 59, reset=1)
     #hd.fans.cmd_fans_rpm_override(0, 1200.0, reset=1)
     #sleep(3)
-    #hd.fans.cmd_fans_rpm_override(0, 1200.0, reset=0)
+    hd.fans.cmd_fans_rpm_override(0, 1200.0, reset=0)
+    sleep(5)
 
+    hd.ui.cmd_ui_user_alarm_response(3)
+
     #while True:
     #    print(hd.alarms.get_alarm_state(AlarmList.ALARM_ID_HD_FAN_RPM_OUT_OF_RANGE.value), hd.alarms.alarm_top,
     #          hd.alarms.alarm_conditions[AlarmList.ALARM_ID_HD_FAN_RPM_OUT_OF_RANGE.value])
Index: tests/peter/test_dg_records.py
===================================================================
diff -u -r4df4ba2027fd95dbdd6601cd3ec14861ce9fb6e7 -r42100367185571479b8e07191b2c423314f23aef
--- tests/peter/test_dg_records.py	(.../test_dg_records.py)	(revision 4df4ba2027fd95dbdd6601cd3ec14861ce9fb6e7)
+++ tests/peter/test_dg_records.py	(.../test_dg_records.py)	(revision 42100367185571479b8e07191b2c423314f23aef)
@@ -289,8 +289,8 @@
 
 if __name__ == "__main__":
 
-    #test_dg_reset_record()
-    test_dg_calibration_record()
+    test_dg_reset_record()
+    #test_dg_calibration_record()
     # test_dg_service_record()
     #test_dg_system_record()
     # test_dg_scheduled_runs_record()