platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 10:07:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve error reporting when upload port isn't defined

Browse Source
This commit is contained in:
Ivan Kravets
2015-02-16 23:16:48 +02:00
parent be6cdc09d9
commit 0d2d6cc17e
1 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ from os.path import join
from time import sleep from time import sleep
from SCons.Script import (COMMAND_LINE_TARGETS, AlwaysBuild, Builder, Default, from SCons.Script import (COMMAND_LINE_TARGETS, AlwaysBuild, Builder, Default,
DefaultEnvironment) DefaultEnvironment, Exit)
from platformio.util import get_serialports from platformio.util import get_serialports
@ -111,19 +111,34 @@ env.Append(
) )
def before_upload(target, source, env_): # pylint: disable=W0613 def before_upload(target, source, env): # pylint: disable=W0613
def rpi_sysgpio(path, value): def _autodetect_upload_port():
if "UPLOAD_PORT" not in env:
for item in get_serialports():
if "VID:PID" in item['hwid']:
print "Auto-detected UPLOAD_PORT: %s" % item['port']
env.Replace(UPLOAD_PORT=item['port'])
break
if "UPLOAD_PORT" not in env:
Exit("Error: Please specify `upload_port` for environment or use "
"global `--upload-port` option.\n")
def _rpi_sysgpio(path, value):
with open(path, "w") as f: with open(path, "w") as f:
f.write(str(value)) f.write(str(value))
if env.subst("$UPLOAD_PROTOCOL") != "usbtiny":
_autodetect_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)
rpi_sysgpio("/sys/class/gpio/gpio18/direction", "out") _rpi_sysgpio("/sys/class/gpio/gpio18/direction", "out")
rpi_sysgpio("/sys/class/gpio/gpio18/value", 1) _rpi_sysgpio("/sys/class/gpio/gpio18/value", 1)
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: else:
upload_options = env.get("BOARD_OPTIONS", {}).get("upload", {}) upload_options = env.get("BOARD_OPTIONS", {}).get("upload", {})
@ -187,26 +202,6 @@ uploadeep = env.Alias("uploadeep", target_eep, [
before_upload, "$UPLOADEEPCMD"]) before_upload, "$UPLOADEEPCMD"])
AlwaysBuild(uploadeep) AlwaysBuild(uploadeep)
#
# Check for $UPLOAD_PORT variable
#
is_uptarget = (set(["upload", "uploadlazy", "uploadeep"]) &
set(COMMAND_LINE_TARGETS))
if is_uptarget and env.subst("$UPLOAD_PROTOCOL") != "usbtiny":
# try autodetect upload port
if "UPLOAD_PORT" not in env:
for item in get_serialports():
if "VID:PID" in item['hwid']:
print "Auto-detected UPLOAD_PORT: %s" % item['port']
env.Replace(UPLOAD_PORT=item['port'])
break
if "UPLOAD_PORT" not in env:
print("WARNING!!! Please specify environment 'upload_port' or use "
"global --upload-port option.\n")
# #
# Setup default targets # Setup default targets
# #