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

Don't check OS type for ARM mbed-enabled boards and ST STM32 development platform before uploading to disk

Browse Source
This commit is contained in:
Ivan Kravets
2016-03-29 20:47:12 +03:00
parent b67acfec9c
commit bc3d8d26d0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY.rst
View File

@ -7,6 +7,9 @@ PlatformIO 2.0
2.8.7 (2016-??-??) 2.8.7 (2016-??-??)
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~
* Don't check OS type for ARM mbed-enabled boards and ST STM32 development
platform before uploading to disk
(`issue #596 <https://github.com/platformio/platformio/issues/596>`_)
* Fixed broken compilation for Atmel SAMD based boards except Arduino Due * Fixed broken compilation for Atmel SAMD based boards except Arduino Due
(`issue #598 <https://github.com/platformio/platformio/issues/598>`_) (`issue #598 <https://github.com/platformio/platformio/issues/598>`_)

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

@ -100,10 +100,7 @@ AlwaysBuild(target_size)
# Target: Upload by default .bin file # Target: Upload by default .bin file
# #
disable_msd = ( if "mbed" in env.subst("$FRAMEWORK") and not env.subst("$UPLOAD_PROTOCOL"):
(platform.system() == "Darwin" and platform.release().startswith("14.")) or
env.subst("$UPLOAD_PROTOCOL"))
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)
else: else: