Skip to content

Commit 8d23cf0

Browse files
author
Dilmi Wickramanayake
committed
fixing lint errors
1 parent ed0e3f6 commit 8d23cf0

File tree

2 files changed

+27
-24
lines changed

2 files changed

+27
-24
lines changed

‎examples/niscope/niscope_configured_acquisition/niscope_configured_acquisition.py‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import niscope
88
import numpy as np
99
from niscope.errors import Error
10+
1011
import nipanel
1112

1213
panel_script_path = Path(__file__).with_name("niscope_configured_acquisition_panel.py")
@@ -31,7 +32,7 @@
3132
offset=panel.get_value("vertical_offset", 0.0),
3233
)
3334
session.configure_chan_characteristics(
34-
input_impedance= panel.get_value("input_impedance", 1.0e6),
35+
input_impedance=panel.get_value("input_impedance", 1.0e6),
3536
max_input_frequency=panel.get_value("max_input_frequency", 100.0e6),
3637
)
3738
session.configure_horizontal_timing(
@@ -42,60 +43,62 @@
4243
enforce_realtime=panel.get_value("enforce_realtime", True),
4344
)
4445
trigger_type = int(panel.get_value("trigger_type", "1"))
45-
if trigger_type == 1:
46+
if trigger_type == 1:
4647
immediate = session.configure_trigger_immediate()
47-
elif trigger_type == 2:
48+
elif trigger_type == 2:
4849
edge = session.configure_trigger_edge(
4950
trigger_source=str(panel.get_value("edge_source", 0)),
50-
level= panel.get_value("edge_level", 0.0),
51-
slope = panel.get_value("edge_slope", niscope.TriggerSlope.POSITIVE),
52-
trigger_coupling= panel.get_value("edge_coupling", niscope.TriggerCoupling.DC),
53-
delay= hightime.timedelta(seconds=panel.get_value("digital_delay", 0.0)),
51+
level=panel.get_value("edge_level", 0.0),
52+
slope=panel.get_value("edge_slope", niscope.TriggerSlope.POSITIVE),
53+
trigger_coupling=panel.get_value("edge_coupling", niscope.TriggerCoupling.DC),
54+
delay=hightime.timedelta(seconds=panel.get_value("digital_delay", 0.0)),
5455
)
5556
elif trigger_type == 3:
5657
digital = session.configure_trigger_digital(
5758
trigger_source=panel.get_value("digital_source", "PFI 1"),
58-
slope = panel.get_value("digital_slope", niscope.TriggerSlope.POSITIVE),
59-
delay= hightime.timedelta(seconds=panel.get_value("digital_delay", 0.0)),
59+
slope=panel.get_value("digital_slope", niscope.TriggerSlope.POSITIVE),
60+
delay=hightime.timedelta(seconds=panel.get_value("digital_delay", 0.0)),
6061
)
6162
elif trigger_type == 4:
6263
window = session.configure_trigger_window(
6364
trigger_source=str(panel.get_value("window_source", 0)),
64-
window_mode= panel.get_value("window_mode", niscope.TriggerWindowMode.ENTERING),
65+
window_mode=panel.get_value("window_mode", niscope.TriggerWindowMode.ENTERING),
6566
low_level=panel.get_value("window_low_level", -0.1),
66-
high_level= panel.get_value("window_high_level", 0.1),
67-
trigger_coupling = panel.get_value("window_coupling", niscope.TriggerCoupling.DC),
68-
delay= hightime.timedelta(seconds=panel.get_value("digital_delay", 0.0)),
67+
high_level=panel.get_value("window_high_level", 0.1),
68+
trigger_coupling=panel.get_value("window_coupling", niscope.TriggerCoupling.DC),
69+
delay=hightime.timedelta(seconds=panel.get_value("digital_delay", 0.0)),
6970
)
7071
else:
7172
hysteresis = session.configure_trigger_hysteresis(
7273
trigger_source=str(panel.get_value("hysteresis_source", 0)),
7374
level=panel.get_value("hysteresis_level", 0.0),
7475
hysteresis=panel.get_value("hysteresis", 0.05),
75-
slope = panel.get_value("hysteresis_slope", niscope.TriggerSlope.POSITIVE),
76-
trigger_coupling = panel.get_value("hysteresis_coupling", niscope.TriggerCoupling.DC),
77-
delay= hightime.timedelta(seconds=panel.get_value("digital_delay", 0.0)),
76+
slope=panel.get_value("hysteresis_slope", niscope.TriggerSlope.POSITIVE),
77+
trigger_coupling=panel.get_value(
78+
"hysteresis_coupling", niscope.TriggerCoupling.DC
79+
),
80+
delay=hightime.timedelta(seconds=panel.get_value("digital_delay", 0.0)),
7881
)
7982

8083
with session.initiate():
8184
wfm = np.array(
8285
session.channels[panel.get_value("channel_number", 0)].fetch(
83-
num_samples=1000,
86+
num_samples=1000,
8487
num_records=1000,
8588
relative_to=niscope.FetchRelativeTo.READ_POINTER,
8689
offset=0,
8790
timeout=hightime.timedelta(seconds=panel.get_value("timeout", 5.0)),
8891
)
89-
)
92+
)
9093
try:
9194
panel.set_value("is_running", True)
9295

9396
panel.set_value("stop_button", False)
9497
while not panel.get_value("stop_button", False):
95-
98+
9699
for i in range(len(wfm)):
97100
if panel.get_value("stop_button", True):
98-
break
101+
break
99102
else:
100103
data = wfm[i].samples.tolist()
101104
panel.set_value("waveform_data", data)

‎examples/niscope/niscope_configured_acquisition/niscope_configured_acquisition_panel.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
)
132132
st.number_input(
133133
"Actual Sample Rate",
134-
value=panel.get_value("sample_rate", 1.0e7),
134+
value=panel.get_value("actual_sample_rate", 1.0e7),
135135
step=1.0,
136136
disabled=True,
137137
key="actual_sample_rate",
@@ -145,8 +145,8 @@
145145
)
146146
st.number_input(
147147
"Actual Record Length",
148-
value=panel.get_value("record_length", 1000.0),
149-
step=1.0,
148+
value=panel.get_value("actual_record_length", 1000),
149+
step=1,
150150
disabled=True,
151151
key="actual_record_length",
152152
)
@@ -163,7 +163,7 @@
163163
"legend": {"data": ["Amplitude (V)"]},
164164
"xAxis": {
165165
"type": "category",
166-
"data": [x / record_length for x in range(len(waveform_data))], #change this
166+
"data": [x / record_length for x in range(len(waveform_data))], # change this
167167
"name": "Time (s)",
168168
"nameLocation": "center",
169169
"nameGap": 40,

0 commit comments

Comments
 (0)