Enhancements to Python wrappers: new functionality, refactoring, and fixes

picosdk/errors.py

@@ -60,10 +60,14 @@ class PicoSDKCtypesError(PicoError, IOError):
 class ClosedDeviceError(PicoError, IOError):
     pass
 
+class InvalidRangeOfChannel(PicoError, ValueError):
+    pass
 
 class NoChannelsEnabledError(PicoError, ValueError):
     pass
 
+class ChannelNotEnabledError(PicoError, ValueError):
+    pass
 
 class NoValidTimebaseForOptionsError(PicoError, ValueError):
     pass

picosdk/ps3000a.py

@@ -63,13 +63,6 @@ def __init__(self):
     for k, v in ps3000a.PS3000A_RANGE.items() if k != "PS3000A_MAX_RANGES"
 }
 
-ps3000a.PS3000A_RATIO_MODE = {
-    'PS3000A_RATIO_MODE_NONE': 0,
-    'PS3000A_RATIO_MODE_AGGREGATE': 1,
-    'PS3000A_RATIO_MODE_DECIMATE': 2,
-    'PS3000A_RATIO_MODE_AVERAGE': 4,
-}
-
 ps3000a.PS3000A_TIME_UNITS = make_enum([
     'PS3000A_FS',
     'PS3000A_PS',
@@ -80,6 +73,55 @@ def __init__(self):
     'PS3000A_MAX_TIME_UNITS',
 ])
 
+ps3000a.PS3000A_WAVE_TYPE = make_enum([
+    "PS3000A_SINE",
+    "PS3000A_SQUARE",
+    "PS3000A_TRIANGLE",
+    "PS3000A_DC_VOLTAGE",
+    "PS3000A_RAMP_UP",
+    "PS3000A_RAMP_DOWN",
+    "PS3000A_SINC",
+    "PS3000A_GAUSSIAN",
+    "PS3000A_HALF_SINE",
+])
+
+ps3000a.PS3000A_SWEEP_TYPE = make_enum([
+    "PS3000A_UP",
+    "PS3000A_DOWN",
+    "PS3000A_UPDOWN",
+    "PS3000A_DOWNUP",
+])
+
+ps3000a.PS3000A_EXTRA_OPERATIONS = make_enum([
+	'PS3000A_ES_OFF',
+	'PS3000A_WHITENOISE',
+	'PS3000A_PRBS',
+])
+
+ps3000a.PS3000A_SIGGEN_TRIG_TYPE = make_enum([
+	'PS3000A_SIGGEN_RISING',
+	'PS3000A_SIGGEN_FALLING',
+	'PS3000A_SIGGEN_GATE_HIGH',
+	'PS3000A_SIGGEN_GATE_LOW',
+])
+
+ps3000a.PS3000A_SIGGEN_TRIG_SOURCE = make_enum([
+	'PS3000A_SIGGEN_NONE',
+	'PS3000A_SIGGEN_SCOPE_TRIG',
+	'PS3000A_SIGGEN_EXT_IN',
+	'PS3000A_SIGGEN_SOFT_TRIG',
+    'PS3000A_SIGGEN_TRIGGER_RAW',
+])
+
+ps3000a.PS3000A_RATIO_MODE = make_enum([
+    'PS3000A_RATIO_MODE_NONE',
+    'PS3000A_RATIO_MODE_AGGREGATE',
+    'PS3000A_RATIO_MODE_AVERAGE',
+    'PS3000A_RATIO_MODE_DECIMATE',
+])
+
+ps3000a.PICO_RATIO_MODE = {k[19:]: v for k, v in ps3000a.PS3000A_RATIO_MODE.items()}
+
 ps3000a.PS3000A_DIGITAL_CHANNEL = make_enum([
     "PS3000A_DIGITAL_CHANNEL_0",
     "PS3000A_DIGITAL_CHANNEL_1",