common code for Win and Linux, merged py2 changes

1 files changed, 263 insertions, 263 deletions

diff --git a/src/SubcircuitLibrary/4073/4073.sch b/src/SubcircuitLibrary/4073/4073.sch
index ff6d873a..045208e6 100644
--- a/src/SubcircuitLibrary/4073/4073.sch
+++ b/src/SubcircuitLibrary/4073/4073.sch
@@ -1,263 +1,263 @@
-EESchema Schematic File Version 2

-LIBS:eSim_Analog

-LIBS:eSim_Devices

-LIBS:eSim_Digital

-LIBS:eSim_Hybrid

-LIBS:eSim_Miscellaneous

-LIBS:eSim_Plot

-LIBS:eSim_Power

-LIBS:eSim_Sources

-LIBS:eSim_Subckt

-LIBS:eSim_User

-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 3_and X1

-U 1 1 5CF10AEA

-P 4550 2650

-F 0 "X1" H 4650 2600 60  0000 C CNN

-F 1 "3_and" H 4700 2800 60  0000 C CNN

-F 2 "" H 4550 2650 60  0000 C CNN

-F 3 "" H 4550 2650 60  0000 C CNN

-	1    4550 2650

-	1    0    0    -1  

-$EndComp

-$Comp

-L PORT U1

-U 1 1 5CF10B72

-P 3100 2200

-F 0 "U1" H 3150 2300 30  0000 C CNN

-F 1 "PORT" H 3100 2200 30  0000 C CNN

-F 2 "" H 3100 2200 60  0000 C CNN

-F 3 "" H 3100 2200 60  0000 C CNN

-	1    3100 2200

-	1    0    0    -1  

-$EndComp

-$Comp

-L PORT U1

-U 2 1 5CF10BC9

-P 3100 2500

-F 0 "U1" H 3150 2600 30  0000 C CNN

-F 1 "PORT" H 3100 2500 30  0000 C CNN

-F 2 "" H 3100 2500 60  0000 C CNN

-F 3 "" H 3100 2500 60  0000 C CNN

-	2    3100 2500

-	1    0    0    -1  

-$EndComp

-$Comp

-L PORT U1

-U 8 1 5CF10BEA

-P 3100 2850

-F 0 "U1" H 3150 2950 30  0000 C CNN

-F 1 "PORT" H 3100 2850 30  0000 C CNN

-F 2 "" H 3100 2850 60  0000 C CNN

-F 3 "" H 3100 2850 60  0000 C CNN

-	8    3100 2850

-	1    0    0    -1  

-$EndComp

-$Comp

-L PORT U1

-U 9 1 5CF10C10

-P 6200 2600

-F 0 "U1" H 6250 2700 30  0000 C CNN

-F 1 "PORT" H 6200 2600 30  0000 C CNN

-F 2 "" H 6200 2600 60  0000 C CNN

-F 3 "" H 6200 2600 60  0000 C CNN

-	9    6200 2600

-	-1   0    0    1   

-$EndComp

-Wire Wire Line

-	5950 2600 5050 2600

-Wire Wire Line

-	4200 2500 4200 2200

-Wire Wire Line

-	4200 2200 3350 2200

-Wire Wire Line

-	3350 2500 3850 2500

-Wire Wire Line

-	3850 2500 3850 2600

-Wire Wire Line

-	3850 2600 4200 2600

-Wire Wire Line

-	4200 2700 4200 2850

-Wire Wire Line

-	4200 2850 3350 2850

-$Comp

-L 3_and X3

-U 1 1 5CF10DE5

-P 4600 4100

-F 0 "X3" H 4700 4050 60  0000 C CNN

-F 1 "3_and" H 4750 4250 60  0000 C CNN

-F 2 "" H 4600 4100 60  0000 C CNN

-F 3 "" H 4600 4100 60  0000 C CNN

-	1    4600 4100

-	1    0    0    -1  

-$EndComp

-$Comp

-L PORT U1

-U 3 1 5CF10DEB

-P 3150 3650

-F 0 "U1" H 3200 3750 30  0000 C CNN

-F 1 "PORT" H 3150 3650 30  0000 C CNN

-F 2 "" H 3150 3650 60  0000 C CNN

-F 3 "" H 3150 3650 60  0000 C CNN

-	3    3150 3650

-	1    0    0    -1  

-$EndComp

-$Comp

-L PORT U1

-U 4 1 5CF10DF1

-P 3150 3950

-F 0 "U1" H 3200 4050 30  0000 C CNN

-F 1 "PORT" H 3150 3950 30  0000 C CNN

-F 2 "" H 3150 3950 60  0000 C CNN

-F 3 "" H 3150 3950 60  0000 C CNN

-	4    3150 3950

-	1    0    0    -1  

-$EndComp

-$Comp

-L PORT U1

-U 5 1 5CF10DF7

-P 3150 4300

-F 0 "U1" H 3200 4400 30  0000 C CNN

-F 1 "PORT" H 3150 4300 30  0000 C CNN

-F 2 "" H 3150 4300 60  0000 C CNN

-F 3 "" H 3150 4300 60  0000 C CNN

-	5    3150 4300

-	1    0    0    -1  

-$EndComp

-$Comp

-L PORT U1

-U 6 1 5CF10DFD

-P 6250 4050

-F 0 "U1" H 6300 4150 30  0000 C CNN

-F 1 "PORT" H 6250 4050 30  0000 C CNN

-F 2 "" H 6250 4050 60  0000 C CNN

-F 3 "" H 6250 4050 60  0000 C CNN

-	6    6250 4050

-	-1   0    0    1   

-$EndComp

-Wire Wire Line

-	6000 4050 5100 4050

-Wire Wire Line

-	4250 3950 4250 3650

-Wire Wire Line

-	4250 3650 3400 3650

-Wire Wire Line

-	3400 3950 3900 3950

-Wire Wire Line

-	3900 3950 3900 4050

-Wire Wire Line

-	3900 4050 4250 4050

-Wire Wire Line

-	4250 4150 4250 4300

-Wire Wire Line

-	4250 4300 3400 4300

-$Comp

-L 3_and X2

-U 1 1 5CF10E9C

-P 4550 5450

-F 0 "X2" H 4650 5400 60  0000 C CNN

-F 1 "3_and" H 4700 5600 60  0000 C CNN

-F 2 "" H 4550 5450 60  0000 C CNN

-F 3 "" H 4550 5450 60  0000 C CNN

-	1    4550 5450

-	1    0    0    -1  

-$EndComp

-$Comp

-L PORT U1

-U 11 1 5CF10EA2

-P 3100 5000

-F 0 "U1" H 3150 5100 30  0000 C CNN

-F 1 "PORT" H 3100 5000 30  0000 C CNN

-F 2 "" H 3100 5000 60  0000 C CNN

-F 3 "" H 3100 5000 60  0000 C CNN

-	11   3100 5000

-	1    0    0    -1  

-$EndComp

-$Comp

-L PORT U1

-U 12 1 5CF10EA8

-P 3100 5300

-F 0 "U1" H 3150 5400 30  0000 C CNN

-F 1 "PORT" H 3100 5300 30  0000 C CNN

-F 2 "" H 3100 5300 60  0000 C CNN

-F 3 "" H 3100 5300 60  0000 C CNN

-	12   3100 5300

-	1    0    0    -1  

-$EndComp

-$Comp

-L PORT U1

-U 13 1 5CF10EAE

-P 3100 5650

-F 0 "U1" H 3150 5750 30  0000 C CNN

-F 1 "PORT" H 3100 5650 30  0000 C CNN

-F 2 "" H 3100 5650 60  0000 C CNN

-F 3 "" H 3100 5650 60  0000 C CNN

-	13   3100 5650

-	1    0    0    -1  

-$EndComp

-$Comp

-L PORT U1

-U 10 1 5CF10EB4

-P 6200 5400

-F 0 "U1" H 6250 5500 30  0000 C CNN

-F 1 "PORT" H 6200 5400 30  0000 C CNN

-F 2 "" H 6200 5400 60  0000 C CNN

-F 3 "" H 6200 5400 60  0000 C CNN

-	10   6200 5400

-	-1   0    0    1   

-$EndComp

-Wire Wire Line

-	5950 5400 5050 5400

-Wire Wire Line

-	4200 5300 4200 5000

-Wire Wire Line

-	4200 5000 3350 5000

-Wire Wire Line

-	3350 5300 3850 5300

-Wire Wire Line

-	3850 5300 3850 5400

-Wire Wire Line

-	3850 5400 4200 5400

-Wire Wire Line

-	4200 5500 4200 5650

-Wire Wire Line

-	4200 5650 3350 5650

-$Comp

-L PORT U1

-U 7 1 5CF11A2A

-P 7500 4100

-F 0 "U1" H 7550 4200 30  0000 C CNN

-F 1 "PORT" H 7500 4100 30  0000 C CNN

-F 2 "" H 7500 4100 60  0000 C CNN

-F 3 "" H 7500 4100 60  0000 C CNN

-	7    7500 4100

-	-1   0    0    1   

-$EndComp

-$Comp

-L PORT U1

-U 14 1 5CF11A8A

-P 7550 4600

-F 0 "U1" H 7600 4700 30  0000 C CNN

-F 1 "PORT" H 7550 4600 30  0000 C CNN

-F 2 "" H 7550 4600 60  0000 C CNN

-F 3 "" H 7550 4600 60  0000 C CNN

-	14   7550 4600

-	-1   0    0    1   

-$EndComp

-NoConn ~ 7250 4100

-NoConn ~ 7300 4600

-$EndSCHEMATC

+EESchema Schematic File Version 2
+LIBS:eSim_Analog
+LIBS:eSim_Devices
+LIBS:eSim_Digital
+LIBS:eSim_Hybrid
+LIBS:eSim_Miscellaneous
+LIBS:eSim_Plot
+LIBS:eSim_Power
+LIBS:eSim_Sources
+LIBS:eSim_Subckt
+LIBS:eSim_User
+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 3_and X1
+U 1 1 5CF10AEA
+P 4550 2650
+F 0 "X1" H 4650 2600 60  0000 C CNN
+F 1 "3_and" H 4700 2800 60  0000 C CNN
+F 2 "" H 4550 2650 60  0000 C CNN
+F 3 "" H 4550 2650 60  0000 C CNN
+	1    4550 2650
+	1    0    0    -1  
+$EndComp
+$Comp
+L PORT U1
+U 1 1 5CF10B72
+P 3100 2200
+F 0 "U1" H 3150 2300 30  0000 C CNN
+F 1 "PORT" H 3100 2200 30  0000 C CNN
+F 2 "" H 3100 2200 60  0000 C CNN
+F 3 "" H 3100 2200 60  0000 C CNN
+	1    3100 2200
+	1    0    0    -1  
+$EndComp
+$Comp
+L PORT U1
+U 2 1 5CF10BC9
+P 3100 2500
+F 0 "U1" H 3150 2600 30  0000 C CNN
+F 1 "PORT" H 3100 2500 30  0000 C CNN
+F 2 "" H 3100 2500 60  0000 C CNN
+F 3 "" H 3100 2500 60  0000 C CNN
+	2    3100 2500
+	1    0    0    -1  
+$EndComp
+$Comp
+L PORT U1
+U 8 1 5CF10BEA
+P 3100 2850
+F 0 "U1" H 3150 2950 30  0000 C CNN
+F 1 "PORT" H 3100 2850 30  0000 C CNN
+F 2 "" H 3100 2850 60  0000 C CNN
+F 3 "" H 3100 2850 60  0000 C CNN
+	8    3100 2850
+	1    0    0    -1  
+$EndComp
+$Comp
+L PORT U1
+U 9 1 5CF10C10
+P 6200 2600
+F 0 "U1" H 6250 2700 30  0000 C CNN
+F 1 "PORT" H 6200 2600 30  0000 C CNN
+F 2 "" H 6200 2600 60  0000 C CNN
+F 3 "" H 6200 2600 60  0000 C CNN
+	9    6200 2600
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	5950 2600 5050 2600
+Wire Wire Line
+	4200 2500 4200 2200
+Wire Wire Line
+	4200 2200 3350 2200
+Wire Wire Line
+	3350 2500 3850 2500
+Wire Wire Line
+	3850 2500 3850 2600
+Wire Wire Line
+	3850 2600 4200 2600
+Wire Wire Line
+	4200 2700 4200 2850
+Wire Wire Line
+	4200 2850 3350 2850
+$Comp
+L 3_and X3
+U 1 1 5CF10DE5
+P 4600 4100
+F 0 "X3" H 4700 4050 60  0000 C CNN
+F 1 "3_and" H 4750 4250 60  0000 C CNN
+F 2 "" H 4600 4100 60  0000 C CNN
+F 3 "" H 4600 4100 60  0000 C CNN
+	1    4600 4100
+	1    0    0    -1  
+$EndComp
+$Comp
+L PORT U1
+U 3 1 5CF10DEB
+P 3150 3650
+F 0 "U1" H 3200 3750 30  0000 C CNN
+F 1 "PORT" H 3150 3650 30  0000 C CNN
+F 2 "" H 3150 3650 60  0000 C CNN
+F 3 "" H 3150 3650 60  0000 C CNN
+	3    3150 3650
+	1    0    0    -1  
+$EndComp
+$Comp
+L PORT U1
+U 4 1 5CF10DF1
+P 3150 3950
+F 0 "U1" H 3200 4050 30  0000 C CNN
+F 1 "PORT" H 3150 3950 30  0000 C CNN
+F 2 "" H 3150 3950 60  0000 C CNN
+F 3 "" H 3150 3950 60  0000 C CNN
+	4    3150 3950
+	1    0    0    -1  
+$EndComp
+$Comp
+L PORT U1
+U 5 1 5CF10DF7
+P 3150 4300
+F 0 "U1" H 3200 4400 30  0000 C CNN
+F 1 "PORT" H 3150 4300 30  0000 C CNN
+F 2 "" H 3150 4300 60  0000 C CNN
+F 3 "" H 3150 4300 60  0000 C CNN
+	5    3150 4300
+	1    0    0    -1  
+$EndComp
+$Comp
+L PORT U1
+U 6 1 5CF10DFD
+P 6250 4050
+F 0 "U1" H 6300 4150 30  0000 C CNN
+F 1 "PORT" H 6250 4050 30  0000 C CNN
+F 2 "" H 6250 4050 60  0000 C CNN
+F 3 "" H 6250 4050 60  0000 C CNN
+	6    6250 4050
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	6000 4050 5100 4050
+Wire Wire Line
+	4250 3950 4250 3650
+Wire Wire Line
+	4250 3650 3400 3650
+Wire Wire Line
+	3400 3950 3900 3950
+Wire Wire Line
+	3900 3950 3900 4050
+Wire Wire Line
+	3900 4050 4250 4050
+Wire Wire Line
+	4250 4150 4250 4300
+Wire Wire Line
+	4250 4300 3400 4300
+$Comp
+L 3_and X2
+U 1 1 5CF10E9C
+P 4550 5450
+F 0 "X2" H 4650 5400 60  0000 C CNN
+F 1 "3_and" H 4700 5600 60  0000 C CNN
+F 2 "" H 4550 5450 60  0000 C CNN
+F 3 "" H 4550 5450 60  0000 C CNN
+	1    4550 5450
+	1    0    0    -1  
+$EndComp
+$Comp
+L PORT U1
+U 11 1 5CF10EA2
+P 3100 5000
+F 0 "U1" H 3150 5100 30  0000 C CNN
+F 1 "PORT" H 3100 5000 30  0000 C CNN
+F 2 "" H 3100 5000 60  0000 C CNN
+F 3 "" H 3100 5000 60  0000 C CNN
+	11   3100 5000
+	1    0    0    -1  
+$EndComp
+$Comp
+L PORT U1
+U 12 1 5CF10EA8
+P 3100 5300
+F 0 "U1" H 3150 5400 30  0000 C CNN
+F 1 "PORT" H 3100 5300 30  0000 C CNN
+F 2 "" H 3100 5300 60  0000 C CNN
+F 3 "" H 3100 5300 60  0000 C CNN
+	12   3100 5300
+	1    0    0    -1  
+$EndComp
+$Comp
+L PORT U1
+U 13 1 5CF10EAE
+P 3100 5650
+F 0 "U1" H 3150 5750 30  0000 C CNN
+F 1 "PORT" H 3100 5650 30  0000 C CNN
+F 2 "" H 3100 5650 60  0000 C CNN
+F 3 "" H 3100 5650 60  0000 C CNN
+	13   3100 5650
+	1    0    0    -1  
+$EndComp
+$Comp
+L PORT U1
+U 10 1 5CF10EB4
+P 6200 5400
+F 0 "U1" H 6250 5500 30  0000 C CNN
+F 1 "PORT" H 6200 5400 30  0000 C CNN
+F 2 "" H 6200 5400 60  0000 C CNN
+F 3 "" H 6200 5400 60  0000 C CNN
+	10   6200 5400
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	5950 5400 5050 5400
+Wire Wire Line
+	4200 5300 4200 5000
+Wire Wire Line
+	4200 5000 3350 5000
+Wire Wire Line
+	3350 5300 3850 5300
+Wire Wire Line
+	3850 5300 3850 5400
+Wire Wire Line
+	3850 5400 4200 5400
+Wire Wire Line
+	4200 5500 4200 5650
+Wire Wire Line
+	4200 5650 3350 5650
+$Comp
+L PORT U1
+U 7 1 5CF11A2A
+P 7500 4100
+F 0 "U1" H 7550 4200 30  0000 C CNN
+F 1 "PORT" H 7500 4100 30  0000 C CNN
+F 2 "" H 7500 4100 60  0000 C CNN
+F 3 "" H 7500 4100 60  0000 C CNN
+	7    7500 4100
+	-1   0    0    1   
+$EndComp
+$Comp
+L PORT U1
+U 14 1 5CF11A8A
+P 7550 4600
+F 0 "U1" H 7600 4700 30  0000 C CNN
+F 1 "PORT" H 7550 4600 30  0000 C CNN
+F 2 "" H 7550 4600 60  0000 C CNN
+F 3 "" H 7550 4600 60  0000 C CNN
+	14   7550 4600
+	-1   0    0    1   
+$EndComp
+NoConn ~ 7250 4100
+NoConn ~ 7300 4600
+$EndSCHEMATC