Fix calling issues

2 files changed, 55 insertions, 55 deletions

diff --git a/digital/atk16.dig b/digital/atk16.dig
index c028bd7..87f7ddb 100644
--- a/digital/atk16.dig
+++ b/digital/atk16.dig
@@ -413,20 +413,6 @@
       <pos x="-140" y="180"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>US_RS</string>
-        </entry>
-      </elementAttributes>
-      <pos x="-280" y="220"/>
-    </visualElement>
-    <visualElement>
       <elementName>VDD</elementName>
       <elementAttributes>
         <entry>
@@ -456,21 +442,6 @@
       <pos x="-240" y="200"/>
     </visualElement>
     <visualElement>
-      <elementName>Reset</elementName>
-      <elementAttributes>
-        <entry>
-          <string>invertOutput</string>
-          <boolean>false</boolean>
-        </entry>
-      </elementAttributes>
-      <pos x="-260" y="260"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Or</elementName>
-      <elementAttributes/>
-      <pos x="-220" y="220"/>
-    </visualElement>
-    <visualElement>
       <elementName>Driver</elementName>
       <elementAttributes>
         <entry>
@@ -1741,11 +1712,6 @@
       <pos x="400" y="740"/>
     </visualElement>
     <visualElement>
-      <elementName>Break</elementName>
-      <elementAttributes/>
-      <pos x="880" y="280"/>
-    </visualElement>
-    <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
@@ -1773,6 +1739,40 @@
       </elementAttributes>
       <pos x="680" y="1020"/>
     </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>US_RS</string>
+        </entry>
+      </elementAttributes>
+      <pos x="-360" y="240"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Reset</elementName>
+      <elementAttributes>
+        <entry>
+          <string>invertOutput</string>
+          <boolean>false</boolean>
+        </entry>
+      </elementAttributes>
+      <pos x="-340" y="280"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Or</elementName>
+      <elementAttributes/>
+      <pos x="-300" y="240"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Break</elementName>
+      <elementAttributes/>
+      <pos x="-200" y="260"/>
+    </visualElement>
   </visualElements>
   <wires>
     <wire>
@@ -1808,10 +1808,6 @@
       <p2 x="960" y="640"/>
     </wire>
     <wire>
-      <p1 x="-260" y="260"/>
-      <p2 x="-220" y="260"/>
-    </wire>
-    <wire>
       <p1 x="420" y="260"/>
       <p2 x="440" y="260"/>
     </wire>
@@ -1828,6 +1824,14 @@
       <p2 x="280" y="260"/>
     </wire>
     <wire>
+      <p1 x="-240" y="260"/>
+      <p2 x="-220" y="260"/>
+    </wire>
+    <wire>
+      <p1 x="-220" y="260"/>
+      <p2 x="-200" y="260"/>
+    </wire>
+    <wire>
       <p1 x="680" y="900"/>
       <p2 x="700" y="900"/>
     </wire>
@@ -1960,8 +1964,8 @@
       <p2 x="700" y="280"/>
     </wire>
     <wire>
-      <p1 x="860" y="280"/>
-      <p2 x="880" y="280"/>
+      <p1 x="-340" y="280"/>
+      <p2 x="-300" y="280"/>
     </wire>
     <wire>
       <p1 x="680" y="920"/>
@@ -2348,14 +2352,6 @@
       <p2 x="740" y="-220"/>
     </wire>
     <wire>
-      <p1 x="-160" y="220"/>
-      <p2 x="-140" y="220"/>
-    </wire>
-    <wire>
-      <p1 x="-280" y="220"/>
-      <p2 x="-220" y="220"/>
-    </wire>
-    <wire>
       <p1 x="60" y="220"/>
       <p2 x="80" y="220"/>
     </wire>
@@ -2372,6 +2368,10 @@
       <p2 x="860" y="220"/>
     </wire>
     <wire>
+      <p1 x="-220" y="220"/>
+      <p2 x="-140" y="220"/>
+    </wire>
+    <wire>
       <p1 x="680" y="220"/>
       <p2 x="760" y="220"/>
     </wire>
@@ -2496,6 +2496,10 @@
       <p2 x="280" y="240"/>
     </wire>
     <wire>
+      <p1 x="-360" y="240"/>
+      <p2 x="-300" y="240"/>
+    </wire>
+    <wire>
       <p1 x="-20" y="240"/>
       <p2 x="80" y="240"/>
     </wire>
@@ -2632,12 +2636,8 @@
       <p2 x="280" y="-100"/>
     </wire>
     <wire>
-      <p1 x="860" y="220"/>
-      <p2 x="860" y="280"/>
-    </wire>
-    <wire>
-      <p1 x="-160" y="220"/>
-      <p2 x="-160" y="240"/>
+      <p1 x="-220" y="220"/>
+      <p2 x="-220" y="260"/>
     </wire>
     <wire>
       <p1 x="480" y="0"/>
diff --git a/digital/atk16_mem.dig b/digital/atk16_mem.dig
index 629a6af..5f5e2e6 100644
--- a/digital/atk16_mem.dig
+++ b/digital/atk16_mem.dig
@@ -34,7 +34,7 @@
         </entry>
         <entry>
           <string>Data</string>
-          <data>4014,2e00,6028,8000,8000,8000,8000,8000,8000,8000,8000,8000,8000,8000,8000,8000,001c,001a,001a,001a,8000,e000,e001,e002,e800,f800,4855,f000,31c0,1fc8,31c8,1fc8,4016,2000,2000,4215,2240,3040,1fc9,23c0,1fc9,21c0,e000,4017,2000,4200,3008,601a,0001,0017,0019,0041,001a,4014,2000,4204,0008,2000,4233,2240,0008,31c0,1fc8,4014,2000,4203,0008,1fc9,23c0,1e00,2000,31c8,1fc8,5000,1fd8,4431,2480,2480,31d0,1fc8,4014,2000,4200,0008,1fc9,23c0,3008,4432,2480,2480,31d0,1fc8,4014,2000,4201,0008,1fc9,23c0,3008,4014,2000,4200,0008,2000,4230,2240,3008,4400,31d0,1fc8,4014,2000,4202,0008,1fc9,23c0,3008,4dff,4214,2240,4402,0250,2240,4434,2480,0251,8004,4200,31c8,1fc8,6003,4201,31c8,1fc8,1fc9,21c0,1000,8436,4014,2000,4201,0008,2000,31c0,1fc8,4014,2000,4202,0008,2200,1fc9,21c0,0008,31c0,1fc8,4000,31c0,1fc8,4014,2000,4202,0008,2000,31c0,1fc8,11d1,9200,1258,3008,618b,1fc9,23c0,1fc9,21c0,3008,4414,2480,4602,0498,2480,4601,0498,31d0,1fc8,4014,2000,4202,0008,1fc9,23c0,3008,61b6,4001,1000,8401,61fc,1fd9</data>
+          <data>4014,2e00,1dc0,6027,8000,8000,8000,8000,8000,8000,8000,8000,8000,8000,8000,8000,001c,001a,001a,001a,8000,e000,e001,e002,e800,f800,4855,f000,31c0,1fc8,31c8,1fc8,4016,2000,2000,4215,2240,3040,1fc9,23c0,1fc9,21c0,e000,4017,2000,4200,3008,6018,0001,0017,0019,0041,001a,4433,2480,31d0,1fc8,4400,0590,2480,31d0,1fc8,1fc9,27c0,1fc9,25c0,0498,31d0,1fc8,1d89,2380,5040,1fd8,4431,2480,31d0,1fc8,1fc9,25c0,2480,31d0,1fc8,1fc9,21c0,4200,0270,3040,4432,2480,31d0,1fc8,1fc9,25c0,2480,31d0,1fc8,1fc9,21c0,4201,0270,3040,4000,0180,2000,31c0,1fc8,4030,2000,31c0,1fc8,1fc9,23c0,1fc9,21c0,3008,4000,31c0,1fc8,1fc9,21c0,4400,31d0,1fc8,1fc9,21c0,4202,0270,3040,4202,0388,2240,31c8,1fc8,4234,2240,31c8,1fc8,1fc9,25c0,1fc9,23c0,0251,8004,4200,31c8,1fc8,6003,4201,31c8,1fc8,1fc9,21c0,1000,8447,4001,0180,2000,31c0,1fc8,4002,0180,2000,31c0,1fc8,1fc9,23c0,1fc9,21c0,0008,31c0,1fc8,31f0,1fc8,4000,31c0,1fc8,4002,0180,2000,31c0,1fc8,1dd1,9000,1020,3180,1d88,617a,1fc9,21c0,1f80,1fc9,2dc0,31c0,1fc8,1fc9,23c0,1fc9,21c0,3008,4000,31c0,1fc8,1fc9,21c0,4402,0590,2480,31d0,1fc8,4401,31d0,1fc8,1fc9,27c0,1fc9,25c0,0498,31d0,1fc8,1fc9,21c0,4202,0270,3040,619f,4201,31c8,1fc8,1fc9,21c0,1000,8401,61f8,1f80,f000</data>
         </entry>
       </elementAttributes>
       <pos x="740" y="100" />