Index: dialin/dg/calibration_record.py
===================================================================
diff -u -r47eb368c929e01fbff7d7749a822ee0efb467ea5 -rc4776c1885f259b231532ef5ba7e904178cd0005
--- dialin/dg/calibration_record.py	(.../calibration_record.py)	(revision 47eb368c929e01fbff7d7749a822ee0efb467ea5)
+++ dialin/dg/calibration_record.py	(.../calibration_record.py)	(revision c4776c1885f259b231532ef5ba7e904178cd0005)
@@ -161,7 +161,7 @@
         @return: True upon success, False otherwise
         """
         # Pass the new changes as well as the previous calibration record
-        record_packets = self._utilities.prepare_record_to_send_to_fw(self.dg_calibration_record)
+        record_packets = self._utilities.prepare_record_to_send_to_fw(previous_record)
         self.logger.debug('Setting DG calibration started')
 
         # Update all the data packets with the last message count since is the number of messages that firmware
Index: dialin/dg/switches.py
===================================================================
diff -u -rc19568936f7925714a39b7951eae672ab91769a4 -rc4776c1885f259b231532ef5ba7e904178cd0005
--- dialin/dg/switches.py	(.../switches.py)	(revision c19568936f7925714a39b7951eae672ab91769a4)
+++ dialin/dg/switches.py	(.../switches.py)	(revision c4776c1885f259b231532ef5ba7e904178cd0005)
@@ -41,8 +41,7 @@
         if self.can_interface is not None:
             channel_id = DenaliChannels.dg_sync_broadcast_ch_id
             msg_id = MsgIds.MSG_ID_DG_SWITCHES_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
-                                                                       self._handler_switches_sync)
+            self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_switches_sync)
 
         self.dg_switches_status = {DGSwitchesName.CONCENTRATE_CAP.name: DGSwitchStatus.OFF.value,
                                    DGSwitchesName.DIALYSATE_CAP.name: DGSwitchStatus.OFF.value,
@@ -72,9 +71,9 @@
         fluid_door = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
 
-        self.dg_switches_status[DGSwitchesName.CONCENTRATE_CAP.name] = conc_cap
-        self.dg_switches_status[DGSwitchesName.DIALYSATE_CAP.name] = dialysate_cap
-        self.dg_switches_status[DGSwitchesName.FLUID_DOOR] = fluid_door
+        self.dg_switches_status[DGSwitchesName.CONCENTRATE_CAP.name] = DGSwitchStatus(conc_cap).value
+        self.dg_switches_status[DGSwitchesName.DIALYSATE_CAP.name] = DGSwitchStatus(dialysate_cap).value
+        self.dg_switches_status[DGSwitchesName.FLUID_DOOR.name] = DGSwitchStatus(fluid_door).value
 
     def cmd_dg_switch_status_override(self, switch: int, status: int, reset: int = NO_RESET) -> int:
         """
Index: dialin/hd/switches.py
===================================================================
diff -u -rc19568936f7925714a39b7951eae672ab91769a4 -rc4776c1885f259b231532ef5ba7e904178cd0005
--- dialin/hd/switches.py	(.../switches.py)	(revision c19568936f7925714a39b7951eae672ab91769a4)
+++ dialin/hd/switches.py	(.../switches.py)	(revision c4776c1885f259b231532ef5ba7e904178cd0005)
@@ -64,7 +64,7 @@
         front_door = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
 
-        self.hd_switches_status[HDSwitchesNames.FRONT_DOOR.name] = front_door
+        self.hd_switches_status[HDSwitchesNames.FRONT_DOOR.name] = HDSwitchStatus(front_door).value
 
     def cmd_hd_switch_status_override(self, switch: int, status: int, reset: int = NO_RESET) -> int:
         """
Index: dialin/utils/nv_ops_utils.py
===================================================================
diff -u -r47eb368c929e01fbff7d7749a822ee0efb467ea5 -rc4776c1885f259b231532ef5ba7e904178cd0005
--- dialin/utils/nv_ops_utils.py	(.../nv_ops_utils.py)	(revision 47eb368c929e01fbff7d7749a822ee0efb467ea5)
+++ dialin/utils/nv_ops_utils.py	(.../nv_ops_utils.py)	(revision c4776c1885f259b231532ef5ba7e904178cd0005)
@@ -315,7 +315,6 @@
                     crc = NVOpsUtils.get_group_record_crc(sub_value)
 
                     sub_value['crc'][1] = crc
-                    print(sub_key, sub_value)
         return record
 
     @staticmethod
@@ -503,9 +502,9 @@
                 read_start_index += value_bytes
 
             if inner_key is None:
-                calibration_record[group][key][self._DATA_VALUE_INDEX] = data if data_type != '<f' else round(data, 4)
+                calibration_record[group][key][self._DATA_VALUE_INDEX] = data
             else:
-                calibration_record[group][key][inner_key][self._DATA_VALUE_INDEX] = data if data_type != '<f' else round(data, 4)
+                calibration_record[group][key][inner_key][self._DATA_VALUE_INDEX] = data
 
         except Exception as e:
             self.logger.error("Failed to process fw record: {0}".format(e))
Index: tests/dg_hd_switches_test.py
===================================================================
diff -u
--- tests/dg_hd_switches_test.py	(revision 0)
+++ tests/dg_hd_switches_test.py	(revision c4776c1885f259b231532ef5ba7e904178cd0005)
@@ -0,0 +1,48 @@
+
+
+from dialin.dg.dialysate_generator import DG
+from dialin.dg.switches import DGSwitchesName, DGSwitchStatus
+from dialin.hd.switches import HDSwitchesNames, HDSwitchStatus
+from dialin.hd.hemodialysis_device import HD
+from time import sleep
+
+
+def test_hd_switches():
+
+    hd = HD(log_level="DEBUG")
+    if hd.cmd_log_in_to_hd(resend=False):
+        print(hd.switches.get_switches_status())
+
+        #hd.switches.cmd_hd_switch_status_override(HDSwitchesNames.FRONT_DOOR.value, HDSwitchStatus.ON.value, reset=1)
+        #hd.switches.cmd_hd_switches_data_broadcast_interval_override(100, reset=1)
+
+        while True:
+            print(hd.switches.get_switches_status())
+            sleep(1)
+
+
+def test_dg_switches():
+
+    dg = DG(log_level="DEBUG")
+    if dg.cmd_log_in_to_dg(resend=False):
+        print(dg.switches.get_switches_status())
+
+        #dg.switches.cmd_dg_switch_status_override(DGSwitchesName.FLUID_DOOR.value, DGSwitchStatus.ON.value)
+        #dg.switches.cmd_dg_switch_status_override(DGSwitchesName.CONCENTRATE_CAP.value, DGSwitchStatus.OFF.value, reset=1)
+
+        dg.switches.cmd_dg_switches_data_broadcast_interval_override(100, reset=1)
+
+        while True:
+
+            print(dg.switches.get_switches_status())
+            sleep(1)
+
+
+if __name__ == "__main__":
+
+    test_hd_switches()
+    #test_dg_switches()
+
+
+
+
Index: tests/peter/test_dg_records.py
===================================================================
diff -u -r47eb368c929e01fbff7d7749a822ee0efb467ea5 -rc4776c1885f259b231532ef5ba7e904178cd0005
--- tests/peter/test_dg_records.py	(.../test_dg_records.py)	(revision 47eb368c929e01fbff7d7749a822ee0efb467ea5)
+++ tests/peter/test_dg_records.py	(.../test_dg_records.py)	(revision c4776c1885f259b231532ef5ba7e904178cd0005)
@@ -205,9 +205,10 @@
     dg = DG(log_level="DEBUG")
     if dg.cmd_log_in_to_dg():
 
-        #dg.calibration_record.cmd_reset_dg_calibration_record()
+        dg.calibration_record.cmd_reset_dg_calibration_record()
+        print(dg.calibration_record.dg_calibration_record)
         #dg.scheduled_runs_record.cmd_reset_dg_calibration_record()
-        dg.system_record.cmd_reset_dg_system_record()
+        #dg.system_record.cmd_reset_dg_system_record()
         #dg.service_record.cmd_reset_dg_service_record()
 
 
@@ -263,7 +264,7 @@
 if __name__ == "__main__":
 
     #test_dg_reset_record()
-    #test_dg_calibration_record()
+    test_dg_calibration_record()
     # test_dg_service_record()
-    test_dg_system_record()
+    #test_dg_system_record()
     # test_dg_scheduled_runs_record()
Index: tests/peter/test_hd_records.py
===================================================================
diff -u -r47eb368c929e01fbff7d7749a822ee0efb467ea5 -rc4776c1885f259b231532ef5ba7e904178cd0005
--- tests/peter/test_hd_records.py	(.../test_hd_records.py)	(revision 47eb368c929e01fbff7d7749a822ee0efb467ea5)
+++ tests/peter/test_hd_records.py	(.../test_hd_records.py)	(revision c4776c1885f259b231532ef5ba7e904178cd0005)
@@ -37,14 +37,14 @@
         with open("/home/fw/projects/dialin/tests/peter/hd_cal_record.log", 'w') as f:
             f.write(record_old_formatted)
 
-        hd.calibration_record.hd_calibration_record["accelerometer_sensor"]["accelerometer"]["y_offset"][1] = 0.0
+        hd.calibration_record.hd_calibration_record["accelerometer_sensor"]["accelerometer"]["y_offset"][1] = 2.0
         hd.calibration_record.hd_calibration_record["accelerometer_sensor"]["accelerometer"]["cal_time"][1] = \
             NVOpsUtils.get_current_time_in_epoch()
         hd.calibration_record.hd_calibration_record["accelerometer_sensor"]["accelerometer"]["crc"][1] = \
             NVOpsUtils.get_group_record_crc(hd.calibration_record.hd_calibration_record["accelerometer_sensor"]["accelerometer"])
 
-        hd.calibration_record.hd_calibration_record["heparin_force_sensor"]["heparin_force"]["fourth_order"][1] = 0.0
-        hd.calibration_record.hd_calibration_record["heparin_force_sensor"]["heparin_force"]["third_order"][1] = 0.0
+        hd.calibration_record.hd_calibration_record["heparin_force_sensor"]["heparin_force"]["fourth_order"][1] = 4.0
+        hd.calibration_record.hd_calibration_record["heparin_force_sensor"]["heparin_force"]["third_order"][1] = 4.0
         hd.calibration_record.hd_calibration_record["heparin_force_sensor"]["heparin_force"]["second_order"][1] = 0.0
         hd.calibration_record.hd_calibration_record["heparin_force_sensor"]["heparin_force"]["cal_time"][1] = \
             NVOpsUtils.get_current_time_in_epoch()
@@ -81,9 +81,9 @@
     hd = HD(log_level="DEBUG")
     if hd.cmd_log_in_to_hd(resend=False):
 
-        hd.calibration_record.cmd_reset_hd_calibration_record()
+        #hd.calibration_record.cmd_reset_hd_calibration_record()
         hd.system_record.cmd_reset_hd_system_record()
-        hd.service_record.cmd_reset_hd_service_record()
+        #hd.service_record.cmd_reset_hd_service_record()
 
 
 def test_hd_system_record():
@@ -108,12 +108,14 @@
         print(hd.system_record.hd_system_record)
         hd.system_record.cmd_set_hd_system_record(hd.system_record.hd_system_record)
 
+
+
 if __name__ == "__main__":
 
     #test_hd_reset_record_record()
-    test_hd_calibration_record()
+    #test_hd_calibration_record()
     # test_hd_service_record()
     #test_hd_reset_system_record()
-    #test_hd_system_record()
+    test_hd_system_record()
     # test_crc()
     # test_hd_system_record()