Skip to content

Commit 8a7c834

Browse files
author
TBArchives
authored
Merge pull request #3 from TBArchives/Update_Platformio.ini
Update platformio scripts
2 parents 283e0b4 + 3b774c0 commit 8a7c834

File tree

10 files changed

+491
-491
lines changed

10 files changed

+491
-491
lines changed

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

+10-10
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(BUILD_SRC_FILTER=build_src_filter)
192192

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

‎ini/due.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
[env:DUE]
1919
platform = atmelsam
2020
board = due
21-
src_filter = ${common.default_src_filter} +<src/HAL/DUE> +<src/HAL/shared/backtrace>
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
platform = [email protected]
1717
board = esp32dev
1818
build_flags = ${common.build_flags} -DCORE_DEBUG_LEVEL=0
19-
src_filter = ${common.default_src_filter} +<src/HAL/ESP32>
19+
build_src_filter = ${common.default_src_filter} +<src/HAL/ESP32>
2020
lib_ignore = NativeEthernet
2121
upload_speed = 500000
2222
monitor_speed = 250000

‎ini/features.ini

+195-195
Large diffs are not rendered by default.

‎ini/native.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
platform = native
1717
framework =
1818
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
19+
build_src_flags = -Wall -IMarlin/src/HAL/LINUX/include
2020
build_unflags = -Wall
2121
lib_ldf_mode = off
2222
lib_deps =
23-
src_filter = ${common.default_src_filter} +<src/HAL/LINUX>
23+
build_src_filter = ${common.default_src_filter} +<src/HAL/LINUX>
2424

2525
#
2626
# Native Simulation
@@ -125,6 +125,6 @@ build_unflags = ${simulator_macos.build_unflags}
125125
[env:simulator_windows]
126126
platform = ${simulator_common.platform}
127127
extends = simulator_common
128-
src_build_flags = ${simulator_common.src_build_flags} -fpermissive
128+
build_src_flags = ${simulator_common.src_build_flags} -fpermissive
129129
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
130130
build_type = debug

‎ini/samd51.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ platform = atmelsam
1717
board = adafruit_grandcentral_m4
1818
build_flags = ${common.build_flags} -std=gnu++17
1919
build_unflags = -std=gnu++11
20-
src_filter = ${common.default_src_filter} +<src/HAL/SAMD51>
20+
build_src_filter = ${common.default_src_filter} +<src/HAL/SAMD51>
2121
lib_deps = ${common.lib_deps}
2222
SoftwareSerialM
2323
extra_scripts = ${common.extra_scripts}

‎ini/stm32f0.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ board = malyanm300_f070cb
5151
build_flags = ${common_stm32.build_flags}
5252
-DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB
5353
-DHAL_UART_MODULE_ENABLED
54-
src_filter = ${common.default_src_filter} +<src/HAL/STM32>
54+
build_src_filter = ${common.default_src_filter} +<src/HAL/STM32>

‎ini/stm32f1.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ board = malyanm200_f103cb
223223
build_flags = ${common_stm32.build_flags}
224224
-DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB
225225
-DHAL_UART_MODULE_ENABLED
226-
src_filter = ${common.default_src_filter} +<src/HAL/STM32>
226+
build_src_filter = ${common.default_src_filter} +<src/HAL/STM32>
227227

228228
#
229229
# FLYmaker FLY Mini (STM32F103RCT6)

‎ini/teensy.ini

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ lib_ignore = ${env:common_avr8.lib_ignore}, NativeEthernet
2424
[env:teensy31]
2525
platform = teensy@~4.12.0
2626
board = teensy31
27-
src_filter = ${common.default_src_filter} +<src/HAL/TEENSY31_32>
27+
build_src_filter = ${common.default_src_filter} +<src/HAL/TEENSY31_32>
2828
lib_ignore = NativeEthernet
2929

3030
#
@@ -33,13 +33,13 @@ lib_ignore = NativeEthernet
3333
[env:teensy35]
3434
platform = teensy@~4.12.0
3535
board = teensy35
36-
src_filter = ${common.default_src_filter} +<src/HAL/TEENSY35_36>
36+
build_src_filter = ${common.default_src_filter} +<src/HAL/TEENSY35_36>
3737
lib_ignore = NativeEthernet
3838

3939
[env:teensy36]
4040
platform = teensy@~4.12.0
4141
board = teensy36
42-
src_filter = ${common.default_src_filter} +<src/HAL/TEENSY35_36>
42+
build_src_filter = ${common.default_src_filter} +<src/HAL/TEENSY35_36>
4343
lib_ignore = NativeEthernet
4444

4545
#
@@ -48,4 +48,4 @@ lib_ignore = NativeEthernet
4848
[env:teensy41]
4949
platform = teensy@~4.12.0
5050
board = teensy41
51-
src_filter = ${common.default_src_filter} +<src/HAL/TEENSY40_41>
51+
build_src_filter = ${common.default_src_filter} +<src/HAL/TEENSY40_41>

0 commit comments

Comments
 (0)