common code for Win and Linux, merged py2 changes

1 files changed, 41 insertions, 27 deletions

diff --git a/Examples/BJT_CE_config/BJT_CE_config-cache.lib b/Examples/BJT_CE_config/BJT_CE_config-cache.lib
index d018d0ee..2e5a45fe 100644
--- a/Examples/BJT_CE_config/BJT_CE_config-cache.lib
+++ b/Examples/BJT_CE_config/BJT_CE_config-cache.lib
@@ -1,11 +1,11 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# DC
+# DC-RESCUE-BJT_CE_config
 #
-DEF DC v 0 40 Y Y 1 F N
+DEF DC-RESCUE-BJT_CE_config 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-BJT_CE_config" -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
@@ -23,38 +23,32 @@ ENDDEF
 DEF GND #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -250 50 H I C CNN
 F1 "GND" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 DRAW
-P 6 0 1 0  0 0  0 -50  50 -50  0 -100  -50 -50  0 -50 N
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
 X GND 1 0 0 0 D 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# NPN
+# PWR_FLAG
 #
-DEF NPN Q 0 0 Y N 1 F N
-F0 "Q" -100 50 50 H V R CNN
-F1 "NPN" -50 150 50 H V R CNN
-F2 "" 200 100 29 H V C CNN
-F3 "" 0 0 60 H V C CNN
+DEF PWR_FLAG #FLG 0 0 N N 1 F P
+F0 "#FLG" 0 75 50 H I C CNN
+F1 "PWR_FLAG" 0 150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 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 C
-X B 2 -200 0 225 R 50 50 1 1 I
-X E 3 100 -200 100 U 50 50 1 1 E
+X pwr 1 0 0 0 U 50 50 0 0 w
+P 6 0 1 0 0 0 0 50 -40 75 0 100 40 75 0 50 N
 ENDDRAW
 ENDDEF
 #
-# R
+# R-RESCUE-BJT_CE_config
 #
-DEF R R 0 0 N Y 1 F N
+DEF R-RESCUE-BJT_CE_config 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-BJT_CE_config" 50 50 50 H V C CNN
 F2 "" 50 -20 30 H V C CNN
 F3 "" 50 50 30 V V C CNN
 $FPLIST
@@ -80,15 +74,35 @@ $FPLIST
 $ENDFPLIST
 DRAW
 C 0 0 150 0 1 0 N
-P 2 0 1 0  0 -100  0 -100 N
-P 2 0 1 0  0 100  -50 50 N
-P 2 0 1 0  0 100  0 -100 N
-P 2 0 1 0  0 100  50 50 N
+P 2 0 1 0 0 -100 0 -100 N
+P 2 0 1 0 0 100 -50 50 N
+P 2 0 1 0 0 100 0 -100 N
+P 2 0 1 0 0 100 50 50 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
 #
+# 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
+#
 # plot_i2
 #
 DEF plot_i2 U 0 40 Y Y 1 F N