pymscada 0.2.6b10__tar.gz → 0.2.6b12__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (105) hide show
  1. {pymscada-0.2.6b10/src/pymscada.egg-info → pymscada-0.2.6b12}/PKG-INFO +1 -1
  2. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/pyproject.toml +1 -1
  3. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/bus_server.py +2 -2
  4. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/callout.py +6 -5
  5. {pymscada-0.2.6b10 → pymscada-0.2.6b12/src/pymscada.egg-info}/PKG-INFO +1 -1
  6. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/LICENSE +0 -0
  7. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/MANIFEST.in +0 -0
  8. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/README.md +0 -0
  9. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/setup.cfg +0 -0
  10. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/__init__.py +0 -0
  11. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/__main__.py +0 -0
  12. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/alarms.py +0 -0
  13. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/bus_client.py +0 -0
  14. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/checkout.py +0 -0
  15. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/config.py +0 -0
  16. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/console.py +0 -0
  17. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/README.md +0 -0
  18. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/__init__.py +0 -0
  19. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/__pycache__/__init__.cpython-311.pyc +0 -0
  20. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/accuweather.yaml +0 -0
  21. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/alarms.yaml +0 -0
  22. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/bus.yaml +0 -0
  23. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/callout.yaml +0 -0
  24. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/files.yaml +0 -0
  25. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/history.yaml +0 -0
  26. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/logixclient.yaml +0 -0
  27. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/modbus_plc.py +0 -0
  28. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/modbusclient.yaml +0 -0
  29. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/modbusserver.yaml +0 -0
  30. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/openweather.yaml +0 -0
  31. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/opnotes.yaml +0 -0
  32. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/piapi.yaml +0 -0
  33. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/ping.yaml +0 -0
  34. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/pymscada-alarms.service +0 -0
  35. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/pymscada-bus.service +0 -0
  36. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/pymscada-callout.service +0 -0
  37. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/pymscada-demo-modbus_plc.service +0 -0
  38. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/pymscada-files.service +0 -0
  39. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/pymscada-history.service +0 -0
  40. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/pymscada-io-logixclient.service +0 -0
  41. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/pymscada-io-modbusclient.service +0 -0
  42. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/pymscada-io-modbusserver.service +0 -0
  43. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/pymscada-io-openweather.service +0 -0
  44. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/pymscada-io-piapi.service +0 -0
  45. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/pymscada-io-ping.service +0 -0
  46. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/pymscada-io-sms.service +0 -0
  47. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/pymscada-io-snmpclient.service +0 -0
  48. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/pymscada-io-witsapi.service +0 -0
  49. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/pymscada-opnotes.service +0 -0
  50. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/pymscada-wwwserver.service +0 -0
  51. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/sms.yaml +0 -0
  52. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/snmpclient.yaml +0 -0
  53. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/tags.yaml +0 -0
  54. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/witsapi.yaml +0 -0
  55. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/demo/wwwserver.yaml +0 -0
  56. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/files.py +0 -0
  57. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/history.py +0 -0
  58. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/iodrivers/__init__.py +0 -0
  59. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/iodrivers/accuweather.py +0 -0
  60. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/iodrivers/logix_client.py +0 -0
  61. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/iodrivers/logix_map.py +0 -0
  62. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/iodrivers/modbus_client.py +0 -0
  63. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/iodrivers/modbus_map.py +0 -0
  64. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/iodrivers/modbus_server.py +0 -0
  65. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/iodrivers/openweather.py +0 -0
  66. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/iodrivers/piapi.py +0 -0
  67. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/iodrivers/ping_client.py +0 -0
  68. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/iodrivers/ping_map.py +0 -0
  69. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/iodrivers/sms.py +0 -0
  70. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/iodrivers/snmp_client.py +0 -0
  71. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/iodrivers/snmp_map.py +0 -0
  72. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/iodrivers/witsapi.py +0 -0
  73. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/iodrivers/witsapi_POC.py +0 -0
  74. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/main.py +0 -0
  75. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/misc.py +0 -0
  76. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/module_config.py +0 -0
  77. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/opnotes.py +0 -0
  78. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/pdf/__init__.py +0 -0
  79. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/pdf/__pycache__/__init__.cpython-311.pyc +0 -0
  80. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/pdf/one.pdf +0 -0
  81. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/pdf/two.pdf +0 -0
  82. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/periodic.py +0 -0
  83. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/protocol_constants.py +0 -0
  84. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/samplers.py +0 -0
  85. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/tag.py +0 -0
  86. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/tools/get_history.py +0 -0
  87. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/tools/snmp_client2.py +0 -0
  88. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/tools/walk.py +0 -0
  89. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada/www_server.py +0 -0
  90. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada.egg-info/SOURCES.txt +0 -0
  91. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada.egg-info/dependency_links.txt +0 -0
  92. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada.egg-info/entry_points.txt +0 -0
  93. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada.egg-info/requires.txt +0 -0
  94. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/src/pymscada.egg-info/top_level.txt +0 -0
  95. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/tests/test_alarms.py +0 -0
  96. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/tests/test_bus_server.py +0 -0
  97. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/tests/test_callout.py +0 -0
  98. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/tests/test_config.py +0 -0
  99. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/tests/test_history.py +0 -0
  100. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/tests/test_misc.py +0 -0
  101. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/tests/test_opnotes.py +0 -0
  102. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/tests/test_periodic.py +0 -0
  103. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/tests/test_samplers.py +0 -0
  104. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/tests/test_sms.py +0 -0
  105. {pymscada-0.2.6b10 → pymscada-0.2.6b12}/tests/test_tag.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: pymscada
3
- Version: 0.2.6b10
3
+ Version: 0.2.6b12
4
4
  Summary: Shared tag value SCADA with python backup and Angular UI
5
5
  Author-email: Jamie Walton <jamie@walton.net.nz>
6
6
  License: GPL-3.0-or-later
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "pymscada"
3
- version = "0.2.6b10"
3
+ version = "0.2.6b12"
4
4
  description = "Shared tag value SCADA with python backup and Angular UI"
5
5
  authors = [
6
6
  {name = "Jamie Walton", email = "jamie@walton.net.nz"},
@@ -208,8 +208,8 @@ class BusServer:
208
208
  f"RTA KeyError {tag_id}".encode())
209
209
  return
210
210
  try:
211
- logging.info(f'RTA forwarding {tag.name} from_bus={tag.from_bus} '
212
- f'to bus_id={tag.from_bus}')
211
+ logging.info(f'RTA forwarding {tag.name} rta_bus={tag.from_bus} '
212
+ f'bus_id={bus_id}')
213
213
  self.connections[tag.from_bus].write(
214
214
  pc.COMMAND.RTA, tag_id, tag.time_us, data)
215
215
  except KeyError:
@@ -169,12 +169,13 @@ class Callout:
169
169
  def set_rta_value(self, rta_id: int):
170
170
  """Publish the current configuration to the RTA tag."""
171
171
  callees = [{'name': callee.name, 'sms': callee.sms, 'role': callee.role,
172
- 'group': callee.group, 'delay_ms': callee.delay_ms}
172
+ 'group': callee.group}
173
173
  for callee in self.callees]
174
- self.rta.value = {'__rta_id__': rta_id,
175
- 'callees': callees,
176
- 'groups': self.groups,
177
- 'escalation': list(self.escalation.keys())}
174
+ escalation = self.escalation.keys()
175
+ value = {'__rta_id__': rta_id, 'callees': callees, 'groups': self.groups,
176
+ 'escalation': escalation}
177
+ logging.info(f'set_rta_value {rta_id} {value}')
178
+ self.rta.value = value
178
179
 
179
180
  def alarms_cb(self, alm_tag):
180
181
  """Handle alarm messages from alarms.py."""
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: pymscada
3
- Version: 0.2.6b10
3
+ Version: 0.2.6b12
4
4
  Summary: Shared tag value SCADA with python backup and Angular UI
5
5
  Author-email: Jamie Walton <jamie@walton.net.nz>
6
6
  License: GPL-3.0-or-later
File without changes
File without changes
File without changes
File without changes