Index: dialin/hd/alarms.py
===================================================================
diff -u -ra3aa9f70d9c38f88deb89fba7c01287866f2a44f -r51548ed75c78df9665dcb2188c0445ceb91d09e0
--- dialin/hd/alarms.py	(.../alarms.py)	(revision a3aa9f70d9c38f88deb89fba7c01287866f2a44f)
+++ dialin/hd/alarms.py	(.../alarms.py)	(revision 51548ed75c78df9665dcb2188c0445ceb91d09e0)
@@ -339,12 +339,10 @@
             message['message'][self.START_POS_ALARMS_FLAGS:self.END_POS_ALARMS_FLAGS]),
             byteorder=DenaliMessage.BYTE_ORDER)
 
-        # TODO this clears the alarm state even if the state is not cleared yet.
-        # TODO investigate this code
         # if no active alarms from HD, set all alarms (on Dialin side) to False in case we got out of sync
-        #if self.alarm_top == 0:
-        #    for x in range(500):
-        #        self.alarm_states[x] = False
+        if self.alarm_top == 0:
+            for x in range(500):
+                self.alarm_states[x] = False
 
     @publish(["alarm_states", "alarm_conditions"])
     def _handler_alarm_activate(self, message):
@@ -359,7 +357,6 @@
         alarm_id = struct.unpack('<H', bytearray(message['message'][self.START_POS_ALARM_ID:self.END_POS_ALARM_ID]))
         self.alarm_states[alarm_id[0]] = True
         self.alarm_conditions[alarm_id[0]] = True
-        #print('Alarm {}, {}'.format(alarm_id, self.alarm_states[alarm_id[0]]))
 
     @publish(["alarm_states", "alarm_conditions"])
     def _handler_alarm_clear(self, message):
@@ -371,7 +368,7 @@
         """
         alarm_id = struct.unpack('<H', bytearray(message['message'][self.START_POS_ALARM_ID:self.END_POS_ALARM_ID]))
         self.alarm_states[alarm_id[0]] = False
-        #self.alarm_conditions[alarm_id[0]] = False # TODO why is this here? This function should only clear the state
+        self.alarm_conditions[alarm_id[0]] = False
 
     @publish(["alarm_conditions", "alarm_conditions"])
     def _handler_alarm_condition_clear(self, message):
@@ -382,9 +379,7 @@
         @return: none
         """
         alarm_id = struct.unpack('<H', bytearray(message['message'][self.START_POS_ALARM_ID:self.END_POS_ALARM_ID]))
-        #self.alarm_conditions[alarm_id[0]] = False  # TODO this is also cleared when the user clicks on the alarm but
-        # TODO according to the definitions, condition must be cleared only when the actual condition like the rpm is
-        # TODO back in range
+        self.alarm_conditions[alarm_id[0]] = False
 
     @publish(["alarm_volume", "alarm_audio_curr_hg", "alarm_audio_curr_lg", "alarm_backup_audio_curr","safety_shutdown_active"])
     def _handler_alarm_information_sync(self, message):
Index: dialin/hd/calibration_record.py
===================================================================
diff -u -rbe5fbabd50dc31e5e5a5e4b99893fb8b92d016bd -r51548ed75c78df9665dcb2188c0445ceb91d09e0
--- dialin/hd/calibration_record.py	(.../calibration_record.py)	(revision be5fbabd50dc31e5e5a5e4b99893fb8b92d016bd)
+++ dialin/hd/calibration_record.py	(.../calibration_record.py)	(revision 51548ed75c78df9665dcb2188c0445ceb91d09e0)
@@ -39,6 +39,7 @@
     _DEFAULT_VOLUME_VALUE = 0
     _DEFAULT_CONCENTRATE_VALUE = 1
     _DEFAULT_CALIBRATION_VALUE = 1
+    _DEFAULT_BLOOD_LEAK_SET_POINT = 20
     _DEFAULT_TIME_VALUE = 0
     _DEFAULT_CRC_VALUE = 0
 
@@ -213,7 +214,8 @@
         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_sensor_record(), self._prepare_accelerometer_sensor_record()]
+                     self._prepare_heparin_force_sensor_record(), self._prepare_accelerometer_sensor_record(),
+                     self._prepare_blood_leak_sensor_record()]
 
         for function in functions:
             # Update the groups bytes size so far to be use to padding later
@@ -434,3 +436,25 @@
         hardware_group[group_name] = hardware
 
         return hardware_group, group_byte_size
+
+    def _prepare_blood_leak_sensor_record(self):
+        """
+        Handles creating the calibration_record dictionary of the blood leak sensor hardware group.
+
+        @return: blood leak sensor hardware group dictionary and the byte size of this hardware group
+        """
+        hardware_names = ['blood_leak']
+
+        group_byte_size = 0
+        group_name = 'blood_sensor_sensor'
+        hardware_group = OrderedDict({group_name: OrderedDict()})
+        hardware = OrderedDict()
+
+        for i in hardware_names:
+            hardware[i] = {'set_point': ['<H', self._DEFAULT_BLOOD_LEAK_SET_POINT],
+                           '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: tests/dg_heat_and_chemical_disinfect_test.py
===================================================================
diff -u -r5a14dc42b37cea08ade183148bd15fa9f07401d0 -r51548ed75c78df9665dcb2188c0445ceb91d09e0
--- tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision 5a14dc42b37cea08ade183148bd15fa9f07401d0)
+++ tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision 51548ed75c78df9665dcb2188c0445ceb91d09e0)
@@ -637,18 +637,20 @@
     #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)
 
-    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])
-        sleep(1)
+    #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])
+    #    sleep(1)
 
     #dg.fans.cmd_fans_rpm_override(2, 5000)
 
+    #hd.rtc.cmd_set_rtc_time_and_date(25,52,16, 3,1, 2022)
 
 
 
 
 
 
+
Index: tests/peter/test_hd_records.py
===================================================================
diff -u -rbe5fbabd50dc31e5e5a5e4b99893fb8b92d016bd -r51548ed75c78df9665dcb2188c0445ceb91d09e0
--- tests/peter/test_hd_records.py	(.../test_hd_records.py)	(revision be5fbabd50dc31e5e5a5e4b99893fb8b92d016bd)
+++ tests/peter/test_hd_records.py	(.../test_hd_records.py)	(revision 51548ed75c78df9665dcb2188c0445ceb91d09e0)
@@ -102,7 +102,6 @@
         hd.service_record.cmd_reset_hd_service_record()
 
 
-
 def test_hd_system_record():
     hd = HD(log_level="DEBUG")
     if hd.cmd_log_in_to_hd(resend=False):