From 02cbabcd735e6367b87fa4401f7a5df89813a6f7 Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jans.tuomi@gmail.com>
Date: Fri, 3 Nov 2023 01:01:14 +0200
Subject: Add graphics mode selector

---
 digital/atk16.dig               | 371 ++++++++++++++++++++++++++++++++++------
 digital/atk16_graphics_mode.dig | 311 +++++++++++++++++++++++++++++++++
 digital/atk16_mem.dig           |   6 +-
 digital/atk16_ppu.dig           | 253 ++++++++++++++++-----------
 4 files changed, 789 insertions(+), 152 deletions(-)
 create mode 100644 digital/atk16_graphics_mode.dig

(limited to 'digital')

diff --git a/digital/atk16.dig b/digital/atk16.dig
index 1b9dcc5..323ef10 100644
--- a/digital/atk16.dig
+++ b/digital/atk16.dig
@@ -1223,11 +1223,6 @@
       </elementAttributes>
       <pos x="760" y="200"/>
     </visualElement>
-    <visualElement>
-      <elementName>Break</elementName>
-      <elementAttributes/>
-      <pos x="860" y="260"/>
-    </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
@@ -1267,11 +1262,6 @@
       </elementAttributes>
       <pos x="640" y="220"/>
     </visualElement>
-    <visualElement>
-      <elementName>atk16_ppu.dig</elementName>
-      <elementAttributes/>
-      <pos x="700" y="320"/>
-    </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
@@ -1402,12 +1392,122 @@
           <string>rotation</string>
           <rotation rotation="2"/>
         </entry>
+        <entry>
+          <string>NetName</string>
+          <string>MMIO_IE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="920" y="-40"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation reference="../../../../visualElement[26]/elementAttributes/entry/rotation"/>
+        </entry>
         <entry>
           <string>NetName</string>
           <string>CLK</string>
         </entry>
       </elementAttributes>
-      <pos x="700" y="340"/>
+      <pos x="940" y="-20"/>
+    </visualElement>
+    <visualElement>
+      <elementName>atk16_graphics_mode.dig</elementName>
+      <elementAttributes/>
+      <pos x="960" y="-100"/>
+    </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="940" y="-80"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>PCLK</string>
+        </entry>
+      </elementAttributes>
+      <pos x="700" y="280"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Probe</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>GRAPHICS MODE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1080" y="-100"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>GRMODE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1120" y="-60"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Multiplexer</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Selector Bits</string>
+          <int>2</int>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>8</int>
+        </entry>
+      </elementAttributes>
+      <pos x="980" y="460"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>GRMODE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="980" y="580"/>
+    </visualElement>
+    <visualElement>
+      <elementName>atk16_ppu.dig</elementName>
+      <elementAttributes/>
+      <pos x="680" y="500"/>
+    </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="680" y="520"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -1421,7 +1521,7 @@
           <string>MMIO_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="680" y="360"/>
+      <pos x="660" y="540"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -1435,7 +1535,7 @@
           <string>MMIO_S</string>
         </entry>
       </elementAttributes>
-      <pos x="680" y="420"/>
+      <pos x="660" y="600"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -1449,7 +1549,7 @@
           <string>MMIO_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="680" y="380"/>
+      <pos x="660" y="560"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -1463,7 +1563,78 @@
           <string>DBUS</string>
         </entry>
       </elementAttributes>
-      <pos x="680" y="400"/>
+      <pos x="660" y="580"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Splitter</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Input Splitting</string>
+          <string>2,2,2,1,1</string>
+        </entry>
+      </elementAttributes>
+      <pos x="840" y="500"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>PCLK</string>
+        </entry>
+      </elementAttributes>
+      <pos x="660" y="500"/>
+    </visualElement>
+    <visualElement>
+      <elementName>VGA</elementName>
+      <elementAttributes/>
+      <pos x="1100" y="500"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>PCLK</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1080" y="600"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Splitter</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Input Splitting</string>
+          <string>8</string>
+        </entry>
+        <entry>
+          <string>Output Splitting</string>
+          <string>2,2,2,1,1</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1060" y="500"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Const</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Value</string>
+          <long>0</long>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>8</int>
+        </entry>
+      </elementAttributes>
+      <pos x="940" y="460"/>
     </visualElement>
   </visualElements>
   <wires>
@@ -1499,10 +1670,6 @@
       <p1 x="-180" y="320"/>
       <p2 x="-160" y="320"/>
     </wire>
-    <wire>
-      <p1 x="680" y="320"/>
-      <p2 x="700" y="320"/>
-    </wire>
     <wire>
       <p1 x="260" y="320"/>
       <p2 x="280" y="320"/>
@@ -1527,14 +1694,26 @@
       <p1 x="0" y="260"/>
       <p2 x="80" y="260"/>
     </wire>
-    <wire>
-      <p1 x="840" y="260"/>
-      <p2 x="860" y="260"/>
-    </wire>
     <wire>
       <p1 x="260" y="260"/>
       <p2 x="280" y="260"/>
     </wire>
+    <wire>
+      <p1 x="980" y="580"/>
+      <p2 x="1000" y="580"/>
+    </wire>
+    <wire>
+      <p1 x="660" y="580"/>
+      <p2 x="680" y="580"/>
+    </wire>
+    <wire>
+      <p1 x="820" y="580"/>
+      <p2 x="840" y="580"/>
+    </wire>
+    <wire>
+      <p1 x="1080" y="580"/>
+      <p2 x="1100" y="580"/>
+    </wire>
     <wire>
       <p1 x="380" y="-200"/>
       <p2 x="400" y="-200"/>
@@ -1559,6 +1738,18 @@
       <p1 x="420" y="520"/>
       <p2 x="440" y="520"/>
     </wire>
+    <wire>
+      <p1 x="820" y="520"/>
+      <p2 x="840" y="520"/>
+    </wire>
+    <wire>
+      <p1 x="1080" y="520"/>
+      <p2 x="1100" y="520"/>
+    </wire>
+    <wire>
+      <p1 x="960" y="520"/>
+      <p2 x="980" y="520"/>
+    </wire>
     <wire>
       <p1 x="-160" y="200"/>
       <p2 x="-140" y="200"/>
@@ -1615,6 +1806,14 @@
       <p1 x="420" y="460"/>
       <p2 x="440" y="460"/>
     </wire>
+    <wire>
+      <p1 x="940" y="460"/>
+      <p2 x="960" y="460"/>
+    </wire>
+    <wire>
+      <p1 x="960" y="460"/>
+      <p2 x="980" y="460"/>
+    </wire>
     <wire>
       <p1 x="-420" y="-80"/>
       <p2 x="-280" y="-80"/>
@@ -1647,6 +1846,10 @@
       <p1 x="-480" y="-80"/>
       <p2 x="-460" y="-80"/>
     </wire>
+    <wire>
+      <p1 x="940" y="-80"/>
+      <p2 x="960" y="-80"/>
+    </wire>
     <wire>
       <p1 x="-280" y="-80"/>
       <p2 x="-260" y="-80"/>
@@ -1659,10 +1862,6 @@
       <p1 x="-180" y="400"/>
       <p2 x="-160" y="400"/>
     </wire>
-    <wire>
-      <p1 x="680" y="400"/>
-      <p2 x="700" y="400"/>
-    </wire>
     <wire>
       <p1 x="-140" y="80"/>
       <p2 x="200" y="80"/>
@@ -1687,6 +1886,10 @@
       <p1 x="600" y="-20"/>
       <p2 x="700" y="-20"/>
     </wire>
+    <wire>
+      <p1 x="940" y="-20"/>
+      <p2 x="960" y="-20"/>
+    </wire>
     <wire>
       <p1 x="320" y="-20"/>
       <p2 x="360" y="-20"/>
@@ -1731,6 +1934,18 @@
       <p1 x="340" y="280"/>
       <p2 x="360" y="280"/>
     </wire>
+    <wire>
+      <p1 x="680" y="280"/>
+      <p2 x="700" y="280"/>
+    </wire>
+    <wire>
+      <p1 x="660" y="600"/>
+      <p2 x="680" y="600"/>
+    </wire>
+    <wire>
+      <p1 x="1080" y="600"/>
+      <p2 x="1100" y="600"/>
+    </wire>
     <wire>
       <p1 x="-240" y="-220"/>
       <p2 x="-220" y="-220"/>
@@ -1763,6 +1978,18 @@
       <p1 x="420" y="540"/>
       <p2 x="440" y="540"/>
     </wire>
+    <wire>
+      <p1 x="660" y="540"/>
+      <p2 x="680" y="540"/>
+    </wire>
+    <wire>
+      <p1 x="820" y="540"/>
+      <p2 x="840" y="540"/>
+    </wire>
+    <wire>
+      <p1 x="1080" y="540"/>
+      <p2 x="1100" y="540"/>
+    </wire>
     <wire>
       <p1 x="-160" y="220"/>
       <p2 x="-140" y="220"/>
@@ -1785,10 +2012,6 @@
     </wire>
     <wire>
       <p1 x="820" y="220"/>
-      <p2 x="840" y="220"/>
-    </wire>
-    <wire>
-      <p1 x="840" y="220"/>
       <p2 x="860" y="220"/>
     </wire>
     <wire>
@@ -1807,6 +2030,10 @@
       <p1 x="420" y="480"/>
       <p2 x="440" y="480"/>
     </wire>
+    <wire>
+      <p1 x="960" y="480"/>
+      <p2 x="980" y="480"/>
+    </wire>
     <wire>
       <p1 x="20" y="-100"/>
       <p2 x="60" y="-100"/>
@@ -1843,6 +2070,10 @@
       <p1 x="200" y="-100"/>
       <p2 x="220" y="-100"/>
     </wire>
+    <wire>
+      <p1 x="680" y="-100"/>
+      <p2 x="960" y="-100"/>
+    </wire>
     <wire>
       <p1 x="420" y="420"/>
       <p2 x="440" y="420"/>
@@ -1851,10 +2082,6 @@
       <p1 x="-180" y="420"/>
       <p2 x="-160" y="420"/>
     </wire>
-    <wire>
-      <p1 x="680" y="420"/>
-      <p2 x="700" y="420"/>
-    </wire>
     <wire>
       <p1 x="40" y="-40"/>
       <p2 x="60" y="-40"/>
@@ -1879,6 +2106,10 @@
       <p1 x="660" y="-40"/>
       <p2 x="680" y="-40"/>
     </wire>
+    <wire>
+      <p1 x="920" y="-40"/>
+      <p2 x="960" y="-40"/>
+    </wire>
     <wire>
       <p1 x="420" y="360"/>
       <p2 x="440" y="360"/>
@@ -1887,10 +2118,6 @@
       <p1 x="-180" y="360"/>
       <p2 x="-160" y="360"/>
     </wire>
-    <wire>
-      <p1 x="680" y="360"/>
-      <p2 x="700" y="360"/>
-    </wire>
     <wire>
       <p1 x="420" y="300"/>
       <p2 x="440" y="300"/>
@@ -1935,6 +2162,18 @@
       <p1 x="360" y="560"/>
       <p2 x="400" y="560"/>
     </wire>
+    <wire>
+      <p1 x="660" y="560"/>
+      <p2 x="680" y="560"/>
+    </wire>
+    <wire>
+      <p1 x="820" y="560"/>
+      <p2 x="840" y="560"/>
+    </wire>
+    <wire>
+      <p1 x="1080" y="560"/>
+      <p2 x="1100" y="560"/>
+    </wire>
     <wire>
       <p1 x="-60" y="240"/>
       <p2 x="-20" y="240"/>
@@ -1995,6 +2234,26 @@
       <p1 x="420" y="500"/>
       <p2 x="440" y="500"/>
     </wire>
+    <wire>
+      <p1 x="660" y="500"/>
+      <p2 x="680" y="500"/>
+    </wire>
+    <wire>
+      <p1 x="820" y="500"/>
+      <p2 x="840" y="500"/>
+    </wire>
+    <wire>
+      <p1 x="1080" y="500"/>
+      <p2 x="1100" y="500"/>
+    </wire>
+    <wire>
+      <p1 x="1020" y="500"/>
+      <p2 x="1060" y="500"/>
+    </wire>
+    <wire>
+      <p1 x="860" y="500"/>
+      <p2 x="980" y="500"/>
+    </wire>
     <wire>
       <p1 x="220" y="-440"/>
       <p2 x="240" y="-440"/>
@@ -2015,6 +2274,14 @@
       <p1 x="-440" y="-60"/>
       <p2 x="-420" y="-60"/>
     </wire>
+    <wire>
+      <p1 x="1060" y="-60"/>
+      <p2 x="1080" y="-60"/>
+    </wire>
+    <wire>
+      <p1 x="1080" y="-60"/>
+      <p2 x="1120" y="-60"/>
+    </wire>
     <wire>
       <p1 x="-100" y="-60"/>
       <p2 x="60" y="-60"/>
@@ -2039,10 +2306,6 @@
       <p1 x="-180" y="380"/>
       <p2 x="-160" y="380"/>
     </wire>
-    <wire>
-      <p1 x="680" y="380"/>
-      <p2 x="700" y="380"/>
-    </wire>
     <wire>
       <p1 x="180" y="-320"/>
       <p2 x="240" y="-320"/>
@@ -2059,6 +2322,14 @@
       <p1 x="0" y="260"/>
       <p2 x="0" y="320"/>
     </wire>
+    <wire>
+      <p1 x="960" y="460"/>
+      <p2 x="960" y="480"/>
+    </wire>
+    <wire>
+      <p1 x="960" y="480"/>
+      <p2 x="960" y="520"/>
+    </wire>
     <wire>
       <p1 x="-580" y="-140"/>
       <p2 x="-580" y="-100"/>
@@ -2075,10 +2346,6 @@
       <p1 x="200" y="60"/>
       <p2 x="200" y="80"/>
     </wire>
-    <wire>
-      <p1 x="840" y="220"/>
-      <p2 x="840" y="260"/>
-    </wire>
     <wire>
       <p1 x="-140" y="-40"/>
       <p2 x="-140" y="80"/>
@@ -2173,12 +2440,16 @@
     </wire>
     <wire>
       <p1 x="680" y="220"/>
-      <p2 x="680" y="320"/>
+      <p2 x="680" y="280"/>
     </wire>
     <wire>
       <p1 x="360" y="280"/>
       <p2 x="360" y="560"/>
     </wire>
+    <wire>
+      <p1 x="1000" y="540"/>
+      <p2 x="1000" y="580"/>
+    </wire>
     <wire>
       <p1 x="300" y="-240"/>
       <p2 x="300" y="-140"/>
@@ -2203,6 +2474,10 @@
       <p1 x="180" y="-280"/>
       <p2 x="180" y="-240"/>
     </wire>
+    <wire>
+      <p1 x="1080" y="-100"/>
+      <p2 x="1080" y="-60"/>
+    </wire>
     <wire>
       <p1 x="-60" y="180"/>
       <p2 x="-60" y="240"/>
diff --git a/digital/atk16_graphics_mode.dig b/digital/atk16_graphics_mode.dig
new file mode 100644
index 0000000..2d05dd6
--- /dev/null
+++ b/digital/atk16_graphics_mode.dig
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="utf-8"?>
+<circuit>
+  <version>2</version>
+  <attributes>
+    <entry>
+      <string>romContent</string>
+      <romList>
+        <roms/>
+      </romList>
+    </entry>
+    <entry>
+      <string>Width</string>
+      <int>5</int>
+    </entry>
+  </attributes>
+  <visualElements>
+    <visualElement>
+      <elementName>In</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>DBUS</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>16</int>
+        </entry>
+      </elementAttributes>
+      <pos x="220" y="160"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>00 disabled
+01 text mode
+10 sprite mode
+11 undefined</string>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>MODE</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>2</int>
+        </entry>
+      </elementAttributes>
+      <pos x="700" y="160"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Register</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>GRAPHICS MODE</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>2</int>
+        </entry>
+      </elementAttributes>
+      <pos x="480" y="160"/>
+    </visualElement>
+    <visualElement>
+      <elementName>And</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Inputs</string>
+          <int>13</int>
+        </entry>
+      </elementAttributes>
+      <pos x="440" y="260"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Splitter</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Input Splitting</string>
+          <string>13</string>
+        </entry>
+        <entry>
+          <string>Output Splitting</string>
+          <string>1*13</string>
+        </entry>
+      </elementAttributes>
+      <pos x="400" y="260"/>
+    </visualElement>
+    <visualElement>
+      <elementName>And</elementName>
+      <elementAttributes/>
+      <pos x="560" y="380"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Splitter</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Input Splitting</string>
+          <string>16</string>
+        </entry>
+        <entry>
+          <string>Output Splitting</string>
+          <string>2,14</string>
+        </entry>
+      </elementAttributes>
+      <pos x="360" y="160"/>
+    </visualElement>
+    <visualElement>
+      <elementName>In</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>MMIO_S</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>13</int>
+        </entry>
+      </elementAttributes>
+      <pos x="220" y="280"/>
+    </visualElement>
+    <visualElement>
+      <elementName>In</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>MMIO_IE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="220" y="560"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Const</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Value</string>
+          <long>2</long>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>13</int>
+        </entry>
+      </elementAttributes>
+      <pos x="260" y="320"/>
+    </visualElement>
+    <visualElement>
+      <elementName>XNOr</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Bits</string>
+          <int>13</int>
+        </entry>
+      </elementAttributes>
+      <pos x="280" y="280"/>
+    </visualElement>
+    <visualElement>
+      <elementName>In</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>CLK</string>
+        </entry>
+      </elementAttributes>
+      <pos x="220" y="220"/>
+    </visualElement>
+  </visualElements>
+  <wires>
+    <wire>
+      <p1 x="380" y="160"/>
+      <p2 x="480" y="160"/>
+    </wire>
+    <wire>
+      <p1 x="220" y="160"/>
+      <p2 x="360" y="160"/>
+    </wire>
+    <wire>
+      <p1 x="620" y="160"/>
+      <p2 x="700" y="160"/>
+    </wire>
+    <wire>
+      <p1 x="420" y="320"/>
+      <p2 x="440" y="320"/>
+    </wire>
+    <wire>
+      <p1 x="260" y="320"/>
+      <p2 x="280" y="320"/>
+    </wire>
+    <wire>
+      <p1 x="420" y="480"/>
+      <p2 x="440" y="480"/>
+    </wire>
+    <wire>
+      <p1 x="420" y="260"/>
+      <p2 x="440" y="260"/>
+    </wire>
+    <wire>
+      <p1 x="460" y="260"/>
+      <p2 x="640" y="260"/>
+    </wire>
+    <wire>
+      <p1 x="380" y="260"/>
+      <p2 x="400" y="260"/>
+    </wire>
+    <wire>
+      <p1 x="420" y="420"/>
+      <p2 x="440" y="420"/>
+    </wire>
+    <wire>
+      <p1 x="540" y="420"/>
+      <p2 x="560" y="420"/>
+    </wire>
+    <wire>
+      <p1 x="460" y="200"/>
+      <p2 x="480" y="200"/>
+    </wire>
+    <wire>
+      <p1 x="420" y="360"/>
+      <p2 x="440" y="360"/>
+    </wire>
+    <wire>
+      <p1 x="420" y="460"/>
+      <p2 x="440" y="460"/>
+    </wire>
+    <wire>
+      <p1 x="420" y="300"/>
+      <p2 x="440" y="300"/>
+    </wire>
+    <wire>
+      <p1 x="360" y="300"/>
+      <p2 x="380" y="300"/>
+    </wire>
+    <wire>
+      <p1 x="420" y="400"/>
+      <p2 x="440" y="400"/>
+    </wire>
+    <wire>
+      <p1 x="620" y="400"/>
+      <p2 x="640" y="400"/>
+    </wire>
+    <wire>
+      <p1 x="220" y="560"/>
+      <p2 x="540" y="560"/>
+    </wire>
+    <wire>
+      <p1 x="420" y="500"/>
+      <p2 x="440" y="500"/>
+    </wire>
+    <wire>
+      <p1 x="420" y="340"/>
+      <p2 x="440" y="340"/>
+    </wire>
+    <wire>
+      <p1 x="540" y="180"/>
+      <p2 x="620" y="180"/>
+    </wire>
+    <wire>
+      <p1 x="440" y="180"/>
+      <p2 x="480" y="180"/>
+    </wire>
+    <wire>
+      <p1 x="420" y="440"/>
+      <p2 x="440" y="440"/>
+    </wire>
+    <wire>
+      <p1 x="420" y="280"/>
+      <p2 x="440" y="280"/>
+    </wire>
+    <wire>
+      <p1 x="220" y="280"/>
+      <p2 x="280" y="280"/>
+    </wire>
+    <wire>
+      <p1 x="420" y="380"/>
+      <p2 x="440" y="380"/>
+    </wire>
+    <wire>
+      <p1 x="500" y="380"/>
+      <p2 x="560" y="380"/>
+    </wire>
+    <wire>
+      <p1 x="220" y="220"/>
+      <p2 x="440" y="220"/>
+    </wire>
+    <wire>
+      <p1 x="640" y="260"/>
+      <p2 x="640" y="400"/>
+    </wire>
+    <wire>
+      <p1 x="440" y="180"/>
+      <p2 x="440" y="220"/>
+    </wire>
+    <wire>
+      <p1 x="460" y="200"/>
+      <p2 x="460" y="260"/>
+    </wire>
+    <wire>
+      <p1 x="380" y="260"/>
+      <p2 x="380" y="300"/>
+    </wire>
+    <wire>
+      <p1 x="620" y="160"/>
+      <p2 x="620" y="180"/>
+    </wire>
+    <wire>
+      <p1 x="540" y="420"/>
+      <p2 x="540" y="560"/>
+    </wire>
+  </wires>
+  <measurementOrdering/>
+</circuit>
\ No newline at end of file
diff --git a/digital/atk16_mem.dig b/digital/atk16_mem.dig
index a3d8b5e..4c1db35 100644
--- a/digital/atk16_mem.dig
+++ b/digital/atk16_mem.dig
@@ -35,9 +35,9 @@
         </entry>
         <entry>
           <string>Data</string>
-          <data>4014,2a00,6026,13*8000,1a,18,18,18,8000,0,e000,e001,4855,f000
-,3140,1b48,3148,1b48,4017,2000,2000,4216,2240,3040,1b49,2340,1b49
-,2140,e000,61ff</data>
+          <data>4014,2a00,4017,2000,4200,3008,6022,9*8000,1a,18,18,18,8000,e000
+,e001,e002,4855,f000,3140,1b48,3148,1b48,4016,2000,2000,4215,2240
+,3040,1b49,2340,1b49,2140,e000,4017,2000,4201,3008,61ff</data>
         </entry>
       </elementAttributes>
       <pos x="740" y="100"/>
diff --git a/digital/atk16_ppu.dig b/digital/atk16_ppu.dig
index d9064dd..c2cbdba 100644
--- a/digital/atk16_ppu.dig
+++ b/digital/atk16_ppu.dig
@@ -553,95 +553,6 @@ sprite mem, starting from 0x0800</string>
       <elementAttributes/>
       <pos x="640" y="340"/>
     </visualElement>
-    <visualElement>
-      <elementName>VGA</elementName>
-      <elementAttributes/>
-      <pos x="-100" y="540"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>PCLK</string>
-        </entry>
-      </elementAttributes>
-      <pos x="-120" y="640"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>HSYNC</string>
-        </entry>
-      </elementAttributes>
-      <pos x="-100" y="600"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>VSYNC</string>
-        </entry>
-      </elementAttributes>
-      <pos x="-100" y="620"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>PR</string>
-        </entry>
-      </elementAttributes>
-      <pos x="-120" y="540"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>PG</string>
-        </entry>
-      </elementAttributes>
-      <pos x="-120" y="560"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>PB</string>
-        </entry>
-      </elementAttributes>
-      <pos x="-120" y="580"/>
-    </visualElement>
     <visualElement>
       <elementName>Const</elementName>
       <elementAttributes>
@@ -991,6 +902,142 @@ sprite mem, starting from 0x0800</string>
       </elementAttributes>
       <pos x="160" y="-40"/>
     </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>PR</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>2</int>
+        </entry>
+      </elementAttributes>
+      <pos x="600" y="-260"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>PG</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>2</int>
+        </entry>
+      </elementAttributes>
+      <pos x="600" y="-220"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>PB</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>2</int>
+        </entry>
+      </elementAttributes>
+      <pos x="600" y="-180"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>HSYNC</string>
+        </entry>
+      </elementAttributes>
+      <pos x="600" y="-140"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>VSYNC</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>2</int>
+        </entry>
+      </elementAttributes>
+      <pos x="600" y="-100"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>PB</string>
+        </entry>
+      </elementAttributes>
+      <pos x="580" y="-180"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>PR</string>
+        </entry>
+      </elementAttributes>
+      <pos x="580" y="-260"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>PG</string>
+        </entry>
+      </elementAttributes>
+      <pos x="580" y="-220"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>HSYNC</string>
+        </entry>
+      </elementAttributes>
+      <pos x="580" y="-140"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>VSYNC</string>
+        </entry>
+      </elementAttributes>
+      <pos x="580" y="-100"/>
+    </visualElement>
   </visualElements>
   <wires>
     <wire>
@@ -1026,12 +1073,8 @@ sprite mem, starting from 0x0800</string>
       <p2 x="540" y="320"/>
     </wire>
     <wire>
-      <p1 x="-120" y="640"/>
-      <p2 x="-100" y="640"/>
-    </wire>
-    <wire>
-      <p1 x="-120" y="580"/>
-      <p2 x="-100" y="580"/>
+      <p1 x="580" y="-260"/>
+      <p2 x="600" y="-260"/>
     </wire>
     <wire>
       <p1 x="200" y="-200"/>
@@ -1057,6 +1100,10 @@ sprite mem, starting from 0x0800</string>
       <p1 x="0" y="-140"/>
       <p2 x="80" y="-140"/>
     </wire>
+    <wire>
+      <p1 x="580" y="-140"/>
+      <p2 x="600" y="-140"/>
+    </wire>
     <wire>
       <p1 x="160" y="-140"/>
       <p2 x="180" y="-140"/>
@@ -1134,8 +1181,8 @@ sprite mem, starting from 0x0800</string>
       <p2 x="420" y="280"/>
     </wire>
     <wire>
-      <p1 x="-120" y="540"/>
-      <p2 x="-100" y="540"/>
+      <p1 x="580" y="-220"/>
+      <p2 x="600" y="-220"/>
     </wire>
     <wire>
       <p1 x="200" y="-160"/>
@@ -1177,6 +1224,10 @@ sprite mem, starting from 0x0800</string>
       <p1 x="-80" y="-100"/>
       <p2 x="-60" y="-100"/>
     </wire>
+    <wire>
+      <p1 x="580" y="-100"/>
+      <p2 x="600" y="-100"/>
+    </wire>
     <wire>
       <p1 x="600" y="100"/>
       <p2 x="620" y="100"/>
@@ -1241,10 +1292,6 @@ sprite mem, starting from 0x0800</string>
       <p1 x="260" y="300"/>
       <p2 x="340" y="300"/>
     </wire>
-    <wire>
-      <p1 x="-120" y="560"/>
-      <p2 x="-100" y="560"/>
-    </wire>
     <wire>
       <p1 x="60" y="-180"/>
       <p2 x="80" y="-180"/>
@@ -1253,6 +1300,10 @@ sprite mem, starting from 0x0800</string>
       <p1 x="200" y="-180"/>
       <p2 x="260" y="-180"/>
     </wire>
+    <wire>
+      <p1 x="580" y="-180"/>
+      <p2 x="600" y="-180"/>
+    </wire>
     <wire>
       <p1 x="520" y="180"/>
       <p2 x="540" y="180"/>
-- 
cgit v1.3