Merge pull request #304 from gnmerritt/connect-no-name

Continue device connection with empty/null objectName prop
ChristianTremblay · Dec 17, 2021 · e5e3005 · e5e3005
2 parents ff3a980 + 09fdfc7
commit e5e3005
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/BAC0/core/devices/Device.py b/BAC0/core/devices/Device.py
@@ -883,11 +883,10 @@ def connect(self, *, db=None):
                 else:
                     segmentation_supported = True
 
-                if name:
-                    if segmentation_supported:
-                        self.new_state(RPMDeviceConnected)
-                    else:
-                        self.new_state(RPDeviceConnected)
+                if segmentation_supported:
+                    self.new_state(RPMDeviceConnected)
+                else:
+                    self.new_state(RPDeviceConnected)
 
             except SegmentationNotSupported:
                 self.segmentation_supported = False

diff --git a/BAC0/core/devices/mixins/read_mixin.py b/BAC0/core/devices/mixins/read_mixin.py
@@ -5,7 +5,7 @@
 # Licensed under LGPLv3, see file LICENSE in this source tree.
 #
 """
-read_mixin.py - Add ReadProperty and ReadPropertyMultiple to a device 
+read_mixin.py - Add ReadProperty and ReadPropertyMultiple to a device
 """
 # --- standard Python modules ---
 
@@ -381,7 +381,7 @@ def _process_new_objects(
             presentValue = self.read_single(
                 "{} {} presentValue ".format(point_type, point_address)
             )
-            if obj_type == "analog":
+            if obj_type == "analog" and presentValue:
                 presentValue = float(presentValue)
 
             _newpoints.append(