Skip to content

Add a new resetmethod_menu_all macro #4241

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 2 commits into from
Jan 27, 2018
Merged

Add a new resetmethod_menu_all macro #4241

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2400e74
Add a new resetmethod_menu_all macro to give the choice of all the re…
mribble Jan 25, 2018
8fe2727
Change reset menu from all to extra. This gets rid of duplicated code
mribble Jan 26, 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
20 changes: 0 additions & 20 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,10 +817,6 @@ 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 @@ -951,10 +947,6 @@ 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 @@ -1085,10 +1077,6 @@ 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 @@ -1219,10 +1207,6 @@ 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 @@ -2644,10 +2628,6 @@ 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
12 changes: 10 additions & 2 deletions tools/boards.txt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
# flashfreq_40/_80: fixed flash frequency
# selection menu:
# resetmethod_menu menus for reset method
# resetmethod_menu_all menus for all reset methods
# crystalfreq/flashfreq_menu: menus for crystal/flash frequency selection
# flashmode_menu: menus for flashmode selection (dio/dout/qio/qout)
# 512K/1M/2M/4M/8M/16M: menus for flash & SPIFFS size
Expand Down Expand Up @@ -61,7 +62,7 @@
'.build.board': 'ESP8266_GENERIC',
},
'macro': [
'resetmethod_menu',
'resetmethod_menu_all',
'crystalfreq_menu',
'flashfreq_menu',
'flashmode_menu',
Expand Down Expand Up @@ -271,7 +272,7 @@
'.build.board': 'ESP8266_ESP01',
},
'macro': [
'resetmethod_menu',
'resetmethod_menu_all',
'crystalfreq_menu',
'flashmode_dout',
'flashfreq_40',
Expand Down Expand Up @@ -761,6 +762,13 @@
####################### menu.resetmethod

'resetmethod_menu': collections.OrderedDict([
( '.menu.ResetMethod.ck', 'ck' ),
( '.menu.ResetMethod.ck.upload.resetmethod', 'ck' ),
( '.menu.ResetMethod.nodemcu', 'nodemcu' ),
( '.menu.ResetMethod.nodemcu.upload.resetmethod', 'nodemcu' ),
]),

'resetmethod_menu_all': collections.OrderedDict([
Copy link
Collaborator

Choose a reason for hiding this comment

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

What do you think of calling this one _extra and leaving in it only none and dtrset, then use it only in generic boards?

( '.menu.ResetMethod.ck', 'ck' ),
( '.menu.ResetMethod.ck.upload.resetmethod', 'ck' ),
( '.menu.ResetMethod.nodemcu', 'nodemcu' ),
Expand Down