diff --git a/htmlgen/htmlgen.py b/htmlgen/htmlgen.py index 21994af4..0ebc6211 100644 --- a/htmlgen/htmlgen.py +++ b/htmlgen/htmlgen.py @@ -69,7 +69,6 @@ segbits_r = dict() segframes = dict() routebits = dict() routezbits = dict() -piptypes = dict() maskbits = dict() print("Loading tilegrid.") @@ -191,7 +190,7 @@ with open("%s/index.html" % os.getenv("XRAY_DATABASE"), "w") as f: ################################################# # Create Segment Pages -for segtype in segbits.keys(): +for segtype in sorted(segbits.keys()): print("Writing %s/seg_%s.html." % (os.getenv("XRAY_DATABASE"), segtype)) with open("%s/seg_%s.html" % (os.getenv("XRAY_DATABASE"), segtype), "w") as f: print("X-Ray %s Database: %s" % (os.getenv("XRAY_DATABASE").upper(), segtype.upper()), file=f) @@ -238,6 +237,7 @@ function oml() { unused_bits = 0 unknown_bits = 0 known_bits = 0 + piptypes = dict() print("", file=f) print("", file=f) @@ -341,6 +341,12 @@ function oml() { elif re.match("^INT_[LR].LH", bn): bgcolor = "#4466bb" label = "LH" + elif re.match("^HCLK_[LR]", bn) and "_B_BOT" in bn: + bgcolor = "#4466bb" + label = "BOT" + elif re.match("^HCLK_[LR]", bn) and "_B_TOP" in bn: + bgcolor = "#7755ff" + label = "TOP" piptypes[bit_pos] = label title.append(bn) diff --git a/utils/dbcheck.sh b/utils/dbcheck.sh index dbcb203a..3bf2550a 100644 --- a/utils/dbcheck.sh +++ b/utils/dbcheck.sh @@ -3,3 +3,5 @@ python3 ${XRAY_UTILS_DIR}/dbcheck.py ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/segbi python3 ${XRAY_UTILS_DIR}/dbcheck.py ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/segbits_{clblm,int}_r.db python3 ${XRAY_UTILS_DIR}/dbcheck.py ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/segbits_{clbll,int}_l.db python3 ${XRAY_UTILS_DIR}/dbcheck.py ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/segbits_{clbll,int}_r.db +python3 ${XRAY_UTILS_DIR}/dbcheck.py ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/segbits_hclk_l.db +python3 ${XRAY_UTILS_DIR}/dbcheck.py ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/segbits_hclk_r.db diff --git a/utils/dbfixup.py b/utils/dbfixup.py index 7e6b4afe..6f897ce8 100644 --- a/utils/dbfixup.py +++ b/utils/dbfixup.py @@ -75,4 +75,6 @@ update_mask("clbll_l", "clbll_l", "int_l") update_mask("clbll_r", "clbll_r", "int_r") update_mask("clblm_l", "clblm_l", "int_l") update_mask("clblm_r", "clblm_r", "int_r") +update_mask("hclk_l", "hclk_l") +update_mask("hclk_r", "hclk_r")