Merge pull request #54 from sunspec/development

Development

Author: bobfox

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name='pysunspec2',
-    version='1.0.5',
+    version='1.0.6',
     description='Python SunSpec Tools',
     author='SunSpec Alliance',
     author_email='support@sunspec.org',

sunspec2/__init__.py

@@ -1,2 +1,2 @@
 # pySunSpec version
-VERSION = '1.0.0'
+VERSION = '1.0.6'

sunspec2/device.py

@@ -139,6 +139,7 @@ def __init__(self, pdef=None, model=None, group=None, model_offset=0, data=None,
         self.read_func_arg = None   # the argument passed to the read_func
         self.write_func = None      # function to be called on write
         self.write_func_arg = None  # the argument passed to the write_func
+        self.static = None
 
         if pdef:
             self.sf_required = (pdef.get(mdef.SF) is not None)
@@ -158,6 +159,10 @@ def __init__(self, pdef=None, model=None, group=None, model_offset=0, data=None,
             if data is not None:
                 self._set_data(data=data, offset=data_offset)
 
+            static = pdef.get('static', None)
+            if static and static == 'S':
+                self.static = True
+
     def __str__(self):
         return self.disp()
 
@@ -203,7 +208,7 @@ def get_value(self, computed=False):
         v = self._value
         if computed and v is not None:
             if self.sf_required:
-                if self.sf_value is None:
+                if self.sf_value is None or not self.static:
                     if self.sf:
                         sf = self.group.points.get(self.sf)
                         if sf is None:
@@ -224,7 +229,7 @@ def set_value(self, data=None, computed=False, dirty=None):
             self.dirty = dirty
         if computed:
             if self.sf_required:
-                if self.sf_value is None:
+                if self.sf_value is None or not self.static:
                     if self.sf:
                         sf = self.group.points.get(self.sf)
                         if sf is None:
@@ -263,7 +268,7 @@ def get_mb(self, computed=False):
         data = err = None
         if computed and v is not None:
             if self.sf_required:
-                if self.sf_value is None:
+                if self.sf_value is None or not self.static:
                     if self.sf:
                         sf = self.group.points.get(self.sf)
                         if sf is None:
@@ -409,32 +414,10 @@ def __init__(self, gdef=None, model=None, model_offset=0, group_len=0, data=None
 
         # check if group fits in access region
         if self.len > ACCESS_REGION_REGS:
-            if self.points_len > ACCESS_REGION_REGS:
-                index = 0
-                count = 0
-                for p, point in self.points.items():
-                    if count + point.len > ACCESS_REGION_REGS:
-                        self.access_regions.append((index, count))
-                        index = count
-                        count = 0
-                    count += point.len
-                if count > 0:
-                    self.access_regions.append((index, count))
-            else:
-                self.access_regions.append((0, self.points_len))
-                groups_len = self.len - self.points_len
-                if groups_len > ACCESS_REGION_REGS:
-                    for g, group in self.groups.items():
-                        if isinstance(group, list) and len(group) > 0:
-                            glen = group[0].len
-                            if glen > ACCESS_REGION_REGS:
-                                raise ModelError('Nested groups too big')
-                            index = self.points_len
-                            for i in range(len(group)):
-                                self.access_regions.append((index, glen))
-                                index += glen
-                        elif group.len > ACCESS_REGION_REGS:
-                            raise ModelError('Nested single group too big')
+            index, count = self._init_access(self.access_regions, index=0, count=0)
+            # add last region if pending
+            if count > 0:
+                self.access_regions.append((index, count))
 
         len_point = self.points.get('L')
         if len_point:
@@ -446,6 +429,26 @@ def __init__(self, gdef=None, model=None, model_offset=0, group_len=0, data=None
             if id_val:
                 id_point.set_value(id_point.pdef['value'])
 
+    def _init_access(self, access_regions, index, count):
+        # add points
+        if self.points:
+            for p, point in self.points.items():
+                if count + point.len > ACCESS_REGION_REGS:
+                    access_regions.append((index, count))
+                    index += count
+                    count = 0
+                count += point.len
+        # add groups
+        if self.groups:
+            for g, groups in self.groups.items():
+                if isinstance(groups, list) and len(groups) > 0:
+                    for group in groups:
+                        index, count = group._init_access(access_regions, index, count)
+                elif groups.len > ACCESS_REGION_REGS:
+                    index, count = groups._init_access(access_regions, index, count)
+
+        return index, count
+
     def __getattr__(self, attr):
         v = self.points.get(attr)
         if v is None:

sunspec2/modbus/client.py

@@ -266,7 +266,7 @@ def scan(self, progress=None, delay=None, connect=True, full_model_read=True):
                     model_data = model_id_data + model_len_data
                     model = self.model_class(model_id=model_id, model_addr=addr, model_len=model_len, data=model_data,
                                              mb_device=self)
-                    if full_model_read:
+                    if full_model_read and model.model_def:
                         model.read()
                     model.mid = '%s_%s' % (self.did, mid)
                     mid += 1