Merge branch 'master' of https://dev.azure.com/PicoDevOps/TechSupport/_git/PicoSDK-Core-Examples-picosdk-python-wrappers

Author: joey-gmaj

.gitignore

@@ -6,6 +6,7 @@
 **/*.obj
 **/*.lib
 **/*.exp
+**/*.bak
 
 # All platforms
 

picosdk/PicoDeviceEnums.py

@@ -217,7 +217,8 @@ def _define_threshold_direction():
 
 picoEnum.PICO_ETS_MODE = make_enum([
     "PICO_ETS_OFF",
-    "PICO_WINDOW",
+    "PICO_ETS_FAST",
+    "PICO_ETS_SLOW"
     ])
 
 picoEnum.PICO_INDEX_MODE = make_enum([
@@ -250,6 +251,7 @@ def _define_resolution():
     PICO_DR_15BIT = 3
     PICO_DR_16BIT = 4
     PICO_DR_10BIT = 10
+    PICO_DR_10BIT_TURBO = 0x1A
 
     return {k.upper(): v for k, v in locals().items() if k.startswith("PICO")}
 
@@ -312,7 +314,7 @@ def _define_conditions_info():
     ])
 
 def _define_digital_port():
-    Pico_DIGITAL_PORT_NONE = 0
+    PICO_DIGITAL_PORT_NONE = 0
     PICO_DIGITAL_PORT_MSO_POD = 1000
     PICO_DIGITAL_PORT_UNKNOWN_DEVICE = -2
 
@@ -326,4 +328,13 @@ def _define_digital_port():
     "PICO_FREQUENCY_10MHZ",
     "PICO_FREQUENCY_20MHZ",
     "PICO_FREQUENCY_25MHZ"
-    ])
+    ])
+    
+def _define_power_delivery_device_type():
+    PICO_USB_POWER_DELIEVRY_DEVICE_TYPE_NOTHING = 0
+    PICO_USB_POWER_DELIEVRY_DEVICE_TYPE_SOURCE = 2
+    PICO_USB_POWER_DELIEVRY_DEVICE_TYPE_DEBUG = 3
+    
+    return {k.upper(): v for k, v in locals().items() if k.startswith("PICO")}
+    
+picoEnum.PICO_USB_POWER_DELIEVRY_DEVICE_TYPE = _define_power_delivery_device_type

picosdk/PicoDeviceStructs.py

@@ -117,6 +117,17 @@ class PICO_SCALING_FACTORS(Structure):
 
 picoStruct.PICO_SCALING_FACTORS = PICO_SCALING_FACTORS
 
+class PICO_SCALING_FACTORS_FOR_RANGE_TYPES(Structure):
+    _pack_ = 1
+    _fields_ = [("channel", c_uint32),
+                ("rangeMin", c_int64),
+                ("rangeMax", c_int64),
+                ("rangeType", c_uint32),
+                ("offset", c_int16),
+                ("scalingFactor", c_double)]
+                
+picoStruct.PICO_SCALING_FACTORS_FOR_RANGE_TYPES = PICO_SCALING_FACTORS_FOR_RANGE_TYPES
+
 class PROBE_APP(Structure):
     _pack_ = 1
     _fields_ = [("id", c_int32),
@@ -141,4 +152,32 @@ class PICO_DIGITAL_PORT_INTERACTIONS(Structure):
                 ("serial", c_int8),
                 ("calibrationDate", c_int8)]
 
-picoStruct.PICO_DIGITAL_PORT_INTERACTIONS = PICO_DIGITAL_PORT_INTERACTIONS
+picoStruct.PICO_DIGITAL_PORT_INTERACTIONS = PICO_DIGITAL_PORT_INTERACTIONS
+
+class PICO_CHANNEL_OVERVOLTAGE_TRIPPED(Structure):
+    _pack_ = 1
+    _fields_ = [("channel", c_uint32),
+                ("tripped", c_uint8)]
+                
+picoStruct.PICO_CHANNEL_OVERVOLTAGE_TRIPPED = PICO_CHANNEL_OVERVOLTAGE_TRIPPED
+
+class PICO_USB_POWER_DELIVERY(Structure):
+    _pack_ = 1
+    _fields_ = [("valid", c_uint8),
+                ("busVoltagemV", c_uint32),
+                ("rpCurrentLimitmA", c_uint32),
+                ("partnerConnected", c_uint8),
+                ("ccPolarity", c_uint8),
+                ("attachedDevice", c_uint32),
+                ("contractExists", c_uint8),
+                ("currentPdo", c_uint32),
+                ("currentRdo", c_uint32)]
+                
+picoStruct.PICO_USB_POWER_DELIVERY = PICO_USB_POWER_DELIVERY
+
+class PICO_USB_POWER_DETAILS(Structure):
+    _pack_ = 1
+    _fields_ = [("dataPort", c_uint32),
+                ("powerPort", c_uint32)]
+                
+picoStruct.PICO_USB_POWER_DETAILS = PICO_USB_POWER_DETAILS

picosdk/functions.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018 Pico Technology Ltd. See LICENSE file for terms.
+# Copyright (C) 2018-2024 Pico Technology Ltd. See LICENSE file for terms.
 #
 from __future__ import division
 import numpy as np
@@ -172,3 +172,30 @@ def assert_pico2000_ok(status):
     else:
         errorCheck = False
         raise PicoSDKCtypesError("Unsuccessful API call")
+        
+def mV2adcV2(millivolts, rangeMax, maxADC):
+    """
+        mV2adcV2(
+                float                   millivolts
+				int                     rangeMax
+                c_int32                 maxADC
+                )
+        Takes a voltage value and converts it into adc counts for psospa driver scopes
+    """
+    adcValue = round((millivolts * maxADC.value)/(rangeMax/1000000))
+
+    return adcValue
+    
+def adc2mVV2(bufferADC, rangeMax, maxADC):
+    """ 
+        adc2mVV2(
+                c_short_Array           bufferADC
+                int                     rangeMax
+                c_int32                 maxADC
+                )
+               
+        Takes a buffer of raw adc count values and converts it into millivolts for psospa driver scopes
+    """
+    buffermV = [(x * (rangeMax/1000000)) / maxADC.value for x in bufferADC]
+    
+    return buffermV

picosdk/ps5000a.py

@@ -169,6 +169,8 @@ def _define_conditionsInfo():
     'PS5000A_RATIO_MODE_AVERAGE': 4,
 }
 
+ps5000a.PICO_RATIO_MODE = {k[19:]: v for k, v in ps5000a.PS5000A_RATIO_MODE.items()}
+
 ps5000a.PS5000A_TIME_UNITS = make_enum([
     'PS5000A_FS',
     'PS5000A_PS',
@@ -179,7 +181,13 @@ def _define_conditionsInfo():
     'PS5000A_MAX_TIME_UNITS',
 ])
 
-ps5000a.PICO_RATIO_MODE = {k[19:]: v for k, v in ps5000a.PS5000A_RATIO_MODE.items()}
+ps5000a.PS5000A_PULSE_WIDTH_TYPE = make_enum([
+    'PS5000A_PW_TYPE_NONE',
+    'PS5000A_PW_TYPE_LESS_THAN',
+    'PS5000A_PW_TYPE_GREATER_THAN',
+    'PS5000A_PW_TYPE_IN_RANGE',
+    'PS5000A_PW_TYPE_OUT_OF_RANGE',
+])
 
 
 

picosdk/ps6000a.py

@@ -20,6 +20,8 @@ def __init__(self):
 
 ps6000a = Ps6000alib()
 
+ps6000a.DEFAULT_RESOLUTION = enums.PICO_DEVICE_RESOLUTION["PICO_DR_8BIT"]
+
 doc = """ void ps6000aExternalReferenceInteractions
     (
         int16_t    handle,
@@ -144,7 +146,7 @@ def __init__(self):
         int16_t    *requiredSize,
         PICO_INFO    info
     ); """
-ps6000a.make_symbol("_GetUnitInfo", "ps6000aGetUnitInfo", c_uint32, [c_int16, c_char_p, c_int16, c_void_p, c_int32], doc)
+ps6000a.make_symbol("_GetUnitInfo", "ps6000aGetUnitInfo", c_uint32, [c_int16, c_char_p, c_int16, c_void_p, c_uint32], doc)
 
 doc = """ PICO_STATUS ps6000aCloseUnit
     (
@@ -352,7 +354,7 @@ def __init__(self):
         double    *maximumPermissibleValue,
         double    *step
     ); """
-ps6000a.make_symbol("_SigGenLimits", "ps6000aSigGenLimits", c_uint32, [c_int16, c_uint32, c_double, c_double, c_double], doc)
+ps6000a.make_symbol("_SigGenLimits", "ps6000aSigGenLimits", c_uint32, [c_int16, c_uint32, c_void_p, c_void_p, c_void_p], doc)
 
 doc = """ PICO_STATUS ps6000aSigGenFrequencyLimits
     (
@@ -600,6 +602,15 @@ def __init__(self):
     ); """
 ps6000a.make_symbol("_GetValuesBulk", "ps6000aGetValuesBulk", c_uint32, [c_int16, c_uint64, c_void_p, c_uint64, c_uint64, c_uint64, c_uint32, c_void_p], doc)
 
+doc = """ PICO_STATUS ps6000aGetTriggerInfo
+    (
+        int16_t    handle,
+        PICO_TRIGGER_INFO    *startIndex,
+        uint64_t    firstSegmentIndex,
+        uint64_t    segmentCount,
+    ); """
+ps6000a.make_symbol("_GetTriggerInfo", "ps6000aGetTriggerInfo", c_uint32, [c_int16, c_void_p, c_uint64, c_uint64], doc)
+
 doc = """ PICO_STATUS ps6000aGetValuesAsync
     (
         int16_t    handle,