From 2400e7494ea8f5c9952424c6278260659dd62cd9 Mon Sep 17 00:00:00 2001 From: Maurice Ribble Date: Thu, 25 Jan 2018 11:48:40 -0500 Subject: [PATCH 1/2] Add a new resetmethod_menu_all macro to give the choice of all the reset options. Then only offer all these options for the generic modules. --- boards.txt | 20 -------------------- tools/boards.txt.py | 12 ++++++++++-- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/boards.txt b/boards.txt index 2058d96e7d..0839b9a3ef 100644 --- a/boards.txt +++ b/boards.txt @@ -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 @@ -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 @@ -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 @@ -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 @@ -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) diff --git a/tools/boards.txt.py b/tools/boards.txt.py index 79bace0e47..8462e76d4e 100755 --- a/tools/boards.txt.py +++ b/tools/boards.txt.py @@ -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 @@ -61,7 +62,7 @@ '.build.board': 'ESP8266_GENERIC', }, 'macro': [ - 'resetmethod_menu', + 'resetmethod_menu_all', 'crystalfreq_menu', 'flashfreq_menu', 'flashmode_menu', @@ -271,7 +272,7 @@ '.build.board': 'ESP8266_ESP01', }, 'macro': [ - 'resetmethod_menu', + 'resetmethod_menu_all', 'crystalfreq_menu', 'flashmode_dout', 'flashfreq_40', @@ -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([ ( '.menu.ResetMethod.ck', 'ck' ), ( '.menu.ResetMethod.ck.upload.resetmethod', 'ck' ), ( '.menu.ResetMethod.nodemcu', 'nodemcu' ), From 8fe27272e3d4d0633005f734799089a00390a66c Mon Sep 17 00:00:00 2001 From: Maurice Ribble Date: Fri, 26 Jan 2018 08:32:48 -0500 Subject: [PATCH 2/2] Change reset menu from all to extra. This gets rid of duplicated code --- tools/boards.txt.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/boards.txt.py b/tools/boards.txt.py index 8462e76d4e..c286ee13fa 100755 --- a/tools/boards.txt.py +++ b/tools/boards.txt.py @@ -26,7 +26,7 @@ # flashfreq_40/_80: fixed flash frequency # selection menu: # resetmethod_menu menus for reset method -# resetmethod_menu_all menus for all reset methods +# resetmethod_menu_extra menus for additional 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 @@ -62,7 +62,8 @@ '.build.board': 'ESP8266_GENERIC', }, 'macro': [ - 'resetmethod_menu_all', + 'resetmethod_menu', + 'resetmethod_menu_extra', 'crystalfreq_menu', 'flashfreq_menu', 'flashmode_menu', @@ -272,7 +273,8 @@ '.build.board': 'ESP8266_ESP01', }, 'macro': [ - 'resetmethod_menu_all', + 'resetmethod_menu', + 'resetmethod_menu_extra', 'crystalfreq_menu', 'flashmode_dout', 'flashfreq_40', @@ -768,11 +770,7 @@ ( '.menu.ResetMethod.nodemcu.upload.resetmethod', 'nodemcu' ), ]), - 'resetmethod_menu_all': collections.OrderedDict([ - ( '.menu.ResetMethod.ck', 'ck' ), - ( '.menu.ResetMethod.ck.upload.resetmethod', 'ck' ), - ( '.menu.ResetMethod.nodemcu', 'nodemcu' ), - ( '.menu.ResetMethod.nodemcu.upload.resetmethod', 'nodemcu' ), + 'resetmethod_menu_extra': collections.OrderedDict([ ( '.menu.ResetMethod.none', 'none' ), ( '.menu.ResetMethod.none.upload.resetmethod', 'none' ), ( '.menu.ResetMethod.dtrset', 'dtrset' ),