common code for Win and Linux, merged py2 changes

1 files changed, 139 insertions, 141 deletions

diff --git a/src/SubcircuitLibrary/lm555n/lm555n-cache.lib b/src/SubcircuitLibrary/lm555n/lm555n-cache.lib
index 421c1147..824af11e 100644
--- a/src/SubcircuitLibrary/lm555n/lm555n-cache.lib
+++ b/src/SubcircuitLibrary/lm555n/lm555n-cache.lib
@@ -1,147 +1,26 @@
-EESchema-LIBRARY Version 2.3  Date: Monday 17 December 2012 11:00:43 AM IST
+EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# ADC8
+# GND-RESCUE-lm555n
 #
-DEF ADC8 U 0 10 Y Y 8 L N
-F0 "U" -100 100 40 H V C CNN
-F1 "ADC8" 0 0 40 H V C CNN
-DRAW
-S -150 50 150 -50 0 1 0 N
-X in1 1 -300 0 150 R 25 25 1 1 I
-X out1 9 300 0 150 L 25 25 1 1 O
-X in2 2 -300 0 150 R 25 25 2 1 I
-X out2 10 300 0 150 L 25 25 2 1 O
-X in3 3 -300 0 150 R 25 25 3 1 I
-X out3 11 300 0 150 L 25 25 3 1 O
-X in4 4 -300 0 150 R 25 25 4 1 I
-X out4 12 300 0 150 L 25 25 4 1 O
-X in5 5 -300 0 150 R 25 25 5 1 I
-X out5 13 300 0 150 L 25 25 5 1 O
-X in6 6 -300 0 150 R 25 25 6 1 I
-X out6 14 300 0 150 L 25 25 6 1 O
-X in7 7 -300 0 150 R 25 25 7 1 I
-X out7 15 300 0 150 L 25 25 7 1 O
-X in8 8 -300 0 150 R 25 25 8 1 I
-X out8 16 300 0 150 L 25 25 8 1 O
-ENDDRAW
-ENDDEF
-#
-# d_inverter
-#
-DEF d_inverter U 0 40 Y Y 1 F N
-F0 "U" -150 100 40 H V C CNN
-F1 "d_inverter" 100 100 40 H V C CNN
-DRAW
-P 4 0 1 0  -100 -100  -100 100  100 0  -100 -100 N
-X in 1 -250 0 150 R 25 25 1 1 I
-X out 2 250 0 150 L 25 25 1 1 O I
-ENDDRAW
-ENDDEF
-#
-# D_SRLatch
-#
-DEF D_SRLatch U 0 40 Y Y 1 F N
-F0 "U" -200 250 60 H V C CNN
-F1 "D_SRLatch" 0 100 60 H V C CNN
-DRAW
-S -300 200 300 -200 0 1 0 N
-X S 1 -600 150 300 R 50 50 1 1 I
-X R 2 -600 -150 300 R 50 50 1 1 I
-X Enable 3 -600 0 300 R 50 50 1 1 I
-X Set 4 150 -500 300 U 50 50 1 1 I
-X Reset 5 -150 -500 300 U 50 50 1 1 I
-X Q 6 600 150 300 L 50 50 1 1 O
-X ~Q 7 600 -150 300 L 50 50 1 1 O I
-ENDDRAW
-ENDDEF
-#
-# DAC8
-#
-DEF DAC8 U 0 10 Y Y 8 L N
-F0 "U" -100 100 40 H V C CNN
-F1 "DAC8" 0 0 40 H V C CNN
-DRAW
-S -150 50 150 -50 0 1 0 N
-X in1 1 -300 0 150 R 25 25 1 1 I
-X out1 9 300 0 150 L 25 25 1 1 O
-X in2 2 -300 0 150 R 25 25 2 1 I
-X out2 10 300 0 150 L 25 25 2 1 O
-X in3 3 -300 0 150 R 25 25 3 1 I
-X out3 11 300 0 150 L 25 25 3 1 O
-X in4 4 -300 0 150 R 25 25 4 1 I
-X out4 12 300 0 150 L 25 25 4 1 O
-X in5 5 -300 0 150 R 25 25 5 1 I
-X out5 13 300 0 150 L 25 25 5 1 O
-X in6 6 -300 0 150 R 25 25 6 1 I
-X out6 14 300 0 150 L 25 25 6 1 O
-X in7 7 -300 0 150 R 25 25 7 1 I
-X out7 15 300 0 150 L 25 25 7 1 O
-X in8 8 -300 0 150 R 25 25 8 1 I
-X out8 16 300 0 150 L 25 25 8 1 O
-ENDDRAW
-ENDDEF
-#
-# GND
-#
-DEF ~GND #PWR 0 0 Y Y 1 F P
+DEF ~GND-RESCUE-lm555n #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 0 30 H I C CNN
-F1 "GND" 0 -70 30 H I C CNN
+F1 "GND-RESCUE-lm555n" 0 -70 30 H I C CNN
+F2 "" 0 0 60 H I C CNN
+F3 "" 0 0 60 H I C CNN
 DRAW
-P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
+P 4 0 1 0 -50 0 0 -50 50 0 -50 0 N
 X GND 1 0 0 0 U 30 30 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# LIMIT8
-#
-DEF LIMIT8 U 0 40 Y Y 8 F N
-F0 "U" 0 100 30 H V C CNN
-F1 "LIMIT8" 0 0 30 H V C CNN
-DRAW
-S -150 50 150 -50 0 1 0 N
-X in 1 -300 0 150 R 25 25 1 1 I
-X out 9 300 0 150 L 25 25 1 1 O
-X in 2 -300 0 150 R 25 25 2 1 I
-X out 10 300 0 150 L 25 25 2 1 O
-X in 3 -300 0 150 R 25 25 3 1 I
-X out 11 300 0 150 L 25 25 3 1 O
-X in 4 -300 0 150 R 25 25 4 1 I
-X out 12 300 0 150 L 25 25 4 1 O
-X in 5 -300 0 150 R 25 25 5 1 I
-X out 13 300 0 150 L 25 25 5 1 O
-X in 6 -300 0 150 R 25 25 6 1 I
-X out 14 300 0 150 L 25 25 6 1 O
-X in 7 -300 0 150 R 25 25 7 1 I
-X out 15 300 0 150 L 25 25 7 1 O
-X in 8 -300 0 150 R 25 25 8 1 I
-X out 16 300 0 150 L 25 25 8 1 O
-ENDDRAW
-ENDDEF
-#
-# NPN
-#
-DEF NPN Q 0 0 Y Y 1 F N
-F0 "Q" 0 -150 50 H V R CNN
-F1 "NPN" 0 150 50 H V R CNN
-DRAW
-C 50 0 111 0 1 10 N
-P 2 0 1 0  0 0  100 100 N
-P 3 0 1 10  0 75  0 -75  0 -75 N
-P 3 0 1 0  50 -50  0 0  0 0 N
-P 3 0 1 0  90 -90  100 -100  100 -100 N
-P 5 0 1 0  90 -90  70 -30  30 -70  90 -90  90 -90 F
-X E 1 100 -200 100 U 40 40 1 1 P
-X B 2 -200 0 200 R 40 40 1 1 I
-X C 3 100 200 100 D 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
 # PORT
 #
-DEF PORT U 0 40 Y Y 8 F N
-F0 "U" 0 -50 30 H V C CNN
+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
@@ -154,26 +33,47 @@ 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
 #
 # PWR_FLAG
 #
 DEF PWR_FLAG #FLG 0 0 N N 1 F P
-F0 "#FLG" 0 270 30 H I C CNN
-F1 "PWR_FLAG" 0 230 30 H V C CNN
+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
-X pwr 1 0 0 0 U 20 20 0 0 w
-P 3 0 1 0  0 0  0 100  0 100 N
-P 5 0 1 0  0 100  -100 150  0 200  100 150  0 100 N
+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-lm555n
 #
-DEF R R 0 0 N Y 1 F N
+DEF R-RESCUE-lm555n R 0 0 N Y 1 F N
 F0 "R" 80 0 50 V V C CNN
-F1 "R" 0 0 50 V V C CNN
+F1 "R-RESCUE-lm555n" 0 0 50 V V C CNN
+F2 "" 0 0 60 H I C CNN
+F3 "" 0 0 60 H I C CNN
 $FPLIST
  R?
  SM0603
@@ -190,8 +90,10 @@ ENDDEF
 # VCVS
 #
 DEF VCVS E 0 40 Y Y 1 F N
-F0 "E" -200 100 50 H V C CNN
+F0 "E" 0 150 50 H V C CNN
 F1 "VCVS" -200 -50 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  1_pin
 $ENDFPLIST
@@ -204,4 +106,100 @@ X -c 4 50 -200 100 U 35 35 1 1 P
 ENDDRAW
 ENDDEF
 #
+# adc_bridge_1
+#
+DEF adc_bridge_1 U 0 40 Y Y 1 F N
+F0 "U" 0 0 60 H V C CNN
+F1 "adc_bridge_1" 0 150 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -400 200 350 -50 0 1 0 N
+X IN1 1 -600 50 200 R 50 50 1 1 I
+X OUT1 2 550 50 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# d_inverter
+#
+DEF d_inverter U 0 40 Y Y 1 F N
+F0 "U" 0 -100 60 H V C CNN
+F1 "d_inverter" 0 150 60 H V C CNN
+F2 "" 50 -50 60 H V C CNN
+F3 "" 50 -50 60 H V C CNN
+DRAW
+P 4 0 1 0 -100 50 -100 -50 100 0 -100 50 N
+X ~ 1 -300 0 200 R 50 50 1 1 I
+X ~ 2 300 0 200 L 50 50 1 1 O I
+ENDDRAW
+ENDDEF
+#
+# d_srlatch
+#
+DEF d_srlatch U 0 40 Y Y 1 F N
+F0 "U" 0 0 60 H V C CNN
+F1 "d_srlatch" 50 150 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S 600 550 -600 -600 0 1 0 N
+X S 1 -800 400 200 R 50 50 1 1 I
+X R 2 -800 -450 200 R 50 50 1 1 I
+X EN 3 -800 0 200 R 50 50 1 1 I
+X Set 4 0 750 200 D 50 50 1 1 I
+X Reset 5 0 -800 200 U 50 50 1 1 I
+X Out 6 800 400 200 L 50 50 1 1 O
+X Nout 7 800 -450 200 L 50 50 1 1 O I
+ENDDRAW
+ENDDEF
+#
+# dac_bridge_1
+#
+DEF dac_bridge_1 U 0 40 Y Y 1 F N
+F0 "U" 0 0 60 H V C CNN
+F1 "dac_bridge_1" 0 150 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -400 200 350 -50 0 1 0 N
+X IN1 1 -600 50 200 R 50 50 1 1 I
+X OUT1 2 550 50 200 L 50 50 1 1 O
+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
+#
+# limit
+#
+DEF limit U 0 40 Y Y 1 F N
+F0 "U" 50 -50 60 H V C CNN
+F1 "limit" 50 50 60 H V C CNN
+F2 "" 0 50 60 H V C CNN
+F3 "" 0 50 60 H V C CNN
+DRAW
+C 300 0 0 0 1 0 N
+P 4 0 1 0 -200 200 -200 -200 400 0 -200 200 N
+X IN 1 -400 0 200 R 50 50 1 1 I
+X OUT 2 600 0 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
 #End Library