"fix" grounds by tracks into pour

"finish" routing, ignore DRC violations from disconnected usb shield on
pin 6.

Add boot0 jumper pad "just in case" but really kinda dumb, we've got a
debug header on it. Why bother with this?

Change paper size in schema to get more space.

TODO: add silk?
TODO: replace "arduino" shape with just the pinpoints.

1 files changed, 619 insertions, 599 deletions

diff --git a/hw1/hw1.sch b/hw1/hw1.sch
index 5c89d23..532cf81 100644
--- a/hw1/hw1.sch
+++ b/hw1/hw1.sch
@@ -34,7 +34,7 @@ LIBS:karlp-klibs
 LIBS:hw1-cache
 EELAYER 25 0
 EELAYER END
-$Descr A4 11693 8268
+$Descr A3 16535 11693
 encoding utf-8
 Sheet 1 1
 Title "test host"
@@ -46,1016 +46,1036 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Text Label 9300 2300 2    60   ~ 0
+Text Label 12400 2400 2    60   ~ 0
 Vin
-Text Label 9300 1700 2    60   ~ 0
+Text Label 12400 1800 2    60   ~ 0
 IOREF
-Text Label 9350 2500 2    60   ~ 0
+Text Label 12450 2600 2    60   ~ 0
 DAC1_OUT
-Text Label 9350 2600 2    60   ~ 0
+Text Label 12450 2700 2    60   ~ 0
 DAC2_OUT
-Text Label 9350 2700 2    60   ~ 0
+Text Label 12450 2800 2    60   ~ 0
 ADC_IN1
-Text Label 8900 2800 0    60   ~ 0
+Text Label 12000 2900 0    60   ~ 0
 A3
-Text Label 9350 2900 2    60   ~ 0
+Text Label 12450 3000 2    60   ~ 0
 I2C_SDA
-Text Label 10250 3000 0    60   ~ 0
+Text Label 13350 3100 0    60   ~ 0
 UART_TX_OUT
-Text Label 10550 2800 0    60   ~ 0
+Text Label 13650 2900 0    60   ~ 0
 2
-Text Label 10250 2900 0    60   ~ 0
+Text Label 13350 3000 0    60   ~ 0
 UART_RX_OUT
-Text Label 10550 2700 0    60   ~ 0
+Text Label 13650 2800 0    60   ~ 0
 3(**)
-Text Label 10550 2600 0    60   ~ 0
+Text Label 13650 2700 0    60   ~ 0
 4
-Text Label 10550 2500 0    60   ~ 0
+Text Label 13650 2600 0    60   ~ 0
 5(**)
-Text Label 10550 2400 0    60   ~ 0
+Text Label 13650 2500 0    60   ~ 0
 6(**)
-Text Label 10550 2300 0    60   ~ 0
+Text Label 13650 2400 0    60   ~ 0
 7
-Text Label 10550 2100 0    60   ~ 0
+Text Label 13650 2200 0    60   ~ 0
 8
-Text Label 10550 2000 0    60   ~ 0
+Text Label 13650 2100 0    60   ~ 0
 9(**)
-Text Label 10350 1900 0    60   ~ 0
+Text Label 13450 2000 0    60   ~ 0
 SPI_CS
-Text Label 10350 1800 0    60   ~ 0
+Text Label 13450 1900 0    60   ~ 0
 SPI_MOSI
-Text Label 10350 1700 0    60   ~ 0
+Text Label 13450 1800 0    60   ~ 0
 SPI_MISO
-Text Label 10350 1600 0    60   ~ 0
+Text Label 13450 1700 0    60   ~ 0
 SPI_SCK
-Text Label 10300 1400 0    60   ~ 0
+Text Label 13400 1500 0    60   ~ 0
 AREF
-NoConn ~ 9400 1600
-Text Label 10300 1300 0    60   ~ 0
-I2C_SDA
-Text Label 10300 1200 0    60   ~ 0
-I2C_SCL
-Text Notes 10850 1000 0    60   ~ 0
+NoConn ~ 12500 1700
+Text Notes 13950 1100 0    60   ~ 0
 Holes
-Text Notes 8550 750  0    60   ~ 0
+Text Notes 11650 850  0    60   ~ 0
 Arduino UNOr3 pins\nAs used on Nucleo64 boards\n
 $Comp
 L CONN_01X08 P1
 U 1 1 56D70129
-P 9600 1950
-F 0 "P1" H 9600 2400 50  0000 C CNN
-F 1 "Power" V 9700 1950 50  0000 C CNN
-F 2 "Socket_Arduino_Uno:Socket_Strip_Arduino_1x08" H 9600 1950 50  0001 C CNN
-F 3 "" H 9600 1950 50  0000 C CNN
-	1    9600 1950
+P 12700 2050
+F 0 "P1" H 12700 2500 50  0000 C CNN
+F 1 "Power" V 12800 2050 50  0000 C CNN
+F 2 "Socket_Arduino_Uno:Socket_Strip_Arduino_1x08" H 12700 2050 50  0001 C CNN
+F 3 "" H 12700 2050 50  0000 C CNN
+	1    12700 2050
 	1    0    0    -1  
 $EndComp
-Text Label 9300 1800 2    60   ~ 0
+Text Label 12400 1900 2    60   ~ 0
 RESET_OUT
 $Comp
 L +3.3V #PWR01
 U 1 1 56D70538
-P 8700 1450
-F 0 "#PWR01" H 8700 1300 50  0001 C CNN
-F 1 "+3.3V" H 8700 1590 30  0000 C CNN
-F 2 "" H 8700 1450 50  0000 C CNN
-F 3 "" H 8700 1450 50  0000 C CNN
-	1    8700 1450
+P 11800 1550
+F 0 "#PWR01" H 11800 1400 50  0001 C CNN
+F 1 "+3.3V" H 11800 1690 30  0000 C CNN
+F 2 "" H 11800 1550 50  0000 C CNN
+F 3 "" H 11800 1550 50  0000 C CNN
+	1    11800 1550
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR02
-U 1 1 56D707BB
-P 8600 1450
-F 0 "#PWR02" H 8600 1300 50  0001 C CNN
-F 1 "+5V" H 8600 1590 30  0000 C CNN
-F 2 "" H 8600 1450 50  0000 C CNN
-F 3 "" H 8600 1450 50  0000 C CNN
-	1    8600 1450
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR03
+L GND #PWR02
 U 1 1 56D70CC2
-P 8850 2100
-F 0 "#PWR03" H 8850 1850 50  0001 C CNN
-F 1 "GND" H 8850 1950 50  0000 C CNN
-F 2 "" H 8850 2100 50  0000 C CNN
-F 3 "" H 8850 2100 50  0000 C CNN
-	1    8850 2100
+P 11950 2200
+F 0 "#PWR02" H 11950 1950 50  0001 C CNN
+F 1 "GND" H 11950 2050 50  0000 C CNN
+F 2 "" H 11950 2200 50  0000 C CNN
+F 3 "" H 11950 2200 50  0000 C CNN
+	1    11950 2200
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR04
+L GND #PWR03
 U 1 1 56D70CFF
-P 10950 1500
-F 0 "#PWR04" H 10950 1250 50  0001 C CNN
-F 1 "GND" H 10950 1350 50  0000 C CNN
-F 2 "" H 10950 1500 50  0000 C CNN
-F 3 "" H 10950 1500 50  0000 C CNN
-	1    10950 1500
+P 14050 1600
+F 0 "#PWR03" H 14050 1350 50  0001 C CNN
+F 1 "GND" H 14050 1450 50  0000 C CNN
+F 2 "" H 14050 1600 50  0000 C CNN
+F 3 "" H 14050 1600 50  0000 C CNN
+	1    14050 1600
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_01X06 P2
 U 1 1 56D70DD8
-P 9600 2750
-F 0 "P2" H 9600 3100 50  0000 C CNN
-F 1 "Analog" V 9700 2750 50  0000 C CNN
-F 2 "Socket_Arduino_Uno:Socket_Strip_Arduino_1x06" H 9600 2750 50  0001 C CNN
-F 3 "" H 9600 2750 50  0000 C CNN
-	1    9600 2750
+P 12700 2850
+F 0 "P2" H 12700 3200 50  0000 C CNN
+F 1 "Analog" V 12800 2850 50  0000 C CNN
+F 2 "Socket_Arduino_Uno:Socket_Strip_Arduino_1x06" H 12700 2850 50  0001 C CNN
+F 3 "" H 12700 2850 50  0000 C CNN
+	1    12700 2850
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_01X01 P5
 U 1 1 56D71177
-P 10800 650
-F 0 "P5" V 10900 650 50  0000 C CNN
-F 1 "CONN_01X01" V 10900 650 50  0001 C CNN
-F 2 "Socket_Arduino_Uno:Arduino_1pin" H 10800 650 50  0001 C CNN
-F 3 "" H 10800 650 50  0000 C CNN
-	1    10800 650 
+P 13900 750
+F 0 "P5" V 14000 750 50  0000 C CNN
+F 1 "CONN_01X01" V 14000 750 50  0001 C CNN
+F 2 "Socket_Arduino_Uno:Arduino_1pin" H 13900 750 50  0001 C CNN
+F 3 "" H 13900 750 50  0000 C CNN
+	1    13900 750 
 	0    -1   -1   0   
 $EndComp
 $Comp
 L CONN_01X01 P6
 U 1 1 56D71274
-P 10900 650
-F 0 "P6" V 11000 650 50  0000 C CNN
-F 1 "CONN_01X01" V 11000 650 50  0001 C CNN
-F 2 "Socket_Arduino_Uno:Arduino_1pin" H 10900 650 50  0001 C CNN
-F 3 "" H 10900 650 50  0000 C CNN
-	1    10900 650 
+P 14000 750
+F 0 "P6" V 14100 750 50  0000 C CNN
+F 1 "CONN_01X01" V 14100 750 50  0001 C CNN
+F 2 "Socket_Arduino_Uno:Arduino_1pin" H 14000 750 50  0001 C CNN
+F 3 "" H 14000 750 50  0000 C CNN
+	1    14000 750 
 	0    -1   -1   0   
 $EndComp
 $Comp
 L CONN_01X01 P7
 U 1 1 56D712A8
-P 11000 650
-F 0 "P7" V 11100 650 50  0000 C CNN
-F 1 "CONN_01X01" V 11100 650 50  0001 C CNN
-F 2 "Socket_Arduino_Uno:Arduino_1pin" H 11000 650 50  0001 C CNN
-F 3 "" H 11000 650 50  0000 C CNN
-	1    11000 650 
+P 14100 750
+F 0 "P7" V 14200 750 50  0000 C CNN
+F 1 "CONN_01X01" V 14200 750 50  0001 C CNN
+F 2 "Socket_Arduino_Uno:Arduino_1pin" H 14100 750 50  0001 C CNN
+F 3 "" H 14100 750 50  0000 C CNN
+	1    14100 750 
 	0    -1   -1   0   
 $EndComp
 $Comp
 L CONN_01X01 P8
 U 1 1 56D712DB
-P 11100 650
-F 0 "P8" V 11200 650 50  0000 C CNN
-F 1 "CONN_01X01" V 11200 650 50  0001 C CNN
-F 2 "Socket_Arduino_Uno:Arduino_1pin" H 11100 650 50  0001 C CNN
-F 3 "" H 11100 650 50  0000 C CNN
-	1    11100 650 
+P 14200 750
+F 0 "P8" V 14300 750 50  0000 C CNN
+F 1 "CONN_01X01" V 14300 750 50  0001 C CNN
+F 2 "Socket_Arduino_Uno:Arduino_1pin" H 14200 750 50  0001 C CNN
+F 3 "" H 14200 750 50  0000 C CNN
+	1    14200 750 
 	0    -1   -1   0   
 $EndComp
-NoConn ~ 10800 850 
-NoConn ~ 10900 850 
-NoConn ~ 11000 850 
-NoConn ~ 11100 850 
+NoConn ~ 13900 950 
+NoConn ~ 14000 950 
+NoConn ~ 14100 950 
+NoConn ~ 14200 950 
 $Comp
 L CONN_01X08 P4
 U 1 1 56D7164F
-P 10000 2650
-F 0 "P4" H 10000 3100 50  0000 C CNN
-F 1 "Digital" V 10100 2650 50  0000 C CNN
-F 2 "Socket_Arduino_Uno:Socket_Strip_Arduino_1x08" H 10000 2650 50  0001 C CNN
-F 3 "" H 10000 2650 50  0000 C CNN
-	1    10000 2650
+P 13100 2750
+F 0 "P4" H 13100 3200 50  0000 C CNN
+F 1 "Digital" V 13200 2750 50  0000 C CNN
+F 2 "Socket_Arduino_Uno:Socket_Strip_Arduino_1x08" H 13100 2750 50  0001 C CNN
+F 3 "" H 13100 2750 50  0000 C CNN
+	1    13100 2750
 	-1   0    0    1   
 $EndComp
 $Comp
 L CONN_01X10 P3
 U 1 1 56D721E0
-P 10000 1650
-F 0 "P3" H 10000 2200 50  0000 C CNN
-F 1 "Digital" V 10100 1650 50  0000 C CNN
-F 2 "Socket_Arduino_Uno:Socket_Strip_Arduino_1x10" H 10000 1650 50  0001 C CNN
-F 3 "" H 10000 1650 50  0000 C CNN
-	1    10000 1650
+P 13100 1750
+F 0 "P3" H 13100 2300 50  0000 C CNN
+F 1 "Digital" V 13200 1750 50  0000 C CNN
+F 2 "Socket_Arduino_Uno:Socket_Strip_Arduino_1x10" H 13100 1750 50  0001 C CNN
+F 3 "" H 13100 1750 50  0000 C CNN
+	1    13100 1750
 	-1   0    0    1   
 $EndComp
-Text Notes 9700 1600 0    60   ~ 0
+Text Notes 12800 1700 0    60   ~ 0
 1
 $Comp
 L STM32L151C6TxA U1
 U 1 1 58CEFE92
-P 4950 4500
-F 0 "U1" H 1450 6225 50  0000 L BNN
-F 1 "STM32L151C6TxA" H 8450 6225 50  0000 R BNN
-F 2 "Housings_QFP:TQFP-48_7x7mm_Pitch0.5mm" H 8450 6175 50  0000 R TNN
-F 3 "" H 4950 4500 50  0000 C CNN
-	1    4950 4500
+P 6150 5800
+F 0 "U1" H 2650 7525 50  0000 L BNN
+F 1 "STM32L151C6TxA" H 9650 7525 50  0000 R BNN
+F 2 "Housings_QFP:TQFP-48_7x7mm_Pitch0.5mm" H 9650 7475 50  0000 R TNN
+F 3 "" H 6150 5800 50  0000 C CNN
+	1    6150 5800
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_02X05 P9
 U 1 1 58CF048F
-P 1500 1250
-F 0 "P9" H 1500 1550 50  0000 C CNN
-F 1 "FX2LA" H 1500 950 50  0000 C CNN
-F 2 "Socket_Strips:Socket_Strip_Angled_2x05_Pitch2.54mm" H 1500 50  50  0001 C CNN
-F 3 "" H 1500 50  50  0000 C CNN
-	1    1500 1250
+P 1850 1450
+F 0 "P9" H 1850 1750 50  0000 C CNN
+F 1 "FX2LA" H 1850 1150 50  0000 C CNN
+F 2 "Socket_Strips:Socket_Strip_Angled_2x05_Pitch2.54mm" H 1850 250 50  0001 C CNN
+F 3 "" H 1850 250 50  0000 C CNN
+	1    1850 1450
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR05
+L +3V3 #PWR04
 U 1 1 58CF063D
-P 4900 2500
-F 0 "#PWR05" H 4900 2350 50  0001 C CNN
-F 1 "+3V3" H 4900 2640 50  0000 C CNN
-F 2 "" H 4900 2500 50  0000 C CNN
-F 3 "" H 4900 2500 50  0000 C CNN
-	1    4900 2500
+P 6100 3800
+F 0 "#PWR04" H 6100 3650 50  0001 C CNN
+F 1 "+3V3" H 6100 3940 50  0000 C CNN
+F 2 "" H 6100 3800 50  0000 C CNN
+F 3 "" H 6100 3800 50  0000 C CNN
+	1    6100 3800
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR06
+L GND #PWR05
 U 1 1 58CF077D
-P 4850 6450
-F 0 "#PWR06" H 4850 6200 50  0001 C CNN
-F 1 "GND" H 4850 6300 50  0000 C CNN
-F 2 "" H 4850 6450 50  0000 C CNN
-F 3 "" H 4850 6450 50  0000 C CNN
-	1    4850 6450
+P 6050 7750
+F 0 "#PWR05" H 6050 7500 50  0001 C CNN
+F 1 "GND" H 6050 7600 50  0000 C CNN
+F 2 "" H 6050 7750 50  0000 C CNN
+F 3 "" H 6050 7750 50  0000 C CNN
+	1    6050 7750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR07
+L GND #PWR06
 U 1 1 58CF0E5B
-P 1850 1550
-F 0 "#PWR07" H 1850 1300 50  0001 C CNN
-F 1 "GND" H 1850 1400 50  0000 C CNN
-F 2 "" H 1850 1550 50  0000 C CNN
-F 3 "" H 1850 1550 50  0000 C CNN
-	1    1850 1550
+P 2200 1750
+F 0 "#PWR06" H 2200 1500 50  0001 C CNN
+F 1 "GND" H 2200 1600 50  0000 C CNN
+F 2 "" H 2200 1750 50  0000 C CNN
+F 3 "" H 2200 1750 50  0000 C CNN
+	1    2200 1750
 	1    0    0    -1  
 $EndComp
 $Comp
 L USB_OTG-RESCUE-hw1 P10
 U 1 1 58CF10AD
-P 3650 1250
-F 0 "P10" H 3975 1125 50  0000 C CNN
-F 1 "CONTROL" H 3650 1450 50  0000 C CNN
-F 2 "Connectors:USB_Micro-B" V 3600 1150 50  0001 C CNN
-F 3 "" V 3600 1150 50  0000 C CNN
-	1    3650 1250
+P 4900 1400
+F 0 "P10" H 5225 1275 50  0000 C CNN
+F 1 "CONTROL" H 4900 1600 50  0000 C CNN
+F 2 "Connectors:USB_Micro-B" V 4850 1300 50  0001 C CNN
+F 3 "" V 4850 1300 50  0000 C CNN
+	1    4900 1400
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR08
+L GND #PWR07
 U 1 1 58CF1156
-P 3850 1650
-F 0 "#PWR08" H 3850 1400 50  0001 C CNN
-F 1 "GND" H 3850 1500 50  0000 C CNN
-F 2 "" H 3850 1650 50  0000 C CNN
-F 3 "" H 3850 1650 50  0000 C CNN
-	1    3850 1650
+P 5100 1800
+F 0 "#PWR07" H 5100 1550 50  0001 C CNN
+F 1 "GND" H 5100 1650 50  0000 C CNN
+F 2 "" H 5100 1800 50  0000 C CNN
+F 3 "" H 5100 1800 50  0000 C CNN
+	1    5100 1800
 	1    0    0    -1  
 $EndComp
-Text Label 8650 5500 0    60   ~ 0
+Text Label 9850 6800 0    60   ~ 0
 USB_DM
-Text Label 8650 5600 0    60   ~ 0
+Text Label 9850 6900 0    60   ~ 0
 USB_DP
-Text Label 3550 1600 3    60   ~ 0
+Text Label 4800 1750 3    60   ~ 0
 USB_DM
-Text Label 3650 1600 3    60   ~ 0
+Text Label 4900 1750 3    60   ~ 0
 USB_DP
-Text Label 8650 4800 0    60   ~ 0
+Text Label 9850 6100 0    60   ~ 0
 DAC1_OUT
-Text Label 8650 4900 0    60   ~ 0
+Text Label 9850 6200 0    60   ~ 0
 DAC2_OUT
-Text Label 950  5200 0    60   ~ 0
+Text Label 2150 6500 0    60   ~ 0
 I2C_SCL
-Text Label 950  5300 0    60   ~ 0
+Text Label 2150 6600 0    60   ~ 0
 I2C_SDA
-Text Notes 5400 2350 0    60   ~ 0
+Text Notes 6450 1950 0    60   ~ 0
 [x] debug via via 6pin\n[  ] debug via 10x5x1.27mm cortex SMD\n
-Text Label 9350 3000 2    60   ~ 0
+Text Label 12450 3100 2    60   ~ 0
 I2C_SCL
-Text Notes 8500 3000 0    60   ~ 0
+Text Notes 11600 3100 0    60   ~ 0
 A5 (SCL)
-Text Notes 8500 2900 0    60   ~ 0
+Text Notes 11600 3000 0    60   ~ 0
 A4 (SDA)
-Text Notes 8500 2500 0    60   ~ 0
+Text Notes 11600 2600 0    60   ~ 0
 A0
-Text Notes 8500 2600 0    60   ~ 0
+Text Notes 11600 2700 0    60   ~ 0
 A1
-Text Notes 10950 1300 0    60   ~ 0
-D15 (SCL)\nD14 (SDA)
-Text Notes 11150 1900 0    60   ~ 0
+Text Notes 14050 1400 0    60   ~ 0
+D15 (_ALSO_ SCL)\nD14 (_ALSO_ SDA)
+Text Notes 14250 2000 0    60   ~ 0
 13(SCK) (DACOUT2)\n12(MISO)\n11(**/MOSI)\n10(**/SS)
-Text Notes 11100 3000 0    60   ~ 0
+Text Notes 14200 3100 0    60   ~ 0
 Target TX\nTarget RX
 Wire Notes Line
-	8525 825  9925 825 
+	11625 925  13025 925 
 Wire Notes Line
-	9925 825  9925 475 
-Wire Wire Line
-	9300 1700 9400 1700
+	13025 925  13025 575 
 Wire Wire Line
-	9400 1900 8700 1900
+	12400 1800 12500 1800
 Wire Wire Line
-	9400 2000 8600 2000
+	11950 2200 12500 2200
+Connection ~ 12400 2200
 Wire Wire Line
-	8850 2100 9400 2100
-Connection ~ 9300 2100
+	12500 2600 12450 2600
 Wire Wire Line
-	8600 2000 8600 1450
+	12500 2700 12450 2700
 Wire Wire Line
-	8700 1900 8700 1450
+	12500 2800 12450 2800
 Wire Wire Line
-	9400 2500 9350 2500
+	12500 2900 12000 2900
 Wire Wire Line
-	9400 2600 9350 2600
+	12500 3000 12450 3000
 Wire Wire Line
-	9400 2700 9350 2700
+	12500 3100 12450 3100
 Wire Wire Line
-	9400 2800 8900 2800
+	13300 2200 13650 2200
 Wire Wire Line
-	9400 2900 9350 2900
+	13300 2100 13650 2100
 Wire Wire Line
-	9400 3000 9350 3000
+	13300 2000 13450 2000
 Wire Wire Line
-	10200 2100 10550 2100
+	13300 1900 13450 1900
 Wire Wire Line
-	10200 2000 10550 2000
+	13300 1800 13450 1800
 Wire Wire Line
-	10200 1900 10350 1900
+	13300 1700 13450 1700
 Wire Wire Line
-	10200 1800 10350 1800
+	13300 1500 13400 1500
 Wire Wire Line
-	10200 1700 10350 1700
+	13300 3100 13350 3100
 Wire Wire Line
-	10200 1600 10350 1600
+	13300 3000 13350 3000
 Wire Wire Line
-	10200 1400 10300 1400
+	13300 2900 13650 2900
 Wire Wire Line
-	10200 1300 10300 1300
+	13300 2800 13650 2800
 Wire Wire Line
-	10200 1200 10300 1200
+	13300 2700 13650 2700
 Wire Wire Line
-	10200 3000 10250 3000
+	13300 2600 13650 2600
 Wire Wire Line
-	10200 2900 10250 2900
+	13300 2500 13650 2500
 Wire Wire Line
-	10200 2800 10550 2800
+	13300 2400 13650 2400
 Wire Wire Line
-	10200 2700 10550 2700
-Wire Wire Line
-	10200 2600 10550 2600
-Wire Wire Line
-	10200 2500 10550 2500
-Wire Wire Line
-	10200 2400 10550 2400
-Wire Wire Line
-	10200 2300 10550 2300
-Wire Wire Line
-	10200 1500 10950 1500
+	13300 1600 14050 1600
 Wire Notes Line
-	8500 500  8500 3450
+	11600 600  11600 3550
 Wire Notes Line
-	8500 3450 11200 3450
+	11600 3550 14300 3550
 Wire Wire Line
-	9400 1800 9300 1800
+	12500 1900 12400 1900
 Wire Notes Line
-	11200 1000 10700 1000
+	14300 1100 13800 1100
 Wire Notes Line
-	10700 1000 10700 500 
+	13800 1100 13800 600 
 Wire Wire Line
-	4900 2600 4900 2500
+	6100 3900 6100 3800
 Wire Wire Line
-	4750 2600 5050 2600
+	5950 3900 6250 3900
 Wire Wire Line
-	4750 2600 4750 2700
+	5950 3900 5950 4000
 Wire Wire Line
-	4850 2700 4850 2600
-Connection ~ 4850 2600
+	6050 4000 6050 3900
+Connection ~ 6050 3900
 Wire Wire Line
-	4950 2600 4950 2700
-Connection ~ 4900 2600
+	6150 3900 6150 4000
+Connection ~ 6100 3900
 Wire Wire Line
-	5050 2600 5050 2700
-Connection ~ 4950 2600
+	6250 3900 6250 4000
+Connection ~ 6150 3900
 Wire Wire Line
-	4750 6300 4750 6400
+	5950 7600 5950 7700
 Wire Wire Line
-	4750 6400 5050 6400
+	5950 7700 6250 7700
 Wire Wire Line
-	4850 6300 4850 6450
-Connection ~ 4850 6400
+	6050 7600 6050 7750
+Connection ~ 6050 7700
 Wire Wire Line
-	4950 6400 4950 6300
+	6150 7700 6150 7600
 Wire Wire Line
-	5050 6400 5050 6300
-Connection ~ 4950 6400
+	6250 7700 6250 7600
+Connection ~ 6150 7700
 Wire Wire Line
-	1750 1450 1850 1450
+	2100 1650 2200 1650
 Wire Wire Line
-	1850 1450 1850 1550
+	2200 1650 2200 1750
 Wire Wire Line
-	3850 1550 3850 1650
+	5100 1700 5100 1800
 Wire Wire Line
-	8550 5500 8650 5500
+	9750 6800 9850 6800
 Wire Wire Line
-	8550 5600 8650 5600
+	9750 6900 9850 6900
 Wire Wire Line
-	3550 1550 3550 1600
+	4800 1700 4800 2150
 Wire Wire Line
-	3650 1550 3650 1600
+	4900 1700 4900 2150
 Wire Wire Line
-	8550 4800 8650 4800
+	9750 6100 9850 6100
 Wire Wire Line
-	8550 4900 8650 4900
+	9750 6200 9850 6200
 Wire Wire Line
-	950  5300 1350 5300
+	2150 6600 2550 6600
 Wire Wire Line
-	1350 5200 950  5200
+	2550 6500 2150 6500
 Wire Wire Line
-	1750 1050 1800 1050
+	2100 1250 2150 1250
 Wire Wire Line
-	1750 1150 1800 1150
+	2100 1350 2150 1350
 Wire Wire Line
-	1750 1250 1800 1250
+	2100 1450 2150 1450
 Wire Wire Line
-	1750 1350 1800 1350
+	2100 1550 2150 1550
 Wire Wire Line
-	1250 1050 1200 1050
+	1600 1250 1550 1250
 Wire Wire Line
-	1250 1150 1200 1150
+	1600 1350 1550 1350
 Wire Wire Line
-	1250 1250 1200 1250
+	1600 1450 1550 1450
 Wire Wire Line
-	1250 1350 1200 1350
-Text Label 1200 1050 2    60   ~ 0
+	1600 1550 1550 1550
+Text Label 1550 1250 2    60   ~ 0
 I2C_SDA
-Text Label 1800 1050 0    60   ~ 0
+Text Label 2150 1250 0    60   ~ 0
 I2C_SCL
-Text Label 1200 1150 2    60   ~ 0
+Text Label 1550 1350 2    60   ~ 0
 UART_TX_OUT
-Text Label 1200 1250 2    60   ~ 0
+Text Label 1550 1450 2    60   ~ 0
 SPI_MOSI
-Text Label 1800 1150 0    60   ~ 0
+Text Label 2150 1350 0    60   ~ 0
 UART_RX_OUT
-Text Label 1800 1250 0    60   ~ 0
+Text Label 2150 1450 0    60   ~ 0
 SPI_MISO
-Text Label 1200 1350 2    60   ~ 0
+Text Label 1550 1550 2    60   ~ 0
 SPI_SCK
-Text Notes 500  2100 0    60   Italic 0
+Text Notes 850  2300 0    60   Italic 0
 NOTE: this can be freely routed to do whatever's possible!\nPotentially:\nJumpers to select what you're connecting here?\n(but non-ideal)
 $Comp
 L C C2
 U 1 1 58CF43FF
-P 1500 7000
-F 0 "C2" H 1525 7100 50  0000 L CNN
-F 1 "100n" H 1525 6900 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 1538 6850 50  0000 C CNN
-F 3 "" H 1500 7000 50  0000 C CNN
-	1    1500 7000
+P 2800 9900
+F 0 "C2" H 2825 10000 50  0000 L CNN
+F 1 "100n" H 2825 9800 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 2838 9750 50  0000 C CNN
+F 3 "" H 2800 9900 50  0000 C CNN
+	1    2800 9900
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR09
+L GND #PWR08
 U 1 1 58CF46A1
-P 2050 7350
-F 0 "#PWR09" H 2050 7100 50  0001 C CNN
-F 1 "GND" H 2050 7200 50  0000 C CNN
-F 2 "" H 2050 7350 50  0000 C CNN
-F 3 "" H 2050 7350 50  0000 C CNN
-	1    2050 7350
+P 3350 10250
+F 0 "#PWR08" H 3350 10000 50  0001 C CNN
+F 1 "GND" H 3350 10100 50  0000 C CNN
+F 2 "" H 3350 10250 50  0000 C CNN
+F 3 "" H 3350 10250 50  0000 C CNN
+	1    3350 10250
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR010
+L +3V3 #PWR09
 U 1 1 58CF46D6
-P 2050 6650
-F 0 "#PWR010" H 2050 6500 50  0001 C CNN
-F 1 "+3V3" H 2050 6790 50  0000 C CNN
-F 2 "" H 2050 6650 50  0000 C CNN
-F 3 "" H 2050 6650 50  0000 C CNN
-	1    2050 6650
+P 3350 9550
+F 0 "#PWR09" H 3350 9400 50  0001 C CNN
+F 1 "+3V3" H 3350 9690 50  0000 C CNN
+F 2 "" H 3350 9550 50  0000 C CNN
+F 3 "" H 3350 9550 50  0000 C CNN
+	1    3350 9550
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2050 6850 2050 6650
+	3350 9750 3350 9550
 Wire Wire Line
-	1500 6850 2600 6850
-Connection ~ 1850 6850
-Connection ~ 2050 6850
-Connection ~ 2250 6850
+	2800 9750 3900 9750
+Connection ~ 3150 9750
+Connection ~ 3350 9750
+Connection ~ 3550 9750
 Wire Wire Line
-	1500 7150 2600 7150
-Connection ~ 2250 7150
-Connection ~ 1850 7150
+	2800 10050 3900 10050
+Connection ~ 3550 10050
+Connection ~ 3150 10050
 Wire Wire Line
-	2050 7350 2050 7150
-Connection ~ 2050 7150
+	3350 10250 3350 10050
+Connection ~ 3350 10050
 $Comp
 L C C1
 U 1 1 58CF4B65
-P 600 2900
-F 0 "C1" H 625 3000 50  0000 L CNN
-F 1 "100n" H 625 2800 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 638 2750 50  0000 C CNN
-F 3 "" H 600 2900 50  0000 C CNN
-	1    600  2900
-	1    0    0    -1  
+P 1200 4400
+F 0 "C1" H 1225 4500 50  0000 L CNN
+F 1 "100n" H 1225 4300 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 1238 4250 50  0000 C CNN
+F 3 "" H 1200 4400 50  0000 C CNN
+	1    1200 4400
+	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR011
+L GND #PWR010
 U 1 1 58CF4BEA
-P 600 3100
-F 0 "#PWR011" H 600 2850 50  0001 C CNN
-F 1 "GND" H 600 2950 50  0000 C CNN
-F 2 "" H 600 3100 50  0000 C CNN
-F 3 "" H 600 3100 50  0000 C CNN
-	1    600  3100
+P 900 4400
+F 0 "#PWR010" H 900 4150 50  0001 C CNN
+F 1 "GND" H 900 4250 50  0000 C CNN
+F 2 "" H 900 4400 50  0000 C CNN
+F 3 "" H 900 4400 50  0000 C CNN
+	1    900  4400
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	1350 3100 600  2750
+	2550 4400 1350 4400
 Wire Wire Line
-	600  3050 600  3100
-NoConn ~ 1350 4400
-NoConn ~ 1350 4500
-NoConn ~ 1350 4200
-NoConn ~ 1350 4100
-NoConn ~ 1350 4000
-NoConn ~ 1350 4800
+	1050 4400 900  4400
+NoConn ~ 2550 5700
+NoConn ~ 2550 5800
+NoConn ~ 2550 5500
+NoConn ~ 2550 5400
+NoConn ~ 2550 5300
+NoConn ~ 2550 6100
 Wire Wire Line
-	1350 4700 950  4700
-Text Label 950  4700 0    60   Italic 0
+	2550 6000 2150 6000
+Text Label 2150 6000 0    60   Italic 0
 SWO
 Wire Wire Line
-	8550 5700 8650 5700
+	9750 7000 9850 7000
 Wire Wire Line
-	8550 5800 8650 5800
-Text Label 8650 5700 0    60   Italic 0
+	9750 7100 9850 7100
+Text Label 9850 7000 0    60   Italic 0
 SWDIO
-Text Label 8650 5800 0    60   Italic 0
+Text Label 9850 7100 0    60   Italic 0
 SWCLK
-Text Label 600  2750 0    60   Italic 0
+Text Label 1350 4400 0    60   Italic 0
 NRST
 $Comp
-L PWR_FLAG #FLG012
+L PWR_FLAG #FLG011
 U 1 1 58CF5E41
-P 4100 7000
-F 0 "#FLG012" H 4100 7095 50  0001 C CNN
-F 1 "PWR_FLAG" H 4100 7180 50  0000 C CNN
-F 2 "" H 4100 7000 50  0000 C CNN
-F 3 "" H 4100 7000 50  0000 C CNN
-	1    4100 7000
+P 6900 9950
+F 0 "#FLG011" H 6900 10045 50  0001 C CNN
+F 1 "PWR_FLAG" H 6900 10130 50  0000 C CNN
+F 2 "" H 6900 9950 50  0000 C CNN
+F 3 "" H 6900 9950 50  0000 C CNN
+	1    6900 9950
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR013
+L GND #PWR012
 U 1 1 58CF5E8B
-P 4100 7100
-F 0 "#PWR013" H 4100 6850 50  0001 C CNN
-F 1 "GND" H 4100 6950 50  0000 C CNN
-F 2 "" H 4100 7100 50  0000 C CNN
-F 3 "" H 4100 7100 50  0000 C CNN
-	1    4100 7100
+P 6900 10050
+F 0 "#PWR012" H 6900 9800 50  0001 C CNN
+F 1 "GND" H 6900 9900 50  0000 C CNN
+F 2 "" H 6900 10050 50  0000 C CNN
+F 3 "" H 6900 10050 50  0000 C CNN
+	1    6900 10050
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4100 7000 4100 7100
-Text Notes 2400 900  0    60   Italic 12
-ONLY GROUND BETWEEN BOARDS\nBoth will be powered by their own USB.\n(We're not interested in bootloading the target....\nyet...?)
+	6900 9950 6900 10050
+Text Notes 3650 1050 0    60   Italic 12
+ONLY GROUND BETWEEN BOARDS by default!\nIntended for both to have their own USB\nOption for debug only, with power FROM target
 $Comp
 L C C3
 U 1 1 58CF69A9
-P 1850 7000
-F 0 "C3" H 1875 7100 50  0000 L CNN
-F 1 "100n" H 1875 6900 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 1888 6850 50  0000 C CNN
-F 3 "" H 1850 7000 50  0000 C CNN
-	1    1850 7000
+P 3150 9900
+F 0 "C3" H 3175 10000 50  0000 L CNN
+F 1 "100n" H 3175 9800 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 3188 9750 50  0000 C CNN
+F 3 "" H 3150 9900 50  0000 C CNN
+	1    3150 9900
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C4
 U 1 1 58CF69F1
-P 2250 7000
-F 0 "C4" H 2275 7100 50  0000 L CNN
-F 1 "100n" H 2275 6900 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 2288 6850 50  0000 C CNN
-F 3 "" H 2250 7000 50  0000 C CNN
-	1    2250 7000
+P 3550 9900
+F 0 "C4" H 3575 10000 50  0000 L CNN
+F 1 "100n" H 3575 9800 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 3588 9750 50  0000 C CNN
+F 3 "" H 3550 9900 50  0000 C CNN
+	1    3550 9900
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C5
 U 1 1 58CF6A3A
-P 2600 7000
-F 0 "C5" H 2625 7100 50  0000 L CNN
-F 1 "100n" H 2625 6900 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 2638 6850 50  0000 C CNN
-F 3 "" H 2600 7000 50  0000 C CNN
-	1    2600 7000
+P 3900 9900
+F 0 "C5" H 3925 10000 50  0000 L CNN
+F 1 "100n" H 3925 9800 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 3938 9750 50  0000 C CNN
+F 3 "" H 3900 9900 50  0000 C CNN
+	1    3900 9900
 	1    0    0    -1  
 $EndComp
-NoConn ~ 1250 1450
-Text Notes 1000 1450 0    60   ~ 0
+NoConn ~ 1600 1650
+Text Notes 1350 1650 0    60   ~ 0
 CLK
 Wire Wire Line
-	8550 4600 8650 4600
+	9750 5900 9850 5900
 Wire Wire Line
-	8550 4700 8650 4700
-Text Label 8650 4600 0    60   ~ 0
+	9750 6000 9850 6000
+Text Label 9850 5900 0    60   ~ 0
 UART_TX_OUT
-Text Label 8650 4700 0    60   ~ 0
+Text Label 9850 6000 0    60   ~ 0
 UART_RX_OUT
 Wire Wire Line
-	1350 5600 950  5600
+	2550 6900 2150 6900
 Wire Wire Line
-	1350 5700 950  5700
+	2550 7000 2150 7000
 Wire Wire Line
-	1350 5800 950  5800
+	2550 7100 2150 7100
 Wire Wire Line
-	1350 5900 950  5900
-Text Label 950  5600 0    60   ~ 0
+	2550 7200 2150 7200
+Text Label 2150 6900 0    60   ~ 0
 SPI_CS
-Text Label 950  5700 0    60   ~ 0
+Text Label 2150 7000 0    60   ~ 0
 SPI_SCK
-Text Label 950  5800 0    60   ~ 0
+Text Label 2150 7100 0    60   ~ 0
 SPI_MISO
-Text Label 950  5900 0    60   ~ 0
+Text Label 2150 7200 0    60   ~ 0
 SPI_MOSI
 Wire Wire Line
-	8550 5000 8650 5000
+	9750 6300 9850 6300
 Wire Wire Line
-	8550 5100 8650 5100
-Text Label 8650 5000 0    60   ~ 0
+	9750 6400 9850 6400
+Text Label 9850 6300 0    60   ~ 0
 ADC_IN1
-Text Label 8650 5100 0    60   ~ 0
+Text Label 9850 6400 0    60   ~ 0
 ADC_IN2
-Text Notes 8500 2700 0    60   ~ 0
+Text Notes 11600 2800 0    60   ~ 0
 PA4(DAC1)
 $Comp
 L MIC550x-3.3YM5 U2
 U 1 1 59F7B611
-P 5400 7100
-F 0 "U2" H 5150 7300 50  0000 L CNN
-F 1 "MIC550x-3.3YM5" H 6000 7300 50  0000 R CNN
-F 2 "TO_SOT_Packages_SMD:SOT-23-5_HandSoldering" H 6050 6850 50  0001 C CIN
-F 3 "" H 5400 7100 50  0000 C CNN
-	1    5400 7100
+P 8200 10050
+F 0 "U2" H 7950 10250 50  0000 L CNN
+F 1 "MIC550x-3.3YM5" H 8800 10250 50  0000 R CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23-5_HandSoldering" H 8850 9800 50  0001 C CIN
+F 3 "" H 8200 10050 50  0000 C CNN
+	1    8200 10050
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR014
+L +3V3 #PWR013
 U 1 1 59F7B6BD
-P 6150 7000
-F 0 "#PWR014" H 6150 6850 50  0001 C CNN
-F 1 "+3V3" H 6150 7140 50  0000 C CNN
-F 2 "" H 6150 7000 50  0000 C CNN
-F 3 "" H 6150 7000 50  0000 C CNN
-	1    6150 7000
+P 8950 9950
+F 0 "#PWR013" H 8950 9800 50  0001 C CNN
+F 1 "+3V3" H 8950 10090 50  0000 C CNN
+F 2 "" H 8950 9950 50  0000 C CNN
+F 3 "" H 8950 9950 50  0000 C CNN
+	1    8950 9950
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR015
+L GND #PWR014
 U 1 1 59F7B70C
-P 5400 7550
-F 0 "#PWR015" H 5400 7300 50  0001 C CNN
-F 1 "GND" H 5400 7400 50  0000 C CNN
-F 2 "" H 5400 7550 50  0000 C CNN
-F 3 "" H 5400 7550 50  0000 C CNN
-	1    5400 7550
+P 8200 10500
+F 0 "#PWR014" H 8200 10250 50  0001 C CNN
+F 1 "GND" H 8200 10350 50  0000 C CNN
+F 2 "" H 8200 10500 50  0000 C CNN
+F 3 "" H 8200 10500 50  0000 C CNN
+	1    8200 10500
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	5800 7000 6150 7000
+	8600 9950 8950 9950
 Wire Wire Line
-	4850 7000 5000 7000
+	7650 9950 7800 9950
 Wire Wire Line
-	3150 1600 3450 1600
+	4400 1750 4700 1750
 Wire Wire Line
-	3450 1600 3450 1550
+	4700 1750 4700 1700
 Wire Wire Line
-	3150 1600 3150 1550
+	4400 1750 4400 1700
 Wire Wire Line
-	5400 7400 5400 7550
+	8200 10350 8200 10500
 $Comp
-L +5V #PWR016
+L +5V #PWR015
 U 1 1 59F7C40C
-P 3150 1550
-F 0 "#PWR016" H 3150 1400 50  0001 C CNN
-F 1 "+5V" H 3150 1690 50  0000 C CNN
-F 2 "" H 3150 1550 50  0001 C CNN
-F 3 "" H 3150 1550 50  0001 C CNN
-	1    3150 1550
+P 4400 1700
+F 0 "#PWR015" H 4400 1550 50  0001 C CNN
+F 1 "+5V" H 4400 1840 50  0000 C CNN
+F 2 "" H 4400 1700 50  0001 C CNN
+F 3 "" H 4400 1700 50  0001 C CNN
+	1    4400 1700
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR017
+L +5V #PWR016
 U 1 1 59F7C819
-P 4850 7000
-F 0 "#PWR017" H 4850 6850 50  0001 C CNN
-F 1 "+5V" H 4850 7140 50  0000 C CNN
-F 2 "" H 4850 7000 50  0001 C CNN
-F 3 "" H 4850 7000 50  0001 C CNN
-	1    4850 7000
+P 7650 9950
+F 0 "#PWR016" H 7650 9800 50  0001 C CNN
+F 1 "+5V" H 7650 10090 50  0000 C CNN
+F 2 "" H 7650 9950 50  0001 C CNN
+F 3 "" H 7650 9950 50  0001 C CNN
+	1    7650 9950
 	1    0    0    -1  
 $EndComp
-NoConn ~ 3750 1550
-NoConn ~ 4050 1150
+NoConn ~ 5000 1700
+NoConn ~ 5300 1300
 Wire Wire Line
-	5000 7200 4900 7200
+	7800 10150 7700 10150
 Wire Wire Line
-	4900 7200 4900 7000
-Connection ~ 4900 7000
+	7700 10150 7700 9950
+Connection ~ 7700 9950
 $Comp
 L CONN_01X06 J1
 U 1 1 59F7E088
-P 5350 1400
-F 0 "J1" H 5350 1750 50  0000 C CNN
-F 1 "CONN_01X06" V 5450 1400 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x06_Pitch2.54mm" H 5350 1400 50  0001 C CNN
-F 3 "" H 5350 1400 50  0001 C CNN
-	1    5350 1400
+P 6850 1300
+F 0 "J1" H 6850 1650 50  0000 C CNN
+F 1 "CONN_01X06" V 6950 1300 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x06_Pitch2.54mm" H 6850 1300 50  0001 C CNN
+F 3 "" H 6850 1300 50  0001 C CNN
+	1    6850 1300
 	-1   0    0    -1  
 $EndComp
 Wire Wire Line
-	5550 1150 6100 1150
+	7050 1050 7600 1050
 Wire Wire Line
-	5550 1250 5600 1250
+	7050 1150 7100 1150
 Wire Wire Line
-	5550 1350 6100 1350
+	7050 1250 7600 1250
 Wire Wire Line
-	5550 1450 5600 1450
+	7050 1350 7100 1350
 Wire Wire Line
-	5550 1550 5600 1550
+	7050 1450 7100 1450
 Wire Wire Line
-	5550 1650 5600 1650
+	7050 1550 7100 1550
 $Comp
-L GND #PWR018
+L GND #PWR017
 U 1 1 59F7E9AF
-P 6100 1350
-F 0 "#PWR018" H 6100 1100 50  0001 C CNN
-F 1 "GND" H 6100 1200 50  0000 C CNN
-F 2 "" H 6100 1350 50  0000 C CNN
-F 3 "" H 6100 1350 50  0000 C CNN
-	1    6100 1350
+P 7600 1250
+F 0 "#PWR017" H 7600 1000 50  0001 C CNN
+F 1 "GND" H 7600 1100 50  0000 C CNN
+F 2 "" H 7600 1250 50  0000 C CNN
+F 3 "" H 7600 1250 50  0000 C CNN
+	1    7600 1250
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR019
+L +3V3 #PWR018
 U 1 1 59F7EA7B
-P 6100 1150
-F 0 "#PWR019" H 6100 1000 50  0001 C CNN
-F 1 "+3V3" H 6100 1290 50  0000 C CNN
-F 2 "" H 6100 1150 50  0000 C CNN
-F 3 "" H 6100 1150 50  0000 C CNN
-	1    6100 1150
+P 7600 1050
+F 0 "#PWR018" H 7600 900 50  0001 C CNN
+F 1 "+3V3" H 7600 1190 50  0000 C CNN
+F 2 "" H 7600 1050 50  0000 C CNN
+F 3 "" H 7600 1050 50  0000 C CNN
+	1    7600 1050
 	1    0    0    -1  
 $EndComp
-Text Label 5600 1550 0    60   ~ 0
+Text Label 7100 1450 0    60   ~ 0
 NRST
-Text Label 5600 1650 0    60   ~ 0
+Text Label 7100 1550 0    60   ~ 0
 SWO
-Text Notes 5200 950  0    60   ~ 0
+Text Notes 6700 850  0    60   ~ 0
 STLink compatible debug
-NoConn ~ 8550 4400
-NoConn ~ 8550 4500
-NoConn ~ 8550 5200
-NoConn ~ 8550 5300
-NoConn ~ 8550 5400
-NoConn ~ 8550 5900
-NoConn ~ 1350 5500
-NoConn ~ 1350 5400
-NoConn ~ 1350 5100
-NoConn ~ 1350 5000
-NoConn ~ 1350 4900
+NoConn ~ 9750 5700
+NoConn ~ 9750 5800
+NoConn ~ 9750 6500
+NoConn ~ 9750 6600
+NoConn ~ 9750 6700
+NoConn ~ 9750 7200
+NoConn ~ 2550 6800
+NoConn ~ 2550 6700
+NoConn ~ 2550 6400
+NoConn ~ 2550 6300
+NoConn ~ 2550 6200
 Text Notes -121300 438350 0    60   ~ 0
 IN/OUT from perspective of HOST\nDUT Nucleo is TARGET
-Text Notes 8950 6350 0    60   ~ 0
+Text Notes 10150 7650 0    60   ~ 0
 IN/OUT is from the perspective of HOST\nDUT Nucleo is TARGET
-Text Label 1800 1350 0    60   ~ 0
+Text Label 2150 1550 0    60   ~ 0
 SPI_CS
-Text Label 5600 1250 0    60   ~ 0
+Text Label 7100 1150 0    60   ~ 0
 SWCLK
-Text Label 5600 1450 0    60   ~ 0
+Text Label 7100 1350 0    60   ~ 0
 SWDIO
 $Comp
 L R R1
 U 1 1 5A0F8D14
-P 10500 4050
-F 0 "R1" V 10580 4050 50  0000 C CNN
-F 1 "4k7" V 10500 4050 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 10430 4050 50  0001 C CNN
-F 3 "" H 10500 4050 50  0001 C CNN
-	1    10500 4050
+P 10600 9750
+F 0 "R1" V 10680 9750 50  0000 C CNN
+F 1 "4k7" V 10600 9750 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 10530 9750 50  0001 C CNN
+F 3 "" H 10600 9750 50  0001 C CNN
+	1    10600 9750
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R2
 U 1 1 5A0F8EF5
-P 10800 4050
-F 0 "R2" V 10880 4050 50  0000 C CNN
-F 1 "4k7" V 10800 4050 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 10730 4050 50  0001 C CNN
-F 3 "" H 10800 4050 50  0001 C CNN
-	1    10800 4050
+P 10900 9750
+F 0 "R2" V 10980 9750 50  0000 C CNN
+F 1 "4k7" V 10900 9750 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 10830 9750 50  0001 C CNN
+F 3 "" H 10900 9750 50  0001 C CNN
+	1    10900 9750
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	10800 3800 10800 3900
+	10900 9500 10900 9600
 Wire Wire Line
-	10500 3800 10800 3800
+	10600 9500 10900 9500
 Wire Wire Line
-	10500 3800 10500 3900
+	10600 9500 10600 9600
 $Comp
-L +3V3 #PWR020
+L +3V3 #PWR019
 U 1 1 5A0F90D0
-P 10650 3800
-F 0 "#PWR020" H 10650 3650 50  0001 C CNN
-F 1 "+3V3" H 10650 3940 50  0000 C CNN
-F 2 "" H 10650 3800 50  0000 C CNN
-F 3 "" H 10650 3800 50  0000 C CNN
-	1    10650 3800
+P 10750 9500
+F 0 "#PWR019" H 10750 9350 50  0001 C CNN
+F 1 "+3V3" H 10750 9640 50  0000 C CNN
+F 2 "" H 10750 9500 50  0000 C CNN
+F 3 "" H 10750 9500 50  0000 C CNN
+	1    10750 9500
 	1    0    0    -1  
 $EndComp
 $Comp
 L Jumper_NC_Small JP1
 U 1 1 5A0F91B9
-P 10500 4350
-F 0 "JP1" H 10500 4430 50  0000 C CNN
-F 1 "Jumper_NC_Small" H 10510 4290 50  0000 C CNN
-F 2 "Socket_Strips:Socket_Strip_Straight_2x01_Pitch2.54mm" H 10500 4350 50  0001 C CNN
-F 3 "" H 10500 4350 50  0001 C CNN
-	1    10500 4350
+P 10600 10050
+F 0 "JP1" H 10600 10130 50  0000 C CNN
+F 1 "Jumper_NC_Small" H 10610 9990 50  0000 C CNN
+F 2 "Socket_Strips:Socket_Strip_Straight_2x01_Pitch2.54mm" H 10600 10050 50  0001 C CNN
+F 3 "" H 10600 10050 50  0001 C CNN
+	1    10600 10050
 	0    -1   -1   0   
 $EndComp
 $Comp
 L Jumper_NC_Small JP2
 U 1 1 5A0F9269
-P 10800 4350
-F 0 "JP2" H 10800 4430 50  0000 C CNN
-F 1 "Jumper_NC_Small" H 10810 4290 50  0000 C CNN
-F 2 "Socket_Strips:Socket_Strip_Straight_2x01_Pitch2.54mm" H 10800 4350 50  0001 C CNN
-F 3 "" H 10800 4350 50  0001 C CNN
-	1    10800 4350
+P 10900 10050
+F 0 "JP2" H 10900 10130 50  0000 C CNN
+F 1 "Jumper_NC_Small" H 10910 9990 50  0000 C CNN
+F 2 "Socket_Strips:Socket_Strip_Straight_2x01_Pitch2.54mm" H 10900 10050 50  0001 C CNN
+F 3 "" H 10900 10050 50  0001 C CNN
+	1    10900 10050
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	10500 4200 10500 4250
+	10600 9900 10600 9950
 Wire Wire Line
-	10800 4200 10800 4250
+	10900 9900 10900 9950
 Wire Wire Line
-	10800 4450 10800 4600
+	10900 10150 10900 10300
 Wire Wire Line
-	10500 4450 10500 4600
-Text Label 10500 4600 3    60   ~ 0
+	10600 10150 10600 10300
+Text Label 10600 10300 3    60   ~ 0
 I2C_SDA
-Text Label 10800 4600 3    60   ~ 0
+Text Label 10900 10300 3    60   ~ 0
 I2C_SCL
-Text Notes 600  800  0    60   ~ 0
+Text Notes 950  1000 0    60   ~ 0
 Designed for a cheap FX2LA\nto be just "plugged in" for sigrok
-NoConn ~ 10300 1400
-NoConn ~ 9300 1700
-NoConn ~ 9300 1800
+NoConn ~ 13400 1500
+NoConn ~ 12400 1800
+NoConn ~ 12400 1900
 Wire Wire Line
-	9400 2200 9300 2200
+	12500 2300 12400 2300
 Wire Wire Line
-	9300 2200 9300 2100
+	12400 2300 12400 2200
 Wire Wire Line
-	9400 2300 9300 2300
-NoConn ~ 9300 2300
-NoConn ~ 1350 4600
-NoConn ~ 1350 3300
-Text Notes 1750 3300 0    60   ~ 0
-We're using debugger only here
+	12500 2400 12400 2400
+NoConn ~ 12400 2400
+NoConn ~ 2550 5900
+Text Notes 2950 4600 0    39   ~ 0
+We're using debugger only here\n(but be safe)
 $Comp
 L C C6
 U 1 1 5A0FB867
-P 800 3200
-F 0 "C6" H 825 3300 50  0000 L CNN
-F 1 "100n" H 825 3100 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 838 3050 50  0000 C CNN
-F 3 "" H 800 3200 50  0000 C CNN
-	1    800  3200
-	1    0    0    -1  
+P 1200 4800
+F 0 "C6" H 1225 4900 50  0000 L CNN
+F 1 "100n" H 1225 4700 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 1238 4650 50  0000 C CNN
+F 3 "" H 1200 4800 50  0000 C CNN
+	1    1200 4800
+	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR021
+L GND #PWR020
 U 1 1 5A0FB8D8
-P 800 3400
-F 0 "#PWR021" H 800 3150 50  0001 C CNN
-F 1 "GND" H 800 3250 50  0000 C CNN
-F 2 "" H 800 3400 50  0000 C CNN
-F 3 "" H 800 3400 50  0000 C CNN
-	1    800  3400
+P 900 4800
+F 0 "#PWR020" H 900 4550 50  0001 C CNN
+F 1 "GND" H 900 4650 50  0000 C CNN
+F 2 "" H 900 4800 50  0000 C CNN
+F 3 "" H 900 4800 50  0000 C CNN
+	1    900  4800
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	800  3350 800  3400
-Text Notes -950 3450 0    60   ~ 0
+	1050 4800 900  4800
+Text Notes -50  4450 0    60   ~ 0
 Not needed on L1, but needed for L4/F3
-Text Notes 9000 3300 0    60   ~ 0
+Text Notes 12100 3400 0    60   ~ 0
 TODO\n[ ] Route all spare pins to _something_?
 $Comp
 L C C8
 U 1 1 5A0FC660
-P 6100 7350
-F 0 "C8" H 6125 7450 50  0000 L CNN
-F 1 "1u" H 6125 7250 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 6138 7200 50  0000 C CNN
-F 3 "" H 6100 7350 50  0000 C CNN
-	1    6100 7350
+P 8900 10300
+F 0 "C8" H 8925 10400 50  0000 L CNN
+F 1 "1u" H 8925 10200 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 8938 10150 50  0000 C CNN
+F 3 "" H 8900 10300 50  0000 C CNN
+	1    8900 10300
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C7
 U 1 1 5A0FC76D
-P 4900 7350
-F 0 "C7" H 4925 7450 50  0000 L CNN
-F 1 "1u" H 4925 7250 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 4938 7200 50  0000 C CNN
-F 3 "" H 4900 7350 50  0000 C CNN
-	1    4900 7350
+P 7700 10300
+F 0 "C7" H 7725 10400 50  0000 L CNN
+F 1 "1u" H 7725 10200 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 7738 10150 50  0000 C CNN
+F 3 "" H 7700 10300 50  0000 C CNN
+	1    7700 10300
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4900 7500 6100 7500
-Connection ~ 5400 7500
+	7700 10450 8900 10450
+Connection ~ 8200 10450
 Wire Wire Line
-	6100 7200 6100 7000
-Connection ~ 6100 7000
-Connection ~ 10650 3800
+	8900 10150 8900 9950
+Connection ~ 8900 9950
+Connection ~ 10750 9500
 Wire Wire Line
-	1350 3500 1100 3500
-Wire Wire Line
-	1100 3500 800  3050
-Text Label 1350 3500 2    60   ~ 0
+	1350 4800 2550 4800
+Text Label 2550 4800 2    60   ~ 0
 VLCD
-Text Notes 5150 2750 0    60   ~ 0
+Text Notes 6350 4050 0    60   ~ 0
 L1/F303/L4 in qfp48 are all compatible with this layout\n(but f3 needs external pullup on USB-DP)
 $Comp
 L Crystal_GND24_Small Y1
 U 1 1 5A137095
-P 800 3800
-F 0 "Y1" H 850 3975 50  0000 L CNN
-F 1 "Crystal_GND24_Small" H 850 3900 50  0000 L CNN
-F 2 "Crystals:Crystal_SMD_SeikoEpson_FA238-4pin_3.2x2.5mm" H 800 3800 50  0001 C CNN
-F 3 "" H 800 3800 50  0001 C CNN
-	1    800  3800
-	0    -1   -1   0   
+P 1600 5100
+F 0 "Y1" H 1650 5275 50  0000 L CNN
+F 1 "Crystal_GND24_Small" H 1650 5200 50  0000 L CNN
+F 2 "Crystals:Crystal_SMD_SeikoEpson_FA238-4pin_3.2x2.5mm" H 1600 5100 50  0001 C CNN
+F 3 "" H 1600 5100 50  0001 C CNN
+	1    1600 5100
+	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	550  3700 1350 3700
-Wire Wire Line
-	1350 3800 1150 3800
-Wire Wire Line
-	1150 3800 1150 3900
-Wire Wire Line
-	1150 3900 750  3900
+	1700 5100 2550 5100
 $Comp
 L C C10
 U 1 1 5A1373B8
-P 750 4150
-F 0 "C10" H 775 4250 50  0000 L CNN
-F 1 "18pf" H 775 4050 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 788 4000 50  0000 C CNN
-F 3 "" H 750 4150 50  0000 C CNN
-	1    750  4150
+P 1750 5450
+F 0 "C10" H 1775 5550 50  0000 L CNN
+F 1 "18pf" H 1775 5350 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 1788 5300 50  0000 C CNN
+F 3 "" H 1750 5450 50  0000 C CNN
+	1    1750 5450
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C9
 U 1 1 5A137455
-P 550 4150
-F 0 "C9" H 575 4250 50  0000 L CNN
-F 1 "18pf" H 575 4050 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 588 4000 50  0000 C CNN
-F 3 "" H 550 4150 50  0000 C CNN
-	1    550  4150
+P 1450 5450
+F 0 "C9" H 1475 5550 50  0000 L CNN
+F 1 "18pf" H 1475 5350 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 1488 5300 50  0000 C CNN
+F 3 "" H 1450 5450 50  0000 C CNN
+	1    1450 5450
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR022
+L GND #PWR021
 U 1 1 5A137592
-P 650 4400
-F 0 "#PWR022" H 650 4150 50  0001 C CNN
-F 1 "GND" H 650 4250 50  0000 C CNN
-F 2 "" H 650 4400 50  0000 C CNN
-F 3 "" H 650 4400 50  0000 C CNN
-	1    650  4400
+P 1600 5800
+F 0 "#PWR021" H 1600 5550 50  0001 C CNN
+F 1 "GND" H 1600 5650 50  0000 C CNN
+F 2 "" H 1600 5800 50  0000 C CNN
+F 3 "" H 1600 5800 50  0000 C CNN
+	1    1600 5800
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	550  4000 550  3700
-Connection ~ 800  3700
+	1600 5800 1600 5600
+Wire Wire Line
+	1450 5600 1750 5600
+Connection ~ 1600 5600
+$Comp
+L Jumper_NC_Small JP3
+U 1 1 5A36E60E
+P 12050 2000
+F 0 "JP3" H 12050 2080 50  0000 C CNN
+F 1 "Jumper_NC_Small" H 12060 1940 50  0000 C CNN
+F 2 "Socket_Strips:Socket_Strip_Straight_2x01_Pitch2.54mm" H 12050 2000 50  0001 C CNN
+F 3 "" H 12050 2000 50  0001 C CNN
+	1    12050 2000
+	1    0    0    -1  
+$EndComp
+NoConn ~ 12500 2100
+Text Notes 12300 2150 0    60   ~ 0
+5V
+Wire Wire Line
+	12500 2000 12150 2000
+Wire Wire Line
+	11950 2000 11800 2000
+Wire Wire Line
+	11800 2000 11800 1550
+$Comp
+L CONN_01X02 J3
+U 1 1 5A36EBE0
+P 4850 2350
+F 0 "J3" H 4850 2500 50  0000 C CNN
+F 1 "CONN_01X02" V 4950 2350 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm" H 4850 2350 50  0001 C CNN
+F 3 "" H 4850 2350 50  0001 C CNN
+	1    4850 2350
+	0    1    1    0   
+$EndComp
+Text Notes 4550 2700 0    60   ~ 0
+Probe points, for\nbus tracing USB
+$Comp
+L CONN_01X01_MALE J2
+U 1 1 5A36F13B
+P 2150 4600
+F 0 "J2" H 2150 4675 50  0000 C CNN
+F 1 "CONN_01X01_MALE" H 2150 4500 50  0000 C CNN
+F 2 "Wire_Pads:SolderWirePad_single_0-8mmDrill" H 2150 4600 50  0001 C CNN
+F 3 "" H 2150 4600 50  0001 C CNN
+	1    2150 4600
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2550 4600 2450 4600
+Wire Wire Line
+	1450 4900 1450 5300
+Wire Wire Line
+	1450 5100 1500 5100
+Wire Wire Line
+	2550 5000 2350 5000
 Wire Wire Line
-	650  4400 650  4300
+	2350 5000 2350 4900
 Wire Wire Line
-	550  4300 750  4300
-Connection ~ 650  4300
+	2350 4900 1450 4900
+Connection ~ 1450 5100
 Wire Wire Line
-	750  3900 750  4000
-Connection ~ 800  3900
+	1750 5300 1750 5100
+Connection ~ 1750 5100
+NoConn ~ 13300 1300
+NoConn ~ 13300 1400
 $EndSCHEMATC