Sfoglia il codice sorgente

Apply PIO-supported custom_option for deps (#18935)

Victor Oliveira 4 anni fa
parent
commit
c3fdc7f81e
Nessun account collegato all'indirizzo email del committer

+ 2
- 2
buildroot/share/PlatformIO/scripts/common-dependencies.py Vedi File

37
 			FEATURE_CONFIG[feature] = { 'lib_deps': [] }
37
 			FEATURE_CONFIG[feature] = { 'lib_deps': [] }
38
 		add_to_feat_cnf(feature, key[1])
38
 		add_to_feat_cnf(feature, key[1])
39
 
39
 
40
-	# Add options matching marlin.MY_OPTION to the pile
40
+	# Add options matching custom_marlin.MY_OPTION to the pile
41
 	all_opts = env.GetProjectOptions()
41
 	all_opts = env.GetProjectOptions()
42
 	for n in all_opts:
42
 	for n in all_opts:
43
-		mat = re.match(r'marlin\.(.+)', n[0])
43
+		mat = re.match(r'custom_marlin\.(.+)', n[0])
44
 		if mat:
44
 		if mat:
45
 			try:
45
 			try:
46
 				val = env.GetProjectOption(n[0])
46
 				val = env.GetProjectOption(n[0])

+ 4
- 4
platformio.ini Vedi File

594
 lib_deps       = ${common.lib_deps}
594
 lib_deps       = ${common.lib_deps}
595
   SoftwareSerialM
595
   SoftwareSerialM
596
   Adafruit SPIFlash
596
   Adafruit SPIFlash
597
-marlin.SDSUPPORT = SdFat - Adafruit Fork
597
+custom_marlin.SDSUPPORT = SdFat - Adafruit Fork
598
 debug_tool     = jlink
598
 debug_tool     = jlink
599
 
599
 
600
 #################################
600
 #################################
616
 src_filter        = ${common.default_src_filter} +<src/HAL/LPC1768>
616
 src_filter        = ${common.default_src_filter} +<src/HAL/LPC1768>
617
 lib_deps          = ${common.lib_deps}
617
 lib_deps          = ${common.lib_deps}
618
   Servo
618
   Servo
619
-marlin.USES_LIQUIDCRYSTAL = LiquidCrystal@1.0.0
620
-marlin.NEOPIXEL_LED = Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/1.5.0.zip
619
+custom_marlin.USES_LIQUIDCRYSTAL = LiquidCrystal@1.0.0
620
+custom_marlin.NEOPIXEL_LED = Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/1.5.0.zip
621
 build_flags       = ${common.build_flags} -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC1768/include -IMarlin/src/HAL/LPC1768/u8g
621
 build_flags       = ${common.build_flags} -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC1768/include -IMarlin/src/HAL/LPC1768/u8g
622
   # debug options for backtrace
622
   # debug options for backtrace
623
   #-funwind-tables
623
   #-funwind-tables
702
 lib_deps          = ${common.lib_deps}
702
 lib_deps          = ${common.lib_deps}
703
   SoftwareSerialM
703
   SoftwareSerialM
704
   USBComposite for STM32F1@0.91
704
   USBComposite for STM32F1@0.91
705
-marlin.NEOPIXEL_LED = Adafruit NeoPixel=https://github.com/ccccmagicboy/Adafruit_NeoPixel#meeb_3dp_use
705
+custom_marlin.NEOPIXEL_LED = Adafruit NeoPixel=https://github.com/ccccmagicboy/Adafruit_NeoPixel#meeb_3dp_use
706
 debug_tool        = stlink
706
 debug_tool        = stlink
707
 upload_protocol   = dfu
707
 upload_protocol   = dfu
708
 
708
 

Loading…
Annulla
Salva