luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1254 from mithro/segprint-tool 

Fix segprint tool for new tileconn.json location
This commit is contained in:
Tim Ansell 2020-02-26 21:24:21 -08:00 committed by GitHub
parent 08be5a9d01 5a6272374f
commit dd5fb6d9d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils/segprint.py
View File

@ -419,9 +419,9 @@ def tile_segnames(tiles):
return ret return ret
def load_tiles(db_root): def load_tiles(db_root, part):
# TODO: Migrate to new tilegrid format via library. # TODO: Migrate to new tilegrid format via library.
with open("%s/tilegrid.json" % (db_root), "r") as f: with open("%s/%s/tilegrid.json" % (db_root, part), "r") as f:
tiles = json.load(f) tiles = json.load(f)
return tiles return tiles
@ -438,7 +438,7 @@ def run(
bit_only=False, bit_only=False,
verbose=False): verbose=False):
db = prjxraydb.Database(db_root, part) db = prjxraydb.Database(db_root, part)
tiles = load_tiles(db_root) tiles = load_tiles(db_root, part)
segments = mk_segments(tiles) segments = mk_segments(tiles)
bitdata = bitstream.load_bitdata2(open(bits_file, "r")) bitdata = bitstream.load_bitdata2(open(bits_file, "r"))