Updating subcircuit schematic library

1 files changed, 294 insertions, 278 deletions

diff --git a/kicadSchematicLibrary/eSim_Subckt.lib b/kicadSchematicLibrary/eSim_Subckt.lib
index 3a2abd7a..0151b65f 100644
--- a/kicadSchematicLibrary/eSim_Subckt.lib
+++ b/kicadSchematicLibrary/eSim_Subckt.lib
@@ -1,103 +1,127 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# LM555N
+# 2BITMUL
 #
-DEF LM555N X 0 40 Y Y 1 F N
-F0 "X" 0 -50 60 H V C CNN
-F1 "LM555N" 0 100 60 H V C CNN
-F2 "" -50 0 60 H V C CNN
-F3 "" -50 0 60 H V C CNN
+DEF 2BITMUL X 0 40 Y Y 1 F N
+F0 "X" 0 0 60 H V C CNN
+F1 "2BITMUL" 0 0 60 H V C CNN
+F2 "" 0 0 60 H I C CNN
+F3 "" 0 0 60 H I C CNN
 DRAW
-S 350 -400 -350 400 0 1 0 N
-X GND 1 0 -600 200 U 50 50 1 1 W
-X TR 2 -550 250 200 R 50 50 1 1 I
-X Q 3 550 250 200 L 50 50 1 1 O
-X R 4 -550 -250 200 R 50 50 1 1 I I
-X CV 5 -550 0 200 R 50 50 1 1 I
-X THR 6 550 -250 200 L 50 50 1 1 I
-X DIS 7 550 0 200 L 50 50 1 1 I
-X VCC 8 0 600 200 D 50 50 1 1 W
+S -300 400 300 -400 0 1 0 N
+X A0 1 -500 300 200 R 50 50 1 1 I
+X A1 2 -500 150 200 R 50 50 1 1 I
+X B0 3 -500 -50 200 R 50 50 1 1 I
+X B1 4 -500 -250 200 R 50 50 1 1 I
+X M0 5 500 250 200 L 50 50 1 1 O
+X M1 6 500 100 200 L 50 50 1 1 O
+X M2 7 500 -50 200 L 50 50 1 1 O
+X M3 8 500 -250 200 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
-# Lm_7805
+# 3_and
 #
-DEF Lm_7805 X 0 40 Y Y 1 F N
-F0 "X" 0 0 60 H V C CNN
-F1 "Lm_7805" 50 150 60 H V C CNN
-F2 "" 0 0 60 H I C CNN
-F3 "" 0 0 60 H I C CNN
+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
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
-S -350 100 350 -200 0 1 0 N
-X Vin 1 -550 0 200 R 50 50 1 1 P
-X GND 2 0 -400 200 U 50 50 1 1 P
-X Vout 3 550 0 200 L 50 50 1 1 P
+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
 ENDDRAW
 ENDDEF
 #
-# SCR
+# 4_OR
 #
-DEF SCR X 0 10 Y N 1 F N
-F0 "X" 150 200 50 H V C CNN
-F1 "SCR" 150 -350 50 H V C CNN
+DEF 4_OR X 0 40 Y Y 1 F N
+F0 "X" 150 -100 60 H V C CNN
+F1 "4_OR" 150 100 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 0 0 -200 -150 200 -150 N
-P 2 0 1 0 0 -150 -200 -400 N
-P 3 0 1 0 -150 100 150 100 0 -150 F
-X A 1 0 400 300 D 60 60 1 1 I
-X K 2 0 -550 400 U 60 70 1 1 I
-X G 3 -350 -400 150 R 60 60 1 1 I
+A -800 0 650 226 -226 0 1 0 N -200 250 -200 -250
+A -73 134 444 -599 -176 0 1 0 N 150 -250 350 0
+A -30 -99 393 627 146 0 1 0 N 150 250 350 0
+P 2 0 1 0 -200 -250 150 -250 N
+P 2 0 1 0 -200 250 150 250 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 in4 4 -350 -150 200 R 50 50 1 1 I
+X out 5 550 0 200 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
-# UA741
+# 4_and
 #
-DEF UA741 X 0 40 Y Y 1 F N
-F0 "X" 150 0 60 H V C CNN
-F1 "UA741" 250 -150 60 H V C CNN
+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
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 4 0 1 0 0 150 0 -150 350 0 0 150 N
-X + 1 -200 100 200 R 50 50 1 1 I
-X - 2 -200 -100 200 R 50 50 1 1 I
-X ~ 3 550 0 200 L 50 50 1 1 O
+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
 ENDDRAW
 ENDDEF
 #
-# full_adder
+# 556
 #
-DEF full_adder X 0 40 Y Y 1 F N
-F0 "X" 1400 700 60 H V C CNN
-F1 "full_adder" 1400 600 60 H V C CNN
+DEF 556 X 0 40 Y Y 1 F N
+F0 "X" 0 0 60 H V C CNN
+F1 "556" 0 0 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-S 800 1150 1950 0 0 1 0 N
-X IN1 1 600 950 200 R 50 50 1 1 I
-X IN2 2 600 550 200 R 50 50 1 1 I
-X CIN 3 600 150 200 R 50 50 1 1 I
-X SUM 4 2150 950 200 L 50 50 1 1 O
-X COUT 5 2150 150 200 L 50 50 1 1 O
+S -300 400 250 -550 0 1 0 N
+X dis1 1 -500 150 200 R 50 50 1 1 I
+X thr1 2 -500 -150 200 R 50 50 1 1 I
+X cv1 3 -150 -750 200 U 50 50 1 1 I
+X rst1 4 -200 600 200 D 50 50 1 1 I
+X out1 5 -500 0 200 R 50 50 1 1 O
+X trig1 6 -500 -300 200 R 50 50 1 1 I
+X gnd 7 0 -750 200 U 50 50 1 1 I
+X trig2 8 450 -300 200 L 50 50 1 1 I
+X out2 9 450 0 200 L 50 50 1 1 O
+X rst2 10 100 600 200 D 50 50 1 1 I
+X cv2 11 150 -750 200 U 50 50 1 1 I
+X thr2 12 450 -150 200 L 50 50 1 1 I
+X dis2 13 450 150 200 L 50 50 1 1 I
+X vcc 14 -50 600 200 D 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# half_adder
+# 5_and
 #
-DEF half_adder X 0 40 Y Y 1 F N
-F0 "X" 900 500 60 H V C CNN
-F1 "half_adder" 900 400 60 H V C CNN
+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
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-S 500 800 1250 0 0 1 0 N
-X IN1 1 300 700 200 R 50 50 1 1 I
-X IN2 2 300 100 200 R 50 50 1 1 I
-X SUM 3 1450 700 200 L 50 50 1 1 O
-X COUT 4 1450 100 200 L 50 50 1 1 O
+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
 #
@@ -127,45 +151,6 @@ X VCC 14 450 250 200 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# IC_4017
-#
-DEF IC_4017 X 0 40 Y Y 1 F N
-F0 "X" 0 0 60 H V C CNN
-F1 "IC_4017" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-S -350 850 400 -850 0 1 0 N
-X 1 1 600 650 200 L 50 50 1 1 O
-X 2 2 600 500 200 L 50 50 1 1 O
-X 3 3 600 350 200 L 50 50 1 1 O
-X 4 4 600 200 200 L 50 50 1 1 O
-X 5 5 600 50 200 L 50 50 1 1 O
-X 6 6 600 -100 200 L 50 50 1 1 O
-X 7 7 600 -250 200 L 50 50 1 1 O
-X 8 8 600 -400 200 L 50 50 1 1 O
-X 9 9 600 -600 200 L 50 50 1 1 O
-X 10 10 600 -750 200 L 50 50 1 1 O
-X RST 11 -550 -400 200 R 50 50 1 1 I
-X CLK 12 -550 350 200 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# LM_7812
-#
-DEF LM_7812 X 0 40 Y Y 1 F N
-F0 "X" 0 50 60 H V C CNN
-F1 "LM_7812" 0 150 60 H V C CNN
-F2 "" 0 0 60 H I C CNN
-F3 "" 0 0 60 H I C CNN
-DRAW
-S -350 200 350 -200 0 1 0 N
-X IN 1 -550 0 200 R 50 50 1 1 I
-X GND 2 0 -400 200 U 50 50 1 1 I
-X OUT 3 550 0 200 L 50 50 1 1 O
-ENDDRAW
-ENDDEF
-#
 # IC_4012
 #
 DEF IC_4012 X 0 40 Y Y 1 F N
@@ -192,6 +177,30 @@ X VDD 14 550 300 200 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# IC_4017
+#
+DEF IC_4017 X 0 40 Y Y 1 F N
+F0 "X" 0 0 60 H V C CNN
+F1 "IC_4017" 0 0 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -350 850 400 -850 0 1 0 N
+X 1 1 600 650 200 L 50 50 1 1 O
+X 2 2 600 500 200 L 50 50 1 1 O
+X 3 3 600 350 200 L 50 50 1 1 O
+X 4 4 600 200 200 L 50 50 1 1 O
+X 5 5 600 50 200 L 50 50 1 1 O
+X 6 6 600 -100 200 L 50 50 1 1 O
+X 7 7 600 -250 200 L 50 50 1 1 O
+X 8 8 600 -400 200 L 50 50 1 1 O
+X 9 9 600 -600 200 L 50 50 1 1 O
+X 10 10 600 -750 200 L 50 50 1 1 O
+X RST 11 -550 -400 200 R 50 50 1 1 I
+X CLK 12 -550 350 200 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 # IC_4023
 #
 DEF IC_4023 X 0 40 Y Y 1 F N
@@ -248,7 +257,7 @@ ENDDEF
 #
 # IC_4073
 #
-DEF IC_4073 x 0 40 Y Y 1 F N
+DEF IC_4073 X 0 40 Y Y 1 F N
 F0 "X" 0 -100 60 H V C CNN
 F1 "IC_4073" 0 50 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
@@ -272,6 +281,35 @@ X Vdd 14 500 300 200 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# IC_74153
+#
+DEF IC_74153 X 0 40 Y Y 1 F N
+F0 "X" 100 50 60 H V C CNN
+F1 "IC_74153" 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 100 -200 60 0 0 0 4:1 Normal 0 C C
+T 0 100 -100 60 0 0 0 DUAL Normal 0 C C
+T 0 100 -300 60 0 0 0 MUX Normal 0 C C
+S -200 500 350 -550 0 1 0 N
+X a0 1 -400 350 200 R 50 50 1 1 I
+X a1 2 -400 250 200 R 50 50 1 1 I
+X a2 3 -400 150 200 R 50 50 1 1 I
+X a3 4 -400 50 200 R 50 50 1 1 I
+X EA 5 0 700 200 D 50 50 1 1 I I
+X b0 6 -400 -150 200 R 50 50 1 1 I
+X b1 7 -400 -250 200 R 50 50 1 1 I
+X b2 8 -400 -350 200 R 50 50 1 1 I
+X b3 9 -400 -450 200 R 50 50 1 1 I
+X EB 10 200 700 200 D 50 50 1 1 I I
+X s1 11 50 -750 200 U 50 50 1 1 I
+X s0 12 150 -750 200 U 50 50 1 1 I
+X ya 13 550 250 200 L 50 50 1 1 O
+X yb 14 550 -300 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
 # IC_74154
 #
 DEF IC_74154 X 0 40 Y Y 1 F N
@@ -280,8 +318,8 @@ F1 "IC_74154" 50 -50 60 H V C CNN
 F2 "" 0 50 60 H V C CNN
 F3 "" 0 50 60 H V C CNN
 DRAW
-T 0 0 400 60 0 0 0 4:16~  Normal 0 C C
-T 0 0 250 60 0 0 0 decoder  Normal 0 C C
+T 0 0 400 60 0 0 0 4:16~ Normal 0 C C
+T 0 0 250 60 0 0 0 decoder Normal 0 C C
 S -350 700 400 -700 0 0 0 N
 X ~Y0 1 -550 550 200 R 50 50 1 1 O I
 X ~Y1 2 -550 450 200 R 50 50 1 1 O I
@@ -310,81 +348,32 @@ X ~E1 19 600 50 200 L 50 50 1 1 I I
 ENDDRAW
 ENDDEF
 #
-# 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
-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
-ENDDRAW
-ENDDEF
-#
-# 4_and
+# IC_74157
 #
-DEF 4_and X 0 40 Y Y 1 F N
+DEF IC_74157 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
-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
-ENDDRAW
-ENDDEF
-#
-# 4_OR
-#
-DEF 4_OR X 0 40 Y Y 1 F N
-F0 "X" 150 -100 60 H V C CNN
-F1 "4_OR" 150 100 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-A -800 0 650 226 -226 0 1 0 N -200 250 -200 -250
-A -73 134 444 -599 -176 0 1 0 N 150 -250 350 0
-A -30 -99 393 627 146 0 1 0 N 150 250 350 0
-P 2 0 1 0  -200 -250  150 -250 N
-P 2 0 1 0  -200 250  150 250 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 in4 4 -350 -150 200 R 50 50 1 1 I
-X out 5 550 0 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
+F1 "IC_74157" 50 100 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
+T 0 50 -300 60 0 0 0 2:1 Normal 0 C C
+T 0 50 -400 60 0 0 0 MUX Normal 0 C C
+T 0 50 -200 60 0 0 0 QUAD Normal 0 C C
+S -350 550 400 -650 0 1 0 N
+X a0 1 -550 450 200 R 50 50 1 1 I
+X a1 2 -550 300 200 R 50 50 1 1 I
+X b0 3 -550 200 200 R 50 50 1 1 I
+X b1 4 -550 100 200 R 50 50 1 1 I
+X c0 5 -550 0 200 R 50 50 1 1 I
+X c1 6 -550 -100 200 R 50 50 1 1 I
+X d0 7 -550 -200 200 R 50 50 1 1 I
+X d1 8 -550 -300 200 R 50 50 1 1 I
+X EN 9 -550 -550 200 R 50 50 1 1 I I
+X S 10 -550 -450 200 R 50 50 1 1 I
+X Yd 11 600 0 200 L 50 50 1 1 O
+X Ya 12 600 300 200 L 50 50 1 1 O
+X Yb 13 600 200 200 L 50 50 1 1 O
+X Yc 14 600 100 200 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
@@ -396,7 +385,7 @@ F1 "IC_7485" -50 50 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-T 0 0 550 60 0 0 0 4~BIT~comparator  Normal 0 C C
+T 0 0 550 60 0 0 0 4~BIT~comparator Normal 0 C C
 S -350 450 400 -400 0 1 0 N
 X A<B(in) 1 600 -100 200 L 50 50 1 1 I
 X A=B(in) 2 600 -200 200 L 50 50 1 1 I
@@ -415,140 +404,101 @@ X A<B(out) 14 600 150 200 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
-# IC_74153
+# INVCMOS
 #
-DEF IC_74153 X 0 40 Y Y 1 F N
-F0 "X" 100 50 60 H V C CNN
-F1 "IC_74153" 100 150 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+DEF INVCMOS X 0 40 Y Y 1 F N
+F0 "X" 0 0 60 H V C CNN
+F1 "INVCMOS" -450 150 60 H V C CNN
+F2 "" 0 0 60 H I C CNN
+F3 "" 0 0 60 H I C CNN
 DRAW
-T 0 100 -200 60 0 0 0 4:1  Normal 0 C C
-T 0 100 -100 60 0 0 0 DUAL  Normal 0 C C
-T 0 100 -300 60 0 0 0 MUX  Normal 0 C C
-S -200 500 350 -550 0 1 0 N
-X a0 1 -400 350 200 R 50 50 1 1 I
-X a1 2 -400 250 200 R 50 50 1 1 I
-X a2 3 -400 150 200 R 50 50 1 1 I
-X a3 4 -400 50 200 R 50 50 1 1 I
-X EA 5 0 700 200 D 50 50 1 1 I I
-X b0 6 -400 -150 200 R 50 50 1 1 I
-X b1 7 -400 -250 200 R 50 50 1 1 I
-X b2 8 -400 -350 200 R 50 50 1 1 I
-X b3 9 -400 -450 200 R 50 50 1 1 I
-X EB 10 200 700 200 D 50 50 1 1 I I
-X s1 11 50 -750 200 U 50 50 1 1 I
-X s0 12 150 -750 200 U 50 50 1 1 I
-X ya 13 550 250 200 L 50 50 1 1 O
-X yb 14 550 -300 200 L 50 50 1 1 O
+C 400 0 112 0 1 0 N
+S -250 200 -250 -200 0 1 0 N
+P 3 0 1 0 -250 200 300 0 -250 -200 N
+X in 1 -450 0 200 R 50 50 1 1 P
+X out 2 700 0 200 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# IC_74157
+# LM555N
 #
-DEF IC_74157 X 0 40 Y Y 1 F N
-F0 "X" 50 -50 60 H V C CNN
-F1 "IC_74157" 50 100 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+DEF LM555N X 0 40 Y Y 1 F N
+F0 "X" 0 -50 60 H V C CNN
+F1 "LM555N" 0 100 60 H V C CNN
+F2 "" -50 0 60 H V C CNN
+F3 "" -50 0 60 H V C CNN
 DRAW
-T 0 50 -300 60 0 0 0 2:1  Normal 0 C C
-T 0 50 -400 60 0 0 0 MUX  Normal 0 C C
-T 0 50 -200 60 0 0 0 QUAD  Normal 0 C C
-S -350 550 400 -650 0 1 0 N
-X a0 1 -550 450 200 R 50 50 1 1 I
-X a1 2 -550 300 200 R 50 50 1 1 I
-X b0 3 -550 200 200 R 50 50 1 1 I
-X b1 4 -550 100 200 R 50 50 1 1 I
-X c0 5 -550 0 200 R 50 50 1 1 I
-X c1 6 -550 -100 200 R 50 50 1 1 I
-X d0 7 -550 -200 200 R 50 50 1 1 I
-X d1 8 -550 -300 200 R 50 50 1 1 I
-X EN 9 -550 -550 200 R 50 50 1 1 I I
-X S 10 -550 -450 200 R 50 50 1 1 I
-X Yd 11 600 0 200 L 50 50 1 1 O
-X Ya 12 600 300 200 L 50 50 1 1 O
-X Yb 13 600 200 200 L 50 50 1 1 O
-X Yc 14 600 100 200 L 50 50 1 1 O
+S 350 -400 -350 400 0 1 0 N
+X GND 1 0 -600 200 U 50 50 1 1 W
+X TR 2 -550 250 200 R 50 50 1 1 I
+X Q 3 550 250 200 L 50 50 1 1 O
+X R 4 -550 -250 200 R 50 50 1 1 I I
+X CV 5 -550 0 200 R 50 50 1 1 I
+X THR 6 550 -250 200 L 50 50 1 1 I
+X DIS 7 550 0 200 L 50 50 1 1 I
+X VCC 8 0 600 200 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# half_sub
+# LM_7812
 #
-DEF half_sub X 0 40 Y Y 1 F N
-F0 "X" 0 0 60 H V C CNN
-F1 "half_sub" 0 0 60 H V C CNN
+DEF LM_7812 X 0 40 Y Y 1 F N
+F0 "X" 0 50 60 H V C CNN
+F1 "LM_7812" 0 150 60 H V C CNN
 F2 "" 0 0 60 H I C CNN
 F3 "" 0 0 60 H I C CNN
 DRAW
-S -300 300 300 -300 0 1 0 N
-X A 1 -500 200 200 R 50 50 1 1 I
-X B 2 -500 -100 200 R 50 50 1 1 I
-X D 3 500 150 200 L 50 50 1 1 O
-X BORROW 4 500 -100 200 L 50 50 1 1 O
+S -350 200 350 -200 0 1 0 N
+X IN 1 -550 0 200 R 50 50 1 1 I
+X GND 2 0 -400 200 U 50 50 1 1 I
+X OUT 3 550 0 200 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
-# full_sub
+# Lm_7805
 #
-DEF full_sub X 0 40 Y Y 1 F N
+DEF Lm_7805 X 0 40 Y Y 1 F N
 F0 "X" 0 0 60 H V C CNN
-F1 "full_sub" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F1 "Lm_7805" 50 150 60 H V C CNN
+F2 "" 0 0 60 H I C CNN
+F3 "" 0 0 60 H I C CNN
 DRAW
-S -550 650 450 -600 0 1 0 N
-X A 1 -750 400 200 R 50 50 1 1 I
-X B 2 -750 200 200 R 50 50 1 1 I
-X BIN 3 -750 -200 200 R 50 50 1 1 I
-X DIFF 4 650 450 200 L 50 50 1 1 O
-X BORROW 5 650 150 200 L 50 50 1 1 O
+S -350 100 350 -200 0 1 0 N
+X Vin 1 -550 0 200 R 50 50 1 1 P
+X GND 2 0 -400 200 U 50 50 1 1 P
+X Vout 3 550 0 200 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# 2BITMUL
+# SCR
 #
-DEF 2BITMUL X 0 40 Y Y 1 F N
-F0 "X" 0 0 60 H V C CNN
-F1 "2BITMUL" 0 0 60 H V C CNN
-F2 "" 0 0 60 H I C CNN
-F3 "" 0 0 60 H I C CNN
+DEF SCR X 0 10 Y N 1 F N
+F0 "X" 150 200 50 H V C CNN
+F1 "SCR" 150 -350 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
-S -300 400 300 -400 0 1 0 N
-X A0 1 -500 300 200 R 50 50 1 1 I
-X A1 2 -500 150 200 R 50 50 1 1 I
-X B0 3 -500 -50 200 R 50 50 1 1 I
-X B1 4 -500 -250 200 R 50 50 1 1 I
-X M0 5 500 250 200 L 50 50 1 1 O
-X M1 6 500 100 200 L 50 50 1 1 O
-X M2 7 500 -50 200 L 50 50 1 1 O
-X M3 8 500 -250 200 L 50 50 1 1 O
+P 2 0 0 0 -200 -150 200 -150 N
+P 2 0 1 0 0 -150 -200 -400 N
+P 3 0 1 0 -150 100 150 100 0 -150 F
+X A 1 0 400 300 D 60 60 1 1 I
+X K 2 0 -550 400 U 60 70 1 1 I
+X G 3 -350 -400 150 R 60 60 1 1 I
 ENDDRAW
 ENDDEF
 #
-# 556
+# UA741
 #
-DEF 556 X 0 40 Y Y 1 F N
-F0 "X" 0 0 60 H V C CNN
-F1 "556" 0 0 60 H V C CNN
+DEF UA741 X 0 40 Y Y 1 F N
+F0 "X" 150 0 60 H V C CNN
+F1 "UA741" 250 -150 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-S -300 400 250 -550 0 1 0 N
-X dis1 1 -500 150 200 R 50 50 1 1 I
-X thr1 2 -500 -150 200 R 50 50 1 1 I
-X cv1 3 -150 -750 200 U 50 50 1 1 I
-X rst1 4 -200 600 200 D 50 50 1 1 I
-X out1 5 -500 0 200 R 50 50 1 1 O
-X trig1 6 -500 -300 200 R 50 50 1 1 I
-X gnd 7 0 -750 200 U 50 50 1 1 I
-X trig2 8 450 -300 200 L 50 50 1 1 I
-X out2 9 450 0 200 L 50 50 1 1 O
-X rst2 10 100 600 200 D 50 50 1 1 I
-X cv2 11 150 -750 200 U 50 50 1 1 I
-X thr2 12 450 -150 200 L 50 50 1 1 I
-X dis2 13 450 150 200 L 50 50 1 1 I
-X vcc 14 -50 600 200 D 50 50 1 1 I
+P 4 0 1 0 0 150 0 -150 350 0 0 150 N
+X + 1 -200 100 200 R 50 50 1 1 I
+X - 2 -200 -100 200 R 50 50 1 1 I
+X ~ 3 550 0 200 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
@@ -572,6 +522,72 @@ X B2 3 0 350 200 D 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
+# full_adder
+#
+DEF full_adder X 0 40 Y Y 1 F N
+F0 "X" 1400 700 60 H V C CNN
+F1 "full_adder" 1400 600 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S 800 1150 1950 0 0 1 0 N
+X IN1 1 600 950 200 R 50 50 1 1 I
+X IN2 2 600 550 200 R 50 50 1 1 I
+X CIN 3 600 150 200 R 50 50 1 1 I
+X SUM 4 2150 950 200 L 50 50 1 1 O
+X COUT 5 2150 150 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# full_sub
+#
+DEF full_sub X 0 40 Y Y 1 F N
+F0 "X" 0 0 60 H V C CNN
+F1 "full_sub" 0 0 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -550 650 450 -600 0 1 0 N
+X A 1 -750 400 200 R 50 50 1 1 I
+X B 2 -750 200 200 R 50 50 1 1 I
+X BIN 3 -750 -200 200 R 50 50 1 1 I
+X DIFF 4 650 450 200 L 50 50 1 1 O
+X BORROW 5 650 150 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# half_adder
+#
+DEF half_adder X 0 40 Y Y 1 F N
+F0 "X" 900 500 60 H V C CNN
+F1 "half_adder" 900 400 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S 500 800 1250 0 0 1 0 N
+X IN1 1 300 700 200 R 50 50 1 1 I
+X IN2 2 300 100 200 R 50 50 1 1 I
+X SUM 3 1450 700 200 L 50 50 1 1 O
+X COUT 4 1450 100 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# half_sub
+#
+DEF half_sub X 0 40 Y Y 1 F N
+F0 "X" 0 0 60 H V C CNN
+F1 "half_sub" 0 0 60 H V C CNN
+F2 "" 0 0 60 H I C CNN
+F3 "" 0 0 60 H I C CNN
+DRAW
+S -300 300 300 -300 0 1 0 N
+X A 1 -500 200 200 R 50 50 1 1 I
+X B 2 -500 -100 200 R 50 50 1 1 I
+X D 3 500 150 200 L 50 50 1 1 O
+X BORROW 4 500 -100 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
 # lm_741
 #
 DEF lm_741 X 0 40 Y Y 1 F N
@@ -580,7 +596,7 @@ F1 "lm_741" -100 -250 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 4 0 1 0  -350 350  350 0  -350 -350  -350 350 N
+P 4 0 1 0 -350 350 350 0 -350 -350 -350 350 N
 X off_null 1 -50 400 200 D 50 38 1 1 I
 X inv 2 -550 150 200 R 50 38 1 1 I
 X non_inv 3 -550 -100 200 R 50 38 1 1 I