From da14e7ca7f31cb4b9a975dbe349fb4d385592b9c Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jans.tuomi@gmail.com>
Date: Tue, 11 Apr 2023 14:05:41 +0300
Subject: Fix bugs

---
 digital/atk16_regbank.dig | 723 +++++++++++++++++++++++++++-------------------
 1 file changed, 418 insertions(+), 305 deletions(-)

(limited to 'digital/atk16_regbank.dig')

diff --git a/digital/atk16_regbank.dig b/digital/atk16_regbank.dig
index d65e6fb..5af841b 100644
--- a/digital/atk16_regbank.dig
+++ b/digital/atk16_regbank.dig
@@ -82,104 +82,6 @@
       </elementAttributes>
       <pos x="940" y="320"/>
     </visualElement>
-    <visualElement>
-      <elementName>Ground</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="1"/>
-        </entry>
-        <entry>
-          <string>Bits</string>
-          <int>16</int>
-        </entry>
-      </elementAttributes>
-      <pos x="920" y="320"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>Q1</string>
-        </entry>
-      </elementAttributes>
-      <pos x="920" y="340"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>Q2</string>
-        </entry>
-      </elementAttributes>
-      <pos x="920" y="360"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation reference="../../../../visualElement[7]/elementAttributes/entry/rotation"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>Q3</string>
-        </entry>
-      </elementAttributes>
-      <pos x="920" y="380"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation reference="../../../../visualElement[7]/elementAttributes/entry/rotation"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>Q4</string>
-        </entry>
-      </elementAttributes>
-      <pos x="920" y="400"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation reference="../../../../visualElement[7]/elementAttributes/entry/rotation"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>Q5</string>
-        </entry>
-      </elementAttributes>
-      <pos x="920" y="420"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation reference="../../../../visualElement[7]/elementAttributes/entry/rotation"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>Q6</string>
-        </entry>
-      </elementAttributes>
-      <pos x="920" y="440"/>
-    </visualElement>
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
@@ -208,104 +110,6 @@
       </elementAttributes>
       <pos x="940" y="600"/>
     </visualElement>
-    <visualElement>
-      <elementName>Ground</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="1"/>
-        </entry>
-        <entry>
-          <string>Bits</string>
-          <int>16</int>
-        </entry>
-      </elementAttributes>
-      <pos x="920" y="600"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation reference="../../../../visualElement[6]/elementAttributes/entry/rotation"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>Q1</string>
-        </entry>
-      </elementAttributes>
-      <pos x="920" y="620"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation reference="../../../../visualElement[7]/elementAttributes/entry/rotation"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>Q2</string>
-        </entry>
-      </elementAttributes>
-      <pos x="920" y="640"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation reference="../../../../visualElement[7]/elementAttributes/entry/rotation"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>Q3</string>
-        </entry>
-      </elementAttributes>
-      <pos x="920" y="660"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation reference="../../../../visualElement[7]/elementAttributes/entry/rotation"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>Q4</string>
-        </entry>
-      </elementAttributes>
-      <pos x="920" y="680"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation reference="../../../../visualElement[7]/elementAttributes/entry/rotation"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>Q5</string>
-        </entry>
-      </elementAttributes>
-      <pos x="920" y="700"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation reference="../../../../visualElement[7]/elementAttributes/entry/rotation"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>Q6</string>
-        </entry>
-      </elementAttributes>
-      <pos x="920" y="720"/>
-    </visualElement>
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
@@ -488,7 +292,7 @@
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation reference="../../../../visualElement[27]/elementAttributes/entry/rotation"/>
+          <rotation reference="../../../../visualElement[13]/elementAttributes/entry/rotation"/>
         </entry>
         <entry>
           <string>NetName</string>
@@ -502,7 +306,7 @@
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation reference="../../../../visualElement[28]/elementAttributes/entry/rotation"/>
+          <rotation reference="../../../../visualElement[14]/elementAttributes/entry/rotation"/>
         </entry>
         <entry>
           <string>NetName</string>
@@ -531,7 +335,7 @@
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation reference="../../../../visualElement[31]/elementAttributes/entry/rotation"/>
+          <rotation reference="../../../../visualElement[17]/elementAttributes/entry/rotation"/>
         </entry>
         <entry>
           <string>NetName</string>
@@ -577,7 +381,7 @@
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation reference="../../../../visualElement[27]/elementAttributes/entry/rotation"/>
+          <rotation reference="../../../../visualElement[13]/elementAttributes/entry/rotation"/>
         </entry>
         <entry>
           <string>NetName</string>
@@ -591,7 +395,7 @@
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation reference="../../../../visualElement[28]/elementAttributes/entry/rotation"/>
+          <rotation reference="../../../../visualElement[14]/elementAttributes/entry/rotation"/>
         </entry>
         <entry>
           <string>NetName</string>
@@ -638,7 +442,7 @@
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation reference="../../../../visualElement[27]/elementAttributes/entry/rotation"/>
+          <rotation reference="../../../../visualElement[13]/elementAttributes/entry/rotation"/>
         </entry>
         <entry>
           <string>NetName</string>
@@ -652,7 +456,7 @@
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation reference="../../../../visualElement[28]/elementAttributes/entry/rotation"/>
+          <rotation reference="../../../../visualElement[14]/elementAttributes/entry/rotation"/>
         </entry>
         <entry>
           <string>NetName</string>
@@ -681,7 +485,7 @@
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation reference="../../../../visualElement[31]/elementAttributes/entry/rotation"/>
+          <rotation reference="../../../../visualElement[17]/elementAttributes/entry/rotation"/>
         </entry>
         <entry>
           <string>NetName</string>
@@ -816,7 +620,7 @@
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation reference="../../../../visualElement[53]/elementAttributes/entry/rotation"/>
+          <rotation reference="../../../../visualElement[39]/elementAttributes/entry/rotation"/>
         </entry>
         <entry>
           <string>NetName</string>
@@ -830,7 +634,7 @@
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation reference="../../../../visualElement[54]/elementAttributes/entry/rotation"/>
+          <rotation reference="../../../../visualElement[40]/elementAttributes/entry/rotation"/>
         </entry>
         <entry>
           <string>NetName</string>
@@ -859,7 +663,7 @@
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation reference="../../../../visualElement[57]/elementAttributes/entry/rotation"/>
+          <rotation reference="../../../../visualElement[43]/elementAttributes/entry/rotation"/>
         </entry>
         <entry>
           <string>NetName</string>
@@ -948,66 +752,6 @@
       </elementAttributes>
       <pos x="0" y="740"/>
     </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>NetName</string>
-          <string>RW_A</string>
-        </entry>
-      </elementAttributes>
-      <pos x="120" y="620"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>NetName</string>
-          <string>RW_B</string>
-        </entry>
-      </elementAttributes>
-      <pos x="120" y="640"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>NetName</string>
-          <string>RW_C</string>
-        </entry>
-      </elementAttributes>
-      <pos x="120" y="660"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>NetName</string>
-          <string>RW_D</string>
-        </entry>
-      </elementAttributes>
-      <pos x="120" y="680"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>NetName</string>
-          <string>RW_E</string>
-        </entry>
-      </elementAttributes>
-      <pos x="120" y="700"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>NetName</string>
-          <string>RW_F</string>
-        </entry>
-      </elementAttributes>
-      <pos x="120" y="720"/>
-    </visualElement>
     <visualElement>
       <elementName>Testcase</elementName>
       <elementAttributes>
@@ -1020,9 +764,7 @@ C   0xF 1     1    0    X    X   X
 C   0   0     0    1    X    0xF X
 C   0x5 1     1    1    X    0x5 X
 C   0   0     0    1    X    0x5 X
-
-# zero register read and write
-C   0xA 1     0    0    X    0   X</dataString>
+</dataString>
           </testData>
         </entry>
       </elementAttributes>
@@ -1051,7 +793,7 @@ C   0xA 1     0    0    X    0   X</dataString>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation reference="../../../../visualElement[53]/elementAttributes/entry/rotation"/>
+          <rotation reference="../../../../visualElement[39]/elementAttributes/entry/rotation"/>
         </entry>
         <entry>
           <string>NetName</string>
@@ -1065,7 +807,7 @@ C   0xA 1     0    0    X    0   X</dataString>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation reference="../../../../visualElement[54]/elementAttributes/entry/rotation"/>
+          <rotation reference="../../../../visualElement[40]/elementAttributes/entry/rotation"/>
         </entry>
         <entry>
           <string>NetName</string>
@@ -1094,7 +836,7 @@ C   0xA 1     0    0    X    0   X</dataString>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation reference="../../../../visualElement[57]/elementAttributes/entry/rotation"/>
+          <rotation reference="../../../../visualElement[43]/elementAttributes/entry/rotation"/>
         </entry>
         <entry>
           <string>NetName</string>
@@ -1118,18 +860,79 @@ C   0xA 1     0    0    X    0   X</dataString>
       <pos x="460" y="1160"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>Register</elementName>
       <elementAttributes>
         <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
+          <string>valueIsProbe</string>
+          <boolean>true</boolean>
         </entry>
         <entry>
-          <string>NetName</string>
-          <string>Q7</string>
+          <string>Label</string>
+          <string>RH</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>16</int>
         </entry>
       </elementAttributes>
-      <pos x="920" y="460"/>
+      <pos x="560" y="1260"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation reference="../../../../visualElement[39]/elementAttributes/entry/rotation"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>Din</string>
+        </entry>
+      </elementAttributes>
+      <pos x="560" y="1260"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation reference="../../../../visualElement[40]/elementAttributes/entry/rotation"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>CLK</string>
+        </entry>
+      </elementAttributes>
+      <pos x="560" y="1280"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>Q8</string>
+        </entry>
+      </elementAttributes>
+      <pos x="640" y="1280"/>
+    </visualElement>
+    <visualElement>
+      <elementName>And</elementName>
+      <elementAttributes/>
+      <pos x="460" y="1300"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation reference="../../../../visualElement[43]/elementAttributes/entry/rotation"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>RW_IE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="460" y="1300"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -1140,10 +943,70 @@ C   0xA 1     0    0    X    0   X</dataString>
         </entry>
         <entry>
           <string>NetName</string>
-          <string>Q7</string>
+          <string>RW_H</string>
         </entry>
       </elementAttributes>
-      <pos x="920" y="740"/>
+      <pos x="460" y="1340"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>RW_A</string>
+        </entry>
+      </elementAttributes>
+      <pos x="120" y="600"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>RW_B</string>
+        </entry>
+      </elementAttributes>
+      <pos x="120" y="620"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>RW_C</string>
+        </entry>
+      </elementAttributes>
+      <pos x="120" y="640"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>RW_D</string>
+        </entry>
+      </elementAttributes>
+      <pos x="120" y="660"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>RW_E</string>
+        </entry>
+      </elementAttributes>
+      <pos x="120" y="680"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>RW_F</string>
+        </entry>
+      </elementAttributes>
+      <pos x="120" y="700"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -1153,30 +1016,268 @@ C   0xA 1     0    0    X    0   X</dataString>
           <string>RW_G</string>
         </entry>
       </elementAttributes>
+      <pos x="120" y="720"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>RW_H</string>
+        </entry>
+      </elementAttributes>
       <pos x="120" y="740"/>
     </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>Q1</string>
+        </entry>
+      </elementAttributes>
+      <pos x="920" y="320"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>Q2</string>
+        </entry>
+      </elementAttributes>
+      <pos x="920" y="340"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation reference="../../../../visualElement[81]/elementAttributes/entry/rotation"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>Q3</string>
+        </entry>
+      </elementAttributes>
+      <pos x="920" y="360"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation reference="../../../../visualElement[81]/elementAttributes/entry/rotation"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>Q4</string>
+        </entry>
+      </elementAttributes>
+      <pos x="920" y="380"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation reference="../../../../visualElement[81]/elementAttributes/entry/rotation"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>Q5</string>
+        </entry>
+      </elementAttributes>
+      <pos x="920" y="400"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation reference="../../../../visualElement[81]/elementAttributes/entry/rotation"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>Q6</string>
+        </entry>
+      </elementAttributes>
+      <pos x="920" y="420"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>Q7</string>
+        </entry>
+      </elementAttributes>
+      <pos x="920" y="440"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>Q8</string>
+        </entry>
+      </elementAttributes>
+      <pos x="920" y="460"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation reference="../../../../visualElement[80]/elementAttributes/entry/rotation"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>Q1</string>
+        </entry>
+      </elementAttributes>
+      <pos x="920" y="600"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation reference="../../../../visualElement[81]/elementAttributes/entry/rotation"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>Q2</string>
+        </entry>
+      </elementAttributes>
+      <pos x="920" y="620"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation reference="../../../../visualElement[81]/elementAttributes/entry/rotation"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>Q3</string>
+        </entry>
+      </elementAttributes>
+      <pos x="920" y="640"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation reference="../../../../visualElement[81]/elementAttributes/entry/rotation"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>Q4</string>
+        </entry>
+      </elementAttributes>
+      <pos x="920" y="660"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation reference="../../../../visualElement[81]/elementAttributes/entry/rotation"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>Q5</string>
+        </entry>
+      </elementAttributes>
+      <pos x="920" y="680"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation reference="../../../../visualElement[81]/elementAttributes/entry/rotation"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>Q6</string>
+        </entry>
+      </elementAttributes>
+      <pos x="920" y="700"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation reference="../../../../visualElement[86]/elementAttributes/entry/rotation"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>Q7</string>
+        </entry>
+      </elementAttributes>
+      <pos x="920" y="720"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation reference="../../../../visualElement[87]/elementAttributes/entry/rotation"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>Q8</string>
+        </entry>
+      </elementAttributes>
+      <pos x="920" y="740"/>
+    </visualElement>
   </visualElements>
   <wires>
-    <wire>
-      <p1 x="920" y="320"/>
-      <p2 x="940" y="320"/>
-    </wire>
     <wire>
       <p1 x="520" y="320"/>
       <p2 x="540" y="320"/>
     </wire>
     <wire>
-      <p1 x="920" y="640"/>
-      <p2 x="940" y="640"/>
+      <p1 x="920" y="320"/>
+      <p2 x="940" y="320"/>
     </wire>
     <wire>
       <p1 x="520" y="640"/>
       <p2 x="540" y="640"/>
     </wire>
+    <wire>
+      <p1 x="920" y="640"/>
+      <p2 x="940" y="640"/>
+    </wire>
     <wire>
       <p1 x="520" y="960"/>
       <p2 x="540" y="960"/>
     </wire>
+    <wire>
+      <p1 x="620" y="1280"/>
+      <p2 x="640" y="1280"/>
+    </wire>
     <wire>
       <p1 x="940" y="520"/>
       <p2 x="960" y="520"/>
@@ -1221,6 +1322,10 @@ C   0xA 1     0    0    X    0   X</dataString>
       <p1 x="920" y="720"/>
       <p2 x="940" y="720"/>
     </wire>
+    <wire>
+      <p1 x="540" y="1300"/>
+      <p2 x="560" y="1300"/>
+    </wire>
     <wire>
       <p1 x="920" y="340"/>
       <p2 x="940" y="340"/>
@@ -1229,14 +1334,14 @@ C   0xA 1     0    0    X    0   X</dataString>
       <p1 x="920" y="660"/>
       <p2 x="940" y="660"/>
     </wire>
-    <wire>
-      <p1 x="920" y="600"/>
-      <p2 x="940" y="600"/>
-    </wire>
     <wire>
       <p1 x="620" y="600"/>
       <p2 x="640" y="600"/>
     </wire>
+    <wire>
+      <p1 x="920" y="600"/>
+      <p2 x="940" y="600"/>
+    </wire>
     <wire>
       <p1 x="620" y="280"/>
       <p2 x="640" y="280"/>
@@ -1265,38 +1370,42 @@ C   0xA 1     0    0    X    0   X</dataString>
       <p1 x="540" y="1120"/>
       <p2 x="560" y="1120"/>
     </wire>
-    <wire>
-      <p1 x="920" y="420"/>
-      <p2 x="940" y="420"/>
-    </wire>
     <wire>
       <p1 x="60" y="420"/>
       <p2 x="80" y="420"/>
     </wire>
+    <wire>
+      <p1 x="920" y="420"/>
+      <p2 x="940" y="420"/>
+    </wire>
     <wire>
       <p1 x="920" y="740"/>
       <p2 x="940" y="740"/>
     </wire>
     <wire>
-      <p1 x="920" y="360"/>
-      <p2 x="940" y="360"/>
+      <p1 x="980" y="680"/>
+      <p2 x="1080" y="680"/>
     </wire>
     <wire>
       <p1 x="920" y="680"/>
       <p2 x="940" y="680"/>
     </wire>
     <wire>
-      <p1 x="980" y="680"/>
-      <p2 x="1080" y="680"/>
+      <p1 x="520" y="1320"/>
+      <p2 x="540" y="1320"/>
     </wire>
     <wire>
-      <p1 x="920" y="620"/>
-      <p2 x="940" y="620"/>
+      <p1 x="920" y="360"/>
+      <p2 x="940" y="360"/>
     </wire>
     <wire>
       <p1 x="540" y="620"/>
       <p2 x="560" y="620"/>
     </wire>
+    <wire>
+      <p1 x="920" y="620"/>
+      <p2 x="940" y="620"/>
+    </wire>
     <wire>
       <p1 x="540" y="300"/>
       <p2 x="560" y="300"/>
@@ -1317,14 +1426,14 @@ C   0xA 1     0    0    X    0   X</dataString>
       <p1 x="520" y="1140"/>
       <p2 x="540" y="1140"/>
     </wire>
-    <wire>
-      <p1 x="920" y="440"/>
-      <p2 x="940" y="440"/>
-    </wire>
     <wire>
       <p1 x="620" y="440"/>
       <p2 x="640" y="440"/>
     </wire>
+    <wire>
+      <p1 x="920" y="440"/>
+      <p2 x="940" y="440"/>
+    </wire>
     <wire>
       <p1 x="620" y="760"/>
       <p2 x="640" y="760"/>
@@ -1381,6 +1490,10 @@ C   0xA 1     0    0    X    0   X</dataString>
       <p1 x="540" y="1120"/>
       <p2 x="540" y="1140"/>
     </wire>
+    <wire>
+      <p1 x="540" y="1300"/>
+      <p2 x="540" y="1320"/>
+    </wire>
   </wires>
   <measurementOrdering/>
 </circuit>
\ No newline at end of file
-- 
cgit v1.3