feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Fix using $UPLOAD_PROTOCOL env variable

Browse Source
This commit is contained in:
Ivan Kravets
2015-09-10 16:56:33 +03:00
parent 61ef27c345
commit d4f4d9c789
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platformio/builder/scripts/ststm32.py
View File

@ -15,7 +15,7 @@ env = DefaultEnvironment()
SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "basearm.py"))) SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "basearm.py")))
if env.get("UPLOAD_PROTOCOL") == "gdb": if env.subst("$UPLOAD_PROTOCOL") == "gdb":
if not isfile(join(env.subst("$PROJECT_DIR"), "upload.gdb")): if not isfile(join(env.subst("$PROJECT_DIR"), "upload.gdb")):
Exit( Exit(
"You are using GDB as firmware uploader. " "You are using GDB as firmware uploader. "
@ -90,7 +90,7 @@ AlwaysBuild(target_size)
disable_msd = ( disable_msd = (
(platform.system() == "Darwin" and platform.release().startswith("14.")) or (platform.system() == "Darwin" and platform.release().startswith("14.")) or
"UPLOAD_PROTOCOL" in env) env.subst("$UPLOAD_PROTOCOL"))
if "mbed" in env.subst("$FRAMEWORK") and not disable_msd: if "mbed" in env.subst("$FRAMEWORK") and not disable_msd:
upload = env.Alias(["upload", "uploadlazy"], upload = env.Alias(["upload", "uploadlazy"],
target_firm, env.UploadToDisk) target_firm, env.UploadToDisk)