PyBLNET 0.9.3__tar.gz → 0.9.5__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 (29) hide show
  1. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/PKG-INFO +2 -4
  2. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/PyBLNET.egg-info/PKG-INFO +2 -4
  3. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/PyBLNET.egg-info/SOURCES.txt +1 -0
  4. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/README.md +1 -1
  5. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/pyblnet/__init__.py +1 -1
  6. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/pyblnet/blnet_conn.py +1 -1
  7. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/pyblnet/blnet_parser.py +13 -13
  8. PyBLNET-0.9.5/pyblnet/tests/test_parser.py +28 -0
  9. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/LICENSE.txt +0 -0
  10. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/PyBLNET.egg-info/dependency_links.txt +0 -0
  11. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/PyBLNET.egg-info/requires.txt +0 -0
  12. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/PyBLNET.egg-info/top_level.txt +0 -0
  13. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/pyblnet/blnet.py +0 -0
  14. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/pyblnet/blnet_web.py +0 -0
  15. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/pyblnet/tests/__init__.py +0 -0
  16. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/pyblnet/tests/test_structure/580500.alternative.htm +0 -0
  17. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/pyblnet/tests/test_structure/580500.htm +0 -0
  18. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/pyblnet/tests/test_structure/580600.htm +0 -0
  19. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/pyblnet/tests/test_structure/__init__.py +0 -0
  20. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/pyblnet/tests/test_structure/blnet_mock_server.py +0 -0
  21. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/pyblnet/tests/test_structure/main.htm +0 -0
  22. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/pyblnet/tests/test_structure/main.html +0 -0
  23. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/pyblnet/tests/test_structure/par.htm +0 -0
  24. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/pyblnet/tests/test_structure/server_control.py +0 -0
  25. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/pyblnet/tests/test_web.py +0 -0
  26. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/pyblnet/tests/web_raw/__init__.py +0 -0
  27. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/pyblnet/tests/web_raw/web_state.py +0 -0
  28. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/setup.cfg +0 -0
  29. {PyBLNET-0.9.3 → PyBLNET-0.9.5}/setup.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: PyBLNET
3
- Version: 0.9.3
3
+ Version: 0.9.5
4
4
  Summary: Automate wireless communication to UVR1611 via BL-NET
5
5
  Home-page: https://github.com/nielstron/pyblnet/
6
6
  Author: nielstron
@@ -22,11 +22,9 @@ Classifier: Programming Language :: Python :: 3.11
22
22
  Requires-Python: >=3
23
23
  Description-Content-Type: text/markdown
24
24
  License-File: LICENSE.txt
25
- Requires-Dist: htmldom
26
- Requires-Dist: requests
27
25
 
28
26
  # PyBLNET - a very basic python BL-NET bridge
29
- [![Build Status](https://app.travis-ci.com/nielstron/pyblnet.svg?branch=master)](https://app.travis-ci.com/github/nielstron/pyblnet)
27
+ [![Build status](https://github.com/nielstron/pyblnet/actions/workflows/build.yml/badge.svg)](https://github.com/nielstron/pyblnet/actions/workflows/build.yml)
30
28
  [![Coverage Status](https://coveralls.io/repos/github/nielstron/pyblnet/badge.svg?branch=master)](https://coveralls.io/github/nielstron/pyblnet?branch=master)
31
29
 
32
30
  A package that connects to the BL-NET that is connected itself to a UVR1611 device by Technische Alternative.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: PyBLNET
3
- Version: 0.9.3
3
+ Version: 0.9.5
4
4
  Summary: Automate wireless communication to UVR1611 via BL-NET
5
5
  Home-page: https://github.com/nielstron/pyblnet/
6
6
  Author: nielstron
@@ -22,11 +22,9 @@ Classifier: Programming Language :: Python :: 3.11
22
22
  Requires-Python: >=3
23
23
  Description-Content-Type: text/markdown
24
24
  License-File: LICENSE.txt
25
- Requires-Dist: htmldom
26
- Requires-Dist: requests
27
25
 
28
26
  # PyBLNET - a very basic python BL-NET bridge
29
- [![Build Status](https://app.travis-ci.com/nielstron/pyblnet.svg?branch=master)](https://app.travis-ci.com/github/nielstron/pyblnet)
27
+ [![Build status](https://github.com/nielstron/pyblnet/actions/workflows/build.yml/badge.svg)](https://github.com/nielstron/pyblnet/actions/workflows/build.yml)
30
28
  [![Coverage Status](https://coveralls.io/repos/github/nielstron/pyblnet/badge.svg?branch=master)](https://coveralls.io/github/nielstron/pyblnet?branch=master)
31
29
 
32
30
  A package that connects to the BL-NET that is connected itself to a UVR1611 device by Technische Alternative.
@@ -12,6 +12,7 @@ pyblnet/blnet_conn.py
12
12
  pyblnet/blnet_parser.py
13
13
  pyblnet/blnet_web.py
14
14
  pyblnet/tests/__init__.py
15
+ pyblnet/tests/test_parser.py
15
16
  pyblnet/tests/test_web.py
16
17
  pyblnet/tests/test_structure/580500.alternative.htm
17
18
  pyblnet/tests/test_structure/580500.htm
@@ -1,5 +1,5 @@
1
1
  # PyBLNET - a very basic python BL-NET bridge
2
- [![Build Status](https://app.travis-ci.com/nielstron/pyblnet.svg?branch=master)](https://app.travis-ci.com/github/nielstron/pyblnet)
2
+ [![Build status](https://github.com/nielstron/pyblnet/actions/workflows/build.yml/badge.svg)](https://github.com/nielstron/pyblnet/actions/workflows/build.yml)
3
3
  [![Coverage Status](https://coveralls.io/repos/github/nielstron/pyblnet/badge.svg?branch=master)](https://coveralls.io/github/nielstron/pyblnet?branch=master)
4
4
 
5
5
  A package that connects to the BL-NET that is connected itself to a UVR1611 device by Technische Alternative.
@@ -10,7 +10,7 @@ try:
10
10
  except ImportError as e:
11
11
  warnings.warn(ImportWarning(e))
12
12
 
13
- VERSION = (0, 9, 3)
13
+ VERSION = (0, 9, 5)
14
14
 
15
15
  __version__ = ".".join([str(i) for i in VERSION])
16
16
  __author__ = "nielstron"
@@ -3,7 +3,7 @@
3
3
  """
4
4
  Created on 09.08.2018
5
5
 
6
- This is basically a python port of of a script by berwinter
6
+ This is basically a python port of a script by berwinter
7
7
  https://github.com/berwinter/uvr1611/blob/master/lib/backend/blnet-connection.inc.php
8
8
 
9
9
  @author: Niels
@@ -79,20 +79,18 @@ class BLNETParser:
79
79
  self.digital[channel + 1] = self._convert_digital(digital, channel)
80
80
 
81
81
  self.speed = {}
82
- for channel in range(0, 4):
83
- self.speed[channel + 1] = round(self._convert_speed(speed[channel]), 3)
82
+ for idx, value in enumerate(speed):
83
+ self.speed[idx + 1] = self._convert_speed(value)
84
84
 
85
85
  self.energy = {}
86
86
  for channel in range(0, 2):
87
- self.energy[channel + 1] = round(
88
- self._convert_energy(MWh[channel], kWh[channel], active, channel), 3
89
- )
87
+ energy = self._convert_energy(MWh[channel], kWh[channel], active, channel)
88
+ self.energy[channel + 1] = energy
90
89
 
91
90
  self.power = {}
92
- for channel in range(0, 2):
93
- self.power[channel + 1] = round(
94
- self._convert_power(power[channel], active, channel), 3
95
- )
91
+ for idx, value in enumerate(power):
92
+ power = self._convert_power(value, active, idx)
93
+ self.power[idx + 1] = power
96
94
 
97
95
  def to_dict(self):
98
96
  """
@@ -139,7 +137,7 @@ class BLNETParser:
139
137
  if value & SPEED_ACTIVE:
140
138
  return None
141
139
  else:
142
- return value & SPEED_MASK
140
+ return round(value & SPEED_MASK, 3)
143
141
 
144
142
  def _convert_energy(self, mwh, kwh, active, position):
145
143
  """
@@ -148,7 +146,7 @@ class BLNETParser:
148
146
  """
149
147
  if active & position:
150
148
  kwh = self._calculate_value(kwh, 0.1, INT16_POSITIVE_MASK)
151
- return mwh * 1000 + kwh
149
+ return round(mwh * 1000 + kwh, 3)
152
150
  else:
153
151
  return None
154
152
 
@@ -158,12 +156,14 @@ class BLNETParser:
158
156
  @return its power
159
157
  """
160
158
  if active & position:
161
- return self._calculate_value(value, 1 / 2560, INT32_MASK, INT32_SIGN)
159
+ value = self._calculate_value(value, 1 / 2560, INT32_MASK, INT32_SIGN)
160
+ value = round(value, 3)
161
+ return value
162
162
  else:
163
163
  return None
164
164
 
165
165
  def _calculate_value(
166
- self, value, multiplier=1, positive_mask=POSITIVE_VALUE_MASK, signbit=SIGN_BIT
166
+ self, value, multiplier=1.0, positive_mask=POSITIVE_VALUE_MASK, signbit=SIGN_BIT
167
167
  ):
168
168
  result = value & positive_mask
169
169
  if value & signbit:
@@ -0,0 +1,28 @@
1
+ from pyblnet.blnet_parser import BLNETParser
2
+ import unittest
3
+
4
+
5
+ class TestParser(unittest.TestCase):
6
+
7
+ def test_parser_ok(self):
8
+ data = b'} \xb5"f"\x03"~!\x8e"\x16!\xe0 \xff \xf3 \xf8 \x00\x00=!\x01\x00\x00`\xe2!\x00\x00\x80\x00\x00\x00\x00,\x00\xa4(\x06\x00DhI\x82\x1d\x04Ce\xc0\x00'
9
+ parser = BLNETParser(data)
10
+ parsed_values = parser.to_dict()
11
+ expected_values = {
12
+ 'analog': {1: 12.5, 2: 69.3, 3: 61.4, 4: 51.5, 5: 38.2, 6: 65.4, 7: 27.8, 8: 22.4, 9: 25.5, 10: 24.3, 11: 24.8, 12: 0, 13: 31.7, 14: 1, 15: 0, 16: 48.2},
13
+ 'digital': {1: 0, 2: 0, 3: 0, 4: 0, 5: 0, 6: 0, 7: 0, 8: 0, 9: 0, 10: 0, 11: 0, 12: 0, 13: 0, 14: 0, 15: 0, 16: 0},
14
+ 'speed': {1: None, 2: 0, 3: 0, 4: 0},
15
+ 'energy': {1: None, 2: None},
16
+ 'power': {1: None, 2: None}
17
+ }
18
+
19
+ assert parsed_values['analog'] == expected_values['analog']
20
+ assert parsed_values['digital'] == expected_values['digital']
21
+ assert parsed_values['speed'] == expected_values['speed']
22
+ assert parsed_values['energy'] == expected_values['energy']
23
+ assert parsed_values['power'] == expected_values['power']
24
+
25
+ def test_parser_not_ok(self):
26
+ data = b'broken} \xb5"f"\x03"~!\x8e"\x16!\xe0 \xff \xf3 \xf8 \x00\x00=!\x01\x00\x00`\xe2!\x00\x00\x80\x00\x00\x00\x00,\x00\xa4(\x06\x00DhI\x82\x1d\x04Ce\xc0\x00'
27
+ with self.assertRaises(ValueError):
28
+ parser = BLNETParser(data)
File without changes
File without changes
File without changes
File without changes
File without changes