Procházet zdrojové kódy

🔨 Require PIO >= 6.0.1 (#24205)

ellensp před 2 roky
rodič
revize
6a880280e4
No account linked to committer's email address

+ 3
- 3
buildroot/share/PlatformIO/scripts/common-dependencies.py Zobrazit soubor

@@ -15,7 +15,7 @@ if pioutil.is_pio_build():
15 15
 	FEATURE_CONFIG = {}
16 16
 
17 17
 	def validate_pio():
18
-		PIO_VERSION_MIN = (5, 0, 3)
18
+		PIO_VERSION_MIN = (6, 0, 1)
19 19
 		try:
20 20
 			from platformio import VERSION as PIO_VERSION
21 21
 			weights = (1000, 100, 1)
@@ -174,7 +174,7 @@ if pioutil.is_pio_build():
174 174
 				env.SConscript(feat['extra_scripts'], exports="env")
175 175
 
176 176
 			if 'src_filter' in feat:
177
-				blab("========== Adding src_filter for %s... " % feature, 2)
177
+				blab("========== Adding build_src_filter for %s... " % feature, 2)
178 178
 				src_filter = ' '.join(env.GetProjectOption('src_filter'))
179 179
 				# first we need to remove the references to the same folder
180 180
 				my_srcs = re.findall(r'[+-](<.*?>)', feat['src_filter'])
@@ -184,7 +184,7 @@ if pioutil.is_pio_build():
184 184
 						src_filter = re.sub(r'[+-]' + d, '', src_filter)
185 185
 
186 186
 				src_filter = feat['src_filter'] + ' ' + src_filter
187
-				set_env_field('src_filter', [src_filter])
187
+				set_env_field('build_src_filter', [src_filter])
188 188
 				env.Replace(SRC_FILTER=src_filter)
189 189
 
190 190
 			if 'lib_ignore' in feat:

+ 1
- 1
ini/avr.ini Zobrazit soubor

@@ -16,7 +16,7 @@
16 16
 platform          = atmelavr@~3.4
17 17
 build_flags       = ${common.build_flags} -Wl,--relax
18 18
 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>
20 20
 
21 21
 #
22 22
 # ATmega2560

+ 3
- 3
ini/due.ini Zobrazit soubor

@@ -16,9 +16,9 @@
16 16
 #  - RADDS
17 17
 #
18 18
 [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>
22 22
 
23 23
 [env:DUE_USB]
24 24
 extends  = env:DUE

+ 8
- 8
ini/esp32.ini Zobrazit soubor

@@ -13,14 +13,14 @@
13 13
 # Espressif ESP32
14 14
 #
15 15
 [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
24 24
 #board_build.flash_mode = qio
25 25
 
26 26
 [env:FYSETC_E4]

+ 1
- 1
ini/lpc176x.ini Zobrazit soubor

@@ -20,7 +20,7 @@ lib_ldf_mode      = off
20 20
 lib_compat_mode   = strict
21 21
 extra_scripts     = ${common.extra_scripts}
22 22
   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>
24 24
 lib_deps          = ${common.lib_deps}
25 25
   Servo
26 26
 custom_marlin.USES_LIQUIDCRYSTAL =  arduino-libraries/LiquidCrystal@~1.0.7

+ 11
- 11
ini/native.ini Zobrazit soubor

@@ -13,14 +13,14 @@
13 13
 # No supported Arduino libraries, base Marlin only
14 14
 #
15 15
 [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>
24 24
 
25 25
 #
26 26
 # Native Simulation
@@ -35,11 +35,11 @@ src_filter      = ${common.default_src_filter} +<src/HAL/LINUX>
35 35
 platform          = native
36 36
 framework         =
37 37
 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
39 39
 release_flags     = -g0 -O3 -flto
40 40
 debug_build_flags = -fstack-protector-strong -g -g3 -ggdb
41 41
 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>
43 43
 lib_deps          = ${common.lib_deps}
44 44
   MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/0.0.2.zip
45 45
   Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/marlin_sim_native.zip
@@ -110,6 +110,6 @@ custom_gcc      = g++
110 110
 #
111 111
 [env:simulator_windows]
112 112
 extends     = simulator_common
113
-src_build_flags = ${simulator_common.src_build_flags} -fpermissive
113
+build_src_flags = ${simulator_common.build_src_flags} -fpermissive
114 114
 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
115 115
 build_type = debug

+ 10
- 10
ini/samd51.ini Zobrazit soubor

@@ -13,14 +13,14 @@
13 13
 # Adafruit Grand Central M4 (Atmel SAMD51P20A ARM Cortex-M4)
14 14
 #
15 15
 [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
25 25
 custom_marlin.SDSUPPORT = SdFat - Adafruit Fork, Adafruit SPIFlash
26
-debug_tool     = jlink
26
+debug_tool       = jlink

+ 1
- 1
ini/stm32-common.ini Zobrazit soubor

@@ -18,7 +18,7 @@ build_flags      = ${common.build_flags}
18 18
                    -DTIM_IRQ_PRIO=13
19 19
                    -DADC_RESOLUTION=12
20 20
 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>
22 22
 extra_scripts    = ${common.extra_scripts}
23 23
                    pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
24 24
 

+ 6
- 6
ini/stm32f0.ini Zobrazit soubor

@@ -43,9 +43,9 @@ build_flags = ${common_stm32.build_flags}
43 43
 # Malyan M300 (STM32F070CB)
44 44
 #
45 45
 [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>

+ 1
- 1
ini/stm32f1-maple.ini Zobrazit soubor

@@ -28,7 +28,7 @@ board_build.core  = maple
28 28
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
29 29
   ${common.build_flags} -DARDUINO_ARCH_STM32 -DMAPLE_STM32F1
30 30
 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>
32 32
 lib_ignore        = SPI, FreeRTOS701, FreeRTOS821
33 33
 lib_deps          = ${common.lib_deps}
34 34
   SoftwareSerialM

+ 6
- 6
ini/stm32f1.ini Zobrazit soubor

@@ -249,12 +249,12 @@ build_unflags        = ${stm32_variant.build_unflags}
249 249
 # Malyan M200 (STM32F103CB)
250 250
 #
251 251
 [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>
258 258
 
259 259
 #
260 260
 # FLYmaker FLY Mini (STM32F103RCT6)

+ 16
- 16
ini/teensy.ini Zobrazit soubor

@@ -45,36 +45,36 @@ board   = teensy2pp
45 45
 # Teensy 3.x - 4.x
46 46
 #
47 47
 [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
51 51
 
52 52
 #
53 53
 # Teensy 3.1 / 3.2 (ARM Cortex-M4)
54 54
 #
55 55
 [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>
59 59
 
60 60
 #
61 61
 # Teensy 3.5 / 3.6 (ARM Cortex-M4)
62 62
 #
63 63
 [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>
67 67
 
68 68
 [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>
72 72
 
73 73
 #
74 74
 # Teensy 4.0 / 4.1 (ARM Cortex-M7)
75 75
 #
76 76
 [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       =

+ 4
- 4
platformio.ini Zobrazit soubor

@@ -281,7 +281,7 @@ monitor_flags =
281 281
 # Just print the dependency tree
282 282
 #
283 283
 [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>

Loading…
Zrušit
Uložit