pymscada 0.1.10__tar.gz → 0.1.11b2__tar.gz

{pymscada-0.1.10 → pymscada-0.1.11b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymscada
-Version: 0.1.10
+Version: 0.1.11b2
 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
@@ -10,10 +10,12 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Classifier: Environment :: Console
 Classifier: Development Status :: 1 - Planning
+Project-URL: Homepage, https://github.com/jamie0walton/pymscada
+Project-URL: Bug Tracker, https://github.com/jamie0walton/pymscada/issues
 Requires-Python: >=3.9
 Requires-Dist: PyYAML>=6.0.1
 Requires-Dist: aiohttp>=3.8.5
-Requires-Dist: pymscada-html>=0.1.2
+Requires-Dist: pymscada-html>=0.1.10b2
 Requires-Dist: cerberus>=1.3.5
 Requires-Dist: pycomm3>=1.2.14
 Requires-Dist: pysnmplib>=5.0.24

{pymscada-0.1.10 → pymscada-0.1.11b2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pymscada"
-version = "0.1.10"
+version = "0.1.11b2"
 description = "Shared tag value SCADA with python backup and Angular UI"
 authors = [
     { name = "Jamie Walton", email = "jamie@walton.net.nz" },
@@ -8,7 +8,7 @@ authors = [
 dependencies = [
     "PyYAML>=6.0.1",
     "aiohttp>=3.8.5",
-    "pymscada-html>=0.1.2",
+    "pymscada-html>=0.1.10b2",
     "cerberus>=1.3.5",
     "pycomm3>=1.2.14",
     "pysnmplib>=5.0.24",
@@ -30,6 +30,10 @@ text = "GPL-3.0-or-later"
 [project.scripts]
 pymscada = "pymscada.__main__:cmd_line"
 
+[project.urls]
+Homepage = "https://github.com/jamie0walton/pymscada"
+"Bug Tracker" = "https://github.com/jamie0walton/pymscada/issues"
+
 [build-system]
 requires = [
     "pdm-backend",
@@ -50,3 +54,6 @@ pdm = []
 omit = [
     "tests/*",
 ]
+
+[tool.pytest.ini_options]
+addopts = "-v -s"

{pymscada-0.1.10 → pymscada-0.1.11b2}/src/pymscada/bus_client.py

@@ -42,26 +42,26 @@ class BusClient:
             self.to_publish[tag.name] = tag
             return
         if tag.type is float:
-            data = struct.pack('!Bd', pc.TYPE_FLOAT, tag.value)
+            data = struct.pack('!Bd', pc.TYPE.FLOAT, tag.value)
         elif tag.type is int:
-            data = struct.pack('!Bq', pc.TYPE_INT, tag.value)
+            data = struct.pack('!Bq', pc.TYPE.INT, tag.value)
         elif tag.type is bytes:
             size = len(tag.value)
             try:
-                data = struct.pack(f'!B{size}s', pc.TYPE_BYTES, tag.value)
+                data = struct.pack(f'!B{size}s', pc.TYPE.BYTES, tag.value)
             except struct.error as e:
                 logging.error(f'bus_client {tag.name} {e}')
         elif tag.type is str:
             size = len(tag.value)
-            data = struct.pack(f'!B{size}s', pc.TYPE_STR, tag.value.encode())
+            data = struct.pack(f'!B{size}s', pc.TYPE.STR, tag.value.encode())
         elif tag.type in [list, dict]:
             jsonstr = json.dumps(tag.value).encode()
             size = len(jsonstr)
-            data = struct.pack(f'!B{size}s', pc.TYPE_JSON, jsonstr)
+            data = struct.pack(f'!B{size}s', pc.TYPE.JSON, jsonstr)
         else:
             logging.warning(f'publish {tag.name} unhandled {tag.type}')
             return
-        self.write(pc.CMD_SET, tag.id, tag.time_us, data)
+        self.write(pc.COMMAND.SET, tag.id, tag.time_us, data)
 
     def add_callback_rta(self, tagname, handler):
         """Collect callback handlers."""
@@ -75,10 +75,10 @@ class BusClient:
         time_us = int(time.time() * 1e6)
         jsonstr = json.dumps(request).encode()
         size = len(jsonstr)
-        data = struct.pack(f'>B{size}s', pc.TYPE_JSON, jsonstr)
-        self.write(pc.CMD_RTA, self.tag_by_name[tagname].id, time_us, data)
+        data = struct.pack(f'>B{size}s', pc.TYPE.JSON, jsonstr)
+        self.write(pc.COMMAND.RTA, self.tag_by_name[tagname].id, time_us, data)
 
-    def write(self, command: pc.COMMANDS, tag_id: int, time_us: int,
+    def write(self, command: pc.COMMAND, tag_id: int, time_us: int,
               data: bytes):
         """Write a message."""
         if data is None:
@@ -101,14 +101,14 @@ class BusClient:
         self.tag_by_name[tag.name] = tag
         if tag.value is not None:
             self.to_publish[tag.name] = tag
-        self.write(pc.CMD_ID, 0, 0, tag.name.encode())
+        self.write(pc.COMMAND.ID, 0, 0, tag.name.encode())
 
     async def open_connection(self):
         """Establish connection and callbacks."""
         self.reader, self.writer = await asyncio.open_connection(
             self.ip, self.port)
         self.addr = self.writer.get_extra_info('sockname')
-        self.write(pc.CMD_LOG, 0, 0, f'{self.module} connected'.encode())
+        self.write(pc.COMMAND.LOG, 0, 0, f'{self.module} connected'.encode())
         logging.warning(f'connected {self.addr} {self.port}')
         for tag in Tag.get_all_tags().values():
             self.add_tag(tag)
@@ -157,14 +157,15 @@ class BusClient:
 
     def process(self, cmd, tag_id, time_us, value):
         """Process bus message, updating the local tag value."""
-        if cmd == pc.CMD_ERR:
-            logging.warning(f'Bus server error {tag_id} {value}')
+        if cmd == pc.COMMAND.ERR:
+            logging.warning(f'Bus server error {tag_id} '
+                            f'{pc.COMMAND.text(cmd)} {value}')
             return
-        if cmd == pc.CMD_ID:
+        if cmd == pc.COMMAND.ID:
             tag = self.tag_by_name[value.decode()]
             tag.id = tag_id
             self.tag_by_id[tag_id] = tag
-            self.write(pc.CMD_SUB, tag.id, 0, b'')
+            self.write(pc.COMMAND.SUB, tag.id, 0, b'')
             if tag.name in self.tag_by_name:
                 self.tag_by_id[tag.id] = tag
             if tag.name in self.to_publish:
@@ -172,7 +173,7 @@ class BusClient:
                 del self.to_publish[tag.name]
             return
         tag = self.tag_by_id[tag_id]
-        if cmd == pc.CMD_SET:
+        if cmd == pc.COMMAND.SET:
             if value is None:
                 try:
                     if self.tag_info is None:
@@ -186,17 +187,17 @@ class BusClient:
                     pass
                 return
             data_type = struct.unpack_from('!B', value, offset=0)[0]
-            if data_type == pc.TYPE_FLOAT:
+            if data_type == pc.TYPE.FLOAT:
                 data = struct.unpack_from('!d', value, offset=1)[0]
-            elif data_type == pc.TYPE_INT:
+            elif data_type == pc.TYPE.INT:
                 data = struct.unpack_from('!q', value, offset=1)[0]
-            elif data_type == pc.TYPE_BYTES:
+            elif data_type == pc.TYPE.BYTES:
                 data = struct.unpack_from(f'!{len(value) - 1}s', value,
                                           offset=1)[0]
-            elif data_type == pc.TYPE_STR:
+            elif data_type == pc.TYPE.STR:
                 data = struct.unpack_from(f'!{len(value) - 1}s', value,
                                           offset=1)[0].decode()
-            elif data_type == pc.TYPE_JSON:
+            elif data_type == pc.TYPE.JSON:
                 data = json.loads(struct.unpack_from(f'!{len(value) - 1}s',
                                                      value, offset=1
                                                      )[0].decode())
@@ -204,7 +205,7 @@ class BusClient:
                 logging.warning(f'process error {tag.name} {tag.type} {value}')
                 return
             tag.value = data, time_us, id(self)
-        elif cmd == pc.CMD_RTA:
+        elif cmd == pc.COMMAND.RTA:
             data = struct.unpack_from(f'!{len(value) - 1}s', value, offset=1
                                       )[0].decode()
             data = json.loads(data)

{pymscada-0.1.10 → pymscada-0.1.11b2}/src/pymscada/bus_server.py

@@ -85,12 +85,12 @@ class BusConnection():
         del self.addr
         del self.pending
 
-    def write(self, command: pc.COMMANDS, tag_id: int, time_us: int,
+    def write(self, command: pc.COMMAND, tag_id: int, time_us: int,
               data: bytes):
         """Write a message."""
         if data is None:
             data = b''
-        logging.info(f'write {pc.CMD_TEXT[command]} {tag_id}')
+        logging.info(f'write {command.text} {tag_id}')
         for i in range(0, len(data) + 1, pc.MAX_LEN):
             snip = data[i:i+pc.MAX_LEN]
             size = len(snip)
@@ -168,78 +168,78 @@ class BusServer:
         if tag.from_bus == bus_id:
             return
         try:
-            self.connections[bus_id].write(pc.CMD_SET, tag.id, tag.time_us,
+            self.connections[bus_id].write(pc.COMMAND.SET, tag.id, tag.time_us,
                                            tag.value)
         except KeyError:
             tag.del_callback(self.publish, bus_id)
 
-    def process(self, bus_id, cmd, tag_id, time_us, data):
+    def process(self, bus_id, cmd: int, tag_id, time_us, data):
         """Process bus message, updating the local tag value."""
-        logging.info(f'write {pc.CMD_TEXT[cmd]} {tag_id} '
+        logging.info(f'write {pc.COMMAND.text(cmd)} {tag_id} '
                      f'{"None" if data is None else data[:20]}')
-        if cmd == pc.CMD_SET:
+        if cmd == pc.COMMAND.SET:
             try:
                 tag = BusTags._tag_by_id[tag_id]
                 tag.update(data, time_us, bus_id)
             except KeyError:
                 self.connections[bus_id].write(
-                    pc.CMD_ERR, tag_id, time_us,
+                    pc.COMMAND.ERR, tag_id, time_us,
                     f"SET KeyError {tag_id}".encode())
-        elif cmd == pc.CMD_RTA:
+        elif cmd == pc.COMMAND.RTA:
             try:
                 tag = BusTags._tag_by_id[tag_id]
             except KeyError:
                 self.connections[bus_id].write(
-                    pc.CMD_ERR, tag_id, time_us,
+                    pc.COMMAND.ERR, tag_id, time_us,
                     f"RTA KeyError {tag_id}".encode())
             try:
                 self.connections[tag.from_bus].write(
-                    pc.CMD_RTA, tag_id, tag.time_us, data)
+                    pc.COMMAND.RTA, tag_id, tag.time_us, data)
             except KeyError:
                 logging.warning(f'likely busclient for {tag.name} is gone')
             except Exception as e:
                 self.connections[bus_id].write(
-                    pc.CMD_ERR, tag_id, time_us,
+                    pc.COMMAND.ERR, tag_id, time_us,
                     f"RTA {tag_id} {e}".encode())
             """Reply comes from another BusClient, not the Server."""
-        elif cmd == pc.CMD_SUB:
+        elif cmd == pc.COMMAND.SUB:
             try:
                 tag = BusTags._tag_by_id[tag_id]
             except KeyError:
                 self.connections[bus_id].write(
-                    pc.CMD_ERR, tag_id, time_us,
+                    pc.COMMAND.ERR, tag_id, time_us,
                     f"SUBscribe KeyError {tag_id}".encode())
-            self.connections[bus_id].write(pc.CMD_SET, tag_id, tag.time_us,
+            self.connections[bus_id].write(pc.COMMAND.SET, tag_id, tag.time_us,
                                            tag.value)
             tag.add_callback(self.publish, bus_id)
-        elif cmd == pc.CMD_ID:
+        elif cmd == pc.COMMAND.ID:
             try:
                 tag = BusTags._tag_by_name[data]
             except KeyError:
                 self.connections[bus_id].write(
-                    pc.CMD_ERR, tag_id, time_us,
+                    pc.COMMAND.ERR, tag_id, time_us,
                     f"ID {data} undefined".encode())
                 tag = BusTag(data)
-            self.connections[bus_id].write(pc.CMD_ID, tag.id, tag.time_us,
+            self.connections[bus_id].write(pc.COMMAND.ID, tag.id, tag.time_us,
                                            tag.name)
-        elif cmd == pc.CMD_GET:
+        elif cmd == pc.COMMAND.GET:
             try:
                 tag = BusTags._tag_by_id[tag_id]
             except KeyError:
                 self.connections[bus_id].write(
-                    pc.CMD_ERR, tag_id, time_us,
+                    pc.COMMAND.ERR, tag_id, time_us,
                     f"GET KeyError for {tag_id}".encode())
-            self.connections[bus_id].write(pc.CMD_SET, tag.id, tag.time_us,
+            self.connections[bus_id].write(pc.COMMAND.SET, tag.id, tag.time_us,
                                            tag.value)
-        elif cmd == pc.CMD_UNSUB:
+        elif cmd == pc.COMMAND.UNSUB:
             try:
                 tag = BusTags._tag_by_id[tag_id]
             except KeyError:
                 self.connections[bus_id].write(
-                    pc.CMD_ERR, tag_id, time_us,
+                    pc.COMMAND.ERR, tag_id, time_us,
                     f"UNSubscribe KeyError for {tag_id}".encode())
             tag.del_callback(self.publish, bus_id)
-        elif cmd == pc.CMD_LIST:
+        elif cmd == pc.COMMAND.LIST:
             tagname_list = []
             if len(data) == 0:
                 for _, tag in BusTags._tag_by_id.items():
@@ -260,8 +260,8 @@ class BusServer:
                     if data in tag.name:
                         tagname_list.append(tag.name)
             self.connections[bus_id].write(
-                pc.CMD_LIST, 0, time_us, b' '.join(tagname_list))
-        elif cmd == pc.CMD_LOG:
+                pc.COMMAND.LIST, 0, time_us, b' '.join(tagname_list))
+        elif cmd == pc.COMMAND.LOG:
             if len(data) > 300:
                 logging.warning(f'process: log message too long from {bus_id}')
             else:
@@ -273,6 +273,9 @@ class BusServer:
         """Process read messages, delete broken connections."""
         bus_id, cmd, tag_id, time_us, data = command
         if cmd is None:
+            # Clean up tag subscriptions before deleting it
+            for tag in BusTags._tag_by_id.values():
+                tag.del_callback(self.publish, bus_id)
             self.connections[bus_id].delete()
             del self.connections[bus_id]
             return

{pymscada-0.1.10 → pymscada-0.1.11b2}/src/pymscada/console.py

@@ -13,7 +13,6 @@ except ModuleNotFoundError:
 
 class EC:
     """Escape codes."""
-
     backspace = b'\x7f'
     enter = b'\r'
     tab = b'\t'
@@ -59,17 +58,14 @@ class KeypressProtocol(asyncio.Protocol):
     def data_received(self, data):
         """Got keypress, update edit line, send to writer."""
         if len(data) == 1:
-            if data == EC.backspace:
+            if data == EC.backspace and self.cursor > 0:
                 self.line = self.line[:self.cursor-1] + self.line[self.cursor:]
-                if self.cursor > 0:
-                    self.cursor -= 1
+                self.cursor -= 1
             elif data == EC.enter:
-                self.stash = None
-                if self.lines:
-                    if self.line != self.lines[-1]:
-                        self.lines.append(self.line)
-                else:
+                if self.line and (not self.lines or
+                                  self.line != self.lines[-1]):
                     self.lines.append(self.line)
+                self.stash = None
                 self.edit_line(None, 0)
                 self.process_command(self.line)
                 self.line = None
@@ -129,11 +125,12 @@ class ConsoleWriter:
 
     def write(self, data: bytes):
         """Stream writer, primarily for logging."""
+        cursor_str = b''
+        if self.edit is not None and self.cursor > 0:
+            cursor_str = b'\x1b[' + str(self.cursor).encode() + b'C'
         ln = EC.cr_clr + data + b'\r\n'
         if self.edit is not None:
-            ln += EC.cr_clr + self.edit + EC.mv_left
-            if self.cursor > 0:
-                ln += b'\x1b[' + str(self.cursor).encode() + b'C'
+            ln += EC.cr_clr + self.edit + EC.mv_left + cursor_str
         sys.stdout.buffer.write(ln)
         sys.stdout.flush()
 
@@ -173,8 +170,8 @@ class Console:
         # all to add '\r\n' to the logging output
         logger = logging.getLogger()
         handler = CustomHandler()
-        handler.setFormatter(logging.Formatter(
-            '%(levelname)s:%(name)s:%(message)s'))
+        handler.setFormatter(logging.Formatter('%(levelname)s:console: '
+                                               '%(message)s'))
         logger.handlers.clear()
         logger.addHandler(handler)
         self.busclient = BusClient(bus_ip, bus_port, module='Console')

pymscada-0.1.11b2/src/pymscada/demo/openweather.yaml

@@ -0,0 +1,25 @@
+bus_ip: 127.0.0.1
+bus_port: 1325
+proxy:
+api:
+  api_key: ${OPENWEATHER_API_KEY}
+  units: metric
+  locations:
+    Murupara:
+      lat: -38.45747036367239
+      lon: 176.70484322806843
+  times: [3]
+  parameters:
+  - Temp
+  - WindSpeed
+  - WindDir
+  - Rain
+tags:
+  - Murupara_Temp
+  - Murupara_WindSpeed
+  - Murupara_WindDir
+  - Murupara_Rain
+  - Murupara_Temp_03
+  - Murupara_WindSpeed_03
+  - Murupara_WindDir_03
+  - Murupara_Rain_03

{pymscada-0.1.10 → pymscada-0.1.11b2}/src/pymscada/demo/tags.yaml

@@ -256,10 +256,13 @@ Router_eth8_bytes_out:
   type: int
 localhost_ping:
   desc: Ping time to localhost
+  type: int
   units: ms
 google_ping:
   desc: Ping time to google
+  type: int
   units: ms
 electronet_ping:
   desc: Ping time to electronet
+  type: int
   units: ms

{pymscada-0.1.10 → pymscada-0.1.11b2}/src/pymscada/demo/wwwserver.yaml

@@ -88,269 +88,6 @@ pages:
   parent: Dropdown
   items:
   - type: files
-- name: Temperature
-  parent: Weather
-  items:
-  - type: uplot  # Do all times in seconds, which uplot uses.
-    ms:
-      desc: Temperature
-      age: 172800
-      legend_pos: left
-      time_pos: left
-      time_res: m
-    axes:
-    - scale: x
-      range: [-604800, 86400]  # 86400 172800 1209600
-    - scale: 'C'
-      range: [0.0, 35.0]
-      dp: 1
-    series:
-    - tagname: temperature
-      label: Current Temperature
-      scale: 'C'
-      color: black
-      width: 2
-      dp: 1
-    - tagname: temperature_01
-      label: 1h Temperature
-      scale: 'C'
-      color: darkgray
-      width: 1.5
-      dp: 1
-    - tagname: temperature_04
-      label: 4h Temperature
-      scale: 'C'
-      color: green
-      width: 1
-      dp: 1
-    - tagname: temperature_12
-      label: 12h Temperature
-      scale: 'C'
-      color: orange
-      width: 0.75
-      dp: 1
-    - tagname: temperature_24
-      label: 24h Temperature
-      scale: 'C'
-      color: red
-      width: 0.5
-      dp: 1
-- name: Wind Speed
-  parent: Weather
-  items:
-  - type: uplot  # Do all times in seconds, which uplot uses.
-    ms:
-      desc: Wind Speed
-      age: 172800
-      legend_pos: left
-      time_pos: left
-      time_res: m
-    axes:
-    - scale: x
-      range: [-604800, 86400]  # 86400 172800 1209600
-    - scale: 'm/s'
-      range: [0.0, 20.0]
-      dp: 1
-    series:
-    - tagname: windSpeed
-      label: Current Wind Speed
-      scale: 'm/s'
-      color: black
-      width: 2
-      dp: 1
-    - tagname: windSpeed_01
-      label: 1h Wind Speed
-      scale: 'm/s'
-      color: darkgray
-      width: 1.5
-      dp: 1
-    - tagname: windSpeed_04
-      label: 4h Wind Speed
-      scale: 'm/s'
-      color: green
-      width: 1
-      dp: 1
-    - tagname: windSpeed_12
-      label: 12h Wind Speed
-      scale: 'm/s'
-      color: orange
-      width: 0.75
-      dp: 1
-    - tagname: windSpeed_24
-      label: 24h Wind Speed
-      scale: 'm/s'
-      color: red
-      width: 0.5
-      dp: 1
-- name: Wind Direction
-  parent: Weather
-  items:
-  - type: uplot  # Do all times in seconds, which uplot uses.
-    ms:
-      desc: Wind Direction
-      age: 172800
-      legend_pos: left
-      time_pos: left
-      time_res: m
-    axes:
-    - scale: x
-      range: [-604800, 86400]  # 86400 172800 1209600
-    - scale: 'deg'
-      range: [0.0, 360.0]
-      dp: 1
-    series:
-    - tagname: windDirection
-      label: Current Wind Direction
-      scale: 'deg'
-      color: black
-      width: 2
-      dp: 1
-    - tagname: windDirection_01
-      label: 1h Wind Direction
-      scale: 'deg'
-      color: darkgray
-      width: 1.5
-      dp: 1
-    - tagname: windDirection_04
-      label: 4h Wind Direction
-      scale: 'deg'
-      color: green
-      width: 1
-      dp: 1
-    - tagname: windDirection_12
-      label: 12h Wind Direction
-      scale: 'deg'
-      color: orange
-      width: 0.75
-      dp: 1
-    - tagname: windDirection_24
-      label: 24h Wind Direction
-      scale: 'deg'
-      color: red
-      width: 0.5
-      dp: 1
-- name: Rain Accumulation
-  parent: Weather
-  items:
-  - type: uplot  # Do all times in seconds, which uplot uses.
-    ms:
-      desc: Rain Accumulation
-      age: 172800
-      legend_pos: left
-      time_pos: left
-      time_res: m
-    axes:
-    - scale: x
-      range: [-604800, 86400]  # 86400 172800 1209600
-    - scale: 'mm'
-      range: [0.0, 10.0]
-      dp: 1
-    series:
-    - tagname: rainAccumulation
-      label: Current Rain Accumulation
-      scale: 'mm'
-      color: black
-      width: 2
-      dp: 1
-    - tagname: rainAccumulation_01
-      label: 1h Rain Accumulation
-      scale: 'mm'
-      color: darkgray
-      width: 1.5
-      dp: 1
-    - tagname: rainAccumulation_04
-      label: 4h Rain Accumulation
-      scale: 'mm'
-      color: green
-      width: 1
-      dp: 1
-    - tagname: rainAccumulation_12
-      label: 12h Rain Accumulation
-      scale: 'mm'
-      color: orange
-      width: 0.75
-      dp: 1
-    - tagname: rainAccumulation_24
-      label: 24h Rain Accumulation
-      scale: 'mm'
-      color: red
-      width: 0.5
-      dp: 1
-- name: Humidity
-  parent: Weather
-  items:
-  - type: uplot  # Do all times in seconds, which uplot uses.
-    ms:
-      desc: Humidity
-      age: 172800
-      legend_pos: left
-      time_pos: left
-      time_res: m
-    axes:
-    - scale: x
-      range: [-604800, 86400]  # 86400 172800 1209600
-    - scale: '%'
-      range: [0.0, 100.0]
-      dp: 1
-    series:
-    - tagname: humidity
-      label: Current Humidity
-      scale: '%'
-      color: black
-      width: 2
-      dp: 1
-    - tagname: humidity_01
-      label: 1h Humidity
-      scale: '%'
-      color: darkgray
-      width: 1.5
-      dp: 1
-    - tagname: humidity_04
-      label: 4h Humidity
-      scale: '%'
-      color: green
-      width: 1
-      dp: 1
-    - tagname: humidity_12
-      label: 12h Humidity
-      scale: '%'
-      color: orange
-      width: 0.75
-      dp: 1
-    - tagname: humidity_24
-      label: 24h Humidity
-      scale: '%'
-      color: red
-      width: 0.5
-      dp: 1
-- name: Values
-  parent: Weather
-  items:
-  - {tagname: temperature, type: value}
-  - {tagname: temperature_01, type: value}
-  - {tagname: temperature_04, type: value}
-  - {tagname: temperature_12, type: value}
-  - {tagname: temperature_24, type: value}
-  - {tagname: windSpeed, type: value}
-  - {tagname: windSpeed_01, type: value}
-  - {tagname: windSpeed_04, type: value}
-  - {tagname: windSpeed_12, type: value}
-  - {tagname: windSpeed_24, type: value}
-  - {tagname: windDirection, type: value}
-  - {tagname: windDirection_01, type: value}
-  - {tagname: windDirection_04, type: value}
-  - {tagname: windDirection_12, type: value}
-  - {tagname: windDirection_24, type: value}
-  - {tagname: rainAccumulation, type: value}
-  - {tagname: rainAccumulation_01, type: value}
-  - {tagname: rainAccumulation_04, type: value}
-  - {tagname: rainAccumulation_12, type: value}
-  - {tagname: rainAccumulation_24, type: value}
-  - {tagname: humidity, type: value}
-  - {tagname: humidity_01, type: value}
-  - {tagname: humidity_04, type: value}
-  - {tagname: humidity_12, type: value}
-  - {tagname: humidity_24, type: value}
 - name: Logix
   items:
   - {tagname: Ani_Fin_20, type: setpoint}