PyBLNET 0.9.3__tar.gz → 0.9.4__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.
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/PKG-INFO +1 -1
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/PyBLNET.egg-info/PKG-INFO +1 -1
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/PyBLNET.egg-info/SOURCES.txt +1 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/pyblnet/__init__.py +1 -1
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/pyblnet/blnet_conn.py +1 -1
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/pyblnet/blnet_parser.py +17 -7
- pyblnet-0.9.4/pyblnet/tests/test_parser.py +24 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/LICENSE.txt +0 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/PyBLNET.egg-info/dependency_links.txt +0 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/PyBLNET.egg-info/requires.txt +0 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/PyBLNET.egg-info/top_level.txt +0 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/README.md +0 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/pyblnet/blnet.py +0 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/pyblnet/blnet_web.py +0 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/pyblnet/tests/__init__.py +0 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/pyblnet/tests/test_structure/580500.alternative.htm +0 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/pyblnet/tests/test_structure/580500.htm +0 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/pyblnet/tests/test_structure/580600.htm +0 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/pyblnet/tests/test_structure/__init__.py +0 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/pyblnet/tests/test_structure/blnet_mock_server.py +0 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/pyblnet/tests/test_structure/main.htm +0 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/pyblnet/tests/test_structure/main.html +0 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/pyblnet/tests/test_structure/par.htm +0 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/pyblnet/tests/test_structure/server_control.py +0 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/pyblnet/tests/test_web.py +0 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/pyblnet/tests/web_raw/__init__.py +0 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/pyblnet/tests/web_raw/web_state.py +0 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/setup.cfg +0 -0
- {PyBLNET-0.9.3 → pyblnet-0.9.4}/setup.py +0 -0
|
@@ -80,19 +80,29 @@ class BLNETParser:
|
|
|
80
80
|
|
|
81
81
|
self.speed = {}
|
|
82
82
|
for channel in range(0, 4):
|
|
83
|
-
|
|
83
|
+
speed = self._convert_speed(speed[channel])
|
|
84
|
+
if speed:
|
|
85
|
+
self.speed[channel + 1] = round(speed, 3)
|
|
86
|
+
else:
|
|
87
|
+
break
|
|
84
88
|
|
|
85
89
|
self.energy = {}
|
|
86
90
|
for channel in range(0, 2):
|
|
87
|
-
self.
|
|
88
|
-
|
|
89
|
-
|
|
91
|
+
energy = self._convert_energy(MWh[channel], kWh[channel], active, channel)
|
|
92
|
+
if energy:
|
|
93
|
+
self.energy[channel + 1] = round(energy, 3)
|
|
94
|
+
else:
|
|
95
|
+
break
|
|
90
96
|
|
|
91
97
|
self.power = {}
|
|
92
98
|
for channel in range(0, 2):
|
|
93
|
-
self.power[channel
|
|
94
|
-
|
|
95
|
-
|
|
99
|
+
power = self._convert_power(power[channel], active, channel)
|
|
100
|
+
if power:
|
|
101
|
+
self.power[channel + 1] = round(
|
|
102
|
+
self._convert_power(power[channel], active, channel), 3
|
|
103
|
+
)
|
|
104
|
+
else:
|
|
105
|
+
break
|
|
96
106
|
|
|
97
107
|
def to_dict(self):
|
|
98
108
|
"""
|
|
@@ -0,0 +1,24 @@
|
|
|
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': {},
|
|
15
|
+
'energy': {},
|
|
16
|
+
'power': {}
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
assert parsed_values == expected_values
|
|
20
|
+
|
|
21
|
+
def test_parser_not_ok(self):
|
|
22
|
+
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'
|
|
23
|
+
with self.assertRaises(ValueError):
|
|
24
|
+
parser = BLNETParser(data)
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|