Make upload.py compatible with existing FS upload #6788
Conversation
PR esp8266#6765 introduced an incompatibility with the existing Java uploaders for SPIFFS and LittleFS, breaking them because of the upload.py parameter format change to support single stage erase/upload. Add in patch to silently eat the single --end and to parse the write address and filename properly as generated by calls from the plugins, while retaining compatibility with the current IDE changes.
|
Fixes #6777 Either this or #6781 should be merged ASAP. #6781 reinstates the old path of pass-thru when |
Make upload.py more concise and pythonic. Use the "write_flash" argument in platform.txt for uploads instead of assuming anything that is a file is the bin to upload.
earlephilhower
force-pushed
the
fixfsupload
branch
from
0955674 to
c7cb2fc
Compare
|
@d-a-v I'm sitting on the SC19 expo floor waiting for some networking to be done, so I can't actually test this. It's what was discussed on the channel. If you could give it a try before approving/requesting changed it'd be much appreciated. |
|
I cloned https://github.com/earlephilhower/Arduino.git -b fixfsupload , installed it using-git-version doc on Arduino 1.8.10 (with portable directory on Ubuntu Bionic) and for me https://github.com/esp8266/arduino-esp8266fs-plugin/releases/download/0.4.0/ESP8266FS-0.4.0.zip is working. Sketch upload successful and working on the esp. |
|
@gnu-emu thanks very much for the report and your other PRs on this! It's one thing to report a bug, but a much harder thing to try and fix it... Anyway, I think at some point we'll drop upload.py and call the esptool.py directly from the plugins and from the IDE (3.0 probably). The suggestions you've got on the other repos will probably make sense then. |
PR #6765 introduced an incompatibility with the existing Java uploaders
for SPIFFS and LittleFS, breaking them because of the upload.py
parameter format change to support single stage erase/upload.
Add in patch to silently eat the single --end and to parse the write
address and filename properly as generated by calls from the plugins,
while retaining compatibility with the current IDE changes.