common code for Win and Linux, merged py2 changes

7 files changed, 449 insertions, 0 deletions

diff --git a/src/SubcircuitLibrary/556/556-cache.lib b/src/SubcircuitLibrary/556/556-cache.lib
new file mode 100644
index 00000000..75d610da
--- /dev/null
+++ b/src/SubcircuitLibrary/556/556-cache.lib
@@ -0,0 +1,64 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# LM555N
+#
+DEF LM555N X 0 40 Y Y 1 F N
+F0 "X" 0 -50 60 H V C CNN
+F1 "LM555N" 0 100 60 H V C CNN
+F2 "" -50 0 60 H V C CNN
+F3 "" -50 0 60 H V C CNN
+DRAW
+S 350 -400 -350 400 0 1 0 N
+X GND 1 0 -600 200 U 50 50 1 1 W
+X TR 2 -550 250 200 R 50 50 1 1 I
+X Q 3 550 250 200 L 50 50 1 1 O
+X R 4 -550 -250 200 R 50 50 1 1 I I
+X CV 5 -550 0 200 R 50 50 1 1 I
+X THR 6 550 -250 200 L 50 50 1 1 I
+X DIS 7 550 0 200 L 50 50 1 1 I
+X VCC 8 0 600 200 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# PORT
+#
+DEF PORT U 0 40 Y Y 26 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
+X ~ 9 250 0 100 L 30 30 9 1 B
+X ~ 10 250 0 100 L 30 30 10 1 B
+X ~ 11 250 0 100 L 30 30 11 1 B
+X ~ 12 250 0 100 L 30 30 12 1 B
+X ~ 13 250 0 100 L 30 30 13 1 B
+X ~ 14 250 0 100 L 30 30 14 1 B
+X ~ 15 250 0 100 L 30 30 15 1 B
+X ~ 16 250 0 100 L 30 30 16 1 B
+X ~ 17 250 0 100 L 30 30 17 1 B
+X ~ 18 250 0 100 L 30 30 18 1 B
+X ~ 19 250 0 100 L 30 30 19 1 B
+X ~ 20 250 0 100 L 30 30 20 1 B
+X ~ 21 250 0 100 L 30 30 21 1 B
+X ~ 22 250 0 100 L 30 30 22 1 B
+X ~ 23 250 0 100 L 30 30 23 1 B
+X ~ 24 250 0 100 L 30 30 24 1 B
+X ~ 25 250 0 100 L 30 30 25 1 B
+X ~ 26 250 0 100 L 30 30 26 1 B
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/src/SubcircuitLibrary/556/556.cir b/src/SubcircuitLibrary/556/556.cir
new file mode 100644
index 00000000..48baa73e
--- /dev/null
+++ b/src/SubcircuitLibrary/556/556.cir
@@ -0,0 +1,13 @@
+* C:\esim\eSim\src\SubcircuitLibrary\556\556.cir
+
+* EESchema Netlist Version 1.1 (Spice format) creation date: 03/18/19 18:30:44
+
+* 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: /
+X1  Net-_U1-Pad7_ Net-_U1-Pad6_ Net-_U1-Pad5_ Net-_U1-Pad4_ Net-_U1-Pad3_ Net-_U1-Pad2_ Net-_U1-Pad1_ Net-_U1-Pad14_ LM555N		
+X2  Net-_U1-Pad7_ Net-_U1-Pad8_ Net-_U1-Pad9_ Net-_U1-Pad10_ Net-_U1-Pad11_ Net-_U1-Pad12_ Net-_U1-Pad13_ Net-_U1-Pad14_ LM555N		
+U1  Net-_U1-Pad1_ Net-_U1-Pad2_ Net-_U1-Pad3_ Net-_U1-Pad4_ Net-_U1-Pad5_ Net-_U1-Pad6_ Net-_U1-Pad7_ Net-_U1-Pad8_ Net-_U1-Pad9_ Net-_U1-Pad10_ Net-_U1-Pad11_ Net-_U1-Pad12_ Net-_U1-Pad13_ Net-_U1-Pad14_ PORT		
+
+.end
diff --git a/src/SubcircuitLibrary/556/556.cir.out b/src/SubcircuitLibrary/556/556.cir.out
new file mode 100644
index 00000000..c74aab7c
--- /dev/null
+++ b/src/SubcircuitLibrary/556/556.cir.out
@@ -0,0 +1,15 @@
+* c:\esim\esim\src\subcircuitlibrary\556\556.cir
+
+.include lm555n.sub
+x1 net-_u1-pad7_ net-_u1-pad6_ net-_u1-pad5_ net-_u1-pad4_ net-_u1-pad3_ net-_u1-pad2_ net-_u1-pad1_ net-_u1-pad14_ lm555n
+x2 net-_u1-pad7_ net-_u1-pad8_ net-_u1-pad9_ net-_u1-pad10_ net-_u1-pad11_ net-_u1-pad12_ net-_u1-pad13_ net-_u1-pad14_ lm555n
+* u1  net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u1-pad4_ net-_u1-pad5_ net-_u1-pad6_ net-_u1-pad7_ net-_u1-pad8_ net-_u1-pad9_ net-_u1-pad10_ net-_u1-pad11_ net-_u1-pad12_ net-_u1-pad13_ net-_u1-pad14_ port
+.tran 10e-03 100e-03 0e-03
+
+* Control Statements 
+.control
+run
+print allv > plot_data_v.txt
+print alli > plot_data_i.txt
+.endc
+.end
diff --git a/src/SubcircuitLibrary/556/556.pro b/src/SubcircuitLibrary/556/556.pro
new file mode 100644
index 00000000..a165313d
--- /dev/null
+++ b/src/SubcircuitLibrary/556/556.pro
@@ -0,0 +1,72 @@
+update=03/18/19 18:13:51
+version=1
+last_client=eeschema
+[general]
+version=1
+RootSch=
+BoardNm=
+[pcbnew]
+version=1
+LastNetListRead=
+UseCmpFile=1
+PadDrill=0.600000000000
+PadDrillOvalY=0.600000000000
+PadSizeH=1.500000000000
+PadSizeV=1.500000000000
+PcbTextSizeV=1.500000000000
+PcbTextSizeH=1.500000000000
+PcbTextThickness=0.300000000000
+ModuleTextSizeV=1.000000000000
+ModuleTextSizeH=1.000000000000
+ModuleTextSizeThickness=0.150000000000
+SolderMaskClearance=0.000000000000
+SolderMaskMinWidth=0.000000000000
+DrawSegmentWidth=0.200000000000
+BoardOutlineThickness=0.100000000000
+ModuleOutlineThickness=0.150000000000
+[cvpcb]
+version=1
+NetIExt=net
+[eeschema]
+version=1
+LibDir=
+[eeschema/libraries]
+LibName1=power
+LibName2=device
+LibName3=transistors
+LibName4=conn
+LibName5=regul
+LibName6=74xx
+LibName7=cmos4000
+LibName8=adc-dac
+LibName9=memory
+LibName10=xilinx
+LibName11=microcontrollers
+LibName12=dsp
+LibName13=microchip
+LibName14=analog_switches
+LibName15=motorola
+LibName16=texas
+LibName17=intel
+LibName18=audio
+LibName19=interface
+LibName20=digital-audio
+LibName21=philips
+LibName22=display
+LibName23=cypress
+LibName24=siliconi
+LibName25=opto
+LibName26=atmel
+LibName27=contrib
+LibName28=valves
+LibName29=eSim_User
+LibName30=eSim_Subckt
+LibName31=eSim_Sources
+LibName32=eSim_PSpice
+LibName33=eSim_Power
+LibName34=eSim_Plot
+LibName35=eSim_Miscellaneous
+LibName36=eSim_Hybrid
+LibName37=eSim_Digital
+LibName38=eSim_Devices
+LibName39=eSim_Analog
diff --git a/src/SubcircuitLibrary/556/556.sch b/src/SubcircuitLibrary/556/556.sch
new file mode 100644
index 00000000..af4e1bc9
--- /dev/null
+++ b/src/SubcircuitLibrary/556/556.sch
@@ -0,0 +1,275 @@
+EESchema Schematic File Version 2
+LIBS:power
+LIBS:device
+LIBS:transistors
+LIBS:conn
+LIBS:regul
+LIBS:74xx
+LIBS:cmos4000
+LIBS:adc-dac
+LIBS:memory
+LIBS:xilinx
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
+LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+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
+EELAYER 25 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 1 1
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L LM555N X1
+U 1 1 5C8F9298
+P 4150 3850
+F 0 "X1" H 4150 3800 60  0000 C CNN
+F 1 "LM555N" H 4150 3950 60  0000 C CNN
+F 2 "" H 4100 3850 60  0000 C CNN
+F 3 "" H 4100 3850 60  0000 C CNN
+	1    4150 3850
+	1    0    0    -1  
+$EndComp
+$Comp
+L LM555N X2
+U 1 1 5C8F92E5
+P 7100 3850
+F 0 "X2" H 7100 3800 60  0000 C CNN
+F 1 "LM555N" H 7100 3950 60  0000 C CNN
+F 2 "" H 7050 3850 60  0000 C CNN
+F 3 "" H 7050 3850 60  0000 C CNN
+	1    7100 3850
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4150 3250 4150 3000
+Wire Wire Line
+	4150 3000 7100 3000
+Wire Wire Line
+	4150 4450 4150 4650
+Wire Wire Line
+	4150 4650 7100 4650
+$Comp
+L PORT U1
+U 14 1 5C8F93E6
+P 4650 2600
+F 0 "U1" H 4700 2700 30  0000 C CNN
+F 1 "PORT" H 4650 2600 30  0000 C CNN
+F 2 "" H 4650 2600 60  0000 C CNN
+F 3 "" H 4650 2600 60  0000 C CNN
+	14   4650 2600
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4900 2600 5000 2600
+Wire Wire Line
+	5000 2600 5000 3000
+Connection ~ 5000 3000
+$Comp
+L PORT U1
+U 6 1 5C8F94B6
+P 3050 3600
+F 0 "U1" H 3100 3700 30  0000 C CNN
+F 1 "PORT" H 3050 3600 30  0000 C CNN
+F 2 "" H 3050 3600 60  0000 C CNN
+F 3 "" H 3050 3600 60  0000 C CNN
+	6    3050 3600
+	1    0    0    -1  
+$EndComp
+$Comp
+L PORT U1
+U 3 1 5C8F95C0
+P 3050 3850
+F 0 "U1" H 3100 3950 30  0000 C CNN
+F 1 "PORT" H 3050 3850 30  0000 C CNN
+F 2 "" H 3050 3850 60  0000 C CNN
+F 3 "" H 3050 3850 60  0000 C CNN
+	3    3050 3850
+	1    0    0    -1  
+$EndComp
+$Comp
+L PORT U1
+U 4 1 5C8F95E7
+P 3050 4100
+F 0 "U1" H 3100 4200 30  0000 C CNN
+F 1 "PORT" H 3050 4100 30  0000 C CNN
+F 2 "" H 3050 4100 60  0000 C CNN
+F 3 "" H 3050 4100 60  0000 C CNN
+	4    3050 4100
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7100 3000 7100 3250
+Wire Wire Line
+	7100 4650 7100 4450
+$Comp
+L PORT U1
+U 8 1 5C8F9C35
+P 6000 3600
+F 0 "U1" H 6050 3700 30  0000 C CNN
+F 1 "PORT" H 6000 3600 30  0000 C CNN
+F 2 "" H 6000 3600 60  0000 C CNN
+F 3 "" H 6000 3600 60  0000 C CNN
+	8    6000 3600
+	1    0    0    -1  
+$EndComp
+$Comp
+L PORT U1
+U 11 1 5C8F9C3B
+P 6000 3850
+F 0 "U1" H 6050 3950 30  0000 C CNN
+F 1 "PORT" H 6000 3850 30  0000 C CNN
+F 2 "" H 6000 3850 60  0000 C CNN
+F 3 "" H 6000 3850 60  0000 C CNN
+	11   6000 3850
+	1    0    0    -1  
+$EndComp
+$Comp
+L PORT U1
+U 10 1 5C8F9C41
+P 6000 4100
+F 0 "U1" H 6050 4200 30  0000 C CNN
+F 1 "PORT" H 6000 4100 30  0000 C CNN
+F 2 "" H 6000 4100 60  0000 C CNN
+F 3 "" H 6000 4100 60  0000 C CNN
+	10   6000 4100
+	1    0    0    -1  
+$EndComp
+$Comp
+L PORT U1
+U 2 1 5C8F9D22
+P 5200 4100
+F 0 "U1" H 5250 4200 30  0000 C CNN
+F 1 "PORT" H 5200 4100 30  0000 C CNN
+F 2 "" H 5200 4100 60  0000 C CNN
+F 3 "" H 5200 4100 60  0000 C CNN
+	2    5200 4100
+	-1   0    0    1   
+$EndComp
+$Comp
+L PORT U1
+U 1 1 5C8F9D28
+P 5200 3850
+F 0 "U1" H 5250 3950 30  0000 C CNN
+F 1 "PORT" H 5200 3850 30  0000 C CNN
+F 2 "" H 5200 3850 60  0000 C CNN
+F 3 "" H 5200 3850 60  0000 C CNN
+	1    5200 3850
+	-1   0    0    1   
+$EndComp
+$Comp
+L PORT U1
+U 5 1 5C8F9D2E
+P 5200 3600
+F 0 "U1" H 5250 3700 30  0000 C CNN
+F 1 "PORT" H 5200 3600 30  0000 C CNN
+F 2 "" H 5200 3600 60  0000 C CNN
+F 3 "" H 5200 3600 60  0000 C CNN
+	5    5200 3600
+	-1   0    0    1   
+$EndComp
+$Comp
+L PORT U1
+U 12 1 5C8FA0FA
+P 8250 4100
+F 0 "U1" H 8300 4200 30  0000 C CNN
+F 1 "PORT" H 8250 4100 30  0000 C CNN
+F 2 "" H 8250 4100 60  0000 C CNN
+F 3 "" H 8250 4100 60  0000 C CNN
+	12   8250 4100
+	-1   0    0    1   
+$EndComp
+$Comp
+L PORT U1
+U 13 1 5C8FA100
+P 8250 3850
+F 0 "U1" H 8300 3950 30  0000 C CNN
+F 1 "PORT" H 8250 3850 30  0000 C CNN
+F 2 "" H 8250 3850 60  0000 C CNN
+F 3 "" H 8250 3850 60  0000 C CNN
+	13   8250 3850
+	-1   0    0    1   
+$EndComp
+$Comp
+L PORT U1
+U 9 1 5C8FA106
+P 8250 3600
+F 0 "U1" H 8300 3700 30  0000 C CNN
+F 1 "PORT" H 8250 3600 30  0000 C CNN
+F 2 "" H 8250 3600 60  0000 C CNN
+F 3 "" H 8250 3600 60  0000 C CNN
+	9    8250 3600
+	-1   0    0    1   
+$EndComp
+$Comp
+L PORT U1
+U 7 1 5C8FA319
+P 4950 5050
+F 0 "U1" H 5000 5150 30  0000 C CNN
+F 1 "PORT" H 4950 5050 30  0000 C CNN
+F 2 "" H 4950 5050 60  0000 C CNN
+F 3 "" H 4950 5050 60  0000 C CNN
+	7    4950 5050
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5200 5050 5200 4650
+Connection ~ 5200 4650
+Wire Wire Line
+	3300 3600 3600 3600
+Wire Wire Line
+	3300 3850 3600 3850
+Wire Wire Line
+	3300 4100 3600 4100
+Wire Wire Line
+	4700 3600 4950 3600
+Wire Wire Line
+	4700 3850 4950 3850
+Wire Wire Line
+	4700 4100 4950 4100
+Wire Wire Line
+	6250 3600 6550 3600
+Wire Wire Line
+	6250 3850 6550 3850
+Wire Wire Line
+	6250 4100 6550 4100
+Wire Wire Line
+	8000 3600 7650 3600
+Wire Wire Line
+	8000 3850 7650 3850
+Wire Wire Line
+	8000 4100 7650 4100
+$EndSCHEMATC
diff --git a/src/SubcircuitLibrary/556/556.sub b/src/SubcircuitLibrary/556/556.sub
new file mode 100644
index 00000000..a370b703
--- /dev/null
+++ b/src/SubcircuitLibrary/556/556.sub
@@ -0,0 +1,9 @@
+* Subcircuit 556
+.subckt 556 net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u1-pad4_ net-_u1-pad5_ net-_u1-pad6_ net-_u1-pad7_ net-_u1-pad8_ net-_u1-pad9_ net-_u1-pad10_ net-_u1-pad11_ net-_u1-pad12_ net-_u1-pad13_ net-_u1-pad14_ 
+* c:\esim\esim\src\subcircuitlibrary\556\556.cir
+.include lm555n.sub
+x1 net-_u1-pad7_ net-_u1-pad6_ net-_u1-pad5_ net-_u1-pad4_ net-_u1-pad3_ net-_u1-pad2_ net-_u1-pad1_ net-_u1-pad14_ lm555n
+x2 net-_u1-pad7_ net-_u1-pad8_ net-_u1-pad9_ net-_u1-pad10_ net-_u1-pad11_ net-_u1-pad12_ net-_u1-pad13_ net-_u1-pad14_ lm555n
+* Control Statements
+
+.ends 556
\ No newline at end of file
diff --git a/src/SubcircuitLibrary/556/556_Previous_Values.xml b/src/SubcircuitLibrary/556/556_Previous_Values.xml
new file mode 100644
index 00000000..c025c2d1
--- /dev/null
+++ b/src/SubcircuitLibrary/556/556_Previous_Values.xml
@@ -0,0 +1 @@
+<KicadtoNgspice><source /><model /><devicemodel /><subcircuit><x2><field>C:\esim\eSim\src\SubcircuitLibrary\lm555n</field></x2><x1><field>C:\esim\eSim\src\SubcircuitLibrary\lm555n</field></x1></subcircuit><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">ms</field4><field5 name="Step Combo">ms</field5><field6 name="Stop Combo">ms</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file