common code for Win and Linux, merged py2 changes

1 files changed, 34 insertions, 20 deletions

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