From c0deb3f71c5babb4b61dfa625afef29123692d70 Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Sat, 2 Sep 2017 14:13:50 +0200
Subject: [PATCH] fixed 74160, 74161

---
 src/main/dig/lib/74xx/counter/74160.dig | 194 +++++++++++-------------
 src/main/dig/lib/74xx/counter/74161.dig |  84 +++++-----
 2 files changed, 129 insertions(+), 149 deletions(-)

diff --git a/src/main/dig/lib/74xx/counter/74160.dig b/src/main/dig/lib/74xx/counter/74160.dig
index 30621e1c1..c1c04f78c 100644
--- a/src/main/dig/lib/74xx/counter/74160.dig
+++ b/src/main/dig/lib/74xx/counter/74160.dig
@@ -50,7 +50,7 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>9</int>
+          <string>9</string>
         </entry>
         <entry>
           <string>Default</string>
@@ -82,14 +82,14 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>1</int>
+          <string>1</string>
         </entry>
         <entry>
           <string>Default</string>
           <int>1</int>
         </entry>
       </elementAttributes>
-      <pos x="700" y="260"/>
+      <pos x="700" y="220"/>
     </visualElement>
     <visualElement>
       <elementName>Clock</elementName>
@@ -104,7 +104,7 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>2</int>
+          <string>2</string>
         </entry>
       </elementAttributes>
       <pos x="240" y="340"/>
@@ -118,7 +118,7 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>15</int>
+          <string>15</string>
         </entry>
       </elementAttributes>
       <pos x="920" y="440"/>
@@ -137,7 +137,7 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>10</int>
+          <string>10</string>
         </entry>
       </elementAttributes>
       <pos x="240" y="460"/>
@@ -151,7 +151,7 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>7</int>
+          <string>7</string>
         </entry>
       </elementAttributes>
       <pos x="240" y="380"/>
@@ -180,10 +180,10 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>3</int>
+          <string>3</string>
         </entry>
       </elementAttributes>
-      <pos x="80" y="140"/>
+      <pos x="80" y="120"/>
     </visualElement>
     <visualElement>
       <elementName>Comparator</elementName>
@@ -245,7 +245,7 @@
           <string>1*4</string>
         </entry>
       </elementAttributes>
-      <pos x="840" y="120"/>
+      <pos x="860" y="120"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -256,10 +256,10 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>14</int>
+          <string>14</string>
         </entry>
       </elementAttributes>
-      <pos x="880" y="120"/>
+      <pos x="900" y="120"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -270,10 +270,10 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>13</int>
+          <string>13</string>
         </entry>
       </elementAttributes>
-      <pos x="1020" y="140"/>
+      <pos x="1040" y="140"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -284,10 +284,10 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>12</int>
+          <string>12</string>
         </entry>
       </elementAttributes>
-      <pos x="880" y="160"/>
+      <pos x="900" y="160"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -298,10 +298,10 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>11</int>
+          <string>11</string>
         </entry>
       </elementAttributes>
-      <pos x="1020" y="180"/>
+      <pos x="1040" y="180"/>
     </visualElement>
     <visualElement>
       <elementName>Splitter</elementName>
@@ -315,7 +315,7 @@
           <string>4</string>
         </entry>
       </elementAttributes>
-      <pos x="220" y="140"/>
+      <pos x="220" y="120"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -326,10 +326,10 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>4</int>
+          <string>4</string>
         </entry>
       </elementAttributes>
-      <pos x="200" y="160"/>
+      <pos x="200" y="140"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -340,10 +340,10 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>5</int>
+          <string>5</string>
         </entry>
       </elementAttributes>
-      <pos x="80" y="180"/>
+      <pos x="80" y="160"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -354,10 +354,10 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>6</int>
+          <string>6</string>
         </entry>
       </elementAttributes>
-      <pos x="200" y="200"/>
+      <pos x="200" y="180"/>
     </visualElement>
     <visualElement>
       <elementName>D_FF_AS</elementName>
@@ -366,18 +366,14 @@
           <string>Bits</string>
           <int>4</int>
         </entry>
-      </elementAttributes>
-      <pos x="720" y="120"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Not</elementName>
-      <elementAttributes>
         <entry>
-          <string>rotation</string>
-          <rotation rotation="1"/>
+          <string>inverterConfig</string>
+          <inverterConfig>
+            <string>Clr</string>
+          </inverterConfig>
         </entry>
       </elementAttributes>
-      <pos x="700" y="240"/>
+      <pos x="740" y="120"/>
     </visualElement>
     <visualElement>
       <elementName>Const</elementName>
@@ -387,7 +383,7 @@
           <int>0</int>
         </entry>
       </elementAttributes>
-      <pos x="700" y="120"/>
+      <pos x="720" y="120"/>
     </visualElement>
     <visualElement>
       <elementName>PowerSupply</elementName>
@@ -403,7 +399,7 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>16</int>
+          <string>16</string>
         </entry>
         <entry>
           <string>InDefault</string>
@@ -421,7 +417,7 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>8</int>
+          <string>8</string>
         </entry>
       </elementAttributes>
       <pos x="240" y="580"/>
@@ -430,11 +426,11 @@
   <wires>
     <wire>
       <p1 x="680" y="160"/>
-      <p2 x="720" y="160"/>
+      <p2 x="740" y="160"/>
     </wire>
     <wire>
-      <p1 x="860" y="160"/>
-      <p2 x="880" y="160"/>
+      <p1 x="880" y="160"/>
+      <p2 x="900" y="160"/>
     </wire>
     <wire>
       <p1 x="360" y="160"/>
@@ -449,7 +445,7 @@
       <p2 x="620" y="160"/>
     </wire>
     <wire>
-      <p1 x="200" y="160"/>
+      <p1 x="80" y="160"/>
       <p2 x="220" y="160"/>
     </wire>
     <wire>
@@ -473,24 +469,24 @@
       <p2 x="500" y="200"/>
     </wire>
     <wire>
-      <p1 x="200" y="200"/>
-      <p2 x="220" y="200"/>
-    </wire>
-    <wire>
-      <p1 x="240" y="140"/>
-      <p2 x="560" y="140"/>
-    </wire>
-    <wire>
-      <p1 x="660" y="140"/>
-      <p2 x="720" y="140"/>
-    </wire>
-    <wire>
-      <p1 x="80" y="140"/>
+      <p1 x="200" y="140"/>
       <p2 x="220" y="140"/>
     </wire>
     <wire>
-      <p1 x="860" y="140"/>
-      <p2 x="1020" y="140"/>
+      <p1 x="660" y="140"/>
+      <p2 x="740" y="140"/>
+    </wire>
+    <wire>
+      <p1 x="880" y="140"/>
+      <p2 x="1040" y="140"/>
+    </wire>
+    <wire>
+      <p1 x="280" y="140"/>
+      <p2 x="380" y="140"/>
+    </wire>
+    <wire>
+      <p1 x="380" y="140"/>
+      <p2 x="560" y="140"/>
     </wire>
     <wire>
       <p1 x="240" y="460"/>
@@ -502,19 +498,11 @@
     </wire>
     <wire>
       <p1 x="240" y="300"/>
-      <p2 x="580" y="300"/>
+      <p2 x="640" y="300"/>
     </wire>
     <wire>
       <p1 x="280" y="80"/>
-      <p2 x="380" y="80"/>
-    </wire>
-    <wire>
-      <p1 x="380" y="80"/>
-      <p2 x="600" y="80"/>
-    </wire>
-    <wire>
-      <p1 x="600" y="80"/>
-      <p2 x="800" y="80"/>
+      <p2 x="820" y="80"/>
     </wire>
     <wire>
       <p1 x="380" y="240"/>
@@ -530,12 +518,16 @@
     </wire>
     <wire>
       <p1 x="340" y="400"/>
-      <p2 x="640" y="400"/>
+      <p2 x="580" y="400"/>
     </wire>
     <wire>
       <p1 x="260" y="560"/>
       <p2 x="280" y="560"/>
     </wire>
+    <wire>
+      <p1 x="200" y="180"/>
+      <p2 x="220" y="180"/>
+    </wire>
     <wire>
       <p1 x="540" y="180"/>
       <p2 x="560" y="180"/>
@@ -545,12 +537,8 @@
       <p2 x="300" y="180"/>
     </wire>
     <wire>
-      <p1 x="80" y="180"/>
-      <p2 x="220" y="180"/>
-    </wire>
-    <wire>
-      <p1 x="860" y="180"/>
-      <p2 x="1020" y="180"/>
+      <p1 x="880" y="180"/>
+      <p2 x="1040" y="180"/>
     </wire>
     <wire>
       <p1 x="700" y="180"/>
@@ -561,24 +549,28 @@
       <p2 x="680" y="340"/>
     </wire>
     <wire>
-      <p1 x="600" y="120"/>
+      <p1 x="240" y="120"/>
       <p2 x="620" y="120"/>
     </wire>
     <wire>
-      <p1 x="780" y="120"/>
-      <p2 x="800" y="120"/>
-    </wire>
-    <wire>
-      <p1 x="860" y="120"/>
-      <p2 x="880" y="120"/>
-    </wire>
-    <wire>
-      <p1 x="700" y="120"/>
-      <p2 x="720" y="120"/>
+      <p1 x="80" y="120"/>
+      <p2 x="220" y="120"/>
     </wire>
     <wire>
       <p1 x="800" y="120"/>
-      <p2 x="840" y="120"/>
+      <p2 x="820" y="120"/>
+    </wire>
+    <wire>
+      <p1 x="880" y="120"/>
+      <p2 x="900" y="120"/>
+    </wire>
+    <wire>
+      <p1 x="720" y="120"/>
+      <p2 x="740" y="120"/>
+    </wire>
+    <wire>
+      <p1 x="820" y="120"/>
+      <p2 x="860" y="120"/>
     </wire>
     <wire>
       <p1 x="760" y="440"/>
@@ -598,11 +590,15 @@
     </wire>
     <wire>
       <p1 x="640" y="160"/>
-      <p2 x="640" y="400"/>
+      <p2 x="640" y="300"/>
     </wire>
     <wire>
-      <p1 x="800" y="80"/>
-      <p2 x="800" y="120"/>
+      <p1 x="580" y="180"/>
+      <p2 x="580" y="400"/>
+    </wire>
+    <wire>
+      <p1 x="820" y="80"/>
+      <p2 x="820" y="120"/>
     </wire>
     <wire>
       <p1 x="260" y="420"/>
@@ -612,26 +608,22 @@
       <p1 x="260" y="560"/>
       <p2 x="260" y="580"/>
     </wire>
-    <wire>
-      <p1 x="580" y="180"/>
-      <p2 x="580" y="300"/>
-    </wire>
-    <wire>
-      <p1 x="600" y="80"/>
-      <p2 x="600" y="120"/>
-    </wire>
     <wire>
       <p1 x="600" y="240"/>
       <p2 x="600" y="420"/>
     </wire>
     <wire>
       <p1 x="280" y="80"/>
-      <p2 x="280" y="160"/>
+      <p2 x="280" y="140"/>
     </wire>
     <wire>
       <p1 x="280" y="200"/>
       <p2 x="280" y="220"/>
     </wire>
+    <wire>
+      <p1 x="280" y="140"/>
+      <p2 x="280" y="160"/>
+    </wire>
     <wire>
       <p1 x="520" y="200"/>
       <p2 x="520" y="240"/>
@@ -641,16 +633,12 @@
       <p2 x="680" y="340"/>
     </wire>
     <wire>
-      <p1 x="380" y="80"/>
+      <p1 x="380" y="140"/>
       <p2 x="380" y="220"/>
     </wire>
     <wire>
       <p1 x="700" y="180"/>
-      <p2 x="700" y="200"/>
-    </wire>
-    <wire>
-      <p1 x="700" y="240"/>
-      <p2 x="700" y="260"/>
+      <p2 x="700" y="220"/>
     </wire>
   </wires>
 </circuit>
\ No newline at end of file
diff --git a/src/main/dig/lib/74xx/counter/74161.dig b/src/main/dig/lib/74xx/counter/74161.dig
index b06fc3f42..df72f29f2 100644
--- a/src/main/dig/lib/74xx/counter/74161.dig
+++ b/src/main/dig/lib/74xx/counter/74161.dig
@@ -89,7 +89,7 @@
           <int>1</int>
         </entry>
       </elementAttributes>
-      <pos x="600" y="280"/>
+      <pos x="600" y="240"/>
     </visualElement>
     <visualElement>
       <elementName>Clock</elementName>
@@ -179,7 +179,7 @@
           <int>0</int>
         </entry>
       </elementAttributes>
-      <pos x="600" y="140"/>
+      <pos x="620" y="140"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -263,7 +263,7 @@
           <string>1*4</string>
         </entry>
       </elementAttributes>
-      <pos x="720" y="140"/>
+      <pos x="740" y="140"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -277,7 +277,7 @@
           <string>14</string>
         </entry>
       </elementAttributes>
-      <pos x="760" y="140"/>
+      <pos x="780" y="140"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -291,7 +291,7 @@
           <string>13</string>
         </entry>
       </elementAttributes>
-      <pos x="900" y="160"/>
+      <pos x="920" y="160"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -305,7 +305,7 @@
           <string>12</string>
         </entry>
       </elementAttributes>
-      <pos x="760" y="180"/>
+      <pos x="780" y="180"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -319,7 +319,7 @@
           <string>11</string>
         </entry>
       </elementAttributes>
-      <pos x="900" y="200"/>
+      <pos x="920" y="200"/>
     </visualElement>
     <visualElement>
       <elementName>D_FF_AS</elementName>
@@ -328,18 +328,14 @@
           <string>Bits</string>
           <int>4</int>
         </entry>
-      </elementAttributes>
-      <pos x="620" y="140"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Not</elementName>
-      <elementAttributes>
         <entry>
-          <string>rotation</string>
-          <rotation rotation="1"/>
+          <string>inverterConfig</string>
+          <inverterConfig>
+            <string>Clr</string>
+          </inverterConfig>
         </entry>
       </elementAttributes>
-      <pos x="600" y="260"/>
+      <pos x="640" y="140"/>
     </visualElement>
     <visualElement>
       <elementName>PowerSupply</elementName>
@@ -382,11 +378,11 @@
   <wires>
     <wire>
       <p1 x="560" y="160"/>
-      <p2 x="620" y="160"/>
+      <p2 x="640" y="160"/>
     </wire>
     <wire>
-      <p1 x="740" y="160"/>
-      <p2 x="900" y="160"/>
+      <p1 x="760" y="160"/>
+      <p2 x="920" y="160"/>
     </wire>
     <wire>
       <p1 x="280" y="160"/>
@@ -402,7 +398,7 @@
     </wire>
     <wire>
       <p1 x="360" y="100"/>
-      <p2 x="700" y="100"/>
+      <p2 x="720" y="100"/>
     </wire>
     <wire>
       <p1 x="320" y="420"/>
@@ -425,8 +421,8 @@
       <p2 x="620" y="200"/>
     </wire>
     <wire>
-      <p1 x="740" y="200"/>
-      <p2 x="900" y="200"/>
+      <p1 x="760" y="200"/>
+      <p2 x="920" y="200"/>
     </wire>
     <wire>
       <p1 x="280" y="200"/>
@@ -440,22 +436,22 @@
       <p1 x="160" y="140"/>
       <p2 x="300" y="140"/>
     </wire>
-    <wire>
-      <p1 x="680" y="140"/>
-      <p2 x="700" y="140"/>
-    </wire>
-    <wire>
-      <p1 x="740" y="140"/>
-      <p2 x="760" y="140"/>
-    </wire>
-    <wire>
-      <p1 x="600" y="140"/>
-      <p2 x="620" y="140"/>
-    </wire>
     <wire>
       <p1 x="700" y="140"/>
       <p2 x="720" y="140"/>
     </wire>
+    <wire>
+      <p1 x="760" y="140"/>
+      <p2 x="780" y="140"/>
+    </wire>
+    <wire>
+      <p1 x="620" y="140"/>
+      <p2 x="640" y="140"/>
+    </wire>
+    <wire>
+      <p1 x="720" y="140"/>
+      <p2 x="740" y="140"/>
+    </wire>
     <wire>
       <p1 x="460" y="460"/>
       <p2 x="600" y="460"/>
@@ -481,12 +477,12 @@
       <p2 x="300" y="180"/>
     </wire>
     <wire>
-      <p1 x="740" y="180"/>
-      <p2 x="760" y="180"/>
+      <p1 x="760" y="180"/>
+      <p2 x="780" y="180"/>
     </wire>
     <wire>
       <p1 x="580" y="180"/>
-      <p2 x="620" y="180"/>
+      <p2 x="640" y="180"/>
     </wire>
     <wire>
       <p1 x="500" y="180"/>
@@ -524,6 +520,10 @@
       <p1 x="480" y="200"/>
       <p2 x="480" y="440"/>
     </wire>
+    <wire>
+      <p1 x="720" y="100"/>
+      <p2 x="720" y="140"/>
+    </wire>
     <wire>
       <p1 x="580" y="180"/>
       <p2 x="580" y="340"/>
@@ -548,22 +548,14 @@
       <p1 x="360" y="160"/>
       <p2 x="360" y="200"/>
     </wire>
-    <wire>
-      <p1 x="600" y="260"/>
-      <p2 x="600" y="280"/>
-    </wire>
     <wire>
       <p1 x="600" y="200"/>
-      <p2 x="600" y="220"/>
+      <p2 x="600" y="240"/>
     </wire>
     <wire>
       <p1 x="540" y="180"/>
       <p2 x="540" y="300"/>
     </wire>
-    <wire>
-      <p1 x="700" y="100"/>
-      <p2 x="700" y="140"/>
-    </wire>
     <wire>
       <p1 x="460" y="220"/>
       <p2 x="460" y="460"/>