Skip to content

Commit 319adc6

Browse files
wemosd-a-v
wemos
authored and
d-a-v
committed
Fix boards.txt.py compatible with python3 (#4998)
1 parent 8b55758 commit 319adc6

File tree

2 files changed

+96
-96
lines changed

2 files changed

+96
-96
lines changed

‎doc/faq/a05-board-generator.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ available in the IDE menu.
1919
How can I run the script ?
2020
~~~~~~~~~~~~~~~~~~~~~~~~~~
2121

22-
Python 2 needs to be installed on your system.
22+
Python needs to be installed on your system.
2323

2424
The script is located in the ``tools`` subdirectory of the core's root installation.
2525
It needs to be run from the root directory,

‎tools/boards.txt.py‎

Lines changed: 95 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,7 @@
10081008

10091009
def checkdir ():
10101010
if not os.path.isfile("boards.txt"):
1011-
print "please run me from boards.txt directory (like: ./tools/boards.txt.py -...)"
1011+
print("please run me from boards.txt directory (like: ./tools/boards.txt.py -...)")
10121012
sys.exit(1)
10131013

10141014
################################################################
@@ -1122,29 +1122,29 @@ def flash_size (size_bytes, display, optname, ld, desc, max_upload_size, spiffs_
11221122
page = 0x100
11231123
block = 0x2000
11241124

1125-
print "/* Flash Split for %s chips */" % display
1126-
print "/* sketch %dKB */" % (max_upload_size / 1024)
1125+
print("/* Flash Split for %s chips */" % display)
1126+
print("/* sketch %dKB */" % (max_upload_size / 1024))
11271127
if spiffs_size > 0:
11281128
empty_size = spiffs_start - max_upload_size - 4096
11291129
if empty_size > 1024:
1130-
print "/* empty %dKB */" % (empty_size / 1024)
1131-
print "/* spiffs %dKB */" % (spiffs_size / 1024)
1132-
print "/* eeprom 20KB */"
1133-
print ""
1134-
print "MEMORY"
1135-
print "{"
1136-
print " dport0_0_seg : org = 0x3FF00000, len = 0x10"
1137-
print " dram0_0_seg : org = 0x3FFE8000, len = 0x14000"
1138-
print " iram1_0_seg : org = 0x40100000, len = 0x8000"
1139-
print " irom0_0_seg : org = 0x40201010, len = 0x%x" % max_upload_size
1140-
print "}"
1141-
print ""
1142-
print "PROVIDE ( _SPIFFS_start = 0x%08X );" % (0x40200000 + spiffs_start)
1143-
print "PROVIDE ( _SPIFFS_end = 0x%08X );" % (0x40200000 + spiffs_start + spiffs_size)
1144-
print "PROVIDE ( _SPIFFS_page = 0x%X );" % page
1145-
print "PROVIDE ( _SPIFFS_block = 0x%X );" % block
1146-
print ""
1147-
print 'INCLUDE "../ld/eagle.app.v6.common.ld"'
1130+
print("/* empty %dKB */" % (empty_size / 1024))
1131+
print("/* spiffs %dKB */" % (spiffs_size / 1024))
1132+
print("/* eeprom 20KB */")
1133+
print("")
1134+
print("MEMORY")
1135+
print("{")
1136+
print(" dport0_0_seg : org = 0x3FF00000, len = 0x10")
1137+
print(" dram0_0_seg : org = 0x3FFE8000, len = 0x14000")
1138+
print(" iram1_0_seg : org = 0x40100000, len = 0x8000")
1139+
print(" irom0_0_seg : org = 0x40201010, len = 0x%x" % max_upload_size)
1140+
print("}")
1141+
print("")
1142+
print("PROVIDE ( _SPIFFS_start = 0x%08X );" % (0x40200000 + spiffs_start))
1143+
print("PROVIDE ( _SPIFFS_end = 0x%08X );" % (0x40200000 + spiffs_start + spiffs_size))
1144+
print("PROVIDE ( _SPIFFS_page = 0x%X );" % page)
1145+
print("PROVIDE ( _SPIFFS_block = 0x%X );" % block)
1146+
print("")
1147+
print('INCLUDE "../ld/eagle.app.v6.common.ld"')
11481148

11491149
if ldgen:
11501150
sys.stdout.close()
@@ -1216,38 +1216,38 @@ def all_boards ():
12161216
macros.update(all_debug())
12171217
macros.update(led(led_default, led_max))
12181218

1219-
print '#'
1220-
print '# Do not create pull-requests for this file only, CI will not accept them.'
1221-
print '# You *must* edit/modify/run ' + os.path.basename(sys.argv[0]) + ' to regenerate boards.txt.'
1222-
print '# All modified files after running with option "--allgen" must be included in the pull-request.'
1223-
print '#'
1224-
print ''
1225-
print 'menu.BoardModel=Model'
1226-
print 'menu.UploadSpeed=Upload Speed'
1227-
print 'menu.CpuFrequency=CPU Frequency'
1228-
print 'menu.CrystalFreq=Crystal Frequency'
1229-
print 'menu.FlashSize=Flash Size'
1230-
print 'menu.FlashMode=Flash Mode'
1231-
print 'menu.FlashFreq=Flash Frequency'
1232-
print 'menu.ResetMethod=Reset Method'
1233-
print 'menu.ESPModule=Module'
1234-
print 'menu.Debug=Debug port'
1235-
print 'menu.DebugLevel=Debug Level'
1236-
print 'menu.LwIPVariant=lwIP Variant'
1237-
print 'menu.VTable=VTables'
1238-
print 'menu.led=Builtin Led'
1239-
print 'menu.FlashErase=Erase Flash'
1240-
print ''
1219+
print('#')
1220+
print('# Do not create pull-requests for this file only, CI will not accept them.')
1221+
print('# You *must* edit/modify/run ' + os.path.basename(sys.argv[0]) + ' to regenerate boards.txt.')
1222+
print('# All modified files after running with option "--allgen" must be included in the pull-request.')
1223+
print('#')
1224+
print('')
1225+
print('menu.BoardModel=Model')
1226+
print('menu.UploadSpeed=Upload Speed')
1227+
print('menu.CpuFrequency=CPU Frequency')
1228+
print('menu.CrystalFreq=Crystal Frequency')
1229+
print('menu.FlashSize=Flash Size')
1230+
print('menu.FlashMode=Flash Mode')
1231+
print('menu.FlashFreq=Flash Frequency')
1232+
print('menu.ResetMethod=Reset Method')
1233+
print('menu.ESPModule=Module')
1234+
print('menu.Debug=Debug port')
1235+
print('menu.DebugLevel=Debug Level')
1236+
print('menu.LwIPVariant=lwIP Variant')
1237+
print('menu.VTable=VTables')
1238+
print('menu.led=Builtin Led')
1239+
print('menu.FlashErase=Erase Flash')
1240+
print('')
12411241

12421242
for id in boards:
1243-
print '##############################################################'
1243+
print('##############################################################')
12441244
board = boards[id]
1245-
print id + '.name=' + board['name']
1245+
print(id + '.name=' + board['name'])
12461246

12471247
# standalone options
12481248
if 'opts' in board:
12491249
for optname in board['opts']:
1250-
print id + optname + '=' + board['opts'][optname]
1250+
print(id + optname + '=' + board['opts'][optname])
12511251

12521252
# macros
12531253
macrolist = [ 'defaults', 'cpufreq_menu', 'vtable_menu' ]
@@ -1260,7 +1260,7 @@ def all_boards ():
12601260
macrolist += [ 'debug_menu', 'flash_erase_menu' ]
12611261

12621262
for cs in customspeeds:
1263-
print id + cs
1263+
print(id + cs)
12641264

12651265
if 'serial' in board:
12661266
macrolist += speeds[board['serial']]
@@ -1270,15 +1270,15 @@ def all_boards ():
12701270
for block in macrolist:
12711271
for optname in macros[block]:
12721272
if not ('opts' in board) or not (optname in board['opts']):
1273-
print id + optname + '=' + macros[block][optname]
1273+
print(id + optname + '=' + macros[block][optname])
12741274

12751275
if nofloat:
1276-
print id + '.build.float='
1276+
print(id + '.build.float=')
12771277

12781278
if noextra4kheap:
1279-
print id + '.build.noextra4kheap=-DNO_EXTRA_4K_HEAP'
1279+
print(id + '.build.noextra4kheap=-DNO_EXTRA_4K_HEAP')
12801280

1281-
print ''
1281+
print('')
12821282

12831283
if boardsgen:
12841284
sys.stdout.close()
@@ -1332,25 +1332,25 @@ def doc ():
13321332
realstdout = sys.stdout
13331333
sys.stdout = open("doc/boards.rst", 'w')
13341334

1335-
print 'Boards'
1336-
print '======'
1337-
print ''
1335+
print('Boards')
1336+
print('======')
1337+
print('')
13381338

13391339
for id in boards:
13401340
board = boards[id]
1341-
print board['name']
1341+
print(board['name'])
13421342
dash = ""
13431343
for i in range(len(board['name'])):
13441344
dash += '-'
1345-
print dash
1345+
print(dash)
13461346

1347-
print ''
1347+
print('')
13481348
if 'desc' in board:
13491349
for line in board['desc']:
1350-
print line
1350+
print(line)
13511351
else:
1352-
print 'No description'
1353-
print ''
1352+
print('No description')
1353+
print('')
13541354

13551355
if docgen:
13561356
sys.stdout.close()
@@ -1360,39 +1360,39 @@ def doc ():
13601360
# help / usage
13611361

13621362
def usage (name,ret):
1363-
print ""
1364-
print "boards.txt generator for esp8266/Arduino"
1365-
print ""
1366-
print "usage: %s [options]" % name
1367-
print ""
1368-
print " -h, --help"
1369-
print " --lwip - preferred default lwIP version (default %d)" % lwip
1370-
print " --led - preferred default builtin led for generic boards (default %d)" % led_default
1371-
print " --board b - board to modify:"
1372-
print " --speed s - change default serial speed"
1373-
print " --customspeed s - new serial speed for all boards"
1374-
print " --nofloat - disable float support in printf/scanf"
1375-
print " --noextra4kheap - disable extra 4k heap (will enable WPS)"
1376-
print " --allowWPS - synonym for --noextra4kheap"
1377-
print ""
1378-
print " mandatory option (at least one):"
1379-
print ""
1380-
print " --boards - show boards.txt"
1381-
print " --boardsgen - replace boards.txt"
1382-
print " --ld - show ldscripts"
1383-
print " --ldgen - replace ldscripts"
1384-
print " --package - show package"
1385-
print " --packagegen - replace board:[] in package"
1386-
print " --doc - shows doc/boards.rst"
1387-
print " --docgen - replace doc/boards.rst"
1388-
print " --allgen - generate and replace everything"
1389-
print " (useful for pushing on github)"
1390-
print ""
1363+
print("")
1364+
print("boards.txt generator for esp8266/Arduino")
1365+
print("")
1366+
print("usage: %s [options]" % name)
1367+
print("")
1368+
print(" -h, --help")
1369+
print(" --lwip - preferred default lwIP version (default %d)" % lwip)
1370+
print(" --led - preferred default builtin led for generic boards (default %d)" % led_default)
1371+
print(" --board b - board to modify:")
1372+
print(" --speed s - change default serial speed")
1373+
print(" --customspeed s - new serial speed for all boards")
1374+
print(" --nofloat - disable float support in printf/scanf")
1375+
print(" --noextra4kheap - disable extra 4k heap (will enable WPS)")
1376+
print(" --allowWPS - synonym for --noextra4kheap")
1377+
print("")
1378+
print(" mandatory option (at least one):")
1379+
print("")
1380+
print(" --boards - show boards.txt")
1381+
print(" --boardsgen - replace boards.txt")
1382+
print(" --ld - show ldscripts")
1383+
print(" --ldgen - replace ldscripts")
1384+
print(" --package - show package")
1385+
print(" --packagegen - replace board:[] in package")
1386+
print(" --doc - shows doc/boards.rst")
1387+
print(" --docgen - replace doc/boards.rst")
1388+
print(" --allgen - generate and replace everything")
1389+
print(" (useful for pushing on github)")
1390+
print("")
13911391

13921392
out = ""
13931393
for s in speeds:
13941394
out += s + ' '
1395-
print "available serial speed options (kbps):", out
1395+
print("available serial speed options (kbps):", out)
13961396

13971397
out = ""
13981398
for b in boards:
@@ -1402,9 +1402,9 @@ def usage (name,ret):
14021402
else:
14031403
out += default_speed
14041404
out += 'k) '
1405-
print "available board names:", out
1405+
print("available board names:", out)
14061406

1407-
print ""
1407+
print("")
14081408

14091409
sys.exit(ret)
14101410

@@ -1437,7 +1437,7 @@ def usage (name,ret):
14371437
"ld", "ldgen", "boards", "boardsgen", "package", "packagegen", "doc", "docgen",
14381438
"allgen"] )
14391439
except getopt.GetoptError as err:
1440-
print str(err) # will print something like "option -a not recognized"
1440+
print(str(err)) # will print something like "option -a not recognized"
14411441
usage(sys.argv[0], 1)
14421442

14431443
no = '(not set)'
@@ -1461,16 +1461,16 @@ def usage (name,ret):
14611461

14621462
elif o in ("--board"):
14631463
if not a in boards:
1464-
print "board %s not available" % a
1464+
print("board %s not available" % a)
14651465
usage(sys.argv[0], 1)
14661466
board = a
14671467

14681468
elif o in ("--speed"):
14691469
if board == no:
1470-
print "board not set"
1470+
print("board not set")
14711471
usage(sys.argv[0], 1)
14721472
if not a in speeds:
1473-
print "speed %s not available" % a
1473+
print("speed %s not available" % a)
14741474
usage(sys.argv[0], 1)
14751475
boards[board]['serial'] = a
14761476

0 commit comments

Comments
 (0)