Resolve merge conflicts

Author: neil.hamilton

picosdk/ps5000a.py

@@ -182,6 +182,19 @@ def _define_conditionsInfo():
 ps5000a.PICO_RATIO_MODE = {k[19:]: v for k, v in ps5000a.PS5000A_RATIO_MODE.items()}
 
 
+
+class PS5000A_TRIGGER_INFO(Structure):
+    _pack_ = 1
+    _fields_ = [("status", c_uint32),
+                ("segmentIndex", c_uint32),
+                ("triggerIndex", c_uint32),
+                ("triggerTime", c_int64),
+                ("timeUnits", c_int16),
+                ("reserved0", c_int16),
+                ("timeStampCounter", c_uint64)]
+
+ps5000a.PS5000A_TRIGGER_INFO = PS5000A_TRIGGER_INFO
+
 class PS5000A_DIGITAL_CHANNEL_DIRECTIONS(Structure):
     _pack_ = 1
     _fields_ = [("channel", c_int32),
@@ -941,6 +954,7 @@ class PS5000A_PWQ_CONDITIONS (Structure):
     ); """
 ps5000a.make_symbol("_SetTriggerDigitalPortProperties", "ps5000aSetTriggerDigitalPortProperties", c_uint32,
                     [c_int16, c_void_p, c_int16], doc)
+<<<<<<< HEAD
 
 doc = """ PICO_STATUS ps5000aSetPulseWidthQualifierProperties
     (
@@ -969,4 +983,4 @@ class PS5000A_PWQ_CONDITIONS (Structure):
         int16_t                             nDirections
     ); """
 ps5000a.make_symbol("_SetPulseWidthQualifierDirections", "ps5000aSetPulseWidthQualifierDirections", c_uint32,
-                    [c_int16, c_void_p, c_int16], doc)
+                    [c_int16, c_void_p, c_int16], doc)

ps5000aExamples/ps5000aRapidBlockExample.py

@@ -291,6 +291,21 @@
 status["GetValuesTriggerTimeOffsetBulk"] = ps.ps5000aGetValuesTriggerTimeOffsetBulk64(chandle, ctypes.byref(Times), ctypes.byref(TimeUnits), 0, 9)
 assert_pico_ok(status["GetValuesTriggerTimeOffsetBulk"])
 
+# Get and print TriggerInfo for memory segments
+# Create array of ps.PS5000A_TRIGGER_INFO for each memory segment
+Ten_TriggerInfo = (ps.PS5000A_TRIGGER_INFO*10) ()
+
+status["GetTriggerInfoBulk"] = ps.ps5000aGetTriggerInfoBulk(chandle, ctypes.byref(Ten_TriggerInfo), 0, 9)
+assert_pico_ok(status["GetTriggerInfoBulk"])
+
+print("Printing triggerInfo blocks")
+for i in Ten_TriggerInfo:
+    print("PICO_STATUS is ", i.status)
+    print("segmentIndex is ", i.segmentIndex)
+    print("triggerTime is ", i.triggerTime)
+    print("timeUnits is ", i.timeUnits)
+    print("timeStampCounter is ", i.timeStampCounter)
+
 # Converts ADC from channel A to mV
 adc2mVChAMax =  adc2mV(bufferAMax, chARange, maxADC)
 adc2mVChAMax1 =  adc2mV(bufferAMax1, chARange, maxADC)

ps6000aExamples/ps6000aRapidBlockExample.py

@@ -161,7 +161,8 @@
 noOfSamples = ctypes.c_uint64(nSamples)
 # downSampleRatio = 1
 # segmentIndex = 0
-overflow = ctypes.c_int16(0)
+# Creates a overflow location for each segment
+overflow = (ctypes.c_int16 * 10)()
 status["getValues"] = ps.ps6000aGetValuesBulk(chandle, 0, ctypes.byref(noOfSamples),0, 9, 1, downSampleMode, ctypes.byref(overflow))
 assert_pico_ok(status["getValues"])
 
@@ -206,4 +207,4 @@
 status["closeunit"] = ps.ps6000aCloseUnit(chandle)
 assert_pico_ok(status["closeunit"])
 
-print(status)
+print(status)