Browse Source

Apply PIO-supported custom_option for deps (#18935)

Victor Oliveira 3 years ago
parent
commit
c3fdc7f81e
No account linked to committer's email address
2 changed files with 6 additions and 6 deletions
  1. 2
    2
      buildroot/share/PlatformIO/scripts/common-dependencies.py
  2. 4
    4
      platformio.ini

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

@@ -37,10 +37,10 @@ def load_config():
37 37
 			FEATURE_CONFIG[feature] = { 'lib_deps': [] }
38 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 41
 	all_opts = env.GetProjectOptions()
42 42
 	for n in all_opts:
43
-		mat = re.match(r'marlin\.(.+)', n[0])
43
+		mat = re.match(r'custom_marlin\.(.+)', n[0])
44 44
 		if mat:
45 45
 			try:
46 46
 				val = env.GetProjectOption(n[0])

+ 4
- 4
platformio.ini View File

@@ -594,7 +594,7 @@ src_filter     = ${common.default_src_filter} +<src/HAL/SAMD51>
594 594
 lib_deps       = ${common.lib_deps}
595 595
   SoftwareSerialM
596 596
   Adafruit SPIFlash
597
-marlin.SDSUPPORT = SdFat - Adafruit Fork
597
+custom_marlin.SDSUPPORT = SdFat - Adafruit Fork
598 598
 debug_tool     = jlink
599 599
 
600 600
 #################################
@@ -616,8 +616,8 @@ extra_scripts     = ${common.extra_scripts}
616 616
 src_filter        = ${common.default_src_filter} +<src/HAL/LPC1768>
617 617
 lib_deps          = ${common.lib_deps}
618 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 621
 build_flags       = ${common.build_flags} -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC1768/include -IMarlin/src/HAL/LPC1768/u8g
622 622
   # debug options for backtrace
623 623
   #-funwind-tables
@@ -702,7 +702,7 @@ extra_scripts     = ${common.extra_scripts}
702 702
 lib_deps          = ${common.lib_deps}
703 703
   SoftwareSerialM
704 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 706
 debug_tool        = stlink
707 707
 upload_protocol   = dfu
708 708
 

Loading…
Cancel
Save