diff options
53 files changed, 709 insertions, 547 deletions
diff --git a/library/SubcircuitLibrary/2bitmul/half_adder.pro b/library/SubcircuitLibrary/2bitmul/half_adder.pro index 695ae0f6..18039276 100644 --- a/library/SubcircuitLibrary/2bitmul/half_adder.pro +++ b/library/SubcircuitLibrary/2bitmul/half_adder.pro @@ -1,4 +1,4 @@ -update=Wed Jun 24 11:27:22 2015 +update=Wed Mar 18 19:53:58 2020 version=1 last_client=eeschema [general] @@ -32,38 +32,39 @@ version=1 LibDir= [eeschema/libraries] LibName1=power -LibName2=device -LibName3=transistors -LibName4=conn -LibName5=linear -LibName6=regul -LibName7=74xx -LibName8=cmos4000 -LibName9=adc-dac -LibName10=memory -LibName11=xilinx -LibName12=special -LibName13=microcontrollers -LibName14=dsp -LibName15=microchip -LibName16=analog_switches -LibName17=motorola -LibName18=texas -LibName19=intel -LibName20=audio -LibName21=interface -LibName22=digital-audio -LibName23=philips -LibName24=display -LibName25=cypress -LibName26=siliconi -LibName27=opto -LibName28=atmel -LibName29=contrib -LibName30=valves -LibName31=/home/gaurav/Desktop/eSim Library/eSim_Analog -LibName32=/home/gaurav/Desktop/eSim Library/eSim_Devices -LibName33=/home/gaurav/Desktop/eSim Library/eSim_Digital -LibName34=/home/gaurav/Desktop/eSim Library/eSim_Hybrid -LibName35=/home/gaurav/Desktop/eSim Library/eSim_Sources -LibName36=/home/gaurav/Desktop/eSim Library/eSim_Subckt +LibName2=transistors +LibName3=conn +LibName4=regul +LibName5=74xx +LibName6=cmos4000 +LibName7=adc-dac +LibName8=memory +LibName9=xilinx +LibName10=microcontrollers +LibName11=dsp +LibName12=microchip +LibName13=analog_switches +LibName14=motorola +LibName15=texas +LibName16=intel +LibName17=audio +LibName18=interface +LibName19=digital-audio +LibName20=philips +LibName21=display +LibName22=cypress +LibName23=siliconi +LibName24=opto +LibName25=atmel +LibName26=contrib +LibName27=valves +LibName28=eSim_Analog +LibName29=eSim_Devices +LibName30=eSim_Digital +LibName31=eSim_Hybrid +LibName32=eSim_Miscellaneous +LibName33=eSim_Plot +LibName34=eSim_Power +LibName35=eSim_Sources +LibName36=eSim_Subckt +LibName37=eSim_User diff --git a/library/SubcircuitLibrary/4002/4002.pro b/library/SubcircuitLibrary/4002/4002.pro index 96586117..d9fee2f6 100644 --- a/library/SubcircuitLibrary/4002/4002.pro +++ b/library/SubcircuitLibrary/4002/4002.pro @@ -1,4 +1,4 @@ -update=05/31/19 09:35:41 +update=Wed Mar 18 20:04:35 2020 version=1 last_client=eeschema [general] @@ -38,8 +38,7 @@ LibName4=eSim_Hybrid LibName5=eSim_Miscellaneous LibName6=eSim_Plot LibName7=eSim_Power -LibName8=eSim_PSpice -LibName9=eSim_Sources -LibName10=eSim_Subckt -LibName11=eSim_User -LibName12=power +LibName8=eSim_Sources +LibName9=eSim_Subckt +LibName10=eSim_User +LibName11=power diff --git a/library/SubcircuitLibrary/4023/3_and.pro b/library/SubcircuitLibrary/4023/3_and.pro index 76df4655..6ed3ab10 100644 --- a/library/SubcircuitLibrary/4023/3_and.pro +++ b/library/SubcircuitLibrary/4023/3_and.pro @@ -1,4 +1,4 @@ -update=05/31/19 15:26:09 +update=Wed Mar 18 20:05:15 2020 version=1 last_client=eeschema [general] @@ -38,7 +38,6 @@ LibName4=eSim_Hybrid LibName5=eSim_Miscellaneous LibName6=eSim_Plot LibName7=eSim_Power -LibName8=eSim_PSpice -LibName9=eSim_Sources -LibName10=eSim_Subckt -LibName11=eSim_User +LibName8=eSim_Sources +LibName9=eSim_Subckt +LibName10=eSim_User diff --git a/library/SubcircuitLibrary/4073/3_and.pro b/library/SubcircuitLibrary/4073/3_and.pro index 76df4655..d60dab2f 100644 --- a/library/SubcircuitLibrary/4073/3_and.pro +++ b/library/SubcircuitLibrary/4073/3_and.pro @@ -1,4 +1,4 @@ -update=05/31/19 15:26:09 +update=Wed Mar 18 20:06:00 2020 version=1 last_client=eeschema [general] @@ -38,7 +38,6 @@ LibName4=eSim_Hybrid LibName5=eSim_Miscellaneous LibName6=eSim_Plot LibName7=eSim_Power -LibName8=eSim_PSpice -LibName9=eSim_Sources -LibName10=eSim_Subckt -LibName11=eSim_User +LibName8=eSim_Sources +LibName9=eSim_Subckt +LibName10=eSim_User diff --git a/library/SubcircuitLibrary/4_and/3_and.pro b/library/SubcircuitLibrary/4_and/3_and.pro index 76df4655..06813ca7 100644 --- a/library/SubcircuitLibrary/4_and/3_and.pro +++ b/library/SubcircuitLibrary/4_and/3_and.pro @@ -1,4 +1,4 @@ -update=05/31/19 15:26:09 +update=Wed Mar 18 19:54:53 2020 version=1 last_client=eeschema [general] @@ -38,7 +38,6 @@ LibName4=eSim_Hybrid LibName5=eSim_Miscellaneous LibName6=eSim_Plot LibName7=eSim_Power -LibName8=eSim_PSpice -LibName9=eSim_Sources -LibName10=eSim_Subckt -LibName11=eSim_User +LibName8=eSim_Sources +LibName9=eSim_Subckt +LibName10=eSim_User diff --git a/library/SubcircuitLibrary/4_and/4_and.pro b/library/SubcircuitLibrary/4_and/4_and.pro index 9c0be79e..b13a0a82 100644 --- a/library/SubcircuitLibrary/4_and/4_and.pro +++ b/library/SubcircuitLibrary/4_and/4_and.pro @@ -1,4 +1,4 @@ -update=06/01/19 15:08:42 +update=Wed Mar 18 19:54:24 2020 version=1 last_client=eeschema [general] @@ -52,7 +52,6 @@ LibName18=eSim_Hybrid LibName19=eSim_Miscellaneous LibName20=eSim_Plot LibName21=eSim_Power -LibName22=eSim_PSpice -LibName23=eSim_Sources -LibName24=eSim_Subckt -LibName25=eSim_User +LibName22=eSim_Sources +LibName23=eSim_Subckt +LibName24=eSim_User diff --git a/library/SubcircuitLibrary/4to16_demux/3_and.pro b/library/SubcircuitLibrary/4to16_demux/3_and.pro index 76df4655..117e4cb6 100644 --- a/library/SubcircuitLibrary/4to16_demux/3_and.pro +++ b/library/SubcircuitLibrary/4to16_demux/3_and.pro @@ -1,4 +1,4 @@ -update=05/31/19 15:26:09 +update=Wed Mar 18 19:57:16 2020 version=1 last_client=eeschema [general] @@ -38,7 +38,6 @@ LibName4=eSim_Hybrid LibName5=eSim_Miscellaneous LibName6=eSim_Plot LibName7=eSim_Power -LibName8=eSim_PSpice -LibName9=eSim_Sources -LibName10=eSim_Subckt -LibName11=eSim_User +LibName8=eSim_Sources +LibName9=eSim_Subckt +LibName10=eSim_User diff --git a/library/SubcircuitLibrary/4to16_demux/5_and-cache.lib b/library/SubcircuitLibrary/4to16_demux/5_and-cache.lib index ac396288..fc177c1f 100644 --- a/library/SubcircuitLibrary/4to16_demux/5_and-cache.lib +++ b/library/SubcircuitLibrary/4to16_demux/5_and-cache.lib @@ -1,17 +1,17 @@ EESchema-LIBRARY Version 2.3 #encoding utf-8 # -# 3_and +# 3_and-RESCUE-5_and # -DEF 3_and X 0 40 Y Y 1 F N +DEF 3_and-RESCUE-5_and X 0 40 Y Y 1 F N F0 "X" 900 300 60 H V C CNN -F1 "3_and" 950 500 60 H V C CNN +F1 "3_and-RESCUE-5_and" 950 500 60 H V C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN DRAW A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250 -P 2 0 1 0 650 550 1000 550 N -P 3 0 1 0 650 550 650 250 1000 250 N +P 2 0 1 0 650 550 1000 550 N +P 3 0 1 0 650 550 650 250 1000 250 N X in1 1 450 500 200 R 50 50 1 1 I X in2 2 450 400 200 R 50 50 1 1 I X in3 3 450 300 200 R 50 50 1 1 I @@ -69,7 +69,7 @@ F3 "" 0 0 60 H V C CNN DRAW A 149 50 100 -894 0 0 1 0 N 150 -50 250 50 A 150 49 100 6 900 0 1 0 N 250 50 150 150 -P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N +P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N X IN1 1 -450 100 200 R 50 50 1 1 I X IN2 2 -450 0 200 R 50 50 1 1 I X OUT 3 450 50 200 L 50 50 1 1 O diff --git a/library/SubcircuitLibrary/4to16_demux/5_and-rescue.lib b/library/SubcircuitLibrary/4to16_demux/5_and-rescue.lib new file mode 100644 index 00000000..483b8efb --- /dev/null +++ b/library/SubcircuitLibrary/4to16_demux/5_and-rescue.lib @@ -0,0 +1,22 @@ +EESchema-LIBRARY Version 2.3 +#encoding utf-8 +# +# 3_and-RESCUE-5_and +# +DEF 3_and-RESCUE-5_and X 0 40 Y Y 1 F N +F0 "X" 900 300 60 H V C CNN +F1 "3_and-RESCUE-5_and" 950 500 60 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250 +P 2 0 1 0 650 550 1000 550 N +P 3 0 1 0 650 550 650 250 1000 250 N +X in1 1 450 500 200 R 50 50 1 1 I +X in2 2 450 400 200 R 50 50 1 1 I +X in3 3 450 300 200 R 50 50 1 1 I +X out 4 1300 400 200 L 50 50 1 1 O +ENDDRAW +ENDDEF +# +#End Library diff --git a/library/SubcircuitLibrary/4to16_demux/5_and.pro b/library/SubcircuitLibrary/4to16_demux/5_and.pro index 7a2f090e..42b50b1e 100644 --- a/library/SubcircuitLibrary/4to16_demux/5_and.pro +++ b/library/SubcircuitLibrary/4to16_demux/5_and.pro @@ -1,4 +1,4 @@ -update=06/01/19 11:31:03 +update=Wed Mar 18 19:57:51 2020 version=1 last_client=eeschema [general] @@ -44,7 +44,6 @@ LibName10=eSim_Hybrid LibName11=eSim_Miscellaneous LibName12=eSim_Plot LibName13=eSim_Power -LibName14=eSim_PSpice -LibName15=eSim_Sources -LibName16=eSim_Subckt -LibName17=eSim_User +LibName14=eSim_Sources +LibName15=eSim_Subckt +LibName16=eSim_User diff --git a/library/SubcircuitLibrary/4to16_demux/5_and.sch b/library/SubcircuitLibrary/4to16_demux/5_and.sch index e9eb58ee..89cee816 100644 --- a/library/SubcircuitLibrary/4to16_demux/5_and.sch +++ b/library/SubcircuitLibrary/4to16_demux/5_and.sch @@ -1,4 +1,5 @@ EESchema Schematic File Version 2 +LIBS:5_and-rescue LIBS:cypress LIBS:siliconi LIBS:opto @@ -12,7 +13,6 @@ LIBS:eSim_Hybrid LIBS:eSim_Miscellaneous LIBS:eSim_Plot LIBS:eSim_Power -LIBS:eSim_PSpice LIBS:eSim_Sources LIBS:eSim_Subckt LIBS:eSim_User @@ -32,7 +32,7 @@ Comment3 "" Comment4 "" $EndDescr $Comp -L 3_and X1 +L 3_and-RESCUE-5_and X1 U 1 1 5C9A2741 P 3800 3350 F 0 "X1" H 4700 3650 60 0000 C CNN diff --git a/library/SubcircuitLibrary/4to16_demux/5_nand.pro b/library/SubcircuitLibrary/4to16_demux/5_nand.pro index b7d23f44..55cad11e 100644 --- a/library/SubcircuitLibrary/4to16_demux/5_nand.pro +++ b/library/SubcircuitLibrary/4to16_demux/5_nand.pro @@ -1,4 +1,4 @@ -update=Fri Jun 21 16:46:10 2019 +update=Wed Mar 18 19:59:08 2020 version=1 last_client=eeschema [general] @@ -52,32 +52,19 @@ LibName18=opto LibName19=atmel LibName20=contrib LibName21=power -LibName22=device -LibName23=transistors -LibName24=conn -LibName25=linear -LibName26=regul -LibName27=74xx -LibName28=cmos4000 -LibName29=eSim_Analog -LibName30=eSim_Devices -LibName31=eSim_Digital -LibName32=eSim_Hybrid -LibName33=eSim_Miscellaneous -LibName34=eSim_Power -LibName35=eSim_Sources -LibName36=eSim_Subckt -LibName37=eSim_User -LibName38=eSim_Plot -LibName39=eSim_PSpice -LibName40=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Analog -LibName41=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Devices -LibName42=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Digital -LibName43=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Hybrid -LibName44=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Miscellaneous -LibName45=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Plot -LibName46=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Power -LibName47=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Sources -LibName48=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Subckt -LibName49=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_User +LibName22=transistors +LibName23=conn +LibName24=regul +LibName25=74xx +LibName26=cmos4000 +LibName27=eSim_Analog +LibName28=eSim_Devices +LibName29=eSim_Digital +LibName30=eSim_Hybrid +LibName31=eSim_Miscellaneous +LibName32=eSim_Power +LibName33=eSim_Sources +LibName34=eSim_Subckt +LibName35=eSim_User +LibName36=eSim_Plot diff --git a/library/SubcircuitLibrary/556/556.pro b/library/SubcircuitLibrary/556/556.pro index 5a379015..01ad1124 100644 --- a/library/SubcircuitLibrary/556/556.pro +++ b/library/SubcircuitLibrary/556/556.pro @@ -1,4 +1,4 @@ -update=03/18/19 18:13:51 +update=Wed Mar 18 20:02:35 2020 version=1 last_client=eeschema [general] @@ -62,10 +62,9 @@ LibName28=valves LibName29=eSim_User LibName30=eSim_Subckt LibName31=eSim_Sources -LibName32=eSim_PSpice -LibName33=eSim_Power -LibName34=eSim_Plot -LibName35=eSim_Miscellaneous -LibName36=eSim_Hybrid -LibName37=eSim_Digital -LibName38=eSim_Devices +LibName32=eSim_Power +LibName33=eSim_Plot +LibName34=eSim_Miscellaneous +LibName35=eSim_Hybrid +LibName36=eSim_Digital +LibName37=eSim_Devices diff --git a/library/SubcircuitLibrary/5_and/3_and.pro b/library/SubcircuitLibrary/5_and/3_and.pro index 76df4655..da3e199e 100644 --- a/library/SubcircuitLibrary/5_and/3_and.pro +++ b/library/SubcircuitLibrary/5_and/3_and.pro @@ -1,4 +1,4 @@ -update=05/31/19 15:26:09 +update=Wed Mar 18 20:00:16 2020 version=1 last_client=eeschema [general] @@ -38,7 +38,6 @@ LibName4=eSim_Hybrid LibName5=eSim_Miscellaneous LibName6=eSim_Plot LibName7=eSim_Power -LibName8=eSim_PSpice -LibName9=eSim_Sources -LibName10=eSim_Subckt -LibName11=eSim_User +LibName8=eSim_Sources +LibName9=eSim_Subckt +LibName10=eSim_User diff --git a/library/SubcircuitLibrary/5_and/5_and-cache.lib b/library/SubcircuitLibrary/5_and/5_and-cache.lib index ac396288..fc177c1f 100644 --- a/library/SubcircuitLibrary/5_and/5_and-cache.lib +++ b/library/SubcircuitLibrary/5_and/5_and-cache.lib @@ -1,17 +1,17 @@ EESchema-LIBRARY Version 2.3 #encoding utf-8 # -# 3_and +# 3_and-RESCUE-5_and # -DEF 3_and X 0 40 Y Y 1 F N +DEF 3_and-RESCUE-5_and X 0 40 Y Y 1 F N F0 "X" 900 300 60 H V C CNN -F1 "3_and" 950 500 60 H V C CNN +F1 "3_and-RESCUE-5_and" 950 500 60 H V C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN DRAW A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250 -P 2 0 1 0 650 550 1000 550 N -P 3 0 1 0 650 550 650 250 1000 250 N +P 2 0 1 0 650 550 1000 550 N +P 3 0 1 0 650 550 650 250 1000 250 N X in1 1 450 500 200 R 50 50 1 1 I X in2 2 450 400 200 R 50 50 1 1 I X in3 3 450 300 200 R 50 50 1 1 I @@ -69,7 +69,7 @@ F3 "" 0 0 60 H V C CNN DRAW A 149 50 100 -894 0 0 1 0 N 150 -50 250 50 A 150 49 100 6 900 0 1 0 N 250 50 150 150 -P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N +P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N X IN1 1 -450 100 200 R 50 50 1 1 I X IN2 2 -450 0 200 R 50 50 1 1 I X OUT 3 450 50 200 L 50 50 1 1 O diff --git a/library/SubcircuitLibrary/5_and/5_and-rescue.lib b/library/SubcircuitLibrary/5_and/5_and-rescue.lib new file mode 100644 index 00000000..483b8efb --- /dev/null +++ b/library/SubcircuitLibrary/5_and/5_and-rescue.lib @@ -0,0 +1,22 @@ +EESchema-LIBRARY Version 2.3 +#encoding utf-8 +# +# 3_and-RESCUE-5_and +# +DEF 3_and-RESCUE-5_and X 0 40 Y Y 1 F N +F0 "X" 900 300 60 H V C CNN +F1 "3_and-RESCUE-5_and" 950 500 60 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250 +P 2 0 1 0 650 550 1000 550 N +P 3 0 1 0 650 550 650 250 1000 250 N +X in1 1 450 500 200 R 50 50 1 1 I +X in2 2 450 400 200 R 50 50 1 1 I +X in3 3 450 300 200 R 50 50 1 1 I +X out 4 1300 400 200 L 50 50 1 1 O +ENDDRAW +ENDDEF +# +#End Library diff --git a/library/SubcircuitLibrary/5_and/5_and.pro b/library/SubcircuitLibrary/5_and/5_and.pro index b09b3dde..c16a3f85 100644 --- a/library/SubcircuitLibrary/5_and/5_and.pro +++ b/library/SubcircuitLibrary/5_and/5_and.pro @@ -1,4 +1,4 @@ -update=06/01/19 11:31:03 +update=Wed Mar 18 19:59:53 2020 version=1 last_client=eeschema [general] diff --git a/library/SubcircuitLibrary/5_and/5_and.sch b/library/SubcircuitLibrary/5_and/5_and.sch index e9eb58ee..aef3c043 100644 --- a/library/SubcircuitLibrary/5_and/5_and.sch +++ b/library/SubcircuitLibrary/5_and/5_and.sch @@ -1,4 +1,5 @@ EESchema Schematic File Version 2 +LIBS:5_and-rescue LIBS:cypress LIBS:siliconi LIBS:opto @@ -12,10 +13,9 @@ LIBS:eSim_Hybrid LIBS:eSim_Miscellaneous LIBS:eSim_Plot LIBS:eSim_Power -LIBS:eSim_PSpice +LIBS:eSim_User LIBS:eSim_Sources LIBS:eSim_Subckt -LIBS:eSim_User LIBS:5_and-cache EELAYER 25 0 EELAYER END @@ -32,7 +32,7 @@ Comment3 "" Comment4 "" $EndDescr $Comp -L 3_and X1 +L 3_and-RESCUE-5_and X1 U 1 1 5C9A2741 P 3800 3350 F 0 "X1" H 4700 3650 60 0000 C CNN diff --git a/library/SubcircuitLibrary/74153/3_and.pro b/library/SubcircuitLibrary/74153/3_and.pro index 2c9ac554..2ed02922 100644 --- a/library/SubcircuitLibrary/74153/3_and.pro +++ b/library/SubcircuitLibrary/74153/3_and.pro @@ -1,4 +1,4 @@ -update=03/26/19 18:40:23 +update=Wed Mar 18 20:09:49 2020 version=1 last_client=eeschema [general] @@ -52,7 +52,6 @@ LibName18=eSim_Hybrid LibName19=eSim_Miscellaneous LibName20=eSim_Plot LibName21=eSim_Power -LibName22=eSim_PSpice -LibName23=eSim_Sources -LibName24=eSim_Subckt -LibName25=eSim_User +LibName22=eSim_Sources +LibName23=eSim_Subckt +LibName24=eSim_User diff --git a/library/SubcircuitLibrary/74153/4_OR.pro b/library/SubcircuitLibrary/74153/4_OR.pro index 2c258cec..82ea8876 100644 --- a/library/SubcircuitLibrary/74153/4_OR.pro +++ b/library/SubcircuitLibrary/74153/4_OR.pro @@ -1,4 +1,4 @@ -update=03/28/19 22:43:48 +update=Wed Mar 18 20:10:33 2020 version=1 last_client=eeschema [general] @@ -39,7 +39,6 @@ LibName5=eSim_Hybrid LibName6=eSim_Miscellaneous LibName7=eSim_Plot LibName8=eSim_Power -LibName9=eSim_PSpice -LibName10=eSim_Sources -LibName11=eSim_Subckt -LibName12=eSim_User +LibName9=eSim_Sources +LibName10=eSim_Subckt +LibName11=eSim_User diff --git a/library/SubcircuitLibrary/74153/4_and-cache.lib b/library/SubcircuitLibrary/74153/4_and-cache.lib index ac396288..e7636dd5 100644 --- a/library/SubcircuitLibrary/74153/4_and-cache.lib +++ b/library/SubcircuitLibrary/74153/4_and-cache.lib @@ -1,17 +1,17 @@ EESchema-LIBRARY Version 2.3 #encoding utf-8 # -# 3_and +# 3_and-RESCUE-4_and # -DEF 3_and X 0 40 Y Y 1 F N +DEF 3_and-RESCUE-4_and X 0 40 Y Y 1 F N F0 "X" 900 300 60 H V C CNN -F1 "3_and" 950 500 60 H V C CNN +F1 "3_and-RESCUE-4_and" 950 500 60 H V C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN DRAW A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250 -P 2 0 1 0 650 550 1000 550 N -P 3 0 1 0 650 550 650 250 1000 250 N +P 2 0 1 0 650 550 1000 550 N +P 3 0 1 0 650 550 650 250 1000 250 N X in1 1 450 500 200 R 50 50 1 1 I X in2 2 450 400 200 R 50 50 1 1 I X in3 3 450 300 200 R 50 50 1 1 I @@ -69,7 +69,7 @@ F3 "" 0 0 60 H V C CNN DRAW A 149 50 100 -894 0 0 1 0 N 150 -50 250 50 A 150 49 100 6 900 0 1 0 N 250 50 150 150 -P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N +P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N X IN1 1 -450 100 200 R 50 50 1 1 I X IN2 2 -450 0 200 R 50 50 1 1 I X OUT 3 450 50 200 L 50 50 1 1 O diff --git a/library/SubcircuitLibrary/74153/4_and-rescue.lib b/library/SubcircuitLibrary/74153/4_and-rescue.lib new file mode 100644 index 00000000..49f649ad --- /dev/null +++ b/library/SubcircuitLibrary/74153/4_and-rescue.lib @@ -0,0 +1,22 @@ +EESchema-LIBRARY Version 2.3 +#encoding utf-8 +# +# 3_and-RESCUE-4_and +# +DEF 3_and-RESCUE-4_and X 0 40 Y Y 1 F N +F0 "X" 900 300 60 H V C CNN +F1 "3_and-RESCUE-4_and" 950 500 60 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250 +P 2 0 1 0 650 550 1000 550 N +P 3 0 1 0 650 550 650 250 1000 250 N +X in1 1 450 500 200 R 50 50 1 1 I +X in2 2 450 400 200 R 50 50 1 1 I +X in3 3 450 300 200 R 50 50 1 1 I +X out 4 1300 400 200 L 50 50 1 1 O +ENDDRAW +ENDDEF +# +#End Library diff --git a/library/SubcircuitLibrary/74153/4_and.pro b/library/SubcircuitLibrary/74153/4_and.pro index 6eb77fff..55a70ef1 100644 --- a/library/SubcircuitLibrary/74153/4_and.pro +++ b/library/SubcircuitLibrary/74153/4_and.pro @@ -1,4 +1,4 @@ -update=03/26/19 18:58:33 +update=Wed Mar 18 20:10:11 2020 version=1 last_client=eeschema [general] @@ -51,7 +51,6 @@ LibName17=eSim_Hybrid LibName18=eSim_Miscellaneous LibName19=eSim_Plot LibName20=eSim_Power -LibName21=eSim_PSpice -LibName22=eSim_Sources -LibName23=eSim_Subckt -LibName24=eSim_User +LibName21=eSim_Sources +LibName22=eSim_Subckt +LibName23=eSim_User diff --git a/library/SubcircuitLibrary/74153/4_and.sch b/library/SubcircuitLibrary/74153/4_and.sch index 883458e1..87b2bf51 100644 --- a/library/SubcircuitLibrary/74153/4_and.sch +++ b/library/SubcircuitLibrary/74153/4_and.sch @@ -1,4 +1,5 @@ EESchema Schematic File Version 2 +LIBS:4_and-rescue LIBS:texas LIBS:intel LIBS:audio @@ -19,10 +20,10 @@ LIBS:eSim_Hybrid LIBS:eSim_Miscellaneous LIBS:eSim_Plot LIBS:eSim_Power -LIBS:eSim_PSpice LIBS:eSim_Sources LIBS:eSim_Subckt LIBS:eSim_User +LIBS:4_and-cache EELAYER 25 0 EELAYER END $Descr A4 11693 8268 @@ -38,7 +39,7 @@ Comment3 "" Comment4 "" $EndDescr $Comp -L 3_and X1 +L 3_and-RESCUE-4_and X1 U 1 1 5C9A2915 P 3700 3500 F 0 "X1" H 4600 3800 60 0000 C CNN diff --git a/library/SubcircuitLibrary/74153/74153-cache.lib b/library/SubcircuitLibrary/74153/74153-cache.lib index 1e85854e..0c4adc4e 100644 --- a/library/SubcircuitLibrary/74153/74153-cache.lib +++ b/library/SubcircuitLibrary/74153/74153-cache.lib @@ -1,19 +1,19 @@ EESchema-LIBRARY Version 2.3 #encoding utf-8 # -# 4_OR +# 4_OR-RESCUE-74153 # -DEF 4_OR X 0 40 Y Y 1 F N +DEF 4_OR-RESCUE-74153 X 0 40 Y Y 1 F N F0 "X" 3900 3050 60 H V C CNN -F1 "4_OR" 3900 3250 60 H V C CNN +F1 "4_OR-RESCUE-74153" 3900 3250 60 H V C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN DRAW A 2950 3150 650 226 -226 0 1 0 N 3550 3400 3550 2900 A 3677 3284 444 -599 -176 0 1 0 N 3900 2900 4100 3150 A 3720 3051 393 627 146 0 1 0 N 3900 3400 4100 3150 -P 2 0 1 0 3550 2900 3900 2900 N -P 2 0 1 0 3550 3400 3900 3400 N +P 2 0 1 0 3550 2900 3900 2900 N +P 2 0 1 0 3550 3400 3900 3400 N X in1 1 3400 3300 200 R 50 50 1 1 I X in2 2 3400 3200 200 R 50 50 1 1 I X in3 3 3400 3100 200 R 50 50 1 1 I @@ -22,17 +22,17 @@ X out 5 4300 3150 200 L 50 50 1 1 O ENDDRAW ENDDEF # -# 4_and +# 4_and-RESCUE-74153 # -DEF 4_and X 0 40 Y Y 1 F N +DEF 4_and-RESCUE-74153 X 0 40 Y Y 1 F N F0 "X" 1500 1050 60 H V C CNN -F1 "4_and" 1550 1200 60 H V C CNN +F1 "4_and-RESCUE-74153" 1550 1200 60 H V C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN DRAW A 1550 1100 206 760 -760 0 1 0 N 1600 1300 1600 900 -P 2 0 1 0 1250 1300 1600 1300 N -P 4 0 1 0 1250 1300 1250 900 1500 900 1600 900 N +P 2 0 1 0 1250 1300 1600 1300 N +P 4 0 1 0 1250 1300 1250 900 1500 900 1600 900 N X in1 1 1050 1250 200 R 50 50 1 1 I X in2 2 1050 1150 200 R 50 50 1 1 I X in3 3 1050 1050 200 R 50 50 1 1 I @@ -89,7 +89,7 @@ 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 +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 diff --git a/library/SubcircuitLibrary/74153/74153-rescue.lib b/library/SubcircuitLibrary/74153/74153-rescue.lib new file mode 100644 index 00000000..825bc5e2 --- /dev/null +++ b/library/SubcircuitLibrary/74153/74153-rescue.lib @@ -0,0 +1,44 @@ +EESchema-LIBRARY Version 2.3 +#encoding utf-8 +# +# 4_OR-RESCUE-74153 +# +DEF 4_OR-RESCUE-74153 X 0 40 Y Y 1 F N +F0 "X" 3900 3050 60 H V C CNN +F1 "4_OR-RESCUE-74153" 3900 3250 60 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +A 2950 3150 650 226 -226 0 1 0 N 3550 3400 3550 2900 +A 3677 3284 444 -599 -176 0 1 0 N 3900 2900 4100 3150 +A 3720 3051 393 627 146 0 1 0 N 3900 3400 4100 3150 +P 2 0 1 0 3550 2900 3900 2900 N +P 2 0 1 0 3550 3400 3900 3400 N +X in1 1 3400 3300 200 R 50 50 1 1 I +X in2 2 3400 3200 200 R 50 50 1 1 I +X in3 3 3400 3100 200 R 50 50 1 1 I +X in4 4 3400 3000 200 R 50 50 1 1 I +X out 5 4300 3150 200 L 50 50 1 1 O +ENDDRAW +ENDDEF +# +# 4_and-RESCUE-74153 +# +DEF 4_and-RESCUE-74153 X 0 40 Y Y 1 F N +F0 "X" 1500 1050 60 H V C CNN +F1 "4_and-RESCUE-74153" 1550 1200 60 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +A 1550 1100 206 760 -760 0 1 0 N 1600 1300 1600 900 +P 2 0 1 0 1250 1300 1600 1300 N +P 4 0 1 0 1250 1300 1250 900 1500 900 1600 900 N +X in1 1 1050 1250 200 R 50 50 1 1 I +X in2 2 1050 1150 200 R 50 50 1 1 I +X in3 3 1050 1050 200 R 50 50 1 1 I +X in4 4 1050 950 200 R 50 50 1 1 I +X out 5 1950 1100 200 L 50 50 1 1 O +ENDDRAW +ENDDEF +# +#End Library diff --git a/library/SubcircuitLibrary/74153/74153.pro b/library/SubcircuitLibrary/74153/74153.pro index a4d6d3bb..6a74248c 100644 --- a/library/SubcircuitLibrary/74153/74153.pro +++ b/library/SubcircuitLibrary/74153/74153.pro @@ -1,4 +1,4 @@ -update=03/28/19 23:27:36 +update=Wed Mar 18 20:10:59 2020 version=1 last_client=eeschema [general] @@ -31,27 +31,28 @@ NetIExt=net version=1 LibDir= [eeschema/libraries] -LibName1=power -LibName2=eSim_User -LibName3=texas -LibName4=intel -LibName5=audio -LibName6=interface -LibName7=digital-audio -LibName8=philips -LibName9=display -LibName10=cypress -LibName11=siliconi -LibName12=opto -LibName13=atmel -LibName14=contrib -LibName15=valves -LibName16=eSim_Analog -LibName17=eSim_Devices -LibName18=eSim_Digital -LibName19=eSim_Hybrid -LibName20=eSim_Miscellaneous -LibName21=eSim_Plot -LibName22=eSim_Power -LibName23=eSim_Subckt -LibName24=eSim_Sources +LibName1=74153-rescue +LibName2=power +LibName3=eSim_User +LibName4=texas +LibName5=intel +LibName6=audio +LibName7=interface +LibName8=digital-audio +LibName9=philips +LibName10=display +LibName11=cypress +LibName12=siliconi +LibName13=opto +LibName14=atmel +LibName15=contrib +LibName16=valves +LibName17=eSim_Analog +LibName18=eSim_Devices +LibName19=eSim_Digital +LibName20=eSim_Hybrid +LibName21=eSim_Miscellaneous +LibName22=eSim_Plot +LibName23=eSim_Power +LibName24=eSim_Subckt +LibName25=eSim_Sources diff --git a/library/SubcircuitLibrary/74153/74153.sch b/library/SubcircuitLibrary/74153/74153.sch index e0bcf950..470aab71 100644 --- a/library/SubcircuitLibrary/74153/74153.sch +++ b/library/SubcircuitLibrary/74153/74153.sch @@ -1,6 +1,7 @@ EESchema Schematic File Version 2 +LIBS:74153-rescue LIBS:power -LIBS:device +LIBS:eSim_User LIBS:texas LIBS:intel LIBS:audio @@ -21,10 +22,8 @@ LIBS:eSim_Hybrid LIBS:eSim_Miscellaneous LIBS:eSim_Plot LIBS:eSim_Power -LIBS:eSim_PSpice -LIBS:eSim_Sources -LIBS:eSim_User LIBS:eSim_Subckt +LIBS:eSim_Sources LIBS:74153-cache EELAYER 25 0 EELAYER END @@ -267,7 +266,7 @@ YA Text Notes 7400 5250 0 60 ~ 12 YB $Comp -L 4_and X8 +L 4_and-RESCUE-74153 X8 U 1 1 5C9D0C22 P 2750 3050 F 0 "X8" H 4250 4100 60 0000 C CNN @@ -278,7 +277,7 @@ F 3 "" H 2750 3050 60 0000 C CNN 1 0 0 -1 $EndComp $Comp -L 4_and X9 +L 4_and-RESCUE-74153 X9 U 1 1 5C9D0CA2 P 2750 3600 F 0 "X9" H 4250 4650 60 0000 C CNN @@ -289,7 +288,7 @@ F 3 "" H 2750 3600 60 0000 C CNN 1 0 0 -1 $EndComp $Comp -L 4_and X4 +L 4_and-RESCUE-74153 X4 U 1 1 5C9D0D16 P 2700 4200 F 0 "X4" H 4200 5250 60 0000 C CNN @@ -300,7 +299,7 @@ F 3 "" H 2700 4200 60 0000 C CNN 1 0 0 -1 $EndComp $Comp -L 4_and X10 +L 4_and-RESCUE-74153 X10 U 1 1 5C9D0D93 P 2750 4700 F 0 "X10" H 4250 5750 60 0000 C CNN @@ -311,7 +310,7 @@ F 3 "" H 2750 4700 60 0000 C CNN 1 0 0 -1 $EndComp $Comp -L 4_and X5 +L 4_and-RESCUE-74153 X5 U 1 1 5C9D182A P 2700 5700 F 0 "X5" H 4200 6750 60 0000 C CNN @@ -322,7 +321,7 @@ F 3 "" H 2700 5700 60 0000 C CNN 1 0 0 -1 $EndComp $Comp -L 4_and X6 +L 4_and-RESCUE-74153 X6 U 1 1 5C9D1830 P 2700 6250 F 0 "X6" H 4200 7300 60 0000 C CNN @@ -333,7 +332,7 @@ F 3 "" H 2700 6250 60 0000 C CNN 1 0 0 -1 $EndComp $Comp -L 4_and X3 +L 4_and-RESCUE-74153 X3 U 1 1 5C9D1836 P 2650 6850 F 0 "X3" H 4150 7900 60 0000 C CNN @@ -344,7 +343,7 @@ F 3 "" H 2650 6850 60 0000 C CNN 1 0 0 -1 $EndComp $Comp -L 4_and X7 +L 4_and-RESCUE-74153 X7 U 1 1 5C9D183C P 2700 7350 F 0 "X7" H 4200 8400 60 0000 C CNN @@ -512,7 +511,7 @@ Wire Wire Line Wire Wire Line 3750 6450 3750 6400 $Comp -L 4_OR X1 +L 4_OR-RESCUE-74153 X1 U 1 1 5C9D22F7 P 2150 8400 F 0 "X1" H 6050 11450 60 0000 C CNN @@ -539,7 +538,7 @@ Wire Wire Line Wire Wire Line 4650 5400 5550 5400 $Comp -L 4_OR X2 +L 4_OR-RESCUE-74153 X2 U 1 1 5C9D28DE P 2250 5750 F 0 "X2" H 6150 8800 60 0000 C CNN diff --git a/library/SubcircuitLibrary/74153/Dual4to1MUX.pro b/library/SubcircuitLibrary/74153/Dual4to1MUX.pro new file mode 100644 index 00000000..f63b751e --- /dev/null +++ b/library/SubcircuitLibrary/74153/Dual4to1MUX.pro @@ -0,0 +1,69 @@ +update=22/05/2015 07:44:53 +version=1 +last_client=kicad +[general] +version=1 +RootSch= +BoardNm= +[pcbnew] +version=1 +LastNetListRead= +UseCmpFile=1 +PadDrill=0.600000000000 +PadDrillOvalY=0.600000000000 +PadSizeH=1.500000000000 +PadSizeV=1.500000000000 +PcbTextSizeV=1.500000000000 +PcbTextSizeH=1.500000000000 +PcbTextThickness=0.300000000000 +ModuleTextSizeV=1.000000000000 +ModuleTextSizeH=1.000000000000 +ModuleTextSizeThickness=0.150000000000 +SolderMaskClearance=0.000000000000 +SolderMaskMinWidth=0.000000000000 +DrawSegmentWidth=0.200000000000 +BoardOutlineThickness=0.100000000000 +ModuleOutlineThickness=0.150000000000 +[cvpcb] +version=1 +NetIExt=net +[eeschema] +version=1 +LibDir= +[eeschema/libraries] +LibName1=adc-dac +LibName2=memory +LibName3=xilinx +LibName4=microcontrollers +LibName5=dsp +LibName6=microchip +LibName7=analog_switches +LibName8=motorola +LibName9=texas +LibName10=intel +LibName11=audio +LibName12=interface +LibName13=digital-audio +LibName14=philips +LibName15=display +LibName16=cypress +LibName17=siliconi +LibName18=opto +LibName19=atmel +LibName20=contrib +LibName21=power +LibName22=eSim_Plot +LibName23=transistors +LibName24=conn +LibName25=eSim_User +LibName26=regul +LibName27=74xx +LibName28=cmos4000 +LibName29=eSim_Analog +LibName30=eSim_Devices +LibName31=eSim_Digital +LibName32=eSim_Hybrid +LibName33=eSim_Miscellaneous +LibName34=eSim_Power +LibName35=eSim_Sources +LibName36=eSim_Subckt diff --git a/library/SubcircuitLibrary/74157/3_and.pro b/library/SubcircuitLibrary/74157/3_and.pro index 2c9ac554..9c67c7ed 100644 --- a/library/SubcircuitLibrary/74157/3_and.pro +++ b/library/SubcircuitLibrary/74157/3_and.pro @@ -1,4 +1,4 @@ -update=03/26/19 18:40:23 +update=Wed Mar 18 20:12:00 2020 version=1 last_client=eeschema [general] @@ -52,7 +52,6 @@ LibName18=eSim_Hybrid LibName19=eSim_Miscellaneous LibName20=eSim_Plot LibName21=eSim_Power -LibName22=eSim_PSpice -LibName23=eSim_Sources -LibName24=eSim_Subckt -LibName25=eSim_User +LibName22=eSim_Sources +LibName23=eSim_Subckt +LibName24=eSim_User diff --git a/library/SubcircuitLibrary/74157/74157-cache.lib b/library/SubcircuitLibrary/74157/74157-cache.lib index de171255..d72d1628 100644 --- a/library/SubcircuitLibrary/74157/74157-cache.lib +++ b/library/SubcircuitLibrary/74157/74157-cache.lib @@ -1,17 +1,17 @@ EESchema-LIBRARY Version 2.3 #encoding utf-8 # -# 3_and +# 3_and-RESCUE-74157 # -DEF 3_and X 0 40 Y Y 1 F N +DEF 3_and-RESCUE-74157 X 0 40 Y Y 1 F N F0 "X" 900 300 60 H V C CNN -F1 "3_and" 950 500 60 H V C CNN +F1 "3_and-RESCUE-74157" 950 500 60 H V C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN DRAW A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250 -P 2 0 1 0 650 550 1000 550 N -P 3 0 1 0 650 550 650 250 1000 250 N +P 2 0 1 0 650 550 1000 550 N +P 3 0 1 0 650 550 650 250 1000 250 N X in1 1 450 500 200 R 50 50 1 1 I X in2 2 450 400 200 R 50 50 1 1 I X in3 3 450 300 200 R 50 50 1 1 I @@ -67,7 +67,7 @@ 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 +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 @@ -84,8 +84,8 @@ DRAW A -450 50 224 266 -266 0 1 0 N -250 150 -250 -50 A -25 -124 325 574 323 0 1 0 N 150 150 250 50 A 74 125 191 -665 -231 0 1 0 N 150 -50 250 50 -P 2 0 1 0 -250 -50 150 -50 N -P 2 0 1 0 -250 150 150 150 N +P 2 0 1 0 -250 -50 150 -50 N +P 2 0 1 0 -250 150 150 150 N X IN1 1 -450 100 215 R 50 50 1 1 I X IN2 2 -450 0 215 R 50 50 1 1 I X OUT 3 450 50 200 L 50 50 1 1 O diff --git a/library/SubcircuitLibrary/74157/74157-rescue.lib b/library/SubcircuitLibrary/74157/74157-rescue.lib new file mode 100644 index 00000000..cac27fc1 --- /dev/null +++ b/library/SubcircuitLibrary/74157/74157-rescue.lib @@ -0,0 +1,22 @@ +EESchema-LIBRARY Version 2.3 +#encoding utf-8 +# +# 3_and-RESCUE-74157 +# +DEF 3_and-RESCUE-74157 X 0 40 Y Y 1 F N +F0 "X" 900 300 60 H V C CNN +F1 "3_and-RESCUE-74157" 950 500 60 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250 +P 2 0 1 0 650 550 1000 550 N +P 3 0 1 0 650 550 650 250 1000 250 N +X in1 1 450 500 200 R 50 50 1 1 I +X in2 2 450 400 200 R 50 50 1 1 I +X in3 3 450 300 200 R 50 50 1 1 I +X out 4 1300 400 200 L 50 50 1 1 O +ENDDRAW +ENDDEF +# +#End Library diff --git a/library/SubcircuitLibrary/74157/74157.pro b/library/SubcircuitLibrary/74157/74157.pro index c18140ca..70c266b8 100644 --- a/library/SubcircuitLibrary/74157/74157.pro +++ b/library/SubcircuitLibrary/74157/74157.pro @@ -1,4 +1,4 @@ -update=03/28/19 22:30:06 +update=Wed Mar 18 20:12:25 2020 version=1 last_client=eeschema [general] @@ -31,26 +31,27 @@ NetIExt=net version=1 LibDir= [eeschema/libraries] -LibName1=power -LibName2=intel -LibName3=audio -LibName4=interface -LibName5=digital-audio -LibName6=philips -LibName7=display -LibName8=cypress -LibName9=siliconi -LibName10=opto -LibName11=atmel -LibName12=contrib -LibName13=valves -LibName14=eSim_Analog -LibName15=eSim_Devices -LibName16=eSim_Digital -LibName17=eSim_Hybrid -LibName18=eSim_Miscellaneous -LibName19=eSim_Plot -LibName20=eSim_Power -LibName21=eSim_Subckt -LibName22=eSim_Sources -LibName23=eSim_User +LibName1=74157-rescue +LibName2=power +LibName3=intel +LibName4=audio +LibName5=interface +LibName6=digital-audio +LibName7=philips +LibName8=display +LibName9=cypress +LibName10=siliconi +LibName11=opto +LibName12=atmel +LibName13=contrib +LibName14=valves +LibName15=eSim_Analog +LibName16=eSim_Devices +LibName17=eSim_Digital +LibName18=eSim_Hybrid +LibName19=eSim_Miscellaneous +LibName20=eSim_Plot +LibName21=eSim_Power +LibName22=eSim_Subckt +LibName23=eSim_Sources +LibName24=eSim_User diff --git a/library/SubcircuitLibrary/74157/74157.sch b/library/SubcircuitLibrary/74157/74157.sch index 7fd3609e..fc95564d 100644 --- a/library/SubcircuitLibrary/74157/74157.sch +++ b/library/SubcircuitLibrary/74157/74157.sch @@ -1,4 +1,5 @@ EESchema Schematic File Version 2 +LIBS:74157-rescue LIBS:power LIBS:intel LIBS:audio @@ -19,10 +20,9 @@ LIBS:eSim_Hybrid LIBS:eSim_Miscellaneous LIBS:eSim_Plot LIBS:eSim_Power -LIBS:eSim_PSpice +LIBS:eSim_Subckt LIBS:eSim_Sources LIBS:eSim_User -LIBS:eSim_Subckt LIBS:74157-cache EELAYER 25 0 EELAYER END @@ -439,7 +439,7 @@ Wire Wire Line 3400 6650 3400 5700 Connection ~ 3450 5700 $Comp -L 3_and X2 +L 3_and-RESCUE-74157 X2 U 1 1 5C9D0110 P 3450 2400 F 0 "X2" H 4350 2700 60 0000 C CNN @@ -450,7 +450,7 @@ F 3 "" H 3450 2400 60 0000 C CNN 1 0 0 -1 $EndComp $Comp -L 3_and X3 +L 3_and-RESCUE-74157 X3 U 1 1 5C9D01B8 P 3450 2900 F 0 "X3" H 4350 3200 60 0000 C CNN @@ -461,7 +461,7 @@ F 3 "" H 3450 2900 60 0000 C CNN 1 0 0 -1 $EndComp $Comp -L 3_and X4 +L 3_and-RESCUE-74157 X4 U 1 1 5C9D0222 P 3450 3350 F 0 "X4" H 4350 3650 60 0000 C CNN @@ -472,7 +472,7 @@ F 3 "" H 3450 3350 60 0000 C CNN 1 0 0 -1 $EndComp $Comp -L 3_and X5 +L 3_and-RESCUE-74157 X5 U 1 1 5C9D0289 P 3450 3850 F 0 "X5" H 4350 4150 60 0000 C CNN @@ -483,7 +483,7 @@ F 3 "" H 3450 3850 60 0000 C CNN 1 0 0 -1 $EndComp $Comp -L 3_and X6 +L 3_and-RESCUE-74157 X6 U 1 1 5C9D0361 P 3450 4650 F 0 "X6" H 4350 4950 60 0000 C CNN @@ -494,7 +494,7 @@ F 3 "" H 3450 4650 60 0000 C CNN 1 0 0 -1 $EndComp $Comp -L 3_and X7 +L 3_and-RESCUE-74157 X7 U 1 1 5C9D0367 P 3450 5150 F 0 "X7" H 4350 5450 60 0000 C CNN @@ -505,7 +505,7 @@ F 3 "" H 3450 5150 60 0000 C CNN 1 0 0 -1 $EndComp $Comp -L 3_and X1 +L 3_and-RESCUE-74157 X1 U 1 1 5C9D036D P 3400 5600 F 0 "X1" H 4300 5900 60 0000 C CNN @@ -516,7 +516,7 @@ F 3 "" H 3400 5600 60 0000 C CNN 1 0 0 -1 $EndComp $Comp -L 3_and X8 +L 3_and-RESCUE-74157 X8 U 1 1 5C9D0373 P 3450 6100 F 0 "X8" H 4350 6400 60 0000 C CNN diff --git a/library/SubcircuitLibrary/7485/3_and.pro b/library/SubcircuitLibrary/7485/3_and.pro index 2c9ac554..f2572d86 100644 --- a/library/SubcircuitLibrary/7485/3_and.pro +++ b/library/SubcircuitLibrary/7485/3_and.pro @@ -1,4 +1,4 @@ -update=03/26/19 18:40:23 +update=Wed Mar 18 20:07:22 2020 version=1 last_client=eeschema [general] @@ -52,7 +52,6 @@ LibName18=eSim_Hybrid LibName19=eSim_Miscellaneous LibName20=eSim_Plot LibName21=eSim_Power -LibName22=eSim_PSpice -LibName23=eSim_Sources -LibName24=eSim_Subckt -LibName25=eSim_User +LibName22=eSim_Sources +LibName23=eSim_Subckt +LibName24=eSim_User diff --git a/library/SubcircuitLibrary/7485/4_and-cache.lib b/library/SubcircuitLibrary/7485/4_and-cache.lib index ac396288..e7636dd5 100644 --- a/library/SubcircuitLibrary/7485/4_and-cache.lib +++ b/library/SubcircuitLibrary/7485/4_and-cache.lib @@ -1,17 +1,17 @@ EESchema-LIBRARY Version 2.3 #encoding utf-8 # -# 3_and +# 3_and-RESCUE-4_and # -DEF 3_and X 0 40 Y Y 1 F N +DEF 3_and-RESCUE-4_and X 0 40 Y Y 1 F N F0 "X" 900 300 60 H V C CNN -F1 "3_and" 950 500 60 H V C CNN +F1 "3_and-RESCUE-4_and" 950 500 60 H V C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN DRAW A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250 -P 2 0 1 0 650 550 1000 550 N -P 3 0 1 0 650 550 650 250 1000 250 N +P 2 0 1 0 650 550 1000 550 N +P 3 0 1 0 650 550 650 250 1000 250 N X in1 1 450 500 200 R 50 50 1 1 I X in2 2 450 400 200 R 50 50 1 1 I X in3 3 450 300 200 R 50 50 1 1 I @@ -69,7 +69,7 @@ F3 "" 0 0 60 H V C CNN DRAW A 149 50 100 -894 0 0 1 0 N 150 -50 250 50 A 150 49 100 6 900 0 1 0 N 250 50 150 150 -P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N +P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N X IN1 1 -450 100 200 R 50 50 1 1 I X IN2 2 -450 0 200 R 50 50 1 1 I X OUT 3 450 50 200 L 50 50 1 1 O diff --git a/library/SubcircuitLibrary/7485/4_and-rescue.lib b/library/SubcircuitLibrary/7485/4_and-rescue.lib new file mode 100644 index 00000000..49f649ad --- /dev/null +++ b/library/SubcircuitLibrary/7485/4_and-rescue.lib @@ -0,0 +1,22 @@ +EESchema-LIBRARY Version 2.3 +#encoding utf-8 +# +# 3_and-RESCUE-4_and +# +DEF 3_and-RESCUE-4_and X 0 40 Y Y 1 F N +F0 "X" 900 300 60 H V C CNN +F1 "3_and-RESCUE-4_and" 950 500 60 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250 +P 2 0 1 0 650 550 1000 550 N +P 3 0 1 0 650 550 650 250 1000 250 N +X in1 1 450 500 200 R 50 50 1 1 I +X in2 2 450 400 200 R 50 50 1 1 I +X in3 3 450 300 200 R 50 50 1 1 I +X out 4 1300 400 200 L 50 50 1 1 O +ENDDRAW +ENDDEF +# +#End Library diff --git a/library/SubcircuitLibrary/7485/4_and.pro b/library/SubcircuitLibrary/7485/4_and.pro index 6eb77fff..1904462e 100644 --- a/library/SubcircuitLibrary/7485/4_and.pro +++ b/library/SubcircuitLibrary/7485/4_and.pro @@ -1,4 +1,4 @@ -update=03/26/19 18:58:33 +update=Wed Mar 18 20:07:48 2020 version=1 last_client=eeschema [general] @@ -51,7 +51,6 @@ LibName17=eSim_Hybrid LibName18=eSim_Miscellaneous LibName19=eSim_Plot LibName20=eSim_Power -LibName21=eSim_PSpice -LibName22=eSim_Sources -LibName23=eSim_Subckt -LibName24=eSim_User +LibName21=eSim_Sources +LibName22=eSim_Subckt +LibName23=eSim_User diff --git a/library/SubcircuitLibrary/7485/4_and.sch b/library/SubcircuitLibrary/7485/4_and.sch index 883458e1..87b2bf51 100644 --- a/library/SubcircuitLibrary/7485/4_and.sch +++ b/library/SubcircuitLibrary/7485/4_and.sch @@ -1,4 +1,5 @@ EESchema Schematic File Version 2 +LIBS:4_and-rescue LIBS:texas LIBS:intel LIBS:audio @@ -19,10 +20,10 @@ LIBS:eSim_Hybrid LIBS:eSim_Miscellaneous LIBS:eSim_Plot LIBS:eSim_Power -LIBS:eSim_PSpice LIBS:eSim_Sources LIBS:eSim_Subckt LIBS:eSim_User +LIBS:4_and-cache EELAYER 25 0 EELAYER END $Descr A4 11693 8268 @@ -38,7 +39,7 @@ Comment3 "" Comment4 "" $EndDescr $Comp -L 3_and X1 +L 3_and-RESCUE-4_and X1 U 1 1 5C9A2915 P 3700 3500 F 0 "X1" H 4600 3800 60 0000 C CNN diff --git a/library/SubcircuitLibrary/7485/5_and-cache.lib b/library/SubcircuitLibrary/7485/5_and-cache.lib index ac396288..0032562a 100644 --- a/library/SubcircuitLibrary/7485/5_and-cache.lib +++ b/library/SubcircuitLibrary/7485/5_and-cache.lib @@ -1,24 +1,6 @@ EESchema-LIBRARY Version 2.3 #encoding utf-8 # -# 3_and -# -DEF 3_and X 0 40 Y Y 1 F N -F0 "X" 900 300 60 H V C CNN -F1 "3_and" 950 500 60 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250 -P 2 0 1 0 650 550 1000 550 N -P 3 0 1 0 650 550 650 250 1000 250 N -X in1 1 450 500 200 R 50 50 1 1 I -X in2 2 450 400 200 R 50 50 1 1 I -X in3 3 450 300 200 R 50 50 1 1 I -X out 4 1300 400 200 L 50 50 1 1 O -ENDDRAW -ENDDEF -# # PORT # DEF PORT U 0 40 Y Y 26 F N @@ -69,7 +51,7 @@ F3 "" 0 0 60 H V C CNN DRAW A 149 50 100 -894 0 0 1 0 N 150 -50 250 50 A 150 49 100 6 900 0 1 0 N 250 50 150 150 -P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N +P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N X IN1 1 -450 100 200 R 50 50 1 1 I X IN2 2 -450 0 200 R 50 50 1 1 I X OUT 3 450 50 200 L 50 50 1 1 O diff --git a/library/SubcircuitLibrary/7485/5_and-rescue.lib b/library/SubcircuitLibrary/7485/5_and-rescue.lib new file mode 100644 index 00000000..483b8efb --- /dev/null +++ b/library/SubcircuitLibrary/7485/5_and-rescue.lib @@ -0,0 +1,22 @@ +EESchema-LIBRARY Version 2.3 +#encoding utf-8 +# +# 3_and-RESCUE-5_and +# +DEF 3_and-RESCUE-5_and X 0 40 Y Y 1 F N +F0 "X" 900 300 60 H V C CNN +F1 "3_and-RESCUE-5_and" 950 500 60 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250 +P 2 0 1 0 650 550 1000 550 N +P 3 0 1 0 650 550 650 250 1000 250 N +X in1 1 450 500 200 R 50 50 1 1 I +X in2 2 450 400 200 R 50 50 1 1 I +X in3 3 450 300 200 R 50 50 1 1 I +X out 4 1300 400 200 L 50 50 1 1 O +ENDDRAW +ENDDEF +# +#End Library diff --git a/library/SubcircuitLibrary/7485/5_and.pro b/library/SubcircuitLibrary/7485/5_and.pro index c82e4e6d..3b76cce9 100644 --- a/library/SubcircuitLibrary/7485/5_and.pro +++ b/library/SubcircuitLibrary/7485/5_and.pro @@ -1,4 +1,4 @@ -update=03/26/19 18:50:27 +update=Wed Mar 18 20:08:07 2020 version=1 last_client=eeschema [general] @@ -44,7 +44,6 @@ LibName10=eSim_Hybrid LibName11=eSim_Miscellaneous LibName12=eSim_Plot LibName13=eSim_Power -LibName14=eSim_PSpice -LibName15=eSim_Sources -LibName16=eSim_Subckt -LibName17=eSim_User +LibName14=eSim_Sources +LibName15=eSim_Subckt +LibName16=eSim_User diff --git a/library/SubcircuitLibrary/7485/5_and.sch b/library/SubcircuitLibrary/7485/5_and.sch index da927b09..1426d055 100644 --- a/library/SubcircuitLibrary/7485/5_and.sch +++ b/library/SubcircuitLibrary/7485/5_and.sch @@ -12,10 +12,10 @@ LIBS:eSim_Hybrid LIBS:eSim_Miscellaneous LIBS:eSim_Plot LIBS:eSim_Power -LIBS:eSim_PSpice LIBS:eSim_Sources LIBS:eSim_Subckt LIBS:eSim_User +LIBS:5_and-cache EELAYER 25 0 EELAYER END $Descr A4 11693 8268 @@ -31,7 +31,7 @@ Comment3 "" Comment4 "" $EndDescr $Comp -L 3_and X1 +L 3_and-RESCUE-5_and X1 U 1 1 5C9A2741 P 3800 3350 F 0 "X1" H 4700 3650 60 0000 C CNN diff --git a/library/SubcircuitLibrary/7485/7485-cache.lib b/library/SubcircuitLibrary/7485/7485-cache.lib index 6edb5033..4328b632 100644 --- a/library/SubcircuitLibrary/7485/7485-cache.lib +++ b/library/SubcircuitLibrary/7485/7485-cache.lib @@ -1,17 +1,17 @@ EESchema-LIBRARY Version 2.3 #encoding utf-8 # -# 3_and +# 3_and-RESCUE-7485 # -DEF 3_and X 0 40 Y Y 1 F N +DEF 3_and-RESCUE-7485 X 0 40 Y Y 1 F N F0 "X" 900 300 60 H V C CNN -F1 "3_and" 950 500 60 H V C CNN +F1 "3_and-RESCUE-7485" 950 500 60 H V C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN DRAW A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250 -P 2 0 1 0 650 550 1000 550 N -P 3 0 1 0 650 550 650 250 1000 250 N +P 2 0 1 0 650 550 1000 550 N +P 3 0 1 0 650 550 650 250 1000 250 N X in1 1 450 500 200 R 50 50 1 1 I X in2 2 450 400 200 R 50 50 1 1 I X in3 3 450 300 200 R 50 50 1 1 I @@ -19,17 +19,17 @@ X out 4 1300 400 200 L 50 50 1 1 O ENDDRAW ENDDEF # -# 4_and +# 4_and-RESCUE-7485 # -DEF 4_and X 0 40 Y Y 1 F N +DEF 4_and-RESCUE-7485 X 0 40 Y Y 1 F N F0 "X" 1500 1050 60 H V C CNN -F1 "4_and" 1550 1200 60 H V C CNN +F1 "4_and-RESCUE-7485" 1550 1200 60 H V C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN DRAW A 1550 1100 206 760 -760 0 1 0 N 1600 1300 1600 900 -P 2 0 1 0 1250 1300 1600 1300 N -P 4 0 1 0 1250 1300 1250 900 1500 900 1600 900 N +P 2 0 1 0 1250 1300 1600 1300 N +P 4 0 1 0 1250 1300 1250 900 1500 900 1600 900 N X in1 1 1050 1250 200 R 50 50 1 1 I X in2 2 1050 1150 200 R 50 50 1 1 I X in3 3 1050 1050 200 R 50 50 1 1 I @@ -38,17 +38,17 @@ X out 5 1950 1100 200 L 50 50 1 1 O ENDDRAW ENDDEF # -# 5_and +# 5_and-RESCUE-7485 # -DEF 5_and X 0 40 Y Y 1 F N +DEF 5_and-RESCUE-7485 X 0 40 Y Y 1 F N F0 "X" 1350 800 60 H V C CNN -F1 "5_and" 1400 1050 60 H V C CNN +F1 "5_and-RESCUE-7485" 1400 1050 60 H V C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN DRAW A 1400 900 255 787 -787 0 1 0 N 1450 1150 1450 650 -P 2 0 1 0 1050 1150 1450 1150 N -P 3 0 1 0 1050 1150 1050 650 1450 650 N +P 2 0 1 0 1050 1150 1450 1150 N +P 3 0 1 0 1050 1150 1050 650 1450 650 N X in1 1 850 1100 200 R 50 50 1 1 I X in2 2 850 1000 200 R 50 50 1 1 I X in3 3 850 900 200 R 50 50 1 1 I @@ -107,8 +107,8 @@ F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN DRAW A 6000 4550 316 716 -716 0 1 0 N 6100 4850 6100 4250 -P 2 0 1 0 5550 4850 6100 4850 N -P 4 0 1 0 5550 4850 5550 4250 6050 4250 6100 4250 N +P 2 0 1 0 5550 4850 6100 4850 N +P 4 0 1 0 5550 4850 5550 4250 6050 4250 6100 4250 N X in1 1 5350 4800 200 R 50 50 1 1 I I X in2 2 5350 4700 200 R 50 50 1 1 I I X in3 3 5350 4600 200 R 50 50 1 1 I I @@ -129,7 +129,7 @@ F3 "" 0 0 60 H V C CNN DRAW A 149 50 100 -894 0 0 1 0 N 150 -50 250 50 A 150 49 100 6 900 0 1 0 N 250 50 150 150 -P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N +P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N X IN1 1 -450 100 200 R 50 50 1 1 I X IN2 2 -450 0 200 R 50 50 1 1 I X OUT 3 450 50 200 L 50 50 1 1 O @@ -146,7 +146,7 @@ F3 "" 0 0 60 H V C CNN DRAW A 149 50 100 -894 0 0 1 0 N 150 -50 250 50 A 150 49 100 6 900 0 1 0 N 250 50 150 150 -P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N +P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N X IN1 1 -450 100 200 R 50 50 1 1 I X IN2 2 -450 0 200 R 50 50 1 1 I X OUT 3 450 50 200 L 50 50 1 1 O I @@ -164,8 +164,8 @@ DRAW A -450 50 224 266 -266 0 1 0 N -250 150 -250 -50 A -25 -124 325 574 323 0 1 0 N 150 150 250 50 A 74 125 191 -665 -231 0 1 0 N 150 -50 250 50 -P 2 0 1 0 -250 -50 150 -50 N -P 2 0 1 0 -250 150 150 150 N +P 2 0 1 0 -250 -50 150 -50 N +P 2 0 1 0 -250 150 150 150 N X IN1 1 -450 100 215 R 50 50 1 1 I X IN2 2 -450 0 215 R 50 50 1 1 I X OUT 3 450 50 200 L 50 50 1 1 O I diff --git a/library/SubcircuitLibrary/7485/7485-rescue.lib b/library/SubcircuitLibrary/7485/7485-rescue.lib new file mode 100644 index 00000000..f94d6ecc --- /dev/null +++ b/library/SubcircuitLibrary/7485/7485-rescue.lib @@ -0,0 +1,61 @@ +EESchema-LIBRARY Version 2.3 +#encoding utf-8 +# +# 3_and-RESCUE-7485 +# +DEF 3_and-RESCUE-7485 X 0 40 Y Y 1 F N +F0 "X" 900 300 60 H V C CNN +F1 "3_and-RESCUE-7485" 950 500 60 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250 +P 2 0 1 0 650 550 1000 550 N +P 3 0 1 0 650 550 650 250 1000 250 N +X in1 1 450 500 200 R 50 50 1 1 I +X in2 2 450 400 200 R 50 50 1 1 I +X in3 3 450 300 200 R 50 50 1 1 I +X out 4 1300 400 200 L 50 50 1 1 O +ENDDRAW +ENDDEF +# +# 4_and-RESCUE-7485 +# +DEF 4_and-RESCUE-7485 X 0 40 Y Y 1 F N +F0 "X" 1500 1050 60 H V C CNN +F1 "4_and-RESCUE-7485" 1550 1200 60 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +A 1550 1100 206 760 -760 0 1 0 N 1600 1300 1600 900 +P 2 0 1 0 1250 1300 1600 1300 N +P 4 0 1 0 1250 1300 1250 900 1500 900 1600 900 N +X in1 1 1050 1250 200 R 50 50 1 1 I +X in2 2 1050 1150 200 R 50 50 1 1 I +X in3 3 1050 1050 200 R 50 50 1 1 I +X in4 4 1050 950 200 R 50 50 1 1 I +X out 5 1950 1100 200 L 50 50 1 1 O +ENDDRAW +ENDDEF +# +# 5_and-RESCUE-7485 +# +DEF 5_and-RESCUE-7485 X 0 40 Y Y 1 F N +F0 "X" 1350 800 60 H V C CNN +F1 "5_and-RESCUE-7485" 1400 1050 60 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +A 1400 900 255 787 -787 0 1 0 N 1450 1150 1450 650 +P 2 0 1 0 1050 1150 1450 1150 N +P 3 0 1 0 1050 1150 1050 650 1450 650 N +X in1 1 850 1100 200 R 50 50 1 1 I +X in2 2 850 1000 200 R 50 50 1 1 I +X in3 3 850 900 200 R 50 50 1 1 I +X in4 4 850 800 200 R 50 50 1 1 I +X in5 5 850 700 200 R 50 50 1 1 I +X out 6 1850 900 200 L 50 50 1 1 O +ENDDRAW +ENDDEF +# +#End Library diff --git a/library/SubcircuitLibrary/7485/7485.pro b/library/SubcircuitLibrary/7485/7485.pro index 1f89e4a2..87d0c274 100644 --- a/library/SubcircuitLibrary/7485/7485.pro +++ b/library/SubcircuitLibrary/7485/7485.pro @@ -1,4 +1,4 @@ -update=03/26/19 19:27:48 +update=Wed Mar 18 20:06:33 2020 version=1 last_client=eeschema [general] diff --git a/library/SubcircuitLibrary/7485/7485.sch b/library/SubcircuitLibrary/7485/7485.sch index 0db5f0d6..e3f5364d 100644 --- a/library/SubcircuitLibrary/7485/7485.sch +++ b/library/SubcircuitLibrary/7485/7485.sch @@ -1,4 +1,5 @@ EESchema Schematic File Version 2 +LIBS:7485-rescue LIBS:power LIBS:texas LIBS:intel @@ -20,10 +21,9 @@ LIBS:eSim_Hybrid LIBS:eSim_Miscellaneous LIBS:eSim_Plot LIBS:eSim_Power -LIBS:eSim_PSpice +LIBS:eSim_Subckt LIBS:eSim_Sources LIBS:eSim_User -LIBS:eSim_Subckt LIBS:7485-cache EELAYER 25 0 EELAYER END @@ -95,7 +95,7 @@ F 3 "" H 6900 1000 60 0000 C CNN 1 0 0 -1 $EndComp $Comp -L 3_and X12 +L 3_and-RESCUE-7485 X12 U 1 1 5C9A2DC4 P 6050 1650 F 0 "X12" H 6950 1950 60 0000 C CNN @@ -106,7 +106,7 @@ F 3 "" H 6050 1650 60 0000 C CNN 1 0 0 -1 $EndComp $Comp -L 4_and X7 +L 4_and-RESCUE-7485 X7 U 1 1 5C9A2EB7 P 5450 2750 F 0 "X7" H 6950 3800 60 0000 C CNN @@ -117,7 +117,7 @@ F 3 "" H 5450 2750 60 0000 C CNN 1 0 0 -1 $EndComp $Comp -L 5_and X9 +L 5_and-RESCUE-7485 X9 U 1 1 5C9A2F2E P 5650 3050 F 0 "X9" H 7000 3850 60 0000 C CNN @@ -128,7 +128,7 @@ F 3 "" H 5650 3050 60 0000 C CNN 1 0 0 -1 $EndComp $Comp -L 5_and X10 +L 5_and-RESCUE-7485 X10 U 1 1 5C9A2F95 P 5650 3600 F 0 "X10" H 7000 4400 60 0000 C CNN @@ -139,7 +139,7 @@ F 3 "" H 5650 3600 60 0000 C CNN 1 0 0 -1 $EndComp $Comp -L 5_and X11 +L 5_and-RESCUE-7485 X11 U 1 1 5C9A3164 P 5650 4150 F 0 "X11" H 7000 4950 60 0000 C CNN @@ -150,7 +150,7 @@ F 3 "" H 5650 4150 60 0000 C CNN 1 0 0 -1 $EndComp $Comp -L 5_and X13 +L 5_and-RESCUE-7485 X13 U 1 1 5C9A31B3 P 7550 4850 F 0 "X13" H 8900 5650 60 0000 C CNN @@ -172,7 +172,7 @@ F 3 "" H 6350 6900 60 0000 C CNN 1 0 0 1 $EndComp $Comp -L 3_and X8 +L 3_and-RESCUE-7485 X8 U 1 1 5C9A3303 P 5500 6250 F 0 "X8" H 6400 6550 60 0000 C CNN @@ -183,7 +183,7 @@ F 3 "" H 5500 6250 60 0000 C CNN 1 0 0 1 $EndComp $Comp -L 4_and X3 +L 4_and-RESCUE-7485 X3 U 1 1 5C9A3309 P 4900 5150 F 0 "X3" H 6400 6200 60 0000 C CNN @@ -194,7 +194,7 @@ F 3 "" H 4900 5150 60 0000 C CNN 1 0 0 1 $EndComp $Comp -L 5_and X6 +L 5_and-RESCUE-7485 X6 U 1 1 5C9A330F P 5100 4850 F 0 "X6" H 6450 5650 60 0000 C CNN @@ -205,7 +205,7 @@ F 3 "" H 5100 4850 60 0000 C CNN 1 0 0 1 $EndComp $Comp -L 5_and X5 +L 5_and-RESCUE-7485 X5 U 1 1 5C9A3315 P 5100 4300 F 0 "X5" H 6450 5100 60 0000 C CNN @@ -216,7 +216,7 @@ F 3 "" H 5100 4300 60 0000 C CNN 1 0 0 1 $EndComp $Comp -L 5_and X4 +L 5_and-RESCUE-7485 X4 U 1 1 5C9A331B P 5100 3750 F 0 "X4" H 6450 4550 60 0000 C CNN @@ -385,29 +385,15 @@ Wire Wire Line Wire Wire Line 3600 1400 3600 1550 Wire Wire Line - 2700 1000 2700 1200 -Wire Wire Line - 2700 1200 2700 1400 -Wire Wire Line - 2700 1400 2700 1500 -Wire Wire Line - 2700 1500 2700 4700 + 2700 1000 2700 4700 Wire Wire Line 2700 1600 1550 1600 Wire Wire Line - 1550 1600 1550 1450 -Wire Wire Line - 1100 1450 1500 1450 -Wire Wire Line - 1500 1450 1550 1450 -Wire Wire Line - 1550 1450 1650 1450 + 1550 1450 1550 1600 Wire Wire Line - 1100 1350 1400 1350 + 1100 1450 1650 1450 Wire Wire Line - 1400 1350 1550 1350 -Wire Wire Line - 1550 1350 1650 1350 + 1100 1350 1650 1350 Wire Wire Line 1550 1350 1550 1100 Wire Wire Line @@ -422,29 +408,15 @@ Wire Wire Line Wire Wire Line 3700 2800 3700 2950 Wire Wire Line - 2800 2000 2800 2600 -Wire Wire Line - 2800 2600 2800 2800 -Wire Wire Line - 2800 2800 2800 2900 -Wire Wire Line - 2800 2900 2800 4600 + 2800 2000 2800 4600 Wire Wire Line 2800 3000 1650 3000 Wire Wire Line - 1650 3000 1650 2850 -Wire Wire Line - 1200 2850 1600 2850 -Wire Wire Line - 1600 2850 1650 2850 -Wire Wire Line - 1650 2850 1750 2850 -Wire Wire Line - 1200 2750 1450 2750 + 1650 2850 1650 3000 Wire Wire Line - 1450 2750 1650 2750 + 1200 2850 1750 2850 Wire Wire Line - 1650 2750 1750 2750 + 1200 2750 1750 2750 Wire Wire Line 1650 2750 1650 2500 Wire Wire Line @@ -459,29 +431,15 @@ Wire Wire Line Wire Wire Line 4050 5150 4050 5300 Wire Wire Line - 3150 4950 3150 5000 -Wire Wire Line - 3150 5000 3150 5150 -Wire Wire Line - 3150 5150 3150 5250 -Wire Wire Line - 3150 5250 3150 5850 + 3150 4950 3150 5850 Wire Wire Line 3150 5350 2000 5350 Wire Wire Line - 2000 5350 2000 5200 -Wire Wire Line - 1250 5200 1500 5200 + 2000 5200 2000 5350 Wire Wire Line - 1500 5200 2000 5200 + 1250 5200 2100 5200 Wire Wire Line - 2000 5200 2100 5200 -Wire Wire Line - 1250 5100 1800 5100 -Wire Wire Line - 1800 5100 2000 5100 -Wire Wire Line - 2000 5100 2100 5100 + 1250 5100 2100 5100 Wire Wire Line 2000 5100 2000 4850 Wire Wire Line @@ -496,29 +454,15 @@ Wire Wire Line Wire Wire Line 3850 3950 3850 4100 Wire Wire Line - 2950 3200 2950 3750 -Wire Wire Line - 2950 3750 2950 3950 -Wire Wire Line - 2950 3950 2950 4050 -Wire Wire Line - 2950 4050 2950 4350 + 2950 3200 2950 4350 Wire Wire Line 2950 4150 1800 4150 Wire Wire Line - 1800 4150 1800 4000 -Wire Wire Line - 1350 4000 1750 4000 -Wire Wire Line - 1750 4000 1800 4000 + 1800 4000 1800 4150 Wire Wire Line - 1800 4000 1900 4000 + 1350 4000 1900 4000 Wire Wire Line - 1200 3900 1600 3900 -Wire Wire Line - 1600 3900 1800 3900 -Wire Wire Line - 1800 3900 1900 3900 + 1200 3900 1900 3900 Wire Wire Line 1800 3900 1800 3650 Wire Wire Line @@ -557,29 +501,9 @@ Connection ~ 2800 2900 Wire Wire Line 5100 6550 5950 6550 Wire Wire Line - 5100 1350 5100 1700 -Wire Wire Line - 5100 1700 5100 2150 + 5100 1350 5100 6550 Wire Wire Line - 5100 2150 5100 2500 -Wire Wire Line - 5100 2500 5100 3050 -Wire Wire Line - 5100 3050 5100 3750 -Wire Wire Line - 5100 3750 5100 4850 -Wire Wire Line - 5100 4850 5100 5400 -Wire Wire Line - 5100 5400 5100 5750 -Wire Wire Line - 5100 5750 5100 6300 -Wire Wire Line - 5100 6300 5100 6550 -Wire Wire Line - 4500 1350 5100 1350 -Wire Wire Line - 5100 1350 6500 1350 + 4500 1350 6500 1350 Wire Wire Line 1500 1450 1500 900 Wire Wire Line @@ -627,23 +551,7 @@ Connection ~ 5100 1700 Wire Wire Line 6500 1800 5250 1800 Wire Wire Line - 5250 1800 5250 2250 -Wire Wire Line - 5250 2250 5250 2600 -Wire Wire Line - 5250 2600 5250 2750 -Wire Wire Line - 5250 2750 5250 3150 -Wire Wire Line - 5250 3150 5250 3850 -Wire Wire Line - 5250 3850 5250 4750 -Wire Wire Line - 5250 4750 5250 5300 -Wire Wire Line - 5250 5300 5250 5650 -Wire Wire Line - 5250 5650 5250 6100 + 5250 1800 5250 6100 Wire Wire Line 5250 2750 4600 2750 Wire Wire Line @@ -669,19 +577,7 @@ Connection ~ 5250 2250 Wire Wire Line 6500 2350 5350 2350 Wire Wire Line - 5350 2350 5350 2700 -Wire Wire Line - 5350 2700 5350 3200 -Wire Wire Line - 5350 3200 5350 3900 -Wire Wire Line - 5350 3900 5350 4050 -Wire Wire Line - 5350 4050 5350 4650 -Wire Wire Line - 5350 4650 5350 5200 -Wire Wire Line - 5350 5200 5350 5550 + 5350 2350 5350 5550 Wire Wire Line 5350 3900 4750 3900 Wire Wire Line @@ -696,17 +592,9 @@ Connection ~ 5350 2700 Wire Wire Line 6500 2800 5450 2800 Wire Wire Line - 5450 2800 5450 3350 -Wire Wire Line - 5450 3350 5450 4150 + 5450 2800 5450 5100 Wire Wire Line - 5450 4150 5450 4550 -Wire Wire Line - 5450 4550 5450 5100 -Wire Wire Line - 4950 5100 5450 5100 -Wire Wire Line - 5450 5100 5950 5100 + 4950 5100 5950 5100 Wire Wire Line 6500 2900 5550 2900 Wire Wire Line @@ -730,19 +618,13 @@ Wire Wire Line 6500 3350 5450 3350 Connection ~ 5450 3350 Wire Wire Line - 4800 3450 5950 3450 -Wire Wire Line - 5950 3450 6500 3450 + 4800 3450 6500 3450 Wire Wire Line - 4800 3450 4800 3400 + 4800 3400 4800 3450 Wire Wire Line - 4800 3400 2600 3400 + 1050 3400 4800 3400 Wire Wire Line - 2050 3400 1050 3400 -Wire Wire Line - 5950 3450 5950 3950 -Wire Wire Line - 5950 3950 5950 4450 + 5950 3450 5950 4450 Connection ~ 5950 3450 Wire Wire Line 5950 4550 5450 4550 @@ -1122,6 +1004,4 @@ Wire Notes Line 10550 1550 9500 1550 Text Notes 9900 3400 0 60 ~ 12 Outputs -Wire Wire Line - 2600 3400 2050 3400 $EndSCHEMATC diff --git a/library/SubcircuitLibrary/7485/c_gate-cache.lib b/library/SubcircuitLibrary/7485/c_gate-cache.lib index 05fb44d7..b65670b7 100644 --- a/library/SubcircuitLibrary/7485/c_gate-cache.lib +++ b/library/SubcircuitLibrary/7485/c_gate-cache.lib @@ -1,17 +1,17 @@ EESchema-LIBRARY Version 2.3 #encoding utf-8 # -# 5_and +# 5_and-RESCUE-c_gate # -DEF 5_and X 0 40 Y Y 1 F N +DEF 5_and-RESCUE-c_gate X 0 40 Y Y 1 F N F0 "X" 1350 800 60 H V C CNN -F1 "5_and" 1400 1050 60 H V C CNN +F1 "5_and-RESCUE-c_gate" 1400 1050 60 H V C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN DRAW A 1400 900 255 787 -787 0 1 0 N 1450 1150 1450 650 -P 2 0 1 0 1050 1150 1450 1150 N -P 3 0 1 0 1050 1150 1050 650 1450 650 N +P 2 0 1 0 1050 1150 1450 1150 N +P 3 0 1 0 1050 1150 1050 650 1450 650 N X in1 1 850 1100 200 R 50 50 1 1 I X in2 2 850 1000 200 R 50 50 1 1 I X in3 3 850 900 200 R 50 50 1 1 I @@ -71,7 +71,7 @@ F3 "" 0 0 60 H V C CNN DRAW A 149 50 100 -894 0 0 1 0 N 150 -50 250 50 A 150 49 100 6 900 0 1 0 N 250 50 150 150 -P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N +P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N X IN1 1 -450 100 200 R 50 50 1 1 I X IN2 2 -450 0 200 R 50 50 1 1 I X OUT 3 450 50 200 L 50 50 1 1 O @@ -86,7 +86,7 @@ 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 +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 diff --git a/library/SubcircuitLibrary/7485/c_gate-rescue.lib b/library/SubcircuitLibrary/7485/c_gate-rescue.lib new file mode 100644 index 00000000..00a7cb20 --- /dev/null +++ b/library/SubcircuitLibrary/7485/c_gate-rescue.lib @@ -0,0 +1,24 @@ +EESchema-LIBRARY Version 2.3 +#encoding utf-8 +# +# 5_and-RESCUE-c_gate +# +DEF 5_and-RESCUE-c_gate X 0 40 Y Y 1 F N +F0 "X" 1350 800 60 H V C CNN +F1 "5_and-RESCUE-c_gate" 1400 1050 60 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +A 1400 900 255 787 -787 0 1 0 N 1450 1150 1450 650 +P 2 0 1 0 1050 1150 1450 1150 N +P 3 0 1 0 1050 1150 1050 650 1450 650 N +X in1 1 850 1100 200 R 50 50 1 1 I +X in2 2 850 1000 200 R 50 50 1 1 I +X in3 3 850 900 200 R 50 50 1 1 I +X in4 4 850 800 200 R 50 50 1 1 I +X in5 5 850 700 200 R 50 50 1 1 I +X out 6 1850 900 200 L 50 50 1 1 O +ENDDRAW +ENDDEF +# +#End Library diff --git a/library/SubcircuitLibrary/7485/c_gate.pro b/library/SubcircuitLibrary/7485/c_gate.pro index f0743529..366050e3 100644 --- a/library/SubcircuitLibrary/7485/c_gate.pro +++ b/library/SubcircuitLibrary/7485/c_gate.pro @@ -1,4 +1,4 @@ -update=03/26/19 19:06:59 +update=Wed Mar 18 20:08:46 2020 version=1 last_client=eeschema [general] @@ -51,7 +51,6 @@ LibName17=eSim_Hybrid LibName18=eSim_Miscellaneous LibName19=eSim_Plot LibName20=eSim_Power -LibName21=eSim_PSpice -LibName22=eSim_Sources -LibName23=eSim_Subckt -LibName24=eSim_User +LibName21=eSim_Sources +LibName22=eSim_Subckt +LibName23=eSim_User diff --git a/library/SubcircuitLibrary/7485/c_gate.sch b/library/SubcircuitLibrary/7485/c_gate.sch index 5d960c8d..c2a2b71c 100644 --- a/library/SubcircuitLibrary/7485/c_gate.sch +++ b/library/SubcircuitLibrary/7485/c_gate.sch @@ -1,4 +1,5 @@ EESchema Schematic File Version 2 +LIBS:c_gate-rescue LIBS:texas LIBS:intel LIBS:audio @@ -19,7 +20,6 @@ LIBS:eSim_Hybrid LIBS:eSim_Miscellaneous LIBS:eSim_Plot LIBS:eSim_Power -LIBS:eSim_PSpice LIBS:eSim_Sources LIBS:eSim_Subckt LIBS:eSim_User @@ -39,7 +39,7 @@ Comment3 "" Comment4 "" $EndDescr $Comp -L 5_and X1 +L 5_and-RESCUE-c_gate X1 U 1 1 5C9A2B0B P 3300 3750 F 0 "X1" H 4650 4550 60 0000 C CNN diff --git a/library/SubcircuitLibrary/full_adder/half_adder.pro b/library/SubcircuitLibrary/full_adder/half_adder.pro index 695ae0f6..582cec8b 100644 --- a/library/SubcircuitLibrary/full_adder/half_adder.pro +++ b/library/SubcircuitLibrary/full_adder/half_adder.pro @@ -1,4 +1,4 @@ -update=Wed Jun 24 11:27:22 2015 +update=Wed Mar 18 20:13:43 2020 version=1 last_client=eeschema [general] @@ -32,38 +32,38 @@ version=1 LibDir= [eeschema/libraries] LibName1=power -LibName2=device -LibName3=transistors -LibName4=conn -LibName5=linear -LibName6=regul -LibName7=74xx -LibName8=cmos4000 -LibName9=adc-dac -LibName10=memory -LibName11=xilinx -LibName12=special -LibName13=microcontrollers -LibName14=dsp -LibName15=microchip -LibName16=analog_switches -LibName17=motorola -LibName18=texas -LibName19=intel -LibName20=audio -LibName21=interface -LibName22=digital-audio -LibName23=philips -LibName24=display -LibName25=cypress -LibName26=siliconi -LibName27=opto -LibName28=atmel -LibName29=contrib -LibName30=valves -LibName31=/home/gaurav/Desktop/eSim Library/eSim_Analog -LibName32=/home/gaurav/Desktop/eSim Library/eSim_Devices -LibName33=/home/gaurav/Desktop/eSim Library/eSim_Digital -LibName34=/home/gaurav/Desktop/eSim Library/eSim_Hybrid -LibName35=/home/gaurav/Desktop/eSim Library/eSim_Sources -LibName36=/home/gaurav/Desktop/eSim Library/eSim_Subckt +LibName2=transistors +LibName3=conn +LibName4=74xx +LibName5=cmos4000 +LibName6=adc-dac +LibName7=memory +LibName8=xilinx +LibName9=microcontrollers +LibName10=dsp +LibName11=microchip +LibName12=analog_switches +LibName13=motorola +LibName14=texas +LibName15=intel +LibName16=audio +LibName17=interface +LibName18=digital-audio +LibName19=philips +LibName20=display +LibName21=cypress +LibName22=siliconi +LibName23=opto +LibName24=atmel +LibName25=contrib +LibName26=valves +LibName27=eSim_Analog +LibName28=eSim_Devices +LibName29=eSim_Digital +LibName30=eSim_Hybrid +LibName31=eSim_Miscellaneous +LibName32=eSim_Plot +LibName33=eSim_Power +LibName34=eSim_Sources +LibName35=eSim_Subckt +LibName36=eSim_User diff --git a/library/SubcircuitLibrary/full_sub/half_sub.pro b/library/SubcircuitLibrary/full_sub/half_sub.pro index 90e3ded9..8ff39ace 100644 --- a/library/SubcircuitLibrary/full_sub/half_sub.pro +++ b/library/SubcircuitLibrary/full_sub/half_sub.pro @@ -1,4 +1,4 @@ -update=Wed 06 Mar 2019 11:10:38 PM IST +update=Wed Mar 18 20:15:12 2020 version=1 last_client=eeschema [general] @@ -52,23 +52,19 @@ LibName18=opto LibName19=atmel LibName20=contrib LibName21=power -LibName22=device -LibName23=transistors -LibName24=conn -LibName25=linear -LibName26=regul -LibName27=74xx -LibName28=cmos4000 -LibName29=eSim_Analog -LibName30=eSim_Devices -LibName31=eSim_Digital -LibName32=eSim_Hybrid -LibName33=eSim_Miscellaneous -LibName34=eSim_Power -LibName35=eSim_Sources -LibName36=eSim_Subckt -LibName37=eSim_User -LibName38=eSim_Plot -LibName39=eSim_PSpice -LibName40=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Subckt +LibName22=transistors +LibName23=conn +LibName24=regul +LibName25=74xx +LibName26=cmos4000 +LibName27=eSim_Analog +LibName28=eSim_Devices +LibName29=eSim_Digital +LibName30=eSim_Hybrid +LibName31=eSim_Miscellaneous +LibName32=eSim_Power +LibName33=eSim_Sources +LibName34=eSim_Subckt +LibName35=eSim_User +LibName36=eSim_Plot |