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

Better handling of source files for uploading // Issue #382

Browse Source
This commit is contained in:
Ivan Kravets
2015-12-29 14:36:39 +02:00
parent 11986354d9
commit a959ff767d
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platformio/__init__.py
View File

@ -14,7 +14,7 @@
import sys import sys
VERSION = (2, 7, "0.dev6") VERSION = (2, 7, "0.dev7")
__version__ = ".".join([str(s) for s in VERSION]) __version__ = ".".join([str(s) for s in VERSION])
__title__ = "platformio" __title__ = "platformio"

12
platformio/builder/scripts/espressif.py
View File

@ -111,23 +111,23 @@ env.Replace(
"-vv", "-vv",
"-cd", "${BOARD_OPTIONS['upload']['resetmethod']}", "-cd", "${BOARD_OPTIONS['upload']['resetmethod']}",
"-cb", "$UPLOAD_SPEED", "-cb", "$UPLOAD_SPEED",
"-cp", "$UPLOAD_PORT", "-cp", "$UPLOAD_PORT"
"-cf", "$SOURCE"
], ],
UPLOADERFSFLAGS=[ UPLOADERFSFLAGS=[
"$UPLOADERFLAGS", "$UPLOADERFLAGS",
"$UPLOAD_FLAGS",
"-ca", "$SPIFFS_START" "-ca", "$SPIFFS_START"
], ],
UPLOADEROTAFLAGS=[ UPLOADEROTAFLAGS=[
"--debug", "--debug",
"--progress", "--progress",
"-i", "$UPLOAD_PORT", "-i", "$UPLOAD_PORT",
"-f", "$SOURCE" "$UPLOAD_FLAGS"
], ],
UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS', UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS -cf $SOURCE',
UPLOADFSCMD='"$UPLOADER" $UPLOADERFSFLAGS', UPLOADFSCMD='"$UPLOADER" $UPLOADERFSFLAGS -cf $SOURCE',
UPLOADOTACMD='"$UPLOADEROTA" $UPLOADEROTAFLAGS', UPLOADOTACMD='"$UPLOADEROTA" $UPLOADEROTAFLAGS -f $SOURCE',
# #
# Misc # Misc

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

@ -32,8 +32,8 @@ if env.subst("$BOARD") == "rfduino":
) )
env.Replace( env.Replace(
UPLOADER=join("$PIOPACKAGES_DIR", "tool-rfdloader", "rfdloader"), UPLOADER=join("$PIOPACKAGES_DIR", "tool-rfdloader", "rfdloader"),
UPLOADERFLAGS=["-q", "$UPLOAD_PORT", "$SOURCES"], UPLOADERFLAGS=["-q", "$UPLOAD_PORT"],
UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS' UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS $SOURCES'
) )
# #