Skip to content

Commit a54309b

Browse files
committed
📌 Ask for PlatformIO 6.1 or newer
1 parent 11cc2db commit a54309b

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

buildroot/share/PlatformIO/scripts/pioutil.py

+7-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,10 @@
44

55
# Make sure 'vscode init' is not the current command
66
def is_pio_build():
7-
from SCons.Script import COMMAND_LINE_TARGETS
8-
return "idedata" not in COMMAND_LINE_TARGETS and "_idedata" not in COMMAND_LINE_TARGETS
7+
from SCons.Script import DefaultEnvironment
8+
env = DefaultEnvironment()
9+
return not env.IsIntegrationDump()
10+
11+
def get_pio_version():
12+
from platformio import util
13+
return util.pioversion_to_intstr()

buildroot/share/PlatformIO/scripts/preflight-checks.py

+5
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ def sanity_check_target():
5252
if 'PIOENV' not in env:
5353
raise SystemExit("Error: PIOENV is not defined. This script is intended to be used with PlatformIO")
5454

55+
# Require PlatformIO 6.1.0 or later
56+
vers = pioutil.get_pio_version()
57+
if vers < [6, 1, 0]:
58+
raise SystemExit("Error: Marlin requires PlatformIO >= 6.1.0. Use 'pio upgrade' to get a newer version.")
59+
5560
if 'MARLIN_FEATURES' not in env:
5661
raise SystemExit("Error: this script should be used after common Marlin scripts")
5762

platformio.ini

+3-10
Original file line numberDiff line numberDiff line change
@@ -267,17 +267,10 @@ framework = arduino
267267
extra_scripts = ${common.extra_scripts}
268268
build_flags = ${common.build_flags}
269269
lib_deps = ${common.lib_deps}
270-
platform_packages = platformio/tool-dfuutil@^1.11.0
271270
monitor_speed = 250000
272-
monitor_flags =
273-
--quiet
274-
--echo
275-
--eol
276-
LF
277-
--filter
278-
colorize
279-
--filter
280-
time
271+
monitor_eol = LF
272+
monitor_echo = yes
273+
monitor_filters = colorize, time, send_on_enter, log2file, esp32_exception_decoder
281274

282275
#
283276
# Just print the dependency tree

0 commit comments

Comments
 (0)