Skip to content

Commit 8a24598

Browse files
mribbled-a-v
authored andcommitted
Add missing esptool upload modes for none and dtrset (#4228)
* Add missing esptool upload modes for none and dtrset
1 parent 575c45d commit 8a24598

File tree

2 files changed

+39
-3
lines changed

2 files changed

+39
-3
lines changed

boards.txt

+28
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ generic.menu.ResetMethod.ck=ck
3838
generic.menu.ResetMethod.ck.upload.resetmethod=ck
3939
generic.menu.ResetMethod.nodemcu=nodemcu
4040
generic.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
41+
generic.menu.ResetMethod.none=none
42+
generic.menu.ResetMethod.none.upload.resetmethod=none
43+
generic.menu.ResetMethod.dtrset=dtrset
44+
generic.menu.ResetMethod.dtrset.upload.resetmethod=dtrset
4145
generic.menu.CrystalFreq.26=26 MHz
4246
generic.menu.CrystalFreq.40=40 MHz
4347
generic.menu.CrystalFreq.40.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
@@ -319,6 +323,10 @@ esp8285.menu.ResetMethod.ck=ck
319323
esp8285.menu.ResetMethod.ck.upload.resetmethod=ck
320324
esp8285.menu.ResetMethod.nodemcu=nodemcu
321325
esp8285.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
326+
esp8285.menu.ResetMethod.none=none
327+
esp8285.menu.ResetMethod.none.upload.resetmethod=none
328+
esp8285.menu.ResetMethod.dtrset=dtrset
329+
esp8285.menu.ResetMethod.dtrset.upload.resetmethod=dtrset
322330
esp8285.menu.CrystalFreq.26=26 MHz
323331
esp8285.menu.CrystalFreq.40=40 MHz
324332
esp8285.menu.CrystalFreq.40.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
@@ -809,6 +817,10 @@ espresso_lite_v1.menu.ResetMethod.ck=ck
809817
espresso_lite_v1.menu.ResetMethod.ck.upload.resetmethod=ck
810818
espresso_lite_v1.menu.ResetMethod.nodemcu=nodemcu
811819
espresso_lite_v1.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
820+
espresso_lite_v1.menu.ResetMethod.none=none
821+
espresso_lite_v1.menu.ResetMethod.none.upload.resetmethod=none
822+
espresso_lite_v1.menu.ResetMethod.dtrset=dtrset
823+
espresso_lite_v1.menu.ResetMethod.dtrset.upload.resetmethod=dtrset
812824
espresso_lite_v1.menu.LwIPVariant.v2mss536=v2 Prebuilt (MSS=536)
813825
espresso_lite_v1.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
814826
espresso_lite_v1.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
@@ -939,6 +951,10 @@ espresso_lite_v2.menu.ResetMethod.ck=ck
939951
espresso_lite_v2.menu.ResetMethod.ck.upload.resetmethod=ck
940952
espresso_lite_v2.menu.ResetMethod.nodemcu=nodemcu
941953
espresso_lite_v2.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
954+
espresso_lite_v2.menu.ResetMethod.none=none
955+
espresso_lite_v2.menu.ResetMethod.none.upload.resetmethod=none
956+
espresso_lite_v2.menu.ResetMethod.dtrset=dtrset
957+
espresso_lite_v2.menu.ResetMethod.dtrset.upload.resetmethod=dtrset
942958
espresso_lite_v2.menu.LwIPVariant.v2mss536=v2 Prebuilt (MSS=536)
943959
espresso_lite_v2.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
944960
espresso_lite_v2.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
@@ -1069,6 +1085,10 @@ phoenix_v1.menu.ResetMethod.ck=ck
10691085
phoenix_v1.menu.ResetMethod.ck.upload.resetmethod=ck
10701086
phoenix_v1.menu.ResetMethod.nodemcu=nodemcu
10711087
phoenix_v1.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
1088+
phoenix_v1.menu.ResetMethod.none=none
1089+
phoenix_v1.menu.ResetMethod.none.upload.resetmethod=none
1090+
phoenix_v1.menu.ResetMethod.dtrset=dtrset
1091+
phoenix_v1.menu.ResetMethod.dtrset.upload.resetmethod=dtrset
10721092
phoenix_v1.menu.LwIPVariant.v2mss536=v2 Prebuilt (MSS=536)
10731093
phoenix_v1.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
10741094
phoenix_v1.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
@@ -1199,6 +1219,10 @@ phoenix_v2.menu.ResetMethod.ck=ck
11991219
phoenix_v2.menu.ResetMethod.ck.upload.resetmethod=ck
12001220
phoenix_v2.menu.ResetMethod.nodemcu=nodemcu
12011221
phoenix_v2.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
1222+
phoenix_v2.menu.ResetMethod.none=none
1223+
phoenix_v2.menu.ResetMethod.none.upload.resetmethod=none
1224+
phoenix_v2.menu.ResetMethod.dtrset=dtrset
1225+
phoenix_v2.menu.ResetMethod.dtrset.upload.resetmethod=dtrset
12021226
phoenix_v2.menu.LwIPVariant.v2mss536=v2 Prebuilt (MSS=536)
12031227
phoenix_v2.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
12041228
phoenix_v2.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
@@ -2620,6 +2644,10 @@ espino.menu.ResetMethod.ck=ck
26202644
espino.menu.ResetMethod.ck.upload.resetmethod=ck
26212645
espino.menu.ResetMethod.nodemcu=nodemcu
26222646
espino.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
2647+
espino.menu.ResetMethod.none=none
2648+
espino.menu.ResetMethod.none.upload.resetmethod=none
2649+
espino.menu.ResetMethod.dtrset=dtrset
2650+
espino.menu.ResetMethod.dtrset.upload.resetmethod=dtrset
26232651
espino.build.flash_mode=qio
26242652
espino.build.flash_freq=40
26252653
espino.menu.FlashSize.4M1M=4M (1M SPIFFS)

tools/boards.txt.py

+11-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
# opts: specific entries dicts (overrides same entry in macros)
2222
# macro: common entries
2323
# unmodifiable parameters:
24-
# resetmethod_ck/_nodemcu/_none: fixed reset method
25-
# flashmode_qio/_dio/_qout/_dout: fixed flash mode
26-
# flashfreq_40/_80: fixed flash frequency
24+
# resetmethod_ck/_nodemcu/_none/_dtrset: fixed reset method
25+
# flashmode_qio/_dio/_qout/_dout: fixed flash mode
26+
# flashfreq_40/_80: fixed flash frequency
2727
# selection menu:
2828
# resetmethod_menu menus for reset method
2929
# crystalfreq/flashfreq_menu: menus for crystal/flash frequency selection
@@ -765,6 +765,10 @@
765765
( '.menu.ResetMethod.ck.upload.resetmethod', 'ck' ),
766766
( '.menu.ResetMethod.nodemcu', 'nodemcu' ),
767767
( '.menu.ResetMethod.nodemcu.upload.resetmethod', 'nodemcu' ),
768+
( '.menu.ResetMethod.none', 'none' ),
769+
( '.menu.ResetMethod.none.upload.resetmethod', 'none' ),
770+
( '.menu.ResetMethod.dtrset', 'dtrset' ),
771+
( '.menu.ResetMethod.dtrset.upload.resetmethod', 'dtrset' ),
768772
]),
769773

770774
####################### upload.resetmethod
@@ -780,6 +784,10 @@
780784
'resetmethod_none': collections.OrderedDict([
781785
( '.upload.resetmethod', 'none' ),
782786
]),
787+
788+
'resetmethod_dtrset': collections.OrderedDict([
789+
( '.upload.resetmethod', 'dtrset' ),
790+
]),
783791

784792
####################### menu.FlashMode
785793

0 commit comments

Comments
 (0)