Skip to content

Commit d19fc3b

Browse files
d-a-vd-a-v
authored
fix boards.txt.py with python3 (#5887)
* fix boards.txt.py with python3 * fix boards.txt.py to generate same order when using python2 or python3
1 parent a3ea816 commit d19fc3b

File tree

2 files changed

+62
-62
lines changed

2 files changed

+62
-62
lines changed

‎boards.txt

+23-23
Original file line numberDiff line numberDiff line change
@@ -4475,25 +4475,25 @@ espinotee.menu.baud.921600.upload.speed=921600
44754475

44764476
##############################################################
44774477
wifinfo.name=WifInfo
4478-
wifinfo.menu.ESPModule.ESP12.build.board=ESP8266_ESP12
4479-
wifinfo.menu.ESPModule.ESP12.upload.maximum_size=1044464
4480-
wifinfo.menu.ESPModule.ESP12.build.spiffs_pagesize=256
4481-
wifinfo.menu.ESPModule.ESP12.build.flash_ld=eagle.flash.4m1m.ld
4482-
wifinfo.menu.ESPModule.ESP07192.build.spiffs_blocksize=4096
4478+
wifinfo.build.board=WIFINFO
4479+
wifinfo.build.variant=wifinfo
4480+
wifinfo.menu.ESPModule.ESP07192=ESP07 (1M/192K SPIFFS)
4481+
wifinfo.menu.ESPModule.ESP07192.build.board=ESP8266_ESP07
4482+
wifinfo.menu.ESPModule.ESP07192.build.flash_size=1M
4483+
wifinfo.menu.ESPModule.ESP07192.build.flash_ld=eagle.flash.1m192.ld
4484+
wifinfo.menu.ESPModule.ESP07192.build.spiffs_start=0xCB000
44834485
wifinfo.menu.ESPModule.ESP07192.build.spiffs_end=0xFB000
4486+
wifinfo.menu.ESPModule.ESP07192.build.spiffs_blocksize=4096
4487+
wifinfo.menu.ESPModule.ESP07192.upload.maximum_size=827376
44844488
wifinfo.menu.ESPModule.ESP12=ESP12 (4M/1M SPIFFS)
4489+
wifinfo.menu.ESPModule.ESP12.build.board=ESP8266_ESP12
4490+
wifinfo.menu.ESPModule.ESP12.build.flash_size=4M
4491+
wifinfo.menu.ESPModule.ESP12.build.flash_ld=eagle.flash.4m1m.ld
44854492
wifinfo.menu.ESPModule.ESP12.build.spiffs_start=0x300000
44864493
wifinfo.menu.ESPModule.ESP12.build.spiffs_end=0x3FB000
4487-
wifinfo.menu.ESPModule.ESP07192.build.spiffs_start=0xCB000
4488-
wifinfo.menu.ESPModule.ESP07192.build.board=ESP8266_ESP07
44894494
wifinfo.menu.ESPModule.ESP12.build.spiffs_blocksize=8192
4490-
wifinfo.menu.ESPModule.ESP12.build.flash_size=4M
4491-
wifinfo.build.board=WIFINFO
4492-
wifinfo.build.variant=wifinfo
4493-
wifinfo.menu.ESPModule.ESP07192.build.flash_ld=eagle.flash.1m192.ld
4494-
wifinfo.menu.ESPModule.ESP07192.build.flash_size=1M
4495-
wifinfo.menu.ESPModule.ESP07192=ESP07 (1M/192K SPIFFS)
4496-
wifinfo.menu.ESPModule.ESP07192.upload.maximum_size=827376
4495+
wifinfo.menu.ESPModule.ESP12.build.spiffs_pagesize=256
4496+
wifinfo.menu.ESPModule.ESP12.upload.maximum_size=1044464
44974497
wifinfo.upload.tool=esptool
44984498
wifinfo.upload.maximum_data_size=81920
44994499
wifinfo.upload.wait_for_upload_port=true
@@ -4719,19 +4719,19 @@ wifinfo.menu.baud.921600.upload.speed=921600
47194719

47204720
##############################################################
47214721
arduino-esp8266.name=Arduino
4722-
arduino-esp8266.menu.BoardModel.starottodeved.build.board=ESP8266_ARDUINO_STAR_OTTO
4722+
arduino-esp8266.build.board=ESP8266_ARDUINO
4723+
arduino-esp8266.menu.BoardModel.primo=Primo
4724+
arduino-esp8266.menu.BoardModel.primo.build.board=ESP8266_ARDUINO_PRIMO
4725+
arduino-esp8266.menu.BoardModel.primo.build.variant=arduino_spi
47234726
arduino-esp8266.menu.BoardModel.primo.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
4724-
arduino-esp8266.menu.BoardModel.starottodeved.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
4725-
arduino-esp8266.menu.BoardModel.starottodeved.build.variant=arduino_uart
4727+
arduino-esp8266.menu.BoardModel.unowifideved=Uno WiFi
47264728
arduino-esp8266.menu.BoardModel.unowifideved.build.board=ESP8266_ARDUINO_UNOWIFI
4727-
arduino-esp8266.menu.BoardModel.unowifideved.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
4728-
arduino-esp8266.menu.BoardModel.primo=Primo
47294729
arduino-esp8266.menu.BoardModel.unowifideved.build.variant=arduino_uart
4730-
arduino-esp8266.menu.BoardModel.primo.build.variant=arduino_spi
4730+
arduino-esp8266.menu.BoardModel.unowifideved.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
47314731
arduino-esp8266.menu.BoardModel.starottodeved=Star OTTO
4732-
arduino-esp8266.build.board=ESP8266_ARDUINO
4733-
arduino-esp8266.menu.BoardModel.primo.build.board=ESP8266_ARDUINO_PRIMO
4734-
arduino-esp8266.menu.BoardModel.unowifideved=Uno WiFi
4732+
arduino-esp8266.menu.BoardModel.starottodeved.build.variant=arduino_uart
4733+
arduino-esp8266.menu.BoardModel.starottodeved.build.board=ESP8266_ARDUINO_STAR_OTTO
4734+
arduino-esp8266.menu.BoardModel.starottodeved.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
47354735
arduino-esp8266.upload.tool=esptool
47364736
arduino-esp8266.upload.maximum_data_size=81920
47374737
arduino-esp8266.upload.wait_for_upload_port=true

‎tools/boards.txt.py

+39-39
Original file line numberDiff line numberDiff line change
@@ -673,27 +673,27 @@
673673
}),
674674
( 'wifinfo', {
675675
'name': 'WifInfo',
676-
'opts': {
677-
'.build.board': 'WIFINFO',
678-
'.build.variant': 'wifinfo',
679-
'.menu.ESPModule.ESP07192': 'ESP07 (1M/192K SPIFFS)',
680-
'.menu.ESPModule.ESP07192.build.board': 'ESP8266_ESP07',
681-
'.menu.ESPModule.ESP07192.build.flash_size': '1M',
682-
'.menu.ESPModule.ESP07192.build.flash_ld': 'eagle.flash.1m192.ld',
683-
'.menu.ESPModule.ESP07192.build.spiffs_start': '0xCB000',
684-
'.menu.ESPModule.ESP07192.build.spiffs_end': '0xFB000',
685-
'.menu.ESPModule.ESP07192.build.spiffs_blocksize': '4096',
686-
'.menu.ESPModule.ESP07192.upload.maximum_size': '827376',
687-
'.menu.ESPModule.ESP12': 'ESP12 (4M/1M SPIFFS)',
688-
'.menu.ESPModule.ESP12.build.board': 'ESP8266_ESP12',
689-
'.menu.ESPModule.ESP12.build.flash_size': '4M',
690-
'.menu.ESPModule.ESP12.build.flash_ld': 'eagle.flash.4m1m.ld',
691-
'.menu.ESPModule.ESP12.build.spiffs_start': '0x300000',
692-
'.menu.ESPModule.ESP12.build.spiffs_end': '0x3FB000',
693-
'.menu.ESPModule.ESP12.build.spiffs_blocksize': '8192',
694-
'.menu.ESPModule.ESP12.build.spiffs_pagesize': '256',
695-
'.menu.ESPModule.ESP12.upload.maximum_size': '1044464',
696-
},
676+
'opts': collections.OrderedDict([
677+
( '.build.board', 'WIFINFO' ),
678+
( '.build.variant', 'wifinfo' ),
679+
( '.menu.ESPModule.ESP07192', 'ESP07 (1M/192K SPIFFS)' ),
680+
( '.menu.ESPModule.ESP07192.build.board', 'ESP8266_ESP07' ),
681+
( '.menu.ESPModule.ESP07192.build.flash_size', '1M' ),
682+
( '.menu.ESPModule.ESP07192.build.flash_ld', 'eagle.flash.1m192.ld' ),
683+
( '.menu.ESPModule.ESP07192.build.spiffs_start', '0xCB000' ),
684+
( '.menu.ESPModule.ESP07192.build.spiffs_end', '0xFB000' ),
685+
( '.menu.ESPModule.ESP07192.build.spiffs_blocksize', '4096' ),
686+
( '.menu.ESPModule.ESP07192.upload.maximum_size', '827376' ),
687+
( '.menu.ESPModule.ESP12', 'ESP12 (4M/1M SPIFFS)' ),
688+
( '.menu.ESPModule.ESP12.build.board', 'ESP8266_ESP12' ),
689+
( '.menu.ESPModule.ESP12.build.flash_size', '4M' ),
690+
( '.menu.ESPModule.ESP12.build.flash_ld', 'eagle.flash.4m1m.ld' ),
691+
( '.menu.ESPModule.ESP12.build.spiffs_start', '0x300000' ),
692+
( '.menu.ESPModule.ESP12.build.spiffs_end', '0x3FB000' ),
693+
( '.menu.ESPModule.ESP12.build.spiffs_blocksize', '8192' ),
694+
( '.menu.ESPModule.ESP12.build.spiffs_pagesize', '256' ),
695+
( '.menu.ESPModule.ESP12.upload.maximum_size', '1044464' ),
696+
]),
697697
'macro': [
698698
'resetmethod_nodemcu',
699699
'flashmode_qio',
@@ -707,21 +707,21 @@
707707
}),
708708
( 'arduino-esp8266', {
709709
'name': 'Arduino',
710-
'opts': {
711-
'.build.board': 'ESP8266_ARDUINO',
712-
'.menu.BoardModel.primo': 'Primo',
713-
'.menu.BoardModel.primo.build.board': 'ESP8266_ARDUINO_PRIMO',
714-
'.menu.BoardModel.primo.build.variant': 'arduino_spi',
715-
'.menu.BoardModel.primo.build.extra_flags': '-DF_CRYSTAL=40000000 -DESP8266',
716-
'.menu.BoardModel.unowifideved': 'Uno WiFi',
717-
'.menu.BoardModel.unowifideved.build.board': 'ESP8266_ARDUINO_UNOWIFI',
718-
'.menu.BoardModel.unowifideved.build.variant': 'arduino_uart',
719-
'.menu.BoardModel.unowifideved.build.extra_flags=-DF_CRYSTAL': '40000000 -DESP8266',
720-
'.menu.BoardModel.starottodeved': 'Star OTTO',
721-
'.menu.BoardModel.starottodeved.build.variant': 'arduino_uart',
722-
'.menu.BoardModel.starottodeved.build.board': 'ESP8266_ARDUINO_STAR_OTTO',
723-
'.menu.BoardModel.starottodeved.build.extra_flags': '-DF_CRYSTAL=40000000 -DESP8266',
724-
},
710+
'opts': collections.OrderedDict([
711+
( '.build.board', 'ESP8266_ARDUINO' ),
712+
( '.menu.BoardModel.primo', 'Primo' ),
713+
( '.menu.BoardModel.primo.build.board', 'ESP8266_ARDUINO_PRIMO' ),
714+
( '.menu.BoardModel.primo.build.variant', 'arduino_spi' ),
715+
( '.menu.BoardModel.primo.build.extra_flags', '-DF_CRYSTAL=40000000 -DESP8266' ),
716+
( '.menu.BoardModel.unowifideved', 'Uno WiFi' ),
717+
( '.menu.BoardModel.unowifideved.build.board', 'ESP8266_ARDUINO_UNOWIFI' ),
718+
( '.menu.BoardModel.unowifideved.build.variant', 'arduino_uart' ),
719+
( '.menu.BoardModel.unowifideved.build.extra_flags=-DF_CRYSTAL', '40000000 -DESP8266' ),
720+
( '.menu.BoardModel.starottodeved', 'Star OTTO' ),
721+
( '.menu.BoardModel.starottodeved.build.variant', 'arduino_uart' ),
722+
( '.menu.BoardModel.starottodeved.build.board', 'ESP8266_ARDUINO_STAR_OTTO' ),
723+
( '.menu.BoardModel.starottodeved.build.extra_flags', '-DF_CRYSTAL=40000000 -DESP8266' ),
724+
]),
725725
'macro': [
726726
'resetmethod_ck',
727727
'flashmode_qio',
@@ -1177,9 +1177,9 @@ def flash_map (flashsize_kb, spiffs_kb = 0):
11771177
else:
11781178
spiffs_blocksize = 8192
11791179

1180-
strsize = str(flashsize_kb / 1024) + 'M' if (flashsize_kb >= 1024) else str(flashsize_kb) + 'K'
1181-
strspiffs = str(spiffs_kb / 1024) + 'M' if (spiffs_kb >= 1024) else str(spiffs_kb) + 'K'
1182-
strspiffs_strip = str(spiffs_kb / 1024) + 'M' if (spiffs_kb >= 1024) else str(spiffs_kb) if (spiffs_kb > 0) else ''
1180+
strsize = str(int(flashsize_kb / 1024)) + 'M' if (flashsize_kb >= 1024) else str(flashsize_kb) + 'K'
1181+
strspiffs = str(int(spiffs_kb / 1024)) + 'M' if (spiffs_kb >= 1024) else str(spiffs_kb) + 'K'
1182+
strspiffs_strip = str(int(spiffs_kb / 1024)) + 'M' if (spiffs_kb >= 1024) else str(spiffs_kb) if (spiffs_kb > 0) else ''
11831183

11841184
ld = 'eagle.flash.' + strsize.lower() + strspiffs_strip.lower() + '.ld'
11851185
menu = '.menu.eesz.' + strsize + strspiffs_strip

0 commit comments

Comments
 (0)