Skip to content

Commit a5051f7

Browse files
thinkyheadthinkyhead
committed
🔨 PlatformIO 6 compatibility
1 parent 5b7b065 commit a5051f7

File tree

14 files changed

+271
-276
lines changed

14 files changed

+271
-276
lines changed

‎Marlin/Configuration_adv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2361,7 +2361,7 @@
23612361
* TMC26X Stepper Driver options
23622362
*
23632363
* The TMC26XStepper library is required for this stepper driver.
2364-
* https://github.com/trinamic/TMC26XStepper
2364+
* https://github.com/MarlinFirmware/TMC26XStepper
23652365
*/
23662366
#if HAS_DRIVER(TMC26X)
23672367

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def add_to_feat_cnf(feature, flines):
6363
for line in atoms:
6464
parts = line.split('=')
6565
name = parts.pop(0)
66-
if name in ['build_flags', 'extra_scripts', 'src_filter', 'lib_ignore']:
66+
if name in ['build_flags', 'extra_scripts', 'build_src_filter', 'lib_ignore']:
6767
feat[name] = '='.join(parts)
6868
blab("[%s] %s=%s" % (feature, name, feat[name]), 3)
6969
else:
@@ -176,19 +176,19 @@ def apply_features_config():
176176
blab("Running extra_scripts for %s... " % feature, 2)
177177
env.SConscript(feat['extra_scripts'], exports="env")
178178

179-
if 'src_filter' in feat:
180-
blab("========== Adding src_filter for %s... " % feature, 2)
181-
src_filter = ' '.join(env.GetProjectOption('src_filter'))
179+
if 'build_src_filter' in feat:
180+
blab("========== Adding build_src_filter for %s... " % feature, 2)
181+
build_src_filter = ' '.join(env.GetProjectOption('build_src_filter'))
182182
# first we need to remove the references to the same folder
183-
my_srcs = re.findall(r'[+-](<.*?>)', feat['src_filter'])
184-
cur_srcs = re.findall(r'[+-](<.*?>)', src_filter)
183+
my_srcs = re.findall(r'[+-](<.*?>)', feat['build_src_filter'])
184+
cur_srcs = re.findall(r'[+-](<.*?>)', build_src_filter)
185185
for d in my_srcs:
186186
if d in cur_srcs:
187-
src_filter = re.sub(r'[+-]' + d, '', src_filter)
187+
build_src_filter = re.sub(r'[+-]' + d, '', build_src_filter)
188188

189-
src_filter = feat['src_filter'] + ' ' + src_filter
190-
set_env_field('src_filter', [src_filter])
191-
env.Replace(SRC_FILTER=src_filter)
189+
build_src_filter = feat['build_src_filter'] + ' ' + build_src_filter
190+
set_env_field('build_src_filter', [build_src_filter])
191+
env.Replace(SRC_FILTER=build_src_filter)
192192

193193
if 'lib_ignore' in feat:
194194
blab("========== Adding lib_ignore for %s... " % feature, 2)

‎buildroot/share/PlatformIO/scripts/marlin.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ def copytree(src, dst, symlinks=False, ignore=None):
1717
shutil.copy2(s, d)
1818

1919
def replace_define(field, value):
20-
for define in env['CPPDEFINES']:
20+
envdefs = env['CPPDEFINES'].copy()
21+
for define in envdefs:
2122
if define[0] == field:
2223
env['CPPDEFINES'].remove(define)
2324
env['CPPDEFINES'].append((field, value))

‎ini/avr.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
[common_avr8]
1616
build_flags = ${common.build_flags} -Wl,--relax
1717
board_build.f_cpu = 16000000L
18-
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
18+
build_src_filter = ${common.default_src_filter} +<src/HAL/AVR>
1919

2020
#
2121
# ATmega2560

‎ini/due.ini

Lines changed: 3 additions & 3 deletions
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
platform = atmelsam

‎ini/esp32.ini

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
# Espressif ESP32
1414
#
1515
[env:esp32]
16-
platform = [email protected]
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 = [email protected]
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/features.ini

Lines changed: 191 additions & 191 deletions
Large diffs are not rendered by default.

‎ini/lpc176x.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ 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
26-
custom_marlin.USES_LIQUIDCRYSTAL = arduino-libraries/LiquidCrystal@~1.0.7
26+
custom_marlin.USES_LIQUIDCRYSTAL = arduino-libraries/LiquidCrystal@~1.0.7
2727
custom_marlin.NEOPIXEL_LED = Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/1.5.0.zip
2828
build_flags = ${common.build_flags} -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC1768/include -IMarlin/src/HAL/LPC1768/u8g
2929
# debug options for backtrace

‎ini/native.ini

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
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+
src_build_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>

‎ini/samd51.ini

Lines changed: 8 additions & 8 deletions
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}
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}
2222
SoftwareSerialM
23-
extra_scripts = ${common.extra_scripts}
23+
extra_scripts = ${common.extra_scripts}
2424
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

0 commit comments

Comments
 (0)