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

Merge pull request #121 from mcmasterg/make_format 

make format: update to latest yapf
This commit is contained in:
Tim Ansell 2018-09-17 18:51:26 -07:00 committed by GitHub
parent 8a257d46a3 cfea717280
commit 9d65b21ef4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
experiments/example/segdata.py
View File

@ -54,8 +54,8 @@ with open("carrydata.txt", "r") as f:
assert line[0] not in carry assert line[0] not in carry
carry[line[0]] = dict() carry[line[0]] = dict()
for i, n in enumerate( for i, n in enumerate(
"CYINIT:ZRO:ONE:AX:CIN DI0:AX:O5 DI1:AX:O5 DI2:AX:O5 DI3:AX:O5". "CYINIT:ZRO:ONE:AX:CIN DI0:AX:O5 DI1:AX:O5 DI2:AX:O5 DI3:AX:O5"
split()): .split()):
n = n.split(":") n = n.split(":")
for k in n[1:]: for k in n[1:]:
carry[line[0]]["CARRY_%s_MUX_%s" % carry[line[0]]["CARRY_%s_MUX_%s" %

6
htmlgen/htmlgen.py
View File

@ -848,9 +848,11 @@ for tiletype in sorted(cfgbits.keys()):
line = " --><td>%s</td>" % (pip) line = " --><td>%s</td>" % (pip)
for bit in grp_bits: for bit in grp_bits:
c = "-" c = "-"
if bit in routebits[tiletype] and pip in routebits[tiletype][bit]: if bit in routebits[tiletype] and pip in routebits[
tiletype][bit]:
c = "1" c = "1"
if bit in routezbits[tiletype] and pip in routezbits[tiletype][bit]: if bit in routezbits[tiletype] and pip in routezbits[
tiletype][bit]:
c = "0" c = "0"
line = "%s%s<td align=\"center\">%s</td>" % (c, line, c) line = "%s%s<td align=\"center\">%s</td>" % (c, line, c)
lines.append(line) lines.append(line)

4
tools/simpleroute.py
View File

@ -84,8 +84,8 @@ def db_gen():
node_node_pip[src_node] = dict() node_node_pip[src_node] = dict()
if dst_node not in reverse_node_node: if dst_node not in reverse_node_node:
reverse_node_node[dst_node] = set() reverse_node_node[dst_node] = set()
node_node_pip[src_node][ node_node_pip[src_node][dst_node] = "%s.%s.%s" % (
dst_node] = "%s.%s.%s" % (tile, dst, src) tile, dst, src)
reverse_node_node[dst_node].add(src_node) reverse_node_node[dst_node].add(src_node)
return type_to_tiles, grid_to_tile, nodes, node_node_pip, reverse_node_node return type_to_tiles, grid_to_tile, nodes, node_node_pip, reverse_node_node