Skip to content

Commit 6a62215

Browse files
author
neil-hamilton
authored
Merge pull request picotech#45 from utkuturker/master
Fix ps3000aBlockAdvancedTriggerExample.py and 3000a.py
2 parents 482f22e + 17db62e commit 6a62215

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

picosdk/ps3000a.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def _define_digital_port():
153153
"PS3000A_ABOVE_LOWER",
154154
"PS3000A_BELOW_LOWER",
155155
"PS3000A_RISING_LOWER",
156-
"PS3000A_FALLING_LOWER"
156+
"PS3000A_FALLING_LOWER",
157157
"PS3000A_POSITIVE_RUNT",
158158
"PS3000A_NEGATIVE_RUNT"
159159
])

ps3000aExamples/ps3000aBlockAdvancedTriggerExample.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
# channel = PS3000A_CHANNEL_A = 0
4444
# enabled = 1
4545
# coupling type = PS3000A_DC = 1
46-
# range = PS3000A_10V = 8
46+
# range = PS3000A_5V = 8
4747
# analogue offset = 0 V
4848
chARange = 8
4949
status["setChA"] = ps.ps3000aSetChannel(chandle, 0, 1, 1, chARange, 0)
@@ -93,7 +93,7 @@
9393
channelBDirection = ps.PS3000A_THRESHOLD_DIRECTION["PS3000A_NONE"]
9494
channelCDirection = ps.PS3000A_THRESHOLD_DIRECTION["PS3000A_NONE"]
9595
channelDDirection = ps.PS3000A_THRESHOLD_DIRECTION["PS3000A_NONE"]
96-
extDirection = ps.PS3000A_THRESHOLD_DIRECTION["PS3000A_NONE"]
96+
extDirection = ps.PS3000A_THRESHOLD_DIRECTION["PS3000A_RISING"]
9797
auxDirection = ps.PS3000A_THRESHOLD_DIRECTION["PS3000A_NONE"]
9898
status["setTrigDir"] = ps.ps3000aSetTriggerChannelDirections(chandle, channelADirection, channelBDirection, channelCDirection, channelDDirection, extDirection, auxDirection)
9999
assert_pico_ok(status["setTrigDir"])

0 commit comments

Comments
 (0)