pymscada 0.0.12__tar.gz → 0.0.15__tar.gz

{pymscada-0.0.12 → pymscada-0.0.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymscada
-Version: 0.0.12
+Version: 0.0.15
 Summary: Shared tag value SCADA with python backup and Angular UI
 Author-Email: Jamie Walton <jamie@walton.net.nz>
 License: GPL-3.0-or-later
@@ -15,6 +15,8 @@ Requires-Dist: PyYAML>=6.0.1
 Requires-Dist: aiohttp>=3.8.5
 Requires-Dist: pymscada-html<=0.1.0
 Requires-Dist: cerberus>=1.3.5
+Requires-Dist: pycomm3>=1.2.14
+Requires-Dist: pysnmplib>=5.0.24
 Description-Content-Type: text/markdown
 
 # pymscada
@@ -24,20 +26,39 @@ Description-Content-Type: text/markdown
 
 ## Python Mobile SCADA
 
+This is an open source Python SCADA package intended for use over your
+mobile phone. It has been developed to connect custom python scripts to
+Modicon and Rockwell PLCs, and present a web based user interface, with
+minimal coding. ```pymscada``` does expect you to be able to use python.
+
+```pymscada``` shares values through a ```Tag``` for all data. Tag values
+are updated by exception through a message bus. Changes are in any
+direction with simple loops stopped with a simplistic _don't send updates
+back to where they came from_ check. It's too simple to stop you defeating
+it (but there are easier ways to break the code).
+
+There are primary owner Tag's. A _request to set_ command is passed to the
+author of the Tag, where it is updated. This allows database information
+to pass through the Tag values as well. Tag values are typically float or
+int however they may also be megabyte sized binary or dictionary values.
+
+Example ```systemd``` service files, pymscada module config files and
+custom script examples are included. The example scripts include polling
+weather from tommorrow.io and a python script based Modbus TCP PLC.
+
+## Introduction
+
 This is a small SCADA package that will run on Linux (preferably) or
 Windows. The server runs as several modules on the host, sharing
 information through a message bus. A __subset__ of modules is:
 
 - Bus server - shares tag values with by exception updates
 - Modbus client - reads and writes to a PLC using Modbus/TCP
+- Logix client - uses ```pycomm3``` to read / write to Rockwell PLCs
+- SNMP client - polls SNMP OID values
 - History - saves data changes, serves history to web pages
 - Web server - serves web pages which connect with a web socket
-- Web pages - an Angular single page web application
-
-Web pages are responsive and defined procedurally from the
-```wwwserver.yaml``` config file.
-
-Trends use [uPlot](https://github.com/leeoniya/uPlot).
+- Web pages - procedurally generated setpoint, indication and trends
 
 ## Objectives
 

{pymscada-0.0.12 → pymscada-0.0.15}/README.md

@@ -5,20 +5,39 @@
 
 ## Python Mobile SCADA
 
+This is an open source Python SCADA package intended for use over your
+mobile phone. It has been developed to connect custom python scripts to
+Modicon and Rockwell PLCs, and present a web based user interface, with
+minimal coding. ```pymscada``` does expect you to be able to use python.
+
+```pymscada``` shares values through a ```Tag``` for all data. Tag values
+are updated by exception through a message bus. Changes are in any
+direction with simple loops stopped with a simplistic _don't send updates
+back to where they came from_ check. It's too simple to stop you defeating
+it (but there are easier ways to break the code).
+
+There are primary owner Tag's. A _request to set_ command is passed to the
+author of the Tag, where it is updated. This allows database information
+to pass through the Tag values as well. Tag values are typically float or
+int however they may also be megabyte sized binary or dictionary values.
+
+Example ```systemd``` service files, pymscada module config files and
+custom script examples are included. The example scripts include polling
+weather from tommorrow.io and a python script based Modbus TCP PLC.
+
+## Introduction
+
 This is a small SCADA package that will run on Linux (preferably) or
 Windows. The server runs as several modules on the host, sharing
 information through a message bus. A __subset__ of modules is:
 
 - Bus server - shares tag values with by exception updates
 - Modbus client - reads and writes to a PLC using Modbus/TCP
+- Logix client - uses ```pycomm3``` to read / write to Rockwell PLCs
+- SNMP client - polls SNMP OID values
 - History - saves data changes, serves history to web pages
 - Web server - serves web pages which connect with a web socket
-- Web pages - an Angular single page web application
-
-Web pages are responsive and defined procedurally from the
-```wwwserver.yaml``` config file.
-
-Trends use [uPlot](https://github.com/leeoniya/uPlot).
+- Web pages - procedurally generated setpoint, indication and trends
 
 ## Objectives
 

{pymscada-0.0.12 → pymscada-0.0.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pymscada"
-version = "0.0.12"
+version = "0.0.15"
 description = "Shared tag value SCADA with python backup and Angular UI"
 authors = [
     { name = "Jamie Walton", email = "jamie@walton.net.nz" },
@@ -10,6 +10,8 @@ dependencies = [
     "aiohttp>=3.8.5",
     "pymscada-html<=0.1.0",
     "cerberus>=1.3.5",
+    "pycomm3>=1.2.14",
+    "pysnmplib>=5.0.24",
 ]
 requires-python = ">=3.9"
 readme = "README.md"

{pymscada-0.0.12 → pymscada-0.0.15}/src/pymscada/__init__.py

@@ -2,9 +2,10 @@
 from pymscada.bus_client import BusClient
 from pymscada.bus_server import BusServer
 from pymscada.config import Config
+from pymscada.iodrivers.logix_client import LogixClient
+from pymscada.iodrivers.modbus_client import ModbusClient
+from pymscada.iodrivers.modbus_server import ModbusServer
 from pymscada.misc import find_nodes, ramp
-from pymscada.modbus_client import ModbusClient
-from pymscada.modbus_server import ModbusServer
 from pymscada.periodic import Periodic
 from pymscada.tag import Tag
 from pymscada.validate import validate
@@ -13,10 +14,11 @@ __all__ = [
     'BusClient',
     'BusServer',
     'Config',
-    'find_nodes', 'ramp',
+    'LogixClient',
     'ModbusClient',
     'ModbusServer',
+    'find_nodes', 'ramp',
     'Periodic',
     'Tag',
-    'validate'
+    'validate',
 ]

pymscada-0.0.15/src/pymscada/demo/logixclient.yaml

@@ -0,0 +1,50 @@
+bus_ip: 127.0.0.1
+bus_port: 1324
+rtus:
+- name: Ani
+  ip: 172.26.7.196
+  rate: 0.2
+  read:
+  - {addr: Fout, type: 'REAL[]', start: 0, end: 99}
+  - {addr: Iout, type: 'DINT[]', start: 0, end: 99}
+  - {addr: OutVar, type: REAL}
+  writeok:
+  - {addr: Fin, type: 'REAL[]', start: 0, end: 99}
+  - {addr: Iin, type: 'REAL[]', start: 0, end: 99}
+  - {addr: InVar, type: REAL}
+tags:
+  Ani_Fin_20:
+    type: float32
+    read: 'Ani:Fout[20]'
+    write: 'Ani:Fin[20]'
+  Ani_Fout_20:
+    type: float32
+    addr: 'Ani:Fout[20]'
+  Ani_Iin_20:
+    type: int32
+    read: 'Ani:Iout[20]'
+    write: 'Ani:Iin[20]'
+  Ani_Iout_20:
+    type: int32
+    addr: 'Ani:Iout[20]'
+  Ani_Iin_21_0:
+    type: bool
+    read: 'Ani:Iout[21].0'
+    write: 'Ani:Iin[21].0'
+  Ani_Iout_21_0:
+    type: bool
+    addr: 'Ani:Iout[21].0'
+  Ani_Iin_21_1:
+    type: bool
+    read: 'Ani:Iout[21].1'
+    write: 'Ani:Iin[21].1'
+  Ani_Iout_21_1:
+    type: bool
+    addr: 'Ani:Iout[21].1'
+  InVar:
+    type: float32
+    read: Ani:OutVar
+    write: Ani:InVar
+  OutVar:
+    type: float32
+    addr: Ani:OutVar

{pymscada-0.0.12 → pymscada-0.0.15}/src/pymscada/demo/modbusserver.yaml

@@ -1,5 +1,5 @@
-bus_ip:
-bus_port:
+bus_ip: 192.168.1.100  # for the demo PLC make empty (None)
+bus_port: 2345  # for the demo PLC make empty (None)
 rtus:
 - name: RTU
   ip: 0.0.0.0

pymscada-0.0.15/src/pymscada/demo/pymscada-io-logixclient.service

@@ -0,0 +1,15 @@
+[Unit]
+    Description=pymscada - pycomm3 client
+    BindsTo=pymscada-bus.service
+    After=pymscada-bus.service
+
+[Service]
+    WorkingDirectory=__DIR__
+    ExecStart=__PYMSCADA__ logixclient --config __DIR__/config/logixclient.yaml
+    Restart=always
+    RestartSec=5
+    User=mscada
+    Group=mscada
+
+[Install]
+    WantedBy=multi-user.target

pymscada-0.0.15/src/pymscada/demo/pymscada-io-snmpclient.service

@@ -0,0 +1,15 @@
+[Unit]
+    Description=pymscada - SNMP client
+    BindsTo=pymscada-bus.service
+    After=pymscada-bus.service
+
+[Service]
+    WorkingDirectory=__DIR__
+    ExecStart=__PYMSCADA__ snmpclient --config __DIR__/config/snmpclient.yaml
+    Restart=always
+    RestartSec=5
+    User=mscada
+    Group=mscada
+
+[Install]
+    WantedBy=multi-user.target

pymscada-0.0.15/src/pymscada/demo/snmpclient.yaml

@@ -0,0 +1,73 @@
+bus_ip: 127.0.0.1
+bus_port: 1324
+rtus:
+- name: router
+  ip: 172.26.3.254
+  community: public
+  rate: 10
+  read:
+  - '1.3.6.1.2.1.31.1.1.1.6.1'
+  - '1.3.6.1.2.1.31.1.1.1.6.2'
+  - '1.3.6.1.2.1.31.1.1.1.6.3'
+  - '1.3.6.1.2.1.31.1.1.1.6.4'
+  - '1.3.6.1.2.1.31.1.1.1.6.5'
+  - '1.3.6.1.2.1.31.1.1.1.6.6'
+  - '1.3.6.1.2.1.31.1.1.1.6.7'
+  - '1.3.6.1.2.1.31.1.1.1.6.8'
+  - '1.3.6.1.2.1.31.1.1.1.10.1'
+  - '1.3.6.1.2.1.31.1.1.1.10.2'
+  - '1.3.6.1.2.1.31.1.1.1.10.3'
+  - '1.3.6.1.2.1.31.1.1.1.10.4'
+  - '1.3.6.1.2.1.31.1.1.1.10.5'
+  - '1.3.6.1.2.1.31.1.1.1.10.6'
+  - '1.3.6.1.2.1.31.1.1.1.10.7'
+  - '1.3.6.1.2.1.31.1.1.1.10.8'
+tags:
+  Router_eth1_bytes_in:
+    type: int_roc
+    addr: 'router:1.3.6.1.2.1.31.1.1.1.6.1'
+  Router_eth1_bytes_out:
+    type: int_roc
+    addr: 'router:1.3.6.1.2.1.31.1.1.1.10.1'
+  Router_eth2_bytes_in:
+    type: int_roc
+    addr: 'router:1.3.6.1.2.1.31.1.1.1.6.2'
+  Router_eth2_bytes_out:
+    type: int_roc
+    addr: 'router:1.3.6.1.2.1.31.1.1.1.10.2'
+  Router_eth3_bytes_in:
+    type: int_roc
+    addr: 'router:1.3.6.1.2.1.31.1.1.1.6.3'
+  Router_eth3_bytes_out:
+    type: int_roc
+    addr: 'router:1.3.6.1.2.1.31.1.1.1.10.3'
+  Router_eth4_bytes_in:
+    type: int_roc
+    addr: 'router:1.3.6.1.2.1.31.1.1.1.6.4'
+  Router_eth4_bytes_out:
+    type: int_roc
+    addr: 'router:1.3.6.1.2.1.31.1.1.1.10.4'
+  Router_eth5_bytes_in:
+    type: int_roc
+    addr: 'router:1.3.6.1.2.1.31.1.1.1.6.5'
+  Router_eth5_bytes_out:
+    type: int_roc
+    addr: 'router:1.3.6.1.2.1.31.1.1.1.10.5'
+  Router_eth6_bytes_in:
+    type: int_roc
+    addr: 'router:1.3.6.1.2.1.31.1.1.1.6.6'
+  Router_eth6_bytes_out:
+    type: int_roc
+    addr: 'router:1.3.6.1.2.1.31.1.1.1.10.6'
+  Router_eth7_bytes_in:
+    type: int_roc
+    addr: 'router:1.3.6.1.2.1.31.1.1.1.6.7'
+  Router_eth7_bytes_out:
+    type: int_roc
+    addr: 'router:1.3.6.1.2.1.31.1.1.1.10.7'
+  Router_eth8_bytes_in:
+    type: int_roc
+    addr: 'router:1.3.6.1.2.1.31.1.1.1.6.8'
+  Router_eth8_bytes_out:
+    type: int_roc
+    addr: 'router:1.3.6.1.2.1.31.1.1.1.10.8'

{pymscada-0.0.12 → pymscada-0.0.15}/src/pymscada/demo/tags.yaml

@@ -129,4 +129,88 @@ disk_use:
   min: 0
   max: 100
   units: '%'
-  dp: 1
+  dp: 1
+sim_IntSet:  # for the demo PLC sim_ tags not required
+  desc: Simulation tag
+  type: int
+sim_IntVal:
+  desc: Simulation tag
+  type: int
+sim_FloatSet:
+  desc: Simulation tag
+  type: float
+sim_FloatVal:
+  desc: Simulation tag
+  type: float
+sim_MultiSet:
+  desc: Simulation tag
+  type: int
+sim_MultiVal:
+  desc: Simulation tag
+  type: int
+sim_TimeSet:
+  desc: Simulation tag
+  type: int
+sim_TimeVal:
+  desc: Simulation tag
+  type: int
+sim_DateSet:
+  desc: Simulation tag
+  type: int
+sim_DateVal:
+  desc: Simulation tag
+  type: int
+sim_DateTimeSet:
+  desc: Simulation tag
+  type: int
+sim_DateTimeVal:
+  desc: Simulation tag
+  type: int
+Router_eth1_bytes_in:
+  desc: eth1 bytes in
+  type: int
+Router_eth1_bytes_out:
+  desc: eth1 bytes out
+  type: int
+Router_eth2_bytes_in:
+  desc: eth2 bytes in
+  type: int
+Router_eth2_bytes_out:
+  desc: eth2 bytes out
+  type: int
+Router_eth3_bytes_in:
+  desc: eth3 bytes in
+  type: int
+Router_eth3_bytes_out:
+  desc: eth3 bytes out
+  type: int
+Router_eth4_bytes_in:
+  desc: eth4 bytes in
+  type: int
+Router_eth4_bytes_out:
+  desc: eth4 bytes out
+  type: int
+Router_eth5_bytes_in:
+  desc: eth5 bytes in
+  type: int
+Router_eth5_bytes_out:
+  desc: eth5 bytes out
+  type: int
+Router_eth6_bytes_in:
+  desc: eth6 bytes in
+  type: int
+Router_eth6_bytes_out:
+  desc: eth6 bytes out
+  type: int
+Router_eth7_bytes_in:
+  desc: eth7 bytes in
+  type: int
+Router_eth7_bytes_out:
+  desc: eth7 bytes out
+  type: int
+Router_eth8_bytes_in:
+  desc: eth8 bytes in
+  type: int
+Router_eth8_bytes_out:
+  desc: eth8 bytes out
+  type: int

pymscada-0.0.15/src/pymscada/iodrivers/logix_client.py

@@ -0,0 +1,80 @@
+"""Read and write to Logix PLC processor."""
+import logging
+from pycomm3 import LogixDriver
+from pymscada.bus_client import BusClient
+from pymscada.periodic import Periodic
+from pymscada.iodrivers.logix_map import LogixMaps
+
+
+class LogixClientConnector:
+    """Poll Logix device, write on change in write range."""
+
+    def __init__(self, name: str, ip:str, rate: float, read: list,
+                 writeok: list, mapping: LogixMaps):
+        """Set up polling client."""
+        self.plc_name = name
+        self.ip = ip
+        self.read_tags = []
+        for r in read:
+            tag = r['addr']
+            if r['type'].endswith('[]'):
+                count = r['end'] - r['start'] + 1
+                tag = f"{r['addr']}[{r['start']}]{{{count}}}"
+            self.read_tags.append(tag)
+        self.mapping = mapping
+        self.mapping.add_write_callback(name, writeok,
+                                        self.write_tag_update)
+        self.periodic = Periodic(self.poll, rate)
+        self.plc = LogixDriver(ip)
+
+    def write_tag_update(self, addr: str, value):  # : int|float
+        """Write out any tag updates."""
+        if not self.plc.connected and not self.plc.open():
+            logging.warning(f'write failed {self.plc_name} {addr} to {value}')
+            return
+        logging.info(f'writing {addr} {value}')
+        res = self.plc.write((addr, value))
+        pass
+
+    async def poll(self):
+        """Poll data, reopen connection if dead."""
+        if not self.plc.connected and not self.plc.open():
+            return
+        polled_tags = None
+        polled_tags = self.plc.read(*self.read_tags)
+        self.mapping.polled_data(self.plc_name, polled_tags)
+
+    async def start(self):
+        """Start polling."""
+        await self.periodic.start()
+
+
+class LogixClient:
+
+    def __init__(self, bus_ip: str = '127.0.0.1', bus_port: int = 1324,
+                 rtus: dict = {}, tags: dict = {}) -> None:
+        """
+        Connect to bus on bus_ip:bus_port, connect to Logix PLCs.
+
+        Event loop must be running.
+        """
+        self.busclient = None
+        if bus_ip is not None:
+            self.busclient = BusClient(bus_ip, bus_port)
+        self.mapping = LogixMaps(tags)
+        self.connections: list[LogixClientConnector] = []
+        for rtu in rtus:
+            connection = LogixClientConnector(**rtu, mapping=self.mapping)
+            self.connections.append(connection)
+
+    async def _poll(self):
+        """For testing."""
+        for connection in self.connections:
+            await connection.poll()
+
+    async def start(self):
+        """Start bus connection and PLC polling."""
+        if self.busclient is not None:
+            await self.busclient.start()
+        for connection in self.connections:
+            await connection.start()

pymscada-0.0.15/src/pymscada/iodrivers/logix_map.py

@@ -0,0 +1,147 @@
+"""Map between modbus table and Tag."""
+import logging
+from time import time
+from pymscada.tag import Tag
+
+
+# data types for PLCs
+DTYPES = {
+    'int32': [int, -2147483648, 2147483647],
+    'float32': [float, -3.40282346639e+38, 3.40282346639e+38],
+    'bool': [int, 0, 1]
+}
+
+
+def tag_split(plc_tag: str):
+    separator = plc_tag.find(':')
+    arr_start_loc = plc_tag.find('[')
+    arr_end_loc = plc_tag.find(']')
+    bit_loc = plc_tag.find('.')
+    plc = plc_tag[:separator]
+    if arr_start_loc == -1 and bit_loc == -1:
+        var = plc_tag[separator + 1:]
+        elm = None
+        bit = None
+    elif arr_start_loc == -1:
+        var = plc_tag[separator + 1:bit_loc]
+        elm = None
+        bit = int(plc_tag[bit_loc + 1:])
+    elif bit_loc == -1:
+        var = plc_tag[separator + 1:arr_start_loc]
+        elm = int(plc_tag[arr_start_loc + 1:arr_end_loc])
+        bit = None
+    else:
+        var = plc_tag[separator + 1:arr_start_loc]
+        elm = int(plc_tag[arr_start_loc + 1:arr_end_loc])
+        bit = int(plc_tag[bit_loc + 1:])
+    return plc, var, elm, bit
+
+
+class LogixMap:
+    """Do value updates for each tag."""
+
+    def __init__(self, tagname: str, src_type: str, read_tag: str,
+                 write_tag: str):
+        """Initialise modbus map and Tag."""
+        dtype, dmin, dmax = DTYPES[src_type][0:3]
+        self.tag = Tag(tagname, dtype)
+        self.map_bus = id(self)
+        self.read_plc, self.read_var, self.read_elm, self.read_bit = \
+            tag_split(read_tag)
+        self.plc_read_tag = read_tag
+        self.write_plc, self.write_var, self.write_elm, self.write_bit = \
+            tag_split(write_tag)
+        self.plc_write_tag = write_tag
+        self.callback = None
+        if dmin is not None:
+            self.tag.value_min = dmin
+        if dmax is not None:
+            self.tag.value_max = dmax
+
+    def set_callback(self, callback):
+        """Add tag callback interface."""
+        self.callback = callback
+        self.tag.add_callback(self.tag_value_changed, bus_id=self.map_bus)
+
+    def set_tag_value(self, value, time_us):
+        """Pass update from IO driver to tag value."""
+        if self.read_bit is not None:
+            if value & 1 << self.read_bit:
+                value = 1
+            else:
+                value = 0
+        if self.tag.value != value:
+            self.tag.value = value, time_us, self.map_bus
+
+    def tag_value_changed(self, tag: Tag):
+        """Pass update from tag value to IO driver."""
+        if self.write_elm is None and self.write_bit is None:
+            addr = self.write_var
+        elif self.write_elm is None:
+            addr = f'{self.write_var}.{self.write_bit}'
+        elif self.write_bit is None:
+            addr = f'{self.write_var}[{self.write_elm}]'
+        else:
+            addr = f'{self.write_var}[{self.write_elm}].{self.write_bit}'
+        self.callback(addr, tag.value)
+
+
+class LogixMaps:
+    """Link tags with protocol connector."""
+
+    def __init__(self, tags: dict):
+        """Collect maps based on a tag dictionary."""
+        # use the tagname to access the map.
+        self.tag_map: dict[str, LogixMap] = {}
+        # use the plc_name then variable name to access a list of maps.
+        self.read_var_map: dict[str, dict[str, list[LogixMap]]] = {}
+        for tagname, v in tags.items():
+            if 'addr' in v:
+                read_addr = v['addr']
+                write_addr = v['addr']
+            else:
+                read_addr = v['read']
+                write_addr = v['write']
+            map = LogixMap(tagname, v['type'], read_addr, write_addr)
+            if map.read_plc not in self.read_var_map:
+                self.read_var_map[map.read_plc] = {}
+            if map.read_var not in self.read_var_map[map.read_plc]:
+                # make a list so multiple bits can map to a word
+                self.read_var_map[map.read_plc][map.read_var] = []
+            self.read_var_map[map.read_plc][map.read_var].append(map)
+            self.tag_map[map.tag.name] = map
+
+    def add_write_callback(self, plcname, writeok, callback):
+        """Connection advises device links."""
+        # Create a set of all possible valid addresses
+        write_set = set()
+        for w in writeok:
+            if '[' in w['type']:
+                for i in range(w['start'], w['end'] + 1):
+                    write_set.add((w['addr'], i))
+            else:
+                write_set.add((w['addr'], None))
+        # where the mapped tag uses a valid address, add callback to
+        # the connection writer
+        for map in self.tag_map.values():
+            if map.write_plc == plcname and \
+                    (map.write_var, map.write_elm) in write_set:
+                map.set_callback(callback)
+
+    def polled_data(self, plcname, polls):
+        """Pass updates read from the PLC to the tags."""
+        time_us = int(time() * 1e6)
+        for poll in polls:
+            if poll.error is not None:
+                logging.error(poll.error)
+            arr_start_loc = poll.tag.find('[')
+            if arr_start_loc == -1:
+                for map in self.read_var_map[plcname][poll.tag]:
+                    map.set_tag_value(poll.value, time_us)
+            else:
+                var = poll.tag[:arr_start_loc]
+                elm = int(poll.tag[arr_start_loc + 1: -1])
+                for map in self.read_var_map[plcname][var]:
+                    elm_offset = map.read_elm - elm
+                    if elm_offset > 0 and elm_offset < len(poll.value):
+                        map.set_tag_value(poll.value[elm_offset], time_us)

{pymscada-0.0.12/src/pymscada → pymscada-0.0.15/src/pymscada/iodrivers}/modbus_client.py

@@ -4,7 +4,7 @@ from itertools import chain
 import logging
 from struct import pack, unpack_from
 from pymscada.bus_client import BusClient
-from pymscada.modbus_map import ModbusMaps
+from pymscada.iodrivers.modbus_map import ModbusMaps
 from pymscada.periodic import Periodic
 
 

{pymscada-0.0.12/src/pymscada → pymscada-0.0.15/src/pymscada/iodrivers}/modbus_server.py

@@ -3,7 +3,7 @@ import asyncio
 import logging
 from struct import pack, unpack_from
 from pymscada.bus_client import BusClient
-from pymscada.modbus_map import ModbusMaps
+from pymscada.iodrivers.modbus_map import ModbusMaps
 
 
 class ModbusServerProtocol: