summaryrefslogtreecommitdiff
path: root/Examples/Analysis_Of_Digital_IC/4012_test
diff options
context:
space:
mode:
authorsaurabhb172020-03-18 18:27:02 +0530
committersaurabhb172020-03-18 18:27:02 +0530
commit3aa3c9f7f6b7e30c89dc8a83515044bb74854064 (patch)
tree707ef78111e714b4826b781288821fb53333daed /Examples/Analysis_Of_Digital_IC/4012_test
parent50cc0a9c65834db636c502cde6548f9e3971600c (diff)
downloadeSim-3aa3c9f7f6b7e30c89dc8a83515044bb74854064.tar.gz
eSim-3aa3c9f7f6b7e30c89dc8a83515044bb74854064.tar.bz2
eSim-3aa3c9f7f6b7e30c89dc8a83515044bb74854064.zip
fixes in Analysis of Digital ICs directory
Diffstat (limited to 'Examples/Analysis_Of_Digital_IC/4012_test')
-rw-r--r--Examples/Analysis_Of_Digital_IC/4012_test/4012_test-cache.lib125
-rw-r--r--Examples/Analysis_Of_Digital_IC/4012_test/4012_test.pro56
-rw-r--r--Examples/Analysis_Of_Digital_IC/4012_test/4012_test.sch504
-rw-r--r--Examples/Analysis_Of_Digital_IC/4012_test/analysis (renamed from Examples/Analysis_Of_Digital_IC/4012_test/analysis~HEAD)0
-rw-r--r--Examples/Analysis_Of_Digital_IC/4012_test/analysis~fellowship2019-python31
5 files changed, 4 insertions, 682 deletions
diff --git a/Examples/Analysis_Of_Digital_IC/4012_test/4012_test-cache.lib b/Examples/Analysis_Of_Digital_IC/4012_test/4012_test-cache.lib
index b21dbef3..ecdf0089 100644
--- a/Examples/Analysis_Of_Digital_IC/4012_test/4012_test-cache.lib
+++ b/Examples/Analysis_Of_Digital_IC/4012_test/4012_test-cache.lib
@@ -1,127 +1,3 @@
-<<<<<<< HEAD
-EESchema-LIBRARY Version 2.3
-#encoding utf-8
-#
-# 4012
-#
-DEF 4012 X 0 40 Y Y 1 F N
-F0 "X" 0 0 60 H V C CNN
-F1 "4012" 0 200 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-S -300 400 350 -400 0 1 0 N
-X Q1 1 -500 300 200 R 50 50 1 1 O
-X A1 2 -500 200 200 R 50 50 1 1 I
-X B1 3 -500 100 200 R 50 50 1 1 I
-X C1 4 -500 0 200 R 50 50 1 1 I
-X D1 5 -500 -100 200 R 50 50 1 1 I
-X NC 6 -500 -200 200 R 50 50 1 1 N
-X VSS 7 -500 -300 200 R 50 50 1 1 I
-X NC 8 550 -300 200 L 50 50 1 1 N
-X A2 9 550 -200 200 L 50 50 1 1 I
-X B2 10 550 -100 200 L 50 50 1 1 I
-X C2 11 550 0 200 L 50 50 1 1 I
-X D2 12 550 100 200 L 50 50 1 1 I
-X Q2 13 550 200 200 L 50 50 1 1 O
-X VDD 14 550 300 200 L 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# DC
-#
-DEF DC 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
-F2 "R1" -300 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-$FPLIST
- 1_pin
-$ENDFPLIST
-DRAW
-C 0 0 150 0 1 0 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
-#
-# PWR_FLAG
-#
-DEF PWR_FLAG #FLG 0 0 N N 1 F P
-F0 "#FLG" 0 95 50 H I C CNN
-F1 "PWR_FLAG" 0 180 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-X pwr 1 0 0 0 U 20 20 0 0 w
-P 6 0 1 0 0 0 0 50 -75 100 0 150 75 100 0 50 N
-ENDDRAW
-ENDDEF
-#
-# adc_bridge_4
-#
-DEF adc_bridge_4 U 0 40 Y Y 1 F N
-F0 "U" 0 0 60 H V C CNN
-F1 "adc_bridge_4" 0 300 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-S -350 350 350 -200 0 1 0 N
-X IN1 1 -550 200 200 R 50 50 1 1 I
-X IN2 2 -550 100 200 R 50 50 1 1 I
-X IN3 3 -550 0 200 R 50 50 1 1 I
-X IN4 4 -550 -100 200 R 50 50 1 1 I
-X OUT1 5 550 200 200 L 50 50 1 1 O
-X OUT2 6 550 100 200 L 50 50 1 1 O
-X OUT3 7 550 0 200 L 50 50 1 1 O
-X OUT4 8 550 -100 200 L 50 50 1 1 O
-ENDDRAW
-ENDDEF
-#
-# dac_bridge_2
-#
-DEF dac_bridge_2 U 0 40 Y Y 1 F N
-F0 "U" 0 0 60 H V C CNN
-F1 "dac_bridge_2" 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 -250 200 350 -100 0 1 0 N
-X IN1 1 -450 50 200 R 50 50 1 1 I
-X IN2 2 -450 -50 200 R 50 50 1 1 I
-X OUT1 3 550 50 200 L 50 50 1 1 O
-X OUT4 4 550 -50 200 L 50 50 1 1 O
-ENDDRAW
-ENDDEF
-#
-# eSim_GND
-#
-DEF eSim_GND #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -250 50 H I C CNN
-F1 "eSim_GND" 0 -150 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
-X GND 1 0 0 0 D 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# plot_v1
-#
-DEF plot_v1 U 0 40 Y Y 1 F N
-F0 "U" 0 500 60 H V C CNN
-F1 "plot_v1" 200 350 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-C 0 500 100 0 1 0 N
-X ~ ~ 0 200 200 U 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-#End Library
-=======
EESchema-LIBRARY Version 2.3
#encoding utf-8
#
@@ -244,4 +120,3 @@ ENDDRAW
ENDDEF
#
#End Library
->>>>>>> fellowship2019-python3
diff --git a/Examples/Analysis_Of_Digital_IC/4012_test/4012_test.pro b/Examples/Analysis_Of_Digital_IC/4012_test/4012_test.pro
index 8af698d3..c335281a 100644
--- a/Examples/Analysis_Of_Digital_IC/4012_test/4012_test.pro
+++ b/Examples/Analysis_Of_Digital_IC/4012_test/4012_test.pro
@@ -1,51 +1,4 @@
-<<<<<<< HEAD
-update=06/01/19 15:09:21
-version=1
-last_client=eeschema
-[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=../../eSim/kicadSchematicLibrary
-[eeschema/libraries]
-LibName1=power
-LibName2=eSim_Analog
-LibName3=eSim_Devices
-LibName4=eSim_Digital
-LibName5=eSim_Hybrid
-LibName6=eSim_Miscellaneous
-LibName7=eSim_Plot
-LibName8=eSim_Power
-LibName9=eSim_PSpice
-LibName10=eSim_Sources
-LibName11=eSim_User
-LibName12=eSim_Subckt
-=======
-update=Wed Mar 11 12:50:15 2020
+update=Wed Mar 18 18:18:08 2020
version=1
last_client=eeschema
[general]
@@ -87,7 +40,6 @@ LibName6=eSim_Hybrid
LibName7=eSim_Miscellaneous
LibName8=eSim_Plot
LibName9=eSim_Power
-LibName10=eSim_Subckt
-LibName11=eSim_Sources
-LibName12=eSim_User
->>>>>>> fellowship2019-python3
+LibName10=eSim_Sources
+LibName11=eSim_User
+LibName12=eSim_Subckt
diff --git a/Examples/Analysis_Of_Digital_IC/4012_test/4012_test.sch b/Examples/Analysis_Of_Digital_IC/4012_test/4012_test.sch
index 28de6099..1fc9b602 100644
--- a/Examples/Analysis_Of_Digital_IC/4012_test/4012_test.sch
+++ b/Examples/Analysis_Of_Digital_IC/4012_test/4012_test.sch
@@ -1,506 +1,3 @@
-<<<<<<< HEAD
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:eSim_Analog
-LIBS:eSim_Devices
-LIBS:eSim_Digital
-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:4012_test-cache
-EELAYER 25 0
-EELAYER END
-$Descr A4 11693 8268
-encoding utf-8
-Sheet 1 1
-Title ""
-Date ""
-Rev ""
-Comp ""
-Comment1 ""
-Comment2 ""
-Comment3 ""
-Comment4 ""
-$EndDescr
-$Comp
-L 4012 X1
-U 1 1 5CF22C85
-P 5050 4050
-F 0 "X1" H 5050 4050 60 0000 C CNN
-F 1 "4012" H 5050 4250 60 0000 C CNN
-F 2 "" H 5050 4050 60 0000 C CNN
-F 3 "" H 5050 4050 60 0000 C CNN
- 1 5050 4050
- 1 0 0 -1
-$EndComp
-$Comp
-L adc_bridge_4 U5
-U 1 1 5CF24801
-P 3600 4050
-F 0 "U5" H 3600 4050 60 0000 C CNN
-F 1 "adc_bridge_4" H 3600 4350 60 0000 C CNN
-F 2 "" H 3600 4050 60 0000 C CNN
-F 3 "" H 3600 4050 60 0000 C CNN
- 1 3600 4050
- 1 0 0 -1
-$EndComp
-NoConn ~ 4550 4350
-NoConn ~ 5600 3750
-$Comp
-L DC v1
-U 1 1 5CF2488C
-P 1900 3450
-F 0 "v1" H 1700 3550 60 0000 C CNN
-F 1 "DC" H 1700 3400 60 0000 C CNN
-F 2 "R1" H 1600 3450 60 0000 C CNN
-F 3 "" H 1900 3450 60 0000 C CNN
- 1 1900 3450
- 0 1 1 0
-$EndComp
-$Comp
-L DC v2
-U 1 1 5CF248E2
-P 1900 4000
-F 0 "v2" H 1700 4100 60 0000 C CNN
-F 1 "DC" H 1700 3950 60 0000 C CNN
-F 2 "R1" H 1600 4000 60 0000 C CNN
-F 3 "" H 1900 4000 60 0000 C CNN
- 1 1900 4000
- 0 1 1 0
-$EndComp
-$Comp
-L DC v3
-U 1 1 5CF24906
-P 1900 4550
-F 0 "v3" H 1700 4650 60 0000 C CNN
-F 1 "DC" H 1700 4500 60 0000 C CNN
-F 2 "R1" H 1600 4550 60 0000 C CNN
-F 3 "" H 1900 4550 60 0000 C CNN
- 1 1900 4550
- 0 1 1 0
-$EndComp
-$Comp
-L DC v4
-U 1 1 5CF24935
-P 1900 5100
-F 0 "v4" H 1700 5200 60 0000 C CNN
-F 1 "DC" H 1700 5050 60 0000 C CNN
-F 2 "R1" H 1600 5100 60 0000 C CNN
-F 3 "" H 1900 5100 60 0000 C CNN
- 1 1900 5100
- 0 1 1 0
-$EndComp
-Wire Wire Line
- 2350 3450 2800 3450
-Wire Wire Line
- 2800 3450 2800 3850
-Wire Wire Line
- 2800 3850 3050 3850
-Wire Wire Line
- 3050 3950 2350 3950
-Wire Wire Line
- 2350 3950 2350 4000
-Wire Wire Line
- 2350 4550 2700 4550
-Wire Wire Line
- 2700 4550 2700 4050
-Wire Wire Line
- 2700 4050 3050 4050
-Wire Wire Line
- 3050 4150 3050 5100
-Wire Wire Line
- 3050 5100 2350 5100
-Wire Wire Line
- 1450 3450 1200 3450
-Wire Wire Line
- 1200 3450 1200 5100
-Wire Wire Line
- 1200 4000 1450 4000
-Wire Wire Line
- 1200 4550 1450 4550
-Connection ~ 1200 4000
-Wire Wire Line
- 1200 5100 1450 5100
-Connection ~ 1200 4550
-$Comp
-L adc_bridge_4 U9
-U 1 1 5CF24B4A
-P 6450 4050
-F 0 "U9" H 6450 4050 60 0000 C CNN
-F 1 "adc_bridge_4" H 6450 4350 60 0000 C CNN
-F 2 "" H 6450 4050 60 0000 C CNN
-F 3 "" H 6450 4050 60 0000 C CNN
- 1 6450 4050
- -1 0 0 1
-$EndComp
-$Comp
-L DC v8
-U 1 1 5CF24B50
-P 8150 4650
-F 0 "v8" H 7950 4750 60 0000 C CNN
-F 1 "DC" H 7950 4600 60 0000 C CNN
-F 2 "R1" H 7850 4650 60 0000 C CNN
-F 3 "" H 8150 4650 60 0000 C CNN
- 1 8150 4650
- 0 -1 -1 0
-$EndComp
-$Comp
-L DC v7
-U 1 1 5CF24B56
-P 8150 4100
-F 0 "v7" H 7950 4200 60 0000 C CNN
-F 1 "DC" H 7950 4050 60 0000 C CNN
-F 2 "R1" H 7850 4100 60 0000 C CNN
-F 3 "" H 8150 4100 60 0000 C CNN
- 1 8150 4100
- 0 -1 -1 0
-$EndComp
-$Comp
-L DC v6
-U 1 1 5CF24B5C
-P 8150 3550
-F 0 "v6" H 7950 3650 60 0000 C CNN
-F 1 "DC" H 7950 3500 60 0000 C CNN
-F 2 "R1" H 7850 3550 60 0000 C CNN
-F 3 "" H 8150 3550 60 0000 C CNN
- 1 8150 3550
- 0 -1 -1 0
-$EndComp
-$Comp
-L DC v5
-U 1 1 5CF24B62
-P 8150 3000
-F 0 "v5" H 7950 3100 60 0000 C CNN
-F 1 "DC" H 7950 2950 60 0000 C CNN
-F 2 "R1" H 7850 3000 60 0000 C CNN
-F 3 "" H 8150 3000 60 0000 C CNN
- 1 8150 3000
- 0 -1 -1 0
-$EndComp
-Wire Wire Line
- 7700 4650 7250 4650
-Wire Wire Line
- 7250 4650 7250 4250
-Wire Wire Line
- 7250 4250 7000 4250
-Wire Wire Line
- 7000 4150 7700 4150
-Wire Wire Line
- 7700 4150 7700 4100
-Wire Wire Line
- 7700 3550 7350 3550
-Wire Wire Line
- 7350 3400 7350 4050
-Wire Wire Line
- 7350 4050 7000 4050
-Wire Wire Line
- 7000 3950 7000 3000
-Wire Wire Line
- 7000 3000 7700 3000
-Wire Wire Line
- 8600 4650 8850 4650
-Wire Wire Line
- 8850 4650 8850 3000
-Wire Wire Line
- 8850 4100 8600 4100
-Wire Wire Line
- 8850 3550 8600 3550
-Connection ~ 8850 4100
-Wire Wire Line
- 8850 3000 8600 3000
-Connection ~ 8850 3550
-Wire Wire Line
- 5900 3950 5600 3950
-Wire Wire Line
- 5600 4050 5900 4050
-Wire Wire Line
- 5600 4150 5900 4150
-Wire Wire Line
- 5600 4250 5900 4250
-Wire Wire Line
- 4550 3850 4150 3850
-Wire Wire Line
- 4150 3950 4550 3950
-Wire Wire Line
- 4150 4050 4550 4050
-Wire Wire Line
- 4550 4150 4150 4150
-$Comp
-L plot_v1 U1
-U 1 1 5CF2512D
-P 2400 3300
-F 0 "U1" H 2400 3800 60 0000 C CNN
-F 1 "plot_v1" H 2600 3650 60 0000 C CNN
-F 2 "" H 2400 3300 60 0000 C CNN
-F 3 "" H 2400 3300 60 0000 C CNN
- 1 2400 3300
- 1 0 0 -1
-$EndComp
-$Comp
-L plot_v1 U3
-U 1 1 5CF25268
-P 3000 3450
-F 0 "U3" H 3000 3950 60 0000 C CNN
-F 1 "plot_v1" H 3200 3800 60 0000 C CNN
-F 2 "" H 3000 3450 60 0000 C CNN
-F 3 "" H 3000 3450 60 0000 C CNN
- 1 3000 3450
- 1 0 0 -1
-$EndComp
-$Comp
-L plot_v1 U4
-U 1 1 5CF252A7
-P 3050 4600
-F 0 "U4" H 3050 5100 60 0000 C CNN
-F 1 "plot_v1" H 3250 4950 60 0000 C CNN
-F 2 "" H 3050 4600 60 0000 C CNN
-F 3 "" H 3050 4600 60 0000 C CNN
- 1 3050 4600
- 0 1 1 0
-$EndComp
-$Comp
-L plot_v1 U2
-U 1 1 5CF25311
-P 2900 5100
-F 0 "U2" H 2900 5600 60 0000 C CNN
-F 1 "plot_v1" H 3100 5450 60 0000 C CNN
-F 2 "" H 2900 5100 60 0000 C CNN
-F 3 "" H 2900 5100 60 0000 C CNN
- 1 2900 5100
- -1 0 0 1
-$EndComp
-Wire Wire Line
- 2400 3100 2400 3450
-Connection ~ 2400 3450
-Wire Wire Line
- 3000 3250 3000 3550
-Wire Wire Line
- 3000 3550 2700 3550
-Wire Wire Line
- 2700 3550 2700 3950
-Connection ~ 2700 3950
-Wire Wire Line
- 2700 4450 3250 4450
-Wire Wire Line
- 3250 4450 3250 4600
-Connection ~ 2700 4450
-Wire Wire Line
- 2900 5100 2900 5300
-Connection ~ 2900 5100
-Wire Wire Line
- 1200 4250 850 4250
-Wire Wire Line
- 850 4150 850 4500
-Connection ~ 1200 4250
-$Comp
-L PWR_FLAG #FLG01
-U 1 1 5CF254BC
-P 850 4150
-F 0 "#FLG01" H 850 4245 50 0001 C CNN
-F 1 "PWR_FLAG" H 850 4330 50 0000 C CNN
-F 2 "" H 850 4150 50 0000 C CNN
-F 3 "" H 850 4150 50 0000 C CNN
- 1 850 4150
- 1 0 0 -1
-$EndComp
-$Comp
-L eSim_GND #PWR02
-U 1 1 5CF254EE
-P 850 4500
-F 0 "#PWR02" H 850 4250 50 0001 C CNN
-F 1 "eSim_GND" H 850 4350 50 0000 C CNN
-F 2 "" H 850 4500 50 0001 C CNN
-F 3 "" H 850 4500 50 0001 C CNN
- 1 850 4500
- 1 0 0 -1
-$EndComp
-Connection ~ 850 4250
-Text GLabel 2300 3250 0 60 Input ~ 0
-a1
-Text GLabel 2900 3350 0 60 Input ~ 0
-b1
-Text GLabel 2900 4550 3 60 Input ~ 0
-c1
-Text GLabel 2800 5200 0 60 Input ~ 0
-d1
-Wire Wire Line
- 2800 5200 2900 5200
-Connection ~ 2900 5200
-Wire Wire Line
- 2900 4450 2900 4550
-Connection ~ 2900 4450
-Wire Wire Line
- 2900 3350 3000 3350
-Connection ~ 3000 3350
-Wire Wire Line
- 2300 3250 2400 3250
-Connection ~ 2400 3250
-$Comp
-L plot_v1 U11
-U 1 1 5CF2581B
-P 7200 3000
-F 0 "U11" H 7200 3500 60 0000 C CNN
-F 1 "plot_v1" H 7400 3350 60 0000 C CNN
-F 2 "" H 7200 3000 60 0000 C CNN
-F 3 "" H 7200 3000 60 0000 C CNN
- 1 7200 3000
- 1 0 0 -1
-$EndComp
-$Comp
-L plot_v1 U10
-U 1 1 5CF25889
-P 6500 3450
-F 0 "U10" H 6500 3950 60 0000 C CNN
-F 1 "plot_v1" H 6700 3800 60 0000 C CNN
-F 2 "" H 6500 3450 60 0000 C CNN
-F 3 "" H 6500 3450 60 0000 C CNN
- 1 6500 3450
- 1 0 0 -1
-$EndComp
-$Comp
-L plot_v1 U13
-U 1 1 5CF258F2
-P 7550 4750
-F 0 "U13" H 7550 5250 60 0000 C CNN
-F 1 "plot_v1" H 7750 5100 60 0000 C CNN
-F 2 "" H 7550 4750 60 0000 C CNN
-F 3 "" H 7550 4750 60 0000 C CNN
- 1 7550 4750
- -1 0 0 1
-$EndComp
-$Comp
-L plot_v1 U12
-U 1 1 5CF2597E
-P 7200 4800
-F 0 "U12" H 7200 5300 60 0000 C CNN
-F 1 "plot_v1" H 7400 5150 60 0000 C CNN
-F 2 "" H 7200 4800 60 0000 C CNN
-F 3 "" H 7200 4800 60 0000 C CNN
- 1 7200 4800
- 0 -1 -1 0
-$EndComp
-Wire Wire Line
- 7550 4950 7550 4650
-Connection ~ 7550 4650
-Wire Wire Line
- 7000 4800 7150 4800
-Wire Wire Line
- 7150 4800 7150 4150
-Connection ~ 7150 4150
-Wire Wire Line
- 7200 2800 7200 3400
-Wire Wire Line
- 7200 3400 7350 3400
-Connection ~ 7350 3550
-Wire Wire Line
- 6500 3250 6500 3450
-Wire Wire Line
- 6500 3450 7000 3450
-Connection ~ 7000 3450
-Wire Wire Line
- 8850 3800 9450 3800
-Wire Wire Line
- 9450 3800 9450 4150
-Connection ~ 8850 3800
-$Comp
-L eSim_GND #PWR03
-U 1 1 5CF25F3B
-P 9450 4150
-F 0 "#PWR03" H 9450 3900 50 0001 C CNN
-F 1 "eSim_GND" H 9450 4000 50 0000 C CNN
-F 2 "" H 9450 4150 50 0001 C CNN
-F 3 "" H 9450 4150 50 0001 C CNN
- 1 9450 4150
- 1 0 0 -1
-$EndComp
-$Comp
-L dac_bridge_2 U7
-U 1 1 5CF26149
-P 5050 2800
-F 0 "U7" H 5050 2800 60 0000 C CNN
-F 1 "dac_bridge_2" H 5100 2950 60 0000 C CNN
-F 2 "" H 5050 2800 60 0000 C CNN
-F 3 "" H 5050 2800 60 0000 C CNN
- 1 5050 2800
- 0 -1 -1 0
-$EndComp
-Wire Wire Line
- 4550 3250 4550 3750
-Wire Wire Line
- 4550 3250 5000 3250
-Wire Wire Line
- 5100 3250 5800 3250
-Wire Wire Line
- 5800 3250 5800 3850
-Wire Wire Line
- 5800 3850 5600 3850
-$Comp
-L plot_v1 U8
-U 1 1 5CF263AC
-P 5400 2000
-F 0 "U8" H 5400 2500 60 0000 C CNN
-F 1 "plot_v1" H 5600 2350 60 0000 C CNN
-F 2 "" H 5400 2000 60 0000 C CNN
-F 3 "" H 5400 2000 60 0000 C CNN
- 1 5400 2000
- 0 1 1 0
-$EndComp
-$Comp
-L plot_v1 U6
-U 1 1 5CF26445
-P 4800 2050
-F 0 "U6" H 4800 2550 60 0000 C CNN
-F 1 "plot_v1" H 5000 2400 60 0000 C CNN
-F 2 "" H 4800 2050 60 0000 C CNN
-F 3 "" H 4800 2050 60 0000 C CNN
- 1 4800 2050
- 0 -1 -1 0
-$EndComp
-Wire Wire Line
- 5000 2250 5000 2050
-Wire Wire Line
- 5000 2050 4600 2050
-Wire Wire Line
- 5100 2250 5100 2000
-Wire Wire Line
- 5100 2000 5600 2000
-Text GLabel 4800 1850 1 60 Output ~ 0
-q1
-Text GLabel 5400 1850 1 60 Output ~ 0
-q2
-Text GLabel 7350 2900 2 60 Input ~ 0
-d2
-Text GLabel 6800 3350 1 60 Input ~ 0
-c2
-Text GLabel 7100 4500 0 60 Input ~ 0
-b2
-Text GLabel 7450 4800 0 60 Input ~ 0
-a2
-Wire Wire Line
- 7450 4800 7550 4800
-Connection ~ 7550 4800
-Wire Wire Line
- 7100 4500 7150 4500
-Connection ~ 7150 4500
-Wire Wire Line
- 6800 3350 6800 3450
-Connection ~ 6800 3450
-Wire Wire Line
- 7350 2900 7200 2900
-Connection ~ 7200 2900
-Wire Wire Line
- 5400 1850 5400 2000
-Connection ~ 5400 2000
-Wire Wire Line
- 4800 1850 4800 2050
-Connection ~ 4800 2050
-$EndSCHEMATC
-=======
EESchema Schematic File Version 2
LIBS:4012_test-rescue
LIBS:power
@@ -1002,4 +499,3 @@ Wire Wire Line
4800 1850 4800 2050
Connection ~ 4800 2050
$EndSCHEMATC
->>>>>>> fellowship2019-python3
diff --git a/Examples/Analysis_Of_Digital_IC/4012_test/analysis~HEAD b/Examples/Analysis_Of_Digital_IC/4012_test/analysis
index 660a46cc..660a46cc 100644
--- a/Examples/Analysis_Of_Digital_IC/4012_test/analysis~HEAD
+++ b/Examples/Analysis_Of_Digital_IC/4012_test/analysis
diff --git a/Examples/Analysis_Of_Digital_IC/4012_test/analysis~fellowship2019-python3 b/Examples/Analysis_Of_Digital_IC/4012_test/analysis~fellowship2019-python3
deleted file mode 100644
index 660a46cc..00000000
--- a/Examples/Analysis_Of_Digital_IC/4012_test/analysis~fellowship2019-python3
+++ /dev/null
@@ -1 +0,0 @@
-.tran 10e-03 100e-03 0e-03 \ No newline at end of file