works with wire loads

diff --git a/electric/omegaCounter.jelib b/electric/omegaCounter.jelib
index 692b6d8..ca8e80c 100644 (file)
--- 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|1247802712001|
+ConeBit;1{sch}||schematic|1242942044308|1247802919660|
 IorangeTSMC090nm:LEload;1{ic}|LEload@0||-74|44|||D5G4;|ATTR_L(D5G1;OLPUDX1;)S100|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NOLPX0.5;Y-1;)S1|ATTR_width(D5G1;NOLPX0.5;Y-2;)S3
 IorangeTSMC090nm:LEload;1{ic}|LEload@1||-73.5|26.5|||D5G4;|ATTR_L(D5G1;OLPUDX1;)S100|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NOLPX0.5;Y-1;)S1|ATTR_width(D5G1;NOLPX0.5;Y-2;)S3
 IorangeTSMC090nm:LEload;1{ic}|LEload@2||-2.5|11|||D5G4;|ATTR_L(D5G1;OLPUDX1;)S100|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NOLPX0.5;Y-1;)S1|ATTR_width(D5G1;NOLPX0.5;Y-2;)S3
@@ -573,6 +573,14 @@ NWire_Pin|pin@507||-51|72||||
 NWire_Pin|pin@508||-54.5|62.5||||
 NWire_Pin|pin@509||-54.5|59||||
 NWire_Pin|pin@510||-64.5|59||||
+NWire_Pin|pin@511||-79|44||||
+NWire_Pin|pin@512||-79|50.5||||
+NWire_Pin|pin@513||-79|26.5||||
+NWire_Pin|pin@514||-79|21||||
+NWire_Pin|pin@515||-7.5|11||||
+NWire_Pin|pin@516||-7.5|19||||
+NWire_Pin|pin@517||-7|67.5||||
+NWire_Pin|pin@518||-7|61||||
 IredFive:pms1;2{ic}|pms1@0||-9.5|80|||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;
@@ -597,9 +605,7 @@ Awire|net@754|||0|predCond@3|in[1]|-21|20|pin@343||-26.5|20
 Awire|net@765|||0|pin@312||-14|61|predCond@4|state[1]|-15.5|61
 Awire|net@770|||0|predCond@4|in[1]|-21|62|pin@361||-26.5|62
 Awire|net@779|||1800|pin@312||-14|61|pin@367||-9.5|61
-Awire|net@780|||1800|pin@367||-9.5|61|conn@3|a|-3|61
 Awire|net@781|||900|pms1@0|d|-9.5|78|pin@367||-9.5|61
-Awire|net@784|||1800|pin@369||-9.5|19|conn@0|a|-3.5|19
 Awire|net@785|||900|pms1@1|d|-9.5|28|pin@369||-9.5|19
 Awire|net@787|||2700|nms1@0|d|-9.5|7|pin@369||-9.5|19
 Awire|net@789|||2700|nms1@1|d|-9.5|50|pin@367||-9.5|61
@@ -629,8 +635,6 @@ Awire|net@949|||2700|pin@450||-24.5|-21.5|pin@451||-24.5|60
 Awire|net@956|||1800|pin@455||-70.5|96|pin@456||-41|96
 Awire|net@957|||900|pin@456||-41|96|pin@457||-41|20
 Awire|net@958|||0|pin@457||-41|20|sucDri20@0|cond|-46|20
-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@968|||2700|nor2n@0|out|-60|-3|inv@9|in|-60|-0.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
@@ -705,6 +709,22 @@ Awire|net@1069|||0|pin@509||-54.5|59|pin@510||-64.5|59
 Awire|net@1070|||900|inv@17|in|-70.5|77.5|pin@503||-70.5|74.5
 Awire|net@1071|||900|inv@18|in|-70.5|85|inv@17|out|-70.5|82.5
 Awire|net@1072|||2700|inv@18|out|-70.5|90|pin@504||-70.5|91.5
+Awire|net@1073|||0|LEload@0|a|-77|44|pin@511||-79|44
+Awire|net@1074|||1800|conn@2|y|-81|50.5|pin@512||-79|50.5
+Awire|net@1075|||1800|pin@512||-79|50.5|pin@418||-70.5|50.5
+Awire|net@1076|||2700|pin@511||-79|44|pin@512||-79|50.5
+Awire|net@1077|||0|LEload@1|a|-76.5|26.5|pin@513||-79|26.5
+Awire|net@1078|||1800|conn@1|a|-82|21|pin@514||-79|21
+Awire|net@1079|||1800|pin@514||-79|21|pin@448||-70.5|21
+Awire|net@1080|||900|pin@513||-79|26.5|pin@514||-79|21
+Awire|net@1081|||0|LEload@2|a|-5.5|11|pin@515||-7.5|11
+Awire|net@1082|||1800|pin@369||-9.5|19|pin@516||-7.5|19
+Awire|net@1083|||1800|pin@516||-7.5|19|conn@0|a|-3.5|19
+Awire|net@1084|||2700|pin@515||-7.5|11|pin@516||-7.5|19
+Awire|net@1085|||0|LEload@4|a|-3.5|67.5|pin@517||-7|67.5
+Awire|net@1086|||1800|pin@367||-9.5|61|pin@518||-7|61
+Awire|net@1087|||1800|pin@518||-7|61|conn@3|a|-3|61
+Awire|net@1088|||900|pin@517||-7|67.5|pin@518||-7|61
 Awire|not_load_zero|D5G2;X-3.5;||0|pms1@0|g|-12.5|80|pin@368||-20|80
 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