Refactor names

1 files changed, 949 insertions, 0 deletions

diff --git a/digital_diagrams/atk16_mem.dig b/digital_diagrams/atk16_mem.dig
new file mode 100644
index 0000000..6ff9810
--- /dev/null
+++ b/digital_diagrams/atk16_mem.dig
@@ -0,0 +1,949 @@
+<circuit>
+  <version>2</version>
+  <attributes>
+    <entry>
+      <string>romContent</string>
+      <romList>
+        <roms />
+      </romList>
+    </entry>
+    <entry>
+      <string>Width</string>
+      <int>7</int>
+    </entry>
+  </attributes>
+  <visualElements>
+    <visualElement>
+      <elementName>EEPROM</elementName>
+      <elementAttributes>
+        <entry>
+          <string>AddrBits</string>
+          <int>15</int>
+        </entry>
+        <entry>
+          <string>isProgramMemory</string>
+          <boolean>true</boolean>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>MEM_ROM</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>16</int>
+        </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" />
+    </visualElement>
+    <visualElement>
+      <elementName>Ground</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="1" />
+        </entry>
+      </elementAttributes>
+      <pos x="720" y="160" />
+    </visualElement>
+    <visualElement>
+      <elementName>VDD</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="1" />
+        </entry>
+      </elementAttributes>
+      <pos x="720" y="120" />
+    </visualElement>
+    <visualElement>
+      <elementName>VDD</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation reference="../../../../visualElement[3]/elementAttributes/entry/rotation" />
+        </entry>
+      </elementAttributes>
+      <pos x="720" y="180" />
+    </visualElement>
+    <visualElement>
+      <elementName>In</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Address</string>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>ADDR</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>16</int>
+        </entry>
+      </elementAttributes>
+      <pos x="160" y="140" />
+    </visualElement>
+    <visualElement>
+      <elementName>Splitter</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Input Splitting</string>
+          <string>16</string>
+        </entry>
+        <entry>
+          <string>Output Splitting</string>
+          <string>13,1,1,1</string>
+        </entry>
+      </elementAttributes>
+      <pos x="220" y="140" />
+    </visualElement>
+    <visualElement>
+      <elementName>atk16_mem_mux.dig</elementName>
+      <elementAttributes />
+      <pos x="320" y="160" />
+    </visualElement>
+    <visualElement>
+      <elementName>Splitter</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Input Splitting</string>
+          <string>13,1,1</string>
+        </entry>
+        <entry>
+          <string>Output Splitting</string>
+          <string>15</string>
+        </entry>
+      </elementAttributes>
+      <pos x="320" y="80" />
+    </visualElement>
+    <visualElement>
+      <elementName>Splitter</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Input Splitting</string>
+          <string>1,1</string>
+        </entry>
+        <entry>
+          <string>Output Splitting</string>
+          <string>2</string>
+        </entry>
+      </elementAttributes>
+      <pos x="400" y="160" />
+    </visualElement>
+    <visualElement>
+      <elementName>Demultiplexer</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Selector Bits</string>
+          <int>2</int>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>15</int>
+        </entry>
+      </elementAttributes>
+      <pos x="420" y="60" />
+    </visualElement>
+    <visualElement>
+      <elementName>Probe</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>ROM_OUT</string>
+        </entry>
+      </elementAttributes>
+      <pos x="840" y="100" />
+    </visualElement>
+    <visualElement>
+      <elementName>Driver</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Bits</string>
+          <int>16</int>
+        </entry>
+        <entry>
+          <string>flipSelPos</string>
+          <boolean>true</boolean>
+        </entry>
+      </elementAttributes>
+      <pos x="880" y="140" />
+    </visualElement>
+    <visualElement>
+      <elementName>Demultiplexer</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Selector Bits</string>
+          <int>2</int>
+        </entry>
+        <entry>
+          <string>flipSelPos</string>
+          <boolean>true</boolean>
+        </entry>
+      </elementAttributes>
+      <pos x="420" y="300" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>RAM_IE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="480" y="320" />
+    </visualElement>
+    <visualElement>
+      <elementName>In</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Data bus</string>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>DBUS</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>16</int>
+        </entry>
+        <entry>
+          <string>isHighZ</string>
+          <boolean>true</boolean>
+        </entry>
+      </elementAttributes>
+      <pos x="260" y="500" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>CLK</string>
+        </entry>
+      </elementAttributes>
+      <pos x="180" y="280" />
+    </visualElement>
+    <visualElement>
+      <elementName>RAMDualPort</elementName>
+      <elementAttributes>
+        <entry>
+          <string>AddrBits</string>
+          <int>15</int>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>MEM_RAM</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>16</int>
+        </entry>
+      </elementAttributes>
+      <pos x="660" y="280" />
+    </visualElement>
+    <visualElement>
+      <elementName>VDD</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="1" />
+        </entry>
+      </elementAttributes>
+      <pos x="640" y="360" />
+    </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="640" y="340" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2" />
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>RAM_IE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="640" y="320" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2" />
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>DBUS</string>
+        </entry>
+      </elementAttributes>
+      <pos x="640" y="300" />
+    </visualElement>
+    <visualElement>
+      <elementName>Probe</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>RAM_OUT</string>
+        </entry>
+      </elementAttributes>
+      <pos x="760" y="280" />
+    </visualElement>
+    <visualElement>
+      <elementName>Driver</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Bits</string>
+          <int>16</int>
+        </entry>
+      </elementAttributes>
+      <pos x="860" y="320" />
+    </visualElement>
+    <visualElement>
+      <elementName>In</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Clock</string>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>CLK</string>
+        </entry>
+      </elementAttributes>
+      <pos x="160" y="280" />
+    </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Memory-mapped I/O word input enable</string>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>MMIO_IE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="880" y="540" />
+    </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Memory-mapped I/O word output enable</string>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>MMIO_OE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="880" y="600" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>MMIO_S</string>
+        </entry>
+      </elementAttributes>
+      <pos x="260" y="40" />
+    </visualElement>
+    <visualElement>
+      <elementName>Testcase</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Testdata</string>
+          <testData>
+            <dataString>CLK ADDR   MEM_IE  MEM_OE   DBUS  DBUS_out
+
+# read ROM
+program(0xFF)
+C   0x0    0       1        Z      0xFF
+
+# read RAM
+memory MEM_RAM(0x0)=0x55;
+C   0      0       0        Z      X
+C   0x8000 0       1        Z      0x55
+
+# write to RAM
+C   0x8000 1       0        0xAA   0xAA
+C   0x8000 0       1        Z      0xAA
+</dataString>
+          </testData>
+        </entry>
+      </elementAttributes>
+      <pos x="540" y="480" />
+    </visualElement>
+    <visualElement>
+      <elementName>In</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Memory input enable</string>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>MEM_IE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="160" y="340" />
+    </visualElement>
+    <visualElement>
+      <elementName>In</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Memory output enable</string>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>MEM_OE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="260" y="560" />
+    </visualElement>
+    <visualElement>
+      <elementName>And</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2" />
+        </entry>
+      </elementAttributes>
+      <pos x="960" y="280" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>RAM_OE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="960" y="280" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>MEM_OE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="280" y="560" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>MEM_OE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="960" y="240" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>DBUS</string>
+        </entry>
+      </elementAttributes>
+      <pos x="900" y="320" />
+    </visualElement>
+    <visualElement>
+      <elementName>And</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2" />
+        </entry>
+      </elementAttributes>
+      <pos x="960" y="200" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>ROM_OE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="960" y="200" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>MEM_OE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="960" y="160" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>DBUS</string>
+        </entry>
+      </elementAttributes>
+      <pos x="920" y="120" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>DBUS</string>
+        </entry>
+      </elementAttributes>
+      <pos x="280" y="500" />
+    </visualElement>
+    <visualElement>
+      <elementName>Decoder</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Selector Bits</string>
+          <int>2</int>
+        </entry>
+        <entry>
+          <string>flipSelPos</string>
+          <boolean>true</boolean>
+        </entry>
+      </elementAttributes>
+      <pos x="460" y="180" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>ROM_OE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="500" y="180" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>RAM_OE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="500" y="200" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>MMIO_OE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="500" y="220" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>MMIO_IE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="480" y="340" />
+    </visualElement>
+    <visualElement>
+      <elementName>And</elementName>
+      <elementAttributes />
+      <pos x="780" y="580" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2" />
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>MEM_OE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="780" y="620" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2" />
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>MMIO_OE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="780" y="580" />
+    </visualElement>
+    <visualElement>
+      <elementName>And</elementName>
+      <elementAttributes />
+      <pos x="780" y="500" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2" />
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>MEM_IE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="780" y="540" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2" />
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>MMIO_IE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="780" y="500" />
+    </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Memory-mapped I/O word selector</string>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>MMIO_S</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>13</int>
+        </entry>
+      </elementAttributes>
+      <pos x="880" y="460" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2" />
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>MMIO_S</string>
+        </entry>
+      </elementAttributes>
+      <pos x="860" y="460" />
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>MEM_IE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="300" y="360" />
+    </visualElement>
+  </visualElements>
+  <wires>
+    <wire>
+      <p1 x="720" y="160" />
+      <p2 x="740" y="160" />
+    </wire>
+    <wire>
+      <p1 x="240" y="160" />
+      <p2 x="260" y="160" />
+    </wire>
+    <wire>
+      <p1 x="380" y="160" />
+      <p2 x="400" y="160" />
+    </wire>
+    <wire>
+      <p1 x="420" y="160" />
+      <p2 x="440" y="160" />
+    </wire>
+    <wire>
+      <p1 x="260" y="160" />
+      <p2 x="320" y="160" />
+    </wire>
+    <wire>
+      <p1 x="440" y="160" />
+      <p2 x="480" y="160" />
+    </wire>
+    <wire>
+      <p1 x="460" y="320" />
+      <p2 x="480" y="320" />
+    </wire>
+    <wire>
+      <p1 x="640" y="320" />
+      <p2 x="660" y="320" />
+    </wire>
+    <wire>
+      <p1 x="720" y="320" />
+      <p2 x="760" y="320" />
+    </wire>
+    <wire>
+      <p1 x="880" y="320" />
+      <p2 x="900" y="320" />
+    </wire>
+    <wire>
+      <p1 x="760" y="320" />
+      <p2 x="840" y="320" />
+    </wire>
+    <wire>
+      <p1 x="620" y="100" />
+      <p2 x="740" y="100" />
+    </wire>
+    <wire>
+      <p1 x="260" y="100" />
+      <p2 x="320" y="100" />
+    </wire>
+    <wire>
+      <p1 x="380" y="100" />
+      <p2 x="420" y="100" />
+    </wire>
+    <wire>
+      <p1 x="860" y="260" />
+      <p2 x="900" y="260" />
+    </wire>
+    <wire>
+      <p1 x="240" y="200" />
+      <p2 x="320" y="200" />
+    </wire>
+    <wire>
+      <p1 x="640" y="360" />
+      <p2 x="660" y="360" />
+    </wire>
+    <wire>
+      <p1 x="280" y="360" />
+      <p2 x="300" y="360" />
+    </wire>
+    <wire>
+      <p1 x="240" y="40" />
+      <p2 x="260" y="40" />
+    </wire>
+    <wire>
+      <p1 x="840" y="520" />
+      <p2 x="860" y="520" />
+    </wire>
+    <wire>
+      <p1 x="640" y="300" />
+      <p2 x="660" y="300" />
+    </wire>
+    <wire>
+      <p1 x="800" y="140" />
+      <p2 x="840" y="140" />
+    </wire>
+    <wire>
+      <p1 x="160" y="140" />
+      <p2 x="220" y="140" />
+    </wire>
+    <wire>
+      <p1 x="840" y="140" />
+      <p2 x="860" y="140" />
+    </wire>
+    <wire>
+      <p1 x="860" y="460" />
+      <p2 x="880" y="460" />
+    </wire>
+    <wire>
+      <p1 x="240" y="80" />
+      <p2 x="320" y="80" />
+    </wire>
+    <wire>
+      <p1 x="340" y="80" />
+      <p2 x="380" y="80" />
+    </wire>
+    <wire>
+      <p1 x="460" y="80" />
+      <p2 x="600" y="80" />
+    </wire>
+    <wire>
+      <p1 x="260" y="560" />
+      <p2 x="280" y="560" />
+    </wire>
+    <wire>
+      <p1 x="720" y="180" />
+      <p2 x="740" y="180" />
+    </wire>
+    <wire>
+      <p1 x="240" y="180" />
+      <p2 x="280" y="180" />
+    </wire>
+    <wire>
+      <p1 x="380" y="180" />
+      <p2 x="400" y="180" />
+    </wire>
+    <wire>
+      <p1 x="880" y="180" />
+      <p2 x="900" y="180" />
+    </wire>
+    <wire>
+      <p1 x="280" y="180" />
+      <p2 x="320" y="180" />
+    </wire>
+    <wire>
+      <p1 x="640" y="340" />
+      <p2 x="660" y="340" />
+    </wire>
+    <wire>
+      <p1 x="160" y="340" />
+      <p2 x="280" y="340" />
+    </wire>
+    <wire>
+      <p1 x="460" y="340" />
+      <p2 x="480" y="340" />
+    </wire>
+    <wire>
+      <p1 x="280" y="340" />
+      <p2 x="420" y="340" />
+    </wire>
+    <wire>
+      <p1 x="260" y="500" />
+      <p2 x="280" y="500" />
+    </wire>
+    <wire>
+      <p1 x="160" y="280" />
+      <p2 x="180" y="280" />
+    </wire>
+    <wire>
+      <p1 x="600" y="280" />
+      <p2 x="660" y="280" />
+    </wire>
+    <wire>
+      <p1 x="720" y="120" />
+      <p2 x="740" y="120" />
+    </wire>
+    <wire>
+      <p1 x="280" y="120" />
+      <p2 x="320" y="120" />
+    </wire>
+    <wire>
+      <p1 x="900" y="120" />
+      <p2 x="920" y="120" />
+    </wire>
+    <wire>
+      <p1 x="840" y="600" />
+      <p2 x="880" y="600" />
+    </wire>
+    <wire>
+      <p1 x="460" y="60" />
+      <p2 x="620" y="60" />
+    </wire>
+    <wire>
+      <p1 x="860" y="540" />
+      <p2 x="880" y="540" />
+    </wire>
+    <wire>
+      <p1 x="480" y="160" />
+      <p2 x="480" y="180" />
+    </wire>
+    <wire>
+      <p1 x="260" y="100" />
+      <p2 x="260" y="160" />
+    </wire>
+    <wire>
+      <p1 x="900" y="120" />
+      <p2 x="900" y="140" />
+    </wire>
+    <wire>
+      <p1 x="840" y="100" />
+      <p2 x="840" y="140" />
+    </wire>
+    <wire>
+      <p1 x="620" y="60" />
+      <p2 x="620" y="100" />
+    </wire>
+    <wire>
+      <p1 x="240" y="40" />
+      <p2 x="240" y="80" />
+    </wire>
+    <wire>
+      <p1 x="240" y="80" />
+      <p2 x="240" y="140" />
+    </wire>
+    <wire>
+      <p1 x="880" y="160" />
+      <p2 x="880" y="180" />
+    </wire>
+    <wire>
+      <p1 x="280" y="120" />
+      <p2 x="280" y="180" />
+    </wire>
+    <wire>
+      <p1 x="280" y="340" />
+      <p2 x="280" y="360" />
+    </wire>
+    <wire>
+      <p1 x="440" y="140" />
+      <p2 x="440" y="160" />
+    </wire>
+    <wire>
+      <p1 x="440" y="160" />
+      <p2 x="440" y="300" />
+    </wire>
+    <wire>
+      <p1 x="600" y="80" />
+      <p2 x="600" y="280" />
+    </wire>
+    <wire>
+      <p1 x="760" y="280" />
+      <p2 x="760" y="320" />
+    </wire>
+    <wire>
+      <p1 x="380" y="80" />
+      <p2 x="380" y="100" />
+    </wire>
+    <wire>
+      <p1 x="860" y="520" />
+      <p2 x="860" y="540" />
+    </wire>
+    <wire>
+      <p1 x="860" y="260" />
+      <p2 x="860" y="300" />
+    </wire>
+  </wires>
+  <measurementOrdering />
+</circuit>
\ No newline at end of file