Add advanced trigger structures to ps5000a class in picosdk/ps5000a.py

Author: neil.hamilton

picosdk/ps5000a.py

@@ -187,12 +187,15 @@ class PS5000A_DIGITAL_CHANNEL_DIRECTIONS(Structure):
     _fields_ = [("channel", c_int32),
                 ("direction", c_int32)]
 
+ps5000a.PS5000A_DIGITAL_CHANNEL_DIRECTIONS = PS5000A_DIGITAL_CHANNEL_DIRECTIONS
 
 class PS5000A_DIRECTION(Structure):
     _pack_ = 1
     _fields_ = [("channel", c_int32),
                 ("direction", c_int32),
                 ("mode", c_int32)]
+                
+ps5000a.PS5000A_DIRECTION = PS5000A_DIRECTION
 
 
 class PS5000A_TRIGGER_CHANNEL_PROPERTIES_V2(Structure):
@@ -202,12 +205,16 @@ class PS5000A_TRIGGER_CHANNEL_PROPERTIES_V2(Structure):
                 ("thresholdLower", c_int16),
                 ("thresholdLowerHysteresis", c_uint16),
                 ("channel", c_int32)]
+                
+ps5000a.PS5000A_TRIGGER_CHANNEL_PROPERTIES_V2 = PS5000A_TRIGGER_CHANNEL_PROPERTIES_V2
 
 
 class PS5000A_CONDITION (Structure):
 	_pack_ = 1
 	_fields_ = [("source", c_int32),
 				("condition", c_int16)]
+                
+ps5000a.PS5000A_CONDITION PS5000A_CONDITION
 
 
 

ps5000aExamples/ps5000aBlockAdvancedTriggerExample.py

@@ -65,25 +65,28 @@
 
 # Set up an advanced trigger
 adcTriggerLevel = mV2adc(500, chARange, maxADC)
-triggerProperties = PS5000A_TRIGGER_CHANNEL_PROPERTIES_V2(adcTriggerLevel,
+
+triggerProperties = ps.PS5000A_TRIGGER_CHANNEL_PROPERTIES_V2(adcTriggerLevel,
 															10,
 															0,
 															10,
 															ps.PS5000A_CHANNEL["PS5000A_CHANNEL_A"])
 
-status["setTriggerChannelPropertiesV2"] = ps.ps5000aSetTriggerChannelPropertiesV2(chandle, triggerProperties, length(triggerProperties), 0)
+status["setTriggerChannelPropertiesV2"] = ps.ps5000aSetTriggerChannelPropertiesV2(chandle, ctypes.byref(triggerProperties), 1, 0)
 
-triggerConditions = PS5000A_CONDITION(ps.PS5000A_CHANNEL["PS5000A_CHANNEL_A"],
+triggerConditions = ps.PS5000A_CONDITION(ps.PS5000A_CHANNEL["PS5000A_CHANNEL_A"],
                                                            ps.PS5000A_TRIGGER_STATE["PS5000A_CONDITION_TRUE"])
 
 clear = 1
 add = 2
 
-status["setTriggerChannelConditionsV2"] = ps.ps5000aSetTriggerChannelConditionsV2(chandle, triggerConditions, length(triggerConditions), (clear + add))
+status["setTriggerChannelConditionsV2"] = ps.ps5000aSetTriggerChannelConditionsV2(chandle, ctypes.byref(triggerConditions), 1, (clear + add))
 
-triggerDirections = PS5000A_DIRECTION(ps.PS5000A_CHANNEL["PS5000A_CHANNEL_A"], ps.PS5000A_THRESHOLD_DIRECTION["PS5000A_RISING"], ps.PS5000A_THRESHOLD_MODE["PS5000A_LEVEL"])
+triggerDirections = ps.PS5000A_DIRECTION(ps.PS5000A_CHANNEL["PS5000A_CHANNEL_A"], 
+                                                            ps.PS5000A_THRESHOLD_DIRECTION["PS5000A_RISING"], 
+                                                            ps.PS5000A_THRESHOLD_MODE["PS5000A_LEVEL"])
 
-status["setTriggerChannelDirections"] = ps5000aSetTriggerChannelDirectionsV2(chandle, triggerDirections, length(triggerDirections))
+status["setTriggerChannelDirections"] = ps5000aSetTriggerChannelDirectionsV2(chandle, ctypes.byref(triggerDirections), 1)
 
 
 # Set number of pre and post trigger samples to be collected