summaryrefslogtreecommitdiff
path: root/Examples/7812VoltageRegulator
diff options
context:
space:
mode:
authorsaurabhb172020-03-18 18:27:02 +0530
committersaurabhb172020-03-18 18:27:02 +0530
commit3aa3c9f7f6b7e30c89dc8a83515044bb74854064 (patch)
tree707ef78111e714b4826b781288821fb53333daed /Examples/7812VoltageRegulator
parent50cc0a9c65834db636c502cde6548f9e3971600c (diff)
downloadeSim-3aa3c9f7f6b7e30c89dc8a83515044bb74854064.tar.gz
eSim-3aa3c9f7f6b7e30c89dc8a83515044bb74854064.tar.bz2
eSim-3aa3c9f7f6b7e30c89dc8a83515044bb74854064.zip
fixes in Analysis of Digital ICs directory
Diffstat (limited to 'Examples/7812VoltageRegulator')
-rw-r--r--Examples/7812VoltageRegulator/7812VoltageRegulator.pro16
-rw-r--r--Examples/7812VoltageRegulator/NPN.lib (renamed from Examples/7812VoltageRegulator/NPN.lib~HEAD)0
-rw-r--r--Examples/7812VoltageRegulator/NPN.lib~fellowship2019-python34
3 files changed, 1 insertions, 19 deletions
diff --git a/Examples/7812VoltageRegulator/7812VoltageRegulator.pro b/Examples/7812VoltageRegulator/7812VoltageRegulator.pro
index 86307015..02b139b0 100644
--- a/Examples/7812VoltageRegulator/7812VoltageRegulator.pro
+++ b/Examples/7812VoltageRegulator/7812VoltageRegulator.pro
@@ -52,32 +52,18 @@ LibName18=opto
LibName19=atmel
LibName20=contrib
LibName21=power
-<<<<<<< HEAD
-LibName22=device
-LibName23=transistors
-LibName24=conn
-LibName25=linear
-=======
LibName22=eSim_Plot
LibName23=transistors
LibName24=conn
LibName25=eSim_User
->>>>>>> fellowship2019-python3
LibName26=regul
LibName27=74xx
LibName28=cmos4000
LibName29=eSim_Analog
-LibName30=eSim_Devices
+LibName30=eSim_Plot
LibName31=eSim_Digital
LibName32=eSim_Hybrid
LibName33=eSim_Miscellaneous
LibName34=eSim_Power
LibName35=eSim_Sources
LibName36=eSim_Subckt
-<<<<<<< HEAD
-LibName37=eSim_User
-LibName38=eSim_Plot
-LibName39=eSim_PSpice
-=======
->>>>>>> fellowship2019-python3
-
diff --git a/Examples/7812VoltageRegulator/NPN.lib~HEAD b/Examples/7812VoltageRegulator/NPN.lib
index 6509fe7a..6509fe7a 100644
--- a/Examples/7812VoltageRegulator/NPN.lib~HEAD
+++ b/Examples/7812VoltageRegulator/NPN.lib
diff --git a/Examples/7812VoltageRegulator/NPN.lib~fellowship2019-python3 b/Examples/7812VoltageRegulator/NPN.lib~fellowship2019-python3
deleted file mode 100644
index 6509fe7a..00000000
--- a/Examples/7812VoltageRegulator/NPN.lib~fellowship2019-python3
+++ /dev/null
@@ -1,4 +0,0 @@
-.model Q2N2222 NPN( Is=14.34f Xti=3 Eg=1.11 Vaf=74.03 Bf=400 Ne=1.307
-+ Ise=14.34f Ikf=.2847 Xtb=1.5 Br=6.092 Nc=2 Isc=0 Ikr=0 Rc=1 Cjc=7.306p
-+ Mjc=.3416 Vjc=.75 Fc=.5 Cje=22.01p Mje=.377 Vje=.75 Tr=46.91n Tf=411.1p
-+ Itf=.6 Vtf=1.7 Xtf=3 Rb=10)