From 3f9f7eefb9d0836ec53a08e311219f7f497517c7 Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jan@jantuomi.fi>
Date: Sat, 13 Apr 2024 00:25:18 +0300
Subject: Make text mode work

---
 digital_diagrams/atk16_mem.dig | 426 +++++++++++++++++++++--------------------
 1 file changed, 222 insertions(+), 204 deletions(-)

(limited to 'digital_diagrams')

diff --git a/digital_diagrams/atk16_mem.dig b/digital_diagrams/atk16_mem.dig
index 6ff9810..30579a7 100644
--- a/digital_diagrams/atk16_mem.dig
+++ b/digital_diagrams/atk16_mem.dig
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <circuit>
   <version>2</version>
   <attributes>
     <entry>
       <string>romContent</string>
       <romList>
-        <roms />
+        <roms/>
       </romList>
     </entry>
     <entry>
@@ -34,40 +35,57 @@
         </entry>
         <entry>
           <string>Data</string>
-          <data>4014,2e00,1dc0,6026,8000,8000,8000,8000,8000,8000,8000,8000,8000,8000,8000,8000,001b,001a,001a,001a,8000,e000,e001,e002,e800,f800,f000,31c0,1fc8,31c8,1fc8,4016,2000,2000,4215,2240,3040,1fc9,23c0,1fc9,21c0,e000,4017,2000,4200,3008,600d,0008,0000,0001,0002,0017,0019,9000,0100,0031,0061,0062,0063,0032,402f,2000,0fc0,4433,2480,31d0,1fc8,1fc9,25c0,2480,31d0,1fc8,1fc9,21c0,4200,0270,3040,4434,2480,31d0,1fc8,1fc9,25c0,2480,31d0,1fc8,1fc9,21c0,4201,0270,3040,4000,0180,2000,31c0,1fc8,4031,2000,31c0,1fc8,1fc9,23c0,1fc9,21c0,3008,4000,31c0,1fc8,1fc9,21c0,4035,2000,31c0,1fc8,4000,31c0,1fc8,1fc9,23c0,1fc9,21c0,0008,31c0,1fc8,4037,2000,31c0,1fc8,1fc9,23c0,1fc9,21c0,3008,4000,31c0,1fc8,1fc9,21c0,4035,2000,31c0,1fc8,4001,31c0,1fc8,1fc9,23c0,1fc9,21c0,0008,31c0,1fc8,4038,2000,31c0,1fc8,1fc9,23c0,1fc9,21c0,3008,4000,31c0,1fc8,1fc9,21c0,4035,2000,31c0,1fc8,4002,31c0,1fc8,1fc9,23c0,1fc9,21c0,0008,31c0,1fc8,4039,2000,31c0,1fc8,1fc9,23c0,1fc9,21c0,3008,4000,31c0,1fc8,1fc9,21c0,4035,2000,31c0,1fc8,4003,31c0,1fc8,1fc9,23c0,1fc9,21c0,0008,31c0,1fc8,403a,2000,31c0,1fc8,1fc9,23c0,1fc9,21c0,3008,4000,31c0,1fc8,1fc9,21c0,4035,2000,31c0,1fc8,4004,31c0,1fc8,1fc9,23c0,1fc9,21c0,0008,31c0,1fc8,403b,2000,31c0,1fc8,1fc9,23c0,1fc9,21c0,3008,4000,31c0,1fc8,1fc9,21c0,4035,2000,31c0,1fc8,4005,31c0,1fc8,1fc9,23c0,1fc9,21c0,0008,31c0,1fc8,4000,31c0,1fc8,1fc9,23c0,1fc9,21c0,3008,4000,31c0,1fc8,1fc9,21c0,4435,2480,31d0,1fc8,1fc9,21c0,4202,0270,3040,4400,31d0,1fc8,1fc9,21c0,4203,0270,3040,4402,0590,2480,31d0,1fc8,1fc9,25c0,2480,31d0,1fc8,1fc9,21c0,4204,0270,3040,4400,31d0,1fc8,1fc9,21c0,4205,0270,3040,4201,31c8,1fc8,1fc9,21c0,1000,8451,4435,2480,31d0,1fc8,4403,0590,2480,31d0,1fc8,1fc9,27c0,1fc9,25c0,0498,31d0,1fc8,1fc9,21c0,4206,0270,3040,4406,0590,2480,31d0,1fc8,1fc9,25c0,2480,31d0,1fc8,1fc9,21c0,4207,0270,3040,4007,0180,2000,31c0,1fc8,4000,31c0,1fc8,1fc9,21c0,1000,8402,6020,6000,4407,0590,2480,31d0,1fc8,1fc9,21c0,4205,0270,3040,4403,0590,2480,31d0,1fc8,4401,31d0,1fc8,1fc9,27c0,1fc9,25c0,0498,31d0,1fc8,1fc9,21c0,4203,0270,3040,61a8,4001,0180,2000,31c0,1fc8,4000,31c0,1fc8,1fc9,23c0,1fc9,21c0,0008,31c0,1fc8,4004,0180,2000,31c0,1fc8,1fc9,23c0,1fc9,21c0,3008,4000,31c0,1fc8,1fc9,21c0,4001,0180,2000,31c0,1fc8,4001,31c0,1fc8,1fc9,23c0,1fc9,21c0,0008,31c0,1fc8,4005,0180,2000,31c0,1fc8,1fc9,23c0,1fc9,21c0,3008,4000,31c0,1fc8,1fc9,21c0,1f80,f000</data>
-        </entry>
-      </elementAttributes>
-      <pos x="740" y="100" />
+          <data>4014,2c00,6019,13*8000,c0,1a,1a,1a,8000,e000,e001,e002,e800,f800
+,4855,f000,4017,2000,4200,3008,6000,6001,f840,4422,2480,4220,3088
+,1488,4248,3088,1488,4245,3088,1488,424c,3088,1488,424c,3088,1488
+,424f,3088,1488,4220,3088,1488,4223,3088,1488,4276,3088,1488,4261
+,3088,1488,4269,3088,1488,426e,3088,1488,4263,3088,1488,426f,3088
+,1488,426f,3088,1488,4264,3088,1488,4269,3088,1488,426a,3088,1488
+,4275,3088,1488,4274,3088,1488,4275,3088,1488,4274,3088,1488,14b5
+,1488,14b7,4220,3088,1488,42bb,3088,1488,42bb,3088,1488,42bb,3088
+,1488,42bb,3088,1488,4220,3088,1488,4242,3088,1488,4259,3088,1488
+,4220,3088,1488,4240,3088,1488,426b,3088,1488,4261,3088,1488,426c
+,3088,1488,425f,3088,1488,426a,3088,1488,4261,3088,1488,426e,3088
+,1488,4220,3088,1488,42bb,3088,1488,42bb,3088,1488,42bb,3088,1488
+,42bb,3088,1488,14b5,1488,14b7,14b5,1488,14b7,4220,3088,1488,423e
+,3088,1488,4220,3088,1488,4017,2000,4201,3008,61ff,3140,1b48,3148
+,1b48,3158,1b48,4016,2000,2000,4215,2240,1600,16e9,16e9,8407,1600
+,16e9,16d9,8410,3080,1488,6012,14b5,1488,14b7,4220,3088,1488,423e
+,3088,1488,4220,3088,1488,6005,1489,4220,3088,1488,1489,3158,1b48
+,3148,1b48,3140,1b48,e000</data>
+        </entry>
+      </elementAttributes>
+      <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>
@@ -85,7 +103,7 @@
           <int>16</int>
         </entry>
       </elementAttributes>
-      <pos x="160" y="140" />
+      <pos x="160" y="140"/>
     </visualElement>
     <visualElement>
       <elementName>Splitter</elementName>
@@ -99,12 +117,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>
@@ -118,7 +136,7 @@
           <string>15</string>
         </entry>
       </elementAttributes>
-      <pos x="320" y="80" />
+      <pos x="320" y="80"/>
     </visualElement>
     <visualElement>
       <elementName>Splitter</elementName>
@@ -132,7 +150,7 @@
           <string>2</string>
         </entry>
       </elementAttributes>
-      <pos x="400" y="160" />
+      <pos x="400" y="160"/>
     </visualElement>
     <visualElement>
       <elementName>Demultiplexer</elementName>
@@ -146,7 +164,7 @@
           <int>15</int>
         </entry>
       </elementAttributes>
-      <pos x="420" y="60" />
+      <pos x="420" y="60"/>
     </visualElement>
     <visualElement>
       <elementName>Probe</elementName>
@@ -156,7 +174,7 @@
           <string>ROM_OUT</string>
         </entry>
       </elementAttributes>
-      <pos x="840" y="100" />
+      <pos x="840" y="100"/>
     </visualElement>
     <visualElement>
       <elementName>Driver</elementName>
@@ -170,7 +188,7 @@
           <boolean>true</boolean>
         </entry>
       </elementAttributes>
-      <pos x="880" y="140" />
+      <pos x="880" y="140"/>
     </visualElement>
     <visualElement>
       <elementName>Demultiplexer</elementName>
@@ -184,7 +202,7 @@
           <boolean>true</boolean>
         </entry>
       </elementAttributes>
-      <pos x="420" y="300" />
+      <pos x="420" y="300"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -194,7 +212,7 @@
           <string>RAM_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="480" y="320" />
+      <pos x="480" y="320"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -216,7 +234,7 @@
           <boolean>true</boolean>
         </entry>
       </elementAttributes>
-      <pos x="260" y="500" />
+      <pos x="260" y="500"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -226,7 +244,7 @@
           <string>CLK</string>
         </entry>
       </elementAttributes>
-      <pos x="180" y="280" />
+      <pos x="180" y="280"/>
     </visualElement>
     <visualElement>
       <elementName>RAMDualPort</elementName>
@@ -244,59 +262,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>
@@ -306,7 +324,7 @@
           <string>RAM_OUT</string>
         </entry>
       </elementAttributes>
-      <pos x="760" y="280" />
+      <pos x="760" y="280"/>
     </visualElement>
     <visualElement>
       <elementName>Driver</elementName>
@@ -316,7 +334,7 @@
           <int>16</int>
         </entry>
       </elementAttributes>
-      <pos x="860" y="320" />
+      <pos x="860" y="320"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -330,7 +348,7 @@
           <string>CLK</string>
         </entry>
       </elementAttributes>
-      <pos x="160" y="280" />
+      <pos x="160" y="280"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -344,7 +362,7 @@
           <string>MMIO_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="880" y="540" />
+      <pos x="880" y="540"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -358,7 +376,7 @@
           <string>MMIO_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="880" y="600" />
+      <pos x="880" y="600"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -368,7 +386,7 @@
           <string>MMIO_S</string>
         </entry>
       </elementAttributes>
-      <pos x="260" y="40" />
+      <pos x="260" y="40"/>
     </visualElement>
     <visualElement>
       <elementName>Testcase</elementName>
@@ -394,7 +412,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>
@@ -408,7 +426,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>
@@ -422,17 +440,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>
@@ -442,7 +460,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>
@@ -452,7 +470,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>
@@ -462,7 +480,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>
@@ -472,17 +490,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>
@@ -492,7 +510,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>
@@ -502,7 +520,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>
@@ -512,7 +530,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>
@@ -522,7 +540,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>
@@ -536,7 +554,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>
@@ -546,7 +564,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>
@@ -556,7 +574,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>
@@ -566,7 +584,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>
@@ -576,73 +594,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>
@@ -660,21 +678,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>
@@ -684,266 +702,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
-- 
cgit v1.3