📌 Ask for PlatformIO 6.1.1 or newer (#24435)

This commit is contained in:
Scott Lahteine 2022-07-12 13:02:54 -05:00
parent 6a86c5bad3
commit f543b3cb84
4 changed files with 22 additions and 18 deletions

View File

@ -4,5 +4,10 @@
# Make sure 'vscode init' is not the current command # Make sure 'vscode init' is not the current command
def is_pio_build(): def is_pio_build():
from SCons.Script import COMMAND_LINE_TARGETS from SCons.Script import DefaultEnvironment
return "idedata" not in COMMAND_LINE_TARGETS and "_idedata" not in COMMAND_LINE_TARGETS env = DefaultEnvironment()
return not env.IsIntegrationDump()
def get_pio_version():
from platformio import util
return util.pioversion_to_intstr()

View File

@ -52,6 +52,11 @@ if pioutil.is_pio_build():
if 'PIOENV' not in env: if 'PIOENV' not in env:
raise SystemExit("Error: PIOENV is not defined. This script is intended to be used with PlatformIO") raise SystemExit("Error: PIOENV is not defined. This script is intended to be used with PlatformIO")
# Require PlatformIO 6.1.1 or later
vers = pioutil.get_pio_version()
if vers < [6, 1, 1]:
raise SystemExit("Error: Marlin requires PlatformIO >= 6.1.1. Use 'pio upgrade' to get a newer version.")
if 'MARLIN_FEATURES' not in env: if 'MARLIN_FEATURES' not in env:
raise SystemExit("Error: this script should be used after common Marlin scripts") raise SystemExit("Error: this script should be used after common Marlin scripts")

View File

@ -20,6 +20,7 @@ build_src_filter = ${common.default_src_filter} +<src/HAL/ESP32>
lib_ignore = NativeEthernet lib_ignore = NativeEthernet
upload_speed = 500000 upload_speed = 500000
monitor_speed = 250000 monitor_speed = 250000
monitor_filters = colorize, time, send_on_enter, log2file, esp32_exception_decoder
#upload_port = marlinesp.local #upload_port = marlinesp.local
#board_build.flash_mode = qio #board_build.flash_mode = qio
@ -28,13 +29,13 @@ extends = env:esp32
board_build.partitions = default_16MB.csv board_build.partitions = default_16MB.csv
[env:PANDA] [env:PANDA]
extends = env:esp32 extends = env:esp32
build_flags = ${env:esp32.build_flags} -DUSE_ESP32_EXIO -DUSE_ESP32_TASK_WDT build_flags = ${env:esp32.build_flags} -DUSE_ESP32_EXIO -DUSE_ESP32_TASK_WDT
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
SoftwareSerialEsp32 SoftwareSerialEsp32
board_build.partitions = Marlin/src/HAL/ESP32/esp32.csv board_build.partitions = Marlin/src/HAL/ESP32/esp32.csv
upload_speed = 115200 upload_speed = 115200
monitor_speed = 115200 monitor_speed = 115200
[env:mks_tinybee] [env:mks_tinybee]
extends = env:esp32 extends = env:esp32

View File

@ -267,17 +267,10 @@ framework = arduino
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
build_flags = ${common.build_flags} build_flags = ${common.build_flags}
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
platform_packages = platformio/tool-dfuutil@^1.11.0
monitor_speed = 250000 monitor_speed = 250000
monitor_flags = monitor_eol = LF
--quiet monitor_echo = yes
--echo monitor_filters = colorize, time, send_on_enter, log2file
--eol
LF
--filter
colorize
--filter
time
# #
# Just print the dependency tree # Just print the dependency tree