Skip to content

Commit

Permalink
Merge pull request #191 from thennen/fix-ps6000a-DC50
Browse files Browse the repository at this point in the history
Correct DC50 enum:  2 -> 50
  • Loading branch information
hmaarrfk committed Sep 14, 2023
2 parents 1747100 + 8b32721 commit f0a771a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions picoscope/ps6000a.py
Expand Up @@ -58,8 +58,8 @@
# use the values specified in the h file
# float is always defined as 32 bits
# double is defined as 64 bits
from ctypes import byref, POINTER, create_string_buffer, c_float, c_int8,\
c_double, c_int16, c_uint16, c_int32, c_uint32, c_int64, c_uint64,\
from ctypes import byref, POINTER, create_string_buffer, c_float, c_int8, \
c_double, c_int16, c_uint16, c_int32, c_uint32, c_int64, c_uint64, \
c_void_p, CFUNCTYPE
from ctypes import c_int32 as c_enum

Expand Down Expand Up @@ -130,7 +130,7 @@ class PS6000a(_PicoscopeBase):
CHANNELS = {"A": 0, "B": 1, "C": 2, "D": 3,
"External": 1000, "MaxChannels": 4, "TriggerAux": 1001}

CHANNEL_COUPLINGS = {"DC50": 2, "DC": 1, "AC": 0}
CHANNEL_COUPLINGS = {"DC50": 50, "DC": 1, "AC": 0}

ACTIONS = { # PICO_ACTION they can be combined with bitwise OR.
'clear_all': 0x00000001, # PICO_CLEAR_ALL
Expand Down

0 comments on commit f0a771a

Please sign in to comment.