Run make format.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
This commit is contained in:
Keith Rothman 2018-10-22 12:32:42 -07:00
parent 1d7738271a
commit 42addd98a2
4 changed files with 6 additions and 8 deletions

View File

@ -4,6 +4,7 @@ WORD_SIZE_BITS = 32
# How many 32-bit words for frame in a 7-series bitstream?
FRAME_WORD_COUNT = 101
def load_bitdata(f):
""" Read bit file and return bitdata map.

View File

@ -4,6 +4,7 @@ class Roi(object):
Can be used to iterate over tiles and sites within an ROI.
"""
def __init__(self, db, x1, x2, y1, y2):
self.grid = db.grid()
self.x1 = x1
@ -51,7 +52,6 @@ class Roi(object):
gridinfo = self.grid.gridinfo_at_loc(loc)
for site_name, site_type in gridinfo.sites.items():
if site_types is not None and site_type not in site_types:
continue

View File

@ -32,12 +32,7 @@ def slice_xy():
def get_roi():
(x1, x2), (y1, y2) = roi_xy()
db = Database(get_db_root())
return Roi(
db=db,
x1=x1,
x2=x2,
y1=y1,
y2=y2)
return Roi(db=db, x1=x1, x2=x2, y1=y1, y2=y2)
# we know that all bits for CLB MUXes are in frames 30 and 31, so filter all other bits

View File

@ -13,7 +13,9 @@ from prjxray import db
def main():
import argparse
parser = argparse.ArgumentParser(description='Outputs a Vivavo highlight_objects command from a FASM file.')
parser = argparse.ArgumentParser(
description=
'Outputs a Vivavo highlight_objects command from a FASM file.')
database_dir = os.getenv("XRAY_DATABASE_DIR")
database = os.getenv("XRAY_DATABASE")