9 files changed, 147 insertions, 29 deletions

diff --git a/kicadSchematicLibrary/eSim_Analog.lib b/kicadSchematicLibrary/eSim_Analog.lib
index 8e44446b..66c2e3a6 100644
--- a/kicadSchematicLibrary/eSim_Analog.lib
+++ b/kicadSchematicLibrary/eSim_Analog.lib
@@ -1,6 +1,21 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
+# aswitch
+#
+DEF aswitch U 0 40 Y Y 1 F N
+F0 "U" 450 300 60 H V C CNN
+F1 "aswitch" 450 200 60 H V C CNN
+F2 "" 450 100 60 H V C CNN
+F3 "" 450 100 60 H V C CNN
+DRAW
+S 200 250 650 100 0 1 0 N
+X ~ 2 0 150 200 R 50 50 1 1 O
+X ~ 3 850 150 200 L 50 50 1 1 O
+X ~ 1_IN 450 -100 200 U 50 20 1 1 I
+ENDDRAW
+ENDDEF
+#
 # climit
 #
 DEF climit U 0 40 Y Y 1 F N
diff --git a/kicadSchematicLibrary/eSim_Devices.lib b/kicadSchematicLibrary/eSim_Devices.lib
index 442795e7..9c093d3a 100644
--- a/kicadSchematicLibrary/eSim_Devices.lib
+++ b/kicadSchematicLibrary/eSim_Devices.lib
@@ -153,26 +153,4 @@ X E 3 100 -200 100 U 50 50 1 1 E
 ENDDRAW
 ENDDEF
 #
-# PORT
-#
-DEF PORT U 0 40 Y Y 8 F N
-F0 "U" 50 100 30 H V C CNN
-F1 "PORT" 0 0 30 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-A 325 225 285 -1421 -1278 0 1 0 N 100 50 150 0
-A 376 -275 356 1294 1408 0 1 0 N 150 0 100 -50
-S -100 50 100 -50 0 1 0 N
-X ~ 1 250 0 100 L 30 30 1 1 B
-X ~ 2 250 0 100 L 30 30 2 1 B
-X ~ 3 250 0 100 L 30 30 3 1 B
-X ~ 4 250 0 100 L 30 30 4 1 B
-X ~ 5 250 0 100 L 30 30 5 1 B
-X ~ 6 250 0 100 L 30 30 6 1 B
-X ~ 7 250 0 100 L 30 30 7 1 B
-X ~ 8 250 0 100 L 30 30 8 1 B
-ENDDRAW
-ENDDEF
-#
 #End Library
diff --git a/kicadSchematicLibrary/eSim_Digital.lib b/kicadSchematicLibrary/eSim_Digital.lib
index c44e546c..ff53d004 100644
--- a/kicadSchematicLibrary/eSim_Digital.lib
+++ b/kicadSchematicLibrary/eSim_Digital.lib
@@ -85,14 +85,14 @@ ENDDEF
 # d_inverter
 #
 DEF d_inverter U 0 40 Y Y 1 F N
-F0 "U" 0 -50 60 H V C CNN
-F1 "d_inverter" 0 50 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F0 "U" 0 -100 60 H V C CNN
+F1 "d_inverter" 0 150 60 H V C CNN
+F2 "" 50 -50 60 H V C CNN
+F3 "" 50 -50 60 H V C CNN
 DRAW
-P 4 0 1 0  -300 200  -300 -200  450 0  -300 200 N
-X IN 1 -500 0 200 R 50 50 1 1 I
-X OUT 2 650 0 200 L 50 50 1 1 O I
+P 4 0 1 0  -100 50  -100 -50  100 0  -100 50 N
+X ~ 1 -300 0 200 R 50 50 1 1 I
+X ~ 2 300 0 200 L 50 50 1 1 O I
 ENDDRAW
 ENDDEF
 #
diff --git a/kicadSchematicLibrary/eSim_Miscellaneous.dcm b/kicadSchematicLibrary/eSim_Miscellaneous.dcm
new file mode 100644
index 00000000..5f3ed79b
--- /dev/null
+++ b/kicadSchematicLibrary/eSim_Miscellaneous.dcm
@@ -0,0 +1,3 @@
+EESchema-DOCLIB  Version 2.0
+#
+#End Doc Library
diff --git a/kicadSchematicLibrary/eSim_Miscellaneous.lib b/kicadSchematicLibrary/eSim_Miscellaneous.lib
new file mode 100644
index 00000000..2bd18839
--- /dev/null
+++ b/kicadSchematicLibrary/eSim_Miscellaneous.lib
@@ -0,0 +1,39 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# IC
+#
+DEF IC U 0 40 Y Y 1 F N
+F0 "U" 300 150 60 H V C CNN
+F1 "IC" 250 350 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+P 5 0 1 0  200 300  100 250  200 200  300 250  200 300 N
+X ~ 1 200 50 146 U 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# PORT
+#
+DEF PORT U 0 40 Y Y 8 F N
+F0 "U" 50 100 30 H V C CNN
+F1 "PORT" 0 0 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 325 225 285 -1421 -1278 0 1 0 N 100 50 150 0
+A 376 -275 356 1294 1408 0 1 0 N 150 0 100 -50
+S -100 50 100 -50 0 1 0 N
+X ~ 1 250 0 100 L 30 30 1 1 B
+X ~ 2 250 0 100 L 30 30 2 1 B
+X ~ 3 250 0 100 L 30 30 3 1 B
+X ~ 4 250 0 100 L 30 30 4 1 B
+X ~ 5 250 0 100 L 30 30 5 1 B
+X ~ 6 250 0 100 L 30 30 6 1 B
+X ~ 7 250 0 100 L 30 30 7 1 B
+X ~ 8 250 0 100 L 30 30 8 1 B
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/kicadSchematicLibrary/eSim_Subckt.dcm b/kicadSchematicLibrary/eSim_Subckt.dcm
new file mode 100644
index 00000000..1980d0d1
--- /dev/null
+++ b/kicadSchematicLibrary/eSim_Subckt.dcm
@@ -0,0 +1,7 @@
+EESchema-DOCLIB  Version 2.0
+#
+$CMP SCR
+D Thyristor
+$ENDCMP
+#
+#End Doc Library
diff --git a/kicadSchematicLibrary/eSim_Subckt.lib b/kicadSchematicLibrary/eSim_Subckt.lib
new file mode 100644
index 00000000..dab9e680
--- /dev/null
+++ b/kicadSchematicLibrary/eSim_Subckt.lib
@@ -0,0 +1,69 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# SCR
+#
+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
+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
+#
+# UA741
+#
+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
+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
+#
+# 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
+#
+# 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
+#
+#End Library
diff --git a/kicadSchematicLibrary/eSim_User.dcm b/kicadSchematicLibrary/eSim_User.dcm
new file mode 100644
index 00000000..5f3ed79b
--- /dev/null
+++ b/kicadSchematicLibrary/eSim_User.dcm
@@ -0,0 +1,3 @@
+EESchema-DOCLIB  Version 2.0
+#
+#End Doc Library
diff --git a/kicadSchematicLibrary/eSim_User.lib b/kicadSchematicLibrary/eSim_User.lib
new file mode 100644
index 00000000..2063b3ae
--- /dev/null
+++ b/kicadSchematicLibrary/eSim_User.lib
@@ -0,0 +1,4 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+#End Library