Skip to content

Commit 56fe2bf

Browse files
[BREAKING] Update FS plugin info for python3 compat (#6807)
The FS uploader plugins need to be updated to use python3 and not python, or they will fail on Windows (or Linux boxes without an installed python2 interpreter). Update the documents to point to the new versions.
1 parent 3279248 commit 56fe2bf

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

doc/filesystem.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,11 @@ directory into ESP8266 flash file system.
190190

191191
**Warning**: Due to the move from the obsolete esptool-ck.exe to the
192192
supported esptool.py upload tool, upgraders from pre 2.5.1 will need to
193-
update the ESP8266FS tool referenced below to 0.4.0 or later. Prior versions
193+
update the ESP8266FS tool referenced below to 0.5.0 or later. Prior versions
194194
will fail with a "esptool not found" error because they don't know how to
195195
use esptool.py.
196196

197-
- Download the tool: https://github.com/esp8266/arduino-esp8266fs-plugin/releases/download/0.4.0/ESP8266FS-0.4.0.zip
197+
- Download the tool: https://github.com/esp8266/arduino-esp8266fs-plugin/releases/download/0.5.0/ESP8266FS-0.5.0.zip
198198
- In your Arduino sketchbook directory, create ``tools`` directory if
199199
it doesn't exist yet.
200200
- Unpack the tool into ``tools`` directory (the path will look like
@@ -214,7 +214,7 @@ use esptool.py.
214214

215215
*ESP8266LittleFS* is the equivalent tool for LittleFS.
216216

217-
- Download the tool: https://github.com/earlephilhower/arduino-esp8266littlefs-plugin/releases
217+
- Download the 2.6.0 or later version of the tool: https://github.com/earlephilhower/arduino-esp8266littlefs-plugin/releases
218218
- Install as above
219219
- To upload a LittleFS filesystem use Tools > ESP8266 LittleFS Data Upload
220220

tools/upload.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# Wrapper for Arduino core / others that can call esptool.py possibly multiple times
44
# Adds pyserial to sys.path automatically based on the path of the current file
55

6-
# First parameter is pyserial path, second is esptool path, then a series of command arguments separated with --end
7-
# i.e. upload.py tools/pyserial tools/esptool erase_flash --end write_flash file 0x0 --end
6+
# First parameter is pyserial path, second is esptool path, then a series of command arguments
7+
# i.e. upload.py tools/pyserial tools/esptool write_flash file 0x0
88

99
import sys
1010
import os
@@ -42,9 +42,6 @@
4242
elif thisarg == 'erase_region':
4343
erase_addr = sys.argv.pop(0)
4444
erase_len = sys.argv.pop(0)
45-
elif thisarg == '--end':
46-
# Backwards compatibility with fs upload tools, eat --end
47-
pass
4845
elif thisarg == 'write_flash':
4946
write_addr = sys.argv.pop(0)
5047
binary = sys.argv.pop(0)

0 commit comments

Comments
 (0)