Replace numbers with enums in ps6000aBlockExample.py

Author: neil.hamilton

picosdk/PicoDeviceEnums.py

@@ -105,7 +105,7 @@ def _define_coupling():
 # needs implementing still
 
 def _define_bandwidth_limiter():
-    PICO_BW_FULL = 0,
+    PICO_BW_FULL = 0
     PICO_BW_100KHZ = 100000
     PICO_BW_20KHZ = 20000
     PICO_BW_1MHZ = 1000000
@@ -191,9 +191,9 @@ def _define_wave_type():
     ])
 
 def _define_threshold_direction():
-    PICO_ABOVE= PICO_INSIDE = 0
+    PICO_ABOVE = PICO_INSIDE = 0
     PICO_BELOW = PICO_OUTSIDE = 1
-    PICO_RISING = PICO_ENTER = PICO_NONE = 2
+    PICO_RISING = PICO_ENTER = PICO_NONE = 2 
     PICO_FALLING = PICO_EXIT = 3
     PICO_RISING_OR_FALLING = PICO_ENTER_OR_EXIT = 4
     PICO_ABOVE_LOWER = 5

ps6000aExamples/ps6000aBlockExample.py

@@ -8,7 +8,7 @@
 import ctypes
 import numpy as np
 from picosdk.ps6000a import ps6000a as ps
-#from picosdk.PicoDeviceEnums import PicoDeviceEnums as enums
+from picosdk.PicoDeviceEnums import picoEnum as enums
 import matplotlib.pyplot as plt
 from picosdk.functions import adc2mV, assert_pico_ok
 
@@ -18,17 +18,17 @@
 
 # Open 6000 A series PicoScope
 # returns handle to chandle for use in future API functions
-resolution = 0 # PICO_DEVICE_RESOLUTION["PICO_DR_8BIT"]
+resolution = enums.PICO_DEVICE_RESOLUTION["PICO_DR_8BIT"]
 status["openunit"] = ps.ps6000aOpenUnit(ctypes.byref(chandle), None, resolution)
 assert_pico_ok(status["openunit"])
 
 # Set channel A on
 # handle = chandle
-channelA = 0 #enums.PICO_CHANNEL["PICO_CHANNEL_A"]
-coupling = 0 #enums.PICO_COUPLING["PICO_DC"]
+channelA = enums.PICO_CHANNEL["PICO_CHANNEL_A"]
+coupling = enums.PICO_COUPLING["PICO_DC"]
 channelRange = 7
 # analogueOffset = 0 V
-bandwidth = 0 #enums.PICO_CHANNEL["PICO_BW_FULL"]
+bandwidth = enums.PICO_BANDWIDTH_LIMITER["PICO_BW_FULL"]
 status["setChannelA"] = ps.ps6000aSetChannelOn(chandle, channelA, coupling, channelRange, 0, bandwidth)
 assert_pico_ok(status["setChannelA"])
 
@@ -43,15 +43,15 @@
 # enable = 1
 source = channelA
 # threshold = 1000 mV
-direction = 2 # PICO_THRESHOLD_DIRECTION["PICO_RISING"]
+direction = enums.PICO_THRESHOLD_DIRECTION["PICO_RISING"]
 # delay = 0 s
 # autoTriggerMicroSeconds = 1000000 us
 status["setSimpleTrigger"] = ps.ps6000aSetSimpleTrigger(chandle, 1, source, 1000, direction, 0, 1000000)
 assert_pico_ok(status["setSimpleTrigger"])
 
 # Get fastest available timebase
 # handle = chandle
-enabledChannelFlags = 1 #PICO_CHANNEL_FLAGS["PICOCHANNEL_A_FLAGS"]
+enabledChannelFlags = enums.PICO_CHANNEL_FLAGS["PICO_CHANNEL_A_FLAGS"]
 timebase = ctypes.c_uint32(0)
 timeInterval = ctypes.c_double(0)
 # resolution = resolution
@@ -74,12 +74,12 @@
 # bufferMax = bufferAMax
 # bufferMin = bufferAMin
 # nSamples = nSamples
-dataType = 1 # PICO_DATA_TYPE["PICO_INT16_T"]
+dataType = enums.PICO_DATA_TYPE["PICO_INT16_T"]
 waveform = 0
-downSampleMode = 0x80000000 # PICO_RATIO_MODE["PICO_RATIO_MODE_RAW"]
-clear = 0x00000001 # PICO_ACTION["PICO_CLEAR_ALL"]
-add = 0x00000002 # PICO_ACTION["PICO_ADD"]
-action = clear|add # PICO_ACTION["PICO_CLEAR_WAVEFORM_CLEAR_ALL"] + PICO_ACTION["PICO_ADD"]  
+downSampleMode = enums.PICO_RATIO_MODE["PICO_RATIO_MODE_RAW"]
+clear = enums.PICO_ACTION["PICO_CLEAR_ALL"]
+add = enums.PICO_ACTION["PICO_ADD"]
+action = clear|add # PICO_ACTION["PICO_CLEAR_WAVEFORM_CLEAR_ALL"] | PICO_ACTION["PICO_ADD"]  
 status["setDataBuffers"] = ps.ps6000aSetDataBuffers(chandle, channelA, ctypes.byref(bufferAMax), ctypes.byref(bufferAMin), nSamples, dataType, waveform, downSampleMode, action)
 assert_pico_ok(status["setDataBuffers"])