From 05f88595c7ec5f1d0cb20069cfe9a186680d10a9 Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Fri, 24 Mar 2017 16:21:39 +0100
Subject: [PATCH] minor layout changes

---
 src/main/dig/cmos/d-ff.dig      |  16 ++--
 src/main/dig/cmos/d-sram-ff.dig | 140 ++++++++++++++++----------------
 2 files changed, 77 insertions(+), 79 deletions(-)

diff --git a/src/main/dig/cmos/d-ff.dig b/src/main/dig/cmos/d-ff.dig
index 1b02d6935..92169a5a0 100644
--- a/src/main/dig/cmos/d-ff.dig
+++ b/src/main/dig/cmos/d-ff.dig
@@ -185,7 +185,7 @@
       <p2 x="360" y="400"/>
     </wire>
     <wire>
-      <p1 x="340" y="340"/>
+      <p1 x="380" y="340"/>
       <p2 x="400" y="340"/>
     </wire>
     <wire>
@@ -222,7 +222,7 @@
     </wire>
     <wire>
       <p1 x="180" y="380"/>
-      <p2 x="340" y="380"/>
+      <p2 x="380" y="380"/>
     </wire>
     <wire>
       <p1 x="200" y="140"/>
@@ -324,10 +324,6 @@
       <p1 x="180" y="80"/>
       <p2 x="180" y="380"/>
     </wire>
-    <wire>
-      <p1 x="340" y="340"/>
-      <p2 x="340" y="380"/>
-    </wire>
     <wire>
       <p1 x="200" y="140"/>
       <p2 x="200" y="220"/>
@@ -353,8 +349,8 @@
       <p2 x="280" y="280"/>
     </wire>
     <wire>
-      <p1 x="460" y="220"/>
-      <p2 x="460" y="240"/>
+      <p1 x="380" y="340"/>
+      <p2 x="380" y="380"/>
     </wire>
     <wire>
       <p1 x="380" y="140"/>
@@ -364,5 +360,9 @@
       <p1 x="380" y="200"/>
       <p2 x="380" y="280"/>
     </wire>
+    <wire>
+      <p1 x="460" y="220"/>
+      <p2 x="460" y="240"/>
+    </wire>
   </wires>
 </circuit>
\ No newline at end of file
diff --git a/src/main/dig/cmos/d-sram-ff.dig b/src/main/dig/cmos/d-sram-ff.dig
index 27af4735f..b1d7f60e5 100644
--- a/src/main/dig/cmos/d-sram-ff.dig
+++ b/src/main/dig/cmos/d-sram-ff.dig
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <circuit>
   <version>1</version>
+  <attributes>
+    <entry>
+      <string>Description</string>
+      <string>D flip flop based on a SRAM cell.</string>
+    </entry>
+  </attributes>
   <visualElements>
     <visualElement>
       <elementName>In</elementName>
@@ -10,7 +16,7 @@
           <string>D</string>
         </entry>
       </elementAttributes>
-      <pos x="160" y="440"/>
+      <pos x="140" y="360"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -20,7 +26,7 @@
           <string>C</string>
         </entry>
       </elementAttributes>
-      <pos x="160" y="520"/>
+      <pos x="140" y="460"/>
     </visualElement>
     <visualElement>
       <elementName>NFET</elementName>
@@ -82,7 +88,7 @@
           </testData>
         </entry>
       </elementAttributes>
-      <pos x="460" y="360"/>
+      <pos x="460" y="420"/>
     </visualElement>
     <visualElement>
       <elementName>PullUp</elementName>
@@ -107,27 +113,27 @@
     <visualElement>
       <elementName>NFET</elementName>
       <elementAttributes/>
-      <pos x="260" y="460"/>
+      <pos x="260" y="400"/>
     </visualElement>
     <visualElement>
       <elementName>NFET</elementName>
       <elementAttributes/>
-      <pos x="360" y="460"/>
+      <pos x="360" y="420"/>
     </visualElement>
     <visualElement>
       <elementName>Ground</elementName>
       <elementAttributes/>
-      <pos x="280" y="540"/>
+      <pos x="280" y="480"/>
     </visualElement>
     <visualElement>
       <elementName>Ground</elementName>
       <elementAttributes/>
-      <pos x="380" y="540"/>
+      <pos x="380" y="480"/>
     </visualElement>
     <visualElement>
       <elementName>NFET</elementName>
       <elementAttributes/>
-      <pos x="360" y="400"/>
+      <pos x="360" y="320"/>
     </visualElement>
     <visualElement>
       <elementName>NFET</elementName>
@@ -137,52 +143,48 @@
     <visualElement>
       <elementName>NFET</elementName>
       <elementAttributes/>
-      <pos x="200" y="360"/>
+      <pos x="180" y="380"/>
     </visualElement>
     <visualElement>
       <elementName>PFET</elementName>
       <elementAttributes/>
-      <pos x="200" y="280"/>
+      <pos x="180" y="280"/>
     </visualElement>
     <visualElement>
       <elementName>Ground</elementName>
       <elementAttributes/>
-      <pos x="220" y="420"/>
+      <pos x="200" y="440"/>
     </visualElement>
     <visualElement>
       <elementName>VDD</elementName>
       <elementAttributes/>
-      <pos x="220" y="260"/>
+      <pos x="200" y="260"/>
     </visualElement>
   </visualElements>
   <wires>
-    <wire>
-      <p1 x="180" y="400"/>
-      <p2 x="200" y="400"/>
-    </wire>
     <wire>
       <p1 x="460" y="240"/>
       <p2 x="480" y="240"/>
     </wire>
     <wire>
-      <p1 x="220" y="340"/>
+      <p1 x="160" y="420"/>
+      <p2 x="180" y="420"/>
+    </wire>
+    <wire>
+      <p1 x="200" y="340"/>
       <p2 x="260" y="340"/>
     </wire>
     <wire>
-      <p1 x="340" y="500"/>
-      <p2 x="360" y="500"/>
+      <p1 x="240" y="440"/>
+      <p2 x="260" y="440"/>
     </wire>
     <wire>
-      <p1 x="240" y="500"/>
-      <p2 x="260" y="500"/>
+      <p1 x="140" y="360"/>
+      <p2 x="160" y="360"/>
     </wire>
     <wire>
-      <p1 x="160" y="440"/>
-      <p2 x="180" y="440"/>
-    </wire>
-    <wire>
-      <p1 x="180" y="440"/>
-      <p2 x="360" y="440"/>
+      <p1 x="160" y="360"/>
+      <p2 x="360" y="360"/>
     </wire>
     <wire>
       <p1 x="280" y="280"/>
@@ -193,8 +195,8 @@
       <p2 x="400" y="280"/>
     </wire>
     <wire>
-      <p1 x="180" y="280"/>
-      <p2 x="200" y="280"/>
+      <p1 x="160" y="280"/>
+      <p2 x="180" y="280"/>
     </wire>
     <wire>
       <p1 x="320" y="200"/>
@@ -205,12 +207,12 @@
       <p2 x="480" y="200"/>
     </wire>
     <wire>
-      <p1 x="160" y="520"/>
-      <p2 x="240" y="520"/>
+      <p1 x="140" y="460"/>
+      <p2 x="240" y="460"/>
     </wire>
     <wire>
-      <p1 x="240" y="520"/>
-      <p2 x="340" y="520"/>
+      <p1 x="240" y="460"/>
+      <p2 x="360" y="460"/>
     </wire>
     <wire>
       <p1 x="280" y="140"/>
@@ -245,8 +247,16 @@
       <p2 x="320" y="240"/>
     </wire>
     <wire>
-      <p1 x="240" y="500"/>
-      <p2 x="240" y="520"/>
+      <p1 x="240" y="440"/>
+      <p2 x="240" y="460"/>
+    </wire>
+    <wire>
+      <p1 x="160" y="280"/>
+      <p2 x="160" y="360"/>
+    </wire>
+    <wire>
+      <p1 x="160" y="360"/>
+      <p2 x="160" y="420"/>
     </wire>
     <wire>
       <p1 x="420" y="180"/>
@@ -265,24 +275,12 @@
       <p2 x="420" y="240"/>
     </wire>
     <wire>
-      <p1 x="340" y="500"/>
-      <p2 x="340" y="520"/>
-    </wire>
-    <wire>
-      <p1 x="180" y="280"/>
-      <p2 x="180" y="400"/>
-    </wire>
-    <wire>
-      <p1 x="180" y="400"/>
-      <p2 x="180" y="440"/>
-    </wire>
-    <wire>
-      <p1 x="280" y="500"/>
-      <p2 x="280" y="540"/>
+      <p1 x="280" y="440"/>
+      <p2 x="280" y="480"/>
     </wire>
     <wire>
       <p1 x="280" y="340"/>
-      <p2 x="280" y="460"/>
+      <p2 x="280" y="400"/>
     </wire>
     <wire>
       <p1 x="280" y="140"/>
@@ -296,17 +294,33 @@
       <p1 x="280" y="220"/>
       <p2 x="280" y="280"/>
     </wire>
+    <wire>
+      <p1 x="200" y="320"/>
+      <p2 x="200" y="340"/>
+    </wire>
+    <wire>
+      <p1 x="200" y="420"/>
+      <p2 x="200" y="440"/>
+    </wire>
+    <wire>
+      <p1 x="200" y="260"/>
+      <p2 x="200" y="280"/>
+    </wire>
+    <wire>
+      <p1 x="200" y="340"/>
+      <p2 x="200" y="380"/>
+    </wire>
     <wire>
       <p1 x="460" y="220"/>
       <p2 x="460" y="240"/>
     </wire>
     <wire>
-      <p1 x="380" y="500"/>
-      <p2 x="380" y="540"/>
+      <p1 x="380" y="460"/>
+      <p2 x="380" y="480"/>
     </wire>
     <wire>
-      <p1 x="380" y="440"/>
-      <p2 x="380" y="460"/>
+      <p1 x="380" y="360"/>
+      <p2 x="380" y="420"/>
     </wire>
     <wire>
       <p1 x="380" y="140"/>
@@ -318,23 +332,7 @@
     </wire>
     <wire>
       <p1 x="380" y="280"/>
-      <p2 x="380" y="400"/>
-    </wire>
-    <wire>
-      <p1 x="220" y="320"/>
-      <p2 x="220" y="340"/>
-    </wire>
-    <wire>
-      <p1 x="220" y="400"/>
-      <p2 x="220" y="420"/>
-    </wire>
-    <wire>
-      <p1 x="220" y="260"/>
-      <p2 x="220" y="280"/>
-    </wire>
-    <wire>
-      <p1 x="220" y="340"/>
-      <p2 x="220" y="360"/>
+      <p2 x="380" y="320"/>
     </wire>
   </wires>
 </circuit>
\ No newline at end of file