From 075a939ffc421d9f33cc88b01b540aa7d8036fed Mon Sep 17 00:00:00 2001 From: John McMaster Date: Tue, 8 Jan 2019 10:57:41 +0100 Subject: [PATCH] add_site_group_zero() allow unused zero_val for empty tile Signed-off-by: John McMaster --- prjxray/segmaker.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/prjxray/segmaker.py b/prjxray/segmaker.py index 24fdc074..75199756 100644 --- a/prjxray/segmaker.py +++ b/prjxray/segmaker.py @@ -53,8 +53,8 @@ def add_site_group_zero(segmk, site, prefix, vals, zero_val, val): vals: all possible tag enum vals zero_val: tag value known to have no bits set ''' - assert zero_val in vals, "Got %s, need %s" % (zero_val, vals) - assert val in vals, "Got %s, need %s" % (val, vals) + # assert zero_val in vals, "Got %s, need %s" % (zero_val, vals) + assert val in vals or val == zero_val, "Got %s, need %s" % (val, vals) if val == zero_val: # Zero symbol occured, none of the others did @@ -64,10 +64,11 @@ def add_site_group_zero(segmk, site, prefix, vals, zero_val, val): else: # Only add the occured symbol tag = prefix + val - segmk.add_site_tag(site, tag, 1) - # And zero so that it has something to solve against - tag = prefix + zero_val - segmk.add_site_tag(site, tag, 0) + segmk.add_site_tag(site, tag, True) + if zero_val in vals: + # And zero so that it has something to solve against + tag = prefix + zero_val + segmk.add_site_tag(site, tag, False) class Segmaker: