common code for Win and Linux, merged py2 changes

6 files changed, 159 insertions, 65 deletions

diff --git a/src/SubcircuitLibrary/scr/D.lib b/src/SubcircuitLibrary/scr/D.lib
new file mode 100644
index 00000000..ef18bb50
--- /dev/null
+++ b/src/SubcircuitLibrary/scr/D.lib
@@ -0,0 +1,20 @@
+.MODEL D1N750 D(
++  Vj=.75
++  Nbvl=14.976
++  Cjo=175p
++  Rs=.25
++  Isr=1.859n
++  Eg=1.11
++  M=.5516
++  Nbv=1.6989
++  N=1
++  Tbv1=-21.277u
++  Bv=8.1
++  Fc=.5
++  Ikf=0
++  Nr=2
++  Ibv=20.245m
++  Is=880.5E-18
++  Xti=3
++  Ibvl=1.9556m
+)
\ No newline at end of file
diff --git a/src/SubcircuitLibrary/scr/PowerDiode.lib b/src/SubcircuitLibrary/scr/PowerDiode.lib
index d6fb6469..a2f61dce 100644
--- a/src/SubcircuitLibrary/scr/PowerDiode.lib
+++ b/src/SubcircuitLibrary/scr/PowerDiode.lib
@@ -1 +1,20 @@
-.MODEL PowerDiode D( Vj=.75 Nbvl=14.976 Cjo=175p Rs=.25 Isr=1.859n Eg=1.11 M=.5516 Nbv=1.6989 N=1 Tbv1=-21.277u bv=1800 Fc=.5 Ikf=0 Nr=2 Ibv=20.245m Is=2.2E-15 Xti=3 Ibvl=1.9556m )
+.MODEL PowerDiode D(
++ Vj=.75
++ Nbvl=14.976
++ Cjo=175p
++ Rs=.25
++ Isr=1.859n
++ Eg=1.11
++ M=.5516
++ Nbv=1.6989
++ N=1
++ Tbv1=-21.277u
++ bv=1800
++ Fc=.5
++ Ikf=0
++ Nr=2
++ Ibv=20.245m
++ Is=2.2E-15
++ Xti=3
++ Ibvl=1.9556m
+)
\ No newline at end of file
diff --git a/src/SubcircuitLibrary/scr/scr-cache.lib b/src/SubcircuitLibrary/scr/scr-cache.lib
index 24105a8a..0a685b80 100644
--- a/src/SubcircuitLibrary/scr/scr-cache.lib
+++ b/src/SubcircuitLibrary/scr/scr-cache.lib
@@ -6,20 +6,16 @@ EESchema-LIBRARY Version 2.3
 DEF C C 0 10 N Y 1 F N
 F0 "C" 25 100 50 H V L CNN
 F1 "C" 25 -100 50 H V L CNN
-F2 "" 38 -150 30 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F2 "" 38 -150 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 $FPLIST
- C?
- C_????_*
- C_????
- SMD*_c
- Capacitor*
+ C_*
 $ENDFPLIST
 DRAW
-P 2 0 1 20  -80 -30  80 -30 N
-P 2 0 1 20  -80 30  80 30 N
-X ~ 1 0 150 110 D 40 40 1 1 P
-X ~ 2 0 -150 110 U 40 40 1 1 P
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 50 50 1 1 P
+X ~ 2 0 -150 110 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -54,8 +50,8 @@ $FPLIST
  S*
 $ENDFPLIST
 DRAW
-P 2 0 1 6  50 50  50 -50 N
-P 3 0 1 0  -50 50  50 0  -50 -50 F
+P 2 0 1 6 50 50 50 -50 N
+P 3 0 1 0 -50 50 50 0 -50 -50 F
 X A 1 -200 0 150 R 40 40 1 1 P
 X K 2 200 0 150 L 40 40 1 1 P
 ENDDRAW
@@ -63,7 +59,7 @@ ENDDEF
 #
 # PORT
 #
-DEF PORT U 0 40 Y Y 8 F N
+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
@@ -80,14 +76,32 @@ 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
 #
-# R
+# R-RESCUE-scr
 #
-DEF R R 0 0 N Y 1 F N
+DEF R-RESCUE-scr R 0 0 N Y 1 F N
 F0 "R" 50 130 50 H V C CNN
-F1 "R" 50 50 50 H V C CNN
+F1 "R-RESCUE-scr" 50 50 50 H V C CNN
 F2 "" 50 -20 30 H V C CNN
 F3 "" 50 50 30 V V C CNN
 $FPLIST
@@ -116,11 +130,11 @@ X ~ 1_IN 450 -100 200 U 50 20 1 1 I
 ENDDRAW
 ENDDEF
 #
-# dc
+# dc-RESCUE-scr
 #
-DEF dc v 0 40 Y Y 1 F N
+DEF dc-RESCUE-scr v 0 40 Y Y 1 F N
 F0 "v" -200 100 60 H V C CNN
-F1 "dc" -200 -50 60 H V C CNN
+F1 "dc-RESCUE-scr" -200 -50 60 H V C CNN
 F2 "R1" -300 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 $FPLIST
diff --git a/src/SubcircuitLibrary/scr/scr-rescue.lib b/src/SubcircuitLibrary/scr/scr-rescue.lib
new file mode 100644
index 00000000..64237b7d
--- /dev/null
+++ b/src/SubcircuitLibrary/scr/scr-rescue.lib
@@ -0,0 +1,39 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# R-RESCUE-scr
+#
+DEF R-RESCUE-scr R 0 0 N Y 1 F N
+F0 "R" 50 130 50 H V C CNN
+F1 "R-RESCUE-scr" 50 50 50 H V C CNN
+F2 "" 50 -20 30 H V C CNN
+F3 "" 50 50 30 V V C CNN
+$FPLIST
+ R_*
+ Resistor_*
+$ENDFPLIST
+DRAW
+S 150 10 -50 90 0 1 10 N
+X ~ 1 -100 50 50 R 60 60 1 1 P
+X ~ 2 200 50 50 L 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# dc-RESCUE-scr
+#
+DEF dc-RESCUE-scr v 0 40 Y Y 1 F N
+F0 "v" -200 100 60 H V C CNN
+F1 "dc-RESCUE-scr" -200 -50 60 H V C CNN
+F2 "R1" -300 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ 1_pin
+$ENDFPLIST
+DRAW
+C 0 0 150 0 1 0 N
+X + 1 0 450 300 D 50 50 1 1 P
+X - 2 0 -450 300 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/src/SubcircuitLibrary/scr/scr.pro b/src/SubcircuitLibrary/scr/scr.pro
index fc4ca966..ca0df803 100644
--- a/src/SubcircuitLibrary/scr/scr.pro
+++ b/src/SubcircuitLibrary/scr/scr.pro
@@ -1,44 +1,45 @@
-update=Tue Dec  8 15:45:12 2015
-last_client=eeschema
+update=Wed Jul 31 19:51:09 2019
+last_client=kicad
 [eeschema]
 version=1
 LibDir=
 [eeschema/libraries]
-LibName1=eSim_Analog
-LibName2=eSim_Devices
-LibName3=eSim_Digital
-LibName4=eSim_Hybrid
-LibName5=eSim_Miscellaneous
-LibName6=eSim_Sources
-LibName7=eSim_Subckt
-LibName8=eSim_User
-LibName9=power
-LibName10=device
-LibName11=transistors
-LibName12=conn
-LibName13=linear
-LibName14=regul
-LibName15=74xx
-LibName16=cmos4000
-LibName17=adc-dac
-LibName18=memory
-LibName19=xilinx
-LibName20=special
-LibName21=microcontrollers
-LibName22=dsp
-LibName23=microchip
-LibName24=analog_switches
-LibName25=motorola
-LibName26=texas
-LibName27=intel
-LibName28=audio
-LibName29=interface
-LibName30=digital-audio
-LibName31=philips
-LibName32=display
-LibName33=cypress
-LibName34=siliconi
-LibName35=opto
-LibName36=atmel
-LibName37=contrib
-LibName38=valves
+LibName1=scr-rescue
+LibName2=eSim_Analog
+LibName3=eSim_Devices
+LibName4=eSim_Digital
+LibName5=eSim_Hybrid
+LibName6=eSim_Miscellaneous
+LibName7=eSim_Sources
+LibName8=eSim_Subckt
+LibName9=eSim_User
+LibName10=power
+LibName11=device
+LibName12=transistors
+LibName13=conn
+LibName14=linear
+LibName15=regul
+LibName16=74xx
+LibName17=cmos4000
+LibName18=adc-dac
+LibName19=memory
+LibName20=xilinx
+LibName21=special
+LibName22=microcontrollers
+LibName23=dsp
+LibName24=microchip
+LibName25=analog_switches
+LibName26=motorola
+LibName27=texas
+LibName28=intel
+LibName29=audio
+LibName30=interface
+LibName31=digital-audio
+LibName32=philips
+LibName33=display
+LibName34=cypress
+LibName35=siliconi
+LibName36=opto
+LibName37=atmel
+LibName38=contrib
+LibName39=valves
diff --git a/src/SubcircuitLibrary/scr/scr.sch b/src/SubcircuitLibrary/scr/scr.sch
index 1f23ec65..69244f56 100644
--- a/src/SubcircuitLibrary/scr/scr.sch
+++ b/src/SubcircuitLibrary/scr/scr.sch
@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:scr-rescue
 LIBS:eSim_Analog
 LIBS:eSim_Devices
 LIBS:eSim_Digital
@@ -182,7 +183,7 @@ F 3 "" H 3800 4350 60  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L dc v1
+L dc-RESCUE-scr v1
 U 1 1 565DBF58
 P 3600 3700
 F 0 "v1" H 3400 3800 60  0000 C CNN
@@ -193,7 +194,7 @@ F 3 "" H 3600 3700 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L dc v2
+L dc-RESCUE-scr v2
 U 1 1 565DC066
 P 5550 3000
 F 0 "v2" H 5350 3100 60  0000 C CNN
@@ -217,7 +218,7 @@ $EndComp
 Wire Wire Line
 	5950 2000 6650 2000
 $Comp
-L R R1
+L R-RESCUE-scr R1
 U 1 1 5666B019
 P 3550 2950
 F 0 "R1" H 3600 3080 50  0000 C CNN
@@ -228,7 +229,7 @@ F 3 "" V 3600 3000 30  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R2
+L R-RESCUE-scr R2
 U 1 1 5666B17A
 P 4200 5300
 F 0 "R2" H 4250 5430 50  0000 C CNN