Add function defs & calls

1 files changed, 202 insertions, 219 deletions

diff --git a/digital/atk16_mem.dig b/digital/atk16_mem.dig
index 356500f..d09244e 100644
--- a/digital/atk16_mem.dig
+++ b/digital/atk16_mem.dig
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
 <circuit>
   <version>2</version>
   <attributes>
     <entry>
       <string>romContent</string>
       <romList>
-        <roms/>
+        <roms />
       </romList>
     </entry>
     <entry>
@@ -35,56 +34,40 @@
         </entry>
         <entry>
           <string>Data</string>
-          <data>4014,2c00,6029,13*8000,1c,1a,1a,1a,8000,e000,e001,e002,e800,f800
-,4855,f000,3180,1d88,3188,1d88,4016,2000,2000,4215,2240,3040,1800
-,3188,1d88,3180,1d88,e000,4017,2000,4200,3008,6017,0,0,f800,48
-,f801,45,f802,4c,f803,f804,4f,0,3008,1d89,2f80,51c0,4017,2000
-,4201,3008,1d89,2f80,51c0,4000,3180,1d88,4041,3180,1d88,1d89,2180
-,9e00,1fe0,31b8,1d88,5000,1d89,2180,4000,3180,1d88,403d,3180,1d88
-,4033,2000,3180,1d88,4034,2000,3180,1d88,1d89,2380,1d89,2180,1d89
-,2580,9e00,1fe0,31b8,1d88,5080,1d89,2180,4000,3180,1d88,403d,3180
-,1d88,4035,2000,3180,1d88,4036,2000,3180,1d88,1d89,2380,1d89,2180
-,1d89,2580,9e00,1fe0,31b8,1d88,5080,1d89,2180,4000,3180,1d88,403d
-,3180,1d88,4037,2000,3180,1d88,4038,2000,3180,1d88,1d89,2380,1d89
-,2180,1d89,2580,9e00,1fe0,31b8,1d88,5080,1d89,2180,4000,3180,1d88
-,403d,3180,1d88,4039,2000,3180,1d88,4038,2000,3180,1d88,1d89,2380
-,1d89,2180,1d89,2580,9e00,1fe0,31b8,1d88,5080,1d89,2180,4000,3180
-,1d88,403d,3180,1d88,403a,2000,3180,1d88,403b,2000,3180,1d88,1d89
-,2380,1d89,2180,1d89,2580,9e00,1fe0,31b8,1d88,5080,1d89,2180,403c
-,2000,3180,1d88,61ff</data>
+          <data>4014,2c00,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,3180,1d88,3188,1d88,4016,2000,2000,4215,2240,3040,1d89,2380,1d89,2180,e000,4017,2000,4200,3008,602c,0001,0017,0019,0068,0069,1d88,4414,2480,4605,0498,2480,3190,1d88,4014,2000,4207,0008,1d89,2380,3008,4014,2000,4204,0008,4414,2480,4607,0498,2480,3190,1d88,4414,2480,4607,0498,2680,1d89,2580,0298,1c00,2000,3188,1d88,5000,1da0,4431,2480,2480,3190,1d88,4014,2000,4201,0008,1d89,2380,3008,4432,2480,2480,3190,1d88,4014,2000,4202,0008,1d89,2380,3008,4014,2000,4201,0008,2000,4230,2240,3008,4400,3190,1d88,4401,3190,1d88,4403,3190,1d88,1599,9600,16d8,3098,61aa,4014,2000,4203,0008,1d89,2380,3008,4400,3190,1d88,4014,2000,4200,0008,1d89,2380,3008,4014,2000,4202,0008,2000,3180,1d88,4014,2000,4200,0008,2200,1d89,2180,0008,4233,2240,3008,4414,2480,4600,0498,2480,4601,0498,3190,1d88,4014,2000,4200,0008,1d89,2380,3008,4014,2000,4202,0008,2000,3180,1d88,4014,2000,4200,0008,2200,1d89,2180,0008,4234,2240,3008,4001,1000,8401,61fc,1da1</data>
         </entry>
       </elementAttributes>
-      <pos x="740" y="100"/>
+      <pos x="740" y="100" />
     </visualElement>
     <visualElement>
       <elementName>Ground</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="1"/>
+          <rotation rotation="1" />
         </entry>
       </elementAttributes>
-      <pos x="720" y="160"/>
+      <pos x="720" y="160" />
     </visualElement>
     <visualElement>
       <elementName>VDD</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="1"/>
+          <rotation rotation="1" />
         </entry>
       </elementAttributes>
-      <pos x="720" y="120"/>
+      <pos x="720" y="120" />
     </visualElement>
     <visualElement>
       <elementName>VDD</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation reference="../../../../visualElement[3]/elementAttributes/entry/rotation"/>
+          <rotation reference="../../../../visualElement[3]/elementAttributes/entry/rotation" />
         </entry>
       </elementAttributes>
-      <pos x="720" y="180"/>
+      <pos x="720" y="180" />
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -102,7 +85,7 @@
           <int>16</int>
         </entry>
       </elementAttributes>
-      <pos x="160" y="140"/>
+      <pos x="160" y="140" />
     </visualElement>
     <visualElement>
       <elementName>Splitter</elementName>
@@ -116,12 +99,12 @@
           <string>13,1,1,1</string>
         </entry>
       </elementAttributes>
-      <pos x="220" y="140"/>
+      <pos x="220" y="140" />
     </visualElement>
     <visualElement>
       <elementName>atk16_mem_mux.dig</elementName>
-      <elementAttributes/>
-      <pos x="320" y="160"/>
+      <elementAttributes />
+      <pos x="320" y="160" />
     </visualElement>
     <visualElement>
       <elementName>Splitter</elementName>
@@ -135,7 +118,7 @@
           <string>15</string>
         </entry>
       </elementAttributes>
-      <pos x="320" y="80"/>
+      <pos x="320" y="80" />
     </visualElement>
     <visualElement>
       <elementName>Splitter</elementName>
@@ -149,7 +132,7 @@
           <string>2</string>
         </entry>
       </elementAttributes>
-      <pos x="400" y="160"/>
+      <pos x="400" y="160" />
     </visualElement>
     <visualElement>
       <elementName>Demultiplexer</elementName>
@@ -163,7 +146,7 @@
           <int>15</int>
         </entry>
       </elementAttributes>
-      <pos x="420" y="60"/>
+      <pos x="420" y="60" />
     </visualElement>
     <visualElement>
       <elementName>Probe</elementName>
@@ -173,7 +156,7 @@
           <string>ROM_OUT</string>
         </entry>
       </elementAttributes>
-      <pos x="840" y="100"/>
+      <pos x="840" y="100" />
     </visualElement>
     <visualElement>
       <elementName>Driver</elementName>
@@ -187,7 +170,7 @@
           <boolean>true</boolean>
         </entry>
       </elementAttributes>
-      <pos x="880" y="140"/>
+      <pos x="880" y="140" />
     </visualElement>
     <visualElement>
       <elementName>Demultiplexer</elementName>
@@ -201,7 +184,7 @@
           <boolean>true</boolean>
         </entry>
       </elementAttributes>
-      <pos x="420" y="300"/>
+      <pos x="420" y="300" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -211,7 +194,7 @@
           <string>RAM_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="480" y="320"/>
+      <pos x="480" y="320" />
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -233,7 +216,7 @@
           <boolean>true</boolean>
         </entry>
       </elementAttributes>
-      <pos x="260" y="500"/>
+      <pos x="260" y="500" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -243,7 +226,7 @@
           <string>CLK</string>
         </entry>
       </elementAttributes>
-      <pos x="180" y="280"/>
+      <pos x="180" y="280" />
     </visualElement>
     <visualElement>
       <elementName>RAMDualPort</elementName>
@@ -261,59 +244,59 @@
           <int>16</int>
         </entry>
       </elementAttributes>
-      <pos x="660" y="280"/>
+      <pos x="660" y="280" />
     </visualElement>
     <visualElement>
       <elementName>VDD</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="1"/>
+          <rotation rotation="1" />
         </entry>
       </elementAttributes>
-      <pos x="640" y="360"/>
+      <pos x="640" y="360" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="2"/>
+          <rotation rotation="2" />
         </entry>
         <entry>
           <string>NetName</string>
           <string>CLK</string>
         </entry>
       </elementAttributes>
-      <pos x="640" y="340"/>
+      <pos x="640" y="340" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="2"/>
+          <rotation rotation="2" />
         </entry>
         <entry>
           <string>NetName</string>
           <string>RAM_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="640" y="320"/>
+      <pos x="640" y="320" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="2"/>
+          <rotation rotation="2" />
         </entry>
         <entry>
           <string>NetName</string>
           <string>DBUS</string>
         </entry>
       </elementAttributes>
-      <pos x="640" y="300"/>
+      <pos x="640" y="300" />
     </visualElement>
     <visualElement>
       <elementName>Probe</elementName>
@@ -323,7 +306,7 @@
           <string>RAM_OUT</string>
         </entry>
       </elementAttributes>
-      <pos x="760" y="280"/>
+      <pos x="760" y="280" />
     </visualElement>
     <visualElement>
       <elementName>Driver</elementName>
@@ -333,7 +316,7 @@
           <int>16</int>
         </entry>
       </elementAttributes>
-      <pos x="860" y="320"/>
+      <pos x="860" y="320" />
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -347,7 +330,7 @@
           <string>CLK</string>
         </entry>
       </elementAttributes>
-      <pos x="160" y="280"/>
+      <pos x="160" y="280" />
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -361,7 +344,7 @@
           <string>MMIO_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="880" y="540"/>
+      <pos x="880" y="540" />
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -375,7 +358,7 @@
           <string>MMIO_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="880" y="600"/>
+      <pos x="880" y="600" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -385,7 +368,7 @@
           <string>MMIO_S</string>
         </entry>
       </elementAttributes>
-      <pos x="260" y="40"/>
+      <pos x="260" y="40" />
     </visualElement>
     <visualElement>
       <elementName>Testcase</elementName>
@@ -411,7 +394,7 @@ C   0x8000 0       1        Z      0xAA
           </testData>
         </entry>
       </elementAttributes>
-      <pos x="540" y="480"/>
+      <pos x="540" y="480" />
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -425,7 +408,7 @@ C   0x8000 0       1        Z      0xAA
           <string>MEM_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="160" y="340"/>
+      <pos x="160" y="340" />
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -439,17 +422,17 @@ C   0x8000 0       1        Z      0xAA
           <string>MEM_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="260" y="560"/>
+      <pos x="260" y="560" />
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="2"/>
+          <rotation rotation="2" />
         </entry>
       </elementAttributes>
-      <pos x="960" y="280"/>
+      <pos x="960" y="280" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -459,7 +442,7 @@ C   0x8000 0       1        Z      0xAA
           <string>RAM_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="960" y="280"/>
+      <pos x="960" y="280" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -469,7 +452,7 @@ C   0x8000 0       1        Z      0xAA
           <string>MEM_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="280" y="560"/>
+      <pos x="280" y="560" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -479,7 +462,7 @@ C   0x8000 0       1        Z      0xAA
           <string>MEM_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="960" y="240"/>
+      <pos x="960" y="240" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -489,17 +472,17 @@ C   0x8000 0       1        Z      0xAA
           <string>DBUS</string>
         </entry>
       </elementAttributes>
-      <pos x="900" y="320"/>
+      <pos x="900" y="320" />
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="2"/>
+          <rotation rotation="2" />
         </entry>
       </elementAttributes>
-      <pos x="960" y="200"/>
+      <pos x="960" y="200" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -509,7 +492,7 @@ C   0x8000 0       1        Z      0xAA
           <string>ROM_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="960" y="200"/>
+      <pos x="960" y="200" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -519,7 +502,7 @@ C   0x8000 0       1        Z      0xAA
           <string>MEM_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="960" y="160"/>
+      <pos x="960" y="160" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -529,7 +512,7 @@ C   0x8000 0       1        Z      0xAA
           <string>DBUS</string>
         </entry>
       </elementAttributes>
-      <pos x="920" y="120"/>
+      <pos x="920" y="120" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -539,7 +522,7 @@ C   0x8000 0       1        Z      0xAA
           <string>DBUS</string>
         </entry>
       </elementAttributes>
-      <pos x="280" y="500"/>
+      <pos x="280" y="500" />
     </visualElement>
     <visualElement>
       <elementName>Decoder</elementName>
@@ -553,7 +536,7 @@ C   0x8000 0       1        Z      0xAA
           <boolean>true</boolean>
         </entry>
       </elementAttributes>
-      <pos x="460" y="180"/>
+      <pos x="460" y="180" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -563,7 +546,7 @@ C   0x8000 0       1        Z      0xAA
           <string>ROM_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="500" y="180"/>
+      <pos x="500" y="180" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -573,7 +556,7 @@ C   0x8000 0       1        Z      0xAA
           <string>RAM_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="500" y="200"/>
+      <pos x="500" y="200" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -583,7 +566,7 @@ C   0x8000 0       1        Z      0xAA
           <string>MMIO_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="500" y="220"/>
+      <pos x="500" y="220" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -593,73 +576,73 @@ C   0x8000 0       1        Z      0xAA
           <string>MMIO_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="480" y="340"/>
+      <pos x="480" y="340" />
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
-      <elementAttributes/>
-      <pos x="780" y="580"/>
+      <elementAttributes />
+      <pos x="780" y="580" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="2"/>
+          <rotation rotation="2" />
         </entry>
         <entry>
           <string>NetName</string>
           <string>MEM_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="780" y="620"/>
+      <pos x="780" y="620" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="2"/>
+          <rotation rotation="2" />
         </entry>
         <entry>
           <string>NetName</string>
           <string>MMIO_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="780" y="580"/>
+      <pos x="780" y="580" />
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
-      <elementAttributes/>
-      <pos x="780" y="500"/>
+      <elementAttributes />
+      <pos x="780" y="500" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="2"/>
+          <rotation rotation="2" />
         </entry>
         <entry>
           <string>NetName</string>
           <string>MEM_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="780" y="540"/>
+      <pos x="780" y="540" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="2"/>
+          <rotation rotation="2" />
         </entry>
         <entry>
           <string>NetName</string>
           <string>MMIO_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="780" y="500"/>
+      <pos x="780" y="500" />
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -677,21 +660,21 @@ C   0x8000 0       1        Z      0xAA
           <int>13</int>
         </entry>
       </elementAttributes>
-      <pos x="880" y="460"/>
+      <pos x="880" y="460" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="2"/>
+          <rotation rotation="2" />
         </entry>
         <entry>
           <string>NetName</string>
           <string>MMIO_S</string>
         </entry>
       </elementAttributes>
-      <pos x="860" y="460"/>
+      <pos x="860" y="460" />
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -701,266 +684,266 @@ C   0x8000 0       1        Z      0xAA
           <string>MEM_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="300" y="360"/>
+      <pos x="300" y="360" />
     </visualElement>
   </visualElements>
   <wires>
     <wire>
-      <p1 x="720" y="160"/>
-      <p2 x="740" y="160"/>
+      <p1 x="720" y="160" />
+      <p2 x="740" y="160" />
     </wire>
     <wire>
-      <p1 x="240" y="160"/>
-      <p2 x="260" y="160"/>
+      <p1 x="240" y="160" />
+      <p2 x="260" y="160" />
     </wire>
     <wire>
-      <p1 x="380" y="160"/>
-      <p2 x="400" y="160"/>
+      <p1 x="380" y="160" />
+      <p2 x="400" y="160" />
     </wire>
     <wire>
-      <p1 x="420" y="160"/>
-      <p2 x="440" y="160"/>
+      <p1 x="420" y="160" />
+      <p2 x="440" y="160" />
     </wire>
     <wire>
-      <p1 x="260" y="160"/>
-      <p2 x="320" y="160"/>
+      <p1 x="260" y="160" />
+      <p2 x="320" y="160" />
     </wire>
     <wire>
-      <p1 x="440" y="160"/>
-      <p2 x="480" y="160"/>
+      <p1 x="440" y="160" />
+      <p2 x="480" y="160" />
     </wire>
     <wire>
-      <p1 x="460" y="320"/>
-      <p2 x="480" y="320"/>
+      <p1 x="460" y="320" />
+      <p2 x="480" y="320" />
     </wire>
     <wire>
-      <p1 x="640" y="320"/>
-      <p2 x="660" y="320"/>
+      <p1 x="640" y="320" />
+      <p2 x="660" y="320" />
     </wire>
     <wire>
-      <p1 x="720" y="320"/>
-      <p2 x="760" y="320"/>
+      <p1 x="720" y="320" />
+      <p2 x="760" y="320" />
     </wire>
     <wire>
-      <p1 x="880" y="320"/>
-      <p2 x="900" y="320"/>
+      <p1 x="880" y="320" />
+      <p2 x="900" y="320" />
     </wire>
     <wire>
-      <p1 x="760" y="320"/>
-      <p2 x="840" y="320"/>
+      <p1 x="760" y="320" />
+      <p2 x="840" y="320" />
     </wire>
     <wire>
-      <p1 x="620" y="100"/>
-      <p2 x="740" y="100"/>
+      <p1 x="620" y="100" />
+      <p2 x="740" y="100" />
     </wire>
     <wire>
-      <p1 x="260" y="100"/>
-      <p2 x="320" y="100"/>
+      <p1 x="260" y="100" />
+      <p2 x="320" y="100" />
     </wire>
     <wire>
-      <p1 x="380" y="100"/>
-      <p2 x="420" y="100"/>
+      <p1 x="380" y="100" />
+      <p2 x="420" y="100" />
     </wire>
     <wire>
-      <p1 x="860" y="260"/>
-      <p2 x="900" y="260"/>
+      <p1 x="860" y="260" />
+      <p2 x="900" y="260" />
     </wire>
     <wire>
-      <p1 x="240" y="200"/>
-      <p2 x="320" y="200"/>
+      <p1 x="240" y="200" />
+      <p2 x="320" y="200" />
     </wire>
     <wire>
-      <p1 x="640" y="360"/>
-      <p2 x="660" y="360"/>
+      <p1 x="640" y="360" />
+      <p2 x="660" y="360" />
     </wire>
     <wire>
-      <p1 x="280" y="360"/>
-      <p2 x="300" y="360"/>
+      <p1 x="280" y="360" />
+      <p2 x="300" y="360" />
     </wire>
     <wire>
-      <p1 x="240" y="40"/>
-      <p2 x="260" y="40"/>
+      <p1 x="240" y="40" />
+      <p2 x="260" y="40" />
     </wire>
     <wire>
-      <p1 x="840" y="520"/>
-      <p2 x="860" y="520"/>
+      <p1 x="840" y="520" />
+      <p2 x="860" y="520" />
     </wire>
     <wire>
-      <p1 x="640" y="300"/>
-      <p2 x="660" y="300"/>
+      <p1 x="640" y="300" />
+      <p2 x="660" y="300" />
     </wire>
     <wire>
-      <p1 x="800" y="140"/>
-      <p2 x="840" y="140"/>
+      <p1 x="800" y="140" />
+      <p2 x="840" y="140" />
     </wire>
     <wire>
-      <p1 x="160" y="140"/>
-      <p2 x="220" y="140"/>
+      <p1 x="160" y="140" />
+      <p2 x="220" y="140" />
     </wire>
     <wire>
-      <p1 x="840" y="140"/>
-      <p2 x="860" y="140"/>
+      <p1 x="840" y="140" />
+      <p2 x="860" y="140" />
     </wire>
     <wire>
-      <p1 x="860" y="460"/>
-      <p2 x="880" y="460"/>
+      <p1 x="860" y="460" />
+      <p2 x="880" y="460" />
     </wire>
     <wire>
-      <p1 x="240" y="80"/>
-      <p2 x="320" y="80"/>
+      <p1 x="240" y="80" />
+      <p2 x="320" y="80" />
     </wire>
     <wire>
-      <p1 x="340" y="80"/>
-      <p2 x="380" y="80"/>
+      <p1 x="340" y="80" />
+      <p2 x="380" y="80" />
     </wire>
     <wire>
-      <p1 x="460" y="80"/>
-      <p2 x="600" y="80"/>
+      <p1 x="460" y="80" />
+      <p2 x="600" y="80" />
     </wire>
     <wire>
-      <p1 x="260" y="560"/>
-      <p2 x="280" y="560"/>
+      <p1 x="260" y="560" />
+      <p2 x="280" y="560" />
     </wire>
     <wire>
-      <p1 x="720" y="180"/>
-      <p2 x="740" y="180"/>
+      <p1 x="720" y="180" />
+      <p2 x="740" y="180" />
     </wire>
     <wire>
-      <p1 x="240" y="180"/>
-      <p2 x="280" y="180"/>
+      <p1 x="240" y="180" />
+      <p2 x="280" y="180" />
     </wire>
     <wire>
-      <p1 x="380" y="180"/>
-      <p2 x="400" y="180"/>
+      <p1 x="380" y="180" />
+      <p2 x="400" y="180" />
     </wire>
     <wire>
-      <p1 x="880" y="180"/>
-      <p2 x="900" y="180"/>
+      <p1 x="880" y="180" />
+      <p2 x="900" y="180" />
     </wire>
     <wire>
-      <p1 x="280" y="180"/>
-      <p2 x="320" y="180"/>
+      <p1 x="280" y="180" />
+      <p2 x="320" y="180" />
     </wire>
     <wire>
-      <p1 x="640" y="340"/>
-      <p2 x="660" y="340"/>
+      <p1 x="640" y="340" />
+      <p2 x="660" y="340" />
     </wire>
     <wire>
-      <p1 x="160" y="340"/>
-      <p2 x="280" y="340"/>
+      <p1 x="160" y="340" />
+      <p2 x="280" y="340" />
     </wire>
     <wire>
-      <p1 x="460" y="340"/>
-      <p2 x="480" y="340"/>
+      <p1 x="460" y="340" />
+      <p2 x="480" y="340" />
     </wire>
     <wire>
-      <p1 x="280" y="340"/>
-      <p2 x="420" y="340"/>
+      <p1 x="280" y="340" />
+      <p2 x="420" y="340" />
     </wire>
     <wire>
-      <p1 x="260" y="500"/>
-      <p2 x="280" y="500"/>
+      <p1 x="260" y="500" />
+      <p2 x="280" y="500" />
     </wire>
     <wire>
-      <p1 x="160" y="280"/>
-      <p2 x="180" y="280"/>
+      <p1 x="160" y="280" />
+      <p2 x="180" y="280" />
     </wire>
     <wire>
-      <p1 x="600" y="280"/>
-      <p2 x="660" y="280"/>
+      <p1 x="600" y="280" />
+      <p2 x="660" y="280" />
     </wire>
     <wire>
-      <p1 x="720" y="120"/>
-      <p2 x="740" y="120"/>
+      <p1 x="720" y="120" />
+      <p2 x="740" y="120" />
     </wire>
     <wire>
-      <p1 x="280" y="120"/>
-      <p2 x="320" y="120"/>
+      <p1 x="280" y="120" />
+      <p2 x="320" y="120" />
     </wire>
     <wire>
-      <p1 x="900" y="120"/>
-      <p2 x="920" y="120"/>
+      <p1 x="900" y="120" />
+      <p2 x="920" y="120" />
     </wire>
     <wire>
-      <p1 x="840" y="600"/>
-      <p2 x="880" y="600"/>
+      <p1 x="840" y="600" />
+      <p2 x="880" y="600" />
     </wire>
     <wire>
-      <p1 x="460" y="60"/>
-      <p2 x="620" y="60"/>
+      <p1 x="460" y="60" />
+      <p2 x="620" y="60" />
     </wire>
     <wire>
-      <p1 x="860" y="540"/>
-      <p2 x="880" y="540"/>
+      <p1 x="860" y="540" />
+      <p2 x="880" y="540" />
     </wire>
     <wire>
-      <p1 x="480" y="160"/>
-      <p2 x="480" y="180"/>
+      <p1 x="480" y="160" />
+      <p2 x="480" y="180" />
     </wire>
     <wire>
-      <p1 x="260" y="100"/>
-      <p2 x="260" y="160"/>
+      <p1 x="260" y="100" />
+      <p2 x="260" y="160" />
     </wire>
     <wire>
-      <p1 x="900" y="120"/>
-      <p2 x="900" y="140"/>
+      <p1 x="900" y="120" />
+      <p2 x="900" y="140" />
     </wire>
     <wire>
-      <p1 x="840" y="100"/>
-      <p2 x="840" y="140"/>
+      <p1 x="840" y="100" />
+      <p2 x="840" y="140" />
     </wire>
     <wire>
-      <p1 x="620" y="60"/>
-      <p2 x="620" y="100"/>
+      <p1 x="620" y="60" />
+      <p2 x="620" y="100" />
     </wire>
     <wire>
-      <p1 x="240" y="40"/>
-      <p2 x="240" y="80"/>
+      <p1 x="240" y="40" />
+      <p2 x="240" y="80" />
     </wire>
     <wire>
-      <p1 x="240" y="80"/>
-      <p2 x="240" y="140"/>
+      <p1 x="240" y="80" />
+      <p2 x="240" y="140" />
     </wire>
     <wire>
-      <p1 x="880" y="160"/>
-      <p2 x="880" y="180"/>
+      <p1 x="880" y="160" />
+      <p2 x="880" y="180" />
     </wire>
     <wire>
-      <p1 x="280" y="120"/>
-      <p2 x="280" y="180"/>
+      <p1 x="280" y="120" />
+      <p2 x="280" y="180" />
     </wire>
     <wire>
-      <p1 x="280" y="340"/>
-      <p2 x="280" y="360"/>
+      <p1 x="280" y="340" />
+      <p2 x="280" y="360" />
     </wire>
     <wire>
-      <p1 x="440" y="140"/>
-      <p2 x="440" y="160"/>
+      <p1 x="440" y="140" />
+      <p2 x="440" y="160" />
     </wire>
     <wire>
-      <p1 x="440" y="160"/>
-      <p2 x="440" y="300"/>
+      <p1 x="440" y="160" />
+      <p2 x="440" y="300" />
     </wire>
     <wire>
-      <p1 x="600" y="80"/>
-      <p2 x="600" y="280"/>
+      <p1 x="600" y="80" />
+      <p2 x="600" y="280" />
     </wire>
     <wire>
-      <p1 x="760" y="280"/>
-      <p2 x="760" y="320"/>
+      <p1 x="760" y="280" />
+      <p2 x="760" y="320" />
     </wire>
     <wire>
-      <p1 x="380" y="80"/>
-      <p2 x="380" y="100"/>
+      <p1 x="380" y="80" />
+      <p2 x="380" y="100" />
     </wire>
     <wire>
-      <p1 x="860" y="520"/>
-      <p2 x="860" y="540"/>
+      <p1 x="860" y="520" />
+      <p2 x="860" y="540" />
     </wire>
     <wire>
-      <p1 x="860" y="260"/>
-      <p2 x="860" y="300"/>
+      <p1 x="860" y="260" />
+      <p2 x="860" y="300" />
     </wire>
   </wires>
-  <measurementOrdering/>
+  <measurementOrdering />
 </circuit>
\ No newline at end of file