summaryrefslogtreecommitdiff
path: root/src/SubcircuitLibrary
diff options
context:
space:
mode:
Diffstat (limited to 'src/SubcircuitLibrary')
-rw-r--r--src/SubcircuitLibrary/lm555n/lm555n-cache.lib223
-rw-r--r--src/SubcircuitLibrary/lm555n/lm555n.bak638
-rw-r--r--src/SubcircuitLibrary/lm555n/lm555n.cir24
-rw-r--r--src/SubcircuitLibrary/lm555n/lm555n.cir.ckt35
-rw-r--r--src/SubcircuitLibrary/lm555n/lm555n.cir.out11
-rw-r--r--src/SubcircuitLibrary/lm555n/lm555n.sch627
-rw-r--r--src/SubcircuitLibrary/lm555n/lm555n.sub8
-rw-r--r--src/SubcircuitLibrary/lm555n/npn_1.lib29
8 files changed, 807 insertions, 788 deletions
diff --git a/src/SubcircuitLibrary/lm555n/lm555n-cache.lib b/src/SubcircuitLibrary/lm555n/lm555n-cache.lib
index fb2aef47..824af11e 100644
--- a/src/SubcircuitLibrary/lm555n/lm555n-cache.lib
+++ b/src/SubcircuitLibrary/lm555n/lm555n-cache.lib
@@ -1,81 +1,6 @@
EESchema-LIBRARY Version 2.3
#encoding utf-8
#
-# ADC8
-#
-DEF ADC8 U 0 10 Y Y 8 L N
-F0 "U" -100 100 40 H V C CNN
-F1 "ADC8" 0 0 40 H V C CNN
-F2 "" 0 0 60 H I C CNN
-F3 "" 0 0 60 H I C CNN
-DRAW
-S -150 50 150 -50 0 1 0 N
-X in1 1 -300 0 150 R 25 25 1 1 I
-X out1 9 300 0 150 L 25 25 1 1 O
-X in2 2 -300 0 150 R 25 25 2 1 I
-X out2 10 300 0 150 L 25 25 2 1 O
-X in3 3 -300 0 150 R 25 25 3 1 I
-X out3 11 300 0 150 L 25 25 3 1 O
-X in4 4 -300 0 150 R 25 25 4 1 I
-X out4 12 300 0 150 L 25 25 4 1 O
-X in5 5 -300 0 150 R 25 25 5 1 I
-X out5 13 300 0 150 L 25 25 5 1 O
-X in6 6 -300 0 150 R 25 25 6 1 I
-X out6 14 300 0 150 L 25 25 6 1 O
-X in7 7 -300 0 150 R 25 25 7 1 I
-X out7 15 300 0 150 L 25 25 7 1 O
-X in8 8 -300 0 150 R 25 25 8 1 I
-X out8 16 300 0 150 L 25 25 8 1 O
-ENDDRAW
-ENDDEF
-#
-# DAC8
-#
-DEF DAC8 U 0 10 Y Y 8 L N
-F0 "U" -100 100 40 H V C CNN
-F1 "DAC8" 0 0 40 H V C CNN
-F2 "" 0 0 60 H I C CNN
-F3 "" 0 0 60 H I C CNN
-DRAW
-S -150 50 150 -50 0 1 0 N
-X in1 1 -300 0 150 R 25 25 1 1 I
-X out1 9 300 0 150 L 25 25 1 1 O
-X in2 2 -300 0 150 R 25 25 2 1 I
-X out2 10 300 0 150 L 25 25 2 1 O
-X in3 3 -300 0 150 R 25 25 3 1 I
-X out3 11 300 0 150 L 25 25 3 1 O
-X in4 4 -300 0 150 R 25 25 4 1 I
-X out4 12 300 0 150 L 25 25 4 1 O
-X in5 5 -300 0 150 R 25 25 5 1 I
-X out5 13 300 0 150 L 25 25 5 1 O
-X in6 6 -300 0 150 R 25 25 6 1 I
-X out6 14 300 0 150 L 25 25 6 1 O
-X in7 7 -300 0 150 R 25 25 7 1 I
-X out7 15 300 0 150 L 25 25 7 1 O
-X in8 8 -300 0 150 R 25 25 8 1 I
-X out8 16 300 0 150 L 25 25 8 1 O
-ENDDRAW
-ENDDEF
-#
-# D_SRLatch
-#
-DEF D_SRLatch U 0 40 Y Y 1 F N
-F0 "U" -200 250 60 H V C CNN
-F1 "D_SRLatch" 0 100 60 H V C CNN
-F2 "" 0 0 60 H I C CNN
-F3 "" 0 0 60 H I C CNN
-DRAW
-S -300 200 300 -200 0 1 0 N
-X S 1 -600 150 300 R 50 50 1 1 I
-X R 2 -600 -150 300 R 50 50 1 1 I
-X Enable 3 -600 0 300 R 50 50 1 1 I
-X Set 4 150 -500 300 U 50 50 1 1 I
-X Reset 5 -150 -500 300 U 50 50 1 1 I
-X Q 6 600 150 300 L 50 50 1 1 O
-X ~Q 7 600 -150 300 L 50 50 1 1 O I
-ENDDRAW
-ENDDEF
-#
# GND-RESCUE-lm555n
#
DEF ~GND-RESCUE-lm555n #PWR 0 0 Y Y 1 F P
@@ -89,54 +14,6 @@ X GND 1 0 0 0 U 30 30 1 1 W N
ENDDRAW
ENDDEF
#
-# LIMIT8
-#
-DEF LIMIT8 U 0 40 Y Y 8 F N
-F0 "U" 0 100 30 H V C CNN
-F1 "LIMIT8" 0 0 30 H V C CNN
-F2 "" 0 0 60 H I C CNN
-F3 "" 0 0 60 H I C CNN
-DRAW
-S -150 50 150 -50 0 1 0 N
-X in 1 -300 0 150 R 25 25 1 1 I
-X out 9 300 0 150 L 25 25 1 1 O
-X in 2 -300 0 150 R 25 25 2 1 I
-X out 10 300 0 150 L 25 25 2 1 O
-X in 3 -300 0 150 R 25 25 3 1 I
-X out 11 300 0 150 L 25 25 3 1 O
-X in 4 -300 0 150 R 25 25 4 1 I
-X out 12 300 0 150 L 25 25 4 1 O
-X in 5 -300 0 150 R 25 25 5 1 I
-X out 13 300 0 150 L 25 25 5 1 O
-X in 6 -300 0 150 R 25 25 6 1 I
-X out 14 300 0 150 L 25 25 6 1 O
-X in 7 -300 0 150 R 25 25 7 1 I
-X out 15 300 0 150 L 25 25 7 1 O
-X in 8 -300 0 150 R 25 25 8 1 I
-X out 16 300 0 150 L 25 25 8 1 O
-ENDDRAW
-ENDDEF
-#
-# NPN
-#
-DEF NPN Q 0 0 Y Y 1 F N
-F0 "Q" 0 -150 50 H V R CNN
-F1 "NPN" 0 150 50 H V R CNN
-F2 "" 0 0 60 H I C CNN
-F3 "" 0 0 60 H I C CNN
-DRAW
-C 50 0 111 0 1 10 N
-P 2 0 1 0 0 0 100 100 N
-P 3 0 1 10 0 75 0 -75 0 -75 N
-P 3 0 1 0 50 -50 0 0 0 0 N
-P 3 0 1 0 90 -90 100 -100 100 -100 N
-P 5 0 1 0 90 -90 70 -30 30 -70 90 -90 90 -90 F
-X E 1 100 -200 100 U 40 40 1 1 P
-X B 2 -200 0 200 R 40 40 1 1 I
-X C 3 100 200 100 D 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
# PORT
#
DEF PORT U 0 40 Y Y 26 F N
@@ -229,17 +106,99 @@ X -c 4 50 -200 100 U 35 35 1 1 P
ENDDRAW
ENDDEF
#
-# d_inverter-RESCUE-lm555n
+# adc_bridge_1
#
-DEF d_inverter-RESCUE-lm555n U 0 40 Y Y 1 F N
-F0 "U" -150 100 40 H V C CNN
-F1 "d_inverter-RESCUE-lm555n" 100 100 40 H V C CNN
-F2 "" 0 0 60 H I C CNN
-F3 "" 0 0 60 H I C CNN
+DEF adc_bridge_1 U 0 40 Y Y 1 F N
+F0 "U" 0 0 60 H V C CNN
+F1 "adc_bridge_1" 0 150 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -400 200 350 -50 0 1 0 N
+X IN1 1 -600 50 200 R 50 50 1 1 I
+X OUT1 2 550 50 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# d_inverter
+#
+DEF d_inverter U 0 40 Y Y 1 F N
+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 -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
+#
+# d_srlatch
+#
+DEF d_srlatch U 0 40 Y Y 1 F N
+F0 "U" 0 0 60 H V C CNN
+F1 "d_srlatch" 50 150 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S 600 550 -600 -600 0 1 0 N
+X S 1 -800 400 200 R 50 50 1 1 I
+X R 2 -800 -450 200 R 50 50 1 1 I
+X EN 3 -800 0 200 R 50 50 1 1 I
+X Set 4 0 750 200 D 50 50 1 1 I
+X Reset 5 0 -800 200 U 50 50 1 1 I
+X Out 6 800 400 200 L 50 50 1 1 O
+X Nout 7 800 -450 200 L 50 50 1 1 O I
+ENDDRAW
+ENDDEF
+#
+# dac_bridge_1
+#
+DEF dac_bridge_1 U 0 40 Y Y 1 F N
+F0 "U" 0 0 60 H V C CNN
+F1 "dac_bridge_1" 0 150 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -400 200 350 -50 0 1 0 N
+X IN1 1 -600 50 200 R 50 50 1 1 I
+X OUT1 2 550 50 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# eSim_NPN
+#
+DEF eSim_NPN Q 0 0 Y N 1 F N
+F0 "Q" -100 50 50 H V R CNN
+F1 "eSim_NPN" -50 150 50 H V R CNN
+F2 "" 200 100 29 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS BC547 Q2N2222
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0 25 25 100 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
+X C 1 100 200 100 D 50 50 1 1 P
+X B 2 -200 0 225 R 50 50 1 1 P
+X E 3 100 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# limit
+#
+DEF limit U 0 40 Y Y 1 F N
+F0 "U" 50 -50 60 H V C CNN
+F1 "limit" 50 50 60 H V C CNN
+F2 "" 0 50 60 H V C CNN
+F3 "" 0 50 60 H V C CNN
DRAW
-P 4 0 1 0 -100 -100 -100 100 100 0 -100 -100 N
-X in 1 -250 0 150 R 25 25 1 1 I
-X out 2 250 0 150 L 25 25 1 1 O I
+C 300 0 0 0 1 0 N
+P 4 0 1 0 -200 200 -200 -200 400 0 -200 200 N
+X IN 1 -400 0 200 R 50 50 1 1 I
+X OUT 2 600 0 200 L 50 50 1 1 O
ENDDRAW
ENDDEF
#
diff --git a/src/SubcircuitLibrary/lm555n/lm555n.bak b/src/SubcircuitLibrary/lm555n/lm555n.bak
index 066e1c98..28110b13 100644
--- a/src/SubcircuitLibrary/lm555n/lm555n.bak
+++ b/src/SubcircuitLibrary/lm555n/lm555n.bak
@@ -29,6 +29,17 @@ LIBS:opto
LIBS:atmel
LIBS:contrib
LIBS:valves
+LIBS:eSim_User
+LIBS:eSim_Subckt
+LIBS:eSim_Sources
+LIBS:eSim_PSpice
+LIBS:eSim_Power
+LIBS:eSim_Plot
+LIBS:eSim_Miscellaneous
+LIBS:eSim_Hybrid
+LIBS:eSim_Digital
+LIBS:eSim_Devices
+LIBS:eSim_Analog
LIBS:lm555n-cache
EELAYER 25 0
EELAYER END
@@ -44,443 +55,464 @@ Comment2 ""
Comment3 ""
Comment4 ""
$EndDescr
-$Comp
-L d_inverter U5
-U 1 1 50CEA9C5
-P 6700 4050
-F 0 "U5" H 6550 4150 40 0000 C CNN
-F 1 "D_INVERTER" H 6800 4150 40 0000 C CNN
-F 2 "" H 6700 4050 60 0001 C CNN
-F 3 "" H 6700 4050 60 0001 C CNN
- 1 6700 4050
- 1 0 0 -1
-$EndComp
-$Comp
-L D_SRLatch U6
-U 1 1 50CEA9AE
-P 7100 3400
-F 0 "U6" H 6900 3650 60 0000 C CNN
-F 1 "D_SRLATCH" H 7100 3500 60 0000 C CNN
-F 2 "" H 7100 3400 60 0001 C CNN
-F 3 "" H 7100 3400 60 0001 C CNN
- 1 7100 3400
- 1 0 0 -1
-$EndComp
-Text Notes 5750 3050 0 60 ~ 0
+Text Notes 3700 3050 0 60 ~ 0
IC 555
Wire Wire Line
- 4700 3000 4900 3000
-Wire Wire Line
- 4700 4750 4700 4650
-Connection ~ 4400 3550
-Connection ~ 4400 4900
-Wire Wire Line
- 4300 4900 7700 4900
-Wire Wire Line
- 4400 4200 4400 4100
-Wire Wire Line
- 7700 4900 7700 4800
-Wire Wire Line
- 7700 3250 7850 3250
-Wire Wire Line
- 7400 4600 7100 4600
-Wire Wire Line
- 7100 4600 7100 4250
+ 2650 3000 2850 3000
Wire Wire Line
- 7700 3650 7700 3550
+ 2650 4750 2650 4650
+Connection ~ 2350 3550
+Connection ~ 2350 4900
Wire Wire Line
- 6350 4050 6450 4050
+ 2350 4100 2350 4200
Wire Wire Line
- 6950 3900 6950 4000
+ 9100 4900 9100 4800
Wire Wire Line
- 7150 4000 7150 4050
+ 8500 4600 8500 4250
Wire Wire Line
- 7150 4050 6950 4050
+ 3350 3250 3050 3250
Wire Wire Line
- 6500 3550 6200 3550
+ 3050 3250 3050 3750
Wire Wire Line
- 6350 3250 6500 3250
+ 3500 4350 3500 4500
Wire Wire Line
- 5400 3250 5100 3250
+ 3650 3550 4200 3550
Wire Wire Line
- 5100 3250 5100 3750
+ 3850 3250 4200 3250
Wire Wire Line
- 5550 4500 5550 4350
+ 3150 3550 3150 3700
Wire Wire Line
- 5700 3550 5800 3550
+ 3150 3700 3500 3700
Wire Wire Line
- 5900 3250 6000 3250
+ 3500 3700 3500 3750
+Connection ~ 3500 4450
Wire Wire Line
- 6000 3850 6350 3850
+ 3700 4450 3700 4400
Wire Wire Line
- 5800 4150 6200 4150
+ 3050 4350 3050 4450
Wire Wire Line
- 5200 3550 5200 3700
+ 3050 4450 3700 4450
Wire Wire Line
- 5200 3700 5550 3700
+ 9100 4250 9000 4250
Wire Wire Line
- 5550 3700 5550 3750
-Connection ~ 5550 4450
+ 9100 4400 9100 4350
Wire Wire Line
- 5750 4400 5750 4450
+ 9100 4350 9200 4350
Wire Wire Line
- 5100 4350 5100 4450
+ 10100 2950 10350 2950
Wire Wire Line
- 5100 4450 5750 4450
+ 2350 4900 2350 4700
Wire Wire Line
- 6500 3400 6450 3400
+ 2350 3500 2350 3600
Wire Wire Line
- 6450 3400 6450 4050
+ 2250 3000 2350 3000
Wire Wire Line
- 6950 4000 7250 4000
+ 2350 4150 2650 4150
+Connection ~ 2350 4150
Wire Wire Line
- 7250 4000 7250 3900
-Connection ~ 7150 4000
+ 2250 3550 2650 3550
Wire Wire Line
- 7600 4250 7700 4250
+ 2650 3550 2650 3500
Wire Wire Line
- 7700 4400 7700 4350
-Wire Wire Line
- 7700 4350 7800 4350
-Wire Wire Line
- 7850 3850 7900 3850
-Wire Wire Line
- 4400 4900 4400 4700
-Wire Wire Line
- 4400 3600 4400 3500
-Wire Wire Line
- 4300 3000 4400 3000
-Wire Wire Line
- 4400 4150 4700 4150
-Connection ~ 4400 4150
-Wire Wire Line
- 4300 3550 4700 3550
-Wire Wire Line
- 4700 3550 4700 3500
-Wire Wire Line
- 6350 4750 6350 4650
-Text Label 4850 4100 0 60 ~ 0
+ 4300 4750 4300 4650
+Text Label 2800 4100 0 60 ~ 0
d
$Comp
L VCVS E2
U 1 1 50AA12FF
-P 5050 4050
-F 0 "E2" H 4850 4150 50 0000 C CNN
-F 1 "10000" H 4850 4000 50 0000 C CNN
-F 2 "" H 5050 4050 60 0001 C CNN
-F 3 "" H 5050 4050 60 0001 C CNN
- 1 5050 4050
- 0 1 1 0
-$EndComp
-$Comp
-L LIMIT8 U4
-U 2 1 50B4E21B
-P 6000 3550
-F 0 "U4" H 6000 3650 30 0000 C CNN
-F 1 "LIMIT8" H 6000 3550 30 0000 C CNN
-F 2 "" H 6000 3550 60 0001 C CNN
-F 3 "" H 6000 3550 60 0001 C CNN
- 2 6000 3550
+P 3000 4050
+F 0 "E2" H 2800 4150 50 0000 C CNN
+F 1 "10000" H 2800 4000 50 0000 C CNN
+F 2 "" H 3000 4050 60 0001 C CNN
+F 3 "" H 3000 4050 60 0001 C CNN
+ 1 3000 4050
0 1 1 0
$EndComp
$Comp
-L LIMIT8 U4
-U 1 1 50B4E215
-P 5800 3850
-F 0 "U4" H 5800 3950 30 0000 C CNN
-F 1 "LIMIT8" H 5800 3850 30 0000 C CNN
-F 2 "" H 5800 3850 60 0001 C CNN
-F 3 "" H 5800 3850 60 0001 C CNN
- 1 5800 3850
- 0 1 1 0
-$EndComp
-$Comp
-L DAC8 U3
-U 2 1 50AAFCE7
-P 7700 3950
-F 0 "U3" H 7600 4050 40 0000 C CNN
-F 1 "DAC8" H 7700 3950 40 0000 C CNN
-F 2 "" H 7700 3950 60 0001 C CNN
-F 3 "" H 7700 3950 60 0001 C CNN
- 2 7700 3950
- 0 1 1 0
-$EndComp
-$Comp
-L DAC8 U3
-U 1 1 50AAFC9A
-P 7850 3550
-F 0 "U3" H 7750 3650 40 0000 C CNN
-F 1 "DAC8" H 7850 3550 40 0000 C CNN
-F 2 "" H 7850 3550 60 0001 C CNN
-F 3 "" H 7850 3550 60 0001 C CNN
- 1 7850 3550
- 0 1 1 0
-$EndComp
-$Comp
-L ADC8 U2
-U 3 1 50AAFB76
-P 6350 4350
-F 0 "U2" H 6250 4450 40 0000 C CNN
-F 1 "ADC8" H 6350 4350 40 0000 C CNN
-F 2 "" H 6350 4350 60 0001 C CNN
-F 3 "" H 6350 4350 60 0001 C CNN
- 3 6350 4350
- 0 -1 -1 0
-$EndComp
-$Comp
-L ADC8 U2
-U 2 1 50AAFB64
-P 6350 3550
-F 0 "U2" H 6250 3650 40 0000 C CNN
-F 1 "ADC8" H 6350 3550 40 0000 C CNN
-F 2 "" H 6350 3550 60 0001 C CNN
-F 3 "" H 6350 3550 60 0001 C CNN
- 2 6350 3550
- 0 -1 -1 0
-$EndComp
-$Comp
-L ADC8 U2
-U 1 1 50AAFB55
-P 6200 3850
-F 0 "U2" H 6100 3950 40 0000 C CNN
-F 1 "ADC8" H 6200 3850 40 0000 C CNN
-F 2 "" H 6200 3850 60 0001 C CNN
-F 3 "" H 6200 3850 60 0001 C CNN
- 1 6200 3850
- 0 -1 -1 0
-$EndComp
-$Comp
L PWR_FLAG #FLG01
U 1 1 50AA39A3
-P 5750 4400
-F 0 "#FLG01" H 5750 4670 30 0001 C CNN
-F 1 "PWR_FLAG" H 5750 4630 30 0000 C CNN
-F 2 "" H 5750 4400 60 0001 C CNN
-F 3 "" H 5750 4400 60 0001 C CNN
- 1 5750 4400
+P 3700 4400
+F 0 "#FLG01" H 3700 4670 30 0001 C CNN
+F 1 "PWR_FLAG" H 3700 4630 30 0000 C CNN
+F 2 "" H 3700 4400 60 0001 C CNN
+F 3 "" H 3700 4400 60 0001 C CNN
+ 1 3700 4400
1 0 0 -1
$EndComp
$Comp
L PORT U1
U 5 1 50AA2210
-P 4050 3550
-F 0 "U1" H 4050 3500 30 0000 C CNN
-F 1 "PORT" H 4050 3550 30 0000 C CNN
-F 2 "" H 4050 3550 60 0001 C CNN
-F 3 "" H 4050 3550 60 0001 C CNN
- 5 4050 3550
+P 2000 3550
+F 0 "U1" H 2000 3500 30 0000 C CNN
+F 1 "PORT" H 2000 3550 30 0000 C CNN
+F 2 "" H 2000 3550 60 0001 C CNN
+F 3 "" H 2000 3550 60 0001 C CNN
+ 5 2000 3550
1 0 0 -1
$EndComp
$Comp
L PORT U1
U 1 1 50AA21C7
-P 4050 4900
-F 0 "U1" H 4050 4850 30 0000 C CNN
-F 1 "PORT" H 4050 4900 30 0000 C CNN
-F 2 "" H 4050 4900 60 0001 C CNN
-F 3 "" H 4050 4900 60 0001 C CNN
- 1 4050 4900
+P 2000 4900
+F 0 "U1" H 2000 4850 30 0000 C CNN
+F 1 "PORT" H 2000 4900 30 0000 C CNN
+F 2 "" H 2000 4900 60 0001 C CNN
+F 3 "" H 2000 4900 60 0001 C CNN
+ 1 2000 4900
1 0 0 -1
$EndComp
$Comp
L PORT U1
U 2 1 50AA21BC
-P 4700 5000
-F 0 "U1" H 4700 4950 30 0000 C CNN
-F 1 "PORT" H 4700 5000 30 0000 C CNN
-F 2 "" H 4700 5000 60 0001 C CNN
-F 3 "" H 4700 5000 60 0001 C CNN
- 2 4700 5000
+P 2650 5000
+F 0 "U1" H 2650 4950 30 0000 C CNN
+F 1 "PORT" H 2650 5000 30 0000 C CNN
+F 2 "" H 2650 5000 60 0001 C CNN
+F 3 "" H 2650 5000 60 0001 C CNN
+ 2 2650 5000
0 -1 -1 0
$EndComp
$Comp
L PORT U1
U 4 1 50AA21A9
-P 6350 5000
-F 0 "U1" H 6350 4950 30 0000 C CNN
-F 1 "PORT" H 6350 5000 30 0000 C CNN
-F 2 "" H 6350 5000 60 0001 C CNN
-F 3 "" H 6350 5000 60 0001 C CNN
- 4 6350 5000
+P 4300 5000
+F 0 "U1" H 4300 4950 30 0000 C CNN
+F 1 "PORT" H 4300 5000 30 0000 C CNN
+F 2 "" H 4300 5000 60 0001 C CNN
+F 3 "" H 4300 5000 60 0001 C CNN
+ 4 4300 5000
0 -1 -1 0
$EndComp
$Comp
L PORT U1
U 7 1 50AA21A0
-P 8050 4350
-F 0 "U1" H 8050 4300 30 0000 C CNN
-F 1 "PORT" H 8050 4350 30 0000 C CNN
-F 2 "" H 8050 4350 60 0001 C CNN
-F 3 "" H 8050 4350 60 0001 C CNN
- 7 8050 4350
+P 9450 4350
+F 0 "U1" H 9450 4300 30 0000 C CNN
+F 1 "PORT" H 9450 4350 30 0000 C CNN
+F 2 "" H 9450 4350 60 0001 C CNN
+F 3 "" H 9450 4350 60 0001 C CNN
+ 7 9450 4350
-1 0 0 1
$EndComp
$Comp
L PORT U1
U 3 1 50AA2181
-P 8150 3850
-F 0 "U1" H 8150 3800 30 0000 C CNN
-F 1 "PORT" H 8150 3850 30 0000 C CNN
-F 2 "" H 8150 3850 60 0001 C CNN
-F 3 "" H 8150 3850 60 0001 C CNN
- 3 8150 3850
+P 10600 2950
+F 0 "U1" H 10600 2900 30 0000 C CNN
+F 1 "PORT" H 10600 2950 30 0000 C CNN
+F 2 "" H 10600 2950 60 0001 C CNN
+F 3 "" H 10600 2950 60 0001 C CNN
+ 3 10600 2950
-1 0 0 1
$EndComp
$Comp
L PORT U1
U 6 1 50AA2171
-P 5150 3000
-F 0 "U1" H 5150 2950 30 0000 C CNN
-F 1 "PORT" H 5150 3000 30 0000 C CNN
-F 2 "" H 5150 3000 60 0001 C CNN
-F 3 "" H 5150 3000 60 0001 C CNN
- 6 5150 3000
+P 3100 3000
+F 0 "U1" H 3100 2950 30 0000 C CNN
+F 1 "PORT" H 3100 3000 30 0000 C CNN
+F 2 "" H 3100 3000 60 0001 C CNN
+F 3 "" H 3100 3000 60 0001 C CNN
+ 6 3100 3000
-1 0 0 1
$EndComp
$Comp
L PORT U1
U 8 1 50AA2162
-P 4050 3000
-F 0 "U1" H 4050 2950 30 0000 C CNN
-F 1 "PORT" H 4050 3000 30 0000 C CNN
-F 2 "" H 4050 3000 60 0001 C CNN
-F 3 "" H 4050 3000 60 0001 C CNN
- 8 4050 3000
+P 2000 3000
+F 0 "U1" H 2000 2950 30 0000 C CNN
+F 1 "PORT" H 2000 3000 30 0000 C CNN
+F 2 "" H 2000 3000 60 0001 C CNN
+F 3 "" H 2000 3000 60 0001 C CNN
+ 8 2000 3000
1 0 0 -1
$EndComp
$Comp
L R-RESCUE-lm555n R8
U 1 1 50AA20DA
-P 7350 4250
-F 0 "R8" V 7430 4250 50 0000 C CNN
-F 1 "1500" V 7350 4250 50 0000 C CNN
-F 2 "" H 7350 4250 60 0001 C CNN
-F 3 "" H 7350 4250 60 0001 C CNN
- 1 7350 4250
+P 8750 4250
+F 0 "R8" V 8830 4250 50 0000 C CNN
+F 1 "1500" V 8750 4250 50 0000 C CNN
+F 2 "" H 8750 4250 60 0001 C CNN
+F 3 "" H 8750 4250 60 0001 C CNN
+ 1 8750 4250
0 1 1 0
$EndComp
$Comp
-L NPN Q1
-U 1 1 50AA2050
-P 7600 4600
-F 0 "Q1" H 7600 4450 50 0000 R CNN
-F 1 "QNOM" H 7600 4750 50 0000 R CNN
-F 2 "" H 7600 4600 60 0001 C CNN
-F 3 "" H 7600 4600 60 0001 C CNN
- 1 7600 4600
- 1 0 0 -1
-$EndComp
-$Comp
L GND-RESCUE-lm555n #PWR02
U 1 1 50AA140C
-P 5550 4500
-F 0 "#PWR02" H 5550 4500 30 0001 C CNN
-F 1 "GND" H 5550 4430 30 0001 C CNN
-F 2 "" H 5550 4500 60 0001 C CNN
-F 3 "" H 5550 4500 60 0001 C CNN
- 1 5550 4500
+P 3500 4500
+F 0 "#PWR02" H 3500 4500 30 0001 C CNN
+F 1 "GND" H 3500 4430 30 0001 C CNN
+F 2 "" H 3500 4500 60 0001 C CNN
+F 3 "" H 3500 4500 60 0001 C CNN
+ 1 3500 4500
1 0 0 -1
$EndComp
-Text Label 4850 4000 0 60 ~ 0
+Text Label 2800 4000 0 60 ~ 0
c
-Text Label 4700 4650 0 60 ~ 0
+Text Label 2650 4650 0 60 ~ 0
d
-Text Label 4700 4150 0 60 ~ 0
+Text Label 2650 4150 0 60 ~ 0
c
$Comp
L R-RESCUE-lm555n R7
U 1 1 50AA12F7
-P 5650 3250
-F 0 "R7" V 5730 3250 50 0000 C CNN
-F 1 "25" V 5650 3250 50 0000 C CNN
-F 2 "" H 5650 3250 60 0001 C CNN
-F 3 "" H 5650 3250 60 0001 C CNN
- 1 5650 3250
+P 3600 3250
+F 0 "R7" V 3680 3250 50 0000 C CNN
+F 1 "25" V 3600 3250 50 0000 C CNN
+F 2 "" H 3600 3250 60 0001 C CNN
+F 3 "" H 3600 3250 60 0001 C CNN
+ 1 3600 3250
0 -1 -1 0
$EndComp
$Comp
L R-RESCUE-lm555n R6
U 1 1 50AA12B0
-P 5450 3550
-F 0 "R6" V 5530 3550 50 0000 C CNN
-F 1 "25" V 5450 3550 50 0000 C CNN
-F 2 "" H 5450 3550 60 0001 C CNN
-F 3 "" H 5450 3550 60 0001 C CNN
- 1 5450 3550
+P 3400 3550
+F 0 "R6" V 3480 3550 50 0000 C CNN
+F 1 "25" V 3400 3550 50 0000 C CNN
+F 2 "" H 3400 3550 60 0001 C CNN
+F 3 "" H 3400 3550 60 0001 C CNN
+ 1 3400 3550
0 -1 -1 0
$EndComp
-Text Label 5300 4000 0 60 ~ 0
+Text Label 3250 4000 0 60 ~ 0
b
-Text Label 5300 4100 0 60 ~ 0
+Text Label 3250 4100 0 60 ~ 0
a
-Text Label 4700 3000 0 60 ~ 0
+Text Label 2650 3000 0 60 ~ 0
b
-Text Label 4700 3500 0 60 ~ 0
+Text Label 2650 3500 0 60 ~ 0
a
$Comp
L VCVS E1
U 1 1 50AA11B6
-P 5500 4050
-F 0 "E1" H 5300 4150 50 0000 C CNN
-F 1 "10000" H 5300 4000 50 0000 C CNN
-F 2 "" H 5500 4050 60 0001 C CNN
-F 3 "" H 5500 4050 60 0001 C CNN
- 1 5500 4050
+P 3450 4050
+F 0 "E1" H 3250 4150 50 0000 C CNN
+F 1 "10000" H 3250 4000 50 0000 C CNN
+F 2 "" H 3450 4050 60 0001 C CNN
+F 3 "" H 3450 4050 60 0001 C CNN
+ 1 3450 4050
0 1 1 0
$EndComp
$Comp
L R-RESCUE-lm555n R4
U 1 1 50A9E00B
-P 4700 3250
-F 0 "R4" V 4780 3250 50 0000 C CNN
-F 1 "2E6" V 4700 3250 50 0000 C CNN
-F 2 "" H 4700 3250 60 0001 C CNN
-F 3 "" H 4700 3250 60 0001 C CNN
- 1 4700 3250
+P 2650 3250
+F 0 "R4" V 2730 3250 50 0000 C CNN
+F 1 "2E6" V 2650 3250 50 0000 C CNN
+F 2 "" H 2650 3250 60 0001 C CNN
+F 3 "" H 2650 3250 60 0001 C CNN
+ 1 2650 3250
1 0 0 -1
$EndComp
$Comp
L R-RESCUE-lm555n R5
U 1 1 50A9E001
-P 4700 4400
-F 0 "R5" V 4780 4400 50 0000 C CNN
-F 1 "2E6" V 4700 4400 50 0000 C CNN
-F 2 "" H 4700 4400 60 0001 C CNN
-F 3 "" H 4700 4400 60 0001 C CNN
- 1 4700 4400
+P 2650 4400
+F 0 "R5" V 2730 4400 50 0000 C CNN
+F 1 "2E6" V 2650 4400 50 0000 C CNN
+F 2 "" H 2650 4400 60 0001 C CNN
+F 3 "" H 2650 4400 60 0001 C CNN
+ 1 2650 4400
1 0 0 -1
$EndComp
$Comp
L R-RESCUE-lm555n R3
U 1 1 50A9DF09
-P 4400 4450
-F 0 "R3" V 4480 4450 50 0000 C CNN
-F 1 "5000" V 4400 4450 50 0000 C CNN
-F 2 "" H 4400 4450 60 0001 C CNN
-F 3 "" H 4400 4450 60 0001 C CNN
- 1 4400 4450
+P 2350 4450
+F 0 "R3" V 2430 4450 50 0000 C CNN
+F 1 "5000" V 2350 4450 50 0000 C CNN
+F 2 "" H 2350 4450 60 0001 C CNN
+F 3 "" H 2350 4450 60 0001 C CNN
+ 1 2350 4450
1 0 0 -1
$EndComp
$Comp
L R-RESCUE-lm555n R2
U 1 1 50A9DF03
-P 4400 3850
-F 0 "R2" V 4480 3850 50 0000 C CNN
-F 1 "5000" V 4400 3850 50 0000 C CNN
-F 2 "" H 4400 3850 60 0001 C CNN
-F 3 "" H 4400 3850 60 0001 C CNN
- 1 4400 3850
+P 2350 3850
+F 0 "R2" V 2430 3850 50 0000 C CNN
+F 1 "5000" V 2350 3850 50 0000 C CNN
+F 2 "" H 2350 3850 60 0001 C CNN
+F 3 "" H 2350 3850 60 0001 C CNN
+ 1 2350 3850
1 0 0 -1
$EndComp
$Comp
L R-RESCUE-lm555n R1
U 1 1 50A9DEFE
-P 4400 3250
-F 0 "R1" V 4480 3250 50 0000 C CNN
-F 1 "5000" V 4400 3250 50 0000 C CNN
-F 2 "" H 4400 3250 60 0001 C CNN
-F 3 "" H 4400 3250 60 0001 C CNN
- 1 4400 3250
+P 2350 3250
+F 0 "R1" V 2430 3250 50 0000 C CNN
+F 1 "5000" V 2350 3250 50 0000 C CNN
+F 2 "" H 2350 3250 60 0001 C CNN
+F 3 "" H 2350 3250 60 0001 C CNN
+ 1 2350 3250
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_srlatch U8
+U 1 1 5E01E563
+P 8000 3350
+F 0 "U8" H 8000 3350 60 0000 C CNN
+F 1 "d_srlatch" H 8050 3500 60 0000 C CNN
+F 2 "" H 8000 3350 60 0000 C CNN
+F 3 "" H 8000 3350 60 0000 C CNN
+ 1 8000 3350
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_inverter U7
+U 1 1 5E01F10F
+P 7450 4400
+F 0 "U7" H 7450 4300 60 0000 C CNN
+F 1 "d_inverter" H 7450 4550 60 0000 C CNN
+F 2 "" H 7500 4350 60 0000 C CNN
+F 3 "" H 7500 4350 60 0000 C CNN
+ 1 7450 4400
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 7750 4400 8150 4400
+Wire Wire Line
+ 8000 4400 8000 4150
+$Comp
+L adc_bridge_1 U5
+U 1 1 5E01F2C7
+P 6350 3400
+F 0 "U5" H 6350 3400 60 0000 C CNN
+F 1 "adc_bridge_1" H 6350 3550 60 0000 C CNN
+F 2 "" H 6350 3400 60 0000 C CNN
+F 3 "" H 6350 3400 60 0000 C CNN
+ 1 6350 3400
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 6900 3350 7200 3350
+Wire Wire Line
+ 4300 4650 5600 4650
+Wire Wire Line
+ 5600 4650 5600 3350
+Wire Wire Line
+ 5600 3350 5750 3350
+$Comp
+L adc_bridge_1 U4
+U 1 1 5E01F3F2
+P 6350 3000
+F 0 "U4" H 6350 3000 60 0000 C CNN
+F 1 "adc_bridge_1" H 6350 3150 60 0000 C CNN
+F 2 "" H 6350 3000 60 0000 C CNN
+F 3 "" H 6350 3000 60 0000 C CNN
+ 1 6350 3000
1 0 0 -1
$EndComp
+$Comp
+L adc_bridge_1 U6
+U 1 1 5E01F469
+P 6350 3850
+F 0 "U6" H 6350 3850 60 0000 C CNN
+F 1 "adc_bridge_1" H 6350 4000 60 0000 C CNN
+F 2 "" H 6350 3850 60 0000 C CNN
+F 3 "" H 6350 3850 60 0000 C CNN
+ 1 6350 3850
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 6900 3800 7200 3800
+Wire Wire Line
+ 7200 2950 6900 2950
+$Comp
+L limit U3
+U 1 1 5E01F5DC
+P 4900 2950
+F 0 "U3" H 4950 2900 60 0000 C CNN
+F 1 "limit" H 4950 3000 60 0000 C CNN
+F 2 "" H 4900 3000 60 0000 C CNN
+F 3 "" H 4900 3000 60 0000 C CNN
+ 1 4900 2950
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 5500 2950 5750 2950
+Wire Wire Line
+ 4200 3250 4200 2950
+Wire Wire Line
+ 4200 2950 4500 2950
+$Comp
+L limit U2
+U 1 1 5E01F79D
+P 4800 3800
+F 0 "U2" H 4850 3750 60 0000 C CNN
+F 1 "limit" H 4850 3850 60 0000 C CNN
+F 2 "" H 4800 3850 60 0000 C CNN
+F 3 "" H 4800 3850 60 0000 C CNN
+ 1 4800 3800
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 5400 3800 5750 3800
+Wire Wire Line
+ 4200 3550 4200 3800
+Wire Wire Line
+ 4200 3800 4400 3800
+Wire Wire Line
+ 7050 3350 7050 4400
+Wire Wire Line
+ 7050 4400 7150 4400
+Connection ~ 7050 3350
+Wire Wire Line
+ 8000 2600 8150 2600
+Wire Wire Line
+ 8150 2600 8150 4400
+Connection ~ 8000 4400
+$Comp
+L dac_bridge_1 U9
+U 1 1 5E01FCD2
+P 9550 3000
+F 0 "U9" H 9550 3000 60 0000 C CNN
+F 1 "dac_bridge_1" H 9550 3150 60 0000 C CNN
+F 2 "" H 9550 3000 60 0000 C CNN
+F 3 "" H 9550 3000 60 0000 C CNN
+ 1 9550 3000
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 8800 2950 8950 2950
+$Comp
+L dac_bridge_1 U10
+U 1 1 5E01FE8E
+P 9600 3850
+F 0 "U10" H 9600 3850 60 0000 C CNN
+F 1 "dac_bridge_1" H 9600 4000 60 0000 C CNN
+F 2 "" H 9600 3850 60 0000 C CNN
+F 3 "" H 9600 3850 60 0000 C CNN
+ 1 9600 3850
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 9000 3800 8800 3800
+Wire Wire Line
+ 9100 4000 9100 4250
+Wire Wire Line
+ 9100 4000 10300 4000
+Wire Wire Line
+ 10300 4000 10300 3800
+Wire Wire Line
+ 10300 3800 10150 3800
+$Comp
+L eSim_NPN Q1
+U 1 1 5E01E782
+P 9000 4600
+F 0 "Q1" H 8900 4650 50 0000 R CNN
+F 1 "eSim_NPN" H 8950 4750 50 0000 R CNN
+F 2 "" H 9200 4700 29 0000 C CNN
+F 3 "" H 9000 4600 60 0000 C CNN
+ 1 9000 4600
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 8800 4600 8500 4600
+Wire Wire Line
+ 2250 4900 9100 4900
$EndSCHEMATC
diff --git a/src/SubcircuitLibrary/lm555n/lm555n.cir b/src/SubcircuitLibrary/lm555n/lm555n.cir
index 807cd6e9..682d4945 100644
--- a/src/SubcircuitLibrary/lm555n/lm555n.cir
+++ b/src/SubcircuitLibrary/lm555n/lm555n.cir
@@ -1,27 +1,31 @@
-* /home/saurabh/Downloads/eSim-1.1.2/src/SubcircuitLibrary/lm555n/lm555n.cir
+* /home/ash98/Downloads/lm555n/lm555n.cir
-* EESchema Netlist Version 1.1 (Spice format) creation date: Mon Jan 28 13:25:01 2019
+* EESchema Netlist Version 1.1 (Spice format) creation date: Tue Dec 24 15:58:04 2019
* To exclude a component from the Spice Netlist add [Spice_Netlist_Enabled] user FIELD set to: N
* To reorder the component spice node sequence add [Spice_Node_Sequence] user FIELD and define sequence: 2,1,0
* Sheet Name: /
-U5 Net-_U2-Pad11_ Net-_U5-Pad2_ D_INVERTER
-U6 Net-_U2-Pad10_ Net-_U2-Pad9_ Net-_U2-Pad11_ Net-_U5-Pad2_ Net-_U5-Pad2_ Net-_U3-Pad1_ Net-_U3-Pad2_ D_SRLATCH
E2 Net-_E2-Pad1_ GND /c /d 10000
-U4 Net-_R6-Pad2_ Net-_R7-Pad2_ Net-_U2-Pad1_ Net-_U2-Pad2_ LIMIT8
-U3 Net-_U3-Pad1_ Net-_U3-Pad2_ Net-_U1-Pad3_ Net-_R8-Pad1_ DAC8
-U2 Net-_U2-Pad1_ Net-_U2-Pad2_ Net-_U1-Pad4_ Net-_U2-Pad9_ Net-_U2-Pad10_ Net-_U2-Pad11_ ADC8
-U1 Net-_Q1-Pad1_ /d Net-_U1-Pad3_ Net-_U1-Pad4_ /a /b Net-_Q1-Pad3_ Net-_R1-Pad1_ PORT
+U1 Net-_Q1-Pad3_ /d Net-_U1-Pad3_ Net-_U1-Pad4_ /a /b Net-_Q1-Pad1_ Net-_R1-Pad1_ PORT
R8 Net-_R8-Pad1_ Net-_Q1-Pad2_ 1500
-Q1 Net-_Q1-Pad1_ Net-_Q1-Pad2_ Net-_Q1-Pad3_ QNOM
R7 Net-_E2-Pad1_ Net-_R7-Pad2_ 25
R6 Net-_E1-Pad1_ Net-_R6-Pad2_ 25
E1 Net-_E1-Pad1_ GND /b /a 10000
R4 /b /a 2E6
R5 /c /d 2E6
-R3 /c Net-_Q1-Pad1_ 5000
+R3 /c Net-_Q1-Pad3_ 5000
R2 /a /c 5000
R1 Net-_R1-Pad1_ /a 5000
+U8 Net-_U4-Pad2_ Net-_U6-Pad2_ Net-_U5-Pad2_ Net-_U7-Pad2_ Net-_U7-Pad2_ Net-_U8-Pad6_ Net-_U10-Pad1_ d_srlatch
+U7 Net-_U5-Pad2_ Net-_U7-Pad2_ d_inverter
+U5 Net-_U1-Pad4_ Net-_U5-Pad2_ adc_bridge_1
+U4 Net-_U3-Pad2_ Net-_U4-Pad2_ adc_bridge_1
+U6 Net-_U2-Pad2_ Net-_U6-Pad2_ adc_bridge_1
+U3 Net-_R7-Pad2_ Net-_U3-Pad2_ limit
+U2 Net-_R6-Pad2_ Net-_U2-Pad2_ limit
+U9 Net-_U8-Pad6_ Net-_U1-Pad3_ dac_bridge_1
+U10 Net-_U10-Pad1_ Net-_R8-Pad1_ dac_bridge_1
+Q1 Net-_Q1-Pad1_ Net-_Q1-Pad2_ Net-_Q1-Pad3_ eSim_NPN
.end
diff --git a/src/SubcircuitLibrary/lm555n/lm555n.cir.ckt b/src/SubcircuitLibrary/lm555n/lm555n.cir.ckt
deleted file mode 100644
index f45920fd..00000000
--- a/src/SubcircuitLibrary/lm555n/lm555n.cir.ckt
+++ /dev/null
@@ -1,35 +0,0 @@
-* eeschema netlist version 1.1 (spice format) creation date: monday 17 december 2012 11:00:36 am ist
-
-* Inverter d_inverter
-* SR Latch d_srlatch
-e2 18 0 23 14 10000
-* Limiter limit8
-* Digital to Analog converter dac8
-* Analog to Digital converter adc8
-u1 22 14 7 6 15 16 3 13 port
-r8 9 2 1500
-q1 3 2 22 qnom
-r7 18 20 25
-r6 17 19 25
-e1 17 0 16 15 10000
-r4 16 15 2e6
-r5 23 14 2e6
-r3 23 22 5000
-r2 15 23 5000
-r1 13 15 5000
-a1 5 21 u5
-.model u5 d_inverter(rise_delay=1e-12 fall_delay=1e-12 input_load=1e-12)
-a2 1 4 5 21 21 8 10 u6
-.model u6 d_srlatch(rise_delay=1e-12 fall_delay=1e-12 ic=0
-+sr_load=1e-12 enable_load=1e-12 set_load=1e-12 reset_load=1e-12
-+sr_delay=1e-12 enable_delay=1e-12 set_delay=1e-12 reset_delay=1e-12)
-a3 19 11 u4
-a4 20 12 u4
-.model u4 limit(out_lower_limit=0.0 out_upper_limit=5.0 in_offset=0.0 gain=1.0)
-a5 [8] [7] u3
-a6 [10] [9] u3
-.model u3 dac_bridge(out_low=0.2 out_high=5.0 out_undef=5.0 )
-a7 [11] [4] u2
-a8 [12] [1] u2
-a9 [6] [5] u2
-.model u2 adc_bridge(in_low=0.8 in_high=2.0 )
diff --git a/src/SubcircuitLibrary/lm555n/lm555n.cir.out b/src/SubcircuitLibrary/lm555n/lm555n.cir.out
index f45920fd..a81070a1 100644
--- a/src/SubcircuitLibrary/lm555n/lm555n.cir.out
+++ b/src/SubcircuitLibrary/lm555n/lm555n.cir.out
@@ -1,5 +1,5 @@
* eeschema netlist version 1.1 (spice format) creation date: monday 17 december 2012 11:00:36 am ist
-
+.include npn_1.lib
* Inverter d_inverter
* SR Latch d_srlatch
e2 18 0 23 14 10000
@@ -8,7 +8,7 @@ e2 18 0 23 14 10000
* Analog to Digital converter adc8
u1 22 14 7 6 15 16 3 13 port
r8 9 2 1500
-q1 3 2 22 qnom
+q1 3 2 22 npn_1
r7 18 20 25
r6 17 19 25
e1 17 0 16 15 10000
@@ -33,3 +33,10 @@ a7 [11] [4] u2
a8 [12] [1] u2
a9 [6] [5] u2
.model u2 adc_bridge(in_low=0.8 in_high=2.0 )
+
+.control
+run
+print allv > plot_data_v.txt
+print alli > plot_data_i.txt
+.endc
+.end
diff --git a/src/SubcircuitLibrary/lm555n/lm555n.sch b/src/SubcircuitLibrary/lm555n/lm555n.sch
index 6b588212..28110b13 100644
--- a/src/SubcircuitLibrary/lm555n/lm555n.sch
+++ b/src/SubcircuitLibrary/lm555n/lm555n.sch
@@ -55,443 +55,464 @@ Comment2 ""
Comment3 ""
Comment4 ""
$EndDescr
-$Comp
-L d_inverter-RESCUE-lm555n U5
-U 1 1 50CEA9C5
-P 6700 4050
-F 0 "U5" H 6550 4150 40 0000 C CNN
-F 1 "D_INVERTER" H 6800 4150 40 0000 C CNN
-F 2 "" H 6700 4050 60 0001 C CNN
-F 3 "" H 6700 4050 60 0001 C CNN
- 1 6700 4050
- 1 0 0 -1
-$EndComp
-$Comp
-L D_SRLatch U6
-U 1 1 50CEA9AE
-P 7100 3400
-F 0 "U6" H 6900 3650 60 0000 C CNN
-F 1 "D_SRLATCH" H 7100 3500 60 0000 C CNN
-F 2 "" H 7100 3400 60 0001 C CNN
-F 3 "" H 7100 3400 60 0001 C CNN
- 1 7100 3400
- 1 0 0 -1
-$EndComp
-Text Notes 5750 3050 0 60 ~ 0
+Text Notes 3700 3050 0 60 ~ 0
IC 555
Wire Wire Line
- 4700 3000 4900 3000
-Wire Wire Line
- 4700 4750 4700 4650
-Connection ~ 4400 3550
-Connection ~ 4400 4900
-Wire Wire Line
- 4300 4900 7700 4900
-Wire Wire Line
- 4400 4200 4400 4100
-Wire Wire Line
- 7700 4900 7700 4800
-Wire Wire Line
- 7700 3250 7850 3250
-Wire Wire Line
- 7400 4600 7100 4600
-Wire Wire Line
- 7100 4600 7100 4250
+ 2650 3000 2850 3000
Wire Wire Line
- 7700 3650 7700 3550
+ 2650 4750 2650 4650
+Connection ~ 2350 3550
+Connection ~ 2350 4900
Wire Wire Line
- 6350 4050 6450 4050
+ 2350 4100 2350 4200
Wire Wire Line
- 6950 3900 6950 4000
+ 9100 4900 9100 4800
Wire Wire Line
- 7150 4000 7150 4050
+ 8500 4600 8500 4250
Wire Wire Line
- 7150 4050 6950 4050
+ 3350 3250 3050 3250
Wire Wire Line
- 6500 3550 6200 3550
+ 3050 3250 3050 3750
Wire Wire Line
- 6350 3250 6500 3250
+ 3500 4350 3500 4500
Wire Wire Line
- 5400 3250 5100 3250
+ 3650 3550 4200 3550
Wire Wire Line
- 5100 3250 5100 3750
+ 3850 3250 4200 3250
Wire Wire Line
- 5550 4500 5550 4350
+ 3150 3550 3150 3700
Wire Wire Line
- 5700 3550 5800 3550
+ 3150 3700 3500 3700
Wire Wire Line
- 5900 3250 6000 3250
+ 3500 3700 3500 3750
+Connection ~ 3500 4450
Wire Wire Line
- 6000 3850 6350 3850
+ 3700 4450 3700 4400
Wire Wire Line
- 5800 4150 6200 4150
+ 3050 4350 3050 4450
Wire Wire Line
- 5200 3550 5200 3700
+ 3050 4450 3700 4450
Wire Wire Line
- 5200 3700 5550 3700
+ 9100 4250 9000 4250
Wire Wire Line
- 5550 3700 5550 3750
-Connection ~ 5550 4450
+ 9100 4400 9100 4350
Wire Wire Line
- 5750 4400 5750 4450
+ 9100 4350 9200 4350
Wire Wire Line
- 5100 4350 5100 4450
+ 10100 2950 10350 2950
Wire Wire Line
- 5100 4450 5750 4450
+ 2350 4900 2350 4700
Wire Wire Line
- 6500 3400 6450 3400
+ 2350 3500 2350 3600
Wire Wire Line
- 6450 3400 6450 4050
+ 2250 3000 2350 3000
Wire Wire Line
- 6950 4000 7250 4000
+ 2350 4150 2650 4150
+Connection ~ 2350 4150
Wire Wire Line
- 7250 4000 7250 3900
-Connection ~ 7150 4000
+ 2250 3550 2650 3550
Wire Wire Line
- 7600 4250 7700 4250
+ 2650 3550 2650 3500
Wire Wire Line
- 7700 4400 7700 4350
-Wire Wire Line
- 7700 4350 7800 4350
-Wire Wire Line
- 7850 3850 7900 3850
-Wire Wire Line
- 4400 4900 4400 4700
-Wire Wire Line
- 4400 3600 4400 3500
-Wire Wire Line
- 4300 3000 4400 3000
-Wire Wire Line
- 4400 4150 4700 4150
-Connection ~ 4400 4150
-Wire Wire Line
- 4300 3550 4700 3550
-Wire Wire Line
- 4700 3550 4700 3500
-Wire Wire Line
- 6350 4750 6350 4650
-Text Label 4850 4100 0 60 ~ 0
+ 4300 4750 4300 4650
+Text Label 2800 4100 0 60 ~ 0
d
$Comp
L VCVS E2
U 1 1 50AA12FF
-P 5050 4050
-F 0 "E2" H 4850 4150 50 0000 C CNN
-F 1 "10000" H 4850 4000 50 0000 C CNN
-F 2 "" H 5050 4050 60 0001 C CNN
-F 3 "" H 5050 4050 60 0001 C CNN
- 1 5050 4050
- 0 1 1 0
-$EndComp
-$Comp
-L LIMIT8 U4
-U 2 1 50B4E21B
-P 6000 3550
-F 0 "U4" H 6000 3650 30 0000 C CNN
-F 1 "LIMIT8" H 6000 3550 30 0000 C CNN
-F 2 "" H 6000 3550 60 0001 C CNN
-F 3 "" H 6000 3550 60 0001 C CNN
- 2 6000 3550
+P 3000 4050
+F 0 "E2" H 2800 4150 50 0000 C CNN
+F 1 "10000" H 2800 4000 50 0000 C CNN
+F 2 "" H 3000 4050 60 0001 C CNN
+F 3 "" H 3000 4050 60 0001 C CNN
+ 1 3000 4050
0 1 1 0
$EndComp
$Comp
-L LIMIT8 U4
-U 1 1 50B4E215
-P 5800 3850
-F 0 "U4" H 5800 3950 30 0000 C CNN
-F 1 "LIMIT8" H 5800 3850 30 0000 C CNN
-F 2 "" H 5800 3850 60 0001 C CNN
-F 3 "" H 5800 3850 60 0001 C CNN
- 1 5800 3850
- 0 1 1 0
-$EndComp
-$Comp
-L DAC8 U3
-U 2 1 50AAFCE7
-P 7700 3950
-F 0 "U3" H 7600 4050 40 0000 C CNN
-F 1 "DAC8" H 7700 3950 40 0000 C CNN
-F 2 "" H 7700 3950 60 0001 C CNN
-F 3 "" H 7700 3950 60 0001 C CNN
- 2 7700 3950
- 0 1 1 0
-$EndComp
-$Comp
-L DAC8 U3
-U 1 1 50AAFC9A
-P 7850 3550
-F 0 "U3" H 7750 3650 40 0000 C CNN
-F 1 "DAC8" H 7850 3550 40 0000 C CNN
-F 2 "" H 7850 3550 60 0001 C CNN
-F 3 "" H 7850 3550 60 0001 C CNN
- 1 7850 3550
- 0 1 1 0
-$EndComp
-$Comp
-L ADC8 U2
-U 3 1 50AAFB76
-P 6350 4350
-F 0 "U2" H 6250 4450 40 0000 C CNN
-F 1 "ADC8" H 6350 4350 40 0000 C CNN
-F 2 "" H 6350 4350 60 0001 C CNN
-F 3 "" H 6350 4350 60 0001 C CNN
- 3 6350 4350
- 0 -1 -1 0
-$EndComp
-$Comp
-L ADC8 U2
-U 2 1 50AAFB64
-P 6350 3550
-F 0 "U2" H 6250 3650 40 0000 C CNN
-F 1 "ADC8" H 6350 3550 40 0000 C CNN
-F 2 "" H 6350 3550 60 0001 C CNN
-F 3 "" H 6350 3550 60 0001 C CNN
- 2 6350 3550
- 0 -1 -1 0
-$EndComp
-$Comp
-L ADC8 U2
-U 1 1 50AAFB55
-P 6200 3850
-F 0 "U2" H 6100 3950 40 0000 C CNN
-F 1 "ADC8" H 6200 3850 40 0000 C CNN
-F 2 "" H 6200 3850 60 0001 C CNN
-F 3 "" H 6200 3850 60 0001 C CNN
- 1 6200 3850
- 0 -1 -1 0
-$EndComp
-$Comp
L PWR_FLAG #FLG01
U 1 1 50AA39A3
-P 5750 4400
-F 0 "#FLG01" H 5750 4670 30 0001 C CNN
-F 1 "PWR_FLAG" H 5750 4630 30 0000 C CNN
-F 2 "" H 5750 4400 60 0001 C CNN
-F 3 "" H 5750 4400 60 0001 C CNN
- 1 5750 4400
+P 3700 4400
+F 0 "#FLG01" H 3700 4670 30 0001 C CNN
+F 1 "PWR_FLAG" H 3700 4630 30 0000 C CNN
+F 2 "" H 3700 4400 60 0001 C CNN
+F 3 "" H 3700 4400 60 0001 C CNN
+ 1 3700 4400
1 0 0 -1
$EndComp
$Comp
L PORT U1
U 5 1 50AA2210
-P 4050 3550
-F 0 "U1" H 4050 3500 30 0000 C CNN
-F 1 "PORT" H 4050 3550 30 0000 C CNN
-F 2 "" H 4050 3550 60 0001 C CNN
-F 3 "" H 4050 3550 60 0001 C CNN
- 5 4050 3550
+P 2000 3550
+F 0 "U1" H 2000 3500 30 0000 C CNN
+F 1 "PORT" H 2000 3550 30 0000 C CNN
+F 2 "" H 2000 3550 60 0001 C CNN
+F 3 "" H 2000 3550 60 0001 C CNN
+ 5 2000 3550
1 0 0 -1
$EndComp
$Comp
L PORT U1
U 1 1 50AA21C7
-P 4050 4900
-F 0 "U1" H 4050 4850 30 0000 C CNN
-F 1 "PORT" H 4050 4900 30 0000 C CNN
-F 2 "" H 4050 4900 60 0001 C CNN
-F 3 "" H 4050 4900 60 0001 C CNN
- 1 4050 4900
+P 2000 4900
+F 0 "U1" H 2000 4850 30 0000 C CNN
+F 1 "PORT" H 2000 4900 30 0000 C CNN
+F 2 "" H 2000 4900 60 0001 C CNN
+F 3 "" H 2000 4900 60 0001 C CNN
+ 1 2000 4900
1 0 0 -1
$EndComp
$Comp
L PORT U1
U 2 1 50AA21BC
-P 4700 5000
-F 0 "U1" H 4700 4950 30 0000 C CNN
-F 1 "PORT" H 4700 5000 30 0000 C CNN
-F 2 "" H 4700 5000 60 0001 C CNN
-F 3 "" H 4700 5000 60 0001 C CNN
- 2 4700 5000
+P 2650 5000
+F 0 "U1" H 2650 4950 30 0000 C CNN
+F 1 "PORT" H 2650 5000 30 0000 C CNN
+F 2 "" H 2650 5000 60 0001 C CNN
+F 3 "" H 2650 5000 60 0001 C CNN
+ 2 2650 5000
0 -1 -1 0
$EndComp
$Comp
L PORT U1
U 4 1 50AA21A9
-P 6350 5000
-F 0 "U1" H 6350 4950 30 0000 C CNN
-F 1 "PORT" H 6350 5000 30 0000 C CNN
-F 2 "" H 6350 5000 60 0001 C CNN
-F 3 "" H 6350 5000 60 0001 C CNN
- 4 6350 5000
+P 4300 5000
+F 0 "U1" H 4300 4950 30 0000 C CNN
+F 1 "PORT" H 4300 5000 30 0000 C CNN
+F 2 "" H 4300 5000 60 0001 C CNN
+F 3 "" H 4300 5000 60 0001 C CNN
+ 4 4300 5000
0 -1 -1 0
$EndComp
$Comp
L PORT U1
U 7 1 50AA21A0
-P 8050 4350
-F 0 "U1" H 8050 4300 30 0000 C CNN
-F 1 "PORT" H 8050 4350 30 0000 C CNN
-F 2 "" H 8050 4350 60 0001 C CNN
-F 3 "" H 8050 4350 60 0001 C CNN
- 7 8050 4350
+P 9450 4350
+F 0 "U1" H 9450 4300 30 0000 C CNN
+F 1 "PORT" H 9450 4350 30 0000 C CNN
+F 2 "" H 9450 4350 60 0001 C CNN
+F 3 "" H 9450 4350 60 0001 C CNN
+ 7 9450 4350
-1 0 0 1
$EndComp
$Comp
L PORT U1
U 3 1 50AA2181
-P 8150 3850
-F 0 "U1" H 8150 3800 30 0000 C CNN
-F 1 "PORT" H 8150 3850 30 0000 C CNN
-F 2 "" H 8150 3850 60 0001 C CNN
-F 3 "" H 8150 3850 60 0001 C CNN
- 3 8150 3850
+P 10600 2950
+F 0 "U1" H 10600 2900 30 0000 C CNN
+F 1 "PORT" H 10600 2950 30 0000 C CNN
+F 2 "" H 10600 2950 60 0001 C CNN
+F 3 "" H 10600 2950 60 0001 C CNN
+ 3 10600 2950
-1 0 0 1
$EndComp
$Comp
L PORT U1
U 6 1 50AA2171
-P 5150 3000
-F 0 "U1" H 5150 2950 30 0000 C CNN
-F 1 "PORT" H 5150 3000 30 0000 C CNN
-F 2 "" H 5150 3000 60 0001 C CNN
-F 3 "" H 5150 3000 60 0001 C CNN
- 6 5150 3000
+P 3100 3000
+F 0 "U1" H 3100 2950 30 0000 C CNN
+F 1 "PORT" H 3100 3000 30 0000 C CNN
+F 2 "" H 3100 3000 60 0001 C CNN
+F 3 "" H 3100 3000 60 0001 C CNN
+ 6 3100 3000
-1 0 0 1
$EndComp
$Comp
L PORT U1
U 8 1 50AA2162
-P 4050 3000
-F 0 "U1" H 4050 2950 30 0000 C CNN
-F 1 "PORT" H 4050 3000 30 0000 C CNN
-F 2 "" H 4050 3000 60 0001 C CNN
-F 3 "" H 4050 3000 60 0001 C CNN
- 8 4050 3000
+P 2000 3000
+F 0 "U1" H 2000 2950 30 0000 C CNN
+F 1 "PORT" H 2000 3000 30 0000 C CNN
+F 2 "" H 2000 3000 60 0001 C CNN
+F 3 "" H 2000 3000 60 0001 C CNN
+ 8 2000 3000
1 0 0 -1
$EndComp
$Comp
L R-RESCUE-lm555n R8
U 1 1 50AA20DA
-P 7350 4250
-F 0 "R8" V 7430 4250 50 0000 C CNN
-F 1 "1500" V 7350 4250 50 0000 C CNN
-F 2 "" H 7350 4250 60 0001 C CNN
-F 3 "" H 7350 4250 60 0001 C CNN
- 1 7350 4250
+P 8750 4250
+F 0 "R8" V 8830 4250 50 0000 C CNN
+F 1 "1500" V 8750 4250 50 0000 C CNN
+F 2 "" H 8750 4250 60 0001 C CNN
+F 3 "" H 8750 4250 60 0001 C CNN
+ 1 8750 4250
0 1 1 0
$EndComp
$Comp
-L NPN Q1
-U 1 1 50AA2050
-P 7600 4600
-F 0 "Q1" H 7600 4450 50 0000 R CNN
-F 1 "QNOM" H 7600 4750 50 0000 R CNN
-F 2 "" H 7600 4600 60 0001 C CNN
-F 3 "" H 7600 4600 60 0001 C CNN
- 1 7600 4600
- 1 0 0 -1
-$EndComp
-$Comp
L GND-RESCUE-lm555n #PWR02
U 1 1 50AA140C
-P 5550 4500
-F 0 "#PWR02" H 5550 4500 30 0001 C CNN
-F 1 "GND" H 5550 4430 30 0001 C CNN
-F 2 "" H 5550 4500 60 0001 C CNN
-F 3 "" H 5550 4500 60 0001 C CNN
- 1 5550 4500
+P 3500 4500
+F 0 "#PWR02" H 3500 4500 30 0001 C CNN
+F 1 "GND" H 3500 4430 30 0001 C CNN
+F 2 "" H 3500 4500 60 0001 C CNN
+F 3 "" H 3500 4500 60 0001 C CNN
+ 1 3500 4500
1 0 0 -1
$EndComp
-Text Label 4850 4000 0 60 ~ 0
+Text Label 2800 4000 0 60 ~ 0
c
-Text Label 4700 4650 0 60 ~ 0
+Text Label 2650 4650 0 60 ~ 0
d
-Text Label 4700 4150 0 60 ~ 0
+Text Label 2650 4150 0 60 ~ 0
c
$Comp
L R-RESCUE-lm555n R7
U 1 1 50AA12F7
-P 5650 3250
-F 0 "R7" V 5730 3250 50 0000 C CNN
-F 1 "25" V 5650 3250 50 0000 C CNN
-F 2 "" H 5650 3250 60 0001 C CNN
-F 3 "" H 5650 3250 60 0001 C CNN
- 1 5650 3250
+P 3600 3250
+F 0 "R7" V 3680 3250 50 0000 C CNN
+F 1 "25" V 3600 3250 50 0000 C CNN
+F 2 "" H 3600 3250 60 0001 C CNN
+F 3 "" H 3600 3250 60 0001 C CNN
+ 1 3600 3250
0 -1 -1 0
$EndComp
$Comp
L R-RESCUE-lm555n R6
U 1 1 50AA12B0
-P 5450 3550
-F 0 "R6" V 5530 3550 50 0000 C CNN
-F 1 "25" V 5450 3550 50 0000 C CNN
-F 2 "" H 5450 3550 60 0001 C CNN
-F 3 "" H 5450 3550 60 0001 C CNN
- 1 5450 3550
+P 3400 3550
+F 0 "R6" V 3480 3550 50 0000 C CNN
+F 1 "25" V 3400 3550 50 0000 C CNN
+F 2 "" H 3400 3550 60 0001 C CNN
+F 3 "" H 3400 3550 60 0001 C CNN
+ 1 3400 3550
0 -1 -1 0
$EndComp
-Text Label 5300 4000 0 60 ~ 0
+Text Label 3250 4000 0 60 ~ 0
b
-Text Label 5300 4100 0 60 ~ 0
+Text Label 3250 4100 0 60 ~ 0
a
-Text Label 4700 3000 0 60 ~ 0
+Text Label 2650 3000 0 60 ~ 0
b
-Text Label 4700 3500 0 60 ~ 0
+Text Label 2650 3500 0 60 ~ 0
a
$Comp
L VCVS E1
U 1 1 50AA11B6
-P 5500 4050
-F 0 "E1" H 5300 4150 50 0000 C CNN
-F 1 "10000" H 5300 4000 50 0000 C CNN
-F 2 "" H 5500 4050 60 0001 C CNN
-F 3 "" H 5500 4050 60 0001 C CNN
- 1 5500 4050
+P 3450 4050
+F 0 "E1" H 3250 4150 50 0000 C CNN
+F 1 "10000" H 3250 4000 50 0000 C CNN
+F 2 "" H 3450 4050 60 0001 C CNN
+F 3 "" H 3450 4050 60 0001 C CNN
+ 1 3450 4050
0 1 1 0
$EndComp
$Comp
L R-RESCUE-lm555n R4
U 1 1 50A9E00B
-P 4700 3250
-F 0 "R4" V 4780 3250 50 0000 C CNN
-F 1 "2E6" V 4700 3250 50 0000 C CNN
-F 2 "" H 4700 3250 60 0001 C CNN
-F 3 "" H 4700 3250 60 0001 C CNN
- 1 4700 3250
+P 2650 3250
+F 0 "R4" V 2730 3250 50 0000 C CNN
+F 1 "2E6" V 2650 3250 50 0000 C CNN
+F 2 "" H 2650 3250 60 0001 C CNN
+F 3 "" H 2650 3250 60 0001 C CNN
+ 1 2650 3250
1 0 0 -1
$EndComp
$Comp
L R-RESCUE-lm555n R5
U 1 1 50A9E001
-P 4700 4400
-F 0 "R5" V 4780 4400 50 0000 C CNN
-F 1 "2E6" V 4700 4400 50 0000 C CNN
-F 2 "" H 4700 4400 60 0001 C CNN
-F 3 "" H 4700 4400 60 0001 C CNN
- 1 4700 4400
+P 2650 4400
+F 0 "R5" V 2730 4400 50 0000 C CNN
+F 1 "2E6" V 2650 4400 50 0000 C CNN
+F 2 "" H 2650 4400 60 0001 C CNN
+F 3 "" H 2650 4400 60 0001 C CNN
+ 1 2650 4400
1 0 0 -1
$EndComp
$Comp
L R-RESCUE-lm555n R3
U 1 1 50A9DF09
-P 4400 4450
-F 0 "R3" V 4480 4450 50 0000 C CNN
-F 1 "5000" V 4400 4450 50 0000 C CNN
-F 2 "" H 4400 4450 60 0001 C CNN
-F 3 "" H 4400 4450 60 0001 C CNN
- 1 4400 4450
+P 2350 4450
+F 0 "R3" V 2430 4450 50 0000 C CNN
+F 1 "5000" V 2350 4450 50 0000 C CNN
+F 2 "" H 2350 4450 60 0001 C CNN
+F 3 "" H 2350 4450 60 0001 C CNN
+ 1 2350 4450
1 0 0 -1
$EndComp
$Comp
L R-RESCUE-lm555n R2
U 1 1 50A9DF03
-P 4400 3850
-F 0 "R2" V 4480 3850 50 0000 C CNN
-F 1 "5000" V 4400 3850 50 0000 C CNN
-F 2 "" H 4400 3850 60 0001 C CNN
-F 3 "" H 4400 3850 60 0001 C CNN
- 1 4400 3850
+P 2350 3850
+F 0 "R2" V 2430 3850 50 0000 C CNN
+F 1 "5000" V 2350 3850 50 0000 C CNN
+F 2 "" H 2350 3850 60 0001 C CNN
+F 3 "" H 2350 3850 60 0001 C CNN
+ 1 2350 3850
1 0 0 -1
$EndComp
$Comp
L R-RESCUE-lm555n R1
U 1 1 50A9DEFE
-P 4400 3250
-F 0 "R1" V 4480 3250 50 0000 C CNN
-F 1 "5000" V 4400 3250 50 0000 C CNN
-F 2 "" H 4400 3250 60 0001 C CNN
-F 3 "" H 4400 3250 60 0001 C CNN
- 1 4400 3250
+P 2350 3250
+F 0 "R1" V 2430 3250 50 0000 C CNN
+F 1 "5000" V 2350 3250 50 0000 C CNN
+F 2 "" H 2350 3250 60 0001 C CNN
+F 3 "" H 2350 3250 60 0001 C CNN
+ 1 2350 3250
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_srlatch U8
+U 1 1 5E01E563
+P 8000 3350
+F 0 "U8" H 8000 3350 60 0000 C CNN
+F 1 "d_srlatch" H 8050 3500 60 0000 C CNN
+F 2 "" H 8000 3350 60 0000 C CNN
+F 3 "" H 8000 3350 60 0000 C CNN
+ 1 8000 3350
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_inverter U7
+U 1 1 5E01F10F
+P 7450 4400
+F 0 "U7" H 7450 4300 60 0000 C CNN
+F 1 "d_inverter" H 7450 4550 60 0000 C CNN
+F 2 "" H 7500 4350 60 0000 C CNN
+F 3 "" H 7500 4350 60 0000 C CNN
+ 1 7450 4400
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 7750 4400 8150 4400
+Wire Wire Line
+ 8000 4400 8000 4150
+$Comp
+L adc_bridge_1 U5
+U 1 1 5E01F2C7
+P 6350 3400
+F 0 "U5" H 6350 3400 60 0000 C CNN
+F 1 "adc_bridge_1" H 6350 3550 60 0000 C CNN
+F 2 "" H 6350 3400 60 0000 C CNN
+F 3 "" H 6350 3400 60 0000 C CNN
+ 1 6350 3400
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 6900 3350 7200 3350
+Wire Wire Line
+ 4300 4650 5600 4650
+Wire Wire Line
+ 5600 4650 5600 3350
+Wire Wire Line
+ 5600 3350 5750 3350
+$Comp
+L adc_bridge_1 U4
+U 1 1 5E01F3F2
+P 6350 3000
+F 0 "U4" H 6350 3000 60 0000 C CNN
+F 1 "adc_bridge_1" H 6350 3150 60 0000 C CNN
+F 2 "" H 6350 3000 60 0000 C CNN
+F 3 "" H 6350 3000 60 0000 C CNN
+ 1 6350 3000
1 0 0 -1
$EndComp
+$Comp
+L adc_bridge_1 U6
+U 1 1 5E01F469
+P 6350 3850
+F 0 "U6" H 6350 3850 60 0000 C CNN
+F 1 "adc_bridge_1" H 6350 4000 60 0000 C CNN
+F 2 "" H 6350 3850 60 0000 C CNN
+F 3 "" H 6350 3850 60 0000 C CNN
+ 1 6350 3850
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 6900 3800 7200 3800
+Wire Wire Line
+ 7200 2950 6900 2950
+$Comp
+L limit U3
+U 1 1 5E01F5DC
+P 4900 2950
+F 0 "U3" H 4950 2900 60 0000 C CNN
+F 1 "limit" H 4950 3000 60 0000 C CNN
+F 2 "" H 4900 3000 60 0000 C CNN
+F 3 "" H 4900 3000 60 0000 C CNN
+ 1 4900 2950
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 5500 2950 5750 2950
+Wire Wire Line
+ 4200 3250 4200 2950
+Wire Wire Line
+ 4200 2950 4500 2950
+$Comp
+L limit U2
+U 1 1 5E01F79D
+P 4800 3800
+F 0 "U2" H 4850 3750 60 0000 C CNN
+F 1 "limit" H 4850 3850 60 0000 C CNN
+F 2 "" H 4800 3850 60 0000 C CNN
+F 3 "" H 4800 3850 60 0000 C CNN
+ 1 4800 3800
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 5400 3800 5750 3800
+Wire Wire Line
+ 4200 3550 4200 3800
+Wire Wire Line
+ 4200 3800 4400 3800
+Wire Wire Line
+ 7050 3350 7050 4400
+Wire Wire Line
+ 7050 4400 7150 4400
+Connection ~ 7050 3350
+Wire Wire Line
+ 8000 2600 8150 2600
+Wire Wire Line
+ 8150 2600 8150 4400
+Connection ~ 8000 4400
+$Comp
+L dac_bridge_1 U9
+U 1 1 5E01FCD2
+P 9550 3000
+F 0 "U9" H 9550 3000 60 0000 C CNN
+F 1 "dac_bridge_1" H 9550 3150 60 0000 C CNN
+F 2 "" H 9550 3000 60 0000 C CNN
+F 3 "" H 9550 3000 60 0000 C CNN
+ 1 9550 3000
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 8800 2950 8950 2950
+$Comp
+L dac_bridge_1 U10
+U 1 1 5E01FE8E
+P 9600 3850
+F 0 "U10" H 9600 3850 60 0000 C CNN
+F 1 "dac_bridge_1" H 9600 4000 60 0000 C CNN
+F 2 "" H 9600 3850 60 0000 C CNN
+F 3 "" H 9600 3850 60 0000 C CNN
+ 1 9600 3850
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 9000 3800 8800 3800
+Wire Wire Line
+ 9100 4000 9100 4250
+Wire Wire Line
+ 9100 4000 10300 4000
+Wire Wire Line
+ 10300 4000 10300 3800
+Wire Wire Line
+ 10300 3800 10150 3800
+$Comp
+L eSim_NPN Q1
+U 1 1 5E01E782
+P 9000 4600
+F 0 "Q1" H 8900 4650 50 0000 R CNN
+F 1 "eSim_NPN" H 8950 4750 50 0000 R CNN
+F 2 "" H 9200 4700 29 0000 C CNN
+F 3 "" H 9000 4600 60 0000 C CNN
+ 1 9000 4600
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 8800 4600 8500 4600
+Wire Wire Line
+ 2250 4900 9100 4900
$EndSCHEMATC
diff --git a/src/SubcircuitLibrary/lm555n/lm555n.sub b/src/SubcircuitLibrary/lm555n/lm555n.sub
index beeefc43..b524f5c6 100644
--- a/src/SubcircuitLibrary/lm555n/lm555n.sub
+++ b/src/SubcircuitLibrary/lm555n/lm555n.sub
@@ -1,5 +1,6 @@
* Subcircuit lm555n
-.subckt lm555n 22 14 7 6 15 16 3 13
+.subckt lm555n 22 14 7 6 15 16 3 13
+.include npn_1.lib
* eeschema netlist version 1.1 (spice format) creation date: monday 17 december 2012 11:00:36 am ist
* Inverter d_inverter
* SR Latch d_srlatch
@@ -8,7 +9,7 @@ e2 18 0 23 14 10000
* Digital to Analog converter dac8
* Analog to Digital converter adc8
r8 9 2 1500
-q1 3 2 22 qnom
+q1 3 2 22 npn_1
r7 18 20 25
r6 17 19 25
e1 17 0 16 15 10000
@@ -33,5 +34,6 @@ a7 [11] [4] u2
a8 [12] [1] u2
a9 [6] [5] u2
.model u2 adc_bridge(in_low=0.8 in_high=2.0 )
+*control statements
-.ends lm555n \ No newline at end of file
+.ends lm555n
diff --git a/src/SubcircuitLibrary/lm555n/npn_1.lib b/src/SubcircuitLibrary/lm555n/npn_1.lib
new file mode 100644
index 00000000..a1818ed8
--- /dev/null
+++ b/src/SubcircuitLibrary/lm555n/npn_1.lib
@@ -0,0 +1,29 @@
+.model npn_1 NPN(
++ Vtf=1.7
++ Cjc=0.5p
++ Nc=2
++ Tr=46.91n
++ Ne=1.307
++ Cje=0.5p
++ Isc=0
++ Xtb=1.5
++ Rb=500
++ Rc=1
++ Tf=411.1p
++ Xti=3
++ Ikr=0
++ Bf=125
++ Fc=.5
++ Ise=14.34f
++ Br=6.092
++ Ikf=.2847
++ Mje=.377
++ Mjc=.3416
++ Vaf=74.03
++ Vjc=.75
++ Vje=.75
++ Xtf=3
++ Itf=.6
++ Is=14.34f
++ Eg=1.11
+) \ No newline at end of file