Skip to content

Commit 4f8738b

Browse files
committed
chore(sources/ljm): Better Tuple Handling
Signed-off-by: Qian Qian "Qubik"‎ <qubik65536@qubik65536.top>
1 parent d4b39fe commit 4f8738b

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/sources/ljm/main.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,10 @@ def read_data(handle, num_addresses, scans_per_read, scan_rate):
9494
rates.pop(0)
9595

9696
# Read from the stream.
97-
read = ljm.eStreamRead(handle)
98-
aData = read[0]
99-
_deviceScanBacklog = read[1]
100-
_ljmScanBackLog = read[2]
97+
sensor_values, _deviceScanBacklog, _ljmScanBackLog = ljm.eStreamRead(handle)
10198

102-
# Convert aData to DAQ data format.
103-
# aData is a interleaved list of readings,
99+
# Convert sensor_values to DAQ data format.
100+
# sensor_values is a interleaved list of readings,
104101
# i.e. [chan0_scan0, chan1_scan0, ..., chanN_scan0,
105102
# chan0_scan1, chan1_scan1, ..., chanN_scan1, ...,
106103
# chan0_scanM, chan1_scanM, ..., chanN_scanM].
@@ -114,7 +111,10 @@ def read_data(handle, num_addresses, scans_per_read, scan_rate):
114111
data: list[list[float | int]] = []
115112
for i in range(num_addresses):
116113
data.append(
117-
[aData[j * num_addresses + i] for j in range(scans_per_read)]
114+
[
115+
sensor_values[j * num_addresses + i]
116+
for j in range(scans_per_read)
117+
]
118118
)
119119

120120
num_of_messages_read = 0 if not data else len(data[0])

0 commit comments

Comments
 (0)