pymscada 0.1.9__tar.gz → 0.1.10__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 (85) hide show
  1. {pymscada-0.1.9 → pymscada-0.1.10}/PKG-INFO +1 -1
  2. {pymscada-0.1.9 → pymscada-0.1.10}/pyproject.toml +1 -1
  3. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/iodrivers/accuweather.py +4 -2
  4. {pymscada-0.1.9 → pymscada-0.1.10}/LICENSE +0 -0
  5. {pymscada-0.1.9 → pymscada-0.1.10}/README.md +0 -0
  6. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/__init__.py +0 -0
  7. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/__main__.py +0 -0
  8. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/bus_client.py +0 -0
  9. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/bus_server.py +0 -0
  10. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/checkout.py +0 -0
  11. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/config.py +0 -0
  12. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/console.py +0 -0
  13. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/README.md +0 -0
  14. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/__init__.py +0 -0
  15. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/accuweather.yaml +0 -0
  16. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/bus.yaml +0 -0
  17. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/files.yaml +0 -0
  18. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/history.yaml +0 -0
  19. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/logixclient.yaml +0 -0
  20. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/modbus_plc.py +0 -0
  21. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/modbusclient.yaml +0 -0
  22. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/modbusserver.yaml +0 -0
  23. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/opnotes.yaml +0 -0
  24. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/ping.yaml +0 -0
  25. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/pymscada-bus.service +0 -0
  26. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/pymscada-demo-modbus_plc.service +0 -0
  27. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/pymscada-files.service +0 -0
  28. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/pymscada-history.service +0 -0
  29. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/pymscada-io-accuweather.service +0 -0
  30. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/pymscada-io-logixclient.service +0 -0
  31. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/pymscada-io-modbusclient.service +0 -0
  32. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/pymscada-io-modbusserver.service +0 -0
  33. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/pymscada-io-ping.service +0 -0
  34. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/pymscada-io-snmpclient.service +0 -0
  35. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/pymscada-opnotes.service +0 -0
  36. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/pymscada-wwwserver.service +0 -0
  37. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/snmpclient.yaml +0 -0
  38. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/tags.yaml +0 -0
  39. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/demo/wwwserver.yaml +0 -0
  40. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/files.py +0 -0
  41. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/history.py +0 -0
  42. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/iodrivers/__init__.py +0 -0
  43. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/iodrivers/logix_client.py +0 -0
  44. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/iodrivers/logix_map.py +0 -0
  45. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/iodrivers/modbus_client.py +0 -0
  46. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/iodrivers/modbus_map.py +0 -0
  47. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/iodrivers/modbus_server.py +0 -0
  48. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/iodrivers/ping_client.py +0 -0
  49. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/iodrivers/ping_map.py +0 -0
  50. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/iodrivers/snmp_client.py +0 -0
  51. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/iodrivers/snmp_map.py +0 -0
  52. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/main.py +0 -0
  53. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/misc.py +0 -0
  54. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/opnotes.py +0 -0
  55. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/pdf/__init__.py +0 -0
  56. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/pdf/one.pdf +0 -0
  57. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/pdf/two.pdf +0 -0
  58. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/periodic.py +0 -0
  59. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/protocol_constants.py +0 -0
  60. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/samplers.py +0 -0
  61. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/tag.py +0 -0
  62. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/tools/snmp_client2.py +0 -0
  63. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/tools/walk.py +0 -0
  64. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/validate.py +0 -0
  65. {pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/www_server.py +0 -0
  66. {pymscada-0.1.9 → pymscada-0.1.10}/tests/__init__.py +0 -0
  67. {pymscada-0.1.9 → pymscada-0.1.10}/tests/bus_echo.py +0 -0
  68. {pymscada-0.1.9 → pymscada-0.1.10}/tests/iodrivers/test_logix.py +0 -0
  69. {pymscada-0.1.9 → pymscada-0.1.10}/tests/iodrivers/test_modbus.py +0 -0
  70. {pymscada-0.1.9 → pymscada-0.1.10}/tests/test_assets/busserver.yaml +0 -0
  71. {pymscada-0.1.9 → pymscada-0.1.10}/tests/test_assets/db.sqlite +0 -0
  72. {pymscada-0.1.9 → pymscada-0.1.10}/tests/test_assets/hist_tag_0_0.dat +0 -0
  73. {pymscada-0.1.9 → pymscada-0.1.10}/tests/test_assets/hist_tag_0_10_2.dat +0 -0
  74. {pymscada-0.1.9 → pymscada-0.1.10}/tests/test_assets/hist_tag_0_15.dat +0 -0
  75. {pymscada-0.1.9 → pymscada-0.1.10}/tests/test_assets/hist_tag_0_26.dat +0 -0
  76. {pymscada-0.1.9 → pymscada-0.1.10}/tests/test_assets/hist_tag_0_50.dat +0 -0
  77. {pymscada-0.1.9 → pymscada-0.1.10}/tests/test_bus_server.py +0 -0
  78. {pymscada-0.1.9 → pymscada-0.1.10}/tests/test_config.py +0 -0
  79. {pymscada-0.1.9 → pymscada-0.1.10}/tests/test_history.py +0 -0
  80. {pymscada-0.1.9 → pymscada-0.1.10}/tests/test_misc.py +0 -0
  81. {pymscada-0.1.9 → pymscada-0.1.10}/tests/test_opnotes.py +0 -0
  82. {pymscada-0.1.9 → pymscada-0.1.10}/tests/test_periodic.py +0 -0
  83. {pymscada-0.1.9 → pymscada-0.1.10}/tests/test_samplers.py +0 -0
  84. {pymscada-0.1.9 → pymscada-0.1.10}/tests/test_tag.py +0 -0
  85. {pymscada-0.1.9 → pymscada-0.1.10}/tests/test_validate.py +0 -0
{pymscada-0.1.9 → pymscada-0.1.10}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: pymscada
3
- Version: 0.1.9
3
+ Version: 0.1.10
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
{pymscada-0.1.9 → pymscada-0.1.10}/pyproject.toml RENAMED
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "pymscada"
3
- version = "0.1.9"
3
+ version = "0.1.10"
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" },
{pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/iodrivers/accuweather.py RENAMED
@@ -42,7 +42,7 @@ class AccuWeatherClient:
42
42
  for record in json:
43
43
  epoch = record['EpochDateTime']
44
44
  hour = int((epoch - time_mod) / 3600)
45
- logging.warning(f'epoch {epoch} time_s {time_s} hour {hour}')
45
+ logging.info(f'epoch {epoch} time_s {time_s} hour {hour}')
46
46
  if hour not in self.api['times']:
47
47
  continue
48
48
  suffix = ''
@@ -55,11 +55,13 @@ class AccuWeatherClient:
55
55
  ['Rain', 'Rain', None, 'Value'],
56
56
  ['Snow', 'Snow', None, 'Value']
57
57
  ]:
58
- tag = self.tags[f'{site}{parm}{suffix}']
58
+ tagname = f'{site}{parm}{suffix}'
59
+ tag = self.tags[tagname]
59
60
  if key2 is None:
60
61
  value = record[key1][key]
61
62
  else:
62
63
  value = record[key1][key2][key]
64
+ logging.info(f'{tagname} was {tag.value} new {value}')
63
65
  if tag.value != value:
64
66
  tag.value = value, int(epoch * 1e6), self.map_bus
65
67
 
{pymscada-0.1.9 → pymscada-0.1.10}/LICENSE RENAMED
File without changes
{pymscada-0.1.9 → pymscada-0.1.10}/README.md RENAMED
File without changes
{pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/main.py RENAMED
File without changes
{pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/misc.py RENAMED
File without changes
{pymscada-0.1.9 → pymscada-0.1.10}/src/pymscada/tag.py RENAMED
File without changes
{pymscada-0.1.9 → pymscada-0.1.10}/tests/__init__.py RENAMED
File without changes
{pymscada-0.1.9 → pymscada-0.1.10}/tests/bus_echo.py RENAMED
File without changes
{pymscada-0.1.9 → pymscada-0.1.10}/tests/test_config.py RENAMED
File without changes
{pymscada-0.1.9 → pymscada-0.1.10}/tests/test_misc.py RENAMED
File without changes
{pymscada-0.1.9 → pymscada-0.1.10}/tests/test_tag.py RENAMED
File without changes