From 42addd98a22deb35b98448c078e55598d91832cc Mon Sep 17 00:00:00 2001 From: Keith Rothman <537074+litghost@users.noreply.github.com> Date: Mon, 22 Oct 2018 12:32:42 -0700 Subject: [PATCH] Run make format. Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com> --- prjxray/bitstream.py | 1 + prjxray/roi.py | 2 +- prjxray/util.py | 7 +------ utils/fasm2pips.py | 4 +++- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/prjxray/bitstream.py b/prjxray/bitstream.py index ce73157d..450046ed 100644 --- a/prjxray/bitstream.py +++ b/prjxray/bitstream.py @@ -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. diff --git a/prjxray/roi.py b/prjxray/roi.py index c99c9816..c8d02318 100644 --- a/prjxray/roi.py +++ b/prjxray/roi.py @@ -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 diff --git a/prjxray/util.py b/prjxray/util.py index 9e7518ef..70ed3427 100644 --- a/prjxray/util.py +++ b/prjxray/util.py @@ -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 diff --git a/utils/fasm2pips.py b/utils/fasm2pips.py index 4c4ddc0d..9c92887b 100644 --- a/utils/fasm2pips.py +++ b/utils/fasm2pips.py @@ -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")