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

Fix uploading for "atmelavr" platform // Resolve #92

Browse Source
This commit is contained in:
Ivan Kravets
2015-02-23 01:06:50 +02:00
parent f86a33c991
commit d1ca17c406
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
platformio/builder/scripts/atmelavr.py
View File

@ -34,6 +34,9 @@ def before_upload(target, source, env): # pylint: disable=W0613,W0621
if env.subst("$UPLOAD_PROTOCOL") != "usbtiny": if env.subst("$UPLOAD_PROTOCOL") != "usbtiny":
_autodetect_upload_port() _autodetect_upload_port()
env.Append(
UPLOADERFLAGS=["-P", "$UPLOAD_PORT"]
)
if env.subst("$BOARD") == "raspduino": if env.subst("$BOARD") == "raspduino":
_rpi_sysgpio("/sys/class/gpio/export", 18) _rpi_sysgpio("/sys/class/gpio/export", 18)
@ -42,7 +45,7 @@ def before_upload(target, source, env): # pylint: disable=W0613,W0621
sleep(0.1) sleep(0.1)
_rpi_sysgpio("/sys/class/gpio/gpio18/value", 0) _rpi_sysgpio("/sys/class/gpio/gpio18/value", 0)
_rpi_sysgpio("/sys/class/gpio/unexport", 18) _rpi_sysgpio("/sys/class/gpio/unexport", 18)
else: elif "UPLOAD_PORT" in env:
upload_options = env.get("BOARD_OPTIONS", {}).get("upload", {}) upload_options = env.get("BOARD_OPTIONS", {}).get("upload", {})
if not upload_options.get("disable_flushing", False): if not upload_options.get("disable_flushing", False):
@ -50,8 +53,7 @@ def before_upload(target, source, env): # pylint: disable=W0613,W0621
before_ports = [i['port'] for i in get_serialports()] before_ports = [i['port'] for i in get_serialports()]
if (upload_options.get("use_1200bps_touch", False) and if upload_options.get("use_1200bps_touch", False):
"UPLOAD_PORT" in env):
env.TouchSerialPort("$UPLOAD_PORT", 1200) env.TouchSerialPort("$UPLOAD_PORT", 1200)
if upload_options.get("wait_for_upload_port", False): if upload_options.get("wait_for_upload_port", False):
@ -65,7 +67,7 @@ env = SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "baseavr.py")),
env.Replace( env.Replace(
UPLOADER=join("$PIOPACKAGES_DIR", "tool-avrdude", "avrdude"), UPLOADER=join("$PIOPACKAGES_DIR", "tool-avrdude", "avrdude"),
UPLOADERFLAGS=[ UPLOADERFLAGS=[
"-q", # suppress progress output "-v",
"-D", # disable auto erase for flash memory "-D", # disable auto erase for flash memory
"-p", "$BOARD_MCU", "-p", "$BOARD_MCU",
"-C", "-C",
@ -77,6 +79,11 @@ env.Replace(
UPLOADEEPCMD='"$UPLOADER" $UPLOADERFLAGS -U eeprom:w:$SOURCES:i' UPLOADEEPCMD='"$UPLOADER" $UPLOADERFLAGS -U eeprom:w:$SOURCES:i'
) )
if "UPLOAD_SPEED" in env:
env.Append(
UPLOADERFLAGS=["-b", "$UPLOAD_SPEED"]
)
CORELIBS = env.ProcessGeneral() CORELIBS = env.ProcessGeneral()
# #

2
platformio/platforms/atmelavr.py
View File

@ -29,7 +29,7 @@ class AtmelavrPlatform(BasePlatform):
def on_run_err(self, line): # pylint: disable=R0201 def on_run_err(self, line): # pylint: disable=R0201
# fix STDERR "flash written" for avrdude # fix STDERR "flash written" for avrdude
if "flash written" in line: if "avrdude" in line:
self.on_run_out(line) self.on_run_out(line)
else: else:
BasePlatform.on_run_err(self, line) BasePlatform.on_run_err(self, line)