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

Author: neil.hamilton

README.md

@@ -24,10 +24,13 @@ libraries.
 ## Installing the python driver bindings
 
 A `distutils` installer is provided. After you have installed the PicoSDK
-driver package (see above), the Python installer can be used as follows:
+driver package (see above), the Python package can be installed using the
+following command in the top-level directory:
 
-    python setup.py install
+    pip install .
 
+If you are not using a virtualenv or are not elevated, use:
+=======
 For using the AS108 you will need to use the following as well:
 
 	python setupPicosynth.py install
@@ -37,13 +40,13 @@ On macOS and Linux you will either need to use `sudo` with this command, to
 install into the system folders, or to install for the current user only you
 can use:
 
-    python setup.py install --user
+    pip install . --user
 
 Within python, the library for `import` is called `picosdk`.
 
 ## Compatibility
 
-This code is written to be compatible with both python 2.7 and python 3 (any version).
+This code is written to be compatible with both Python 2.7 and Python 3 (any version).
 
 If you find a compatibility problem please raise an [Issue](https://www.picotech.com/tech-support), listing all the versions you can find (python, numpy, 
 picosdk commit hash, etc.) and your error message(s).
@@ -72,7 +75,7 @@ The following drivers and devices are not yet supported:
 
 ### Dependencies
 
-As well as depending on the C libraries, the Pythonic wrappers use some python libraries like `numpy`. Many of the
+As well as depending on the C libraries, the Python wrappers use some Python libraries like `numpy`. Many of the
 examples scripts also use the `matplotlib` plotting library. You can install these dependencies with pip as follows:
 
     pip install -r requirements.txt

ps3000aExamples/ps3000aBlockMSOExample.py

@@ -98,7 +98,7 @@
                                                     0)
 assert_pico_ok(status["SetDataBuffers"])
 
-print "Starting data collection..."
+print ("Starting data collection...")
 
 # Starts the block capture
 # handle = chandle
@@ -143,7 +143,7 @@
 status["GetValues"] = ps.ps3000aGetValues(chandle, 0, ctypes.byref(cTotalSamples), 1, 0, 0, ctypes.byref(overflow))
 assert_pico_ok(status["GetValues"])
 
-print "Data collection complete."
+print ("Data collection complete.")
 
 # Obtain binary for Digital Port 0
 # The tuple returned contains the channels in order (D7, D6, D5, ... D0).
@@ -154,7 +154,7 @@
 
 # Plot the data from digital channels onto a graph
 
-print "Plotting data..."
+print ("Plotting data...")
 
 plt.figure(num='PicoScope 3000 Series (A API) MSO Block Capture Example')
 plt.title('Plot of Digital Port 0 digital channels vs. time')
@@ -171,7 +171,7 @@
 plt.legend(loc="upper right")
 plt.show()
 
-print "Close figure to stop the device and close the connection."
+print ("Close figure to stop the device and close the connection.")
 
 # Stops the scope
 # handle = chandle

ps5000aExamples/ps5000aRapidBlockExample.py

@@ -80,7 +80,7 @@
 # MaxSamples = ctypes.byref(returnedMaxSamples)
 # Segement index = 0
 timeIntervalns = ctypes.c_float()
-returnedMaxSamples = ctypes.c_int16()
+returnedMaxSamples = ctypes.c_int32()
 status["GetTimebase"] = ps.ps5000aGetTimebase2(chandle, timebase, maxsamples, ctypes.byref(timeIntervalns), ctypes.byref(returnedMaxSamples), 0)
 assert_pico_ok(status["GetTimebase"])
 
@@ -288,7 +288,7 @@
 # Timeunits = TimeUnits = ctypes.c_char() = ctypes.byref(TimeUnits)
 # Fromsegmentindex = 0
 # Tosegementindex = 9
-Times = (ctypes.c_int16*10)()
+Times = (ctypes.c_int64*10)()
 TimeUnits = ctypes.c_char()
 status["GetValuesTriggerTimeOffsetBulk"] = ps.ps5000aGetValuesTriggerTimeOffsetBulk64(chandle, ctypes.byref(Times), ctypes.byref(TimeUnits), 0, 9)
 assert_pico_ok(status["GetValuesTriggerTimeOffsetBulk"])

ps6000Examples/ps6000SigGen.py

@@ -71,7 +71,7 @@
 triggerSource = ctypes.c_int32(0)
 
 status["SetSigGenBuiltIn"] = ps.ps6000SetSigGenBuiltIn(chandle, 0, 2000000, wavetype, 10000, 10000, 0, 1, sweepType, 0, 0, 0, triggertype, triggerSource, 1)
-assert_pico_ok(status["SetSignGenBuiltIn"])
+assert_pico_ok(status["SetSigGenBuiltIn"])
 
 # Pauses the script to show signal
 time.sleep(10)

setup.py

@@ -32,4 +32,5 @@
       author='Pico Technology Ltd',
       author_email='[email protected]',
       url='https://www.picotech.com',
-      packages=['picosdk'])
+      packages=['picosdk'],
+      install_requires=['numpy>=1.12.1'])