Skip to content

Commit f0a771a

Browse files
authored
Merge pull request #191 from thennen/fix-ps6000a-DC50
Correct DC50 enum: 2 -> 50
2 parents 1747100 + 8b32721 commit f0a771a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

picoscope/ps6000a.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
# use the values specified in the h file
5959
# float is always defined as 32 bits
6060
# double is defined as 64 bits
61-
from ctypes import byref, POINTER, create_string_buffer, c_float, c_int8,\
62-
c_double, c_int16, c_uint16, c_int32, c_uint32, c_int64, c_uint64,\
61+
from ctypes import byref, POINTER, create_string_buffer, c_float, c_int8, \
62+
c_double, c_int16, c_uint16, c_int32, c_uint32, c_int64, c_uint64, \
6363
c_void_p, CFUNCTYPE
6464
from ctypes import c_int32 as c_enum
6565

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

133-
CHANNEL_COUPLINGS = {"DC50": 2, "DC": 1, "AC": 0}
133+
CHANNEL_COUPLINGS = {"DC50": 50, "DC": 1, "AC": 0}
134134

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

0 commit comments

Comments
 (0)