Skip to content

Commit fdbcef8

Browse files
thinkyheadthinkyhead
committed
Updated PIO
1 parent 4273ff7 commit fdbcef8

File tree

13 files changed

+58
-58
lines changed

13 files changed

+58
-58
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ def apply_features_config():
175175

176176
if 'src_filter' in feat:
177177
blab("========== Adding src_filter for %s... " % feature, 2)
178-
src_filter = ' '.join(env.GetProjectOption('src_filter'))
178+
src_filter = ' '.join(env.GetProjectOption('build_src_filter'))
179179
# first we need to remove the references to the same folder
180180
my_srcs = re.findall(r'[+-](<.*?>)', feat['src_filter'])
181181
cur_srcs = re.findall(r'[+-](<.*?>)', 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‎

Lines changed: 1 addition & 1 deletion
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‎

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
extends = env:DUE

‎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/lpc176x.ini‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 11 additions & 11 deletions
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
@@ -107,6 +107,6 @@ build_unflags = ${simulator_macos.build_unflags}
107107
#
108108
[env:simulator_windows]
109109
extends = simulator_common
110-
src_build_flags = ${simulator_common.src_build_flags} -fpermissive
110+
build_src_flags = ${simulator_common.build_src_flags} -fpermissive
111111
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
112112
build_type = debug

‎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

‎ini/stm32-common.ini‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ board = malyanm300_f070cb
4848
build_flags = ${common_stm32.build_flags}
4949
-DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB
5050
-DHAL_UART_MODULE_ENABLED
51-
src_filter = ${common.default_src_filter} +<src/HAL/STM32>
51+
build_src_filter = ${common.default_src_filter} +<src/HAL/STM32>

‎ini/stm32f1-maple.ini‎

Lines changed: 1 addition & 1 deletion
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

0 commit comments

Comments
 (0)