arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-06 05:21:22 +03:00
Code

Add a new resetmethod_menu_all macro (#4241)

Browse Source 
* Add a new resetmethod_menu_extra macro to give the choice of all the reset options.  Then only offer all these options for the generic modules.
This commit is contained in:
Maurice Ribble 2018-01-26 20:04:22 -05:00 committed by david gauchard
parent 8a24598d5d
commit 4e539b2618
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
boards.txt
View File

@ -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.ck.upload.resetmethod=ck
espresso_lite_v1.menu.ResetMethod.nodemcu=nodemcu espresso_lite_v1.menu.ResetMethod.nodemcu=nodemcu
espresso_lite_v1.menu.ResetMethod.nodemcu.upload.resetmethod=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=v2 Prebuilt (MSS=536)
espresso_lite_v1.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include espresso_lite_v1.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
espresso_lite_v1.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 espresso_lite_v1.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
@ -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.ck.upload.resetmethod=ck
espresso_lite_v2.menu.ResetMethod.nodemcu=nodemcu espresso_lite_v2.menu.ResetMethod.nodemcu=nodemcu
espresso_lite_v2.menu.ResetMethod.nodemcu.upload.resetmethod=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=v2 Prebuilt (MSS=536)
espresso_lite_v2.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include espresso_lite_v2.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
espresso_lite_v2.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 espresso_lite_v2.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
@ -1085,10 +1077,6 @@ phoenix_v1.menu.ResetMethod.ck=ck
phoenix_v1.menu.ResetMethod.ck.upload.resetmethod=ck phoenix_v1.menu.ResetMethod.ck.upload.resetmethod=ck
phoenix_v1.menu.ResetMethod.nodemcu=nodemcu phoenix_v1.menu.ResetMethod.nodemcu=nodemcu
phoenix_v1.menu.ResetMethod.nodemcu.upload.resetmethod=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=v2 Prebuilt (MSS=536)
phoenix_v1.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include phoenix_v1.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
phoenix_v1.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 phoenix_v1.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
@ -1219,10 +1207,6 @@ phoenix_v2.menu.ResetMethod.ck=ck
phoenix_v2.menu.ResetMethod.ck.upload.resetmethod=ck phoenix_v2.menu.ResetMethod.ck.upload.resetmethod=ck
phoenix_v2.menu.ResetMethod.nodemcu=nodemcu phoenix_v2.menu.ResetMethod.nodemcu=nodemcu
phoenix_v2.menu.ResetMethod.nodemcu.upload.resetmethod=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=v2 Prebuilt (MSS=536)
phoenix_v2.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include phoenix_v2.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
phoenix_v2.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 phoenix_v2.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
@ -2644,10 +2628,6 @@ espino.menu.ResetMethod.ck=ck
espino.menu.ResetMethod.ck.upload.resetmethod=ck espino.menu.ResetMethod.ck.upload.resetmethod=ck
espino.menu.ResetMethod.nodemcu=nodemcu espino.menu.ResetMethod.nodemcu=nodemcu
espino.menu.ResetMethod.nodemcu.upload.resetmethod=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_mode=qio
espino.build.flash_freq=40 espino.build.flash_freq=40
espino.menu.FlashSize.4M1M=4M (1M SPIFFS) espino.menu.FlashSize.4M1M=4M (1M SPIFFS)

6
tools/boards.txt.py
View File

@ -26,6 +26,7 @@
# flashfreq_40/_80: fixed flash frequency # flashfreq_40/_80: fixed flash frequency
# selection menu: # selection menu:
# resetmethod_menu menus for reset method # resetmethod_menu menus for reset method
# resetmethod_menu_extra menus for additional reset methods
# crystalfreq/flashfreq_menu: menus for crystal/flash frequency selection # crystalfreq/flashfreq_menu: menus for crystal/flash frequency selection
# flashmode_menu: menus for flashmode selection (dio/dout/qio/qout) # flashmode_menu: menus for flashmode selection (dio/dout/qio/qout)
# 512K/1M/2M/4M/8M/16M: menus for flash & SPIFFS size # 512K/1M/2M/4M/8M/16M: menus for flash & SPIFFS size
@ -62,6 +63,7 @@ boards = collections.OrderedDict([
}, },
'macro': [ 'macro': [
'resetmethod_menu', 'resetmethod_menu',
'resetmethod_menu_extra',
'crystalfreq_menu', 'crystalfreq_menu',
'flashfreq_menu', 'flashfreq_menu',
'flashmode_menu', 'flashmode_menu',
@ -272,6 +274,7 @@ boards = collections.OrderedDict([
}, },
'macro': [ 'macro': [
'resetmethod_menu', 'resetmethod_menu',
'resetmethod_menu_extra',
'crystalfreq_menu', 'crystalfreq_menu',
'flashmode_dout', 'flashmode_dout',
'flashfreq_40', 'flashfreq_40',
@ -765,6 +768,9 @@ macros = {
( '.menu.ResetMethod.ck.upload.resetmethod', 'ck' ), ( '.menu.ResetMethod.ck.upload.resetmethod', 'ck' ),
( '.menu.ResetMethod.nodemcu', 'nodemcu' ), ( '.menu.ResetMethod.nodemcu', 'nodemcu' ),
( '.menu.ResetMethod.nodemcu.upload.resetmethod', 'nodemcu' ), ( '.menu.ResetMethod.nodemcu.upload.resetmethod', 'nodemcu' ),
]),
'resetmethod_menu_extra': collections.OrderedDict([
( '.menu.ResetMethod.none', 'none' ), ( '.menu.ResetMethod.none', 'none' ),
( '.menu.ResetMethod.none.upload.resetmethod', 'none' ), ( '.menu.ResetMethod.none.upload.resetmethod', 'none' ),
( '.menu.ResetMethod.dtrset', 'dtrset' ), ( '.menu.ResetMethod.dtrset', 'dtrset' ),