Merge branch 'master' of https://github.com/picotech/picosdk-python-wrappers

Author: neil.hamilton

picosdk/PicoDeviceEnums.py

@@ -78,7 +78,7 @@ def _define_channel_flags():
     "PICO_PORT_DIGITAL_CHANNEL1",
     "PICO_PORT_DIGITAL_CHANNEL2",
     "PICO_PORT_DIGITAL_CHANNEL3",
-    "PICO_PORT_DIGITAL_CHANNEL4"
+    "PICO_PORT_DIGITAL_CHANNEL4",
     "PICO_PORT_DIGITAL_CHANNEL5",
     "PICO_PORT_DIGITAL_CHANNEL6",
     "PICO_PORT_DIGITAL_CHANNEL7",

picosdk/device.py

@@ -201,7 +201,7 @@ def capture_block(self, timebase_options, channel_configs=()):
             # always force the number of memory segments on the device to 1 before computing timebases for a one-off
             # block capture.
             max_samples_possible = self.driver.memory_segments(self, USE_SEGMENT_ID+1)
-            if timebase_options.no_of_samples is not None and timebase_options.no_of_samples > max_samples_possible:
+            if timebase_options.no_of_samples is not None and timebase_options.no_of_samples > max_samples_possible.value:
                 raise NoValidTimebaseForOptionsError()
         except DeviceCannotSegmentMemoryError:
             pass

picosdk/library.py

@@ -66,14 +66,20 @@ def __init__(self, name):
     def _load(self):
         library_path = find_library(self.name)
 
-        if library_path is None:
-            env_var_name = "PATH" if sys.platform == 'win32' else "LD_LIBRARY_PATH"
-            raise CannotFindPicoSDKError("PicoSDK (%s) not found, check %s" % (self.name, env_var_name))
+        # 'find_library' fails in Cygwin.
+        if not sys.platform == 'cygwin':
+            if library_path is None:
+                env_var_name = "PATH" if sys.platform == 'win32' else "LD_LIBRARY_PATH"
+                raise CannotFindPicoSDKError("PicoSDK (%s) not found, check %s" % (self.name, env_var_name))
 
         try:
             if sys.platform == 'win32':
                 from ctypes import WinDLL
                 result = WinDLL(library_path)
+            elif sys.platform == 'cygwin':
+                from ctypes import CDLL
+                library_path = self.name
+                result = CDLL(library_path + ".dll")
             else:
                 from ctypes import cdll
                 result = cdll.LoadLibrary(library_path)

picosdk/ps3000a.py

@@ -153,7 +153,7 @@ def _define_digital_port():
     "PS3000A_ABOVE_LOWER",
     "PS3000A_BELOW_LOWER",
     "PS3000A_RISING_LOWER",
-    "PS3000A_FALLING_LOWER"
+    "PS3000A_FALLING_LOWER",
     "PS3000A_POSITIVE_RUNT",
     "PS3000A_NEGATIVE_RUNT"
     ])

picosdk/ps6000.py

@@ -649,6 +649,22 @@ class PS6000_TRIGGER_INFO (Structure):
                                                     c_void_p)
 ps6000.BlockReadyType.__doc__ = doc
 
+doc = """ void ps6000DataReadyType
+    (
+        int16_t          handle,
+        PICO_STATUS      status,
+        uint32_t         noOfSamples,
+        int16_t          overflow,
+        void             *pParameter
+    ); """
+ps6000.DataReadyType = C_CALLBACK_FUNCTION_FACTORY(None,
+                                                   c_int16,
+                                                   c_uint32,
+                                                   c_uint32,
+                                                   c_int16,
+                                                   c_void_p)
+ps6000.DataReadyType.__doc__ = doc
+
 doc = """ void ps6000StreamingReady
 	(
 		int16_t				handle,
@@ -777,8 +793,8 @@ class PS6000_TRIGGER_INFO (Structure):
         uint32_t           toSegmentIndex,
         int16_t           *overflow
     ); """
-ps6000.make_symbol("_GetValuesAsync", "ps6000GetValuesAsync", c_uint32,
-                   [c_int16, c_uint32, c_uint32, c_uint32, c_int32, c_uint32, c_uint32, c_void_p], doc)
+#ps6000.make_symbol("_GetValuesAsync", "ps6000GetValuesAsync", c_uint32,
+#                   [c_int16, c_uint32, c_uint32, c_uint32, c_int32, c_uint32, c_uint32, c_void_p], doc)
 
 doc = """ PICO_STATUS ps6000GetNoOfCaptures
     (

ps3000aExamples/ps3000aBlockAdvancedTriggerExample.py

@@ -43,7 +43,7 @@
 # channel = PS3000A_CHANNEL_A = 0
 # enabled = 1
 # coupling type = PS3000A_DC = 1
-# range = PS3000A_10V = 8
+# range = PS3000A_5V = 8
 # analogue offset = 0 V
 chARange = 8
 status["setChA"] = ps.ps3000aSetChannel(chandle, 0, 1, 1, chARange, 0)
@@ -93,7 +93,7 @@
 channelBDirection = ps.PS3000A_THRESHOLD_DIRECTION["PS3000A_NONE"]
 channelCDirection = ps.PS3000A_THRESHOLD_DIRECTION["PS3000A_NONE"]
 channelDDirection = ps.PS3000A_THRESHOLD_DIRECTION["PS3000A_NONE"]
-extDirection = ps.PS3000A_THRESHOLD_DIRECTION["PS3000A_NONE"]
+extDirection = ps.PS3000A_THRESHOLD_DIRECTION["PS3000A_RISING"]
 auxDirection = ps.PS3000A_THRESHOLD_DIRECTION["PS3000A_NONE"]
 status["setTrigDir"] = ps.ps3000aSetTriggerChannelDirections(chandle, channelADirection, channelBDirection, channelCDirection, channelDDirection, extDirection, auxDirection)
 assert_pico_ok(status["setTrigDir"])