mirror of
https://github.com/MarlinFirmware/Marlin.git
synced 2025-07-11 00:37:48 -06:00
🔨 Simplify generic variants, update DFU tool (#27502)
This commit is contained in:
parent
7b104a108f
commit
08717d3f60
26 changed files with 110 additions and 100 deletions
|
@ -3,28 +3,41 @@
|
|||
#
|
||||
import pioutil
|
||||
if pioutil.is_pio_build():
|
||||
import shutil, marlin
|
||||
from pathlib import Path
|
||||
env = pioutil.env
|
||||
platform = env.PioPlatform()
|
||||
board = env.BoardConfig()
|
||||
|
||||
FRAMEWORK_DIR = Path(platform.get_package_dir("framework-arduinoststm32-maple"))
|
||||
assert FRAMEWORK_DIR.is_dir()
|
||||
|
||||
source_root = Path("buildroot/share/PlatformIO/variants")
|
||||
source_root_str = "buildroot/share/PlatformIO/variants"
|
||||
source_root = Path(source_root_str)
|
||||
assert source_root.is_dir()
|
||||
|
||||
env = pioutil.env
|
||||
board = env.BoardConfig()
|
||||
variant = board.get("build.variant")
|
||||
variant_dir = FRAMEWORK_DIR / "STM32F1/variants" / variant
|
||||
|
||||
source_dir = source_root / variant
|
||||
assert source_dir.is_dir()
|
||||
|
||||
if variant_dir.is_dir():
|
||||
shutil.rmtree(variant_dir)
|
||||
if True:
|
||||
# Copying to the platform folder is still needed by STM32F1 (Maple).
|
||||
# The alternative code below comes close. See if you can solve it!
|
||||
platform = env.PioPlatform()
|
||||
FRAMEWORK_DIR = Path(platform.get_package_dir("framework-arduinoststm32-maple"))
|
||||
assert FRAMEWORK_DIR.is_dir()
|
||||
|
||||
if not variant_dir.is_dir():
|
||||
variant_dir.mkdir()
|
||||
variant_dir = FRAMEWORK_DIR / "STM32F1/variants" / variant
|
||||
|
||||
marlin.copytree(source_dir, variant_dir)
|
||||
if variant_dir.is_dir():
|
||||
import shutil
|
||||
shutil.rmtree(variant_dir)
|
||||
|
||||
if not variant_dir.is_dir():
|
||||
variant_dir.mkdir()
|
||||
|
||||
import marlin
|
||||
marlin.copytree(source_dir, variant_dir)
|
||||
|
||||
else:
|
||||
|
||||
# The following almost works, but __start__ (from wirish/start.S) is not seen by common.inc
|
||||
board.update("build.variants_dir", source_root_str);
|
||||
src = str(source_dir)
|
||||
env.Append(BUILD_FLAGS=[f"-I{src}", f"-L{src}/ld"]) # Add include path for variant
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue