Skip to content

Add upload.py and internal python in tools #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 23, 2019

Conversation

earlephilhower
Copy link
Contributor

When present, use a tools-installed python executable for any python
calls.

When tools/upload.py is present, use it in place of esptool-ck.exe.

When neither of these are present, as in releases 2.5.0 and prior, use
the prior behavior, unchanged.

When present, use a tools-installed python executable for any python
calls.

When tools/upload.py is present, use it in place of esptool-ck.exe.

When neither of these are present, as in releases 2.5.0 and prior, use
the prior behavior, unchanged.
Copy link
Member

@igrr igrr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, left a couple of minor comments. Logic looks fine, but haven't tested.

Instead of a bunch of nested if-elses, use a list of strings to try
iterating over to fins python(.exe).

Replace 1-line if-else with ternary operator
@earlephilhower
Copy link
Contributor Author

Tested with all combinations:

. linux boards.json install 2.5.0 (fallback to esptool-ck)
. linux GIT 2.6.0-dev

. win boards.json install 2.5.0 (fallback to esptool-ck.exe)
. win GIT 2.6.0-dev

@igrr igrr merged commit 33969c9 into esp8266:master Feb 23, 2019
@earlephilhower earlephilhower deleted the adduploadpy branch November 19, 2019 16:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants