cleaned up omegaCounter fire module

diff --git a/electric/omegaCounter.jelib b/electric/omegaCounter.jelib
index 5191159..a2967aa 100644 (file)
--- a/electric/omegaCounter.jelib
+++ b/electric/omegaCounter.jelib
@@ -454,27 +454,26 @@ Enot_load_zero||D5G2;X-5.5;Y-0.5;|pin@31||I
 X
 
 # Cell oneBit;1{sch}
-ConeBit;1{sch}||schematic|1242942044308|1247769751415|
+ConeBit;1{sch}||schematic|1242942044308|1247771227756|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||-1.5|19||||
 NOff-Page|conn@1||-84|21|||RR|
 NOff-Page|conn@2||-83|50.5||||
 NOff-Page|conn@3||-1|62||||
-NOff-Page|conn@4||-78.5|69||||
-NOff-Page|conn@5||-78.5|66||||
-NOff-Page|conn@6||-36.5|74||||
-NOff-Page|conn@7||-36.5|71.5||||
+NOff-Page|conn@4||-95.5|76.5||||
+NOff-Page|conn@5||-95.5|73.5||||
+NOff-Page|conn@6||-36.5|104||||
+NOff-Page|conn@7||-36.5|101.5||||
 Idelay;1{ic}|delay@0||-70.5|16|RRR||D5G4;
 Idelay;1{ic}|delay@1||-70.5|55|R||D5G4;
-Idelay;1{ic}|delay@3||-59.5|31|R||D5G4;
 Idelay;1{ic}|delay@5||-70.5|77|R||D5G4;
 Ifire;1{ic}|fire@0||-28|36|||D5G4;
-IredFive:inv;1{ic}|inv@2||-65.5|25.5|||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S2|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@9||-61|8.5|||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S2|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@10||-54|8.5|||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S2|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@9||-60|2|R||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S2|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@11||-60|8.5|R||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S4|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@12||-60|15.5|R||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S8|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nms1;2{ic}|nms1@0||-9.5|14|||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||-76|25.5|||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: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
 IoneBit;1{ic}|oneBit@0||40|73|||D5G4;
 Ngeneric:Invisible-Pin|pin@6||-72|145|||||ART_message(D5G15;)SoneBit
 Ngeneric:Invisible-Pin|pin@149||-72.5|134.5|||||ART_message(D5G2;)Sam 13 Jul 2009
@@ -518,32 +517,16 @@ NWire_Pin|pin@381||-47|54||||
 NWire_Pin|pin@384||-58.5|71.5||||
 NWire_Pin|pin@385||-43.5|71.5||||
 NWire_Pin|pin@386||-43.5|59||||
-NWire_Pin|pin@387||-79.5|50.5||||
-NWire_Pin|pin@388||-79.5|39||||
-NWire_Pin|pin@389||-79.5|26.5||||
-NWire_Pin|pin@390||-79.5|24.5||||
-NWire_Pin|pin@391||-79.5|21||||
-NWire_Pin|pin@395||-41.5|49||||
+NWire_Pin|pin@395||-44|49||||
 NWire_Pin|pin@396||-46|49||||
-NWire_Pin|pin@397||-41.5|49.5||||
+NWire_Pin|pin@397||-44|49.5||||
 NWire_Pin|pin@398||-26.5|57||||
-NWire_Pin|pin@401||-33|71.5||||
-NWire_Pin|pin@402||-29.5|74||||
+NWire_Pin|pin@401||-33|101.5||||
+NWire_Pin|pin@402||-29.5|104||||
 NWire_Pin|pin@418||-70.5|50.5||||
 NWire_Pin|pin@419||-70.5|71.5||||
 NWire_Pin|pin@423||-43.5|68.5||||
-NWire_Pin|pin@433||-59.5|25.5||||
-NWire_Pin|pin@434||-59.5|46.5||||
-NWire_Pin|pin@435||-41.5|46.5||||
-NWire_Pin|pin@439||-61.5|25.5||||
-NWire_Pin|pin@440||-61.5|14.5||||
-NWire_Pin|pin@441||-66|14.5||||
-NWire_Pin|pin@442||-66|8||||
-NWire_Pin|pin@443||-63.5|8||||
-NWire_Pin|pin@444||-49|8.5||||
-NWire_Pin|pin@445||-49|12.5||||
-NWire_Pin|pin@446||-59|12.5||||
-NWire_Pin|pin@447||-59.5|12.5||||
+NWire_Pin|pin@435||-44|44.5||||
 NWire_Pin|pin@448||-70.5|21||||
 NWire_Pin|pin@449||-70.5|-21.5||||
 NWire_Pin|pin@450||-24.5|-21.5||||
@@ -552,6 +535,11 @@ NWire_Pin|pin@452||-20.5|63.5||||
 NWire_Pin|pin@455||-70.5|96||||
 NWire_Pin|pin@456||-41|96||||
 NWire_Pin|pin@457||-41|22||||
+NWire_Pin|pin@463||-60|44.5||||
+NWire_Pin|pin@464||-61|-10.5||||
+NWire_Pin|pin@465||-64.5|-10.5||||
+NWire_Pin|pin@466||-64.5|71.5||||
+NWire_Pin|pin@467||-59|-21.5||||
 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;
@@ -604,54 +592,27 @@ Awire|net@812|||0|predCond@5|state[1]|-51|58|pin@380||-53|58
 Awire|net@813|||2700|predCond@5|not_state|-47|54|pin@381||-47|54
 Awire|net@822|||900|pin@385||-43.5|71.5|pin@386||-43.5|59
 Awire|net@823|||0|pin@386||-43.5|59|predCond@5|cond|-46|59
-Awire|net@825|||0|pin@387||-79.5|50.5|conn@2|y|-81|50.5
-Awire|net@826|||900|pin@387||-79.5|50.5|pin@388||-79.5|39
-Awire|net@827|||900|pin@388||-79.5|39|pin@389||-79.5|26.5
-Awire|net@828|||1800|pin@389||-79.5|26.5|nor2n@0|inb|-78.5|26.5
-Awire|net@829|||0|nor2n@0|ina|-78.5|24.5|pin@390||-79.5|24.5
-Awire|net@831|||0|pin@391||-79.5|21|conn@1|a|-82|21
-Awire|net@832|||900|pin@390||-79.5|24.5|pin@391||-79.5|21
-Awire|net@837|||0|inv@2|in|-68|25.5|nor2n@0|out|-73.5|25.5
 Awire|net@843|||900|sucDri20@1|cond|-46|49.5|pin@396||-46|49
-Awire|net@844|||2700|pin@395||-41.5|49|pin@397||-41.5|49.5
-Awire|net@845|||1800|sucDri20@1|cond|-46|49.5|pin@397||-41.5|49.5
+Awire|net@844|||2700|pin@395||-44|49|pin@397||-44|49.5
+Awire|net@845|||1800|sucDri20@1|cond|-46|49.5|pin@397||-44|49.5
 Awire|net@846|||2700|fire@0|fire|-26.5|48|pin@398||-26.5|57
 Awire|net@847|||2700|pin@398||-26.5|57|pin@361||-26.5|61
 Awire|net@848|||1800|predCond@5|in[1]|-45.5|57|pin@398||-26.5|57
 Awire|net@853|||900|pin@380||-53|58|pin@293||-53|50.5
-Awire|net@854|||1800|conn@7|y|-34.5|71.5|pin@401||-33|71.5
-Awire|net@855|||900|pin@401||-33|71.5|pin@373||-33|71
-Awire|net@856|||1800|conn@6|y|-34.5|74|pin@402||-29.5|74
-Awire|net@857|||900|pin@374||-29.5|74.5|pin@402||-29.5|74
+Awire|net@854|||1800|conn@7|y|-34.5|101.5|pin@401||-33|101.5
+Awire|net@855|||900|pin@401||-33|101.5|pin@373||-33|71
+Awire|net@856|||1800|conn@6|y|-34.5|104|pin@402||-29.5|104
+Awire|net@857|||2700|pin@374||-29.5|74.5|pin@402||-29.5|104
 Awire|net@891|||0|pin@293||-53|50.5|pin@418||-70.5|50.5
-Awire|net@892|||0|pin@418||-70.5|50.5|pin@387||-79.5|50.5
 Awire|net@893|||900|delay@1|in|-70.5|52.5|pin@418||-70.5|50.5
-Awire|net@894|||0|pin@384||-58.5|71.5|pin@419||-70.5|71.5
 Awire|net@895|||1800|pin@419||-70.5|71.5|pin@385||-43.5|71.5
 Awire|net@896|||2700|delay@1|out|-70.5|69.5|pin@419||-70.5|71.5
 Awire|net@897|||1800|pin@320||-47.25|37|fire@0|NotMSN[ZeroOrOne]|-39|37
 Awire|net@905|||900|pin@385||-43.5|71.5|pin@423||-43.5|68.5
-Awire|net@921|||2700|pin@433||-59.5|25.5|delay@3|in|-59.5|28.5
-Awire|net@922|||2700|delay@3|out|-59.5|45.5|pin@434||-59.5|46.5
-Awire|net@923|||1800|pin@434||-59.5|46.5|pin@435||-41.5|46.5
-Awire|net@924|||2700|pin@435||-41.5|46.5|pin@395||-41.5|49
-Awire|net@931|||1800|inv@2|out|-63|25.5|pin@439||-61.5|25.5
-Awire|net@932|||900|pin@439||-61.5|25.5|pin@440||-61.5|14.5
-Awire|net@933|||0|pin@440||-61.5|14.5|pin@441||-66|14.5
-Awire|net@934|||900|pin@441||-66|14.5|pin@442||-66|8
-Awire|net@935|||1800|pin@442||-66|8|pin@443||-63.5|8
-Awire|net@936|||900|inv@9|in|-63.5|8.5|pin@443||-63.5|8
-Awire|net@937|||0|inv@10|in|-56.5|8.5|inv@9|out|-58.5|8.5
-Awire|net@938|||1800|inv@10|out|-51.5|8.5|pin@444||-49|8.5
-Awire|net@939|||2700|pin@444||-49|8.5|pin@445||-49|12.5
-Awire|net@940|||0|pin@445||-49|12.5|pin@446||-59|12.5
-Awire|net@941|||0|pin@446||-59|12.5|pin@447||-59.5|12.5
-Awire|net@942|||900|pin@433||-59.5|25.5|pin@447||-59.5|12.5
+Awire|net@924|||2700|pin@435||-44|44.5|pin@395||-44|49
 Awire|net@944|||0|pin@296||-53|21|pin@448||-70.5|21
-Awire|net@945|||0|pin@448||-70.5|21|pin@391||-79.5|21
 Awire|net@946|||2700|delay@0|in|-70.5|18.5|pin@448||-70.5|21
 Awire|net@947|||900|delay@0|out|-70.5|1.5|pin@449||-70.5|-21.5
-Awire|net@948|||1800|pin@449||-70.5|-21.5|pin@450||-24.5|-21.5
 Awire|net@949|||2700|pin@450||-24.5|-21.5|pin@451||-24.5|63.5
 Awire|net@950|||1800|pin@451||-24.5|63.5|pin@452||-20.5|63.5
 Awire|net@951|||2700|predCond@4|cond|-20.5|63|pin@452||-20.5|63.5
@@ -660,6 +621,21 @@ Awire|net@955|||2700|delay@5|out|-70.5|91.5|pin@455||-70.5|96
 Awire|net@956|||1800|pin@455||-70.5|96|pin@456||-41|96
 Awire|net@957|||900|pin@456||-41|96|pin@457||-41|22
 Awire|net@958|||0|pin@457||-41|22|sucDri20@0|cond|-46|22
+Awire|net@962|||1800|conn@1|a|-82|21|pin@448||-70.5|21
+Awire|net@963|||1800|conn@2|y|-81|50.5|pin@418||-70.5|50.5
+Awire|net@966|||900|inv@11|in|-60|6|inv@9|out|-60|4.5
+Awire|net@967|||900|inv@12|in|-60|13|inv@11|out|-60|11
+Awire|net@968|||2700|nor2n@0|out|-60|-3|inv@9|in|-60|-0.5
+Awire|net@969|||2700|inv@12|out|-60|18|pin@463||-60|44.5
+Awire|net@970|||1800|pin@463||-60|44.5|pin@435||-44|44.5
+Awire|net@971|||900|nor2n@0|inb|-61|-8|pin@464||-61|-10.5
+Awire|net@972|||0|pin@464||-61|-10.5|pin@465||-64.5|-10.5
+Awire|net@973|||0|pin@384||-58.5|71.5|pin@466||-64.5|71.5
+Awire|net@974|||0|pin@466||-64.5|71.5|pin@419||-70.5|71.5
+Awire|net@975|||2700|pin@465||-64.5|-10.5|pin@466||-64.5|71.5
+Awire|net@976|||1800|pin@449||-70.5|-21.5|pin@467||-59|-21.5
+Awire|net@977|||1800|pin@467||-59|-21.5|pin@450||-24.5|-21.5
+Awire|net@978|||900|nor2n@0|ina|-59|-8|pin@467||-59|-21.5
 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