projects / fleet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d9f0a96)
works
authorAdam Megacz <adam.megacz@sun.com>
Thu, 23 Jul 2009 03:26:51 +0000 (03:26 +0000)
committerAdam Megacz <adam.megacz@sun.com>
Thu, 23 Jul 2009 03:26:51 +0000 (03:26 +0000)
electric/omegaCounter.jelib patch | blob | history

diff --git a/electric/omegaCounter.jelib b/electric/omegaCounter.jelib
index 59c7ab7..b575844 100644 (file)
--- a/electric/omegaCounter.jelib
+++ b/electric/omegaCounter.jelib
@@ -152,79 +152,81 @@ EfireHI||D5G1;RX1.5;|pin@16||O
 X
 
 # Cell fire;3{ic}
-Cfire;3{ic}||artwork|1247529105994|1248131451191|E|ATTR_X(D5G1;HNOLP)S20
+Cfire;3{ic}||artwork|1247529105994|1248214224908|E|ATTR_X(D5G1;HNOLPX-6.25;Y4.25;)S20
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NThick-Circle|art@11||2.5|0|4|4|||ART_color()I10|ART_degrees()F[0.0,3.1415927]
-NThick-Circle|art@18||0.25|3|4.5|4|||ART_color()I10|ART_degrees()F[0.0,3.1415927]
-NThick-Circle|art@19||-0.75|-1|1|1|R||ART_color()I10
-NThick-Circle|art@20||0.25|-1|8|7|YRR||ART_color()I10|ART_degrees()F[0.0,1.0471976]
-NThick-Circle|art@21||-3.75|-1|8|7|||ART_color()I10|ART_degrees()F[0.0,1.0471976]
-NThick-Circle|art@22||-1.75|-3.25|6|6|500||ART_color()I10|ART_degrees()I800
-NThick-Circle|art@23||-2.75|-1|1|1|R||ART_color()I10
-Nschematic:Bus_Pin|pin@4||-0.75|-2.5||||
-Nschematic:Bus_Pin|pin@6||-2.75|-2.5||||
+NThick-Circle|art@18||0.25|5|4.5|4|||ART_color()I10|ART_degrees()F[0.0,3.1415927]
+NThick-Circle|art@19||-0.75|1|1|1|R||ART_color()I10
+NThick-Circle|art@20||0.25|1|8|7|YRR||ART_color()I10|ART_degrees()F[0.0,1.0471976]
+NThick-Circle|art@21||-3.75|1|8|7|||ART_color()I10|ART_degrees()F[0.0,1.0471976]
+NThick-Circle|art@22||-1.75|-1.25|6|6|500||ART_color()I10|ART_degrees()I800
+NThick-Circle|art@23||-2.75|1|1|1|R||ART_color()I10
+NThick-Circle|art@24||2.5|2.5|1|1|R||ART_color()I10
+NThick-Circle|art@25||2.5|3.5|1|1|R||ART_color()I10
+Nschematic:Bus_Pin|pin@4||-0.75|-0.5||||
+Nschematic:Bus_Pin|pin@6||-2.75|-0.5||||
 Nschematic:Bus_Pin|pin@10||1|-2|||X|
-Nschematic:Bus_Pin|pin@16||0.25|6|||R|
-Nschematic:Bus_Pin|pin@40||4|-2||||
-Nschematic:Wire_Pin|pin@41||4|-2||||
-Nschematic:Bus_Pin|pin@57||4|-2|-2|-2|R|
+Nschematic:Bus_Pin|pin@16||0.25|8|||R|
+Nschematic:Bus_Pin|pin@40||4|-2.75||||
+Nschematic:Wire_Pin|pin@41||4|-2.75||||
+Nschematic:Bus_Pin|pin@57||4|-2.75|-2|-2|R|
 NPin|pin@58||4|-1|1|1|R|
-NPin|pin@59||4|-2|||R|
-Nschematic:Bus_Pin|pin@60||2.5|-2|-2|-2|R|
-NPin|pin@62||2.5|-2|||R|
+NPin|pin@59||4|-2.75|||R|
+Nschematic:Bus_Pin|pin@60||2.5|-2.75|-2|-2|R|
+NPin|pin@62||2.5|-2.75|||R|
 NPin|pin@63||2.5|-1|1|1|R|
 NPin|pin@66||1|-1|1|1|R|
-NPin|pin@67||1|-2|||R|
-Nschematic:Wire_Pin|pin@68||2.5|-2||||
+NPin|pin@67||1|-2.75|||R|
+Nschematic:Wire_Pin|pin@68||2.5|-2.75||||
 NPin|pin@72||3.25|-1|1|1|R|
 NPin|pin@73||4.5|0.25|1|1|R|
 NPin|pin@74||4.5|0|1|1|R|
 NPin|pin@75||4.5|-1|1|1|R|
 NPin|pin@76||0.5|-1|1|1|R|
 NPin|pin@79||0.5|0|1|1|R|
-Nschematic:Bus_Pin|pin@82||2|2|-2|-2|R|
-Nschematic:Bus_Pin|pin@85||0|2|-2|-2|R|
-NPin|pin@91||-2.75|-1.5|1|1|R|
-NPin|pin@92||-2.75|-2.5|||R|
-Nschematic:Bus_Pin|pin@93||-1.5|-2.5|-2|-2|R|
+Nschematic:Bus_Pin|pin@82||2|4|-2|-2|R|
+Nschematic:Bus_Pin|pin@85||0|4|-2|-2|R|
+NPin|pin@91||-2.75|0.5|1|1|R|
+NPin|pin@92||-2.75|-0.5|||R|
+Nschematic:Bus_Pin|pin@93||-1.5|-0.5|-2|-2|R|
 Nschematic:Bus_Pin|pin@99||-5.5|-4|-2|-2|R|
-Nschematic:Bus_Pin|pin@100||-3.5|-2.5|-2|-2|R|
-NPin|pin@102||-0.75|-2.5|||R|
-NPin|pin@103||-0.75|-1.5|1|1|R|
-NPin|pin@104||1.25|2|1|1|R|
-NPin|pin@105||2.5|3.25|1|1|R|
-NPin|pin@106||2.5|3|1|1|R|
-NPin|pin@107||2.5|2|1|1|R|
-NPin|pin@108||-2|2|1|1|R|
-NPin|pin@109||-2|3|1|1|R|
-Nschematic:Bus_Pin|pin@110||0|5|-2|-2|R|
-Nschematic:Bus_Pin|pin@111||1.5|6|-2|-2|R|
-NPin|pin@112||0.25|6|1|1|R|
-NPin|pin@113||0.25|5|||R|
-NPin|pin@117||-0.7|-0.5|1|1|R|
-NPin|pin@118||0|0.25|1|1|R|
-Nschematic:Bus_Pin|pin@123||-1.25|2.75|-2|-2|R|
-Aschematic:wire|net@15|||2700|pin@41||4|-2|pin@40||4|-2
-AThicker|net@23|||FS900|pin@58||4|-1|pin@59||4|-2|ART_color()I10
-AThicker|net@24|||FS900|pin@63||2.5|-1|pin@62||2.5|-2|ART_color()I10
-AThicker|net@26|||FS900|pin@66||1|-1|pin@67||1|-2|ART_color()I10
+Nschematic:Bus_Pin|pin@100||-3.5|-0.5|-2|-2|R|
+NPin|pin@102||-0.75|-0.5|||R|
+NPin|pin@103||-0.75|0.5|1|1|R|
+NPin|pin@104||1.25|4|1|1|R|
+NPin|pin@105||2.5|5.25|1|1|R|
+NPin|pin@106||2.5|5|1|1|R|
+NPin|pin@107||2.5|4|1|1|R|
+NPin|pin@108||-2|4|1|1|R|
+NPin|pin@109||-2|5|1|1|R|
+Nschematic:Bus_Pin|pin@110||0|7|-2|-2|R|
+Nschematic:Bus_Pin|pin@111||1.5|8|-2|-2|R|
+NPin|pin@112||0.25|8|1|1|R|
+NPin|pin@113||0.25|7|||R|
+NPin|pin@117||-0.7|1.5|1|1|R|
+NPin|pin@118||0|2.25|1|1|R|
+Nschematic:Bus_Pin|pin@123||-1.25|4.75|-2|-2|R|
+Aschematic:wire|net@15|||2700|pin@41||4|-2.75|pin@40||4|-2.75
+AThicker|net@23|||FS900|pin@58||4|-1|pin@59||4|-2.75|ART_color()I10
+AThicker|net@24|||FS900|pin@63||2.5|-1|pin@62||2.5|-2.75|ART_color()I10
+AThicker|net@26|||FS900|pin@66||1|-1|pin@67||1|-2.75|ART_color()I10
 AThicker|net@28|||FS900|pin@74||4.5|0|pin@75||4.5|-1|ART_color()I10
 AThicker|net@29|||FS0|pin@75||4.5|-1|pin@76||0.5|-1|ART_color()I10
 AThicker|net@30|||FS900|pin@79||0.5|0|pin@76||0.5|-1|ART_color()I10
 AThicker|net@32|||FS450|pin@73||4.5|0.25|pin@72||3.25|-1|ART_color()I10
-AThicker|net@36|||FS900|pin@91||-2.75|-1.5|pin@92||-2.75|-2.5|ART_color()I10
-AThicker|net@40|||FS900|pin@103||-0.75|-1.5|pin@102||-0.75|-2.5|ART_color()I10
-AThicker|net@42|||FS900|pin@106||2.5|3|pin@107||2.5|2|ART_color()I10
-AThicker|net@43|||FS0|pin@107||2.5|2|pin@108||-2|2|ART_color()I10
-AThicker|net@44|||FS900|pin@109||-2|3|pin@108||-2|2|ART_color()I10
-AThicker|net@45|||FS450|pin@105||2.5|3.25|pin@104||1.25|2|ART_color()I10
-AThicker|net@46|||FS900|pin@112||0.25|6|pin@113||0.25|5|ART_color()I10
-AThicker|net@48|||FS470|pin@118||0|0.25|pin@117||-0.7|-0.5|ART_color()I10
+AThicker|net@36|||FS900|pin@91||-2.75|0.5|pin@92||-2.75|-0.5|ART_color()I10
+AThicker|net@40|||FS900|pin@103||-0.75|0.5|pin@102||-0.75|-0.5|ART_color()I10
+AThicker|net@42|||FS900|pin@106||2.5|5|pin@107||2.5|4|ART_color()I10
+AThicker|net@43|||FS0|pin@107||2.5|4|pin@108||-2|4|ART_color()I10
+AThicker|net@44|||FS900|pin@109||-2|5|pin@108||-2|4|ART_color()I10
+AThicker|net@45|||FS450|pin@105||2.5|5.25|pin@104||1.25|4|ART_color()I10
+AThicker|net@46|||FS900|pin@112||0.25|8|pin@113||0.25|7|ART_color()I10
+AThicker|net@48|||FS470|pin@118||0|2.25|pin@117||-0.7|1.5|ART_color()I10
 ELSN[ZeroOrDone]||D5G1;RY-4.5;|pin@68||I
-ELSN[ZeroOrTwo]||D5G1;RY-4.5;|pin@10||I
+ELSN[ZeroOrTwo]||D5G1;RY-5.25;|pin@10||I
 EMSN[ZeroOrDone]||D4G1;RY-0.5;|pin@4||I
 EMSN[ZeroOrTwo]||D4G1;R|pin@6||I
-EdisableLO||D5G1;RY-3;|pin@40||I
+EdisableLO||D5G1;RY-3.75;|pin@40||I
 EfireHI||D5G1;RX2;|pin@16||O
 X
 
@@ -483,6 +485,107 @@ Edisable|disableLO|D5G2;X-1.5;|conn@14|a|I
 Efire[1]|fireHI|D6G2;X4.5;|conn@8|a|O
 X
 
+# Cell fireNEW;1{ic}
+CfireNEW;1{ic}||artwork|1247529105994|1248217930552|E|ATTR_X(D5G1;HNOLPX-6.5;Y3.5;)S20
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NThick-Circle|art@4||2|0.5|1|1|R||ART_color()I10
+NThick-Circle|art@12||-2|1|8|7|||ART_color()I10|ART_degrees()F[0.0,1.0471976]
+NThick-Circle|art@13||0|-1.25|6|6|500||ART_color()I10|ART_degrees()I800
+NThick-Circle|art@14||0|4.5|1|1|R||ART_color()I10
+NThick-Circle|art@15||2|1|8|7|YRR||ART_color()I10|ART_degrees()F[0.0,1.0471976]
+NThick-Circle|art@18||-1.25|-3|1|1|R||ART_color()I10
+NThick-Circle|art@19||-0.25|-3|8|7|YRR||ART_color()I10|ART_degrees()F[0.0,1.0471976]
+NThick-Circle|art@20||-4.25|-3|8|7|||ART_color()I10|ART_degrees()F[0.0,1.0471976]
+NThick-Circle|art@21||-2.25|-5.25|6|6|500||ART_color()I10|ART_degrees()I800
+NThick-Circle|art@22||-3.25|-3|1|1|R||ART_color()I10
+NThick-Circle|art@23||-2.25|0.5|1|1|R||ART_color()I10
+Nschematic:Bus_Pin|pin@4||-1.25|-4||||
+Nschematic:Bus_Pin|pin@6||-3.25|-4||||
+Nschematic:Bus_Pin|pin@16||0|5|||R|
+Nschematic:Bus_Pin|pin@40||2|0||||
+Nschematic:Bus_Pin|pin@46||0|5|-2|-2|R|
+Nschematic:Bus_Pin|pin@54||0|4|-2|-2|R|
+Nschematic:Bus_Pin|pin@82||2|0|-2|-2|R|
+Nschematic:Bus_Pin|pin@85||0|0|-2|-2|R|
+Nschematic:Bus_Pin|pin@86||0|4|-2|-2|R|
+NPin|pin@89||1.25|1.5|1|1|R|
+NPin|pin@90||1.75|2|1|1|R|
+NPin|pin@91||-3.25|-3.5|1|1|R|
+NPin|pin@92||-3.25|-4|||R|
+Nschematic:Bus_Pin|pin@93||-1|-2|-2|-2|R|
+Nschematic:Bus_Pin|pin@99||-5.5|-3.5|-2|-2|R|
+Nschematic:Bus_Pin|pin@100||-3|-2|-2|-2|R|
+NPin|pin@102||-1.25|-4|||R|
+NPin|pin@103||-1.25|-3.5|1|1|R|
+NPin|pin@104||-1.25|-2.5|1|1|R|
+NPin|pin@105||-0.5|-1.75|1|1|R|
+AThicker|net@35|||FS450|pin@90||1.75|2|pin@89||1.25|1.5|ART_color()I10
+AThicker|net@36|||FS900|pin@91||-3.25|-3.5|pin@92||-3.25|-4|ART_color()I10
+AThicker|net@40|||FS900|pin@103||-1.25|-3.5|pin@102||-1.25|-4|ART_color()I10
+AThicker|net@42|||FS450|pin@105||-0.5|-1.75|pin@104||-1.25|-2.5|ART_color()I10
+EdisableLO|LSN|D5G1;RY-1;|pin@40||I
+EMSN[ZeroOrDone]||D4G1;R|pin@4||I
+EMSN[ZeroOrTwo]||D4G1;R|pin@6||I
+EfireHI||D5G1;RX1.5;|pin@16||O
+X
+
+# Cell fireNEW;1{sch}
+CfireNEW;1{sch}||schematic|1247526811643|1248217906456||ATTR_X(D5G1;HNOLPX-57;Y31.5;)S20
+IredFive:PMOS;1{ic}|PMOS@2||-16.5|21|RR||D5G4;|ATTR_X(D5G1.5;NOLPX-1.5;Y-3.5;)S2*@X
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NOff-Page|conn@2||-41|8|||XYRR|
+NOff-Page|conn@3||-47|12||||
+NOff-Page|conn@8||-22|-18.5|||RRR|
+NOff-Page|conn@14||-1|16.75|||YRR|
+IfireNEW;1{ic}|fireNEW@0||-42.75|50|||D5G4;|ATTR_X(D5G1;NOLPX-6;Y3.25;)S20
+IredFive:nms1;2{ic}|nms1@0||-16.5|12|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-0.5;Y-4.25;)S2*@X
+IredFive:nms2a;2{ic}|nms2a@1||-28.5|8|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-1;Y-6;)S@X
+NWire_Pin|pin@79||-43|30||||
+NWire_Pin|pin@80||-43|12||||
+NWire_Pin|pin@81||-33|30||||
+NWire_Pin|pin@82||-33|8||||
+NWire_Pin|pin@84||-38.5|25.5||||
+NWire_Pin|pin@85||-16.5|25.5||||
+NWire_Pin|pin@86||-28.5|25.5||||
+NWire_Pin|pin@87||-28.5|16.5||||
+NWire_Pin|pin@88||-22|16.5||||
+NWire_Pin|pin@90||-16.5|16.5||||
+NWire_Pin|pin@91||-12|12||||
+NWire_Pin|pin@92||-12|21||||
+Ngeneric:Invisible-Pin|pin@96||10|37.5|||||ART_message(D5G1;)S[these pullups and the pull-down they drive,are extra-powerful in order to ensure,that the fire signal goes away promptly.]
+NWire_Pin|pin@102||-12|16.75||||
+IredFive:pms1;2{ic}|pms1@3||-38.5|30|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.25;Y4;)S2*@X
+IredFive:pms1;2{ic}|pms1@4||-28.5|30|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-0.25;Y4;)S2*@X
+Awire|net@198|||0|pms1@3|g|-41.5|30|pin@79||-43|30
+Awire|net@199|||1800|conn@3|y|-45|12|pin@80||-43|12
+Awire|net@200|||1800|pin@80||-43|12|nms2a@1|g2|-31.5|12
+Awire|net@201|||900|pin@79||-43|30|pin@80||-43|12
+Awire|net@202|||0|pms1@4|g|-31.5|30|pin@81||-33|30
+Awire|net@203|||1800|conn@2|y|-39|8|pin@82||-33|8
+Awire|net@204|||1800|pin@82||-33|8|nms2a@1|g|-31.5|8
+Awire|net@205|||900|pin@81||-33|30|pin@82||-33|8
+Awire|net@207|||900|pms1@3|d|-38.5|28|pin@84||-38.5|25.5
+Awire|net@209|||900|pin@85||-16.5|25.5|PMOS@2|d|-16.5|23
+Awire|net@210|||1800|pin@84||-38.5|25.5|pin@86||-28.5|25.5
+Awire|net@211|||1800|pin@86||-28.5|25.5|pin@85||-16.5|25.5
+Awire|net@212|||900|pms1@4|d|-28.5|28|pin@86||-28.5|25.5
+Awire|net@213|||2700|nms2a@1|d|-28.5|14|pin@87||-28.5|16.5
+Awire|net@214|||1800|pin@87||-28.5|16.5|pin@88||-22|16.5
+Awire|net@220|||2700|nms1@0|d|-16.5|14|pin@90||-16.5|16.5
+Awire|net@221|||0|pin@90||-16.5|16.5|pin@88||-22|16.5
+Awire|net@222|||1800|nms1@0|g|-13.5|12|pin@91||-12|12
+Awire|net@223|||1800|PMOS@2|g|-13.5|21|pin@92||-12|21
+Awire|net@226|||2700|conn@8|a|-22|-16.5|pin@88||-22|16.5
+Awire|net@228|||900|PMOS@2|s|-16.5|19|pin@90||-16.5|16.5
+Awire|net@248|||2700|pin@91||-12|12|pin@102||-12|16.75
+Awire|net@249|||2700|pin@102||-12|16.75|pin@92||-12|21
+Awire|net@250|||0|conn@14|y|-3|16.75|pin@102||-12|16.75
+EdisableLO|LSN|D5G2;X-1.5;|conn@14|a|I
+EMSN[ZeroOrDone]||D4G2;X-0.5;|conn@2|a|I
+EMSN[ZeroOrTwo]||D6G2;X-20.5;|conn@3|y|I
+EfireHI||D6G2;X4.5;|conn@8|a|O
+X
+
 # Cell nand2withInverter;1{ic}
 Cnand2withInverter;1{ic}||artwork|1021415734000|1248139184888|E|ATTR_Delay(D5G1;HNPX-2.5;Y5.5;)I100|ATTR_X(D5FLeave alone;G1;HNOLPX-2.5;Y6.5;)S1|ATTR_drive0(D5G1;HNPTX-2.5;Y4.5;)Sstrong0|ATTR_drive1(D5G1;HNPTX-2.5;Y3.5;)Sstrong1|prototype_center()I[6000,0]
 Ngeneric:Facet-Center|art@0||0|0||||AV
The FleetCode -- http://fleet.cs.berkeley.edu/