Skip to content

Commit 35a58c0

Browse files
author
neil.hamilton
committed
Correct formatting of some enum values in PicoDeviceEnums.py
1 parent e7bc9b3 commit 35a58c0

File tree

1 file changed

+83
-82
lines changed

1 file changed

+83
-82
lines changed

‎picosdk/PicoDeviceEnums.py‎

Lines changed: 83 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
functions.
88
"""
99

10+
from ctypes import *
1011
from picosdk.constants import make_enum
1112
from picosdk.library import Library
1213

@@ -18,55 +19,55 @@ def __init__(self):
1819
picoEnum = PicoEnumlib()
1920

2021
def _define_ratio_mode():
21-
PICO_RATIO_MODE_AGGREGATE = 1,
22-
PICO_RATIO_MODE_DECIMATE = 2,
23-
PICO_RATIO_MODE_AVERAGE = 4,
24-
PICO_RATIO_MODE_DISTRIBUTION = 8,
25-
PICO_RATIO_MODE_SUM = 16,
26-
PICO_RATIO_MODE_TRIGGER_DATA_FOR_TIME_CALCUATION = 0x10000000,
27-
PICO_RATIO_MODE_SEGMENT_HEADER = 0x20000000,
28-
PICO_RATIO_MODE_TRIGGER = 0x40000000,
22+
PICO_RATIO_MODE_AGGREGATE = 1
23+
PICO_RATIO_MODE_DECIMATE = 2
24+
PICO_RATIO_MODE_AVERAGE = 4
25+
PICO_RATIO_MODE_DISTRIBUTION = 8
26+
PICO_RATIO_MODE_SUM = 16
27+
PICO_RATIO_MODE_TRIGGER_DATA_FOR_TIME_CALCUATION = 0x10000000
28+
PICO_RATIO_MODE_SEGMENT_HEADER = 0x20000000
29+
PICO_RATIO_MODE_TRIGGER = 0x40000000
2930
PICO_RATIO_MODE_RAW = 0x80000000
3031

3132
return {k.upper(): v for k, v in locals().items() if k.startswith("PICO")}
3233

3334
picoEnum.PICO_RATIO_MODE = _define_ratio_mode()
3435

3536
def _define_channel():
36-
PICO_CHANNEL_A = 0,
37-
PICO_CHANNEL_B = 1,
38-
PICO_CHANNEL_C = 2,
39-
PICO_CHANNEL_D = 3,
40-
PICO_CHANNEL_E = 4,
41-
PICO_CHANNEL_F = 5,
42-
PICO_CHANNEL_G = 6,
43-
PICO_CHANNEL_H = 7,
44-
PICO_PORT0 = 128,
45-
PICO_PORT1 = 129,
46-
PICO_PORT2 = 130,
47-
PICO_PORT3 = 131,
48-
PIOC_EXTERNAL = 1000,
49-
PICI_TRIGGER_AUX = 1001,
50-
PICO_PULSE_WIDTH_SOURCE = 0x10000000,
51-
PICO_DIGITAL_SOURCE = 0x10000001,
37+
PICO_CHANNEL_A = 0
38+
PICO_CHANNEL_B = 1
39+
PICO_CHANNEL_C = 2
40+
PICO_CHANNEL_D = 3
41+
PICO_CHANNEL_E = 4
42+
PICO_CHANNEL_F = 5
43+
PICO_CHANNEL_G = 6
44+
PICO_CHANNEL_H = 7
45+
PICO_PORT0 = 128
46+
PICO_PORT1 = 129
47+
PICO_PORT2 = 130
48+
PICO_PORT3 = 131
49+
PIOC_EXTERNAL = 1000
50+
PICI_TRIGGER_AUX = 1001
51+
PICO_PULSE_WIDTH_SOURCE = 0x10000000
52+
PICO_DIGITAL_SOURCE = 0x10000001
5253

5354
return {k.upper(): v for k, v in locals().items() if k.startswith("PICO")}
5455

5556
picoEnum.PICO_CHANNEL = _define_channel()
5657

5758
def _define_channel_flags():
58-
PICO_CHANNEL_A_FLAGS = 1,
59-
PICO_CHANNEL_B_FLAGS = 2,
60-
PICO_CHANNELS_C_FLAGS = 4,
61-
PICO_CHANNEL_D_FLAGS = 8,
62-
PICO_CHANNEL_E_FLAGS = 16,
63-
PICO_CHANNEL_F_FLAGS = 32,
64-
PICO_CHANNELS_G_FLAGS = 64,
65-
PICO_CHANNEL_H_FLAGS = 128,
66-
PICO_PORT0_FLAGS = 65536,
67-
PICO_PORT1_FLAGS = 131072,
68-
PICO_PORT2_FLAGS = 262144,
69-
PICO_PORT3_FLAGS = 524288,
59+
PICO_CHANNEL_A_FLAGS = 1
60+
PICO_CHANNEL_B_FLAGS = 2
61+
PICO_CHANNELS_C_FLAGS = 4
62+
PICO_CHANNEL_D_FLAGS = 8
63+
PICO_CHANNEL_E_FLAGS = 16
64+
PICO_CHANNEL_F_FLAGS = 32
65+
PICO_CHANNELS_G_FLAGS = 64
66+
PICO_CHANNEL_H_FLAGS = 128
67+
PICO_PORT0_FLAGS = 65536
68+
PICO_PORT1_FLAGS = 131072
69+
PICO_PORT2_FLAGS = 262144
70+
PICO_PORT3_FLAGS = 524288
7071

7172
return {k.upper(): v for k, v in locals().items() if k.startswith("PICO")}
7273

@@ -92,9 +93,9 @@ def _define_channel_flags():
9293
])
9394

9495
def _define_coupling():
95-
PICO_AC = 0,
96-
PICO_DC = 1,
97-
PICO_DC_50OHM = 50,
96+
PICO_AC = 0
97+
PICO_DC = 1
98+
PICO_DC_50OHM = 50
9899

99100
return {k.upper(): v for k, v in locals().items() if k.startswith("PICO")}
100101

@@ -105,13 +106,13 @@ def _define_coupling():
105106

106107
def _define_bandwidth_limiter():
107108
PICO_BW_FULL = 0,
108-
PICO_BW_100KHZ = 100000,
109-
PICO_BW_20KHZ = 20000,
110-
PICO_BW_1MHZ = 1000000,
111-
PICO_BW_20MHZ = 20000000,
112-
PICO_BW_25MHZ = 25000000,
113-
PICO_BW_50MHZ = 50000000,
114-
PICO_BW_250MHZ = 250000000,
109+
PICO_BW_100KHZ = 100000
110+
PICO_BW_20KHZ = 20000
111+
PICO_BW_1MHZ = 1000000
112+
PICO_BW_20MHZ = 20000000
113+
PICO_BW_25MHZ = 25000000
114+
PICO_BW_50MHZ = 50000000
115+
PICO_BW_250MHZ = 250000000
115116
PICO_BW_500MHZ = 500000000
116117

117118
return {k.upper(): v for k, v in locals().items() if k.startswith("PICO")}
@@ -134,18 +135,18 @@ def _define_bandwidth_limiter():
134135
])
135136

136137
def _define_wave_type():
137-
PICO_SINE = 0x00000011,
138-
PICO_SQUARE = 0x00000012,
139-
PICO_TRIANGLE = 0x00000013,
140-
PICO_RAMP_UP = 0x00000014,
141-
PICO_RAMP_DOWN = 0x00000015,
142-
PICO_SINC = 0x00000016,
143-
PICO_GAUSSIAN = 0x00000017,
138+
PICO_SINE = 0x00000011
139+
PICO_SQUARE = 0x00000012
140+
PICO_TRIANGLE = 0x00000013
141+
PICO_RAMP_UP = 0x00000014
142+
PICO_RAMP_DOWN = 0x00000015
143+
PICO_SINC = 0x00000016
144+
PICO_GAUSSIAN = 0x00000017
144145
PICO_HALF_SINE = 0x00000018
145-
PICO_DC_VOLTAGE = 0x00000400,
146-
PICO_PWM = 0x00001000,
147-
PICO_WHITENOISE = 0x00002001,
148-
PICO_PRBS = 0x00002002,
146+
PICO_DC_VOLTAGE = 0x00000400
147+
PICO_PWM = 0x00001000
148+
PICO_WHITENOISE = 0x00002001
149+
PICO_PRBS = 0x00002002
149150
PICO_ARBITRARY = 0x10000000
150151

151152
return {k.upper(): v for k, v in locals().items() if k.startswith("PICO")}
@@ -190,18 +191,18 @@ def _define_wave_type():
190191
])
191192

192193
def _define_threshold_direction():
193-
PICO_ABOVE= PICO_INSIDE = 0,
194-
PICO_BELOW = PICO_OUTSIDE = 1,
195-
PICO_RISING = PICO_ENTER = PICO_NONE = 2,
196-
PICO_FALLING = PICO_EXIT = 3,
197-
PICO_RISING_OR_FALLING = PICO_ENTER_OR_EXIT = 4,
198-
PICO_ABOVE_LOWER = 5,
199-
PICO_BELOW_LOWER = 6,
200-
PICO_RISING_LOWER = 7,
201-
PICO_FALLING_LOWER = 8,
202-
PICO_POSITIVE_RUNT = 9,
203-
PICO_NEGATIVE_RUNT = 10,
204-
PICO_LOGIC_LOWER = 1000,
194+
PICO_ABOVE= PICO_INSIDE = 0
195+
PICO_BELOW = PICO_OUTSIDE = 1
196+
PICO_RISING = PICO_ENTER = PICO_NONE = 2
197+
PICO_FALLING = PICO_EXIT = 3
198+
PICO_RISING_OR_FALLING = PICO_ENTER_OR_EXIT = 4
199+
PICO_ABOVE_LOWER = 5
200+
PICO_BELOW_LOWER = 6
201+
PICO_RISING_LOWER = 7
202+
PICO_FALLING_LOWER = 8
203+
PICO_POSITIVE_RUNT = 9
204+
PICO_NEGATIVE_RUNT = 10
205+
PICO_LOGIC_LOWER = 1000
205206
PICO_LOGIC_UPPER = 1001
206207

207208
return {k.upper(): v for k, v in locals().items() if k.startswith("PICO")}
@@ -225,10 +226,10 @@ def _define_threshold_direction():
225226
])
226227

227228
def _define_action():
228-
PICO_CLEAR_ALL = 0x00000001,
229-
PICO_ADD = 0x00000002,
230-
PICO_CLEAR_THIS_DATA_BUFFER = 0x00001000,
231-
PICO_CLEAR_WAVEFORM_DATA_BUFFERS = 0x00002000,
229+
PICO_CLEAR_ALL = 0x00000001
230+
PICO_ADD = 0x00000002
231+
PICO_CLEAR_THIS_DATA_BUFFER = 0x00001000
232+
PICO_CLEAR_WAVEFORM_DATA_BUFFERS = 0x00002000
232233
PICO_CLEAR_WAVEFORM_READ_DATA_BUFFERS = 0x00004000
233234

234235
return {k.upper(): v for k, v in locals().items() if k.startswith("PICO")}
@@ -242,11 +243,11 @@ def _define_action():
242243
])
243244

244245
def _define_resolution():
245-
PICO_DR_8BIT = 0,
246-
PICO_DR_12BIT = 1,
247-
PICO_DR_14BIT = 2,
248-
PICO_DR_15BIT = 3,
249-
PICO_DR_16BIT = 4,
246+
PICO_DR_8BIT = 0
247+
PICO_DR_12BIT = 1
248+
PICO_DR_14BIT = 2
249+
PICO_DR_15BIT = 3
250+
PICO_DR_16BIT = 4
250251
PICO_DR_10BIT = 10
251252

252253
return {k.upper(): v for k, v in locals().items() if k.startswith("PICO")}
@@ -284,8 +285,8 @@ def _define_resolution():
284285
])
285286

286287
def _define_conditions_info():
287-
PICO_CLEAR_CONDITIONS = 0x00000001,
288-
PICO_ADD_CONDITIONS = 0x00000002,
288+
PICO_CLEAR_CONDITIONS = 0x00000001
289+
PICO_ADD_CONDITIONS = 0x00000002
289290

290291
return {k.upper(): v for k, v in locals().items() if k.startswith("PICO")}
291292

@@ -310,8 +311,8 @@ def _define_conditions_info():
310311
])
311312

312313
def _define_digital_port():
313-
Pico_DIGITAL_PORT_NONE = 0,
314-
PICO_DIGITAL_PORT_MSO_POD = 1000,
314+
Pico_DIGITAL_PORT_NONE = 0
315+
PICO_DIGITAL_PORT_MSO_POD = 1000
315316
PICO_DIGITAL_PORT_UNKNOWN_DEVICE = -2
316317

317318
return {k.upper(): v for k, v in locals().items() if k.startswith("PICO")}

0 commit comments

Comments
 (0)