clean up net names in schematic, get all the parts on the board

diff --git a/megadongle.pcb b/megadongle.pcb
index b0491f5d11f9769dbb6d5df8dad8efebb8ab16eb..e16d8de2458334e4abf4fe2845802bdfcf115644 100644 (file)
--- a/megadongle.pcb
+++ b/megadongle.pcb
@@ -6,7 +6,7 @@ FileVersion[20070407]
 PCB["MegaDongle" 112500 112500]
 
 Grid[100.0 0 0 0]
-Cursor[700 6900 0.000000]
+Cursor[1100 97100 0.000000]
 PolyArea[200000000.000000]
 Thermal[0.500000]
 DRC[600 1000 600 500 1500 650]
@@ -816,13 +816,12 @@ Via[45300 13000 3000 2000 0 1500 "" "thermal(1S,3S)"]
 Via[65300 13000 3000 2000 0 1500 "" "thermal(1S,3S)"]
 Via[65300 3000 3000 2000 0 1500 "" "thermal(1S,3S)"]
 Via[38900 60400 3100 2000 0 1500 "" "thermal(2S)"]
-Via[39000 54500 3100 2000 0 1500 "" "thermal(2S)"]
+Via[39900 53500 3100 2000 0 1500 "" "thermal(2S)"]
 Via[36200 38900 3100 2000 0 1500 "" "thermal(1S,3S)"]
-Via[72600 47000 3100 2000 0 1500 "" "thermal(2S)"]
 Via[50300 29500 3100 2000 0 1500 "" "thermal(1S,3S)"]
 Via[40300 27600 3000 2000 0 1500 "" "thermal(2S)"]
 Via[77500 81500 3000 2000 0 1500 "" "thermal(1S)"]
-Via[106400 49100 3000 2000 0 1500 "" "thermal(2S)"]
+Via[106400 26200 3000 2000 0 1500 "" "thermal(2S)"]
 Via[9100 85400 3000 2000 0 1500 "" "thermal(1S)"]
 Via[104900 89800 3000 2000 0 1500 "" "thermal(1S)"]
 Via[85400 2800 3000 2000 0 1500 "" "thermal(1S,3S)"]
@@ -836,6 +835,9 @@ Via[99400 77000 3000 2000 0 1500 "" "thermal(2S)"]
 Via[99400 85200 3000 2000 0 1500 "" "thermal(0X,1S)"]
 Via[103900 69800 3000 2000 0 1500 "" "thermal(1S)"]
 Via[77700 61200 3000 2000 0 1500 "" "thermal(1S)"]
+Via[72948 45200 3100 2000 0 1500 "" "thermal(2S)"]
+Via[72900 51200 3000 2000 0 1500 "" ""]
+Via[81200 48100 3000 2000 0 1500 "" "thermal(0X,1S)"]
 
 Element["hidename" "hole-M2.5" "H1" "unknown" 20800 7800 -1800 -2800 0 100 ""]
 (
@@ -887,7 +889,7 @@ Element["hidename" "SOT23-5" "U1" "TC2185-3.3" 94000 85000 -500 2400 0 89 ""]
 
        )
 
-Element["hidename" "0402" "C5" "0.1uF" 106400 53474 -1044 -2643 3 100 ""]
+Element["hidename" "0402" "C5" "0.1uF" 106400 30600 -1044 -2643 3 100 ""]
 (
        Pad[-393 1574 393 1574 1968 2000 2568 "1" "1" "square"]
        Pad[-393 -1574 393 -1574 1968 2000 2568 "2" "2" "square"]
@@ -957,20 +959,6 @@ Element["hidename" "0402" "C210" "5.1pF" 48300 33700 -17250 -6572 1 100 ""]
 
        )
 
-Element["hidename" "0402" "C172" "100pF" 76474 45200 6498 -150 2 100 ""]
-(
-       Pad[1574 -393 1574 393 1968 2000 2568 "1" "1" "square"]
-       Pad[-1574 -393 -1574 393 1968 2000 2568 "2" "2" "square"]
-
-       )
-
-Element["hidename" "0402" "C171" "10nF" 76526 49000 19250 15850 2 100 ""]
-(
-       Pad[1574 -393 1574 393 1968 2000 2568 "1" "1" "square"]
-       Pad[-1574 -393 -1574 393 1968 2000 2568 "2" "2" "square"]
-
-       )
-
 Element["hidename" "0402" "C221" "47nF" 42574 43100 -16202 -3450 0 100 ""]
 (
        Pad[-1574 -393 -1574 393 1968 2000 2568 "1" "1" "square"]
@@ -1109,20 +1097,6 @@ Element["hidename" "TI-QFN32" "U6" "CC1120" 51500 62400 19902 2002 0 100 ""]
 
        )
 
-Element["hidename" "0402" "R171" "18" 68200 45200 25754 10950 3 100 ""]
-(
-       Pad[1574 -393 1574 393 1968 2000 2568 "1" "1" "square"]
-       Pad[-1574 -393 -1574 393 1968 2000 2568 "2" "2" "square"]
-
-       )
-
-Element["hidename" "0402" "C173" "56pF" 68222 49000 27498 17550 2 100 ""]
-(
-       Pad[1574 -393 1574 393 1968 2000 2568 "1" "1" "square"]
-       Pad[-1574 -393 -1574 393 1968 2000 2568 "2" "2" "square"]
-
-       )
-
 Element["hidename" "0402" "L173" "43nH" 63000 24200 3002 -15002 2 100 ""]
 (
        Pad[-393 1574 393 1574 1968 2000 2568 "1" "1" "square"]
@@ -1325,62 +1299,48 @@ Element["hidename" "0402" "L201" "27nH" 45100 27700 -2900 -3800 1 100 ""]
 
        )
 
-Element["" "0402" "C610" "0.1uF" 94126 3400 -5424 2050 0 100 ""]
+Element["" "0402" "C610" "0.1uF" 106400 38026 -2050 -5424 3 100 ""]
 (
-       Pad[-1574 -393 -1574 393 1968 2000 2568 "1" "1" "square"]
-       Pad[1574 -393 1574 393 1968 2000 2568 "2" "2" "square"]
+       Pad[-393 -1574 393 -1574 1968 2000 2568 "1" "1" "square"]
+       Pad[-393 1574 393 1574 1968 2000 2568 "2" "2" "square"]
 
        )
 
-Element["" "0402" "R401" "10k" 5826 94800 -6050 1850 0 100 ""]
+Element["" "0402" "R401" "10k" 49500 89074 -1850 -6050 3 100 ""]
 (
-       Pad[-1574 -393 -1574 393 1968 2000 2568 "1" "1" "square"]
-       Pad[1574 -393 1574 393 1968 2000 2568 "2" "2" "square"]
+       Pad[-393 -1574 393 -1574 1968 2000 2568 "1" "1" "square"]
+       Pad[-393 1574 393 1574 1968 2000 2568 "2" "2" "square"]
 
        )
 
-Element["" "0402" "R402" "10k" 6126 106000 -7150 1750 0 100 ""]
+Element["" "0402" "R402" "10k" 32774 44600 7150 -1750 2 100 ""]
 (
-       Pad[-1574 -393 -1574 393 1968 2000 2568 "1" "1" "square"]
-       Pad[1574 -393 1574 393 1968 2000 2568 "2" "2" "square"]
+       Pad[1574 -393 1574 393 1968 2000 2568 "1" "1" "square"]
+       Pad[-1574 -393 -1574 393 1968 2000 2568 "2" "2" "square"]
 
        )
 
-Element["" "0402" "C601" "1uF" 104626 2700 -5850 2050 0 100 ""]
+Element["" "0402" "C601" "1uF" 79100 51500 4150 -4350 0 100 ""]
 (
        Pad[-1574 -393 -1574 393 1968 2000 2568 "1" "1" "square"]
        Pad[1574 -393 1574 393 1968 2000 2568 "2" "2" "square"]
 
        )
 
-Element["" "0402" "C602" "0.1uF" 104626 13700 -5850 2050 0 100 ""]
+Element["" "0402" "C602" "0.1uF" 79126 55300 4450 -3250 0 100 ""]
 (
        Pad[-1574 -393 -1574 393 1968 2000 2568 "1" "1" "square"]
        Pad[1574 -393 1574 393 1968 2000 2568 "2" "2" "square"]
 
        )
 
-Element["" "0402" "L600" "bead" 16226 102600 -6950 2250 0 100 ""]
+Element["" "0402" "L600" "bead" 70526 78800 -6950 2250 0 100 ""]
 (
        Pad[-1574 -393 -1574 393 1968 2000 2568 "1" "1" "square"]
        Pad[1574 -393 1574 393 1968 2000 2568 "2" "2" "square"]
 
        )
 
-Element["hidename" "0-215079-4" "J1" "Debug" 99013 33511 0 0 3 100 ""]
-(
-       Pin[-10000 0 6299 1200 7299 3150 "1" "1" "square,thermal(1X)"]
-       Pin[0 5000 6299 1200 7299 3150 "2" "2" ""]
-       Pin[-10000 10000 6299 1200 7299 3150 "3" "3" ""]
-       Pin[0 15000 6299 1200 7299 3150 "4" "4" ""]
-       Pin[-2913 -5511 7306 1400 7906 5906 "mnt" "0" ""]
-       ElementLine [-15039 -9428 5038 -9428 600]
-       ElementLine [-15039 -9428 -15039 24429 600]
-       ElementLine [-15039 24429 5038 24429 600]
-       ElementLine [5038 -9428 5038 24429 600]
-
-       )
-
 Element["onsolder" "lqfp48" "U2" "STM32L151" 51600 62300 -6200 -5800 3 100 "auto"]
 (
        Pad[14960 10826 18503 10826 1181 787 1811 "PA2/USART2_TX/ADC_IN2/TIM2_CH3/TIM9_CH1" "12" "onsolder,square,edge2"]
@@ -1403,7 +1363,7 @@ Element["onsolder" "lqfp48" "U2" "STM32L151" 51600 62300 -6200 -5800 3 100 "auto
        Pad[-18504 2952 -14961 2952 1181 787 1811 "PA8/USART1_CK/MCO" "29" "onsolder,square"]
        Pad[2952 -18504 2952 -14961 1181 787 1811 "BOOT0" "44" "onsolder,square"]
        Pad[2952 14960 2952 18503 1181 787 1811 "PA7/SPI1_MOSI/ADC_IN7/TIM3_CH2/TIM11_CH1" "17" "onsolder,square,edge2"]
-       Pad[14960 983 18503 983 1181 787 1811 "NRST" "7" "onsolder,square,edge2"]
+       Pad[14960 983 18503 983 1181 787 1811 "NRST" "7" "found,onsolder,square,edge2"]
        Pad[-18504 983 -14961 983 1181 787 1811 "PA9/USART1_TX" "30" "onsolder,square"]
        Pad[983 -18504 983 -14961 1181 787 1811 "PB7/I2C1_SDA/TIM4_CH2/USART1_RX/PVD_IN" "43" "onsolder,square"]
        Pad[983 14960 983 18503 1181 787 1811 "PB0/ADC_IN8/TIM3_CH3/VREF_OUT" "18" "onsolder,square,edge2"]
@@ -1462,45 +1422,48 @@ Element["" "ABM3B" "X1" "8mhz" 90926 65677 0 0 1 100 ""]
        ElementArc [10000 -945 500 500 90 360 1000]
 
        )
-Rat[40773 80803 3 7264 87100 2  "via"]
-Rat[33096 51473 3 7264 87100 2  "via"]
-Rat[62426 43796 3 7264 87100 2  "via"]
-Rat[44611 73266 0 7264 87100 2  "via"]
-Rat[72100 89507 0 7264 87100 2  "via"]
-Rat[48548 51535 0 7264 87100 2  "via"]
-Rat[7264 87100 2 14652 102207 0  ""]
-Rat[4552 105607 0 54552 43796 3  ""]
-Rat[78100 48607 0 10129 87154 1  "via"]
-Rat[78048 44807 0 10129 87154 1  "via"]
-Rat[43607 80248 0 10129 87154 1  "via"]
-Rat[70103 65252 3 10129 87154 1  "via"]
-Rat[42742 80803 3 10129 87154 1  "via"]
-Rat[106007 55048 0 10129 87154 1  "via"]
-Rat[68952 89507 0 10129 87154 1  "via"]
-Rat[33096 53442 3 10129 87154 1  "via"]
-Rat[60457 43796 3 10129 87154 1  "via"]
-Rat[85400 2800 3 92552 3007 0  ""]
-Rat[10129 87154 1 7400 94407 0  ""]
-Rat[7400 94407 0 7700 105607 0  ""]
-Rat[92552 3007 0 106200 2307 0  ""]
-Rat[106200 2307 0 106200 13307 0  ""]
-Rat[3007 73652 0 70103 57379 3  ""]
-Rat[104607 73452 0 70103 55410 3  ""]
-Rat[95700 3007 0 99013 38511 3  ""]
-Rat[99013 38511 3 70103 63283 3  ""]
-Rat[70103 63283 3 46580 73266 0  ""]
-Rat[99011 48511 2 40773 43796 3  ""]
-Rat[89013 43511 3 33096 55410 3  ""]
-Rat[76559 67200 0 81872 70400 0  ""]
-Rat[76559 67200 0 70103 61316 3  ""]
-Rat[98800 60953 0 70103 59347 3  ""]
-Rat[4252 94407 0 48647 80803 3  ""]
-Rat[64607 88826 0 33096 59347 3  ""]
-Rat[54252 91707 0 33096 57379 3  ""]
-Rat[103052 2307 0 103052 13307 0  ""]
-Rat[103052 13307 0 70103 51473 3  ""]
-Rat[70103 51473 3 70103 67220 3  ""]
-Rat[70103 67220 3 17800 102207 0  ""]
+
+Element["hidename" "0-215079-4" "J1" "Debug" 99013 33511 0 0 3 100 ""]
+(
+       Pin[-10000 0 6299 1200 7299 3150 "1" "1" "square,thermal(1X)"]
+       Pin[0 5000 6299 1200 7299 3150 "2" "2" ""]
+       Pin[-10000 10000 6299 1200 7299 3150 "3" "3" ""]
+       Pin[0 15000 6299 1200 7299 3150 "4" "4" ""]
+       Pin[-2913 -5511 7306 1400 7906 5906 "mnt" "0" ""]
+       ElementLine [-15039 -9428 5038 -9428 600]
+       ElementLine [-15039 -9428 -15039 24429 600]
+       ElementLine [-15039 24429 5038 24429 600]
+       ElementLine [5038 -9428 5038 24429 600]
+
+       )
+
+Element["hidename" "0402" "C171" "10nF" 76874 47200 19250 15850 2 100 ""]
+(
+       Pad[1574 -393 1574 393 1968 2000 2568 "1" "1" "square"]
+       Pad[-1574 -393 -1574 393 1968 2000 2568 "2" "2" "square"]
+
+       )
+
+Element["hidename" "0402" "C173" "56pF" 68570 47200 27498 17550 2 100 ""]
+(
+       Pad[1574 -393 1574 393 1968 2000 2568 "1" "1" "square"]
+       Pad[-1574 -393 -1574 393 1968 2000 2568 "2" "2" "square"]
+
+       )
+
+Element["hidename" "0402" "R171" "18" 68548 43400 25754 10950 3 100 ""]
+(
+       Pad[1574 -393 1574 393 1968 2000 2568 "1" "1" "square"]
+       Pad[-1574 -393 -1574 393 1968 2000 2568 "2" "2" "square"]
+
+       )
+
+Element["hidename" "0402" "C172" "100pF" 76822 43400 6498 -150 2 100 ""]
+(
+       Pad[1574 -393 1574 393 1968 2000 2568 "1" "1" "square"]
+       Pad[-1574 -393 -1574 393 1968 2000 2568 "2" "2" "square"]
+
+       )
 Layer(1 "top")
 (
        Line[57500 97600 57500 92000 1000 2000 "clearline"]
@@ -1510,12 +1473,8 @@ Layer(1 "top")
        Line[39517 61417 38500 60400 1000 2000 "clearline"]
        Line[39152 59448 41757 59448 1000 2000 "clearline"]
        Line[39152 59448 38350 60250 1000 2000 "clearline"]
-       Line[39411 55511 41757 55511 1000 2000 "clearline"]
-       Line[39411 55511 38500 54600 1000 2000 "clearline"]
        Line[31600 52748 31552 52700 1000 2000 "clearline"]
        Line[34700 60300 38400 60300 1000 2000 "clearline"]
-       Line[34700 52700 36600 52700 1000 2000 "clearline"]
-       Line[36600 52700 38200 54300 1000 2000 "clearline"]
        Line[35680 57480 41757 57480 1000 2000 "clearline"]
        Line[35680 57480 34700 56500 1000 2000 "clearline"]
        Line[35464 63384 41757 63384 1000 2000 "clearline"]
@@ -1524,8 +1483,6 @@ Layer(1 "top")
        Line[31000 60300 29100 58400 1000 2000 "clearline"]
        Line[31000 56500 31552 56500 1000 2000 "clearline"]
        Line[31000 56500 29100 58400 1000 2000 "clearline"]
-       Line[28950 55302 28950 58250 1000 2000 "clearline"]
-       Line[28950 55302 31552 52700 1000 2000 "clearline"]
        Line[29300 58600 29300 61800 1000 2000 "clearline"]
        Line[29300 61800 31600 64100 1000 2000 "clearline"]
        Line[46580 49332 46580 52657 1000 2000 "clearline"]
@@ -1575,16 +1532,6 @@ Layer(1 "top")
        Line[59500 28700 59450 38950 1000 2000 "clearline"]
        Line[50300 29500 52100 32100 1000 2000 "clearline"]
        Line[50300 29500 48300 32378 1000 2000 "clearline"]
-       Line[69774 45200 70800 45200 1000 2000 "clearline"]
-       Line[69796 49000 70800 49000 1000 2000 "clearline"]
-       Line[70800 49000 72700 47100 1000 2000 "clearline"]
-       Line[74400 45200 74900 45200 1000 2000 "clearline"]
-       Line[74400 45200 72600 47000 1000 2000 "clearline"]
-       Line[74600 49000 74952 49000 1000 2000 "clearline"]
-       Line[70800 45200 74600 49000 1000 2000 "clearline"]
-       Line[66626 45200 66626 48978 1000 2000 "clearline"]
-       Line[66626 48978 66648 49000 1000 2000 "clearline"]
-       Line[62200 47100 66626 47100 1000 2000 "clearline"]
        Line[56304 28700 56252 31848 1000 2000 "clearline"]
        Line[56252 31848 56000 32100 1000 2000 "clearline"]
        Line[51900 38700 50400 38700 1000 2000 "clearline"]
@@ -1669,7 +1616,6 @@ Layer(1 "top")
        Line[61244 59448 63300 59400 1000 2000 "clearline"]
        Line[63400 59398 64700 58900 1000 2000 "clearline"]
        Line[64700 58900 70526 58900 1000 2000 "clearline"]
-       Line[106400 49100 106400 51900 1000 2000 "clearline"]
        Line[64974 85500 68000 85500 1000 2000 "clearline"]
        Line[68000 85500 68500 86000 1000 2000 "clearline"]
        Line[64974 81700 64974 85174 1000 2000 "clearline"]
@@ -1713,6 +1659,41 @@ Layer(1 "top")
        Line[75400 58900 77700 61200 1000 2000 "clearline"]
        Line[73548 55100 73548 57048 1000 2000 "clearline"]
        Line[73548 57048 77700 61200 1000 2000 "clearline"]
+       Line[89013 33511 105063 33511 1000 2000 "clearline"]
+       Line[106400 36452 106400 32174 1000 2000 "clearline"]
+       Line[105063 33511 106487 32087 1000 2000 "clearline"]
+       Line[106400 29026 106400 26200 1000 2000 "clearline"]
+       Line[106400 39600 100102 39600 1000 2000 "clearline"]
+       Line[100102 39600 99013 38511 1000 2000 "clearline"]
+       Line[70122 43400 71148 43400 1000 2000 "clearline"]
+       Line[70144 47200 71148 47200 1000 2000 "clearline"]
+       Line[71148 47200 73048 45300 1000 2000 "clearline"]
+       Line[74748 43400 75248 43400 1000 2000 "clearline"]
+       Line[74748 43400 72948 45200 1000 2000 "clearline"]
+       Line[74948 47200 75300 47200 1000 2000 "clearline"]
+       Line[71148 43400 74948 47200 1000 2000 "clearline"]
+       Line[66974 43400 66974 47178 1000 2000 "clearline"]
+       Line[66974 47178 66996 47200 1000 2000 "clearline"]
+       Line[62200 47100 66896 47100 1000 2000 "clearline"]
+       Line[66896 47100 66996 47200 1000 2000 "clearline"]
+       Line[77526 51500 77526 55274 1000 2000 "clearline"]
+       Line[77526 55274 77552 55300 1000 2000 "clearline"]
+       Line[72900 51200 77526 51200 1000 2000 "clearline"]
+       Line[80700 55300 80700 51526 1000 2000 "clearline"]
+       Line[80700 51526 80674 51500 1000 2000 "clearline"]
+       Line[78448 47200 78448 43452 1000 2000 "clearline"]
+       Line[78448 43452 78396 43400 1000 2000 "clearline"]
+       Line[80700 51400 80700 48600 1000 2000 "clearline"]
+       Line[80700 48600 81200 48100 1000 2000 "clearline"]
+       Line[78448 47500 80500 47500 1000 2000 "clearline"]
+       Line[80500 47500 81150 48150 1000 2000 "clearline"]
+       Line[28950 55302 28950 58250 1000 2000 "clearline"]
+       Line[28950 55302 31552 52700 1000 2000 "clearline"]
+       Line[34700 52700 39100 52700 1000 2000 "clearline"]
+       Line[39100 52700 39900 53500 1000 2000 "clearline"]
+       Line[41757 55511 39911 55511 1000 2000 "clearline"]
+       Line[39911 55511 39900 55500 1000 2000 "clearline"]
+       Line[39900 55500 39900 53500 1000 2000 "clearline"]
        Polygon("")
        (
                [62300 16000] [87100 16000] [87100 1000] [62300 1000] 
@@ -1764,7 +1745,12 @@ Layer(4 "bottom")
        Line[62000 108100 72500 97600 1000 2000 "clearline"]
        Line[23500 103500 28100 108100 1000 2000 "clearline"]
        Line[89002 33500 89013 33511 1000 2000 "clearline"]
-       Line[29059 46259 28300 45500 1000 2000 "clearline"]
+       Line[68332 51473 72627 51473 1000 2000 "clearline"]
+       Line[72627 51473 72900 51200 1000 2000 "clearline"]
+       Line[34868 53442 30810 53442 1000 2000 "clearline"]
+       Line[30810 53442 28950 55302 1000 2000 "clearline"]
+       Line[28950 55302 28950 58350 1000 2000 "clearline"]
+       Line[28950 58350 29100 58500 1000 2000 "clearline"]
        Polygon("clearpoly")
        (
                [13700 16000] [87100 16000] [87100 1000] [13700 1000] 
@@ -1843,23 +1829,24 @@ NetList()
        )
        Net("c2" "(unknown)")
        (
+               Connect("J9-2")
                Connect("U2-26")
+               Connect("U6-8")
        )
-       Net("c_cs" "(unknown)")
+       Net("cs_companion0" "(unknown)")
        (
                Connect("J9-6")
+               Connect("U2-30")
        )
-       Net("c_miso" "(unknown)")
-       (
-               Connect("J9-4")
-       )
-       Net("c_mosi" "(unknown)")
+       Net("cs_companion1" "(unknown)")
        (
-               Connect("J9-3")
+               Connect("J9-5")
+               Connect("U2-31")
        )
-       Net("c_sck" "(unknown)")
+       Net("cs_radio" "(unknown)")
        (
-               Connect("J9-2")
+               Connect("U2-10")
+               Connect("U6-11")
        )
        Net("GND" "(unknown)")
        (
@@ -1915,14 +1902,6 @@ NetList()
                Connect("X2-2")
                Connect("X2-4")
        )
-       Net("jntrst" "(unknown)")
-       (
-               Connect("U2-40")
-       )
-       Net("jtdo" "(unknown)")
-       (
-               Connect("U2-39")
-       )
        Net("led_green" "(unknown)")
        (
                Connect("R12-1")
@@ -1935,31 +1914,20 @@ NetList()
        )
        Net("mi2" "(unknown)")
        (
+               Connect("J9-4")
                Connect("U2-27")
-       )
-       Net("miso" "(unknown)")
-       (
                Connect("U6-9")
        )
        Net("mo2" "(unknown)")
        (
+               Connect("J9-3")
                Connect("U2-28")
-       )
-       Net("mosi" "(unknown)")
-       (
                Connect("U6-7")
        )
-       Net("r_cs" "(unknown)")
-       (
-               Connect("U6-11")
-       )
-       Net("r_int" "(unknown)")
-       (
-               Connect("U6-4")
-       )
        Net("radio_int" "(unknown)")
        (
                Connect("U2-2")
+               Connect("U6-4")
        )
        Net("reset_n" "(unknown)")
        (
@@ -1968,30 +1936,6 @@ NetList()
                Connect("U2-7")
                Connect("U6-2")
        )
-       Net("rx1" "(unknown)")
-       (
-               Connect("U2-31")
-       )
-       Net("sck" "(unknown)")
-       (
-               Connect("U6-8")
-       )
-       Net("scl1" "(unknown)")
-       (
-               Connect("U2-45")
-       )
-       Net("scl2" "(unknown)")
-       (
-               Connect("U2-21")
-       )
-       Net("sda1" "(unknown)")
-       (
-               Connect("U2-46")
-       )
-       Net("sda2" "(unknown)")
-       (
-               Connect("U2-22")
-       )
        Net("swclk" "(unknown)")
        (
                Connect("J1-4")
@@ -2002,10 +1946,6 @@ NetList()
                Connect("J1-3")
                Connect("U2-34")
        )
-       Net("tx1" "(unknown)")
-       (
-               Connect("U2-30")
-       )
        Net("unnamed_net1" "(unknown)")
        (
                Connect("D2-1")

diff --git a/megadongle.sch b/megadongle.sch
index f8085f1bf5aa20fdb2b49e245989f195453d5c64..5a3b74b363fe69c1f8d4192a35d16b961803270c 100644 (file)
--- a/megadongle.sch
+++ b/megadongle.sch
@@ -122,22 +122,22 @@ C 66000 48000 1 0 0 gnd.sym
 N 64700 46300 66400 46300 4
 {
 T 64700 46400 5 10 1 1 0 0 1
-netname=c_cs
+netname=cs_companion0
 }
 N 66400 47900 64700 47900 4
 {
 T 64700 48000 5 10 1 1 0 0 1
-netname=c_sck
+netname=c2
 }
 N 64700 47500 66400 47500 4
 {
 T 64700 47600 5 10 1 1 0 0 1
-netname=c_mosi
+netname=mo2
 }
 N 66400 47100 64700 47100 4
 {
 T 64700 47200 5 10 1 1 0 0 1
-netname=c_miso
+netname=mi2
 }
 N 66400 45500 64700 45500 4
 N 66100 48300 66400 48300 4
@@ -1117,22 +1117,22 @@ C 64600 60600 1 0 0 3.3V-plus.sym
 N 61100 57900 60100 57900 4
 {
 T 60100 58000 5 10 1 1 0 0 1
-netname=mosi
+netname=mo2
 }
 N 61100 57500 60100 57500 4
 {
 T 60100 57600 5 10 1 1 0 0 1
-netname=sck
+netname=c2
 }
 N 61100 57100 60100 57100 4
 {
 T 60100 57200 5 10 1 1 0 0 1
-netname=miso
+netname=mi2
 }
 N 61100 56300 60100 56300 4
 {
 T 60100 56400 5 10 1 1 0 0 1
-netname=r_cs
+netname=cs_radio
 }
 N 61100 59900 60100 59900 4
 {
@@ -1294,7 +1294,7 @@ N 60800 55900 60800 55500 4
 N 61100 59100 60100 59100 4
 {
 T 60100 59200 5 10 1 1 0 0 1
-netname=r_int
+netname=radio_int
 }
 N 42800 50600 42000 50600 4
 {
@@ -1463,39 +1463,6 @@ N 44500 56600 45900 56600 4
 T 44600 56700 5 10 1 1 0 0 1
 netname=boot0
 }
-N 45900 51000 44600 51000 4
-{
-T 44600 51100 5 10 1 1 0 0 1
-netname=tx1
-}
-N 45900 50600 44600 50600 4
-{
-T 44600 50700 5 10 1 1 0 0 1
-netname=rx1
-}
-N 60100 47900 61200 47900 4
-{
-T 60600 48000 5 10 1 1 0 0 1
-netname=reset_n
-}
-N 60100 47500 61200 47500 4
-{
-T 60700 47600 5 10 1 1 0 0 1
-netname=boot0
-}
-N 60100 47100 61200 47100 4
-{
-T 60900 47200 5 10 1 1 0 0 1
-netname=tx1
-}
-N 60100 46700 61200 46700 4
-{
-T 60900 46800 5 10 1 1 0 0 1
-netname=rx1
-}
-T 59200 47000 9 10 1 0 90 0 2
-bootloader
-  support
 N 45900 49400 44600 49400 4
 {
 T 44600 49500 5 10 1 1 0 0 1
@@ -1506,16 +1473,6 @@ N 45900 49000 44600 49000 4
 T 44600 49100 5 10 1 1 0 0 1
 netname=swclk
 }
-N 45900 47000 44600 47000 4
-{
-T 44600 47100 5 10 1 1 0 0 1
-netname=jtdo
-}
-N 45900 46600 44600 46600 4
-{
-T 44600 46700 5 10 1 1 0 0 1
-netname=jntrst
-}
 N 45900 42200 44600 42200 4
 {
 T 44900 42300 5 10 1 1 0 6 1
@@ -1620,26 +1577,6 @@ T 44100 54900 5 10 0 1 0 0 1
 vendor_part_number=399-3027-1-ND
 }
 C 43800 54600 1 0 0 gnd.sym
-N 45900 45000 44600 45000 4
-{
-T 44600 45100 5 10 1 1 0 0 1
-netname=scl1
-}
-N 45900 44600 44600 44600 4
-{
-T 44600 44700 5 10 1 1 0 0 1
-netname=sda1
-}
-N 45900 44200 44600 44200 4
-{
-T 44600 44300 5 10 1 1 0 0 1
-netname=scl2
-}
-N 45900 43800 44600 43800 4
-{
-T 44600 43900 5 10 1 1 0 0 1
-netname=sda2
-}
 C 65900 45900 1 0 0 3.3V-plus.sym
 N 66100 45900 66400 45900 4
 N 55400 55000 56700 55000 4
@@ -1737,3 +1674,23 @@ N 69700 46300 68400 46300 4
 T 68400 46400 5 10 1 1 0 0 1
 netname=swclk
 }
+N 64700 46700 66400 46700 4
+{
+T 64700 46800 5 10 1 1 0 0 1
+netname=cs_companion1
+}
+N 45900 54600 44600 54600 4
+{
+T 44600 54700 5 10 1 1 0 0 1
+netname=cs_radio
+}
+N 45900 51000 44600 51000 4
+{
+T 44600 51100 5 10 1 1 0 0 1
+netname=cs_companion0
+}
+N 45900 50600 44600 50600 4
+{
+T 44600 50700 5 10 1 1 0 0 1
+netname=cs_companion1
+}