commit 90ec237f56b0e55dc239ab92ea7d2847bd7fe65e
author Tim 'mithro' Ansell <me@mith.ro> Mon Feb 05 17:22:18 2018 -0800
committer Tim 'mithro' Ansell <me@mith.ro> Tue Feb 13 10:29:43 2018 -0800
tree b43e03437f399996a2d647b165af531e2c2253b4
parent 10e2cd6cabbd2d1886d4410cf831d1155fe581d4

Fixing htmlgen for name changes.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>

htmlgen/htmlgen.py

diff --git a/htmlgen/htmlgen.py b/htmlgen/htmlgen.py
index 3b933fd..eb010ed 100755
--- a/htmlgen/htmlgen.py
+++ b/htmlgen/htmlgen.py
@@ -202,6 +202,7 @@
                     routebits[segtype][bit].add(bit_name)
 
         def add_single_bit(line):
+            print(line)
             bit_name, bit_pos = line.split()
             assert bit_pos[0] != "!"
             segbits[segtype][bit_name] = bit_pos
@@ -211,7 +212,7 @@
             print("  loading %s segbits." % segtype)
             with db_open("segbits_%s.db" % segtype) as f:
                 for line in f:
-                    if re.search(r"(\.[ABCD]MUX\.)|(\.PRECYINIT\.)", line):
+                    if re.search(r"(\.[ABCD](FF|OUT)MUX\.)|(\.PRECYINIT\.)", line):
                         add_pip_bits(line)
                     else:
                         add_single_bit(line)
@@ -578,12 +579,12 @@
                             bgcolor = "#4466bb"
                             label = "LH"
                         elif re.match(
-                                "^CLBL[LM]_[LR].SLICE[LM]_X[01].[ABCD]FF.DMUX",
+                                "^CLBL[LM]_[LR].SLICE[LM]_X[01].[ABCD]FFMUX",
                                 bn):
                             bgcolor = "#88aaff"
                             label = "DMX"
                         elif re.match(
-                                "^CLBL[LM]_[LR].SLICE[LM]_X[01].[ABCD]MUX",
+                                "^CLBL[LM]_[LR].SLICE[LM]_X[01].[ABCD]OUTMUX",
                                 bn):
                             bgcolor = "#aa88ff"
                             label = "OMX"