Skip to content

Commit 5b16639

Browse files
thinkyheadimp67
authored andcommitted
📌 Ask for PlatformIO 6.1.1 or newer (MarlinFirmware#24435)
1 parent 924282c commit 5b16639

File tree

4 files changed

+22
-18
lines changed

4 files changed

+22
-18
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.1 or later
56+
vers = pioutil.get_pio_version()
57+
if vers < [6, 1, 1]:
58+
raise SystemExit("Error: Marlin requires PlatformIO >= 6.1.1. 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

ini/esp32.ini

+7-6
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ build_src_filter = ${common.default_src_filter} +<src/HAL/ESP32>
2020
lib_ignore = NativeEthernet
2121
upload_speed = 500000
2222
monitor_speed = 250000
23+
monitor_filters = colorize, time, send_on_enter, log2file, esp32_exception_decoder
2324
#upload_port = marlinesp.local
2425
#board_build.flash_mode = qio
2526

@@ -28,13 +29,13 @@ extends = env:esp32
2829
board_build.partitions = default_16MB.csv
2930

3031
[env:PANDA]
31-
extends = env:esp32
32-
build_flags = ${env:esp32.build_flags} -DUSE_ESP32_EXIO -DUSE_ESP32_TASK_WDT
33-
lib_deps = ${common.lib_deps}
34-
SoftwareSerialEsp32
32+
extends = env:esp32
33+
build_flags = ${env:esp32.build_flags} -DUSE_ESP32_EXIO -DUSE_ESP32_TASK_WDT
34+
lib_deps = ${common.lib_deps}
35+
SoftwareSerialEsp32
3536
board_build.partitions = Marlin/src/HAL/ESP32/esp32.csv
36-
upload_speed = 115200
37-
monitor_speed = 115200
37+
upload_speed = 115200
38+
monitor_speed = 115200
3839

3940
[env:mks_tinybee]
4041
extends = env:esp32

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
281274

282275
#
283276
# Just print the dependency tree

0 commit comments

Comments
 (0)