Skip to content

esptool.py: disable 9600bauds in menu for flash upload serial speed #6292

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.

Sign up for GitHub

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 3 commits into from
Jul 13, 2019
Merged

esptool.py: disable 9600bauds in menu for flash upload serial speed #6292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1fc4e3
emulation on host: disable coverage when not in CI
d-a-v Jul 12, 2019
7bb6516
disable 9600bauds for flash upload serial speed (esptool.py won't work)
d-a-v Jul 12, 2019
b08c5a3
Merge branch 'master' into no9600
earlephilhower Jul 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 0 additions & 60 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,8 +466,6 @@ generic.menu.wipe.all=All Flash Contents
generic.menu.wipe.all.upload.erase_cmd=erase_flash
generic.menu.baud.115200=115200
generic.menu.baud.115200.upload.speed=115200
generic.menu.baud.9600=9600
generic.menu.baud.9600.upload.speed=9600
generic.menu.baud.57600=57600
generic.menu.baud.57600.upload.speed=57600
generic.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -736,8 +734,6 @@ esp8285.menu.wipe.all=All Flash Contents
esp8285.menu.wipe.all.upload.erase_cmd=erase_flash
esp8285.menu.baud.115200=115200
esp8285.menu.baud.115200.upload.speed=115200
esp8285.menu.baud.9600=9600
esp8285.menu.baud.9600.upload.speed=9600
esp8285.menu.baud.57600=57600
esp8285.menu.baud.57600.upload.speed=57600
esp8285.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -932,8 +928,6 @@ espduino.menu.wipe.all=All Flash Contents
espduino.menu.wipe.all.upload.erase_cmd=erase_flash
espduino.menu.baud.115200=115200
espduino.menu.baud.115200.upload.speed=115200
espduino.menu.baud.9600=9600
espduino.menu.baud.9600.upload.speed=9600
espduino.menu.baud.57600=57600
espduino.menu.baud.57600.upload.speed=57600
espduino.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -1120,8 +1114,6 @@ huzzah.menu.wipe.all=All Flash Contents
huzzah.menu.wipe.all.upload.erase_cmd=erase_flash
huzzah.menu.baud.115200=115200
huzzah.menu.baud.115200.upload.speed=115200
huzzah.menu.baud.9600=9600
huzzah.menu.baud.9600.upload.speed=9600
huzzah.menu.baud.57600=57600
huzzah.menu.baud.57600.upload.speed=57600
huzzah.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -1308,8 +1300,6 @@ inventone.menu.wipe.all=All Flash Contents
inventone.menu.wipe.all.upload.erase_cmd=erase_flash
inventone.menu.baud.115200=115200
inventone.menu.baud.115200.upload.speed=115200
inventone.menu.baud.9600=9600
inventone.menu.baud.9600.upload.speed=9600
inventone.menu.baud.57600=57600
inventone.menu.baud.57600.upload.speed=57600
inventone.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -1499,8 +1489,6 @@ cw01.menu.wipe.all=All Flash Contents
cw01.menu.wipe.all.upload.erase_cmd=erase_flash
cw01.menu.baud.115200=115200
cw01.menu.baud.115200.upload.speed=115200
cw01.menu.baud.9600=9600
cw01.menu.baud.9600.upload.speed=9600
cw01.menu.baud.57600=57600
cw01.menu.baud.57600.upload.speed=57600
cw01.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -1690,8 +1678,6 @@ espresso_lite_v1.menu.wipe.all=All Flash Contents
espresso_lite_v1.menu.wipe.all.upload.erase_cmd=erase_flash
espresso_lite_v1.menu.baud.115200=115200
espresso_lite_v1.menu.baud.115200.upload.speed=115200
espresso_lite_v1.menu.baud.9600=9600
espresso_lite_v1.menu.baud.9600.upload.speed=9600
espresso_lite_v1.menu.baud.57600=57600
espresso_lite_v1.menu.baud.57600.upload.speed=57600
espresso_lite_v1.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -1881,8 +1867,6 @@ espresso_lite_v2.menu.wipe.all=All Flash Contents
espresso_lite_v2.menu.wipe.all.upload.erase_cmd=erase_flash
espresso_lite_v2.menu.baud.115200=115200
espresso_lite_v2.menu.baud.115200.upload.speed=115200
espresso_lite_v2.menu.baud.9600=9600
espresso_lite_v2.menu.baud.9600.upload.speed=9600
espresso_lite_v2.menu.baud.57600=57600
espresso_lite_v2.menu.baud.57600.upload.speed=57600
espresso_lite_v2.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -2072,8 +2056,6 @@ phoenix_v1.menu.wipe.all=All Flash Contents
phoenix_v1.menu.wipe.all.upload.erase_cmd=erase_flash
phoenix_v1.menu.baud.115200=115200
phoenix_v1.menu.baud.115200.upload.speed=115200
phoenix_v1.menu.baud.9600=9600
phoenix_v1.menu.baud.9600.upload.speed=9600
phoenix_v1.menu.baud.57600=57600
phoenix_v1.menu.baud.57600.upload.speed=57600
phoenix_v1.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -2263,8 +2245,6 @@ phoenix_v2.menu.wipe.all=All Flash Contents
phoenix_v2.menu.wipe.all.upload.erase_cmd=erase_flash
phoenix_v2.menu.baud.115200=115200
phoenix_v2.menu.baud.115200.upload.speed=115200
phoenix_v2.menu.baud.9600=9600
phoenix_v2.menu.baud.9600.upload.speed=9600
phoenix_v2.menu.baud.57600=57600
phoenix_v2.menu.baud.57600.upload.speed=57600
phoenix_v2.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -2451,8 +2431,6 @@ nodemcu.menu.wipe.all=All Flash Contents
nodemcu.menu.wipe.all.upload.erase_cmd=erase_flash
nodemcu.menu.baud.115200=115200
nodemcu.menu.baud.115200.upload.speed=115200
nodemcu.menu.baud.9600=9600
nodemcu.menu.baud.9600.upload.speed=9600
nodemcu.menu.baud.57600=57600
nodemcu.menu.baud.57600.upload.speed=57600
nodemcu.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -2639,8 +2617,6 @@ nodemcuv2.menu.wipe.all=All Flash Contents
nodemcuv2.menu.wipe.all.upload.erase_cmd=erase_flash
nodemcuv2.menu.baud.115200=115200
nodemcuv2.menu.baud.115200.upload.speed=115200
nodemcuv2.menu.baud.9600=9600
nodemcuv2.menu.baud.9600.upload.speed=9600
nodemcuv2.menu.baud.57600=57600
nodemcuv2.menu.baud.57600.upload.speed=57600
nodemcuv2.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -2847,8 +2823,6 @@ modwifi.menu.wipe.all=All Flash Contents
modwifi.menu.wipe.all.upload.erase_cmd=erase_flash
modwifi.menu.baud.115200=115200
modwifi.menu.baud.115200.upload.speed=115200
modwifi.menu.baud.9600=9600
modwifi.menu.baud.9600.upload.speed=9600
modwifi.menu.baud.57600=57600
modwifi.menu.baud.57600.upload.speed=57600
modwifi.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -3035,8 +3009,6 @@ thing.menu.wipe.all=All Flash Contents
thing.menu.wipe.all.upload.erase_cmd=erase_flash
thing.menu.baud.115200=115200
thing.menu.baud.115200.upload.speed=115200
thing.menu.baud.9600=9600
thing.menu.baud.9600.upload.speed=9600
thing.menu.baud.57600=57600
thing.menu.baud.57600.upload.speed=57600
thing.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -3223,8 +3195,6 @@ thingdev.menu.wipe.all=All Flash Contents
thingdev.menu.wipe.all.upload.erase_cmd=erase_flash
thingdev.menu.baud.115200=115200
thingdev.menu.baud.115200.upload.speed=115200
thingdev.menu.baud.9600=9600
thingdev.menu.baud.9600.upload.speed=9600
thingdev.menu.baud.57600=57600
thingdev.menu.baud.57600.upload.speed=57600
thingdev.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -3411,8 +3381,6 @@ esp210.menu.wipe.all=All Flash Contents
esp210.menu.wipe.all.upload.erase_cmd=erase_flash
esp210.menu.baud.57600=57600
esp210.menu.baud.57600.upload.speed=57600
esp210.menu.baud.9600=9600
esp210.menu.baud.9600.upload.speed=9600
esp210.menu.baud.115200=115200
esp210.menu.baud.115200.upload.speed=115200
esp210.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -3599,8 +3567,6 @@ d1_mini.menu.wipe.all=All Flash Contents
d1_mini.menu.wipe.all.upload.erase_cmd=erase_flash
d1_mini.menu.baud.921600=921600
d1_mini.menu.baud.921600.upload.speed=921600
d1_mini.menu.baud.9600=9600
d1_mini.menu.baud.9600.upload.speed=9600
d1_mini.menu.baud.57600=57600
d1_mini.menu.baud.57600.upload.speed=57600
d1_mini.menu.baud.115200=115200
Expand Down Expand Up @@ -3770,8 +3736,6 @@ d1_mini_pro.menu.wipe.all=All Flash Contents
d1_mini_pro.menu.wipe.all.upload.erase_cmd=erase_flash
d1_mini_pro.menu.baud.921600=921600
d1_mini_pro.menu.baud.921600.upload.speed=921600
d1_mini_pro.menu.baud.9600=9600
d1_mini_pro.menu.baud.9600.upload.speed=9600
d1_mini_pro.menu.baud.57600=57600
d1_mini_pro.menu.baud.57600.upload.speed=57600
d1_mini_pro.menu.baud.115200=115200
Expand Down Expand Up @@ -3998,8 +3962,6 @@ d1_mini_lite.menu.wipe.all=All Flash Contents
d1_mini_lite.menu.wipe.all.upload.erase_cmd=erase_flash
d1_mini_lite.menu.baud.921600=921600
d1_mini_lite.menu.baud.921600.upload.speed=921600
d1_mini_lite.menu.baud.9600=9600
d1_mini_lite.menu.baud.9600.upload.speed=9600
d1_mini_lite.menu.baud.57600=57600
d1_mini_lite.menu.baud.57600.upload.speed=57600
d1_mini_lite.menu.baud.115200=115200
Expand Down Expand Up @@ -4186,8 +4148,6 @@ d1.menu.wipe.all=All Flash Contents
d1.menu.wipe.all.upload.erase_cmd=erase_flash
d1.menu.baud.921600=921600
d1.menu.baud.921600.upload.speed=921600
d1.menu.baud.9600=9600
d1.menu.baud.9600.upload.speed=9600
d1.menu.baud.57600=57600
d1.menu.baud.57600.upload.speed=57600
d1.menu.baud.115200=115200
Expand Down Expand Up @@ -4377,8 +4337,6 @@ espino.menu.wipe.all=All Flash Contents
espino.menu.wipe.all.upload.erase_cmd=erase_flash
espino.menu.baud.115200=115200
espino.menu.baud.115200.upload.speed=115200
espino.menu.baud.9600=9600
espino.menu.baud.9600.upload.speed=9600
espino.menu.baud.57600=57600
espino.menu.baud.57600.upload.speed=57600
espino.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -4565,8 +4523,6 @@ espinotee.menu.wipe.all=All Flash Contents
espinotee.menu.wipe.all.upload.erase_cmd=erase_flash
espinotee.menu.baud.115200=115200
espinotee.menu.baud.115200.upload.speed=115200
espinotee.menu.baud.9600=9600
espinotee.menu.baud.9600.upload.speed=9600
espinotee.menu.baud.57600=57600
espinotee.menu.baud.57600.upload.speed=57600
espinotee.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -4813,8 +4769,6 @@ wifinfo.menu.wipe.all=All Flash Contents
wifinfo.menu.wipe.all.upload.erase_cmd=erase_flash
wifinfo.menu.baud.115200=115200
wifinfo.menu.baud.115200.upload.speed=115200
wifinfo.menu.baud.9600=9600
wifinfo.menu.baud.9600.upload.speed=9600
wifinfo.menu.baud.57600=57600
wifinfo.menu.baud.57600.upload.speed=57600
wifinfo.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -5013,8 +4967,6 @@ arduino-esp8266.menu.wipe.all=All Flash Contents
arduino-esp8266.menu.wipe.all.upload.erase_cmd=erase_flash
arduino-esp8266.menu.baud.115200=115200
arduino-esp8266.menu.baud.115200.upload.speed=115200
arduino-esp8266.menu.baud.9600=9600
arduino-esp8266.menu.baud.9600.upload.speed=9600
arduino-esp8266.menu.baud.57600=57600
arduino-esp8266.menu.baud.57600.upload.speed=57600
arduino-esp8266.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -5202,8 +5154,6 @@ gen4iod.menu.wipe.all=All Flash Contents
gen4iod.menu.wipe.all.upload.erase_cmd=erase_flash
gen4iod.menu.baud.115200=115200
gen4iod.menu.baud.115200.upload.speed=115200
gen4iod.menu.baud.9600=9600
gen4iod.menu.baud.9600.upload.speed=9600
gen4iod.menu.baud.57600=57600
gen4iod.menu.baud.57600.upload.speed=57600
gen4iod.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -5391,8 +5341,6 @@ oak.menu.wipe.all=All Flash Contents
oak.menu.wipe.all.upload.erase_cmd=erase_flash
oak.menu.baud.921600=921600
oak.menu.baud.921600.upload.speed=921600
oak.menu.baud.9600=9600
oak.menu.baud.9600.upload.speed=9600
oak.menu.baud.57600=57600
oak.menu.baud.57600.upload.speed=57600
oak.menu.baud.115200=115200
Expand Down Expand Up @@ -5579,8 +5527,6 @@ wifiduino.menu.wipe.all=All Flash Contents
wifiduino.menu.wipe.all.upload.erase_cmd=erase_flash
wifiduino.menu.baud.921600=921600
wifiduino.menu.baud.921600.upload.speed=921600
wifiduino.menu.baud.9600=9600
wifiduino.menu.baud.9600.upload.speed=9600
wifiduino.menu.baud.57600=57600
wifiduino.menu.baud.57600.upload.speed=57600
wifiduino.menu.baud.115200=115200
Expand Down Expand Up @@ -5877,8 +5823,6 @@ wifi_slot.menu.wipe.all=All Flash Contents
wifi_slot.menu.wipe.all.upload.erase_cmd=erase_flash
wifi_slot.menu.baud.115200=115200
wifi_slot.menu.baud.115200.upload.speed=115200
wifi_slot.menu.baud.9600=9600
wifi_slot.menu.baud.9600.upload.speed=9600
wifi_slot.menu.baud.57600=57600
wifi_slot.menu.baud.57600.upload.speed=57600
wifi_slot.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -6065,8 +6009,6 @@ wiolink.menu.wipe.all=All Flash Contents
wiolink.menu.wipe.all.upload.erase_cmd=erase_flash
wiolink.menu.baud.115200=115200
wiolink.menu.baud.115200.upload.speed=115200
wiolink.menu.baud.9600=9600
wiolink.menu.baud.9600.upload.speed=9600
wiolink.menu.baud.57600=57600
wiolink.menu.baud.57600.upload.speed=57600
wiolink.menu.baud.230400.linux=230400
Expand Down Expand Up @@ -6253,8 +6195,6 @@ espectro.menu.wipe.all=All Flash Contents
espectro.menu.wipe.all.upload.erase_cmd=erase_flash
espectro.menu.baud.115200=115200
espectro.menu.baud.115200.upload.speed=115200
espectro.menu.baud.9600=9600
espectro.menu.baud.9600.upload.speed=9600
espectro.menu.baud.57600=57600
espectro.menu.baud.57600.upload.speed=57600
espectro.menu.baud.230400.linux=230400
Expand Down
4 changes: 2 additions & 2 deletions tests/host/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ DEBUG += -DDEBUG_ESP_PORT=Serial
DEBUG += -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_MDNS
endif

FLAGS += $(DEBUG) -Wall -coverage $(OPTZ) -fno-common -g $(M32)
FLAGS += $(DEBUG) -Wall $(OPTZ) -fno-common -g $(M32)
FLAGS += -DHTTPCLIENT_1_1_COMPATIBLE=0
FLAGS += -DLWIP_IPV6=0
FLAGS += -DHOST_MOCK=1
Expand Down Expand Up @@ -178,7 +178,7 @@ COVERAGE_FILES = $(OBJECTS:.o=.gc*)
all: help

CI: # run CI
$(MAKE) -f $(MAKEFILE) MKFLAGS=-Werror FORCE32=0 OPTZ=-O0 doCI
$(MAKE) -f $(MAKEFILE) MKFLAGS="-Werror -coverage" FORCE32=0 OPTZ=-O0 doCI

doCI: build-info $(OUTPUT_BINARY) valgrind test gcov

Expand Down
15 changes: 7 additions & 8 deletions tools/boards.txt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,13 @@
# or by user command line

speeds = collections.OrderedDict([
( '9', [ 's9', 's57', 's115', 's230', 's256', 's460', 's512', 's921' ]),
( '57', [ 's57', 's9', 's115', 's230', 's256', 's460', 's512', 's921' ]),
( '115', [ 's115', 's9', 's57', 's230', 's256', 's460', 's512', 's921' ]),
( '230', [ 's230', 's9', 's57', 's115', 's256', 's460', 's512', 's921' ]),
( '256', [ 's256', 's9', 's57', 's115', 's230', 's460', 's512', 's921' ]),
( '460', [ 's460', 's9', 's57', 's115', 's230', 's256', 's512', 's921' ]),
( '512', [ 's512', 's9', 's57', 's115', 's230', 's256', 's460', 's921' ]),
( '921', [ 's921', 's9', 's57', 's115', 's230', 's256', 's460', 's512' ]),
( '57', [ 's57', 's115', 's230', 's256', 's460', 's512', 's921' ]),
( '115', [ 's115', 's57', 's230', 's256', 's460', 's512', 's921' ]),
( '230', [ 's230', 's57', 's115', 's256', 's460', 's512', 's921' ]),
( '256', [ 's256', 's57', 's115', 's230', 's460', 's512', 's921' ]),
( '460', [ 's460', 's57', 's115', 's230', 's256', 's512', 's921' ]),
( '512', [ 's512', 's57', 's115', 's230', 's256', 's460', 's921' ]),
( '921', [ 's921', 's57', 's115', 's230', 's256', 's460', 's512' ]),
])

# boards list
Expand Down