From b5a8de55f896a6ce474fb6e9ccba2f33b019e74e Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jans.tuomi@gmail.com>
Date: Thu, 13 Apr 2023 16:10:51 +0300
Subject: Refactor CPU layout

---
 digital/atk16.dig | 1381 ++++++++++++++++++++++++++---------------------------
 1 file changed, 670 insertions(+), 711 deletions(-)

(limited to 'digital')

diff --git a/digital/atk16.dig b/digital/atk16.dig
index 056fbb0..2b804fd 100644
--- a/digital/atk16.dig
+++ b/digital/atk16.dig
@@ -71,52 +71,6 @@
       </elementAttributes>
       <pos x="400" y="-240"/>
     </visualElement>
-    <visualElement>
-      <elementName>Register</elementName>
-      <elementAttributes>
-        <entry>
-          <string>valueIsProbe</string>
-          <boolean>true</boolean>
-        </entry>
-        <entry>
-          <string>Label</string>
-          <string>FR</string>
-        </entry>
-        <entry>
-          <string>Bits</string>
-          <int>4</int>
-        </entry>
-      </elementAttributes>
-      <pos x="300" y="280"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>FR_IE</string>
-        </entry>
-      </elementAttributes>
-      <pos x="280" y="340"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>MAR_IE</string>
-        </entry>
-      </elementAttributes>
-      <pos x="380" y="-180"/>
-    </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
@@ -131,72 +85,6 @@
       </elementAttributes>
       <pos x="-40" y="-200"/>
     </visualElement>
-    <visualElement>
-      <elementName>Splitter</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Input Splitting</string>
-          <string>3,1,4</string>
-        </entry>
-      </elementAttributes>
-      <pos x="540" y="280"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>OPCODE</string>
-        </entry>
-      </elementAttributes>
-      <pos x="540" y="320"/>
-    </visualElement>
-    <visualElement>
-      <elementName>BitSelector</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Selector Bits</string>
-          <int>2</int>
-        </entry>
-      </elementAttributes>
-      <pos x="400" y="300"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>FLAG_EQ</string>
-        </entry>
-      </elementAttributes>
-      <pos x="400" y="360"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Splitter</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="1"/>
-        </entry>
-        <entry>
-          <string>Input Splitting</string>
-          <string>3</string>
-        </entry>
-        <entry>
-          <string>Output Splitting</string>
-          <string>2,</string>
-        </entry>
-      </elementAttributes>
-      <pos x="420" y="360"/>
-    </visualElement>
     <visualElement>
       <elementName>CounterPreset</elementName>
       <elementAttributes>
@@ -234,7 +122,7 @@
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation reference="../../../../visualElement[12]/elementAttributes/entry/rotation"/>
+          <rotation reference="../../../../visualElement[4]/elementAttributes/entry/rotation"/>
         </entry>
       </elementAttributes>
       <pos x="0" y="-180"/>
@@ -281,20 +169,6 @@
       </elementAttributes>
       <pos x="0" y="-260"/>
     </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>CLK</string>
-        </entry>
-      </elementAttributes>
-      <pos x="280" y="300"/>
-    </visualElement>
     <visualElement>
       <elementName>atk16_mem.dig</elementName>
       <elementAttributes/>
@@ -329,14 +203,19 @@
       <pos x="580" y="-160"/>
     </visualElement>
     <visualElement>
-      <elementName>atk16_decoder.dig</elementName>
+      <elementName>atk16_jump_unit.dig</elementName>
+      <elementAttributes/>
+      <pos x="-220" y="-240"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Probe</elementName>
       <elementAttributes>
         <entry>
-          <string>shapeType</string>
-          <shapeType>CUSTOM</shapeType>
+          <string>Label</string>
+          <string>PC</string>
         </entry>
       </elementAttributes>
-      <pos x="-40" y="-80"/>
+      <pos x="240" y="-380"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -347,366 +226,389 @@
         </entry>
         <entry>
           <string>NetName</string>
-          <string>RW_IE</string>
+          <string>OPCODE</string>
         </entry>
       </elementAttributes>
-      <pos x="280" y="-60"/>
+      <pos x="240" y="-440"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>Probe</elementName>
       <elementAttributes>
         <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>CLK</string>
+          <string>Label</string>
+          <string>OPCODE</string>
         </entry>
       </elementAttributes>
-      <pos x="260" y="-20"/>
-    </visualElement>
-    <visualElement>
-      <elementName>atk16_regbank.dig</elementName>
-      <elementAttributes/>
-      <pos x="280" y="-80"/>
+      <pos x="240" y="-440"/>
     </visualElement>
     <visualElement>
-      <elementName>Counter</elementName>
+      <elementName>Testcase</elementName>
       <elementAttributes>
-        <entry>
-          <string>valueIsProbe</string>
-          <boolean>true</boolean>
-        </entry>
         <entry>
           <string>Label</string>
-          <string>Microsequencer</string>
+          <string>Sum program TODO</string>
         </entry>
         <entry>
-          <string>Bits</string>
-          <int>3</int>
+          <string>Testdata</string>
+          <testData>
+            <dataString>IN OUT
+
+program(0x4051, 0x40a2, 0x029b)
+
+0 x</dataString>
+          </testData>
         </entry>
       </elementAttributes>
-      <pos x="60" y="240"/>
+      <pos x="900" y="760"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>Out</elementName>
       <elementAttributes>
         <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
+          <string>Description</string>
+          <string>Dummy output</string>
         </entry>
         <entry>
-          <string>NetName</string>
-          <string>US_RS</string>
+          <string>Label</string>
+          <string>OUT</string>
         </entry>
       </elementAttributes>
-      <pos x="-80" y="280"/>
+      <pos x="720" y="800"/>
     </visualElement>
     <visualElement>
-      <elementName>VDD</elementName>
+      <elementName>Ground</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
           <rotation rotation="1"/>
         </entry>
       </elementAttributes>
-      <pos x="40" y="240"/>
+      <pos x="700" y="800"/>
     </visualElement>
     <visualElement>
-      <elementName>Not</elementName>
-      <elementAttributes/>
-      <pos x="0" y="260"/>
+      <elementName>In</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>IN</string>
+        </entry>
+      </elementAttributes>
+      <pos x="720" y="740"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>Ground</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>CLK</string>
+          <rotation reference="../../../../visualElement[18]/elementAttributes/entry/rotation"/>
         </entry>
       </elementAttributes>
-      <pos x="-40" y="260"/>
+      <pos x="740" y="740"/>
     </visualElement>
     <visualElement>
-      <elementName>Reset</elementName>
+      <elementName>Clock</elementName>
       <elementAttributes>
         <entry>
-          <string>invertOutput</string>
-          <boolean>false</boolean>
+          <string>small</string>
+          <boolean>true</boolean>
+        </entry>
+        <entry>
+          <string>runRealTime</string>
+          <boolean>true</boolean>
+        </entry>
+        <entry>
+          <string>Frequency</string>
+          <int>50</int>
         </entry>
       </elementAttributes>
-      <pos x="-60" y="320"/>
+      <pos x="660" y="-340"/>
     </visualElement>
     <visualElement>
-      <elementName>Or</elementName>
+      <elementName>Break</elementName>
       <elementAttributes/>
-      <pos x="-20" y="280"/>
+      <pos x="700" y="-380"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>DipSwitch</elementName>
       <elementAttributes>
         <entry>
-          <string>NetName</string>
-          <string>FLAG_EQ</string>
+          <string>Label</string>
+          <string>IRQ0</string>
         </entry>
       </elementAttributes>
-      <pos x="100" y="-100"/>
+      <pos x="-160" y="-480"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>Ground</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>IR_IE</string>
+          <rotation rotation="1"/>
         </entry>
       </elementAttributes>
-      <pos x="-60" y="-60"/>
+      <pos x="-180" y="-460"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>Ground</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>CLK</string>
+          <rotation reference="../../../../visualElement[24]/elementAttributes/entry/rotation"/>
         </entry>
       </elementAttributes>
-      <pos x="-40" y="-40"/>
+      <pos x="-180" y="-440"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>Ground</elementName>
       <elementAttributes>
         <entry>
-          <string>NetName</string>
-          <string>OPCODE</string>
+          <string>rotation</string>
+          <rotation reference="../../../../visualElement[24]/elementAttributes/entry/rotation"/>
         </entry>
       </elementAttributes>
-      <pos x="100" y="-80"/>
+      <pos x="-180" y="-420"/>
     </visualElement>
     <visualElement>
       <elementName>Splitter</elementName>
       <elementAttributes>
-        <entry>
-          <string>mirror</string>
-          <boolean>true</boolean>
-        </entry>
         <entry>
           <string>Input Splitting</string>
-          <string>16</string>
+          <string>1*4</string>
         </entry>
         <entry>
           <string>Output Splitting</string>
-          <string>1*16</string>
+          <string>4</string>
         </entry>
       </elementAttributes>
-      <pos x="880" y="320"/>
+      <pos x="-140" y="-480"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>atk16_decoder.dig</elementName>
       <elementAttributes>
         <entry>
-          <string>NetName</string>
-          <string>PC_CO</string>
+          <string>shapeType</string>
+          <shapeType>CUSTOM</shapeType>
         </entry>
       </elementAttributes>
-      <pos x="920" y="320"/>
+      <pos x="-260" y="-80"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>NetName</string>
-          <string>PC_IE</string>
+          <string>FLAG_EQ</string>
         </entry>
       </elementAttributes>
-      <pos x="920" y="300"/>
+      <pos x="-120" y="-100"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
         <entry>
           <string>NetName</string>
-          <string>PC_OE</string>
+          <string>IR_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="920" y="280"/>
+      <pos x="-280" y="-60"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
         <entry>
           <string>NetName</string>
-          <string>MAR_IE</string>
+          <string>CLK</string>
         </entry>
       </elementAttributes>
-      <pos x="920" y="260"/>
+      <pos x="-260" y="-40"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>NetName</string>
-          <string>MEM_IE</string>
+          <string>OPCODE</string>
         </entry>
       </elementAttributes>
-      <pos x="920" y="240"/>
+      <pos x="-120" y="-80"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
         <entry>
           <string>NetName</string>
-          <string>MEM_OE</string>
+          <string>LI_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="920" y="220"/>
+      <pos x="-280" y="-20"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
         <entry>
           <string>NetName</string>
-          <string>R1_OE</string>
+          <string>RW_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="920" y="180"/>
+      <pos x="60" y="-80"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
         <entry>
           <string>NetName</string>
-          <string>IR_IE</string>
+          <string>CLK</string>
         </entry>
       </elementAttributes>
-      <pos x="920" y="140"/>
+      <pos x="40" y="-40"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>atk16_regbank.dig</elementName>
+      <elementAttributes/>
+      <pos x="60" y="-100"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Driver</elementName>
       <elementAttributes>
         <entry>
-          <string>NetName</string>
-          <string>ALU_OE</string>
+          <string>Bits</string>
+          <int>16</int>
+        </entry>
+        <entry>
+          <string>flipSelPos</string>
+          <boolean>true</boolean>
         </entry>
       </elementAttributes>
-      <pos x="920" y="80"/>
+      <pos x="360" y="-100"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>NetName</string>
-          <string>US_RS</string>
+          <string>R2_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="920" y="20"/>
+      <pos x="380" y="-80"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>Driver</elementName>
       <elementAttributes>
         <entry>
-          <string>NetName</string>
-          <string>FR_IE</string>
+          <string>Bits</string>
+          <int>16</int>
+        </entry>
+        <entry>
+          <string>flipSelPos</string>
+          <boolean>true</boolean>
         </entry>
       </elementAttributes>
-      <pos x="920" y="60"/>
+      <pos x="240" y="-100"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>NetName</string>
-          <string>RW_IE</string>
+          <string>R1_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="920" y="200"/>
+      <pos x="260" y="-80"/>
     </visualElement>
     <visualElement>
-      <elementName>Stop</elementName>
+      <elementName>atk16_alu_inputs.dig</elementName>
       <elementAttributes/>
-      <pos x="1000" y="40"/>
+      <pos x="360" y="-40"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
         <entry>
           <string>NetName</string>
-          <string>LI_OE</string>
+          <string>IM_M</string>
         </entry>
       </elementAttributes>
-      <pos x="920" y="100"/>
+      <pos x="360" y="20"/>
     </visualElement>
     <visualElement>
-      <elementName>EEPROM</elementName>
+      <elementName>atk16_alu.dig</elementName>
       <elementAttributes>
         <entry>
-          <string>AddrBits</string>
-          <int>8</int>
+          <string>shapeType</string>
+          <shapeType>SIMPLE</shapeType>
         </entry>
         <entry>
           <string>Label</string>
-          <string>UCODE</string>
-        </entry>
-        <entry>
-          <string>Bits</string>
-          <int>16</int>
-        </entry>
-        <entry>
-          <string>Data</string>
-          <data>c,221,3040,8000,4*0,c,221,3040,8000,4*0,c,221,3440,8000,4*0,c
-,221,3440,8000,4*0,c,221,88,60,8000,0,0,0,c,221,88,60,8000,0,0,0
-,c,221,88,110,8000,0,0,0,c,221,88,110,8000,0,0,0,c,221,840,8000
-,4*0,c,221,840,8000,4*0,c,221,82,8000,4*0,c,221,82,8000,4*0,c
-,221,c02,8000,4*0,c,221,c02,8000,4*0,c,221,8000,5*0,c,221,82,8000
-,4*0,c,221,8000,5*0,c,221,c02,8000,4*0,c,221,44,8000,4*0,c,221
-,44,8000,4*0,c,221,8000,5*0,c,221,8000,5*0,c,221,8000,5*0,c,221
-,8000,5*0,c,221,8000,5*0,c,221,8000,5*0,c,221,8000,5*0,c,221,8000
-,5*0,c,221,8000,5*0,c,221,8000,5*0,c,221,4000,5*0,c,221,4000</data>
+          <string>ALU</string>
         </entry>
       </elementAttributes>
-      <pos x="780" y="280"/>
+      <pos x="500" y="-40"/>
     </visualElement>
     <visualElement>
-      <elementName>VDD</elementName>
+      <elementName>Driver</elementName>
       <elementAttributes>
         <entry>
-          <string>rotation</string>
-          <rotation rotation="1"/>
+          <string>Bits</string>
+          <int>16</int>
         </entry>
       </elementAttributes>
-      <pos x="760" y="300"/>
+      <pos x="640" y="-40"/>
     </visualElement>
     <visualElement>
-      <elementName>Ground</elementName>
+      <elementName>Register</elementName>
       <elementAttributes>
         <entry>
-          <string>rotation</string>
-          <rotation rotation="1"/>
+          <string>valueIsProbe</string>
+          <boolean>true</boolean>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>FR</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>4</int>
         </entry>
       </elementAttributes>
-      <pos x="760" y="340"/>
+      <pos x="700" y="-20"/>
     </visualElement>
     <visualElement>
-      <elementName>VDD</elementName>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="1"/>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>FR_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="740" y="360"/>
+      <pos x="680" y="40"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -717,63 +619,77 @@
         </entry>
         <entry>
           <string>NetName</string>
-          <string>LI_OE</string>
+          <string>CLK</string>
         </entry>
       </elementAttributes>
-      <pos x="-60" y="-20"/>
+      <pos x="680" y="0"/>
     </visualElement>
     <visualElement>
-      <elementName>atk16_alu.dig</elementName>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
-          <string>shapeType</string>
-          <shapeType>SIMPLE</shapeType>
-        </entry>
-        <entry>
-          <string>Label</string>
-          <string>ALU</string>
+          <string>NetName</string>
+          <string>ALU_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="740" y="-40"/>
+      <pos x="660" y="-80"/>
     </visualElement>
     <visualElement>
-      <elementName>atk16_alu_inputs.dig</elementName>
-      <elementAttributes/>
-      <pos x="580" y="-40"/>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>FR_Q</string>
+        </entry>
+      </elementAttributes>
+      <pos x="780" y="0"/>
     </visualElement>
     <visualElement>
-      <elementName>Driver</elementName>
+      <elementName>Counter</elementName>
       <elementAttributes>
+        <entry>
+          <string>valueIsProbe</string>
+          <boolean>true</boolean>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>Microsequencer</string>
+        </entry>
         <entry>
           <string>Bits</string>
-          <int>16</int>
+          <int>3</int>
         </entry>
       </elementAttributes>
-      <pos x="880" y="-40"/>
+      <pos x="-140" y="180"/>
     </visualElement>
     <visualElement>
-      <elementName>Driver</elementName>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
-          <string>Bits</string>
-          <int>16</int>
+          <string>rotation</string>
+          <rotation rotation="2"/>
         </entry>
         <entry>
-          <string>flipSelPos</string>
-          <boolean>true</boolean>
+          <string>NetName</string>
+          <string>US_RS</string>
         </entry>
       </elementAttributes>
-      <pos x="440" y="-100"/>
+      <pos x="-280" y="220"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>VDD</elementName>
       <elementAttributes>
         <entry>
-          <string>NetName</string>
-          <string>R1_OE</string>
+          <string>rotation</string>
+          <rotation rotation="1"/>
         </entry>
       </elementAttributes>
-      <pos x="460" y="-80"/>
+      <pos x="-160" y="180"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Not</elementName>
+      <elementAttributes/>
+      <pos x="-200" y="200"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -784,15 +700,35 @@
         </entry>
         <entry>
           <string>NetName</string>
-          <string>IM_M</string>
+          <string>CLK</string>
         </entry>
       </elementAttributes>
-      <pos x="540" y="60"/>
+      <pos x="-240" y="200"/>
     </visualElement>
     <visualElement>
-      <elementName>atk16_jump_unit.dig</elementName>
+      <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="-240"/>
+      <pos x="-220" y="220"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Splitter</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Input Splitting</string>
+          <string>3,1,4</string>
+        </entry>
+      </elementAttributes>
+      <pos x="140" y="220"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -803,34 +739,52 @@
         </entry>
         <entry>
           <string>NetName</string>
-          <string>IM_M</string>
+          <string>OPCODE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="140" y="260"/>
+    </visualElement>
+    <visualElement>
+      <elementName>BitSelector</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Selector Bits</string>
+          <int>2</int>
         </entry>
       </elementAttributes>
-      <pos x="-240" y="-200"/>
+      <pos x="0" y="240"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="1"/>
+          <rotation rotation="2"/>
         </entry>
         <entry>
           <string>NetName</string>
-          <string>ALU_OE</string>
+          <string>FLAG_EQ</string>
         </entry>
       </elementAttributes>
-      <pos x="880" y="-60"/>
+      <pos x="0" y="300"/>
     </visualElement>
     <visualElement>
-      <elementName>Probe</elementName>
+      <elementName>Splitter</elementName>
       <elementAttributes>
         <entry>
-          <string>Label</string>
-          <string>PC</string>
+          <string>rotation</string>
+          <rotation rotation="1"/>
+        </entry>
+        <entry>
+          <string>Input Splitting</string>
+          <string>3</string>
+        </entry>
+        <entry>
+          <string>Output Splitting</string>
+          <string>2,</string>
         </entry>
       </elementAttributes>
-      <pos x="240" y="-380"/>
+      <pos x="20" y="300"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -841,312 +795,365 @@
         </entry>
         <entry>
           <string>NetName</string>
-          <string>OPCODE</string>
+          <string>FR_Q</string>
         </entry>
       </elementAttributes>
-      <pos x="240" y="-440"/>
+      <pos x="-20" y="240"/>
     </visualElement>
     <visualElement>
-      <elementName>Probe</elementName>
+      <elementName>EEPROM</elementName>
       <elementAttributes>
+        <entry>
+          <string>AddrBits</string>
+          <int>8</int>
+        </entry>
         <entry>
           <string>Label</string>
-          <string>OPCODE</string>
+          <string>UCODE</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>16</int>
+        </entry>
+        <entry>
+          <string>Data</string>
+          <data>c,221,3040,8000,4*0,c,221,3040,8000,4*0,c,221,3440,8000,4*0,c
+,221,3440,8000,4*0,c,221,88,60,8000,0,0,0,c,221,88,60,8000,0,0,0
+,c,221,88,110,8000,0,0,0,c,221,88,110,8000,0,0,0,c,221,840,8000
+,4*0,c,221,840,8000,4*0,c,221,82,8000,4*0,c,221,82,8000,4*0,c
+,221,c02,8000,4*0,c,221,c02,8000,4*0,c,221,8000,5*0,c,221,82,8000
+,4*0,c,221,8000,5*0,c,221,c02,8000,4*0,c,221,44,8000,4*0,c,221
+,44,8000,4*0,c,221,8000,5*0,c,221,8000,5*0,c,221,8000,5*0,c,221
+,8000,5*0,c,221,8000,5*0,c,221,8000,5*0,c,221,8000,5*0,c,221,8000
+,5*0,c,221,8000,5*0,c,221,8000,5*0,c,221,4000,5*0,c,221,4000</data>
         </entry>
       </elementAttributes>
-      <pos x="240" y="-440"/>
+      <pos x="220" y="220"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>VDD</elementName>
       <elementAttributes>
         <entry>
-          <string>NetName</string>
-          <string>IM_M</string>
+          <string>rotation</string>
+          <rotation rotation="1"/>
         </entry>
       </elementAttributes>
-      <pos x="920" y="120"/>
+      <pos x="200" y="240"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>Ground</elementName>
       <elementAttributes>
         <entry>
-          <string>NetName</string>
-          <string>R2_OE</string>
+          <string>rotation</string>
+          <rotation rotation="1"/>
         </entry>
       </elementAttributes>
-      <pos x="920" y="160"/>
+      <pos x="200" y="280"/>
     </visualElement>
     <visualElement>
-      <elementName>Driver</elementName>
+      <elementName>VDD</elementName>
       <elementAttributes>
         <entry>
-          <string>Bits</string>
-          <int>16</int>
+          <string>rotation</string>
+          <rotation rotation="1"/>
         </entry>
+      </elementAttributes>
+      <pos x="180" y="300"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Splitter</elementName>
+      <elementAttributes>
         <entry>
-          <string>flipSelPos</string>
+          <string>mirror</string>
           <boolean>true</boolean>
         </entry>
+        <entry>
+          <string>Input Splitting</string>
+          <string>16</string>
+        </entry>
+        <entry>
+          <string>Output Splitting</string>
+          <string>1*16</string>
+        </entry>
       </elementAttributes>
-      <pos x="560" y="-100"/>
+      <pos x="360" y="420"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>NetName</string>
-          <string>R2_OE</string>
+          <string>PC_CO</string>
         </entry>
       </elementAttributes>
-      <pos x="580" y="-80"/>
+      <pos x="400" y="420"/>
     </visualElement>
     <visualElement>
-      <elementName>Testcase</elementName>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
-          <string>Label</string>
-          <string>Sum program TODO</string>
+          <string>NetName</string>
+          <string>PC_IE</string>
         </entry>
+      </elementAttributes>
+      <pos x="400" y="400"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
         <entry>
-          <string>Testdata</string>
-          <testData>
-            <dataString>IN OUT
-
-program(0x4051, 0x40a2, 0x029b)
-
-0 x</dataString>
-          </testData>
+          <string>NetName</string>
+          <string>PC_OE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="400" y="380"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>MAR_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="900" y="760"/>
+      <pos x="400" y="360"/>
     </visualElement>
     <visualElement>
-      <elementName>Out</elementName>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
-          <string>Description</string>
-          <string>Dummy output</string>
-        </entry>
-        <entry>
-          <string>Label</string>
-          <string>OUT</string>
+          <string>NetName</string>
+          <string>MEM_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="720" y="800"/>
+      <pos x="400" y="340"/>
     </visualElement>
     <visualElement>
-      <elementName>Ground</elementName>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
-          <string>rotation</string>
-          <rotation rotation="1"/>
+          <string>NetName</string>
+          <string>MEM_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="700" y="800"/>
+      <pos x="400" y="320"/>
     </visualElement>
     <visualElement>
-      <elementName>In</elementName>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
-          <string>Label</string>
-          <string>IN</string>
+          <string>NetName</string>
+          <string>R1_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="720" y="740"/>
+      <pos x="400" y="280"/>
     </visualElement>
     <visualElement>
-      <elementName>Ground</elementName>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
-          <string>rotation</string>
-          <rotation reference="../../../../visualElement[74]/elementAttributes/entry/rotation"/>
+          <string>NetName</string>
+          <string>IR_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="740" y="740"/>
+      <pos x="400" y="240"/>
     </visualElement>
     <visualElement>
-      <elementName>Clock</elementName>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
-          <string>small</string>
-          <boolean>true</boolean>
-        </entry>
-        <entry>
-          <string>runRealTime</string>
-          <boolean>true</boolean>
+          <string>NetName</string>
+          <string>ALU_OE</string>
         </entry>
+      </elementAttributes>
+      <pos x="400" y="180"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
         <entry>
-          <string>Frequency</string>
-          <int>50</int>
+          <string>NetName</string>
+          <string>US_RS</string>
         </entry>
       </elementAttributes>
-      <pos x="660" y="-340"/>
+      <pos x="400" y="120"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>NetName</string>
-          <string>CLK</string>
+          <string>FR_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="680" y="-340"/>
+      <pos x="400" y="160"/>
     </visualElement>
     <visualElement>
-      <elementName>Break</elementName>
-      <elementAttributes/>
-      <pos x="680" y="-380"/>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>RW_IE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="400" y="300"/>
     </visualElement>
     <visualElement>
-      <elementName>atk16_irc.dig</elementName>
+      <elementName>Stop</elementName>
       <elementAttributes/>
-      <pos x="160" y="-280"/>
+      <pos x="480" y="140"/>
     </visualElement>
     <visualElement>
-      <elementName>Probe</elementName>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
-          <string>Label</string>
-          <string>Bus</string>
+          <string>NetName</string>
+          <string>LI_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="320" y="-320"/>
+      <pos x="400" y="200"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
+          <string>NetName</string>
+          <string>IM_M</string>
         </entry>
+      </elementAttributes>
+      <pos x="400" y="220"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
         <entry>
           <string>NetName</string>
-          <string>PC_OE</string>
+          <string>R2_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="160" y="-200"/>
+      <pos x="400" y="260"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>Driver</elementName>
       <elementAttributes>
         <entry>
-          <string>rotation</string>
-          <rotation reference="../../../../visualElement[4]/elementAttributes/entry/rotation"/>
+          <string>Bits</string>
+          <int>16</int>
         </entry>
         <entry>
-          <string>NetName</string>
-          <string>MAR_IE</string>
+          <string>flipSelPos</string>
+          <boolean>true</boolean>
         </entry>
       </elementAttributes>
-      <pos x="160" y="-220"/>
+      <pos x="140" y="-240"/>
     </visualElement>
     <visualElement>
-      <elementName>DipSwitch</elementName>
+      <elementName>Probe</elementName>
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>IRQ0</string>
+          <string>Bus</string>
         </entry>
       </elementAttributes>
-      <pos x="-160" y="-480"/>
+      <pos x="240" y="-320"/>
     </visualElement>
     <visualElement>
-      <elementName>Ground</elementName>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="1"/>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>MAR_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="-180" y="-460"/>
+      <pos x="380" y="-200"/>
     </visualElement>
     <visualElement>
-      <elementName>Ground</elementName>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation reference="../../../../visualElement[85]/elementAttributes/entry/rotation"/>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>PC_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="-180" y="-440"/>
+      <pos x="140" y="-200"/>
     </visualElement>
     <visualElement>
-      <elementName>Ground</elementName>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
-          <string>rotation</string>
-          <rotation reference="../../../../visualElement[85]/elementAttributes/entry/rotation"/>
+          <string>NetName</string>
+          <string>CLK</string>
         </entry>
       </elementAttributes>
-      <pos x="-180" y="-420"/>
+      <pos x="700" y="-340"/>
     </visualElement>
     <visualElement>
-      <elementName>Splitter</elementName>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
-          <string>Input Splitting</string>
-          <string>1*4</string>
+          <string>rotation</string>
+          <rotation rotation="2"/>
         </entry>
         <entry>
-          <string>Output Splitting</string>
-          <string>4</string>
+          <string>NetName</string>
+          <string>IM_M</string>
         </entry>
       </elementAttributes>
-      <pos x="-140" y="-480"/>
+      <pos x="-220" y="-200"/>
     </visualElement>
   </visualElements>
   <wires>
     <wire>
-      <p1 x="280" y="320"/>
-      <p2 x="300" y="320"/>
-    </wire>
-    <wire>
-      <p1 x="-60" y="320"/>
-      <p2 x="-20" y="320"/>
+      <p1 x="-160" y="0"/>
+      <p2 x="20" y="0"/>
     </wire>
     <wire>
-      <p1 x="900" y="320"/>
-      <p2 x="920" y="320"/>
+      <p1 x="180" y="0"/>
+      <p2 x="360" y="0"/>
     </wire>
     <wire>
-      <p1 x="840" y="320"/>
-      <p2 x="880" y="320"/>
+      <p1 x="480" y="0"/>
+      <p2 x="500" y="0"/>
     </wire>
     <wire>
-      <p1 x="60" y="0"/>
-      <p2 x="160" y="0"/>
+      <p1 x="680" y="0"/>
+      <p2 x="700" y="0"/>
     </wire>
     <wire>
-      <p1 x="180" y="0"/>
-      <p2 x="280" y="0"/>
+      <p1 x="760" y="0"/>
+      <p2 x="780" y="0"/>
     </wire>
     <wire>
-      <p1 x="720" y="0"/>
-      <p2 x="740" y="0"/>
+      <p1 x="20" y="0"/>
+      <p2 x="60" y="0"/>
     </wire>
     <wire>
-      <p1 x="540" y="0"/>
-      <p2 x="580" y="0"/>
+      <p1 x="380" y="320"/>
+      <p2 x="400" y="320"/>
     </wire>
     <wire>
       <p1 x="0" y="-260"/>
       <p2 x="20" y="-260"/>
     </wire>
     <wire>
-      <p1 x="100" y="-260"/>
-      <p2 x="160" y="-260"/>
-    </wire>
-    <wire>
-      <p1 x="40" y="260"/>
-      <p2 x="60" y="260"/>
+      <p1 x="-260" y="260"/>
+      <p2 x="-220" y="260"/>
     </wire>
     <wire>
-      <p1 x="-40" y="260"/>
-      <p2 x="0" y="260"/>
+      <p1 x="380" y="260"/>
+      <p2 x="400" y="260"/>
     </wire>
     <wire>
-      <p1 x="900" y="260"/>
-      <p2 x="920" y="260"/>
+      <p1 x="280" y="260"/>
+      <p2 x="300" y="260"/>
     </wire>
     <wire>
       <p1 x="380" y="-200"/>
@@ -1161,104 +1168,100 @@ program(0x4051, 0x40a2, 0x029b)
       <p2 x="580" y="-200"/>
     </wire>
     <wire>
-      <p1 x="-240" y="-200"/>
-      <p2 x="-220" y="-200"/>
+      <p1 x="-160" y="200"/>
+      <p2 x="-140" y="200"/>
     </wire>
     <wire>
-      <p1 x="900" y="200"/>
-      <p2 x="920" y="200"/>
+      <p1 x="-240" y="200"/>
+      <p2 x="-200" y="200"/>
     </wire>
     <wire>
-      <p1 x="280" y="200"/>
-      <p2 x="860" y="200"/>
+      <p1 x="380" y="200"/>
+      <p2 x="400" y="200"/>
     </wire>
     <wire>
       <p1 x="-280" y="-140"/>
-      <p2 x="-60" y="-140"/>
-    </wire>
-    <wire>
-      <p1 x="200" y="-140"/>
-      <p2 x="300" y="-140"/>
+      <p2 x="20" y="-140"/>
     </wire>
     <wire>
       <p1 x="300" y="-140"/>
-      <p2 x="480" y="-140"/>
+      <p2 x="400" y="-140"/>
     </wire>
     <wire>
-      <p1 x="-60" y="-140"/>
-      <p2 x="200" y="-140"/>
+      <p1 x="280" y="-140"/>
+      <p2 x="300" y="-140"/>
     </wire>
     <wire>
-      <p1 x="-180" y="-460"/>
-      <p2 x="-140" y="-460"/>
+      <p1 x="20" y="-140"/>
+      <p2 x="280" y="-140"/>
     </wire>
     <wire>
-      <p1 x="900" y="140"/>
-      <p2 x="920" y="140"/>
+      <p1 x="400" y="-140"/>
+      <p2 x="480" y="-140"/>
     </wire>
     <wire>
-      <p1 x="200" y="-80"/>
-      <p2 x="280" y="-80"/>
+      <p1 x="-180" y="-460"/>
+      <p2 x="-140" y="-460"/>
     </wire>
     <wire>
-      <p1 x="-60" y="-80"/>
-      <p2 x="-40" y="-80"/>
+      <p1 x="380" y="140"/>
+      <p2 x="480" y="140"/>
     </wire>
     <wire>
-      <p1 x="60" y="-80"/>
-      <p2 x="100" y="-80"/>
+      <p1 x="-280" y="-80"/>
+      <p2 x="-260" y="-80"/>
     </wire>
     <wire>
-      <p1 x="380" y="-80"/>
-      <p2 x="400" y="-80"/>
+      <p1 x="-160" y="-80"/>
+      <p2 x="-120" y="-80"/>
     </wire>
     <wire>
-      <p1 x="440" y="-80"/>
-      <p2 x="460" y="-80"/>
+      <p1 x="160" y="-80"/>
+      <p2 x="180" y="-80"/>
     </wire>
     <wire>
-      <p1 x="560" y="-80"/>
-      <p2 x="580" y="-80"/>
+      <p1 x="360" y="-80"/>
+      <p2 x="380" y="-80"/>
     </wire>
     <wire>
-      <p1 x="400" y="-80"/>
-      <p2 x="420" y="-80"/>
+      <p1 x="240" y="-80"/>
+      <p2 x="260" y="-80"/>
     </wire>
     <wire>
-      <p1 x="900" y="80"/>
-      <p2 x="920" y="80"/>
+      <p1 x="640" y="-80"/>
+      <p2 x="660" y="-80"/>
     </wire>
     <wire>
-      <p1 x="200" y="80"/>
-      <p2 x="720" y="80"/>
+      <p1 x="-140" y="80"/>
+      <p2 x="480" y="80"/>
     </wire>
     <wire>
-      <p1 x="260" y="-20"/>
-      <p2 x="280" y="-20"/>
+      <p1 x="380" y="400"/>
+      <p2 x="400" y="400"/>
     </wire>
     <wire>
-      <p1 x="60" y="-20"/>
-      <p2 x="180" y="-20"/>
+      <p1 x="-280" y="-20"/>
+      <p2 x="-260" y="-20"/>
     </wire>
     <wire>
-      <p1 x="-60" y="-20"/>
-      <p2 x="-40" y="-20"/>
+      <p1 x="-160" y="-20"/>
+      <p2 x="60" y="-20"/>
     </wire>
     <wire>
-      <p1 x="680" y="-20"/>
-      <p2 x="740" y="-20"/>
+      <p1 x="180" y="-20"/>
+      <p2 x="320" y="-20"/>
     </wire>
     <wire>
-      <p1 x="840" y="-20"/>
-      <p2 x="860" y="-20"/>
+      <p1 x="460" y="-20"/>
+      <p2 x="500" y="-20"/>
     </wire>
     <wire>
-      <p1 x="400" y="-20"/>
-      <p2 x="520" y="-20"/>
+      <p1 x="600" y="-20"/>
+      <p2 x="700" y="-20"/>
     </wire>
     <wire>
-      <p1 x="520" y="-20"/>
-      <p2 x="580" y="-20"/>
+      <p1 x="320" y="-20"/>
+      <p2 x="360" y="-20"/>
     </wire>
     <wire>
       <p1 x="-240" y="-340"/>
@@ -1269,28 +1272,16 @@ program(0x4051, 0x40a2, 0x029b)
       <p2 x="680" y="-340"/>
     </wire>
     <wire>
-      <p1 x="160" y="20"/>
-      <p2 x="220" y="20"/>
-    </wire>
-    <wire>
-      <p1 x="900" y="20"/>
-      <p2 x="920" y="20"/>
-    </wire>
-    <wire>
-      <p1 x="560" y="20"/>
-      <p2 x="580" y="20"/>
-    </wire>
-    <wire>
-      <p1 x="440" y="20"/>
-      <p2 x="540" y="20"/>
+      <p1 x="680" y="-340"/>
+      <p2 x="700" y="-340"/>
     </wire>
     <wire>
-      <p1 x="220" y="20"/>
-      <p2 x="280" y="20"/>
+      <p1 x="680" y="20"/>
+      <p2 x="700" y="20"/>
     </wire>
     <wire>
-      <p1 x="760" y="340"/>
-      <p2 x="780" y="340"/>
+      <p1 x="380" y="340"/>
+      <p2 x="400" y="340"/>
     </wire>
     <wire>
       <p1 x="80" y="-280"/>
@@ -1301,32 +1292,12 @@ program(0x4051, 0x40a2, 0x029b)
       <p2 x="20" y="-280"/>
     </wire>
     <wire>
-      <p1 x="120" y="-280"/>
-      <p2 x="160" y="-280"/>
-    </wire>
-    <wire>
-      <p1 x="40" y="280"/>
-      <p2 x="60" y="280"/>
-    </wire>
-    <wire>
-      <p1 x="-80" y="280"/>
-      <p2 x="-20" y="280"/>
-    </wire>
-    <wire>
-      <p1 x="500" y="280"/>
-      <p2 x="540" y="280"/>
-    </wire>
-    <wire>
-      <p1 x="280" y="280"/>
-      <p2 x="300" y="280"/>
-    </wire>
-    <wire>
-      <p1 x="900" y="280"/>
-      <p2 x="920" y="280"/>
+      <p1 x="200" y="280"/>
+      <p2 x="220" y="280"/>
     </wire>
     <wire>
-      <p1 x="560" y="280"/>
-      <p2 x="780" y="280"/>
+      <p1 x="380" y="280"/>
+      <p2 x="400" y="280"/>
     </wire>
     <wire>
       <p1 x="460" y="-220"/>
@@ -1341,112 +1312,124 @@ program(0x4051, 0x40a2, 0x029b)
       <p2 x="20" y="-220"/>
     </wire>
     <wire>
-      <p1 x="900" y="220"/>
-      <p2 x="920" y="220"/>
+      <p1 x="-160" y="220"/>
+      <p2 x="-140" y="220"/>
     </wire>
     <wire>
-      <p1 x="-160" y="-480"/>
-      <p2 x="-140" y="-480"/>
+      <p1 x="-280" y="220"/>
+      <p2 x="-220" y="220"/>
+    </wire>
+    <wire>
+      <p1 x="100" y="220"/>
+      <p2 x="140" y="220"/>
+    </wire>
+    <wire>
+      <p1 x="160" y="220"/>
+      <p2 x="220" y="220"/>
     </wire>
     <wire>
-      <p1 x="-120" y="-480"/>
-      <p2 x="120" y="-480"/>
+      <p1 x="380" y="220"/>
+      <p2 x="400" y="220"/>
     </wire>
     <wire>
-      <p1 x="900" y="160"/>
-      <p2 x="920" y="160"/>
+      <p1 x="-160" y="-480"/>
+      <p2 x="-140" y="-480"/>
     </wire>
     <wire>
       <p1 x="700" y="800"/>
       <p2 x="720" y="800"/>
     </wire>
     <wire>
-      <p1 x="80" y="-100"/>
-      <p2 x="100" y="-100"/>
+      <p1 x="380" y="160"/>
+      <p2 x="400" y="160"/>
     </wire>
     <wire>
-      <p1 x="460" y="-100"/>
-      <p2 x="500" y="-100"/>
+      <p1 x="-140" y="-100"/>
+      <p2 x="-120" y="-100"/>
     </wire>
     <wire>
-      <p1 x="400" y="-100"/>
-      <p2 x="420" y="-100"/>
+      <p1 x="20" y="-100"/>
+      <p2 x="60" y="-100"/>
     </wire>
     <wire>
-      <p1 x="580" y="-100"/>
-      <p2 x="620" y="-100"/>
+      <p1 x="320" y="-100"/>
+      <p2 x="340" y="-100"/>
     </wire>
     <wire>
-      <p1 x="520" y="-100"/>
-      <p2 x="540" y="-100"/>
+      <p1 x="260" y="-100"/>
+      <p2 x="280" y="-100"/>
     </wire>
     <wire>
-      <p1 x="-180" y="-420"/>
-      <p2 x="-140" y="-420"/>
+      <p1 x="160" y="-100"/>
+      <p2 x="200" y="-100"/>
     </wire>
     <wire>
-      <p1 x="900" y="100"/>
-      <p2 x="920" y="100"/>
+      <p1 x="380" y="-100"/>
+      <p2 x="400" y="-100"/>
     </wire>
     <wire>
-      <p1 x="720" y="740"/>
-      <p2 x="740" y="740"/>
+      <p1 x="480" y="-100"/>
+      <p2 x="680" y="-100"/>
     </wire>
     <wire>
-      <p1 x="60" y="-40"/>
-      <p2 x="200" y="-40"/>
+      <p1 x="200" y="-100"/>
+      <p2 x="220" y="-100"/>
+    </wire>
+    <wire>
+      <p1 x="-180" y="-420"/>
+      <p2 x="-140" y="-420"/>
     </wire>
     <wire>
-      <p1 x="220" y="-40"/>
-      <p2 x="280" y="-40"/>
+      <p1 x="720" y="740"/>
+      <p2 x="740" y="740"/>
     </wire>
     <wire>
-      <p1 x="680" y="-40"/>
-      <p2 x="740" y="-40"/>
+      <p1 x="380" y="420"/>
+      <p2 x="400" y="420"/>
     </wire>
     <wire>
-      <p1 x="840" y="-40"/>
-      <p2 x="860" y="-40"/>
+      <p1 x="300" y="420"/>
+      <p2 x="360" y="420"/>
     </wire>
     <wire>
-      <p1 x="900" y="-40"/>
-      <p2 x="920" y="-40"/>
+      <p1 x="40" y="-40"/>
+      <p2 x="60" y="-40"/>
     </wire>
     <wire>
-      <p1 x="420" y="-40"/>
-      <p2 x="580" y="-40"/>
+      <p1 x="-160" y="-40"/>
+      <p2 x="-140" y="-40"/>
     </wire>
     <wire>
-      <p1 x="400" y="360"/>
-      <p2 x="420" y="360"/>
+      <p1 x="200" y="-40"/>
+      <p2 x="360" y="-40"/>
     </wire>
     <wire>
-      <p1 x="740" y="360"/>
-      <p2 x="780" y="360"/>
+      <p1 x="600" y="-40"/>
+      <p2 x="620" y="-40"/>
     </wire>
     <wire>
-      <p1 x="900" y="40"/>
-      <p2 x="1000" y="40"/>
+      <p1 x="460" y="-40"/>
+      <p2 x="500" y="-40"/>
     </wire>
     <wire>
-      <p1 x="280" y="300"/>
-      <p2 x="300" y="300"/>
+      <p1 x="660" y="-40"/>
+      <p2 x="680" y="-40"/>
     </wire>
     <wire>
-      <p1 x="360" y="300"/>
-      <p2 x="400" y="300"/>
+      <p1 x="380" y="360"/>
+      <p2 x="400" y="360"/>
     </wire>
     <wire>
-      <p1 x="440" y="300"/>
-      <p2 x="540" y="300"/>
+      <p1 x="0" y="300"/>
+      <p2 x="20" y="300"/>
     </wire>
     <wire>
-      <p1 x="900" y="300"/>
-      <p2 x="920" y="300"/>
+      <p1 x="180" y="300"/>
+      <p2 x="220" y="300"/>
     </wire>
     <wire>
-      <p1 x="760" y="300"/>
-      <p2 x="780" y="300"/>
+      <p1 x="380" y="300"/>
+      <p2 x="400" y="300"/>
     </wire>
     <wire>
       <p1 x="-40" y="-240"/>
@@ -1457,7 +1440,15 @@ program(0x4051, 0x40a2, 0x029b)
       <p2 x="-220" y="-240"/>
     </wire>
     <wire>
-      <p1 x="260" y="-240"/>
+      <p1 x="160" y="-240"/>
+      <p2 x="180" y="-240"/>
+    </wire>
+    <wire>
+      <p1 x="100" y="-240"/>
+      <p2 x="120" y="-240"/>
+    </wire>
+    <wire>
+      <p1 x="180" y="-240"/>
       <p2 x="300" y="-240"/>
     </wire>
     <wire>
@@ -1466,227 +1457,195 @@ program(0x4051, 0x40a2, 0x029b)
     </wire>
     <wire>
       <p1 x="40" y="240"/>
-      <p2 x="60" y="240"/>
+      <p2 x="140" y="240"/>
     </wire>
     <wire>
-      <p1 x="120" y="240"/>
-      <p2 x="500" y="240"/>
+      <p1 x="-20" y="240"/>
+      <p2 x="0" y="240"/>
     </wire>
     <wire>
-      <p1 x="900" y="240"/>
-      <p2 x="920" y="240"/>
+      <p1 x="200" y="240"/>
+      <p2 x="220" y="240"/>
     </wire>
     <wire>
-      <p1 x="0" y="-180"/>
-      <p2 x="20" y="-180"/>
+      <p1 x="380" y="240"/>
+      <p2 x="400" y="240"/>
     </wire>
     <wire>
-      <p1 x="900" y="180"/>
-      <p2 x="920" y="180"/>
+      <p1 x="0" y="-180"/>
+      <p2 x="20" y="-180"/>
     </wire>
     <wire>
-      <p1 x="480" y="-120"/>
-      <p2 x="500" y="-120"/>
+      <p1 x="-160" y="180"/>
+      <p2 x="-140" y="180"/>
     </wire>
     <wire>
-      <p1 x="500" y="-120"/>
-      <p2 x="620" y="-120"/>
+      <p1 x="-80" y="180"/>
+      <p2 x="100" y="180"/>
     </wire>
     <wire>
-      <p1 x="620" y="-120"/>
-      <p2 x="920" y="-120"/>
+      <p1 x="380" y="180"/>
+      <p2 x="400" y="180"/>
     </wire>
     <wire>
       <p1 x="-180" y="-440"/>
       <p2 x="-140" y="-440"/>
     </wire>
     <wire>
-      <p1 x="900" y="120"/>
-      <p2 x="920" y="120"/>
-    </wire>
-    <wire>
-      <p1 x="60" y="-60"/>
-      <p2 x="80" y="-60"/>
+      <p1 x="380" y="120"/>
+      <p2 x="400" y="120"/>
     </wire>
     <wire>
-      <p1 x="-60" y="-60"/>
-      <p2 x="-40" y="-60"/>
+      <p1 x="-280" y="-60"/>
+      <p2 x="-260" y="-60"/>
     </wire>
     <wire>
-      <p1 x="380" y="-60"/>
-      <p2 x="400" y="-60"/>
+      <p1 x="-160" y="-60"/>
+      <p2 x="-140" y="-60"/>
     </wire>
     <wire>
-      <p1 x="80" y="-60"/>
-      <p2 x="220" y="-60"/>
+      <p1 x="-140" y="-60"/>
+      <p2 x="60" y="-60"/>
     </wire>
     <wire>
       <p1 x="100" y="-380"/>
       <p2 x="240" y="-380"/>
     </wire>
     <wire>
-      <p1 x="900" y="60"/>
-      <p2 x="920" y="60"/>
-    </wire>
-    <wire>
-      <p1 x="540" y="60"/>
-      <p2 x="560" y="60"/>
-    </wire>
-    <wire>
-      <p1 x="220" y="60"/>
-      <p2 x="440" y="60"/>
-    </wire>
-    <wire>
-      <p1 x="300" y="-320"/>
-      <p2 x="320" y="-320"/>
-    </wire>
-    <wire>
-      <p1 x="200" y="-40"/>
-      <p2 x="200" y="80"/>
-    </wire>
-    <wire>
-      <p1 x="200" y="-140"/>
-      <p2 x="200" y="-80"/>
-    </wire>
-    <wire>
-      <p1 x="520" y="-100"/>
-      <p2 x="520" y="-20"/>
-    </wire>
-    <wire>
-      <p1 x="80" y="-100"/>
-      <p2 x="80" y="-60"/>
+      <p1 x="680" y="-380"/>
+      <p2 x="700" y="-380"/>
     </wire>
     <wire>
-      <p1 x="720" y="0"/>
-      <p2 x="720" y="80"/>
+      <p1 x="20" y="60"/>
+      <p2 x="180" y="60"/>
     </wire>
     <wire>
-      <p1 x="400" y="-100"/>
-      <p2 x="400" y="-80"/>
+      <p1 x="380" y="380"/>
+      <p2 x="400" y="380"/>
     </wire>
     <wire>
-      <p1 x="400" y="-60"/>
-      <p2 x="400" y="-20"/>
+      <p1 x="180" y="-320"/>
+      <p2 x="240" y="-320"/>
     </wire>
     <wire>
-      <p1 x="-280" y="-240"/>
-      <p2 x="-280" y="-140"/>
+      <p1 x="480" y="-200"/>
+      <p2 x="480" y="-140"/>
     </wire>
     <wire>
-      <p1 x="280" y="320"/>
-      <p2 x="280" y="340"/>
+      <p1 x="480" y="0"/>
+      <p2 x="480" y="80"/>
     </wire>
     <wire>
-      <p1 x="280" y="200"/>
-      <p2 x="280" y="280"/>
+      <p1 x="480" y="-140"/>
+      <p2 x="480" y="-100"/>
     </wire>
     <wire>
-      <p1 x="920" y="-120"/>
-      <p2 x="920" y="-40"/>
+      <p1 x="320" y="-100"/>
+      <p2 x="320" y="-20"/>
     </wire>
     <wire>
-      <p1 x="220" y="-60"/>
-      <p2 x="220" y="-40"/>
+      <p1 x="640" y="-80"/>
+      <p2 x="640" y="-60"/>
     </wire>
     <wire>
-      <p1 x="220" y="20"/>
-      <p2 x="220" y="60"/>
+      <p1 x="100" y="180"/>
+      <p2 x="100" y="220"/>
     </wire>
     <wire>
-      <p1 x="860" y="-20"/>
-      <p2 x="860" y="200"/>
+      <p1 x="100" y="-380"/>
+      <p2 x="100" y="-340"/>
     </wire>
     <wire>
-      <p1 x="540" y="0"/>
-      <p2 x="540" y="20"/>
+      <p1 x="100" y="-340"/>
+      <p2 x="100" y="-280"/>
     </wire>
     <wire>
-      <p1 x="480" y="-200"/>
-      <p2 x="480" y="-140"/>
+      <p1 x="100" y="-280"/>
+      <p2 x="100" y="-240"/>
     </wire>
     <wire>
-      <p1 x="480" y="-140"/>
-      <p2 x="480" y="-120"/>
+      <p1 x="200" y="-100"/>
+      <p2 x="200" y="-40"/>
     </wire>
     <wire>
-      <p1 x="160" y="0"/>
-      <p2 x="160" y="20"/>
+      <p1 x="680" y="20"/>
+      <p2 x="680" y="40"/>
     </wire>
     <wire>
-      <p1 x="420" y="320"/>
-      <p2 x="420" y="340"/>
+      <p1 x="680" y="-100"/>
+      <p2 x="680" y="-40"/>
     </wire>
     <wire>
-      <p1 x="420" y="-80"/>
-      <p2 x="420" y="-40"/>
+      <p1 x="680" y="-380"/>
+      <p2 x="680" y="-340"/>
     </wire>
     <wire>
-      <p1 x="100" y="-380"/>
-      <p2 x="100" y="-340"/>
+      <p1 x="-140" y="-100"/>
+      <p2 x="-140" y="-60"/>
     </wire>
     <wire>
-      <p1 x="100" y="-340"/>
-      <p2 x="100" y="-280"/>
+      <p1 x="-140" y="-40"/>
+      <p2 x="-140" y="80"/>
     </wire>
     <wire>
-      <p1 x="100" y="-280"/>
-      <p2 x="100" y="-260"/>
+      <p1 x="300" y="260"/>
+      <p2 x="300" y="420"/>
     </wire>
     <wire>
-      <p1 x="40" y="280"/>
-      <p2 x="40" y="300"/>
+      <p1 x="300" y="-240"/>
+      <p2 x="300" y="-140"/>
     </wire>
     <wire>
-      <p1 x="680" y="-380"/>
-      <p2 x="680" y="-340"/>
+      <p1 x="140" y="-220"/>
+      <p2 x="140" y="-200"/>
     </wire>
     <wire>
-      <p1 x="620" y="-120"/>
-      <p2 x="620" y="-100"/>
+      <p1 x="-240" y="-340"/>
+      <p2 x="-240" y="-220"/>
     </wire>
     <wire>
-      <p1 x="300" y="-320"/>
-      <p2 x="300" y="-240"/>
+      <p1 x="400" y="-140"/>
+      <p2 x="400" y="-100"/>
     </wire>
     <wire>
-      <p1 x="300" y="-240"/>
-      <p2 x="300" y="-140"/>
+      <p1 x="20" y="-140"/>
+      <p2 x="20" y="-100"/>
     </wire>
     <wire>
-      <p1 x="-240" y="-340"/>
-      <p2 x="-240" y="-220"/>
+      <p1 x="20" y="0"/>
+      <p2 x="20" y="60"/>
     </wire>
     <wire>
-      <p1 x="560" y="20"/>
-      <p2 x="560" y="60"/>
+      <p1 x="20" y="260"/>
+      <p2 x="20" y="280"/>
     </wire>
     <wire>
-      <p1 x="500" y="240"/>
-      <p2 x="500" y="280"/>
+      <p1 x="180" y="-80"/>
+      <p2 x="180" y="-20"/>
     </wire>
     <wire>
-      <p1 x="500" y="-120"/>
-      <p2 x="500" y="-100"/>
+      <p1 x="180" y="0"/>
+      <p2 x="180" y="60"/>
     </wire>
     <wire>
-      <p1 x="180" y="-20"/>
-      <p2 x="180" y="0"/>
+      <p1 x="180" y="-320"/>
+      <p2 x="180" y="-240"/>
     </wire>
     <wire>
-      <p1 x="440" y="20"/>
-      <p2 x="440" y="60"/>
+      <p1 x="-280" y="-240"/>
+      <p2 x="-280" y="-140"/>
     </wire>
     <wire>
-      <p1 x="120" y="-480"/>
-      <p2 x="120" y="-280"/>
+      <p1 x="-280" y="-140"/>
+      <p2 x="-280" y="-80"/>
     </wire>
     <wire>
-      <p1 x="-60" y="-140"/>
-      <p2 x="-60" y="-80"/>
+      <p1 x="280" y="-140"/>
+      <p2 x="280" y="-100"/>
     </wire>
     <wire>
-      <p1 x="380" y="-200"/>
-      <p2 x="380" y="-180"/>
+      <p1 x="-160" y="220"/>
+      <p2 x="-160" y="240"/>
     </wire>
   </wires>
   <measurementOrdering/>
-- 
cgit v1.3