Skip to content

Commit 716f27e

Browse files
fpistmfpistm
authored
[PIO] Apply black and flake8 on python scripts (#945)
1 parent 2412aef commit 716f27e

File tree

3 files changed

+82
-75
lines changed

3 files changed

+82
-75
lines changed

‎CI/build/platformio-builder.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66

77
def run_platformio(example_path, boards):
88
return subprocess.call(
9-
["platformio", "ci", example_path] + ["--board=" + b for b in boards])
9+
["platformio", "ci", example_path] + ["--board=" + b for b in boards]
10+
)
1011

1112

1213
def collect_examples(libs_dir):
@@ -16,17 +17,15 @@ def collect_examples(libs_dir):
1617
examples_dir = os.path.join(lib_dir, "examples")
1718
if os.path.isdir(examples_dir):
1819
examples.extend(
19-
[os.path.join(examples_dir, ex) for ex in os.listdir(examples_dir)])
20+
[os.path.join(examples_dir, ex) for ex in os.listdir(examples_dir)]
21+
)
2022
return examples
2123

2224

2325
parser = argparse.ArgumentParser(description="Basic PlatformIO runner")
2426

2527
parser.add_argument(
26-
"-b",
27-
"--board",
28-
action="append",
29-
help="board ID used for PlatformIO project"
28+
"-b", "--board", action="append", help="board ID used for PlatformIO project"
3029
)
3130

3231

‎tools/.flake8

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[flake8]
2+
max-line-length = 95

‎tools/platformio-build.py

Lines changed: 75 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
board = env.BoardConfig()
3333

3434
FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoststm32")
35-
CMSIS_DIR = join(platform.get_package_dir(
36-
"framework-arduinoststm32"), "CMSIS", "CMSIS")
35+
CMSIS_DIR = join(platform.get_package_dir("framework-arduinoststm32"), "CMSIS", "CMSIS")
3736
assert isdir(FRAMEWORK_DIR)
3837
assert isdir(CMSIS_DIR)
3938

@@ -43,16 +42,18 @@
4342
mcu_type = mcu[:-2]
4443
variant = board.get("build.variant")
4544
series = mcu_type[:7].upper() + "xx"
46-
variants_dir = join(
47-
"$PROJECT_DIR", board.get("build.variants_dir")) if board.get(
48-
"build.variants_dir", "") else join(FRAMEWORK_DIR, "variants")
45+
variants_dir = (
46+
join("$PROJECT_DIR", board.get("build.variants_dir"))
47+
if board.get("build.variants_dir", "")
48+
else join(FRAMEWORK_DIR, "variants")
49+
)
4950
variant_dir = join(variants_dir, variant)
5051
upload_protocol = env.subst("$UPLOAD_PROTOCOL")
5152

5253

5354
def process_standard_library_configuration(cpp_defines):
5455
if "PIO_FRAMEWORK_ARDUINO_STANDARD_LIB" in cpp_defines:
55-
env['LINKFLAGS'].remove("--specs=nano.specs")
56+
env["LINKFLAGS"].remove("--specs=nano.specs")
5657
if "PIO_FRAMEWORK_ARDUINO_NANOLIB_FLOAT_PRINTF" in cpp_defines:
5758
env.Append(LINKFLAGS=["-u_printf_float"])
5859
if "PIO_FRAMEWORK_ARDUINO_NANOLIB_FLOAT_SCANF" in cpp_defines:
@@ -61,7 +62,7 @@ def process_standard_library_configuration(cpp_defines):
6162

6263
def process_usart_configuration(cpp_defines):
6364
if "PIO_FRAMEWORK_ARDUINO_SERIAL_DISABLED" in cpp_defines:
64-
env['CPPDEFINES'].remove("HAL_UART_MODULE_ENABLED")
65+
env["CPPDEFINES"].remove("HAL_UART_MODULE_ENABLED")
6566

6667
elif "PIO_FRAMEWORK_ARDUINO_SERIAL_WITHOUT_GENERIC" in cpp_defines:
6768
env.Append(CPPDEFINES=["HWSERIAL_NONE"])
@@ -85,8 +86,7 @@ def process_usb_configuration(cpp_defines):
8586
elif "PIO_FRAMEWORK_ARDUINO_ENABLE_HID" in cpp_defines:
8687
env.Append(CPPDEFINES=["USBD_USE_HID_COMPOSITE"])
8788

88-
if any(f in env["CPPDEFINES"] for f in (
89-
"USBD_USE_CDC", "USBD_USE_HID_COMPOSITE")):
89+
if any(f in env["CPPDEFINES"] for f in ("USBD_USE_CDC", "USBD_USE_HID_COMPOSITE")):
9090
env.Append(CPPDEFINES=["HAL_PCD_MODULE_ENABLED"])
9191

9292

@@ -122,43 +122,28 @@ def configure_application_offset(mcu, upload_protocol):
122122
env.Append(CPPDEFINES=["BL_LEGACY_LEAF"])
123123

124124
if offset != 0:
125-
env.Append(
126-
CPPDEFINES=[("VECT_TAB_OFFSET", "%s" % hex(offset))],
127-
)
125+
env.Append(CPPDEFINES=[("VECT_TAB_OFFSET", "%s" % hex(offset))],)
128126

129127
# LD_FLASH_OFFSET is mandatory even if there is no offset
130-
env.Append(
131-
LINKFLAGS=["-Wl,--defsym=LD_FLASH_OFFSET=%s" % hex(offset)])
128+
env.Append(LINKFLAGS=["-Wl,--defsym=LD_FLASH_OFFSET=%s" % hex(offset)])
132129

133130

134131
if any(mcu in board.get("build.cpu") for mcu in ("cortex-m4", "cortex-m7")):
135132
env.Append(
136-
CCFLAGS=[
137-
"-mfpu=fpv4-sp-d16",
138-
"-mfloat-abi=hard"
139-
],
140-
141-
LINKFLAGS=[
142-
"-mfpu=fpv4-sp-d16",
143-
"-mfloat-abi=hard"
144-
]
133+
CCFLAGS=["-mfpu=fpv4-sp-d16", "-mfloat-abi=hard"],
134+
LINKFLAGS=["-mfpu=fpv4-sp-d16", "-mfloat-abi=hard"],
145135
)
146136

147137
env.Append(
148138
ASFLAGS=["-x", "assembler-with-cpp"],
149-
150-
CFLAGS=[
151-
"-std=gnu11"
152-
],
153-
139+
CFLAGS=["-std=gnu11"],
154140
CXXFLAGS=[
155141
"-std=gnu++14",
156142
"-fno-threadsafe-statics",
157143
"-fno-rtti",
158144
"-fno-exceptions",
159-
"-fno-use-cxa-atexit"
145+
"-fno-use-cxa-atexit",
160146
],
161-
162147
CCFLAGS=[
163148
"-Os", # optimize for size
164149
"-mcpu=%s" % env.BoardConfig().get("build.cpu"),
@@ -167,44 +152,72 @@ def configure_application_offset(mcu, upload_protocol):
167152
"-fdata-sections",
168153
"-Wall",
169154
"-nostdlib",
170-
"--param", "max-inline-insns-single=500"
155+
"--param",
156+
"max-inline-insns-single=500",
171157
],
172-
173158
CPPDEFINES=[
174159
series,
175160
("ARDUINO", 10808),
176161
"ARDUINO_ARCH_STM32",
177162
"ARDUINO_%s" % board_name.upper(),
178163
("BOARD_NAME", '\\"%s\\"' % board_name.upper()),
179-
"HAL_UART_MODULE_ENABLED"
164+
"HAL_UART_MODULE_ENABLED",
180165
],
181-
182166
CPPPATH=[
183167
join(FRAMEWORK_DIR, "cores", "arduino", "avr"),
184168
join(FRAMEWORK_DIR, "cores", "arduino", "stm32"),
185169
join(FRAMEWORK_DIR, "cores", "arduino", "stm32", "LL"),
186170
join(FRAMEWORK_DIR, "cores", "arduino", "stm32", "usb"),
187171
join(FRAMEWORK_DIR, "cores", "arduino", "stm32", "usb", "hid"),
188172
join(FRAMEWORK_DIR, "cores", "arduino", "stm32", "usb", "cdc"),
189-
join(FRAMEWORK_DIR, "system", "Drivers",
190-
series + "_HAL_Driver", "Inc"),
191-
join(FRAMEWORK_DIR, "system", "Drivers",
192-
series + "_HAL_Driver", "Src"),
173+
join(FRAMEWORK_DIR, "system", "Drivers", series + "_HAL_Driver", "Inc"),
174+
join(FRAMEWORK_DIR, "system", "Drivers", series + "_HAL_Driver", "Src"),
193175
join(FRAMEWORK_DIR, "system", series),
194-
join(FRAMEWORK_DIR, "system", "Middlewares", "ST",
195-
"STM32_USB_Device_Library", "Core", "Inc"),
196-
join(FRAMEWORK_DIR, "system", "Middlewares", "ST",
197-
"STM32_USB_Device_Library", "Core", "Src"),
176+
join(
177+
FRAMEWORK_DIR,
178+
"system",
179+
"Middlewares",
180+
"ST",
181+
"STM32_USB_Device_Library",
182+
"Core",
183+
"Inc",
184+
),
185+
join(
186+
FRAMEWORK_DIR,
187+
"system",
188+
"Middlewares",
189+
"ST",
190+
"STM32_USB_Device_Library",
191+
"Core",
192+
"Src",
193+
),
198194
join(CMSIS_DIR, "Core", "Include"),
199-
join(FRAMEWORK_DIR, "system", "Drivers", "CMSIS",
200-
"Device", "ST", series, "Include"),
195+
join(
196+
FRAMEWORK_DIR,
197+
"system",
198+
"Drivers",
199+
"CMSIS",
200+
"Device",
201+
"ST",
202+
series,
203+
"Include",
204+
),
201205
join(CMSIS_DIR, "DSP", "Include"),
202-
join(FRAMEWORK_DIR, "system", "Drivers", "CMSIS",
203-
"Device", "ST", series, "Source", "Templates", "gcc"),
206+
join(
207+
FRAMEWORK_DIR,
208+
"system",
209+
"Drivers",
210+
"CMSIS",
211+
"Device",
212+
"ST",
213+
series,
214+
"Source",
215+
"Templates",
216+
"gcc",
217+
),
204218
join(FRAMEWORK_DIR, "cores", "arduino"),
205-
variant_dir
219+
variant_dir,
206220
],
207-
208221
LINKFLAGS=[
209222
"-Os",
210223
"-mthumb",
@@ -216,18 +229,16 @@ def configure_application_offset(mcu, upload_protocol):
216229
"-Wl,--unresolved-symbols=report-all",
217230
"-Wl,--warn-common",
218231
"-Wl,--defsym=LD_MAX_SIZE=%d" % board.get("upload.maximum_size"),
219-
"-Wl,--defsym=LD_MAX_DATA_SIZE=%d" % board.get(
220-
"upload.maximum_ram_size")
232+
"-Wl,--defsym=LD_MAX_DATA_SIZE=%d" % board.get("upload.maximum_ram_size"),
221233
],
222-
223234
LIBS=[
224-
get_arm_math_lib(env.BoardConfig().get("build.cpu")), "c", "m", "gcc", "stdc++"
235+
get_arm_math_lib(env.BoardConfig().get("build.cpu")),
236+
"c",
237+
"m",
238+
"gcc",
239+
"stdc++",
225240
],
226-
227-
LIBPATH=[
228-
variant_dir,
229-
join(CMSIS_DIR, "DSP", "Lib", "GCC")
230-
]
241+
LIBPATH=[variant_dir, join(CMSIS_DIR, "DSP", "Lib", "GCC")],
231242
)
232243

233244
env.ProcessFlags(board.get("build.framework_extra_flags.arduino", ""))
@@ -260,7 +271,7 @@ def configure_application_offset(mcu, upload_protocol):
260271
env.Append(
261272
LIBSOURCE_DIRS=[
262273
join(FRAMEWORK_DIR, "libraries", "__cores__", "arduino"),
263-
join(FRAMEWORK_DIR, "libraries")
274+
join(FRAMEWORK_DIR, "libraries"),
264275
]
265276
)
266277

@@ -271,20 +282,15 @@ def configure_application_offset(mcu, upload_protocol):
271282
libs = []
272283

273284
if "build.variant" in env.BoardConfig():
274-
env.Append(
275-
CPPPATH=[variant_dir]
276-
)
277-
env.BuildSources(
278-
join("$BUILD_DIR", "FrameworkArduinoVariant"),
279-
variant_dir
280-
)
285+
env.Append(CPPPATH=[variant_dir])
286+
env.BuildSources(join("$BUILD_DIR", "FrameworkArduinoVariant"), variant_dir)
281287

282288
env.BuildSources(
283-
join("$BUILD_DIR", "FrameworkArduino"),
284-
join(FRAMEWORK_DIR, "cores", "arduino"))
289+
join("$BUILD_DIR", "FrameworkArduino"), join(FRAMEWORK_DIR, "cores", "arduino")
290+
)
285291

286292
env.BuildSources(
287-
join("$BUILD_DIR", "SrcWrapper"),
288-
join(FRAMEWORK_DIR, "libraries", "SrcWrapper"))
293+
join("$BUILD_DIR", "SrcWrapper"), join(FRAMEWORK_DIR, "libraries", "SrcWrapper")
294+
)
289295

290296
env.Prepend(LIBS=libs)

0 commit comments

Comments
 (0)