From: Adam Megacz <adam.megacz@sun.com>
Date: Fri, 17 Jul 2009 03:24:49 +0000 (+0000)
Subject: still works
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=5de1d456ea79e9b6621f6005186801a2bb11944a;p=fleet.git

still works
---

diff --git a/electric/omegaCounter.jelib b/electric/omegaCounter.jelib
index f115047..e2d70c9 100644
--- a/electric/omegaCounter.jelib
+++ b/electric/omegaCounter.jelib
@@ -454,7 +454,7 @@ Enot_load_zero||D5G2;X-5.5;Y-0.5;|pin@31||I
 X
 
 # Cell oneBit;1{sch}
-ConeBit;1{sch}||schematic|1242942044308|1247800907912|
+ConeBit;1{sch}||schematic|1242942044308|1247801080323|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||-1.5|19||||
 NOff-Page|conn@1||-84|21|||RR|
@@ -477,6 +477,7 @@ IredFive:inv;1{ic}|inv@15||-18|43.5|X||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR
 IredFive:inv;1{ic}|inv@16||-18.5|28|X||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y4.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@17||-46.5|61.5|XRR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y4.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nand2;1{ic}|nand2@0||-18|52.5|RR||D5G4;|ATTR_Delay(D5G1;NPX2.5;Y-3;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX2.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:nand2;1{ic}|nand2@1||-57.5|66|||D5G4;|ATTR_Delay(D5G1;NPX2.5;Y-3;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX2.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nms1;2{ic}|nms1@0||-9.5|5|||D5G4;|ATTR_Delay(D5G1;NPX3.75;Y-0.25;)I100|ATTR_X(D5FLeave alone;G1.5;NPX-5;Y-3.25;)S8
 IredFive:nms1;2{ic}|nms1@1||-9.5|48|X||D5G4;|ATTR_Delay(D5G1;NPX-2.75;Y-1.25;)I100|ATTR_X(D5FLeave alone;G1.5;NPX-1.5;Y2.75;)S8
 IredFive:nor2n;1{ic}|nor2n@0||-60|-5.5|R||D5G4;|ATTR_Delay(D5G1;NPX2.5;Y-3;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX2.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
@@ -566,6 +567,10 @@ NWire_Pin|pin@490||-42.5|66||||
 NWire_Pin|pin@491||-14|53.5||||
 NWire_Pin|pin@492||-13|51.5||||
 NWire_Pin|pin@493||-13|19||||
+NWire_Pin|pin@495||-66|67||||
+NWire_Pin|pin@496||-66|50.5||||
+NWire_Pin|pin@497||-62.5|35||||
+NWire_Pin|pin@498||-62.5|65||||
 IredFive:pms1;2{ic}|pms1@0||-9.5|68|||D5G4;|ATTR_Delay(D5G1;NPX-2;Y-1.5;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX3.25;Y1;)S8
 IredFive:pms1;2{ic}|pms1@1||-9.5|30|X||D5G4;|ATTR_Delay(D5G1;NPX-2;Y-1.5;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX-2.75;Y3;)S8
 IpredCondMSC;1{ic}|predCond@3||-18|19|||D5G4;
@@ -656,7 +661,6 @@ Awire|net@987|||1800|pin@472||-44.5|35|pin@376||-39|35
 Awire|net@988|||2700|pin@471||-44.5|17.5|pin@472||-44.5|35
 Awire|net@989|||0|inv@14|in|-56.5|57.5|pin@473||-59|57.5
 Awire|net@990|||0|pin@293||-53|50.5|pin@474||-59|50.5
-Awire|net@991|||0|pin@474||-59|50.5|pin@418||-70.5|50.5
 Awire|net@992|||900|pin@473||-59|57.5|pin@474||-59|50.5
 Awire|net@993|||1800|inv@14|out|-51.5|57.5|pin@475||-45.5|57.5
 Awire|net@994|||900|pin@475||-45.5|57.5|pin@476||-45.5|54
@@ -670,7 +674,6 @@ Awire|net@1003|||1800|inv@15|in|-15.5|43.5|pin@479||-14|43.5
 Awire|net@1004|||0|inv@15|out|-20.5|43.5|pin@480||-22.5|43.5
 Awire|net@1006|||0|pin@481||-22.5|41|fire@0|NotLSN[ZeroOrOne]|-23.5|41
 Awire|net@1007|||900|pin@480||-22.5|43.5|pin@481||-22.5|41
-Awire|net@1008|||2700|pin@480||-22.5|43.5|pin@482||-22.5|58.5
 Awire|net@1009|||0|predCond@4|not_state|-18.5|58.5|pin@482||-22.5|58.5
 Awire|net@1010|||0|inv@16|out|-21|28|pin@483||-22|28
 Awire|net@1012|||0|pin@484||-22|35|fire@0|NotLSN[ZeroOrDone]|-23.5|35
@@ -694,6 +697,14 @@ Awire|net@1029|||1800|nand2@0|inb|-15.5|51.5|pin@492||-13|51.5
 Awire|net@1030|||1800|pin@308||-14|19|pin@493||-13|19
 Awire|net@1031|||1800|pin@493||-13|19|pin@369||-9.5|19
 Awire|net@1032|||900|pin@492||-13|51.5|pin@493||-13|19
+Awire|net@1036|||2700|pin@480||-22.5|43.5|pin@482||-22.5|58.5
+Awire|net@1037|||0|nand2@1|inb|-60|67|pin@495||-66|67
+Awire|net@1038|||0|pin@474||-59|50.5|pin@496||-66|50.5
+Awire|net@1039|||0|pin@496||-66|50.5|pin@418||-70.5|50.5
+Awire|net@1040|||900|pin@495||-66|67|pin@496||-66|50.5
+Awire|net@1041|||0|pin@472||-44.5|35|pin@497||-62.5|35
+Awire|net@1042|||2700|pin@497||-62.5|35|pin@498||-62.5|65
+Awire|net@1043|||1800|pin@498||-62.5|65|nand2@1|ina|-60|65
 Awire|not_load_zero|D5G2;X-3.5;||0|pms1@0|g|-12.5|68|pin@368||-20|68
 Awire|not_load_zero|D5G2;X7;||1800|pms1@1|g|-6.5|30|pin@370||2|30
 Esucc[OneOrTwo]|LSN[ZeroOrDone]|D5G2;X12.5;|conn@0|a|B