Skip to content

Commit 3966078

Browse files
author
neil.hamilton
committed
Update changed functions
1 parent 661da45 commit 3966078

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

picosdk/psospa.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,10 +316,9 @@ def __init__(self):
316316
int16_t handle,
317317
PICO_TRIGGER_CHANNEL_PROPERTIES* channelProperties,
318318
int16_t nChannelProperties,
319-
int16_t auxOutputEnable,
320319
uint32_t autoTriggerMicroSeconds
321320
); """
322-
psospa.make_symbol("_SetTriggerChannelProperties","psospaSetTriggerChannelProperties", c_uint32, [c_int16, c_void_p, c_int16, c_int16, c_uint32], doc)
321+
psospa.make_symbol("_SetTriggerChannelProperties","psospaSetTriggerChannelProperties", c_uint32, [c_int16, c_void_p, c_int16, c_uint32], doc)
323322

324323
doc = """ PICO_STATUS psospaSetTriggerChannelConditions
325324
(

ps6000aExamples/ps6000aBlockExample.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from picosdk.ps6000a import ps6000a as ps
1111
from picosdk.PicoDeviceEnums import picoEnum as enums
1212
import matplotlib.pyplot as plt
13-
from picosdk.functions import adc2mV, assert_pico_ok
13+
from picosdk.functions import adc2mV, assert_pico_ok, mV2adc
1414

1515
# Create chandle and status ready for use
1616
chandle = ctypes.c_int16()
@@ -53,7 +53,7 @@
5353
direction = enums.PICO_THRESHOLD_DIRECTION["PICO_RISING"]
5454
# delay = 0 s
5555
# autoTriggerMicroSeconds = 1000000 us
56-
status["setSimpleTrigger"] = ps.ps6000aSetSimpleTrigger(chandle, 1, source, (mV2adc(100,channelRange,maxADC), direction, 0, 1000000))
56+
status["setSimpleTrigger"] = ps.ps6000aSetSimpleTrigger(chandle, 1, source, (mV2adc(100,channelRange,maxADC)), direction, 0, 1000000)
5757
assert_pico_ok(status["setSimpleTrigger"])
5858

5959
# Get fastest available timebase

ps6000aExamples/ps6000aStreamingModeExample.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from picosdk.PicoDeviceEnums import picoEnum as enums
1212
from picosdk.PicoDeviceStructs import picoStruct as structs
1313
import matplotlib.pyplot as plt
14-
from picosdk.functions import adc2mV, assert_pico_ok
14+
from picosdk.functions import adc2mV, assert_pico_ok, mV2adc
1515
from picosdk.constants import PICO_STATUS
1616
import time
1717

0 commit comments

Comments
 (0)