Skip to content

Add missing esptool upload modes for none and dtrset #4228

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 5 commits into from
Jan 24, 2018
Merged

Add missing esptool upload modes for none and dtrset #4228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3f8f981
Add missing esptool upload modes for none and dtrset
mribble Jan 23, 2018
1b01106
Update boards.txt by modifying boards.txt.py
mribble Jan 24, 2018
0a78567
Merge branch 'master' into expose-more-esptool-modes
mribble Jan 24, 2018
93501af
Merge branch 'master' into expose-more-esptool-modes
mribble Jan 24, 2018
5e2eb9b
Merge branch 'expose-more-esptool-modes' of https://github.com/mribbl…
mribble Jan 24, 2018
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
28 changes: 28 additions & 0 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ generic.menu.ResetMethod.ck=ck
generic.menu.ResetMethod.ck.upload.resetmethod=ck
generic.menu.ResetMethod.nodemcu=nodemcu
generic.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
generic.menu.ResetMethod.none=none
generic.menu.ResetMethod.none.upload.resetmethod=none
generic.menu.ResetMethod.dtrset=dtrset
generic.menu.ResetMethod.dtrset.upload.resetmethod=dtrset
generic.menu.CrystalFreq.26=26 MHz
generic.menu.CrystalFreq.40=40 MHz
generic.menu.CrystalFreq.40.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
Expand Down Expand Up @@ -319,6 +323,10 @@ esp8285.menu.ResetMethod.ck=ck
esp8285.menu.ResetMethod.ck.upload.resetmethod=ck
esp8285.menu.ResetMethod.nodemcu=nodemcu
esp8285.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
esp8285.menu.ResetMethod.none=none
esp8285.menu.ResetMethod.none.upload.resetmethod=none
esp8285.menu.ResetMethod.dtrset=dtrset
esp8285.menu.ResetMethod.dtrset.upload.resetmethod=dtrset
esp8285.menu.CrystalFreq.26=26 MHz
esp8285.menu.CrystalFreq.40=40 MHz
esp8285.menu.CrystalFreq.40.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
Expand Down Expand Up @@ -809,6 +817,10 @@ espresso_lite_v1.menu.ResetMethod.ck=ck
espresso_lite_v1.menu.ResetMethod.ck.upload.resetmethod=ck
espresso_lite_v1.menu.ResetMethod.nodemcu=nodemcu
espresso_lite_v1.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
espresso_lite_v1.menu.ResetMethod.none=none
espresso_lite_v1.menu.ResetMethod.none.upload.resetmethod=none
espresso_lite_v1.menu.ResetMethod.dtrset=dtrset
espresso_lite_v1.menu.ResetMethod.dtrset.upload.resetmethod=dtrset
espresso_lite_v1.menu.LwIPVariant.v2mss536=v2 Prebuilt (MSS=536)
espresso_lite_v1.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
espresso_lite_v1.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
Expand Down Expand Up @@ -939,6 +951,10 @@ espresso_lite_v2.menu.ResetMethod.ck=ck
espresso_lite_v2.menu.ResetMethod.ck.upload.resetmethod=ck
espresso_lite_v2.menu.ResetMethod.nodemcu=nodemcu
espresso_lite_v2.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
espresso_lite_v2.menu.ResetMethod.none=none
espresso_lite_v2.menu.ResetMethod.none.upload.resetmethod=none
espresso_lite_v2.menu.ResetMethod.dtrset=dtrset
espresso_lite_v2.menu.ResetMethod.dtrset.upload.resetmethod=dtrset
espresso_lite_v2.menu.LwIPVariant.v2mss536=v2 Prebuilt (MSS=536)
espresso_lite_v2.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
espresso_lite_v2.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
Expand Down Expand Up @@ -1069,6 +1085,10 @@ phoenix_v1.menu.ResetMethod.ck=ck
phoenix_v1.menu.ResetMethod.ck.upload.resetmethod=ck
phoenix_v1.menu.ResetMethod.nodemcu=nodemcu
phoenix_v1.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
phoenix_v1.menu.ResetMethod.none=none
phoenix_v1.menu.ResetMethod.none.upload.resetmethod=none
phoenix_v1.menu.ResetMethod.dtrset=dtrset
phoenix_v1.menu.ResetMethod.dtrset.upload.resetmethod=dtrset
phoenix_v1.menu.LwIPVariant.v2mss536=v2 Prebuilt (MSS=536)
phoenix_v1.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
phoenix_v1.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
Expand Down Expand Up @@ -1199,6 +1219,10 @@ phoenix_v2.menu.ResetMethod.ck=ck
phoenix_v2.menu.ResetMethod.ck.upload.resetmethod=ck
phoenix_v2.menu.ResetMethod.nodemcu=nodemcu
phoenix_v2.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
phoenix_v2.menu.ResetMethod.none=none
phoenix_v2.menu.ResetMethod.none.upload.resetmethod=none
phoenix_v2.menu.ResetMethod.dtrset=dtrset
phoenix_v2.menu.ResetMethod.dtrset.upload.resetmethod=dtrset
phoenix_v2.menu.LwIPVariant.v2mss536=v2 Prebuilt (MSS=536)
phoenix_v2.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
phoenix_v2.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
Expand Down Expand Up @@ -2620,6 +2644,10 @@ espino.menu.ResetMethod.ck=ck
espino.menu.ResetMethod.ck.upload.resetmethod=ck
espino.menu.ResetMethod.nodemcu=nodemcu
espino.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
espino.menu.ResetMethod.none=none
espino.menu.ResetMethod.none.upload.resetmethod=none
espino.menu.ResetMethod.dtrset=dtrset
espino.menu.ResetMethod.dtrset.upload.resetmethod=dtrset
espino.build.flash_mode=qio
espino.build.flash_freq=40
espino.menu.FlashSize.4M1M=4M (1M SPIFFS)
Expand Down
14 changes: 11 additions & 3 deletions tools/boards.txt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
# opts: specific entries dicts (overrides same entry in macros)
# macro: common entries
# unmodifiable parameters:
# resetmethod_ck/_nodemcu/_none: fixed reset method
# flashmode_qio/_dio/_qout/_dout: fixed flash mode
# flashfreq_40/_80: fixed flash frequency
# resetmethod_ck/_nodemcu/_none/_dtrset: fixed reset method
# flashmode_qio/_dio/_qout/_dout: fixed flash mode
# flashfreq_40/_80: fixed flash frequency
# selection menu:
# resetmethod_menu menus for reset method
# crystalfreq/flashfreq_menu: menus for crystal/flash frequency selection
Expand Down Expand Up @@ -765,6 +765,10 @@
( '.menu.ResetMethod.ck.upload.resetmethod', 'ck' ),
( '.menu.ResetMethod.nodemcu', 'nodemcu' ),
( '.menu.ResetMethod.nodemcu.upload.resetmethod', 'nodemcu' ),
( '.menu.ResetMethod.none', 'none' ),
( '.menu.ResetMethod.none.upload.resetmethod', 'none' ),
( '.menu.ResetMethod.dtrset', 'dtrset' ),
( '.menu.ResetMethod.dtrset.upload.resetmethod', 'dtrset' ),
]),

####################### upload.resetmethod
Expand All @@ -780,6 +784,10 @@
'resetmethod_none': collections.OrderedDict([
( '.upload.resetmethod', 'none' ),
]),

'resetmethod_dtrset': collections.OrderedDict([
( '.upload.resetmethod', 'dtrset' ),
]),

####################### menu.FlashMode

Expand Down