pymscada 0.1.11b7__tar.gz → 0.1.11b9__tar.gz

{pymscada-0.1.11b7 → pymscada-0.1.11b9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymscada
-Version: 0.1.11b7
+Version: 0.1.11b9
 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,7 +15,7 @@ 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.10b2
+Requires-Dist: pymscada-html>=0.1.10b5
 Requires-Dist: cerberus>=1.3.5
 Requires-Dist: pycomm3>=1.2.14
 Requires-Dist: pysnmplib>=5.0.24

{pymscada-0.1.11b7 → pymscada-0.1.11b9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pymscada"
-version = "0.1.11b7"
+version = "0.1.11b9"
 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.10b2",
+    "pymscada-html>=0.1.10b5",
     "cerberus>=1.3.5",
     "pycomm3>=1.2.14",
     "pysnmplib>=5.0.24",

{pymscada-0.1.11b7 → pymscada-0.1.11b9}/src/pymscada/bus_server.py

@@ -265,7 +265,11 @@ class BusServer:
             if len(data) > 300:
                 logging.warning(f'process: log message too long from {bus_id}')
             else:
-                logging.warning(data.decode())
+                log_msg = data.decode()
+                logging.warning(log_msg)
+                client_addr = self.connections[bus_id].addr
+                self.bus_tag.value = f'\x03{client_addr}: {log_msg}'.encode()
+                self.bus_tag.time_us = int(time.time() * 1e6)
         else:  # consider disconnecting
             logging.warn(f'invalid message {cmd}')
 

{pymscada-0.1.11b7 → pymscada-0.1.11b9}/src/pymscada/demo/accuweather.yaml

@@ -1,5 +1,5 @@
 bus_ip: 127.0.0.1
-bus_port: 1325
+bus_port: 1324
 proxy: 'http://127.0.0.1:3128'
 api:
   url: http://dataservice.accuweather.com/forecasts/v1/hourly/12hour/

{pymscada-0.1.11b7 → pymscada-0.1.11b9}/src/pymscada/demo/openweather.yaml

@@ -1,5 +1,5 @@
 bus_ip: 127.0.0.1
-bus_port: 1325
+bus_port: 1324
 proxy:
 api:
   api_key: ${OPENWEATHER_API_KEY}

{pymscada-0.1.11b7 → pymscada-0.1.11b9}/src/pymscada/demo/tags.yaml

@@ -116,4 +116,60 @@ localhost_ping:
 google_ping:
   desc: Ping time to google
   type: float
-  units: ms
+  units: ms
+Murupara_Temp:
+  desc: Murupara Temperature
+  type: float
+  units: '°C'
+  dp: 1
+  min: -50
+  max: 50
+Murupara_WindSpeed:
+  desc: Murupara Wind Speed
+  type: float
+  units: 'm/s'
+  dp: 1
+  min: 0
+  max: 200
+Murupara_WindDir:
+  desc: Murupara Wind Direction
+  type: float
+  units: '°'
+  dp: 0
+  min: 0
+  max: 360
+Murupara_Rain:
+  desc: Murupara Rainfall
+  type: float
+  units: 'mm'
+  dp: 1
+  min: 0
+  max: 1000
+Murupara_Temp_03:
+  desc: Murupara Temperature 3-Hour Forecast
+  type: float
+  units: '°C'
+  dp: 1
+  min: -50
+  max: 50
+Murupara_WindSpeed_03:
+  desc: Murupara Wind Speed 3-Hour Forecast
+  type: float
+  units: 'm/s'
+  dp: 1
+  min: 0
+  max: 200
+Murupara_WindDir_03:
+  desc: Murupara Wind Direction 3-Hour Forecast
+  type: float
+  units: '°'
+  dp: 0
+  min: 0
+  max: 360
+Murupara_Rain_03:
+  desc: Murupara Rainfall 3-Hour Forecast
+  type: float
+  units: 'mm'
+  dp: 1
+  min: 0
+  max: 1000

{pymscada-0.1.11b7 → pymscada-0.1.11b9}/src/pymscada/demo/wwwserver.yaml

@@ -78,3 +78,49 @@ pages:
       scale: mS
       color: red
       dp: 1
+- name: Weather
+  parent:
+  items:
+  - type: uplot
+    ms:
+      desc: Weather
+      age: 172800
+      legend_pos: left
+      time_pos: left
+      time_res: m
+    axes:
+    - scale: x
+      range: [-86400, 0]  # 24 hours of data
+    - scale: temp
+      range: [-10, 40]    # Temperature in Celsius
+      dp: 1
+    - scale: wind
+      range: [0, 100]     # Wind speed in km/h
+      dp: 1
+    - scale: dir
+      range: [0, 360]     # Wind direction in degrees
+      dp: 0
+    - scale: rain
+      range: [0, 50]      # Rain in mm
+      dp: 1
+    series:
+    - tagname: Murupara_Temp
+      label: Temperature
+      scale: temp
+      color: red
+      dp: 1
+    - tagname: Murupara_WindSpeed
+      label: Wind Speed
+      scale: wind
+      color: blue
+      dp: 1
+    - tagname: Murupara_WindDir
+      label: Wind Direction
+      scale: dir
+      color: green
+      dp: 0
+    - tagname: Murupara_Rain
+      label: Rainfall
+      scale: rain
+      color: lightblue
+      dp: 1

{pymscada-0.1.11b7 → pymscada-0.1.11b9}/src/pymscada/iodrivers/openweather.py

@@ -73,6 +73,7 @@ class OpenWeatherClient:
 
     async def fetch_current_data(self):
         """Fetch current weather data for all locations."""
+        logging.info('fetching current')
         if self.session is None:
             self.session = aiohttp.ClientSession()
         for location, coords in self.locations.items():
@@ -92,6 +93,7 @@ class OpenWeatherClient:
 
     async def fetch_forecast_data(self):
         """Fetch forecast weather data for all locations."""
+        logging.info('fetching forecast')
         if self.session is None:
             self.session = aiohttp.ClientSession()
         for location, coords in self.locations.items():
@@ -113,9 +115,9 @@ class OpenWeatherClient:
         """Poll OpenWeather APIs every 10 minutes."""
         now = int(time())
         if now % 600 == 0:  # Every 10 minutes
-            await self.fetch_current_data()
+            asyncio.create_task(self.fetch_current_data())
         if now % 10800 == 60:  # Every 3 hours, offset by 1 minute
-            await self.fetch_forecast_data()
+            asyncio.create_task(self.fetch_forecast_data())
 
     async def start(self):
         """Start bus connection and API polling."""

{pymscada-0.1.11b7 → pymscada-0.1.11b9}/src/pymscada/www_server.py

@@ -182,8 +182,6 @@ class WSHandler():
                 if action == 'set':  # pc.CMD_SET
                     self.tag_by_name[tagname].value = value, time_us, bus
                 elif action == 'rta':  # pc.CMD_RTA
-                    if tagname not in self.tag_by_name:
-                        self.do_sub(tagname)
                     if 'File' in value:
                         file = await anext(self.ws)
                         value['_file_data'] = file.data