Turns out multi-part components were not fully converted and were not

recognized properly during forward annotation. Had to do a couple of
experiments to figure out how KiCAD handles this and then write some quick and
dirty scripts to repair the multi-part symbols (STM32, Artix-7 and the 74_244
logic buffer were affected).

1 files changed, 51 insertions, 45 deletions

diff --git a/KiCAD/rev02_02.sch-bak b/KiCAD/rev02_02.sch-bak
index 66702b9..c389229 100644
--- a/KiCAD/rev02_02.sch-bak
+++ b/KiCAD/rev02_02.sch-bak
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 4
-EELAYER 26 0
+EELAYER 30 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -13,29 +13,29 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Text Notes 11600 3700 0    126   ~ 12
+Text Notes 11600 3700 0    126  ~ 25
 Digitizer
-Text Notes 3200 3700 0    126   ~ 12
+Text Notes 3200 3700 0    126  ~ 25
 Noise generator
 Text Notes 4200 6410 0    60   ~ 12
 Noisy diode
-Text Notes 6800 3700 0    126   ~ 12
+Text Notes 6800 3700 0    126  ~ 25
 Amplifier
 Text Notes 3200 7600 0    60   ~ 12
 AGND is connected to GND on the board using polygons\n(found no other good way) - not visible in schematics.
 Text Notes 9400 7650 0    60   ~ 12
 This whole sheets circuitry should be as shielded as possible.\nSolid isolated ground plane and internal planes connected\nto the rest of the board at a single point is expected.
-Text Notes 13690 10220 0    84   ~ 12
+Text Notes 13690 10220 0    84   ~ 17
 Noise source
 Text Notes 11980 4510 0    60   ~ 12
 U3
 Text Notes 11790 5790 0    60   ~ 12
 MC74HC1G14DTT1G
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V03
 U 1 1 580240AA
 P 11400 4100
-F 0 "VCCO_3V3" H 11400 4100 20  0000 C CNN
+F 0 "#VCCO_3V03" H 11400 4100 20  0000 C CNN
 F 1 "+VCCO_3V3" H 11400 4030 30  0000 C CNN
 F 2 "" H 11400 4100 70  0000 C CNN
 F 3 "" H 11400 4100 70  0000 C CNN
@@ -43,10 +43,10 @@ F 3 "" H 11400 4100 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_21
+L power:GND #GND_021
 U 1 1 580240A9
 P 5050 6550
-F 0 "GND_21" H 5050 6550 20  0000 C CNN
+F 0 "#GND_021" H 5050 6550 20  0000 C CNN
 F 1 "+GND" H 5050 6480 30  0000 C CNN
 F 2 "" H 5050 6550 70  0000 C CNN
 F 3 "" H 5050 6550 70  0000 C CNN
@@ -54,10 +54,10 @@ F 3 "" H 5050 6550 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_2
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_02
 U 1 1 580240A8
 P 8800 4100
-F 0 "VCCO_3V3_2" H 8800 4100 20  0000 C CNN
+F 0 "#VCCO_3V3_02" H 8800 4100 20  0000 C CNN
 F 1 "+VCCO_3V3" H 8800 4030 30  0000 C CNN
 F 2 "" H 8800 4100 70  0000 C CNN
 F 3 "" H 8800 4100 70  0000 C CNN
@@ -65,10 +65,10 @@ F 3 "" H 8800 4100 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:15V_STABLE 15V_STABLE_2
+L Cryptech_Alpha:15V_STABLE #15V_STABLE_02
 U 1 1 580240A7
 P 5050 4350
-F 0 "15V_STABLE_2" H 5050 4350 20  0000 C CNN
+F 0 "#15V_STABLE_02" H 5050 4350 20  0000 C CNN
 F 1 "+15V_STABLE" H 5050 4280 30  0000 C CNN
 F 2 "" H 5050 4350 70  0000 C CNN
 F 3 "" H 5050 4350 70  0000 C CNN
@@ -88,7 +88,7 @@ Wire Wire Line
 	8800 4100 8800 4200
 Wire Wire Line
 	11500 5000 10300 5000
-Text Label 10300 5000 0 48 ~
+Text Label 10300 5000 0    48   ~ 0
 AMPLIFIED
 Wire Wire Line
 	10050 5000 9300 5000
@@ -106,7 +106,7 @@ Wire Wire Line
 	8800 4700 8600 4700
 Wire Wire Line
 	9300 4900 9300 5000
-Text Label 10050 5000 2 48 ~ 0
+Text Label 10050 5000 2    48   ~ 0
 AMPLIFIED
 Connection ~ 8800 5000
 Connection ~ 8800 5000
@@ -114,7 +114,7 @@ Connection ~ 8800 4700
 Connection ~ 9300 5000
 Wire Wire Line
 	13400 4800 12900 4800
-Text GLabel 13400 4800 2 48 Output ~ 0
+Text GLabel 13400 4800 2    48   Output ~ 0
 DIGITIZED_NOISE
 Wire Wire Line
 	11500 5400 11400 5400
@@ -131,7 +131,7 @@ Wire Wire Line
 	8800 5600 8800 5700
 Wire Wire Line
 	4850 6000 4450 6000
-Text Label 4500 6000 0 48 ~
+Text Label 4500 6000 0    48   ~ 0
 NOISE_OUT
 Wire Wire Line
 	3950 5400 3950 6200
@@ -142,7 +142,7 @@ Wire Wire Line
 Wire Wire Line
 	4250 5400 4250 5800
 Connection ~ 4250 5400
-Text Label 3950 5400 0 48 ~
+Text Label 3950 5400 0    48   ~ 0
 NOISE_IN
 Wire Wire Line
 	5050 5400 4850 5400
@@ -156,13 +156,13 @@ Wire Wire Line
 	6400 5400 5350 5400
 Wire Wire Line
 	5350 5300 5350 5400
-Text Label 6400 5400 2 48 ~ 0
+Text Label 6400 5400 2    48   ~ 0
 RAW_NOISE
 Connection ~ 5050 5400
 Connection ~ 5350 5400
 Wire Wire Line
 	7700 5400 6750 5400
-Text Label 6750 5400 0 48 ~
+Text Label 6750 5400 0    48   ~ 0
 RAW_NOISE
 Wire Wire Line
 	8400 4700 8100 4700
@@ -192,10 +192,10 @@ Wire Wire Line
 Wire Wire Line
 	3150 5750 3150 4950
 $Comp
-L power:GND GND_22
+L power:GND #GND_022
 U 1 1 580240A6
 P 3150 5750
-F 0 "GND_22" H 3150 5750 20  0000 C CNN
+F 0 "#GND_022" H 3150 5750 20  0000 C CNN
 F 1 "+GND" H 3150 5680 30  0000 C CNN
 F 2 "" H 3150 5750 70  0000 C CNN
 F 3 "" H 3150 5750 70  0000 C CNN
@@ -203,10 +203,10 @@ F 3 "" H 3150 5750 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_23
+L power:GND #GND_023
 U 1 1 580240A5
 P 8800 5700
-F 0 "GND_23" H 8800 5700 20  0000 C CNN
+F 0 "#GND_023" H 8800 5700 20  0000 C CNN
 F 1 "+GND" H 8800 5630 30  0000 C CNN
 F 2 "" H 8800 5700 70  0000 C CNN
 F 3 "" H 8800 5700 70  0000 C CNN
@@ -214,10 +214,10 @@ F 3 "" H 8800 5700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_24
+L power:GND #GND_024
 U 1 1 580240A4
 P 11400 5900
-F 0 "GND_24" H 11400 5900 20  0000 C CNN
+F 0 "#GND_024" H 11400 5900 20  0000 C CNN
 F 1 "+GND" H 11400 5830 30  0000 C CNN
 F 2 "" H 11400 5900 70  0000 C CNN
 F 3 "" H 11400 5900 70  0000 C CNN
@@ -233,7 +233,7 @@ F 1 "0.1uF" H 11510 5350 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 11510 5350 60  0001 C CNN
 F 3 "" H 11510 5350 60  0000 C CNN
 	1    11100 5300
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:WE-SHC S1
@@ -244,7 +244,7 @@ F 1 "SHIELDING CABINET" H 3600 5450 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:WE-SHC_36103205_NO_CREAM" H 3600 5450 60  0001 C CNN
 F 3 "" H 3600 5450 60  0000 C CNN
 	1    3600 5050
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:BC818*SMD Q2
@@ -255,7 +255,7 @@ F 1 "BC818-40LT1G" H 4420 5780 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:SOT-23" H 4420 5780 60  0001 C CNN
 F 3 "" H 4420 5780 60  0000 C CNN
 	1    4350 6000
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:BC818*SMD T1
@@ -266,7 +266,7 @@ F 1 "BC847BLT3G" H 5620 6150 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:SOT-23" H 5620 6150 60  0001 C CNN
 F 3 "" H 5620 6150 60  0000 C CNN
 	1    4950 6000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:BC818*SMD T2
@@ -277,34 +277,40 @@ F 1 "BC847BLT3G" H 9370 5550 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:SOT-23" H 9370 5550 60  0001 C CNN
 F 3 "" H 9370 5550 60  0000 C CNN
 	1    8700 5400
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:TPB1,27 TP1
 U 1 1 5802409E
 P 5350 5200
 F 0 "TP1" H 5250 4900 60  0000 L BNN
-	1    5350 5200
-	1    0    0    -1
+F 1 "~" H 5350 5200 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:B1,27" H 5250 4900 60  0001 C CNN
+F 3 "" H 5350 5200 50  0001 C CNN
+	1    5350 5200
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:TPB1,27 TP2
 U 1 1 5802409D
 P 9300 4800
 F 0 "TP2" H 9200 4500 60  0000 L BNN
-	1    9300 4800
-	1    0    0    -1
+F 1 "~" H 9300 4800 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:B1,27" H 9200 4500 60  0001 C CNN
+F 3 "" H 9300 4800 50  0001 C CNN
+	1    9300 4800
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:MC74HC1G14DTT1G U3
 U 1 1 5802409C
 P 12200 5000
 F 0 "U3" H 11670 4270 60  0000 L BNN
-	1    12200 5000
-	1    0    0    -1
+F 1 "~" H 12200 5000 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:SOT-23-5" H 11670 4270 60  0001 C CNN
+F 3 "" H 12200 5000 50  0001 C CNN
+	1    12200 5000
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C14
@@ -315,7 +321,7 @@ F 1 "0.1uF" H 4410 6420 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4410 6420 60  0001 C CNN
 F 3 "" H 4410 6420 60  0000 C CNN
 	1    3950 6400
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R10
@@ -326,7 +332,7 @@ F 1 "470" H 4800 5350 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 4800 5350 60  0001 C CNN
 F 3 "" H 4800 5350 60  0000 C CNN
 	1    4650 5400
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R11
@@ -337,7 +343,7 @@ F 1 "1k" V 5060 5240 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 5060 5240 60  0001 C CNN
 F 3 "" H 5060 5240 60  0000 C CNN
 	1    5050 5100
-	0    1    1    0
+	0    1    1    0   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C15
@@ -348,7 +354,7 @@ F 1 "0.1uF" V 7510 5500 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 7510 5500 60  0001 C CNN
 F 3 "" H 7510 5500 60  0000 C CNN
 	1    7800 5400
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R12
@@ -359,7 +365,7 @@ F 1 "10k" H 8470 4850 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 8470 4850 60  0001 C CNN
 F 3 "" H 8470 4850 60  0000 C CNN
 	1    8500 5000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R13
@@ -370,7 +376,7 @@ F 1 "1k" V 8710 4310 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 8710 4310 60  0001 C CNN
 F 3 "" H 8710 4310 60  0000 C CNN
 	1    8800 4400
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:BAT54 D1
@@ -381,8 +387,8 @@ F 1 "BAT54LT1G" H 8270 4530 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:SOT-23" H 8270 4530 60  0001 C CNN
 F 3 "" H 8270 4530 60  0000 C CNN
 	1    8500 4700
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 NoConn ~ 11500 5200
 NoConn ~ 4250 6200
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC