arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

fix boards.txt.py with python3 (#5887)

Browse Source 
* fix boards.txt.py with python3

* fix boards.txt.py to generate same order when using python2 or python3
This commit is contained in:
david gauchard 2019-03-16 23:27:44 +01:00 committed by GitHub
parent a3ea816e65
commit d19fc3b647
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
boards.txt
View File

@ -4475,25 +4475,25 @@ espinotee.menu.baud.921600.upload.speed=921600
############################################################## ##############################################################
wifinfo.name=WifInfo wifinfo.name=WifInfo
wifinfo.menu.ESPModule.ESP12.build.board=ESP8266_ESP12
wifinfo.menu.ESPModule.ESP12.upload.maximum_size=1044464
wifinfo.menu.ESPModule.ESP12.build.spiffs_pagesize=256
wifinfo.menu.ESPModule.ESP12.build.flash_ld=eagle.flash.4m1m.ld
wifinfo.menu.ESPModule.ESP07192.build.spiffs_blocksize=4096
wifinfo.menu.ESPModule.ESP07192.build.spiffs_end=0xFB000
wifinfo.menu.ESPModule.ESP12=ESP12 (4M/1M SPIFFS)
wifinfo.menu.ESPModule.ESP12.build.spiffs_start=0x300000
wifinfo.menu.ESPModule.ESP12.build.spiffs_end=0x3FB000
wifinfo.menu.ESPModule.ESP07192.build.spiffs_start=0xCB000
wifinfo.menu.ESPModule.ESP07192.build.board=ESP8266_ESP07
wifinfo.menu.ESPModule.ESP12.build.spiffs_blocksize=8192
wifinfo.menu.ESPModule.ESP12.build.flash_size=4M
wifinfo.build.board=WIFINFO wifinfo.build.board=WIFINFO
wifinfo.build.variant=wifinfo wifinfo.build.variant=wifinfo
wifinfo.menu.ESPModule.ESP07192.build.flash_ld=eagle.flash.1m192.ld
wifinfo.menu.ESPModule.ESP07192.build.flash_size=1M
wifinfo.menu.ESPModule.ESP07192=ESP07 (1M/192K SPIFFS) wifinfo.menu.ESPModule.ESP07192=ESP07 (1M/192K SPIFFS)
wifinfo.menu.ESPModule.ESP07192.build.board=ESP8266_ESP07
wifinfo.menu.ESPModule.ESP07192.build.flash_size=1M
wifinfo.menu.ESPModule.ESP07192.build.flash_ld=eagle.flash.1m192.ld
wifinfo.menu.ESPModule.ESP07192.build.spiffs_start=0xCB000
wifinfo.menu.ESPModule.ESP07192.build.spiffs_end=0xFB000
wifinfo.menu.ESPModule.ESP07192.build.spiffs_blocksize=4096
wifinfo.menu.ESPModule.ESP07192.upload.maximum_size=827376 wifinfo.menu.ESPModule.ESP07192.upload.maximum_size=827376
wifinfo.menu.ESPModule.ESP12=ESP12 (4M/1M SPIFFS)
wifinfo.menu.ESPModule.ESP12.build.board=ESP8266_ESP12
wifinfo.menu.ESPModule.ESP12.build.flash_size=4M
wifinfo.menu.ESPModule.ESP12.build.flash_ld=eagle.flash.4m1m.ld
wifinfo.menu.ESPModule.ESP12.build.spiffs_start=0x300000
wifinfo.menu.ESPModule.ESP12.build.spiffs_end=0x3FB000
wifinfo.menu.ESPModule.ESP12.build.spiffs_blocksize=8192
wifinfo.menu.ESPModule.ESP12.build.spiffs_pagesize=256
wifinfo.menu.ESPModule.ESP12.upload.maximum_size=1044464
wifinfo.upload.tool=esptool wifinfo.upload.tool=esptool
wifinfo.upload.maximum_data_size=81920 wifinfo.upload.maximum_data_size=81920
wifinfo.upload.wait_for_upload_port=true wifinfo.upload.wait_for_upload_port=true
@ -4719,19 +4719,19 @@ wifinfo.menu.baud.921600.upload.speed=921600
############################################################## ##############################################################
arduino-esp8266.name=Arduino arduino-esp8266.name=Arduino
arduino-esp8266.menu.BoardModel.starottodeved.build.board=ESP8266_ARDUINO_STAR_OTTO
arduino-esp8266.menu.BoardModel.primo.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
arduino-esp8266.menu.BoardModel.starottodeved.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
arduino-esp8266.menu.BoardModel.starottodeved.build.variant=arduino_uart
arduino-esp8266.menu.BoardModel.unowifideved.build.board=ESP8266_ARDUINO_UNOWIFI
arduino-esp8266.menu.BoardModel.unowifideved.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
arduino-esp8266.menu.BoardModel.primo=Primo
arduino-esp8266.menu.BoardModel.unowifideved.build.variant=arduino_uart
arduino-esp8266.menu.BoardModel.primo.build.variant=arduino_spi
arduino-esp8266.menu.BoardModel.starottodeved=Star OTTO
arduino-esp8266.build.board=ESP8266_ARDUINO arduino-esp8266.build.board=ESP8266_ARDUINO
arduino-esp8266.menu.BoardModel.primo=Primo
arduino-esp8266.menu.BoardModel.primo.build.board=ESP8266_ARDUINO_PRIMO arduino-esp8266.menu.BoardModel.primo.build.board=ESP8266_ARDUINO_PRIMO
arduino-esp8266.menu.BoardModel.primo.build.variant=arduino_spi
arduino-esp8266.menu.BoardModel.primo.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
arduino-esp8266.menu.BoardModel.unowifideved=Uno WiFi arduino-esp8266.menu.BoardModel.unowifideved=Uno WiFi
arduino-esp8266.menu.BoardModel.unowifideved.build.board=ESP8266_ARDUINO_UNOWIFI
arduino-esp8266.menu.BoardModel.unowifideved.build.variant=arduino_uart
arduino-esp8266.menu.BoardModel.unowifideved.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
arduino-esp8266.menu.BoardModel.starottodeved=Star OTTO
arduino-esp8266.menu.BoardModel.starottodeved.build.variant=arduino_uart
arduino-esp8266.menu.BoardModel.starottodeved.build.board=ESP8266_ARDUINO_STAR_OTTO
arduino-esp8266.menu.BoardModel.starottodeved.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
arduino-esp8266.upload.tool=esptool arduino-esp8266.upload.tool=esptool
arduino-esp8266.upload.maximum_data_size=81920 arduino-esp8266.upload.maximum_data_size=81920
arduino-esp8266.upload.wait_for_upload_port=true arduino-esp8266.upload.wait_for_upload_port=true

78
tools/boards.txt.py
View File

@ -673,27 +673,27 @@ boards = collections.OrderedDict([
}), }),
( 'wifinfo', { ( 'wifinfo', {
'name': 'WifInfo', 'name': 'WifInfo',
'opts': { 'opts': collections.OrderedDict([
'.build.board': 'WIFINFO', ( '.build.board', 'WIFINFO' ),
'.build.variant': 'wifinfo', ( '.build.variant', 'wifinfo' ),
'.menu.ESPModule.ESP07192': 'ESP07 (1M/192K SPIFFS)', ( '.menu.ESPModule.ESP07192', 'ESP07 (1M/192K SPIFFS)' ),
'.menu.ESPModule.ESP07192.build.board': 'ESP8266_ESP07', ( '.menu.ESPModule.ESP07192.build.board', 'ESP8266_ESP07' ),
'.menu.ESPModule.ESP07192.build.flash_size': '1M', ( '.menu.ESPModule.ESP07192.build.flash_size', '1M' ),
'.menu.ESPModule.ESP07192.build.flash_ld': 'eagle.flash.1m192.ld', ( '.menu.ESPModule.ESP07192.build.flash_ld', 'eagle.flash.1m192.ld' ),
'.menu.ESPModule.ESP07192.build.spiffs_start': '0xCB000', ( '.menu.ESPModule.ESP07192.build.spiffs_start', '0xCB000' ),
'.menu.ESPModule.ESP07192.build.spiffs_end': '0xFB000', ( '.menu.ESPModule.ESP07192.build.spiffs_end', '0xFB000' ),
'.menu.ESPModule.ESP07192.build.spiffs_blocksize': '4096', ( '.menu.ESPModule.ESP07192.build.spiffs_blocksize', '4096' ),
'.menu.ESPModule.ESP07192.upload.maximum_size': '827376', ( '.menu.ESPModule.ESP07192.upload.maximum_size', '827376' ),
'.menu.ESPModule.ESP12': 'ESP12 (4M/1M SPIFFS)', ( '.menu.ESPModule.ESP12', 'ESP12 (4M/1M SPIFFS)' ),
'.menu.ESPModule.ESP12.build.board': 'ESP8266_ESP12', ( '.menu.ESPModule.ESP12.build.board', 'ESP8266_ESP12' ),
'.menu.ESPModule.ESP12.build.flash_size': '4M', ( '.menu.ESPModule.ESP12.build.flash_size', '4M' ),
'.menu.ESPModule.ESP12.build.flash_ld': 'eagle.flash.4m1m.ld', ( '.menu.ESPModule.ESP12.build.flash_ld', 'eagle.flash.4m1m.ld' ),
'.menu.ESPModule.ESP12.build.spiffs_start': '0x300000', ( '.menu.ESPModule.ESP12.build.spiffs_start', '0x300000' ),
'.menu.ESPModule.ESP12.build.spiffs_end': '0x3FB000', ( '.menu.ESPModule.ESP12.build.spiffs_end', '0x3FB000' ),
'.menu.ESPModule.ESP12.build.spiffs_blocksize': '8192', ( '.menu.ESPModule.ESP12.build.spiffs_blocksize', '8192' ),
'.menu.ESPModule.ESP12.build.spiffs_pagesize': '256', ( '.menu.ESPModule.ESP12.build.spiffs_pagesize', '256' ),
'.menu.ESPModule.ESP12.upload.maximum_size': '1044464', ( '.menu.ESPModule.ESP12.upload.maximum_size', '1044464' ),
}, ]),
'macro': [ 'macro': [
'resetmethod_nodemcu', 'resetmethod_nodemcu',
'flashmode_qio', 'flashmode_qio',
@ -707,21 +707,21 @@ boards = collections.OrderedDict([
}), }),
( 'arduino-esp8266', { ( 'arduino-esp8266', {
'name': 'Arduino', 'name': 'Arduino',
'opts': { 'opts': collections.OrderedDict([
'.build.board': 'ESP8266_ARDUINO', ( '.build.board', 'ESP8266_ARDUINO' ),
'.menu.BoardModel.primo': 'Primo', ( '.menu.BoardModel.primo', 'Primo' ),
'.menu.BoardModel.primo.build.board': 'ESP8266_ARDUINO_PRIMO', ( '.menu.BoardModel.primo.build.board', 'ESP8266_ARDUINO_PRIMO' ),
'.menu.BoardModel.primo.build.variant': 'arduino_spi', ( '.menu.BoardModel.primo.build.variant', 'arduino_spi' ),
'.menu.BoardModel.primo.build.extra_flags': '-DF_CRYSTAL=40000000 -DESP8266', ( '.menu.BoardModel.primo.build.extra_flags', '-DF_CRYSTAL=40000000 -DESP8266' ),
'.menu.BoardModel.unowifideved': 'Uno WiFi', ( '.menu.BoardModel.unowifideved', 'Uno WiFi' ),
'.menu.BoardModel.unowifideved.build.board': 'ESP8266_ARDUINO_UNOWIFI', ( '.menu.BoardModel.unowifideved.build.board', 'ESP8266_ARDUINO_UNOWIFI' ),
'.menu.BoardModel.unowifideved.build.variant': 'arduino_uart', ( '.menu.BoardModel.unowifideved.build.variant', 'arduino_uart' ),
'.menu.BoardModel.unowifideved.build.extra_flags=-DF_CRYSTAL': '40000000 -DESP8266', ( '.menu.BoardModel.unowifideved.build.extra_flags=-DF_CRYSTAL', '40000000 -DESP8266' ),
'.menu.BoardModel.starottodeved': 'Star OTTO', ( '.menu.BoardModel.starottodeved', 'Star OTTO' ),
'.menu.BoardModel.starottodeved.build.variant': 'arduino_uart', ( '.menu.BoardModel.starottodeved.build.variant', 'arduino_uart' ),
'.menu.BoardModel.starottodeved.build.board': 'ESP8266_ARDUINO_STAR_OTTO', ( '.menu.BoardModel.starottodeved.build.board', 'ESP8266_ARDUINO_STAR_OTTO' ),
'.menu.BoardModel.starottodeved.build.extra_flags': '-DF_CRYSTAL=40000000 -DESP8266', ( '.menu.BoardModel.starottodeved.build.extra_flags', '-DF_CRYSTAL=40000000 -DESP8266' ),
}, ]),
'macro': [ 'macro': [
'resetmethod_ck', 'resetmethod_ck',
'flashmode_qio', 'flashmode_qio',
@ -1177,9 +1177,9 @@ def flash_map (flashsize_kb, spiffs_kb = 0):
else: else:
spiffs_blocksize = 8192 spiffs_blocksize = 8192
strsize = str(flashsize_kb / 1024) + 'M' if (flashsize_kb >= 1024) else str(flashsize_kb) + 'K' strsize = str(int(flashsize_kb / 1024)) + 'M' if (flashsize_kb >= 1024) else str(flashsize_kb) + 'K'
strspiffs = str(spiffs_kb / 1024) + 'M' if (spiffs_kb >= 1024) else str(spiffs_kb) + 'K' strspiffs = str(int(spiffs_kb / 1024)) + 'M' if (spiffs_kb >= 1024) else str(spiffs_kb) + 'K'
strspiffs_strip = str(spiffs_kb / 1024) + 'M' if (spiffs_kb >= 1024) else str(spiffs_kb) if (spiffs_kb > 0) else '' strspiffs_strip = str(int(spiffs_kb / 1024)) + 'M' if (spiffs_kb >= 1024) else str(spiffs_kb) if (spiffs_kb > 0) else ''
ld = 'eagle.flash.' + strsize.lower() + strspiffs_strip.lower() + '.ld' ld = 'eagle.flash.' + strsize.lower() + strspiffs_strip.lower() + '.ld'
menu = '.menu.eesz.' + strsize + strspiffs_strip menu = '.menu.eesz.' + strsize + strspiffs_strip