Removed testing symbols and cleaned up gate layout

1 files changed, 24 insertions, 33 deletions

diff --git a/CMOS/comparison.asc b/CMOS/comparison.asc
index bcc8a13..411a864 100644
--- a/CMOS/comparison.asc
+++ b/CMOS/comparison.asc
@@ -1,9 +1,10 @@
 Version 4
-SHEET 1 880 868
-WIRE -400 -240 -864 -240
+SHEET 1 944 868
+WIRE -400 -240 -448 -240
 WIRE -128 -240 -320 -240
 WIRE 128 -240 -128 -240
 WIRE 704 -240 128 -240
+WIRE -448 -208 -448 -240
 WIRE 448 -176 224 -176
 WIRE -128 -128 -128 -240
 WIRE 128 -128 128 -240
@@ -17,12 +18,8 @@ WIRE 656 -112 560 -112
 WIRE -224 -16 -224 -112
 WIRE 32 -16 32 -112
 WIRE 32 -16 -224 -16
-WIRE -288 16 -656 16
-WIRE -32 16 -288 16
-WIRE -864 48 -864 -240
-WIRE -800 48 -864 48
 WIRE -592 48 -592 -112
-WIRE -592 48 -720 48
+WIRE -592 48 -784 48
 WIRE -544 48 -592 48
 WIRE 288 48 288 -112
 WIRE 288 48 -432 48
@@ -32,9 +29,7 @@ WIRE -128 64 -128 -32
 WIRE 128 64 128 -32
 WIRE 448 64 448 -32
 WIRE 704 64 704 -32
-WIRE -288 80 -288 16
 WIRE -176 80 -288 80
-WIRE -32 80 -32 16
 WIRE 80 80 -32 80
 WIRE 400 80 352 80
 WIRE 656 80 608 80
@@ -42,12 +37,9 @@ WIRE 352 176 352 80
 WIRE 352 176 -384 176
 WIRE 608 176 608 80
 WIRE 608 176 352 176
-WIRE -864 192 -864 48
-WIRE -864 192 -928 192
 WIRE 128 208 128 160
 WIRE 224 208 224 -176
 WIRE 224 208 128 208
-WIRE -928 224 -928 192
 WIRE -128 272 -128 160
 WIRE 128 272 -128 272
 WIRE 448 272 448 160
@@ -55,11 +47,8 @@ WIRE 448 272 128 272
 WIRE 704 272 704 160
 WIRE 704 272 448 272
 WIRE 864 272 704 272
-WIRE -864 352 -864 192
-WIRE -800 352 -864 352
-WIRE -656 352 -656 16
-WIRE -656 352 -720 352
-WIRE -544 352 -656 352
+WIRE -592 352 -784 352
+WIRE -544 352 -592 352
 WIRE -384 352 -384 176
 WIRE -384 352 -432 352
 WIRE -128 384 -128 272
@@ -74,8 +63,12 @@ WIRE 288 464 288 48
 WIRE 400 464 288 464
 WIRE 560 464 560 48
 WIRE 656 464 560 464
-WIRE -656 512 -656 352
-WIRE 352 512 -656 512
+WIRE -592 512 -592 352
+WIRE -288 512 -288 80
+WIRE -288 512 -592 512
+WIRE -32 512 -32 80
+WIRE -32 512 -288 512
+WIRE 352 512 -32 512
 WIRE 608 512 352 512
 WIRE -384 560 -384 352
 WIRE 32 560 -384 560
@@ -91,8 +84,7 @@ WIRE 352 656 352 512
 WIRE 400 656 352 656
 WIRE 608 656 608 512
 WIRE 656 656 608 656
-WIRE -864 784 -864 352
-WIRE -400 784 -864 784
+WIRE -400 784 -448 784
 WIRE -128 784 -128 672
 WIRE -128 784 -320 784
 WIRE 128 784 128 672
@@ -101,7 +93,15 @@ WIRE 448 784 448 672
 WIRE 448 784 128 784
 WIRE 704 784 704 672
 WIRE 704 784 448 784
-FLAG -928 224 0
+WIRE -448 816 -448 784
+FLAG -448 816 0
+FLAG -448 -208 0
+FLAG -784 48 A
+IOPIN -784 48 In
+FLAG -784 352 B
+IOPIN -784 352 In
+FLAG 864 272 Y
+IOPIN 864 272 Out
 SYMBOL pmos -176 -32 M180
 SYMATTR InstName M1
 SYMATTR Value P-ENH
@@ -131,14 +131,6 @@ WINDOW 0 -32 56 VBottom 0
 WINDOW 3 32 56 VTop 0
 SYMATTR InstName V1
 SYMATTR Value 1
-SYMBOL voltage -704 48 R90
-WINDOW 0 -32 56 VBottom 0
-WINDOW 3 32 56 VTop 0
-SYMATTR InstName A
-SYMBOL voltage -704 352 R90
-WINDOW 0 -32 56 VBottom 0
-WINDOW 3 32 56 VTop 0
-SYMATTR InstName B
 SYMBOL nmos -176 384 R0
 SYMATTR InstName M9
 SYMATTR Value N-ENH
@@ -170,9 +162,8 @@ WINDOW 123 0 0 Left 0
 WINDOW 39 0 0 Left 0
 SYMATTR InstName V2
 SYMATTR Value -1
-SYMBOL ternary-logic\\CMOS\\standard_inverter -496 0 R0
+SYMBOL standard_inverter -496 0 R0
 SYMATTR InstName U1
-SYMBOL ternary-logic\\CMOS\\standard_inverter -496 304 R0
+SYMBOL standard_inverter -496 304 R0
 SYMATTR InstName U2
 TEXT -752 624 Left 0 !.inc ./custom.mos
-TEXT -764 714 Left 0 !.tran 1