Index: leahi_dialin/td/modules/pressure_sensors.py
===================================================================
diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -r60a4cdf7272161c64bb60aac93b26acf50465494
--- leahi_dialin/td/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
+++ leahi_dialin/td/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 60a4cdf7272161c64bb60aac93b26acf50465494)
@@ -96,20 +96,19 @@
         @param message:  published pressure & occlusion data message
         @return: none
         """
+
         sensor_list_1 = []
         sensor_list_1.append((td_enum_repository.TDPressureSensorNames.H2_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES.name,     DataTypes.F32))
         sensor_list_1.append((td_enum_repository.TDPressureSensorNames.H14_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES.name,    DataTypes.F32))
         msg_list_1 = []
         msg_list_1.append(['self.pressure_limits_state', DataTypes.U32])
         sensor_list_2 = []
-        sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H2_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name,             DataTypes.U32))
-        sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H2_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name,             DataTypes.U32))
-        sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H14_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name,            DataTypes.U32))
-        sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H14_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name,            DataTypes.U32))
+        sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H2_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name,             DataTypes.S32))
+        sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H2_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name,             DataTypes.S32))
+        sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H14_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name,            DataTypes.S32))
+        sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H14_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name,            DataTypes.S32))
         sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H2_PRES.name, td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name,     DataTypes.F32))
         sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H14_PRES.name, td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name,    DataTypes.F32))
-        sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H14_PRES.name, td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name,    DataTypes.F32))
-        sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H14_PRES.name, td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name,    DataTypes.F32))
         sensor_list_2.append(('TMP_PRES', td_enum_repository.TDPressureSensorAttributes.PRES.name,                                                                  DataTypes.F32))
         sensor_list_2.append(('TMP_PRES', td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name,                                                DataTypes.F32))
         sensor_list_2.append(('TMP_PRES', td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name,                                                        DataTypes.F32))
Index: leahi_dialin/td/modules/syringe_pump.py
===================================================================
diff -u -r6c90336ac2cd8cf34ac620cff431a847d9ddf557 -r60a4cdf7272161c64bb60aac93b26acf50465494
--- leahi_dialin/td/modules/syringe_pump.py	(.../syringe_pump.py)	(revision 6c90336ac2cd8cf34ac620cff431a847d9ddf557)
+++ leahi_dialin/td/modules/syringe_pump.py	(.../syringe_pump.py)	(revision 60a4cdf7272161c64bb60aac93b26acf50465494)
@@ -80,7 +80,6 @@
         @param message:  published syringe pump data message
         @return: None
         """
-
         msg_list = []
         msg_list.append(('self.syringe_pump_state',             DataTypes.U32))
         msg_list.append(('self.heparin_state',                  DataTypes.U32))
@@ -98,44 +97,8 @@
         msg_list.append(('self.syringe_pump_adc_read_counter',  DataTypes.U08))
 
         self.process_into_vars(decoder_list = msg_list,
-                                        message = message)
-        sta = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))
-        hep = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))
-        srt = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))
-        mrt = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))
-        pos = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))
-        vol = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))
-        hom = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))
-        det = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))
-        frc = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))
-        saf = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))
-        sts = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))
+                               message = message)
 
-        self.syringe_pump_state = sta[0]
-        self.heparin_state = hep[0]
-        self.syringe_pump_set_rate_ml_hr = srt[0]
-        self.syringe_pump_meas_rate_ml_hr = mrt[0]
-        self.syringe_pump_position = pos[0]
-        self.syringe_pump_volume_ml = vol[0]
-        self.syringe_pump_home_v = hom[0]
-        self.syringe_pump_switch_v = det[0]
-        self.syringe_pump_force_v = frc[0]
-        self.syringe_pump_safety_volume_ml = saf[0]
-        self.syringe_pump_status = (sts[0] & 0xFF000000) >> 24
-        self.syringe_pump_encoder_status = (sts[0] & 0x00FF0000) >> 16
-        self.syringe_pump_adc_dac_status = (sts[0] & 0x0000FF00) >> 8
-        self.syringe_pump_adc_read_counter = (sts[0] & 0x000000FF)
         self.td_syringe_pump_timestamp = timestamp
 
 
Index: leahi_dialin/utils/abstract_classes.py
===================================================================
diff -u -rf1b8b4e9558e9cb95b994044f1d7d247c6c8be3f -r60a4cdf7272161c64bb60aac93b26acf50465494
--- leahi_dialin/utils/abstract_classes.py	(.../abstract_classes.py)	(revision f1b8b4e9558e9cb95b994044f1d7d247c6c8be3f)
+++ leahi_dialin/utils/abstract_classes.py	(.../abstract_classes.py)	(revision 60a4cdf7272161c64bb60aac93b26acf50465494)
@@ -96,7 +96,8 @@
                 print(f'{variable_name}: {value} ({datatype.name})')
                 print(f'pos: {start_pos} - {end_pos}')
             if 'nan' in str(value).lower():
-                raise ValueError(f'{value} is not an accepted value!')
+                value = None
+                # raise ValueError(f'{value} is not an accepted value!')
             if datatype is DataTypes.BOOL:
                 value = True if value == 1 else False
             results[variable_name] = value
@@ -144,7 +145,8 @@
                 print(f'value: {value} ({datatype.name})')
                 print(f'pos: {start_pos} - {end_pos}')
             if 'nan' in str(value).lower():
-                raise ValueError(f'{value} is not an accepted value!')
+                value = None
+                # raise ValueError(f'{value} is not an accepted value!')
             # If the type is Bool, convert the value from Integer to Boolean
             if datatype is DataTypes.BOOL:
                 value = True if value == 1 else False