pystuderxcom 3.4.4__tar.gz → 3.4.6__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.
- {pystuderxcom-3.4.4/src/pystuderxcom.egg-info → pystuderxcom-3.4.6}/PKG-INFO +1 -1
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/pyproject.toml +1 -1
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom/api_base_async.py +2 -1
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom/api_base_sync.py +3 -2
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom/datapoints_xcom.json +2 -1
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6/src/pystuderxcom.egg-info}/PKG-INFO +1 -1
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/LICENSE +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/README.md +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/setup.cfg +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom/__init__.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom/api_serial.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom/api_tcp.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom/api_udp.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom/const.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom/data.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom/datapoints.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom/datapoints_120v.json +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom/datapoints_240v.json +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom/discover_async.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom/discover_sync.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom/factory_async.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom/factory_sync.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom/families.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom/messages.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom/messages_en.json +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom/protocol.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom/values.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom.egg-info/SOURCES.txt +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom.egg-info/dependency_links.txt +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom.egg-info/requires.txt +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/src/pystuderxcom.egg-info/top_level.txt +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/tests/test_api_base_async.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/tests/test_api_base_sync.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/tests/test_api_serial_async.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/tests/test_api_serial_sync.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/tests/test_api_tcp_async.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/tests/test_api_tcp_sync.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/tests/test_api_udp_async.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/tests/test_api_udp_sync.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/tests/test_const.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/tests/test_data.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/tests/test_datapoints_async.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/tests/test_datapoints_sync.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/tests/test_discover_async.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/tests/test_discover_sync.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/tests/test_families.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/tests/test_messageset_async.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/tests/test_messageset_sync.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/tests/test_package_async.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/tests/test_package_sync.py +0 -0
- {pystuderxcom-3.4.4 → pystuderxcom-3.4.6}/tests/test_values.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: pystuderxcom
|
|
3
|
-
Version: 3.4.
|
|
3
|
+
Version: 3.4.6
|
|
4
4
|
Summary: Python library to communicate with Studer-Innotec devices on the local network via Xcom protocol
|
|
5
5
|
Author-email: Anko Hanse <anko_hanse@hotmail.com>
|
|
6
6
|
Project-URL: Homepage, https://github.com/ankohanse/pystuderxcom
|
|
@@ -251,13 +251,14 @@ class AsyncXcomApiBase:
|
|
|
251
251
|
case 99003: return self.is_sd_card_full
|
|
252
252
|
case 99004: return self.is_new_datalogger_file_present
|
|
253
253
|
|
|
254
|
-
case 99020 | 99021 | 99022:
|
|
254
|
+
case 99020 | 99021 | 99022 | 99023:
|
|
255
255
|
msg = await self.request_message(index=0, retries=retries, timeout=timeout, verbose=verbose)
|
|
256
256
|
if msg:
|
|
257
257
|
match parameter.nr:
|
|
258
258
|
case 99020: return msg.message_string
|
|
259
259
|
case 99021: return msg.timestamp
|
|
260
260
|
case 99022: return msg.source_address
|
|
261
|
+
case 99023: return msg.message_total
|
|
261
262
|
|
|
262
263
|
case _:
|
|
263
264
|
raise XcomParamException(f"Invalid datapoint passed to request_virtual; nr not recognized. Violated by datapoint '{parameter.name}' ({parameter.nr})")
|
|
@@ -59,8 +59,8 @@ from .values import (
|
|
|
59
59
|
XcomValues,
|
|
60
60
|
XcomValuesItem,
|
|
61
61
|
)
|
|
62
|
-
import threading
|
|
63
62
|
import time
|
|
63
|
+
import threading
|
|
64
64
|
|
|
65
65
|
|
|
66
66
|
_LOGGER = logging.getLogger(__name__)
|
|
@@ -255,13 +255,14 @@ class XcomApiBase:
|
|
|
255
255
|
case 99003: return self.is_sd_card_full
|
|
256
256
|
case 99004: return self.is_new_datalogger_file_present
|
|
257
257
|
|
|
258
|
-
case 99020 | 99021 | 99022:
|
|
258
|
+
case 99020 | 99021 | 99022 | 99023:
|
|
259
259
|
msg = self.request_message(index=0, retries=retries, timeout=timeout, verbose=verbose)
|
|
260
260
|
if msg:
|
|
261
261
|
match parameter.nr:
|
|
262
262
|
case 99020: return msg.message_string
|
|
263
263
|
case 99021: return msg.timestamp
|
|
264
264
|
case 99022: return msg.source_address
|
|
265
|
+
case 99023: return msg.message_total
|
|
265
266
|
|
|
266
267
|
case _:
|
|
267
268
|
raise XcomParamException(f"Invalid datapoint passed to request_virtual; nr not recognized. Violated by datapoint '{parameter.name}' ({parameter.nr})")
|
|
@@ -35,8 +35,9 @@
|
|
|
35
35
|
{ "fam": "xcom", "lvl": "Info", "pnr": 990, "nr": 99003, "name": "Is sd-card full", "short": "", "urcc": "", "unit": "", "fmt": "BOOL" },
|
|
36
36
|
{ "fam": "xcom", "lvl": "Info", "pnr": 990, "nr": 99004, "name": "Is new datalogger file present", "short": "", "urcc": "", "unit": "", "fmt": "BOOL" },
|
|
37
37
|
{ "fam": "xcom", "lvl": "Info", "pnr": 990, "nr": 99020, "name": "Latest message", "short": "", "urcc": "", "unit": "", "fmt": "STRING" },
|
|
38
|
-
{ "fam": "xcom", "lvl": "Info", "pnr": 990, "nr": 99021, "name": "Latest message time", "short": "", "urcc": "", "unit": "
|
|
38
|
+
{ "fam": "xcom", "lvl": "Info", "pnr": 990, "nr": 99021, "name": "Latest message time", "short": "", "urcc": "", "unit": "Seconds", "fmt": "INT32" },
|
|
39
39
|
{ "fam": "xcom", "lvl": "Info", "pnr": 990, "nr": 99022, "name": "Latest message source", "short": "", "urcc": "", "unit": "addr", "fmt": "INT32" },
|
|
40
|
+
{ "fam": "xcom", "lvl": "Info", "pnr": 990, "nr": 99023, "name": "Message count", "short": "", "urcc": "", "unit": "", "fmt": "INT32" },
|
|
40
41
|
|
|
41
42
|
{ "_rem": "###"},
|
|
42
43
|
{ "_rem": "### End of file"},
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: pystuderxcom
|
|
3
|
-
Version: 3.4.
|
|
3
|
+
Version: 3.4.6
|
|
4
4
|
Summary: Python library to communicate with Studer-Innotec devices on the local network via Xcom protocol
|
|
5
5
|
Author-email: Anko Hanse <anko_hanse@hotmail.com>
|
|
6
6
|
Project-URL: Homepage, https://github.com/ankohanse/pystuderxcom
|
|
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
|
|
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
|
|
File without changes
|