Merge branch 'release/v1.3.1'
This commit is contained in:
commit
a6b972edd4
|
@ -41,10 +41,6 @@ FRAMEWORK_DIR = join(platform.get_package_dir(
|
||||||
FRAMEWORK_VERSION = platform.get_package_version("framework-arduinoststm32")
|
FRAMEWORK_VERSION = platform.get_package_version("framework-arduinoststm32")
|
||||||
assert isdir(FRAMEWORK_DIR)
|
assert isdir(FRAMEWORK_DIR)
|
||||||
|
|
||||||
env.Replace(
|
|
||||||
LIBS=["m", "gcc"]
|
|
||||||
)
|
|
||||||
|
|
||||||
env.Append(
|
env.Append(
|
||||||
CCFLAGS=[
|
CCFLAGS=[
|
||||||
"--param", "max-inline-insns-single=500",
|
"--param", "max-inline-insns-single=500",
|
||||||
|
@ -72,7 +68,9 @@ env.Append(
|
||||||
LIBPATH=[
|
LIBPATH=[
|
||||||
join(FRAMEWORK_DIR, "variants",
|
join(FRAMEWORK_DIR, "variants",
|
||||||
board.get("build.variant"), "ld")
|
board.get("build.variant"), "ld")
|
||||||
]
|
],
|
||||||
|
|
||||||
|
LIBS=["c"]
|
||||||
)
|
)
|
||||||
|
|
||||||
for item in ("-nostartfiles", "-nostdlib"):
|
for item in ("-nostartfiles", "-nostdlib"):
|
||||||
|
|
|
@ -137,10 +137,11 @@ if env.subst("$UPLOAD_PROTOCOL") == "gdb":
|
||||||
UPLOADCMD='$UPLOADER $UPLOADERFLAGS'
|
UPLOADCMD='$UPLOADER $UPLOADERFLAGS'
|
||||||
)
|
)
|
||||||
|
|
||||||
if "arduino" in env.subst("$PIOFRAMEWORK"):
|
elif env.subst("$UPLOAD_PROTOCOL") in ("serial", "dfu") \
|
||||||
|
and "arduino" in env.subst("$PIOFRAMEWORK"):
|
||||||
_upload_tool = "serial_upload"
|
_upload_tool = "serial_upload"
|
||||||
_upload_flags = ["{upload.altID}", "{upload.usbID}"]
|
_upload_flags = ["{upload.altID}", "{upload.usbID}"]
|
||||||
if "dfu" in env.subst("$UPLOAD_PROTOCOL"):
|
if env.subst("$UPLOAD_PROTOCOL") == "dfu":
|
||||||
_upload_tool = "maple_upload"
|
_upload_tool = "maple_upload"
|
||||||
_usbids = env.BoardConfig().get("build.hwids")
|
_usbids = env.BoardConfig().get("build.hwids")
|
||||||
_upload_flags = [env.BoardConfig().get("upload.boot_version", 2),
|
_upload_flags = [env.BoardConfig().get("upload.boot_version", 2),
|
||||||
|
@ -164,7 +165,7 @@ else:
|
||||||
target_firm = env.ElfToBin(join("$BUILD_DIR", "firmware"), target_elf)
|
target_firm = env.ElfToBin(join("$BUILD_DIR", "firmware"), target_elf)
|
||||||
|
|
||||||
AlwaysBuild(env.Alias("nobuild", target_firm))
|
AlwaysBuild(env.Alias("nobuild", target_firm))
|
||||||
target_buildprog = env.Alias("buildprog", target_firm)
|
target_buildprog = env.Alias("buildprog", target_firm, target_firm)
|
||||||
|
|
||||||
#
|
#
|
||||||
# Target: Print binary size
|
# Target: Print binary size
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/platformio/platform-ststm32.git"
|
"url": "https://github.com/platformio/platform-ststm32.git"
|
||||||
},
|
},
|
||||||
"version": "1.3.0",
|
"version": "1.3.1",
|
||||||
"packageRepositories": [
|
"packageRepositories": [
|
||||||
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
|
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
|
||||||
"https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
|
"https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
|
||||||
|
|
Loading…
Reference in New Issue