SpecLog 0.0.3__tar.gz → 0.0.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.
- {speclog-0.0.3 → speclog-0.0.4}/PKG-INFO +1 -1
- {speclog-0.0.3 → speclog-0.0.4}/SpecLog/SpecLog.py +4 -4
- {speclog-0.0.3 → speclog-0.0.4}/SpecLog/device.py +5 -5
- speclog-0.0.4/SpecLog/version.py +1 -0
- {speclog-0.0.3 → speclog-0.0.4}/SpecLog.egg-info/PKG-INFO +1 -1
- speclog-0.0.3/SpecLog/version.py +0 -1
- {speclog-0.0.3 → speclog-0.0.4}/README.md +0 -0
- {speclog-0.0.3 → speclog-0.0.4}/SpecLog/SpecLogger.py +0 -0
- {speclog-0.0.3 → speclog-0.0.4}/SpecLog/__init__.py +0 -0
- {speclog-0.0.3 → speclog-0.0.4}/SpecLog/config/__init__.py +0 -0
- {speclog-0.0.3 → speclog-0.0.4}/SpecLog/config/config.cfg +0 -0
- {speclog-0.0.3 → speclog-0.0.4}/SpecLog/config/config.py +0 -0
- {speclog-0.0.3 → speclog-0.0.4}/SpecLog/debugLog.py +0 -0
- {speclog-0.0.3 → speclog-0.0.4}/SpecLog/loggerConfig.py +0 -0
- {speclog-0.0.3 → speclog-0.0.4}/SpecLog/monitor.py +0 -0
- {speclog-0.0.3 → speclog-0.0.4}/SpecLog/run_logger.pyw +0 -0
- {speclog-0.0.3 → speclog-0.0.4}/SpecLog/run_monitor.pyw +0 -0
- {speclog-0.0.3 → speclog-0.0.4}/SpecLog/ui/__init__.py +0 -0
- {speclog-0.0.3 → speclog-0.0.4}/SpecLog/ui/plotting.py +0 -0
- {speclog-0.0.3 → speclog-0.0.4}/SpecLog/ui/plotting.ui +0 -0
- {speclog-0.0.3 → speclog-0.0.4}/SpecLog.egg-info/SOURCES.txt +0 -0
- {speclog-0.0.3 → speclog-0.0.4}/SpecLog.egg-info/dependency_links.txt +0 -0
- {speclog-0.0.3 → speclog-0.0.4}/SpecLog.egg-info/entry_points.txt +0 -0
- {speclog-0.0.3 → speclog-0.0.4}/SpecLog.egg-info/requires.txt +0 -0
- {speclog-0.0.3 → speclog-0.0.4}/SpecLog.egg-info/top_level.txt +0 -0
- {speclog-0.0.3 → speclog-0.0.4}/pyproject.toml +0 -0
- {speclog-0.0.3 → speclog-0.0.4}/setup.cfg +0 -0
|
@@ -60,13 +60,13 @@ class SpecLog:
|
|
|
60
60
|
if not self.last_query_time or now - self.last_query_time > self.delay:
|
|
61
61
|
warning_level = 0
|
|
62
62
|
self._setTimeInDataDictByVariable() # update time
|
|
63
|
-
|
|
64
|
-
self.devices.
|
|
63
|
+
device_info = (
|
|
64
|
+
self.devices.device_info
|
|
65
65
|
) # dictionary: {model: {status, config_status, device, id_command}}
|
|
66
66
|
for name, info in self.commands.items():
|
|
67
67
|
delimiter = self.device_config[name]["delimiter"]
|
|
68
68
|
index = self.device_config[name]["index"]
|
|
69
|
-
device =
|
|
69
|
+
device = device_info[name]["device"]
|
|
70
70
|
termination = self.device_config[name]["termination"]
|
|
71
71
|
for variable in info.keys():
|
|
72
72
|
info[variable]['min'], info[variable]['max'], info[variable]['static']
|
|
@@ -143,7 +143,7 @@ class SpecLog:
|
|
|
143
143
|
if (
|
|
144
144
|
address in self.devices.deviceAddresses
|
|
145
145
|
and address not in self.available_addresses
|
|
146
|
-
and not self.devices.
|
|
146
|
+
and not self.devices.device_info[name]["status"]
|
|
147
147
|
):
|
|
148
148
|
restart_DEVICE = True
|
|
149
149
|
|
|
@@ -16,7 +16,7 @@ from .debugLog import *
|
|
|
16
16
|
|
|
17
17
|
class DEVICE:
|
|
18
18
|
def __init__(self, config, debug_logger):
|
|
19
|
-
self.
|
|
19
|
+
self.device_info = {}
|
|
20
20
|
self._getPorts()
|
|
21
21
|
self.debug_logger = debug_logger
|
|
22
22
|
self.device_config = config.devices
|
|
@@ -71,7 +71,7 @@ class DEVICE:
|
|
|
71
71
|
else:
|
|
72
72
|
device = None
|
|
73
73
|
|
|
74
|
-
self.
|
|
74
|
+
self.device_info[name] = {
|
|
75
75
|
"status": status,
|
|
76
76
|
"config_status": status,
|
|
77
77
|
"device": device,
|
|
@@ -81,13 +81,13 @@ class DEVICE:
|
|
|
81
81
|
return True
|
|
82
82
|
|
|
83
83
|
else:
|
|
84
|
-
self.
|
|
84
|
+
self.device_info = {}
|
|
85
85
|
for name in self.device_config.keys():
|
|
86
86
|
self._setDevice(name)
|
|
87
87
|
|
|
88
88
|
def checkDeviceStatus(self, name: str = None, init: bool = False):
|
|
89
89
|
if name:
|
|
90
|
-
device_info = self.
|
|
90
|
+
device_info = self.device_info[name]
|
|
91
91
|
id_command = device_info["id_command"]
|
|
92
92
|
device = device_info["device"]
|
|
93
93
|
termination = device_info["termination"]
|
|
@@ -114,7 +114,7 @@ class DEVICE:
|
|
|
114
114
|
return False
|
|
115
115
|
|
|
116
116
|
else:
|
|
117
|
-
for name in self.
|
|
117
|
+
for name in self.device_info.keys():
|
|
118
118
|
if self.checkDeviceStatus(name):
|
|
119
119
|
self.debug_logger.info("%s is valid and connected" % name)
|
|
120
120
|
else:
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
__version__ = "0.0.4"
|
speclog-0.0.3/SpecLog/version.py
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
__version__ = "0.0.3"
|
|
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
|