From cb55e59de7ee4383c04edfae7c39ad9ae9552b36 Mon Sep 17 00:00:00 2001 From: rahulp13 Date: Fri, 14 Feb 2020 15:16:35 +0530 Subject: common code for Win and Linux, merged py2 changes --- src/SubcircuitLibrary/7485/7485-cache.lib | 112 +++++++++++++++--------------- 1 file changed, 55 insertions(+), 57 deletions(-) (limited to 'src/SubcircuitLibrary/7485/7485-cache.lib') diff --git a/src/SubcircuitLibrary/7485/7485-cache.lib b/src/SubcircuitLibrary/7485/7485-cache.lib index eb9a059e..6edb5033 100644 --- a/src/SubcircuitLibrary/7485/7485-cache.lib +++ b/src/SubcircuitLibrary/7485/7485-cache.lib @@ -4,80 +4,57 @@ EESchema-LIBRARY Version 2.3 # 3_and # DEF 3_and X 0 40 Y Y 1 F N -F0 "X" 100 -50 60 H V C CNN -F1 "3_and" 150 150 60 H V C CNN +F0 "X" 900 300 60 H V C CNN +F1 "3_and" 950 500 60 H V C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN DRAW -A 150 50 158 716 -716 0 1 0 N 200 200 200 -100 -P 2 0 1 0 -150 200 200 200 N -P 3 0 1 0 -150 200 -150 -100 200 -100 N -X in1 1 -350 150 200 R 50 50 1 1 I -X in2 2 -350 50 200 R 50 50 1 1 I -X in3 3 -350 -50 200 R 50 50 1 1 I -X out 4 500 50 200 L 50 50 1 1 O +A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250 +P 2 0 1 0 650 550 1000 550 N +P 3 0 1 0 650 550 650 250 1000 250 N +X in1 1 450 500 200 R 50 50 1 1 I +X in2 2 450 400 200 R 50 50 1 1 I +X in3 3 450 300 200 R 50 50 1 1 I +X out 4 1300 400 200 L 50 50 1 1 O ENDDRAW ENDDEF # # 4_and # DEF 4_and X 0 40 Y Y 1 F N -F0 "X" 50 -50 60 H V C CNN -F1 "4_and" 100 100 60 H V C CNN +F0 "X" 1500 1050 60 H V C CNN +F1 "4_and" 1550 1200 60 H V C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN DRAW -A 100 0 206 760 -760 0 1 0 N 150 200 150 -200 -P 2 0 1 0 -200 200 150 200 N -P 4 0 1 0 -200 200 -200 -200 50 -200 150 -200 N -X in1 1 -400 150 200 R 50 50 1 1 I -X in2 2 -400 50 200 R 50 50 1 1 I -X in3 3 -400 -50 200 R 50 50 1 1 I -X in4 4 -400 -150 200 R 50 50 1 1 I -X out 5 500 0 200 L 50 50 1 1 O +A 1550 1100 206 760 -760 0 1 0 N 1600 1300 1600 900 +P 2 0 1 0 1250 1300 1600 1300 N +P 4 0 1 0 1250 1300 1250 900 1500 900 1600 900 N +X in1 1 1050 1250 200 R 50 50 1 1 I +X in2 2 1050 1150 200 R 50 50 1 1 I +X in3 3 1050 1050 200 R 50 50 1 1 I +X in4 4 1050 950 200 R 50 50 1 1 I +X out 5 1950 1100 200 L 50 50 1 1 O ENDDRAW ENDDEF # # 5_and # DEF 5_and X 0 40 Y Y 1 F N -F0 "X" 50 -100 60 H V C CNN -F1 "5_and" 100 150 60 H V C CNN +F0 "X" 1350 800 60 H V C CNN +F1 "5_and" 1400 1050 60 H V C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN DRAW -A 100 0 255 787 -787 0 1 0 N 150 250 150 -250 -P 2 0 1 0 -250 250 150 250 N -P 3 0 1 0 -250 250 -250 -250 150 -250 N -X in1 1 -450 200 200 R 50 50 1 1 I -X in2 2 -450 100 200 R 50 50 1 1 I -X in3 3 -450 0 200 R 50 50 1 1 I -X in4 4 -450 -100 200 R 50 50 1 1 I -X in5 5 -450 -200 200 R 50 50 1 1 I -X out 6 550 0 200 L 50 50 1 1 O -ENDDRAW -ENDDEF -# -# 5_nor -# -DEF 5_nor X 0 40 Y Y 1 F N -F0 "X" 50 -100 60 H V C CNN -F1 "5_nor" 100 150 60 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -T 0 50 400 60 0 0 0 name~is~c_gate Normal 0 C C -T 0 50 450 60 0 0 0 subcircuit~file Normal 0 C C -A 150 0 316 716 -716 0 1 0 N 250 300 250 -300 -P 2 0 1 0 -300 300 250 300 N -P 4 0 1 0 -300 300 -300 -300 200 -300 250 -300 N -X in1 1 -500 250 200 R 50 50 1 1 I I -X in2 2 -500 150 200 R 50 50 1 1 I I -X in3 3 -500 50 200 R 50 50 1 1 I I -X in4 4 -500 -50 200 R 50 50 1 1 I I -X in5 5 -500 -150 200 R 50 50 1 1 I I -X in6 6 -500 -250 200 R 50 50 1 1 I I -X out 7 650 0 200 L 50 50 1 1 O +A 1400 900 255 787 -787 0 1 0 N 1450 1150 1450 650 +P 2 0 1 0 1050 1150 1450 1150 N +P 3 0 1 0 1050 1150 1050 650 1450 650 N +X in1 1 850 1100 200 R 50 50 1 1 I +X in2 2 850 1000 200 R 50 50 1 1 I +X in3 3 850 900 200 R 50 50 1 1 I +X in4 4 850 800 200 R 50 50 1 1 I +X in5 5 850 700 200 R 50 50 1 1 I +X out 6 1850 900 200 L 50 50 1 1 O ENDDRAW ENDDEF # @@ -121,6 +98,27 @@ X ~ 26 250 0 100 L 30 30 26 1 B ENDDRAW ENDDEF # +# c_gate +# +DEF c_gate X 0 40 Y Y 1 F N +F0 "X" 5900 4450 60 H V C CNN +F1 "c_gate" 5950 4700 60 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +A 6000 4550 316 716 -716 0 1 0 N 6100 4850 6100 4250 +P 2 0 1 0 5550 4850 6100 4850 N +P 4 0 1 0 5550 4850 5550 4250 6050 4250 6100 4250 N +X in1 1 5350 4800 200 R 50 50 1 1 I I +X in2 2 5350 4700 200 R 50 50 1 1 I I +X in3 3 5350 4600 200 R 50 50 1 1 I I +X in4 4 5350 4500 200 R 50 50 1 1 I I +X in5 5 5350 4400 200 R 50 50 1 1 I I +X in6 6 5350 4300 200 R 50 50 1 1 I I +X out 7 6500 4550 200 L 50 50 1 1 O +ENDDRAW +ENDDEF +# # d_and # DEF d_and U 0 40 Y Y 1 F N @@ -131,7 +129,7 @@ F3 "" 0 0 60 H V C CNN DRAW A 149 50 100 -894 0 0 1 0 N 150 -50 250 50 A 150 49 100 6 900 0 1 0 N 250 50 150 150 -P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N +P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N X IN1 1 -450 100 200 R 50 50 1 1 I X IN2 2 -450 0 200 R 50 50 1 1 I X OUT 3 450 50 200 L 50 50 1 1 O @@ -148,7 +146,7 @@ F3 "" 0 0 60 H V C CNN DRAW A 149 50 100 -894 0 0 1 0 N 150 -50 250 50 A 150 49 100 6 900 0 1 0 N 250 50 150 150 -P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N +P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N X IN1 1 -450 100 200 R 50 50 1 1 I X IN2 2 -450 0 200 R 50 50 1 1 I X OUT 3 450 50 200 L 50 50 1 1 O I @@ -166,8 +164,8 @@ DRAW A -450 50 224 266 -266 0 1 0 N -250 150 -250 -50 A -25 -124 325 574 323 0 1 0 N 150 150 250 50 A 74 125 191 -665 -231 0 1 0 N 150 -50 250 50 -P 2 0 1 0 -250 -50 150 -50 N -P 2 0 1 0 -250 150 150 150 N +P 2 0 1 0 -250 -50 150 -50 N +P 2 0 1 0 -250 150 150 150 N X IN1 1 -450 100 215 R 50 50 1 1 I X IN2 2 -450 0 215 R 50 50 1 1 I X OUT 3 450 50 200 L 50 50 1 1 O I -- cgit