even yet more logic refactoring

diff --git a/electric/omegaCounter.jelib b/electric/omegaCounter.jelib
index 3661a3f..6ed1ab4 100644 (file)
--- a/electric/omegaCounter.jelib
+++ b/electric/omegaCounter.jelib
@@ -626,7 +626,7 @@ Edisable|disableLO|D5G2;X-2;Y-2;|pin@38||I
 X
 
 # Cell oneBit;1{sch}
-ConeBit;1{sch}||schematic|1242942044308|1248140073253|
+ConeBit;1{sch}||schematic|1242942044308|1248140109838|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||1.5|17.5||||
 NOff-Page|conn@1||-87|19.5|||RR|
@@ -638,7 +638,6 @@ IredFive:inv;1{ic}|inv@39||-57.5|23|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_
 IredFive:inv;1{ic}|inv@48||-17|21.5|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX2;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@49||-55.5|47.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@50||-49|49.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPY-2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@51||-71|8.5|||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:invLT;1{ic}|invLT@0||-45|18.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-4;Y-1.5;)S4|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nand2;1{ic}|nand2@1||-66.5|67.5|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-1.5;Y3;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nand2;1{ic}|nand2@2||-65|48.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX1;Y-2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
@@ -670,7 +669,6 @@ NWire_Pin|pin@564||-72|63.5||||
 NWire_Pin|pin@565||-72|63.5||||
 NWire_Pin|pin@575||-27.75|58||||
 NWire_Pin|pin@608||-72|50.5||||
-NWire_Pin|pin@622||-82|9||||
 NWire_Pin|pin@623||-82|19.5||||
 NWire_Pin|pin@627||-70|20.5||||
 NWire_Pin|pin@630||-82|72.5||||
@@ -719,16 +717,15 @@ NWire_Pin|pin@740||-59|66.5||||
 NWire_Pin|pin@741||-59|47.5||||
 NWire_Pin|pin@743||-52.5|23||||
 NWire_Pin|pin@747||-64|14.5||||
-NWire_Pin|pin@748||-81.5|8.5||||
 NWire_Pin|pin@749||-42.5|15.5||||
 NWire_Pin|pin@750||-42.5|16.5||||
-NWire_Pin|pin@751||-42.5|8.5||||
 NWire_Pin|pin@752||-69|62||||
 NWire_Pin|pin@753||-64|62||||
 NWire_Pin|pin@754||-61.5|62||||
 NWire_Pin|pin@755||-61.5|23||||
 NWire_Pin|pin@758||-63|42||||
 NWire_Pin|pin@759||-63|18.5||||
+NWire_Pin|pin@760||-52.5|15.5||||
 IpredCond;1{ic}|predCond@4||-9|61|||D5G4;|ATTR_X(D5G2;NPX0.75;Y-5.25;)S8
 IpredCond;1{ic}|predCond@7||-75|61|YRR||D5G4;|ATTR_X(D5G2;NPX2.25;Y-5.25;)S8
 IpredCond;2{ic}|predCond@10||-9|17.5|||D5G4;|ATTR_X(D5G2;NPX0.25;Y-5.25;)S8
@@ -752,7 +749,6 @@ Awire|net@1275|||0|conn@3|a|0|61|pin@312||-5|61
 Awire|net@1339|||1800|sucDri20@1|in|-72|50.5|pin@608||-72|50.5
 Awire|net@1370|||0|succCond@0|state|-76.5|19.5|pin@623||-82|19.5
 Awire|net@1371|||0|pin@623||-82|19.5|conn@1|a|-85|19.5
-Awire|net@1372|||2700|pin@622||-82|9|pin@623||-82|19.5
 Awire|net@1384|||0|pin@627||-70|20.5|succCond@0|cond|-71.5|20.5
 Awire|net@1393|||0|pin@631||-82|55|conn@2|y|-84|55
 Awire|net@1395|||900|pin@492||-2.5|73.5|pin@632||-2.5|33
@@ -821,13 +817,8 @@ Awire|net@1721|||900|pin@740||-59|66.5|pin@741||-59|47.5
 Awire|net@1722|||2700|pin@688||-43|41.5|pin@738||-43|49.5
 Awire|net@1724|||900|pin@736||-52.5|44|pin@743||-52.5|23
 Awire|net@1729|||0|pin@724||-64|14.5|pin@747||-64|14.5
-Awire|net@1730|||0|inv@51|in|-73.5|8.5|pin@748||-81.5|8.5
-Awire|net@1731|||3150|pin@748||-81.5|8.5|pin@622||-82|9
-Awire|net@1732|||1800|succCond@0|keep_down|-73.25|15.5|pin@749||-42.5|15.5
 Awire|net@1733|||2700|pin@749||-42.5|15.5|pin@750||-42.5|16.5
 Awire|net@1734|||0|predCond@10|cond|-12|16.5|pin@750||-42.5|16.5
-Awire|net@1735|||1800|inv@51|out|-68.5|8.5|pin@751||-42.5|8.5
-Awire|net@1736|||900|pin@749||-42.5|15.5|pin@751||-42.5|8.5
 Awire|net@1737|||1800|nand2@2|ina|-62.5|49.5|pin@737||-52.5|49.5
 Awire|net@1738|||1800|predCond@7|cond|-72|62|pin@752||-69|62
 Awire|net@1739|||0|pin@731||-64|62|pin@753||-64|62
@@ -841,6 +832,9 @@ Awire|net@1748|||1800|pin@668||-68.5|42|pin@758||-63|42
 Awire|net@1750|||1800|succCond@0|in|-71.5|18.5|pin@759||-63|18.5
 Awire|net@1751|||1800|pin@759||-63|18.5|invLT@0|out|-47.5|18.5
 Awire|net@1752|||900|pin@758||-63|42|pin@759||-63|18.5
+Awire|net@1753|||1800|succCond@0|keep_down|-73.25|15.5|pin@760||-52.5|15.5
+Awire|net@1754|||1800|pin@760||-52.5|15.5|pin@749||-42.5|15.5
+Awire|net@1755|||900|pin@743||-52.5|23|pin@760||-52.5|15.5
 ELSN[ZeroOrDone]||D5G2;X12.5;|conn@0|a|B
 ELSN[ZeroOrTwo]||D5G2;X13.5;|conn@3|a|B
 EMSN[ZeroOrDone]||D5G2;X13;|conn@1|a|B