Skip to content

Commit a51d1be

Browse files
ellenspLCh-77
ellensp
authored and
LCh-77
committed
🔨 Require PIO >= 6.0.1 (MarlinFirmware#24205)
1 parent 9229357 commit a51d1be

13 files changed

+71
-71
lines changed

‎buildroot/share/PlatformIO/scripts/common-dependencies.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
FEATURE_CONFIG = {}
1616

1717
def validate_pio():
18-
PIO_VERSION_MIN = (5, 0, 3)
18+
PIO_VERSION_MIN = (6, 0, 1)
1919
try:
2020
from platformio import VERSION as PIO_VERSION
2121
weights = (1000, 100, 1)
@@ -174,7 +174,7 @@ def apply_features_config():
174174
env.SConscript(feat['extra_scripts'], exports="env")
175175

176176
if 'src_filter' in feat:
177-
blab("========== Adding src_filter for %s... " % feature, 2)
177+
blab("========== Adding build_src_filter for %s... " % feature, 2)
178178
src_filter = ' '.join(env.GetProjectOption('src_filter'))
179179
# first we need to remove the references to the same folder
180180
my_srcs = re.findall(r'[+-](<.*?>)', feat['src_filter'])
@@ -184,7 +184,7 @@ def apply_features_config():
184184
src_filter = re.sub(r'[+-]' + d, '', src_filter)
185185

186186
src_filter = feat['src_filter'] + ' ' + src_filter
187-
set_env_field('src_filter', [src_filter])
187+
set_env_field('build_src_filter', [src_filter])
188188
env.Replace(SRC_FILTER=src_filter)
189189

190190
if 'lib_ignore' in feat:

‎ini/avr.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
platform = atmelavr@~3.4
1717
build_flags = ${common.build_flags} -Wl,--relax
1818
board_build.f_cpu = 16000000L
19-
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
19+
build_src_filter = ${common.default_src_filter} +<src/HAL/AVR>
2020

2121
#
2222
# ATmega2560

‎ini/due.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
# - RADDS
1717
#
1818
[env:DUE]
19-
platform = atmelsam
20-
board = due
21-
src_filter = ${common.default_src_filter} +<src/HAL/DUE> +<src/HAL/shared/backtrace>
19+
platform = atmelsam
20+
board = due
21+
build_src_filter = ${common.default_src_filter} +<src/HAL/DUE> +<src/HAL/shared/backtrace>
2222

2323
[env:DUE_USB]
2424
extends = env:DUE

‎ini/esp32.ini

+8-8
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
# Espressif ESP32
1414
#
1515
[env:esp32]
16-
platform = espressif32@2.1.0
17-
board = esp32dev
18-
build_flags = ${common.build_flags} -DCORE_DEBUG_LEVEL=0
19-
src_filter = ${common.default_src_filter} +<src/HAL/ESP32>
20-
lib_ignore = NativeEthernet
21-
upload_speed = 500000
22-
monitor_speed = 250000
23-
#upload_port = marlinesp.local
16+
platform = espressif32@2.1.0
17+
board = esp32dev
18+
build_flags = ${common.build_flags} -DCORE_DEBUG_LEVEL=0
19+
build_src_filter = ${common.default_src_filter} +<src/HAL/ESP32>
20+
lib_ignore = NativeEthernet
21+
upload_speed = 500000
22+
monitor_speed = 250000
23+
#upload_port = marlinesp.local
2424
#board_build.flash_mode = qio
2525

2626
[env:FYSETC_E4]

‎ini/lpc176x.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ lib_ldf_mode = off
2020
lib_compat_mode = strict
2121
extra_scripts = ${common.extra_scripts}
2222
Marlin/src/HAL/LPC1768/upload_extra_script.py
23-
src_filter = ${common.default_src_filter} +<src/HAL/LPC1768> +<src/HAL/shared/backtrace>
23+
build_src_filter = ${common.default_src_filter} +<src/HAL/LPC1768> +<src/HAL/shared/backtrace>
2424
lib_deps = ${common.lib_deps}
2525
Servo
2626
custom_marlin.USES_LIQUIDCRYSTAL = arduino-libraries/LiquidCrystal@~1.0.7

‎ini/native.ini

+11-11
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
# No supported Arduino libraries, base Marlin only
1414
#
1515
[env:linux_native]
16-
platform = native
17-
framework =
18-
build_flags = -D__PLAT_LINUX__ -std=gnu++17 -ggdb -g -lrt -lpthread -D__MARLIN_FIRMWARE__ -Wno-expansion-to-defined
19-
src_build_flags = -Wall -IMarlin/src/HAL/LINUX/include
20-
build_unflags = -Wall
21-
lib_ldf_mode = off
22-
lib_deps =
23-
src_filter = ${common.default_src_filter} +<src/HAL/LINUX>
16+
platform = native
17+
framework =
18+
build_flags = -D__PLAT_LINUX__ -std=gnu++17 -ggdb -g -lrt -lpthread -D__MARLIN_FIRMWARE__ -Wno-expansion-to-defined
19+
build_src_flags = -Wall -IMarlin/src/HAL/LINUX/include
20+
build_unflags = -Wall
21+
lib_ldf_mode = off
22+
lib_deps =
23+
build_src_filter = ${common.default_src_filter} +<src/HAL/LINUX>
2424

2525
#
2626
# Native Simulation
@@ -35,11 +35,11 @@ src_filter = ${common.default_src_filter} +<src/HAL/LINUX>
3535
platform = native
3636
framework =
3737
build_flags = ${common.build_flags} -std=gnu++17 -D__PLAT_NATIVE_SIM__ -DU8G_HAL_LINKS -I/usr/include/SDL2 -IMarlin -IMarlin/src/HAL/NATIVE_SIM/u8g
38-
src_build_flags = -Wall -Wno-expansion-to-defined -Wcast-align
38+
build_src_flags = -Wall -Wno-expansion-to-defined -Wcast-align
3939
release_flags = -g0 -O3 -flto
4040
debug_build_flags = -fstack-protector-strong -g -g3 -ggdb
4141
lib_compat_mode = off
42-
src_filter = ${common.default_src_filter} +<src/HAL/NATIVE_SIM>
42+
build_src_filter = ${common.default_src_filter} +<src/HAL/NATIVE_SIM>
4343
lib_deps = ${common.lib_deps}
4444
MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/0.0.2.zip
4545
Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/marlin_sim_native.zip
@@ -110,6 +110,6 @@ custom_gcc = g++
110110
#
111111
[env:simulator_windows]
112112
extends = simulator_common
113-
src_build_flags = ${simulator_common.src_build_flags} -fpermissive
113+
build_src_flags = ${simulator_common.build_src_flags} -fpermissive
114114
build_flags = ${simulator_common.build_flags} ${simulator_common.debug_build_flags} -IC:\\msys64\\mingw64\\include\\SDL2 -fno-stack-protector -Wl,-subsystem,windows -ldl -lmingw32 -lSDL2main -lSDL2 -lSDL2_net -lopengl32 -lssp
115115
build_type = debug

‎ini/samd51.ini

+10-10
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
# Adafruit Grand Central M4 (Atmel SAMD51P20A ARM Cortex-M4)
1414
#
1515
[env:SAMD51_grandcentral_m4]
16-
platform = atmelsam
17-
board = adafruit_grandcentral_m4
18-
build_flags = ${common.build_flags} -std=gnu++17
19-
build_unflags = -std=gnu++11
20-
src_filter = ${common.default_src_filter} +<src/HAL/SAMD51>
21-
lib_deps = ${common.lib_deps}
22-
SoftwareSerialM
23-
extra_scripts = ${common.extra_scripts}
24-
pre:buildroot/share/PlatformIO/scripts/SAMD51_grandcentral_m4.py
16+
platform = atmelsam
17+
board = adafruit_grandcentral_m4
18+
build_flags = ${common.build_flags} -std=gnu++17
19+
build_unflags = -std=gnu++11
20+
build_src_filter = ${common.default_src_filter} +<src/HAL/SAMD51>
21+
lib_deps = ${common.lib_deps}
22+
SoftwareSerialM
23+
extra_scripts = ${common.extra_scripts}
24+
pre:buildroot/share/PlatformIO/scripts/SAMD51_grandcentral_m4.py
2525
custom_marlin.SDSUPPORT = SdFat - Adafruit Fork, Adafruit SPIFlash
26-
debug_tool = jlink
26+
debug_tool = jlink

‎ini/stm32-common.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ build_flags = ${common.build_flags}
1818
-DTIM_IRQ_PRIO=13
1919
-DADC_RESOLUTION=12
2020
build_unflags = -std=gnu++11
21-
src_filter = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/shared/backtrace>
21+
build_src_filter = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/shared/backtrace>
2222
extra_scripts = ${common.extra_scripts}
2323
pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
2424

‎ini/stm32f0.ini

+6-6
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ build_flags = ${common_stm32.build_flags}
4343
# Malyan M300 (STM32F070CB)
4444
#
4545
[env:malyan_M300]
46-
extends = common_stm32
47-
board = malyanm300_f070cb
48-
build_flags = ${common_stm32.build_flags}
49-
-DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB
50-
-DHAL_UART_MODULE_ENABLED
51-
src_filter = ${common.default_src_filter} +<src/HAL/STM32>
46+
extends = common_stm32
47+
board = malyanm300_f070cb
48+
build_flags = ${common_stm32.build_flags}
49+
-DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB
50+
-DHAL_UART_MODULE_ENABLED
51+
build_src_filter = ${common.default_src_filter} +<src/HAL/STM32>

‎ini/stm32f1-maple.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ board_build.core = maple
2828
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
2929
${common.build_flags} -DARDUINO_ARCH_STM32 -DMAPLE_STM32F1
3030
build_unflags = -std=gnu11 -std=gnu++11
31-
src_filter = ${common.default_src_filter} +<src/HAL/STM32F1>
31+
build_src_filter = ${common.default_src_filter} +<src/HAL/STM32F1>
3232
lib_ignore = SPI, FreeRTOS701, FreeRTOS821
3333
lib_deps = ${common.lib_deps}
3434
SoftwareSerialM

‎ini/stm32f1.ini

+6-6
Original file line numberDiff line numberDiff line change
@@ -249,12 +249,12 @@ build_unflags = ${stm32_variant.build_unflags}
249249
# Malyan M200 (STM32F103CB)
250250
#
251251
[env:STM32F103CB_malyan]
252-
extends = common_stm32
253-
board = malyanm200_f103cb
254-
build_flags = ${common_stm32.build_flags}
255-
-DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB
256-
-DHAL_UART_MODULE_ENABLED
257-
src_filter = ${common.default_src_filter} +<src/HAL/STM32>
252+
extends = common_stm32
253+
board = malyanm200_f103cb
254+
build_flags = ${common_stm32.build_flags}
255+
-DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB
256+
-DHAL_UART_MODULE_ENABLED
257+
build_src_filter = ${common.default_src_filter} +<src/HAL/STM32>
258258

259259
#
260260
# FLYmaker FLY Mini (STM32F103RCT6)

‎ini/teensy.ini

+16-16
Original file line numberDiff line numberDiff line change
@@ -45,36 +45,36 @@ board = teensy2pp
4545
# Teensy 3.x - 4.x
4646
#
4747
[teensy_arm]
48-
platform = teensy@~4.12.0
49-
src_filter = ${common.default_src_filter}
50-
lib_ignore = NativeEthernet
48+
platform = teensy@~4.12.0
49+
build_src_filter = ${common.default_src_filter}
50+
lib_ignore = NativeEthernet
5151

5252
#
5353
# Teensy 3.1 / 3.2 (ARM Cortex-M4)
5454
#
5555
[env:teensy31]
56-
extends = teensy_arm
57-
board = teensy31
58-
src_filter = ${teensy_arm.src_filter} +<src/HAL/TEENSY31_32>
56+
extends = teensy_arm
57+
board = teensy31
58+
build_src_filter = ${teensy_arm.build_src_filter} +<src/HAL/TEENSY31_32>
5959

6060
#
6161
# Teensy 3.5 / 3.6 (ARM Cortex-M4)
6262
#
6363
[env:teensy35]
64-
extends = teensy_arm
65-
board = teensy35
66-
src_filter = ${teensy_arm.src_filter} +<src/HAL/TEENSY35_36>
64+
extends = teensy_arm
65+
board = teensy35
66+
build_src_filter = ${teensy_arm.build_src_filter} +<src/HAL/TEENSY35_36>
6767

6868
[env:teensy36]
69-
extends = teensy_arm
70-
board = teensy36
71-
src_filter = ${teensy_arm.src_filter} +<src/HAL/TEENSY35_36>
69+
extends = teensy_arm
70+
board = teensy36
71+
build_src_filter = ${teensy_arm.build_src_filter} +<src/HAL/TEENSY35_36>
7272

7373
#
7474
# Teensy 4.0 / 4.1 (ARM Cortex-M7)
7575
#
7676
[env:teensy41]
77-
extends = teensy_arm
78-
board = teensy41
79-
src_filter = ${teensy_arm.src_filter} +<src/HAL/TEENSY40_41>
80-
lib_ignore =
77+
extends = teensy_arm
78+
board = teensy41
79+
build_src_filter = ${teensy_arm.build_src_filter} +<src/HAL/TEENSY40_41>
80+
lib_ignore =

‎platformio.ini

+4-4
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ monitor_flags =
281281
# Just print the dependency tree
282282
#
283283
[env:include_tree]
284-
platform = atmelavr
285-
board = megaatmega2560
286-
build_flags = -c -H -std=gnu++11 -Wall -Os -D__MARLIN_FIRMWARE__
287-
src_filter = +<src/MarlinCore.cpp>
284+
platform = atmelavr
285+
board = megaatmega2560
286+
build_flags = -c -H -std=gnu++11 -Wall -Os -D__MARLIN_FIRMWARE__
287+
build_src_filter = +<src/MarlinCore.cpp>

0 commit comments

Comments
 (0)