Merge pull request #57 from sunspec/development

Development

Author: bobfox

setup.py

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

sunspec2/__init__.py

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

sunspec2/device.py

@@ -444,7 +444,7 @@ def _init_access(self, access_regions, index, count):
                 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:
+                else:
                     index, count = groups._init_access(access_regions, index, count)
 
         return index, count

sunspec2/modbus/client.py

@@ -182,7 +182,7 @@ def __init__(self, model_class=SunSpecModbusClientModel):
         device.Device.__init__(self, model_class=model_class)
         self.did = str(uuid.uuid4())
         self.retry_count = 2
-        self.base_addr_list = [0, 40000, 50000]
+        self.base_addr_list = [40000, 0, 50000]
         self.base_addr = None
 
     def connect(self):
@@ -227,11 +227,14 @@ def scan(self, progress=None, delay=None, connect=True, full_model_read=True):
             for addr in self.base_addr_list:
                 try:
                     data = self.read(addr, 3)
-                    if data[:4] == b'SunS':
-                        self.base_addr = addr
-                        break
+                    if data:
+                        if data[:4] == b'SunS':
+                            self.base_addr = addr
+                            break
+                        else:
+                            error = 'Device responded - not SunSpec register map'
                     else:
-                        error = 'Device responded - not SunSpec register map'
+                        error = 'data time out'
                 except SunSpecModbusClientError as e:
                     if not error:
                         error = str(e)

sunspec2/modbus/modbus.py

@@ -528,7 +528,7 @@ def _read(self, addr, count, op=FUNC_READ_HOLDING):
                     data_len = struct.unpack('>H', resp[TCP_HDR_O_LEN:TCP_HDR_O_LEN + 2])
                     len_remaining = data_len[0] - (len(resp) - TCP_HDR_LEN)
             else:
-                raise ModbusClientError('Response timeout')
+                raise ModbusClientTimeout('Response timeout')
 
         if not (resp[TCP_HDR_LEN + 1] & 0x80):
             len_remaining = (resp[TCP_HDR_LEN + 2] + TCP_HDR_LEN) - len(resp)
@@ -591,6 +591,8 @@ def read(self, addr, count, op=FUNC_READ_HOLDING):
                     read_offset += read_count
                 else:
                     break
+        except socket.timeout as e:
+            raise ModbusClientTimeout(str(e))
         finally:
             if local_connect:
                 self.disconnect()