From cb55e59de7ee4383c04edfae7c39ad9ae9552b36 Mon Sep 17 00:00:00 2001 From: rahulp13 Date: Fri, 14 Feb 2020 15:16:35 +0530 Subject: common code for Win and Linux, merged py2 changes --- Examples/RC/RC-cache.lib | 30 ++++++-------- Examples/RC/RC-rescue.lib | 22 ++++++++++ Examples/RC/RC.pro | 79 ++++++++++++++++++----------------- Examples/RC/RC.sch | 3 +- Examples/RC/RC_Previous_Values.xml | 1 + Examples/RC/plot_data_i.txt | 85 -------------------------------------- Examples/RC/plot_data_v.txt | 85 -------------------------------------- 7 files changed, 78 insertions(+), 227 deletions(-) create mode 100644 Examples/RC/RC-rescue.lib create mode 100644 Examples/RC/RC_Previous_Values.xml delete mode 100644 Examples/RC/plot_data_i.txt delete mode 100644 Examples/RC/plot_data_v.txt (limited to 'Examples/RC') diff --git a/Examples/RC/RC-cache.lib b/Examples/RC/RC-cache.lib index 0436d1fe..951a4f65 100644 --- a/Examples/RC/RC-cache.lib +++ b/Examples/RC/RC-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 # @@ -28,19 +24,19 @@ 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 # -# R +# R-RESCUE-RC # -DEF R R 0 0 N Y 1 F N +DEF R-RESCUE-RC 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-RC" 50 50 50 H V C CNN F2 "" 50 -20 30 H V C CNN F3 "" 50 50 30 V V C CNN $FPLIST diff --git a/Examples/RC/RC-rescue.lib b/Examples/RC/RC-rescue.lib new file mode 100644 index 00000000..51220205 --- /dev/null +++ b/Examples/RC/RC-rescue.lib @@ -0,0 +1,22 @@ +EESchema-LIBRARY Version 2.3 +#encoding utf-8 +# +# R-RESCUE-RC +# +DEF R-RESCUE-RC R 0 0 N Y 1 F N +F0 "R" 50 130 50 H V C CNN +F1 "R-RESCUE-RC" 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 +# +#End Library diff --git a/Examples/RC/RC.pro b/Examples/RC/RC.pro index 89697b42..ea92fe7c 100644 --- a/Examples/RC/RC.pro +++ b/Examples/RC/RC.pro @@ -1,4 +1,4 @@ -update=Mon Feb 29 21:34:52 2016 +update=Wed Aug 14 16:52:34 2019 version=1 last_client=eeschema [general] @@ -31,41 +31,42 @@ NetIExt=net version=1 LibDir= [eeschema/libraries] -LibName1=eSim_Analog -LibName2=eSim_Devices -LibName3=eSim_Digital -LibName4=eSim_Hybrid -LibName5=eSim_Miscellaneous -LibName6=eSim_Plot -LibName7=eSim_Power -LibName8=eSim_Sources -LibName9=eSim_Subckt -LibName10=eSim_User -LibName11=adc-dac -LibName12=memory -LibName13=xilinx -LibName14=microcontrollers -LibName15=dsp -LibName16=microchip -LibName17=analog_switches -LibName18=motorola -LibName19=texas -LibName20=intel -LibName21=audio -LibName22=interface -LibName23=digital-audio -LibName24=philips -LibName25=display -LibName26=cypress -LibName27=siliconi -LibName28=opto -LibName29=atmel -LibName30=contrib -LibName31=power -LibName32=device -LibName33=transistors -LibName34=conn -LibName35=linear -LibName36=regul -LibName37=74xx -LibName38=cmos4000 +LibName1=RC-rescue +LibName2=eSim_Analog +LibName3=eSim_Devices +LibName4=eSim_Digital +LibName5=eSim_Hybrid +LibName6=eSim_Miscellaneous +LibName7=eSim_Plot +LibName8=eSim_Power +LibName9=eSim_Sources +LibName10=eSim_Subckt +LibName11=eSim_User +LibName12=adc-dac +LibName13=memory +LibName14=xilinx +LibName15=microcontrollers +LibName16=dsp +LibName17=microchip +LibName18=analog_switches +LibName19=motorola +LibName20=texas +LibName21=intel +LibName22=audio +LibName23=interface +LibName24=digital-audio +LibName25=philips +LibName26=display +LibName27=cypress +LibName28=siliconi +LibName29=opto +LibName30=atmel +LibName31=contrib +LibName32=power +LibName33=device +LibName34=transistors +LibName35=conn +LibName36=linear +LibName37=regul +LibName38=74xx +LibName39=cmos4000 diff --git a/Examples/RC/RC.sch b/Examples/RC/RC.sch index f5b5def0..540004be 100644 --- a/Examples/RC/RC.sch +++ b/Examples/RC/RC.sch @@ -1,4 +1,5 @@ EESchema Schematic File Version 2 +LIBS:RC-rescue LIBS:eSim_Analog LIBS:eSim_Devices LIBS:eSim_Digital @@ -53,7 +54,7 @@ Comment3 "" Comment4 "" $EndDescr $Comp -L R R1 +L R-RESCUE-RC R1 U 1 1 56B86791 P 5750 3050 F 0 "R1" H 5800 3180 50 0000 C CNN diff --git a/Examples/RC/RC_Previous_Values.xml b/Examples/RC/RC_Previous_Values.xml new file mode 100644 index 00000000..999b881e --- /dev/null +++ b/Examples/RC/RC_Previous_Values.xml @@ -0,0 +1 @@ +pwl0m 0 0.5m 5 50m 5 50.5m 0 100m 0truefalsefalseHzHz0Volts or AmperesVolts or AmperesVolts or AmperesVolts or AmperesVolts or AmperesVolts or Amperes010100msmsms \ No newline at end of file diff --git a/Examples/RC/plot_data_i.txt b/Examples/RC/plot_data_i.txt deleted file mode 100644 index dc56edf8..00000000 --- a/Examples/RC/plot_data_i.txt +++ /dev/null @@ -1,85 +0,0 @@ - * /home/fossee/esim-workspace/rc/rc.cir - Transient Analysis Tue Aug 29 10:57:55 2017 --------------------------------------------------------------------------------- -Index time alli --------------------------------------------------------------------------------- -0 0.000000e+00 0.000000e+00 -1 5.000000e-06 -4.99750e-05 -2 5.420140e-06 -5.41741e-05 -3 6.260420e-06 -6.25720e-05 -4 7.940980e-06 -7.93657e-05 -5 1.130210e-05 -1.12945e-04 -6 1.802434e-05 -1.80069e-04 -7 3.146882e-05 -3.14181e-04 -8 5.835778e-05 -5.81866e-04 -9 1.121357e-04 -1.11508e-03 -10 2.196915e-04 -2.17296e-03 -11 4.348032e-04 -4.25494e-03 -12 5.000000e-04 -4.87714e-03 -13 5.430223e-04 -4.85625e-03 -14 6.290670e-04 -4.81464e-03 -15 8.011564e-04 -4.73249e-03 -16 1.145335e-03 -4.57236e-03 -17 1.833692e-03 -4.26809e-03 -18 3.210407e-03 -3.71834e-03 -19 5.210407e-03 -3.04228e-03 -20 7.210407e-03 -2.48914e-03 -21 9.210407e-03 -2.03657e-03 -22 1.121041e-02 -1.66628e-03 -23 1.321041e-02 -1.36332e-03 -24 1.521041e-02 -1.11545e-03 -25 1.721041e-02 -9.12637e-04 -26 1.921041e-02 -7.46703e-04 -27 2.121041e-02 -6.10939e-04 -28 2.321041e-02 -4.99859e-04 -29 2.521041e-02 -4.08976e-04 -30 2.721041e-02 -3.34616e-04 -31 2.921041e-02 -2.73777e-04 -32 3.121041e-02 -2.23999e-04 -33 3.321041e-02 -1.83272e-04 -34 3.521041e-02 -1.49950e-04 -35 3.721041e-02 -1.22686e-04 -36 3.921041e-02 -1.00380e-04 -37 4.121041e-02 -8.21289e-05 -38 4.321041e-02 -6.71964e-05 -39 4.521041e-02 -5.49789e-05 -40 4.721041e-02 -4.49827e-05 -41 4.921041e-02 -3.68040e-05 -42 5.000000e-02 -3.40084e-05 -43 5.005000e-02 4.636733e-04 -44 5.015000e-02 1.454084e-03 -45 5.035000e-02 3.405489e-03 -46 5.050000e-02 4.843620e-03 -47 5.054000e-02 4.824323e-03 -48 5.062000e-02 4.785882e-03 -49 5.078000e-02 4.709916e-03 -50 5.110000e-02 4.561572e-03 -51 5.174000e-02 4.278684e-03 -52 5.302000e-02 3.763955e-03 -53 5.502000e-02 3.079600e-03 -54 5.702000e-02 2.519672e-03 - -Index time alli --------------------------------------------------------------------------------- -55 5.902000e-02 2.061550e-03 -56 6.102000e-02 1.686723e-03 -57 6.302000e-02 1.380046e-03 -58 6.502000e-02 1.129129e-03 -59 6.702000e-02 9.238324e-04 -60 6.902000e-02 7.558629e-04 -61 7.102000e-02 6.184333e-04 -62 7.302000e-02 5.059909e-04 -63 7.502000e-02 4.139925e-04 -64 7.702000e-02 3.387212e-04 -65 7.902000e-02 2.771355e-04 -66 8.102000e-02 2.267472e-04 -67 8.302000e-02 1.855205e-04 -68 8.502000e-02 1.517895e-04 -69 8.702000e-02 1.241914e-04 -70 8.902000e-02 1.016111e-04 -71 9.102000e-02 8.313638e-05 -72 9.302000e-02 6.802067e-05 -73 9.502000e-02 5.565328e-05 -74 9.702000e-02 4.553450e-05 -75 9.902000e-02 3.725550e-05 -76 1.000000e-01 3.377500e-05 diff --git a/Examples/RC/plot_data_v.txt b/Examples/RC/plot_data_v.txt deleted file mode 100644 index 288e6f13..00000000 --- a/Examples/RC/plot_data_v.txt +++ /dev/null @@ -1,85 +0,0 @@ - * /home/fossee/esim-workspace/rc/rc.cir - Transient Analysis Tue Aug 29 10:57:55 2017 --------------------------------------------------------------------------------- -Index time in out --------------------------------------------------------------------------------- -0 0.000000e+00 0.000000e+00 0.000000e+00 -1 5.000000e-06 5.000000e-02 2.498751e-05 -2 5.420140e-06 5.420140e-02 2.726358e-05 -3 6.260420e-06 6.260420e-02 3.216855e-05 -4 7.940980e-06 7.940980e-02 4.409530e-05 -5 1.130210e-05 1.130210e-01 7.641419e-05 -6 1.802434e-05 1.802434e-01 1.748994e-04 -7 3.146882e-05 3.146882e-01 5.071458e-04 -8 5.835778e-05 5.835778e-01 1.711834e-03 -9 1.121357e-04 1.121357e+00 6.274752e-03 -10 2.196915e-04 2.196915e+00 2.395715e-02 -11 4.348032e-04 4.348032e+00 9.309294e-02 -12 5.000000e-04 5.000000e+00 1.228620e-01 -13 5.430223e-04 5.000000e+00 1.437547e-01 -14 6.290670e-04 5.000000e+00 1.853611e-01 -15 8.011564e-04 5.000000e+00 2.675091e-01 -16 1.145335e-03 5.000000e+00 4.276358e-01 -17 1.833692e-03 5.000000e+00 7.319055e-01 -18 3.210407e-03 5.000000e+00 1.281658e+00 -19 5.210407e-03 5.000000e+00 1.957720e+00 -20 7.210407e-03 5.000000e+00 2.510862e+00 -21 9.210407e-03 5.000000e+00 2.963432e+00 -22 1.121041e-02 5.000000e+00 3.333717e+00 -23 1.321041e-02 5.000000e+00 3.636678e+00 -24 1.521041e-02 5.000000e+00 3.884555e+00 -25 1.721041e-02 5.000000e+00 4.087363e+00 -26 1.921041e-02 5.000000e+00 4.253297e+00 -27 2.121041e-02 5.000000e+00 4.389061e+00 -28 2.321041e-02 5.000000e+00 4.500141e+00 -29 2.521041e-02 5.000000e+00 4.591024e+00 -30 2.721041e-02 5.000000e+00 4.665384e+00 -31 2.921041e-02 5.000000e+00 4.726223e+00 -32 3.121041e-02 5.000000e+00 4.776001e+00 -33 3.321041e-02 5.000000e+00 4.816728e+00 -34 3.521041e-02 5.000000e+00 4.850050e+00 -35 3.721041e-02 5.000000e+00 4.877314e+00 -36 3.921041e-02 5.000000e+00 4.899620e+00 -37 4.121041e-02 5.000000e+00 4.917871e+00 -38 4.321041e-02 5.000000e+00 4.932804e+00 -39 4.521041e-02 5.000000e+00 4.945021e+00 -40 4.721041e-02 5.000000e+00 4.955017e+00 -41 4.921041e-02 5.000000e+00 4.963196e+00 -42 5.000000e-02 5.000000e+00 4.965992e+00 -43 5.005000e-02 4.500000e+00 4.963673e+00 -44 5.015000e-02 3.500000e+00 4.954084e+00 -45 5.035000e-02 1.500000e+00 4.905489e+00 -46 5.050000e-02 0.000000e+00 4.843620e+00 -47 5.054000e-02 0.000000e+00 4.824323e+00 -48 5.062000e-02 0.000000e+00 4.785882e+00 -49 5.078000e-02 0.000000e+00 4.709916e+00 -50 5.110000e-02 0.000000e+00 4.561572e+00 -51 5.174000e-02 0.000000e+00 4.278684e+00 -52 5.302000e-02 0.000000e+00 3.763955e+00 -53 5.502000e-02 0.000000e+00 3.079600e+00 -54 5.702000e-02 0.000000e+00 2.519672e+00 - -Index time in out --------------------------------------------------------------------------------- -55 5.902000e-02 0.000000e+00 2.061550e+00 -56 6.102000e-02 0.000000e+00 1.686723e+00 -57 6.302000e-02 0.000000e+00 1.380046e+00 -58 6.502000e-02 0.000000e+00 1.129129e+00 -59 6.702000e-02 0.000000e+00 9.238324e-01 -60 6.902000e-02 0.000000e+00 7.558629e-01 -61 7.102000e-02 0.000000e+00 6.184333e-01 -62 7.302000e-02 0.000000e+00 5.059909e-01 -63 7.502000e-02 0.000000e+00 4.139925e-01 -64 7.702000e-02 0.000000e+00 3.387212e-01 -65 7.902000e-02 0.000000e+00 2.771355e-01 -66 8.102000e-02 0.000000e+00 2.267472e-01 -67 8.302000e-02 0.000000e+00 1.855205e-01 -68 8.502000e-02 0.000000e+00 1.517895e-01 -69 8.702000e-02 0.000000e+00 1.241914e-01 -70 8.902000e-02 0.000000e+00 1.016111e-01 -71 9.102000e-02 0.000000e+00 8.313638e-02 -72 9.302000e-02 0.000000e+00 6.802067e-02 -73 9.502000e-02 0.000000e+00 5.565328e-02 -74 9.702000e-02 0.000000e+00 4.553450e-02 -75 9.902000e-02 0.000000e+00 3.725550e-02 -76 1.000000e-01 0.000000e+00 3.377500e-02 -- cgit