Skip to content

Commit ebbdaaf

Browse files
author
neil.hamilton
committed
Add PS6000_THRESHOLD_DIRECTIONS enum to ps6000.py
1 parent 4127c25 commit ebbdaaf

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

picosdk/ps6000.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,21 @@ def __init__(self):
8383
"PS6000_CONDITION_MAX",
8484
])
8585

86+
ps6000.PS6000_THRESHOLD_DIRECTION = make_enum([
87+
("PS6000_ABOVE", "PS6000_INSIDE"),
88+
("PS6000_BELOW", "PS6000_BELOW"),
89+
("PS6000_RISING", "PS6000_ENTER", "PS6000_NONE"),
90+
("PS6000_FALLING", "PS6000_EXIT"),
91+
("PS6000_RISING_OR_FALLING", "PS6000_ENTER_OR_EXIT"),
92+
"PS6000_ABOVE_LOWER",
93+
"PS6000_BELOW_LOWER",
94+
"PS6000_RISING_LOWER",
95+
"PS6000_FALLING_LOWER",
96+
"PS6000_POSITIVE_RUNT",
97+
"PS6000_NEGATIVE_RUNT",
98+
])
99+
100+
86101
class PS6000_TRIGGER_CONDITIONS (Structure):
87102
_pack_ = 1
88103
_fields_ = [("channelA", c_uint32),

ps6000Examples/ps6000BlockAdvancedTriggerExample.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,16 @@
4545
assert_pico_ok(status["setChB"])
4646

4747
# Set up level drop out tirgger on A
48-
48+
conditions = ps.PS6000_TRIGGER_CONDITIONS(ps.PS6000_TRIGGER_STATE["PS6000_CONDITION_TRUE"],
49+
ps.PS6000_TRIGGER_STATE["PS6000_CONDITION_DONT_CARE"],
50+
ps.PS6000_TRIGGER_STATE["PS6000_CONDITION_DONT_CARE"],
51+
ps.PS6000_TRIGGER_STATE["PS6000_CONDITION_DONT_CARE"],
52+
ps.PS6000_TRIGGER_STATE["PS6000_CONDITION_DONT_CARE"],
53+
ps.PS6000_TRIGGER_STATE["PS6000_CONDITION_DONT_CARE"],
54+
ps.PS6000_TRIGGER_STATE["PS6000_CONDITION_TRUE"])
55+
nConditions = 1
56+
57+
status["setTriggerChannelConditions"] = ps.ps6000SetTriggerChannelConditions(chandle, ctypes.byref(conditions), nConditions)
4958

5059
# Set number of pre and post trigger samples to be collected
5160
preTriggerSamples = 2500

0 commit comments

Comments
 (0)