Skip to content

Commit 1b133a8

Browse files
f5sohf5soh
committed
Keep previous resetmethod names and translate to esptool.py options
1 parent e00d555 commit 1b133a8

File tree

2 files changed

+59
-73
lines changed

2 files changed

+59
-73
lines changed

‎boards.txt

+29-29
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ generic.menu.ssl.all=All SSL ciphers (most compatible)
6161
generic.menu.ssl.all.build.sslflags=
6262
generic.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
6363
generic.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
64-
generic.menu.ResetMethod.dtr=dtr
65-
generic.menu.ResetMethod.dtr.upload.resetmethod=--before default_reset --after hard_reset
66-
generic.menu.ResetMethod.nodtr=no dtr
67-
generic.menu.ResetMethod.nodtr.upload.resetmethod=--before no_reset --after soft_reset
64+
generic.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
65+
generic.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
66+
generic.menu.ResetMethod.ck=no dtr (aka ck)
67+
generic.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
6868
generic.menu.ResetMethod.nodtr_nosync=no dtr, no_sync
6969
generic.menu.ResetMethod.nodtr_nosync.upload.resetmethod=--before no_reset_no_sync --after soft_reset
7070
generic.menu.CrystalFreq.26=26 MHz
@@ -526,10 +526,10 @@ esp8285.menu.ssl.all=All SSL ciphers (most compatible)
526526
esp8285.menu.ssl.all.build.sslflags=
527527
esp8285.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
528528
esp8285.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
529-
esp8285.menu.ResetMethod.dtr=dtr
530-
esp8285.menu.ResetMethod.dtr.upload.resetmethod=--before default_reset --after hard_reset
531-
esp8285.menu.ResetMethod.nodtr=no dtr
532-
esp8285.menu.ResetMethod.nodtr.upload.resetmethod=--before no_reset --after soft_reset
529+
esp8285.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
530+
esp8285.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
531+
esp8285.menu.ResetMethod.ck=no dtr (aka ck)
532+
esp8285.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
533533
esp8285.menu.ResetMethod.nodtr_nosync=no dtr, no_sync
534534
esp8285.menu.ResetMethod.nodtr_nosync.upload.resetmethod=--before no_reset_no_sync --after soft_reset
535535
esp8285.menu.CrystalFreq.26=26 MHz
@@ -1624,10 +1624,10 @@ espresso_lite_v1.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
16241624
espresso_lite_v1.menu.eesz.4M.build.spiffs_pagesize=256
16251625
espresso_lite_v1.menu.eesz.4M.upload.maximum_size=1044464
16261626
espresso_lite_v1.menu.eesz.4M.build.rfcal_addr=0x3FC000
1627-
espresso_lite_v1.menu.ResetMethod.dtr=dtr
1628-
espresso_lite_v1.menu.ResetMethod.dtr.upload.resetmethod=--before default_reset --after hard_reset
1629-
espresso_lite_v1.menu.ResetMethod.nodtr=no dtr
1630-
espresso_lite_v1.menu.ResetMethod.nodtr.upload.resetmethod=--before no_reset --after soft_reset
1627+
espresso_lite_v1.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
1628+
espresso_lite_v1.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
1629+
espresso_lite_v1.menu.ResetMethod.ck=no dtr (aka ck)
1630+
espresso_lite_v1.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
16311631
espresso_lite_v1.menu.ip.lm2f=v2 Lower Memory
16321632
espresso_lite_v1.menu.ip.lm2f.build.lwip_include=lwip2/include
16331633
espresso_lite_v1.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
@@ -1820,10 +1820,10 @@ espresso_lite_v2.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
18201820
espresso_lite_v2.menu.eesz.4M.build.spiffs_pagesize=256
18211821
espresso_lite_v2.menu.eesz.4M.upload.maximum_size=1044464
18221822
espresso_lite_v2.menu.eesz.4M.build.rfcal_addr=0x3FC000
1823-
espresso_lite_v2.menu.ResetMethod.dtr=dtr
1824-
espresso_lite_v2.menu.ResetMethod.dtr.upload.resetmethod=--before default_reset --after hard_reset
1825-
espresso_lite_v2.menu.ResetMethod.nodtr=no dtr
1826-
espresso_lite_v2.menu.ResetMethod.nodtr.upload.resetmethod=--before no_reset --after soft_reset
1823+
espresso_lite_v2.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
1824+
espresso_lite_v2.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
1825+
espresso_lite_v2.menu.ResetMethod.ck=no dtr (aka ck)
1826+
espresso_lite_v2.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
18271827
espresso_lite_v2.menu.ip.lm2f=v2 Lower Memory
18281828
espresso_lite_v2.menu.ip.lm2f.build.lwip_include=lwip2/include
18291829
espresso_lite_v2.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
@@ -2016,10 +2016,10 @@ phoenix_v1.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
20162016
phoenix_v1.menu.eesz.4M.build.spiffs_pagesize=256
20172017
phoenix_v1.menu.eesz.4M.upload.maximum_size=1044464
20182018
phoenix_v1.menu.eesz.4M.build.rfcal_addr=0x3FC000
2019-
phoenix_v1.menu.ResetMethod.dtr=dtr
2020-
phoenix_v1.menu.ResetMethod.dtr.upload.resetmethod=--before default_reset --after hard_reset
2021-
phoenix_v1.menu.ResetMethod.nodtr=no dtr
2022-
phoenix_v1.menu.ResetMethod.nodtr.upload.resetmethod=--before no_reset --after soft_reset
2019+
phoenix_v1.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
2020+
phoenix_v1.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
2021+
phoenix_v1.menu.ResetMethod.ck=no dtr (aka ck)
2022+
phoenix_v1.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
20232023
phoenix_v1.menu.ip.lm2f=v2 Lower Memory
20242024
phoenix_v1.menu.ip.lm2f.build.lwip_include=lwip2/include
20252025
phoenix_v1.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
@@ -2212,10 +2212,10 @@ phoenix_v2.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
22122212
phoenix_v2.menu.eesz.4M.build.spiffs_pagesize=256
22132213
phoenix_v2.menu.eesz.4M.upload.maximum_size=1044464
22142214
phoenix_v2.menu.eesz.4M.build.rfcal_addr=0x3FC000
2215-
phoenix_v2.menu.ResetMethod.dtr=dtr
2216-
phoenix_v2.menu.ResetMethod.dtr.upload.resetmethod=--before default_reset --after hard_reset
2217-
phoenix_v2.menu.ResetMethod.nodtr=no dtr
2218-
phoenix_v2.menu.ResetMethod.nodtr.upload.resetmethod=--before no_reset --after soft_reset
2215+
phoenix_v2.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
2216+
phoenix_v2.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
2217+
phoenix_v2.menu.ResetMethod.ck=no dtr (aka ck)
2218+
phoenix_v2.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
22192219
phoenix_v2.menu.ip.lm2f=v2 Lower Memory
22202220
phoenix_v2.menu.ip.lm2f.build.lwip_include=lwip2/include
22212221
phoenix_v2.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
@@ -4341,10 +4341,10 @@ espino.menu.ssl.all=All SSL ciphers (most compatible)
43414341
espino.menu.ssl.all.build.sslflags=
43424342
espino.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
43434343
espino.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
4344-
espino.menu.ResetMethod.dtr=dtr
4345-
espino.menu.ResetMethod.dtr.upload.resetmethod=--before default_reset --after hard_reset
4346-
espino.menu.ResetMethod.nodtr=no dtr
4347-
espino.menu.ResetMethod.nodtr.upload.resetmethod=--before no_reset --after soft_reset
4344+
espino.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
4345+
espino.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
4346+
espino.menu.ResetMethod.ck=no dtr (aka ck)
4347+
espino.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
43484348
espino.build.flash_mode=qio
43494349
espino.build.flash_flags=-DFLASHMODE_QIO
43504350
espino.build.flash_freq=40
@@ -5383,7 +5383,7 @@ oak.menu.ssl.all=All SSL ciphers (most compatible)
53835383
oak.menu.ssl.all.build.sslflags=
53845384
oak.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
53855385
oak.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
5386-
oak.upload.resetmethod=none
5386+
oak.upload.resetmethod=--before no_reset --after soft_reset
53875387
oak.build.flash_mode=dio
53885388
oak.build.flash_flags=-DFLASHMODE_DIO
53895389
oak.build.flash_freq=40

‎tools/boards.txt.py

+30-44
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@
319319
'.build.variant': 'adafruit',
320320
},
321321
'macro': [
322-
'resetmethod_dtr',
322+
'resetmethod_nodemcu',
323323
'flashmode_qio',
324324
'flashfreq_40',
325325
'4M',
@@ -336,7 +336,7 @@
336336
'.build.variant': 'inventone',
337337
},
338338
'macro': [
339-
'resetmethod_dtr',
339+
'resetmethod_nodemcu',
340340
'flashmode_dio',
341341
'flashfreq_40',
342342
'4M',
@@ -353,7 +353,7 @@
353353
'.build.variant': 'xinabox',
354354
},
355355
'macro': [
356-
'resetmethod_dtr',
356+
'resetmethod_nodemcu',
357357
'crystalfreq_menu',
358358
'flashmode_dio',
359359
'flashfreq_40',
@@ -427,7 +427,7 @@
427427
'.build.variant': 'nodemcu',
428428
},
429429
'macro': [
430-
'resetmethod_dtr',
430+
'resetmethod_nodemcu',
431431
'flashmode_qio',
432432
'flashfreq_40',
433433
'4M',
@@ -461,7 +461,7 @@
461461
'.build.variant': 'nodemcu',
462462
},
463463
'macro': [
464-
'resetmethod_dtr',
464+
'resetmethod_nodemcu',
465465
'flashmode_dio',
466466
'flashfreq_40',
467467
'4M',
@@ -486,7 +486,7 @@
486486
'.build.variant': 'modwifi',
487487
},
488488
'macro': [
489-
'resetmethod_cktmp',
489+
'resetmethod_ck',
490490
'flashmode_qio',
491491
'flashfreq_40',
492492
'2M',
@@ -511,7 +511,7 @@
511511
'.build.variant': 'thing',
512512
},
513513
'macro': [
514-
'resetmethod_cktmp',
514+
'resetmethod_ck',
515515
'flashmode_qio',
516516
'flashfreq_40',
517517
'512K',
@@ -525,7 +525,7 @@
525525
'.build.variant': 'thing',
526526
},
527527
'macro': [
528-
'resetmethod_dtr',
528+
'resetmethod_nodemcu',
529529
'flashmode_dio',
530530
'flashfreq_40',
531531
'512K',
@@ -538,7 +538,7 @@
538538
'.build.board': 'ESP8266_ESP210',
539539
},
540540
'macro': [
541-
'resetmethod_cktmp',
541+
'resetmethod_ck',
542542
'flashmode_qio',
543543
'flashfreq_40',
544544
'4M',
@@ -553,7 +553,7 @@
553553
'.build.variant': 'd1_mini',
554554
},
555555
'macro': [
556-
'resetmethod_dtr',
556+
'resetmethod_nodemcu',
557557
'flashmode_dio',
558558
'flashfreq_40',
559559
'4M',
@@ -568,7 +568,7 @@
568568
'.build.variant': 'd1_mini',
569569
},
570570
'macro': [
571-
'resetmethod_dtr',
571+
'resetmethod_nodemcu',
572572
'flashmode_dio',
573573
'flashfreq_40',
574574
'16M',
@@ -583,7 +583,7 @@
583583
'.build.variant': 'd1_mini',
584584
},
585585
'macro': [
586-
'resetmethod_dtr',
586+
'resetmethod_nodemcu',
587587
'flashmode_dout',
588588
'flashfreq_40',
589589
'1M',
@@ -621,7 +621,7 @@
621621
'.build.variant': 'd1',
622622
},
623623
'macro': [
624-
'resetmethod_dtr',
624+
'resetmethod_nodemcu',
625625
'flashmode_dio',
626626
'flashfreq_40',
627627
'4M',
@@ -655,7 +655,7 @@
655655
'.build.variant': 'espinotee',
656656
},
657657
'macro': [
658-
'resetmethod_dtr',
658+
'resetmethod_nodemcu',
659659
'flashmode_qio',
660660
'flashfreq_40',
661661
'4M',
@@ -696,7 +696,7 @@
696696
( '.menu.ESPModule.ESP12.upload.maximum_size', '1044464' ),
697697
]),
698698
'macro': [
699-
'resetmethod_dtr',
699+
'resetmethod_nodemcu',
700700
'flashmode_qio',
701701
'flashfreq_menu',
702702
'1M',
@@ -724,7 +724,7 @@
724724
( '.menu.BoardModel.starottodeved.build.extra_flags', '-DF_CRYSTAL=40000000 -DESP8266' ),
725725
]),
726726
'macro': [
727-
'resetmethod_cktmp',
727+
'resetmethod_ck',
728728
'flashmode_qio',
729729
'flashfreq_40',
730730
'4M',
@@ -739,7 +739,7 @@
739739
'.build.variant': 'generic',
740740
},
741741
'macro': [
742-
'resetmethod_dtr',
742+
'resetmethod_nodemcu',
743743
'flashmode_dio',
744744
'flashfreq_80',
745745
'512K',
@@ -783,7 +783,7 @@
783783
'.build.variant': 'wifiduino',
784784
},
785785
'macro': [
786-
'resetmethod_dtr',
786+
'resetmethod_nodemcu',
787787
'flashmode_dio',
788788
'flashfreq_40',
789789
'4M',
@@ -798,7 +798,7 @@
798798
'.build.variant': 'wifi_slot',
799799
},
800800
'macro': [
801-
'resetmethod_dtr',
801+
'resetmethod_nodemcu',
802802
'flashfreq_menu',
803803
'flashmode_menu',
804804
'1M', '2M',
@@ -812,7 +812,7 @@
812812
'.build.variant': 'wiolink',
813813
},
814814
'macro': [
815-
'resetmethod_dtr',
815+
'resetmethod_nodemcu',
816816
'flashmode_qio',
817817
'flashfreq_40',
818818
'4M',
@@ -831,7 +831,7 @@
831831
'.build.variant': 'espectro',
832832
},
833833
'macro': [
834-
'resetmethod_dtr',
834+
'resetmethod_nodemcu',
835835
'flashmode_dio',
836836
'flashfreq_40',
837837
'4M',
@@ -918,53 +918,39 @@
918918
####################### menu.resetmethod
919919

920920
'resetmethod_menu': collections.OrderedDict([
921-
( '.menu.ResetMethod.dtr', 'dtr' ),
922-
( '.menu.ResetMethod.dtr.upload.resetmethod', '--before default_reset --after hard_reset' ),
923-
( '.menu.ResetMethod.nodtr', 'no dtr' ),
924-
( '.menu.ResetMethod.nodtr.upload.resetmethod', '--before no_reset --after soft_reset' ),
921+
( '.menu.ResetMethod.nodemcu', 'dtr (aka nodemcu)' ),
922+
( '.menu.ResetMethod.nodemcu.upload.resetmethod', '--before default_reset --after hard_reset' ),
923+
( '.menu.ResetMethod.ck', 'no dtr (aka ck)' ),
924+
( '.menu.ResetMethod.ck.upload.resetmethod', '--before no_reset --after soft_reset' ),
925925
]),
926926

927927
'resetmethod_menu_extra': collections.OrderedDict([
928928
( '.menu.ResetMethod.nodtr_nosync', 'no dtr, no_sync' ),
929929
( '.menu.ResetMethod.nodtr_nosync.upload.resetmethod', '--before no_reset_no_sync --after soft_reset' ),
930930
]),
931931

932-
####################### upload.resetmethod (unused, old esptool-ck)
932+
####################### upload.resetmethod (new esptool.py options)
933933

934934
'resetmethod_ck': collections.OrderedDict([
935-
( '.upload.resetmethod', 'ck' ),
935+
( '.upload.resetmethod', '--before no_reset --after soft_reset' ),
936936
]),
937937

938938
'resetmethod_nodemcu': collections.OrderedDict([
939-
( '.upload.resetmethod', 'nodemcu' ),
939+
( '.upload.resetmethod', '--before default_reset --after hard_reset' ),
940940
]),
941941

942942
'resetmethod_none': collections.OrderedDict([
943-
( '.upload.resetmethod', 'none' ),
943+
( '.upload.resetmethod', '--before no_reset --after soft_reset' ),
944944
]),
945945

946946
'resetmethod_dtrset': collections.OrderedDict([
947-
( '.upload.resetmethod', 'dtrset' ),
948-
]),
949-
950-
####################### upload.resetmethod (new esptool.py)
951-
952-
'resetmethod_dtr': collections.OrderedDict([
953947
( '.upload.resetmethod', '--before default_reset --after hard_reset' ),
954948
]),
955949

956-
'resetmethod_nodtr': collections.OrderedDict([
957-
( '.upload.resetmethod', '--before no_reset --after soft_reset' ),
958-
]),
959-
960950
'resetmethod_nodtr_nosync': collections.OrderedDict([
961951
( '.upload.resetmethod', '--before no_reset_no_sync --after soft_reset' ),
962952
]),
963-
964-
'resetmethod_cktmp': collections.OrderedDict([
965-
( '.upload.resetmethod', '--before no_reset --after soft_reset' ),
966-
]),
967-
953+
968954
####################### menu.FlashMode
969955

970956
'flashmode_menu': collections.OrderedDict([

0 commit comments

Comments
 (0)