From 8a24598d5dbf46effc5ac9189224601950736a70 Mon Sep 17 00:00:00 2001 From: Maurice Ribble Date: Wed, 24 Jan 2018 09:20:04 -0500 Subject: [PATCH] Add missing esptool upload modes for none and dtrset (#4228) * Add missing esptool upload modes for none and dtrset --- boards.txt | 28 ++++++++++++++++++++++++++++ tools/boards.txt.py | 14 +++++++++++--- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/boards.txt b/boards.txt index 2a6df3cfb..2058d96e7 100644 --- a/boards.txt +++ b/boards.txt @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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) diff --git a/tools/boards.txt.py b/tools/boards.txt.py index 442f1d560..79bace0e4 100755 --- a/tools/boards.txt.py +++ b/tools/boards.txt.py @@ -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 @@ -765,6 +765,10 @@ macros = { ( '.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 @@ -780,6 +784,10 @@ macros = { 'resetmethod_none': collections.OrderedDict([ ( '.upload.resetmethod', 'none' ), ]), + + 'resetmethod_dtrset': collections.OrderedDict([ + ( '.upload.resetmethod', 'dtrset' ), + ]), ####################### menu.FlashMode