Modified circuits to match up to their corresponding symbols

5 files changed, 44 insertions, 90 deletions

diff --git a/CMOS/antimax.asc b/CMOS/antimax.asc
index 2151bc4..d74f80e 100644
--- a/CMOS/antimax.asc
+++ b/CMOS/antimax.asc
@@ -2,6 +2,7 @@ Version 4
 SHEET 1 972 680
 WIRE -496 -192 -528 -192
 WIRE -96 -192 -416 -192
+WIRE -528 -160 -528 -192
 WIRE -96 -144 -96 -192
 WIRE -144 -128 -304 -128
 WIRE 384 -112 32 -112
@@ -11,8 +12,6 @@ WIRE 528 -48 224 -48
 WIRE -96 -16 -96 -48
 WIRE 384 -16 384 -112
 WIRE 624 -16 624 -112
-WIRE -528 0 -528 -192
-WIRE -496 0 -528 0
 WIRE -304 0 -304 -128
 WIRE -304 0 -416 0
 WIRE -144 0 -192 0
@@ -22,8 +21,6 @@ WIRE 576 64 528 64
 WIRE -96 128 -96 80
 WIRE 32 128 32 -112
 WIRE 32 128 -96 128
-WIRE -528 144 -528 0
-WIRE -496 144 -528 144
 WIRE -192 144 -192 0
 WIRE -192 144 -416 144
 WIRE 384 176 384 80
@@ -39,10 +36,7 @@ WIRE -304 288 -304 0
 WIRE 288 288 288 64
 WIRE 288 288 -304 288
 WIRE 448 288 288 288
-WIRE -528 320 -528 144
-WIRE -480 320 -528 320
 WIRE 496 336 496 304
-WIRE -480 352 -480 320
 WIRE -96 352 -96 128
 WIRE -96 352 -208 352
 WIRE 32 352 -96 352
@@ -55,14 +49,21 @@ WIRE -256 480 -304 480
 WIRE -48 480 -48 192
 WIRE -16 480 -48 480
 WIRE 496 496 496 432
-WIRE -528 544 -528 320
 WIRE -496 544 -528 544
 WIRE -208 544 -208 496
 WIRE -208 544 -416 544
 WIRE 32 544 32 496
 WIRE 32 544 -208 544
+WIRE -528 576 -528 544
 FLAG 496 496 0
-FLAG -480 352 0
+FLAG -528 576 0
+FLAG -528 -160 0
+FLAG -416 0 A
+IOPIN -416 0 In
+FLAG -416 144 B
+IOPIN -416 144 In
+FLAG 752 -112 Y
+IOPIN 752 -112 Out
 SYMBOL pmos -144 -48 M180
 SYMATTR InstName M1
 SYMATTR Value P-ENH
@@ -87,20 +88,6 @@ SYMATTR Value P-DLOW
 SYMBOL pmos 448 336 R0
 SYMATTR InstName M8
 SYMATTR Value P-DLOW
-SYMBOL voltage -400 0 R90
-WINDOW 0 -32 56 VBottom 0
-WINDOW 3 32 56 VTop 0
-WINDOW 123 0 0 Left 0
-WINDOW 39 0 0 Left 0
-SYMATTR InstName V1
-SYMATTR Value SINE(0 1 2)
-SYMBOL voltage -400 144 R90
-WINDOW 0 -32 56 VBottom 0
-WINDOW 3 32 56 VTop 0
-WINDOW 123 0 0 Left 0
-WINDOW 39 0 0 Left 0
-SYMATTR InstName V2
-SYMATTR Value -1
 SYMBOL voltage -400 -192 R90
 WINDOW 0 -32 56 VBottom 0
 WINDOW 3 32 56 VTop 0
@@ -116,4 +103,3 @@ WINDOW 39 0 0 Left 0
 SYMATTR InstName V4
 SYMATTR Value -1
 TEXT 328 -176 Left 0 !.inc ./custom.mos
-TEXT -536 608 Left 0 !.tran 1
diff --git a/CMOS/antimin.asc b/CMOS/antimin.asc
index e73597e..14b61d2 100644
--- a/CMOS/antimin.asc
+++ b/CMOS/antimin.asc
@@ -2,6 +2,7 @@ Version 4
 SHEET 1 880 680
 WIRE -528 -208 -592 -208
 WIRE -96 -208 -448 -208
+WIRE -592 -176 -592 -208
 WIRE -96 -144 -96 -208
 WIRE -96 -144 -192 -144
 WIRE 16 -144 -96 -144
@@ -15,8 +16,6 @@ WIRE -240 -80 -336 -80
 WIRE -32 -80 -32 -112
 WIRE 256 -16 256 -96
 WIRE 512 -16 512 -96
-WIRE -592 32 -592 -208
-WIRE -528 32 -592 32
 WIRE -384 32 -384 -112
 WIRE -384 32 -448 32
 WIRE -192 96 -192 0
@@ -32,8 +31,6 @@ WIRE 256 160 256 80
 WIRE 368 160 256 160
 WIRE 512 160 512 80
 WIRE 512 160 368 160
-WIRE -592 192 -592 32
-WIRE -528 192 -592 192
 WIRE -336 192 -336 -80
 WIRE -336 192 -448 192
 WIRE 144 192 -336 192
@@ -45,22 +42,26 @@ WIRE -336 288 -336 192
 WIRE -144 288 -336 288
 WIRE 208 320 208 144
 WIRE 320 320 208 320
-WIRE -592 336 -592 192
-WIRE -512 336 -592 336
 WIRE -96 352 -96 304
 WIRE 368 368 368 336
-WIRE -512 384 -512 336
 WIRE -384 432 -384 144
 WIRE -144 432 -384 432
 WIRE 144 448 144 192
 WIRE 320 448 144 448
-WIRE -592 512 -592 336
 WIRE -528 512 -592 512
 WIRE -96 512 -96 448
 WIRE -96 512 -448 512
 WIRE 368 528 368 464
-FLAG -512 384 0
+WIRE -592 544 -592 512
+FLAG -592 544 0
 FLAG 368 528 0
+FLAG -592 -176 0
+FLAG -448 32 A
+IOPIN -448 32 In
+FLAG -448 192 B
+IOPIN -448 192 In
+FLAG 704 -96 Y
+IOPIN 704 -96 Out
 SYMBOL pmos -240 0 M180
 SYMATTR InstName M1
 SYMATTR Value P-ENH
@@ -80,20 +81,6 @@ WINDOW 123 0 0 Left 0
 WINDOW 39 0 0 Left 0
 SYMATTR InstName V1
 SYMATTR Value 1
-SYMBOL voltage -432 32 R90
-WINDOW 0 -32 56 VBottom 0
-WINDOW 3 32 56 VTop 0
-WINDOW 123 0 0 Left 0
-WINDOW 39 0 0 Left 0
-SYMATTR InstName V2
-SYMATTR Value SINE(0 1 2)
-SYMBOL voltage -432 192 R90
-WINDOW 0 -32 56 VBottom 0
-WINDOW 3 59 56 VBottom 0
-WINDOW 123 0 0 Left 0
-WINDOW 39 0 0 Left 0
-SYMATTR InstName V3
-SYMATTR Value 1
 SYMBOL voltage -432 512 R90
 WINDOW 0 -32 56 VBottom 0
 WINDOW 3 32 56 VTop 0
@@ -114,4 +101,3 @@ SYMBOL pmos 464 -16 R0
 SYMATTR InstName M8
 SYMATTR Value P-DLOW
 TEXT 360 -184 Left 0 !.inc ./custom.mos
-TEXT -600 576 Left 0 !.tran 1
diff --git a/CMOS/negative_threshold_inverter.asc b/CMOS/negative_threshold_inverter.asc
index 30899c4..7380e83 100644
--- a/CMOS/negative_threshold_inverter.asc
+++ b/CMOS/negative_threshold_inverter.asc
@@ -2,24 +2,26 @@ Version 4
 SHEET 1 924 680
 WIRE -288 -160 -336 -160
 WIRE 96 -160 -208 -160
+WIRE -336 -128 -336 -160
 WIRE 96 -96 96 -160
 WIRE 48 -80 0 -80
-WIRE -336 96 -336 -160
-WIRE -336 96 -416 96
-WIRE -288 96 -336 96
 WIRE 0 96 0 -80
 WIRE 0 96 -208 96
 WIRE 96 96 96 0
 WIRE 256 96 96 96
-WIRE -416 144 -416 96
 WIRE 96 240 96 96
 WIRE 0 320 0 96
 WIRE 48 320 0 320
-WIRE -336 400 -336 96
 WIRE -288 400 -336 400
 WIRE 96 400 96 336
 WIRE 96 400 -208 400
-FLAG -416 144 0
+WIRE -336 432 -336 400
+FLAG -336 432 0
+FLAG -336 -128 0
+FLAG -208 96 A
+IOPIN -208 96 In
+FLAG 256 96 Y
+IOPIN 256 96 Out
 SYMBOL pmos 48 0 M180
 SYMATTR InstName M1
 SYMATTR Value P-ENH
@@ -33,13 +35,6 @@ WINDOW 123 0 0 Left 0
 WINDOW 39 0 0 Left 0
 SYMATTR InstName V1
 SYMATTR Value 1
-SYMBOL voltage -192 96 R90
-WINDOW 0 -32 56 VBottom 0
-WINDOW 3 32 56 VTop 0
-WINDOW 123 0 0 Left 0
-WINDOW 39 0 0 Left 0
-SYMATTR InstName V2
-SYMATTR Value SINE(0 1 2)
 SYMBOL voltage -192 400 R90
 WINDOW 0 -32 56 VBottom 0
 WINDOW 3 32 56 VTop 0
@@ -48,4 +43,3 @@ WINDOW 39 0 0 Left 0
 SYMATTR InstName V3
 SYMATTR Value -1
 TEXT 408 -160 Left 0 !.inc ./custom.mos
-TEXT -440 472 Left 0 !.tran 1
diff --git a/CMOS/positive_threshold_inverter.asc b/CMOS/positive_threshold_inverter.asc
index 9c5c3e8..1d0c1c5 100644
--- a/CMOS/positive_threshold_inverter.asc
+++ b/CMOS/positive_threshold_inverter.asc
@@ -2,24 +2,26 @@ Version 4
 SHEET 1 924 680
 WIRE -288 -160 -336 -160
 WIRE 96 -160 -208 -160
+WIRE -336 -128 -336 -160
 WIRE 96 -96 96 -160
 WIRE 48 -80 0 -80
-WIRE -336 96 -336 -160
-WIRE -336 96 -416 96
-WIRE -288 96 -336 96
 WIRE 0 96 0 -80
 WIRE 0 96 -208 96
 WIRE 96 96 96 0
 WIRE 256 96 96 96
-WIRE -416 144 -416 96
 WIRE 96 240 96 96
 WIRE 0 320 0 96
 WIRE 48 320 0 320
-WIRE -336 400 -336 96
 WIRE -288 400 -336 400
 WIRE 96 400 96 336
 WIRE 96 400 -208 400
-FLAG -416 144 0
+WIRE -336 432 -336 400
+FLAG -336 432 0
+FLAG -336 -128 0
+FLAG -208 96 A
+IOPIN -208 96 In
+FLAG 256 96 Y
+IOPIN 256 96 Out
 SYMBOL pmos 48 0 M180
 SYMATTR InstName M1
 SYMATTR Value P-ELOW
@@ -33,13 +35,6 @@ WINDOW 123 0 0 Left 0
 WINDOW 39 0 0 Left 0
 SYMATTR InstName V1
 SYMATTR Value 1
-SYMBOL voltage -192 96 R90
-WINDOW 0 -32 56 VBottom 0
-WINDOW 3 32 56 VTop 0
-WINDOW 123 0 0 Left 0
-WINDOW 39 0 0 Left 0
-SYMATTR InstName V2
-SYMATTR Value SINE(0 1 2)
 SYMBOL voltage -192 400 R90
 WINDOW 0 -32 56 VBottom 0
 WINDOW 3 32 56 VTop 0
@@ -48,4 +43,3 @@ WINDOW 39 0 0 Left 0
 SYMATTR InstName V3
 SYMATTR Value -1
 TEXT 408 -160 Left 0 !.inc ./custom.mos
-TEXT -440 472 Left 0 !.tran 1
diff --git a/CMOS/standard_inverter.asc b/CMOS/standard_inverter.asc
index 666bf14..c48a2c7 100644
--- a/CMOS/standard_inverter.asc
+++ b/CMOS/standard_inverter.asc
@@ -2,18 +2,15 @@ Version 4
 SHEET 1 924 680
 WIRE -288 -160 -336 -160
 WIRE 96 -160 -208 -160
+WIRE -336 -128 -336 -160
 WIRE 96 -96 96 -160
 WIRE 48 -80 0 -80
-WIRE -336 96 -336 -160
-WIRE -336 96 -416 96
-WIRE -288 96 -336 96
 WIRE -80 96 -208 96
 WIRE 0 96 0 -80
 WIRE 0 96 -80 96
 WIRE 96 96 96 0
 WIRE 480 96 96 96
 WIRE 640 96 480 96
-WIRE -416 144 -416 96
 WIRE 480 144 480 96
 WIRE 432 224 384 224
 WIRE 96 240 96 96
@@ -22,16 +19,21 @@ WIRE 0 320 0 96
 WIRE 48 320 0 320
 WIRE 384 352 384 224
 WIRE 432 352 384 352
-WIRE -336 400 -336 96
 WIRE -288 400 -336 400
 WIRE 96 400 96 336
 WIRE 96 400 -208 400
+WIRE -336 432 -336 400
 WIRE 480 432 480 368
 WIRE -80 464 -80 96
 WIRE 384 464 384 352
 WIRE 384 464 -80 464
 FLAG 480 432 0
-FLAG -416 144 0
+FLAG -336 432 0
+FLAG -336 -128 0
+FLAG -208 96 A
+IOPIN -208 96 In
+FLAG 640 96 Y
+IOPIN 640 96 Out
 SYMBOL pmos 48 0 M180
 SYMATTR InstName M1
 SYMATTR Value P-ENH
@@ -51,13 +53,6 @@ WINDOW 123 0 0 Left 0
 WINDOW 39 0 0 Left 0
 SYMATTR InstName V1
 SYMATTR Value 1
-SYMBOL voltage -192 96 R90
-WINDOW 0 -32 56 VBottom 0
-WINDOW 3 32 56 VTop 0
-WINDOW 123 0 0 Left 0
-WINDOW 39 0 0 Left 0
-SYMATTR InstName V2
-SYMATTR Value SINE(0 1 2)
 SYMBOL voltage -192 400 R90
 WINDOW 0 -32 56 VBottom 0
 WINDOW 3 32 56 VTop 0
@@ -66,4 +61,3 @@ WINDOW 39 0 0 Left 0
 SYMATTR InstName V3
 SYMATTR Value -1
 TEXT 408 -160 Left 0 !.inc ./custom.mos
-TEXT -440 472 Left 0 !.tran 1