Skip to content

Commit b185da2

Browse files
bessmanorangecms
authored andcommitted
Oscilloscope trigger attributes are now read-only
1 parent fc033df commit b185da2

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

scripts/oscilloscope.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ def capture_loop_voltage(self):
147147
self.number_of_samples,
148148
self.time_gap,
149149
block=False,
150+
trigger=self.trigger_voltage if self.is_trigger_active else False,
151+
trigger_channel=self.trigger_channel,
150152
)
151153
time.sleep(self.delay)
152154
keys = ['time']
@@ -201,12 +203,13 @@ def capture_loop_fft(self):
201203
fit_output1_square = False
202204
fit_output2_square = False
203205
while self.is_reading_fft:
204-
self.device.oscilloscope.trigger_enabled = self.is_trigger_active
205206
x, = self.device.oscilloscope.capture(
206207
self.channels_to_read,
207208
self.number_of_samples,
208209
self.time_gap,
209210
block=False,
211+
trigger=self.trigger_voltage if self.is_trigger_active else False,
212+
trigger_channel=self.trigger_channel,
210213
)
211214
time.sleep(self.delay)
212215
keys = ['frequency']
@@ -318,12 +321,13 @@ def capture_loop_xy_plot(self):
318321
y3 = None
319322
y4 = None
320323
while self.is_reading_xy_plot:
321-
self.device.oscilloscope.trigger_enabled = self.is_trigger_active
322324
self.device.oscilloscope.capture(
323325
self.channels_to_read,
324326
self.number_of_samples,
325327
self.time_gap,
326328
block=False,
329+
trigger=self.trigger_voltage if self.is_trigger_active else False,
330+
trigger_channel=self.trigger_channel,
327331
)
328332
time.sleep(self.delay)
329333
vector = ()

0 commit comments

Comments
 (0)