hw1: more silk cleanup

3 files changed, 197 insertions, 192 deletions

diff --git a/hw1/hw1.kicad_pcb b/hw1/hw1.kicad_pcb
index 649cf93..0772eac 100644
--- a/hw1/hw1.kicad_pcb
+++ b/hw1/hw1.kicad_pcb
@@ -3,9 +3,9 @@
   (general
     (links 87)
     (no_connects 24)
-    (area 119.9355 72.949999 186.303001 126.440001)
+    (area 123.024999 72.949999 177.113001 126.440001)
     (thickness 1.6)
-    (drawings 17)
+    (drawings 18)
     (tracks 288)
     (zones 0)
     (modules 35)
@@ -53,7 +53,7 @@
     (zone_clearance 0.25)
     (zone_45_only yes)
     (trace_min 0.152)
-    (segment_width 0.15)
+    (segment_width 0.12)
     (edge_width 0.15)
     (via_size 0.6)
     (via_drill 0.4)
@@ -64,16 +64,16 @@
     (uvias_allowed no)
     (uvia_min_size 0.2)
     (uvia_min_drill 0.1)
-    (pcb_text_width 0.3)
-    (pcb_text_size 1.5 1.5)
+    (pcb_text_width 0.12)
+    (pcb_text_size 0.7 0.7)
     (mod_edge_width 0.15)
-    (mod_text_size 1 1)
-    (mod_text_width 0.15)
+    (mod_text_size 0.7 0.7)
+    (mod_text_width 0.12)
     (pad_size 1.2 1.2)
     (pad_drill 0.6)
     (pad_to_mask_clearance 0)
     (aux_axis_origin 123.1265 126.365)
-    (grid_origin 110.998 126.365)
+    (grid_origin 123.1265 126.365)
     (visible_elements FFFEFFFF)
     (pcbplotparams
       (layerselection 0x00020_00000000)
@@ -130,15 +130,15 @@
   (net 25 "Net-(C9-Pad1)")
   (net 26 "Net-(C10-Pad1)")
   (net 27 "Net-(JP3-Pad2)")
-  (net 28 "Net-(J2-Pad1)")
-  (net 29 "Net-(J4-Pad1)")
-  (net 30 "Net-(J5-Pad1)")
-  (net 31 "Net-(J7-Pad1)")
-  (net 32 "Net-(J8-Pad1)")
-  (net 33 "Net-(J9-Pad1)")
-  (net 34 "Net-(J3-Pad1)")
-  (net 35 "Net-(J10-Pad1)")
-  (net 36 "Net-(J11-Pad1)")
+  (net 28 "Net-(PA0-Pad1)")
+  (net 29 "Net-(PA1-Pad1)")
+  (net 30 "Net-(PA8-Pad1)")
+  (net 31 "Net-(PA9-Pad1)")
+  (net 32 "Net-(PA10-Pad1)")
+  (net 33 "Net-(PB0-Pad1)")
+  (net 34 "Net-(PB1-Pad1)")
+  (net 35 "Net-(PB10-Pad1)")
+  (net 36 "Net-(PB11-Pad1)")
 
   (net_class Default "This is the default net class."
     (clearance 0.2)
@@ -168,19 +168,19 @@
     (add_net GND)
     (add_net "Net-(C10-Pad1)")
     (add_net "Net-(C9-Pad1)")
-    (add_net "Net-(J10-Pad1)")
-    (add_net "Net-(J11-Pad1)")
-    (add_net "Net-(J2-Pad1)")
-    (add_net "Net-(J3-Pad1)")
-    (add_net "Net-(J4-Pad1)")
-    (add_net "Net-(J5-Pad1)")
-    (add_net "Net-(J7-Pad1)")
-    (add_net "Net-(J8-Pad1)")
-    (add_net "Net-(J9-Pad1)")
     (add_net "Net-(JP1-Pad2)")
     (add_net "Net-(JP2-Pad2)")
     (add_net "Net-(JP3-Pad2)")
     (add_net "Net-(P10-Pad6)")
+    (add_net "Net-(PA0-Pad1)")
+    (add_net "Net-(PA1-Pad1)")
+    (add_net "Net-(PA10-Pad1)")
+    (add_net "Net-(PA8-Pad1)")
+    (add_net "Net-(PA9-Pad1)")
+    (add_net "Net-(PB0-Pad1)")
+    (add_net "Net-(PB1-Pad1)")
+    (add_net "Net-(PB10-Pad1)")
+    (add_net "Net-(PB11-Pad1)")
   )
 
   (net_class power ""
@@ -200,7 +200,7 @@
     (tags "socket strip")
     (path /56D70129)
     (fp_text reference P1 (at 8.89 -2.54) (layer F.SilkS) hide
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value Power (at 8.89 -4.064) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -240,7 +240,7 @@
     (tags "socket strip")
     (path /56D70DD8)
     (fp_text reference P2 (at 6.604 -2.54) (layer F.SilkS) hide
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value Analog (at 6.604 -4.064) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -280,7 +280,7 @@
     (tags "socket strip")
     (path /56D721E0)
     (fp_text reference P3 (at 11.43 2.794) (layer F.SilkS) hide
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value Digital (at 11.43 4.318) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -324,7 +324,7 @@
     (tags "socket strip")
     (path /56D7164F)
     (fp_text reference P4 (at 8.89 2.794) (layer F.SilkS) hide
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value Digital (at 8.89 4.318) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -364,7 +364,7 @@
     (path /58CF4B65)
     (attr smd)
     (fp_text reference C1 (at 0 -1.25 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value 100n (at 0 1.5 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -400,7 +400,7 @@
     (path /58CF43FF)
     (attr smd)
     (fp_text reference C2 (at 0 -1.25 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value 100n (at 0 1.5 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -436,7 +436,7 @@
     (path /58CF69A9)
     (attr smd)
     (fp_text reference C3 (at 0 -1.25 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value 100n (at 0 1.5 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -472,7 +472,7 @@
     (path /58CF69F1)
     (attr smd)
     (fp_text reference C4 (at 0 -1.25 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value 100n (at 0 1.5 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -508,7 +508,7 @@
     (path /58CF6A3A)
     (attr smd)
     (fp_text reference C5 (at 0 -1.25 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value 100n (at 0 1.5 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -544,7 +544,7 @@
     (path /58CF10AD)
     (attr smd)
     (fp_text reference P10 (at 0 -3.24 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value CONTROL (at 0 5.01 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -584,7 +584,7 @@
     (path /58CEFE92)
     (attr smd)
     (fp_text reference U1 (at 0 -6 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value STM32L151C6TxA (at 0 6 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -626,9 +626,9 @@
     (pad 9 smd rect (at -4.35 1.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
       (net 3 +3V3))
     (pad 10 smd rect (at -4.35 1.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 35 "Net-(J10-Pad1)"))
+      (net 28 "Net-(PA0-Pad1)"))
     (pad 11 smd rect (at -4.35 2.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 36 "Net-(J11-Pad1)"))
+      (net 29 "Net-(PA1-Pad1)"))
     (pad 12 smd rect (at -4.35 2.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
       (net 20 /UART_TX_OUT))
     (pad 13 smd rect (at -2.75 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
@@ -641,14 +641,14 @@
       (net 5 /ADC_IN1))
     (pad 17 smd rect (at -0.75 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask))
     (pad 18 smd rect (at -0.25 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 28 "Net-(J2-Pad1)"))
+      (net 33 "Net-(PB0-Pad1)"))
     (pad 19 smd rect (at 0.25 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 34 "Net-(J3-Pad1)"))
+      (net 34 "Net-(PB1-Pad1)"))
     (pad 20 smd rect (at 0.75 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask))
     (pad 21 smd rect (at 1.25 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 29 "Net-(J4-Pad1)"))
+      (net 35 "Net-(PB10-Pad1)"))
     (pad 22 smd rect (at 1.75 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 30 "Net-(J5-Pad1)"))
+      (net 36 "Net-(PB11-Pad1)"))
     (pad 23 smd rect (at 2.25 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
     (pad 24 smd rect (at 2.75 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
@@ -662,11 +662,11 @@
     (pad 28 smd rect (at 4.35 1.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
       (net 9 /SPI_MOSI))
     (pad 29 smd rect (at 4.35 0.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 31 "Net-(J7-Pad1)"))
+      (net 30 "Net-(PA8-Pad1)"))
     (pad 30 smd rect (at 4.35 0.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 32 "Net-(J8-Pad1)"))
+      (net 31 "Net-(PA9-Pad1)"))
     (pad 31 smd rect (at 4.35 -0.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 33 "Net-(J9-Pad1)"))
+      (net 32 "Net-(PA10-Pad1)"))
     (pad 32 smd rect (at 4.35 -0.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
       (net 12 /USB_DM))
     (pad 33 smd rect (at 4.35 -1.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
@@ -709,7 +709,7 @@
     (tags "Through hole angled socket strip THT 2x05 2.54mm double row")
     (path /58CF048F)
     (fp_text reference P9 (at -5.65 -2.27 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value FX2LA (at -5.65 12.43 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -855,7 +855,7 @@
     (path /59F7B611)
     (attr smd)
     (fp_text reference U2 (at 0 -2.9) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value MIC550x-3.3YM5 (at 0 2.9) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -894,7 +894,7 @@
     (path /5A0F8D14)
     (attr smd)
     (fp_text reference R1 (at 0 -1.45) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value 4k7 (at 0 1.55) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -930,7 +930,7 @@
     (path /5A0F8EF5)
     (attr smd)
     (fp_text reference R2 (at 0 -1.45) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value 4k7 (at 0 1.55) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -966,7 +966,7 @@
     (path /5A0FB867)
     (attr smd)
     (fp_text reference C6 (at 0 -1.25) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value 100n (at 0 1.5) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -1002,7 +1002,7 @@
     (path /5A0FC76D)
     (attr smd)
     (fp_text reference C7 (at 0 -1.25 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value 1u (at 0 1.5 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -1038,7 +1038,7 @@
     (path /5A0FC660)
     (attr smd)
     (fp_text reference C8 (at 0 -1.25 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value 1u (at 0 1.5 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -1074,7 +1074,7 @@
     (path /5A137455)
     (attr smd)
     (fp_text reference C9 (at 0 -1.25 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value 18pf (at 0 1.5 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -1110,7 +1110,7 @@
     (path /5A1373B8)
     (attr smd)
     (fp_text reference C10 (at 0 -1.25 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value 18pf (at 0 1.5 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -1146,7 +1146,7 @@
     (path /5A137095)
     (attr smd)
     (fp_text reference Y1 (at 0 -2.45 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value Crystal_GND24_Small (at 0 2.45 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -1179,38 +1179,38 @@
     )
   )
 
-  (module Measurement_Points:Measurement_Point_Round-TH_Small (layer F.Cu) (tedit 5A457D60) (tstamp 5A43A0A2)
+  (module Measurement_Points:Measurement_Point_Round-TH_Small (layer F.Cu) (tedit 5A459322) (tstamp 5A43A0A2)
     (at 163.0045 98.044)
     (descr "Mesurement Point, Square, Trough Hole,  DM 1.5mm, Drill 0.8mm,")
     (tags "Mesurement Point Round Trough Hole 1.5mm Drill 0.8mm")
     (path /5A43D04F)
     (attr virtual)
-    (fp_text reference J2 (at 1.905 -0.0635) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+    (fp_text reference PB0 (at 2.2225 0) (layer F.SilkS)
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value TEST_1P (at 0 2) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05))
     (pad 1 thru_hole circle (at 0 0) (size 1.5 1.5) (drill 0.8) (layers *.Cu *.Mask)
-      (net 28 "Net-(J2-Pad1)"))
+      (net 33 "Net-(PB0-Pad1)"))
   )
 
-  (module Measurement_Points:Measurement_Point_Round-TH_Small (layer F.Cu) (tedit 5A457D62) (tstamp 5A43A0A7)
+  (module Measurement_Points:Measurement_Point_Round-TH_Small (layer F.Cu) (tedit 5A45931E) (tstamp 5A43A0A7)
     (at 163.0045 91.694)
     (descr "Mesurement Point, Square, Trough Hole,  DM 1.5mm, Drill 0.8mm,")
     (tags "Mesurement Point Round Trough Hole 1.5mm Drill 0.8mm")
     (path /5A43D40B)
     (attr virtual)
-    (fp_text reference J4 (at 1.905 0) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+    (fp_text reference PB10 (at 2.54 0.0635) (layer F.SilkS)
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value TEST_1P (at 0 2) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05))
     (pad 1 thru_hole circle (at 0 0) (size 1.5 1.5) (drill 0.8) (layers *.Cu *.Mask)
-      (net 29 "Net-(J4-Pad1)"))
+      (net 35 "Net-(PB10-Pad1)"))
   )
 
   (module Measurement_Points:Measurement_Point_Round-TH_Small (layer F.Cu) (tedit 5A457D71) (tstamp 5A43A0B6)
@@ -1219,66 +1219,66 @@
     (tags "Mesurement Point Round Trough Hole 1.5mm Drill 0.8mm")
     (path /5A43EE7B)
     (attr virtual)
-    (fp_text reference J7 (at 2.032 -0.0635) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+    (fp_text reference PA8 (at 2.032 -0.0635) (layer F.SilkS)
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value TEST_1P (at 0 2) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05))
     (pad 1 thru_hole circle (at 0 0) (size 1.5 1.5) (drill 0.8) (layers *.Cu *.Mask)
-      (net 31 "Net-(J7-Pad1)"))
+      (net 30 "Net-(PA8-Pad1)"))
   )
 
-  (module Measurement_Points:Measurement_Point_Round-TH_Small (layer F.Cu) (tedit 5A457D65) (tstamp 5A43A3E3)
+  (module Measurement_Points:Measurement_Point_Round-TH_Small (layer F.Cu) (tedit 5A45931C) (tstamp 5A43A3E3)
     (at 163.0045 88.392)
     (descr "Mesurement Point, Square, Trough Hole,  DM 1.5mm, Drill 0.8mm,")
     (tags "Mesurement Point Round Trough Hole 1.5mm Drill 0.8mm")
     (path /5A43D49D)
     (attr virtual)
-    (fp_text reference J5 (at 2.2225 0.0635) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+    (fp_text reference PB11 (at 2.4765 0) (layer F.SilkS)
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value TEST_1P (at 0 2) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05))
     (pad 1 thru_hole circle (at 0 0) (size 1.5 1.5) (drill 0.8) (layers *.Cu *.Mask)
-      (net 30 "Net-(J5-Pad1)"))
+      (net 36 "Net-(PB11-Pad1)"))
   )
 
-  (module Measurement_Points:Measurement_Point_Round-TH_Small (layer F.Cu) (tedit 5A457D6D) (tstamp 5A43A3E8)
+  (module Measurement_Points:Measurement_Point_Round-TH_Small (layer F.Cu) (tedit 5A4592FC) (tstamp 5A43A3E8)
     (at 145.796 86.1695)
     (descr "Mesurement Point, Square, Trough Hole,  DM 1.5mm, Drill 0.8mm,")
     (tags "Mesurement Point Round Trough Hole 1.5mm Drill 0.8mm")
     (path /5A43F060)
     (attr virtual)
-    (fp_text reference J8 (at 1.778 -0.127) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+    (fp_text reference PA9 (at 2.032 0) (layer F.SilkS)
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value TEST_1P (at 0 2) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05))
     (pad 1 thru_hole circle (at 0 0) (size 1.5 1.5) (drill 0.8) (layers *.Cu *.Mask)
-      (net 32 "Net-(J8-Pad1)"))
+      (net 31 "Net-(PA9-Pad1)"))
   )
 
-  (module Measurement_Points:Measurement_Point_Round-TH_Small (layer F.Cu) (tedit 5A457D69) (tstamp 5A43A3ED)
+  (module Measurement_Points:Measurement_Point_Round-TH_Small (layer F.Cu) (tedit 5A4592F8) (tstamp 5A43A3ED)
     (at 145.796 88.7095)
     (descr "Mesurement Point, Square, Trough Hole,  DM 1.5mm, Drill 0.8mm,")
     (tags "Mesurement Point Round Trough Hole 1.5mm Drill 0.8mm")
     (path /5A43F0E2)
     (attr virtual)
-    (fp_text reference J9 (at 1.9685 0.127) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+    (fp_text reference PA10 (at 2.3495 0) (layer F.SilkS)
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value TEST_1P (at 0 2) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05))
     (pad 1 thru_hole circle (at 0 0) (size 1.5 1.5) (drill 0.8) (layers *.Cu *.Mask)
-      (net 33 "Net-(J9-Pad1)"))
+      (net 32 "Net-(PA10-Pad1)"))
   )
 
   (module Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm (layer F.Cu) (tedit 5862ED52) (tstamp 5A43BFD3)
@@ -1287,7 +1287,7 @@
     (tags "Through hole pin header THT 1x02 2.54mm single row")
     (path /5A36EBE0)
     (fp_text reference J1 (at 0 -2.39 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value CONN_01X02 (at 0 4.93 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -1317,55 +1317,55 @@
     )
   )
 
-  (module Measurement_Points:Measurement_Point_Round-TH_Small (layer F.Cu) (tedit 5A457D5B) (tstamp 5A43BFD8)
+  (module Measurement_Points:Measurement_Point_Round-TH_Small (layer F.Cu) (tedit 5A459320) (tstamp 5A43BFD8)
     (at 163.0045 95.885 180)
     (descr "Mesurement Point, Square, Trough Hole,  DM 1.5mm, Drill 0.8mm,")
     (tags "Mesurement Point Round Trough Hole 1.5mm Drill 0.8mm")
     (path /5A43D328)
     (attr virtual)
-    (fp_text reference J3 (at -2.032 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+    (fp_text reference PB1 (at -2.286 0 180) (layer F.SilkS)
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value TEST_1P (at 0 2 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05))
     (pad 1 thru_hole circle (at 0 0 180) (size 1.5 1.5) (drill 0.8) (layers *.Cu *.Mask)
-      (net 34 "Net-(J3-Pad1)"))
+      (net 34 "Net-(PB1-Pad1)"))
   )
 
-  (module Measurement_Points:Measurement_Point_Round-TH_Small (layer F.Cu) (tedit 5A457B4A) (tstamp 5A43BFE0)
+  (module Measurement_Points:Measurement_Point_Round-TH_Small (layer F.Cu) (tedit 5A45930F) (tstamp 5A43BFE0)
     (at 158.9405 110.49)
     (descr "Mesurement Point, Square, Trough Hole,  DM 1.5mm, Drill 0.8mm,")
     (tags "Mesurement Point Round Trough Hole 1.5mm Drill 0.8mm")
     (path /5A43FB1F)
     (attr virtual)
-    (fp_text reference J10 (at 2.6035 0.0635) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+    (fp_text reference PA0 (at 2.159 0) (layer F.SilkS)
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value TEST_1P (at 0 2) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05))
     (pad 1 thru_hole circle (at 0 0) (size 1.2 1.2) (drill 0.6) (layers *.Cu *.Mask)
-      (net 35 "Net-(J10-Pad1)"))
+      (net 28 "Net-(PA0-Pad1)"))
   )
 
-  (module Measurement_Points:Measurement_Point_Round-TH_Small (layer F.Cu) (tedit 5A457B3A) (tstamp 5A43BFE5)
+  (module Measurement_Points:Measurement_Point_Round-TH_Small (layer F.Cu) (tedit 5A459312) (tstamp 5A43BFE5)
     (at 158.6865 108.2675)
     (descr "Mesurement Point, Square, Trough Hole,  DM 1.5mm, Drill 0.8mm,")
     (tags "Mesurement Point Round Trough Hole 1.5mm Drill 0.8mm")
     (path /5A43FBC5)
     (attr virtual)
-    (fp_text reference J11 (at 2.54 0) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+    (fp_text reference PA1 (at 2.2225 -0.127) (layer F.SilkS)
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value TEST_1P (at 0 2) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05))
     (pad 1 thru_hole circle (at 0 0) (size 1.2 1.2) (drill 0.6) (layers *.Cu *.Mask)
-      (net 36 "Net-(J11-Pad1)"))
+      (net 29 "Net-(PA1-Pad1)"))
   )
 
   (module Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm (layer F.Cu) (tedit 5A456CA2) (tstamp 5A43C79D)
@@ -1374,7 +1374,7 @@
     (tags "Through hole pin header THT 1x02 2.54mm single row")
     (path /5A0F91B9)
     (fp_text reference JP1 (at 0 -2.39 180) (layer F.SilkS) hide
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value Jumper_NC_Small (at 0 4.93 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -1410,7 +1410,7 @@
     (tags "Through hole pin header THT 1x02 2.54mm single row")
     (path /5A0F9269)
     (fp_text reference JP2 (at 0 -2.39 180) (layer F.SilkS) hide
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value Jumper_NC_Small (at 0 4.93 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -1446,7 +1446,7 @@
     (tags "Through hole pin header THT 1x02 2.54mm single row")
     (path /5A36E60E)
     (fp_text reference JP3 (at 0 -2.39 270) (layer F.SilkS) hide
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value Jumper_NC_Small (at 0 4.93 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -1482,7 +1482,7 @@
     (tags "Through hole socket strip THT 1x06 2.54mm single row")
     (path /59F7E088)
     (fp_text reference P11 (at 0 -2.33 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+      (effects (font (size 0.7 0.7) (thickness 0.12)))
     )
     (fp_text value CONN_01X06 (at 0 15.03 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -1520,16 +1520,19 @@
     )
   )
 
-  (gr_text 3v3 (at 137.541 98.298 90) (layer F.SilkS)
+  (gr_text "<<<<\nFX2LA" (at 174.1805 89.7255 90) (layer F.SilkS)
+    (effects (font (size 0.9 0.9) (thickness 0.12)))
+  )
+  (gr_text 3v3 (at 137.4775 98.4885 90) (layer F.SilkS)
     (effects (font (size 0.7 0.7) (thickness 0.12)))
   )
-  (gr_text SWCLK (at 134.9375 98.425 90) (layer F.SilkS)
+  (gr_text SWCLK (at 135.0645 97.8535 90) (layer F.SilkS)
     (effects (font (size 0.7 0.7) (thickness 0.12)))
   )
   (gr_text GND (at 132.5245 98.425 90) (layer F.SilkS)
     (effects (font (size 0.7 0.7) (thickness 0.12)))
   )
-  (gr_text SWDIO (at 129.921 98.298 90) (layer F.SilkS)
+  (gr_text SWDIO (at 129.921 97.9805 90) (layer F.SilkS)
     (effects (font (size 0.7 0.7) (thickness 0.12)))
   )
   (gr_text nRST (at 127.381 98.3615 90) (layer F.SilkS)
@@ -1539,21 +1542,21 @@
     (effects (font (size 0.7 0.7) (thickness 0.12)))
   )
   (gr_text "I2C PullUps" (at 170.7515 111.76) (layer F.SilkS)
-    (effects (font (size 0.7 0.7) (thickness 0.175)))
+    (effects (font (size 0.7 0.7) (thickness 0.12)))
   )
   (gr_text SCL (at 174.752 118.618 90) (layer F.SilkS)
-    (effects (font (size 0.7 0.7) (thickness 0.175)))
+    (effects (font (size 0.7 0.7) (thickness 0.12)))
   )
   (gr_text SDA (at 166.6875 118.491 90) (layer F.SilkS)
-    (effects (font (size 0.7 0.7) (thickness 0.175)))
+    (effects (font (size 0.7 0.7) (thickness 0.12)))
   )
   (gr_text "3v3 JOIN TGT" (at 139.827 119.1895) (layer F.SilkS)
-    (effects (font (size 0.7 0.7) (thickness 0.175)))
+    (effects (font (size 0.7 0.7) (thickness 0.12)))
   )
-  (gr_text DP (at 137.8585 91.948) (layer F.SilkS)
+  (gr_text DP (at 137.8585 92.0115) (layer F.SilkS)
     (effects (font (size 0.7 0.7) (thickness 0.12)))
   )
-  (gr_text DM (at 137.795 89.154) (layer F.SilkS)
+  (gr_text DM (at 137.8585 89.2175) (layer F.SilkS)
     (effects (font (size 0.7 0.7) (thickness 0.12)))
   )
   (gr_text ESDwat? (at 131.699 90.6145 90) (layer F.SilkS)
@@ -1812,46 +1815,46 @@
   (segment (start 146.558 123.825) (end 146.558 122.309) (width 0.5) (layer F.Cu) (net 27))
   (segment (start 146.558 122.309) (end 145.542 121.293) (width 0.5) (layer F.Cu) (net 27))
   (segment (start 145.542 121.293) (end 145.542 118.999) (width 0.5) (layer F.Cu) (net 27))
-  (segment (start 156.135 101.247) (end 159.8015 101.247) (width 0.25) (layer F.Cu) (net 28))
-  (segment (start 159.8015 101.247) (end 163.0045 98.044) (width 0.25) (layer F.Cu) (net 28) (tstamp 5A43A102))
-  (segment (start 163.0045 91.694) (end 161.7345 92.964) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 161.7345 94.869) (end 161.7345 96.393) (width 0.25) (layer F.Cu) (net 29) (tstamp 5A43A26A))
-  (segment (start 159.333 99.747) (end 156.135 99.747) (width 0.25) (layer F.Cu) (net 29) (tstamp 5A43A174))
-  (segment (start 161.7345 96.393) (end 160.9725 97.155) (width 0.25) (layer F.Cu) (net 29) (tstamp 5A43A15D))
-  (segment (start 160.9725 97.155) (end 160.9725 98.1075) (width 0.25) (layer F.Cu) (net 29) (tstamp 5A43A15F))
-  (segment (start 160.9725 98.1075) (end 159.333 99.747) (width 0.25) (layer F.Cu) (net 29) (tstamp 5A43A166))
-  (segment (start 161.7345 92.964) (end 161.7345 94.869) (width 0.25) (layer F.Cu) (net 29) (tstamp 5A43A2CE))
-  (segment (start 159.071 99.247) (end 156.135 99.247) (width 0.25) (layer F.Cu) (net 30))
-  (segment (start 160.401 97.917) (end 159.071 99.247) (width 0.25) (layer F.Cu) (net 30))
-  (segment (start 160.401 97.028) (end 160.401 97.917) (width 0.25) (layer F.Cu) (net 30) (tstamp 5A43A281))
-  (segment (start 161.163 90.8685) (end 161.163 96.266) (width 0.25) (layer F.Cu) (net 30) (tstamp 5A43A2D7))
-  (segment (start 161.163 90.678) (end 161.163 90.8685) (width 0.25) (layer F.Cu) (net 30) (tstamp 5A43A279))
-  (segment (start 161.163 96.266) (end 160.401 97.028) (width 0.25) (layer F.Cu) (net 30) (tstamp 5A43A27F))
-  (segment (start 161.163 90.2335) (end 161.163 90.678) (width 0.25) (layer F.Cu) (net 30) (tstamp 5A43A2F8))
-  (segment (start 163.0045 88.392) (end 161.163 90.2335) (width 0.25) (layer F.Cu) (net 30))
-  (segment (start 149.987 85.217) (end 148.3995 83.6295) (width 0.25) (layer F.Cu) (net 31))
-  (segment (start 152.535 87.765) (end 149.987 85.217) (width 0.25) (layer F.Cu) (net 31) (tstamp 5A43C2D2))
-  (segment (start 152.535 96.647) (end 152.535 87.765) (width 0.25) (layer F.Cu) (net 31))
-  (segment (start 148.3995 83.6295) (end 145.796 83.6295) (width 0.25) (layer F.Cu) (net 31) (tstamp 5A441C6D))
-  (segment (start 149.9235 86.741) (end 149.352 86.1695) (width 0.25) (layer F.Cu) (net 32))
-  (segment (start 152.035 88.8525) (end 149.9235 86.741) (width 0.25) (layer F.Cu) (net 32) (tstamp 5A43A43C))
-  (segment (start 152.035 96.647) (end 152.035 88.8525) (width 0.25) (layer F.Cu) (net 32))
-  (segment (start 149.352 86.1695) (end 145.796 86.1695) (width 0.25) (layer F.Cu) (net 32) (tstamp 5A441C77))
-  (segment (start 145.796 88.7095) (end 150.114 88.7095) (width 0.25) (layer F.Cu) (net 33))
-  (segment (start 151.535 90.1305) (end 151.535 96.647) (width 0.25) (layer F.Cu) (net 33) (tstamp 5A441C88))
-  (segment (start 150.114 88.7095) (end 151.535 90.1305) (width 0.25) (layer F.Cu) (net 33) (tstamp 5A441C81))
+  (segment (start 153.535 105.347) (end 153.535 106.672) (width 0.25) (layer F.Cu) (net 28))
+  (segment (start 155.5115 107.061) (end 158.9405 110.49) (width 0.25) (layer F.Cu) (net 28) (tstamp 5A43C306))
+  (segment (start 153.924 107.061) (end 155.5115 107.061) (width 0.25) (layer F.Cu) (net 28) (tstamp 5A43C301))
+  (segment (start 153.535 106.672) (end 153.924 107.061) (width 0.25) (layer F.Cu) (net 28) (tstamp 5A43C2FC))
+  (segment (start 154.035 105.347) (end 154.035 106.467998) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 156.972 106.553) (end 158.6865 108.2675) (width 0.25) (layer F.Cu) (net 29) (tstamp 5A43C325))
+  (segment (start 154.120002 106.553) (end 156.972 106.553) (width 0.25) (layer F.Cu) (net 29) (tstamp 5A43C320))
+  (segment (start 154.035 106.467998) (end 154.120002 106.553) (width 0.25) (layer F.Cu) (net 29) (tstamp 5A43C319))
+  (segment (start 149.987 85.217) (end 148.3995 83.6295) (width 0.25) (layer F.Cu) (net 30))
+  (segment (start 152.535 87.765) (end 149.987 85.217) (width 0.25) (layer F.Cu) (net 30) (tstamp 5A43C2D2))
+  (segment (start 152.535 96.647) (end 152.535 87.765) (width 0.25) (layer F.Cu) (net 30))
+  (segment (start 148.3995 83.6295) (end 145.796 83.6295) (width 0.25) (layer F.Cu) (net 30) (tstamp 5A441C6D))
+  (segment (start 149.9235 86.741) (end 149.352 86.1695) (width 0.25) (layer F.Cu) (net 31))
+  (segment (start 152.035 88.8525) (end 149.9235 86.741) (width 0.25) (layer F.Cu) (net 31) (tstamp 5A43A43C))
+  (segment (start 152.035 96.647) (end 152.035 88.8525) (width 0.25) (layer F.Cu) (net 31))
+  (segment (start 149.352 86.1695) (end 145.796 86.1695) (width 0.25) (layer F.Cu) (net 31) (tstamp 5A441C77))
+  (segment (start 145.796 88.7095) (end 150.114 88.7095) (width 0.25) (layer F.Cu) (net 32))
+  (segment (start 151.535 90.1305) (end 151.535 96.647) (width 0.25) (layer F.Cu) (net 32) (tstamp 5A441C88))
+  (segment (start 150.114 88.7095) (end 151.535 90.1305) (width 0.25) (layer F.Cu) (net 32) (tstamp 5A441C81))
+  (segment (start 156.135 101.247) (end 159.8015 101.247) (width 0.25) (layer F.Cu) (net 33))
+  (segment (start 159.8015 101.247) (end 163.0045 98.044) (width 0.25) (layer F.Cu) (net 33) (tstamp 5A43A102))
   (segment (start 161.4805 97.409) (end 163.0045 95.885) (width 0.25) (layer F.Cu) (net 34) (tstamp 5A43A10A))
   (segment (start 161.4805 98.3615) (end 161.4805 97.409) (width 0.25) (layer F.Cu) (net 34) (tstamp 5A43A108))
   (segment (start 159.095 100.747) (end 161.4805 98.3615) (width 0.25) (layer F.Cu) (net 34) (tstamp 5A43A106))
   (segment (start 156.135 100.747) (end 159.095 100.747) (width 0.25) (layer F.Cu) (net 34))
-  (segment (start 153.535 105.347) (end 153.535 106.672) (width 0.25) (layer F.Cu) (net 35))
-  (segment (start 155.5115 107.061) (end 158.9405 110.49) (width 0.25) (layer F.Cu) (net 35) (tstamp 5A43C306))
-  (segment (start 153.924 107.061) (end 155.5115 107.061) (width 0.25) (layer F.Cu) (net 35) (tstamp 5A43C301))
-  (segment (start 153.535 106.672) (end 153.924 107.061) (width 0.25) (layer F.Cu) (net 35) (tstamp 5A43C2FC))
-  (segment (start 154.035 105.347) (end 154.035 106.467998) (width 0.25) (layer F.Cu) (net 36))
-  (segment (start 156.972 106.553) (end 158.6865 108.2675) (width 0.25) (layer F.Cu) (net 36) (tstamp 5A43C325))
-  (segment (start 154.120002 106.553) (end 156.972 106.553) (width 0.25) (layer F.Cu) (net 36) (tstamp 5A43C320))
-  (segment (start 154.035 106.467998) (end 154.120002 106.553) (width 0.25) (layer F.Cu) (net 36) (tstamp 5A43C319))
+  (segment (start 163.0045 91.694) (end 161.7345 92.964) (width 0.25) (layer F.Cu) (net 35))
+  (segment (start 161.7345 94.869) (end 161.7345 96.393) (width 0.25) (layer F.Cu) (net 35) (tstamp 5A43A26A))
+  (segment (start 159.333 99.747) (end 156.135 99.747) (width 0.25) (layer F.Cu) (net 35) (tstamp 5A43A174))
+  (segment (start 161.7345 96.393) (end 160.9725 97.155) (width 0.25) (layer F.Cu) (net 35) (tstamp 5A43A15D))
+  (segment (start 160.9725 97.155) (end 160.9725 98.1075) (width 0.25) (layer F.Cu) (net 35) (tstamp 5A43A15F))
+  (segment (start 160.9725 98.1075) (end 159.333 99.747) (width 0.25) (layer F.Cu) (net 35) (tstamp 5A43A166))
+  (segment (start 161.7345 92.964) (end 161.7345 94.869) (width 0.25) (layer F.Cu) (net 35) (tstamp 5A43A2CE))
+  (segment (start 159.071 99.247) (end 156.135 99.247) (width 0.25) (layer F.Cu) (net 36))
+  (segment (start 160.401 97.917) (end 159.071 99.247) (width 0.25) (layer F.Cu) (net 36))
+  (segment (start 160.401 97.028) (end 160.401 97.917) (width 0.25) (layer F.Cu) (net 36) (tstamp 5A43A281))
+  (segment (start 161.163 90.8685) (end 161.163 96.266) (width 0.25) (layer F.Cu) (net 36) (tstamp 5A43A2D7))
+  (segment (start 161.163 90.678) (end 161.163 90.8685) (width 0.25) (layer F.Cu) (net 36) (tstamp 5A43A279))
+  (segment (start 161.163 96.266) (end 160.401 97.028) (width 0.25) (layer F.Cu) (net 36) (tstamp 5A43A27F))
+  (segment (start 161.163 90.2335) (end 161.163 90.678) (width 0.25) (layer F.Cu) (net 36) (tstamp 5A43A2F8))
+  (segment (start 163.0045 88.392) (end 161.163 90.2335) (width 0.25) (layer F.Cu) (net 36))
 
   (zone (net 2) (net_name GND) (layer B.Cu) (tstamp 5A1C824E) (hatch edge 0.508)
     (connect_pads (clearance 0.508))
diff --git a/hw1/hw1.net b/hw1/hw1.net
index cdd83ae..9f4dd5c 100644
--- a/hw1/hw1.net
+++ b/hw1/hw1.net
@@ -1,7 +1,7 @@
 (export (version D)
   (design
     (source /home/karlp/src/libopencm3-tests/hw1/hw1.sch)
-    (date "Wed 27 Dec 2017 04:42:50 PM GMT")
+    (date "Thu 28 Dec 2017 11:34:16 PM GMT")
     (tool "Eeschema 4.0.6")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
@@ -171,55 +171,55 @@
       (libsource (lib conn) (part CONN_01X02))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A36EBE0))
-    (comp (ref J2)
+    (comp (ref PB0)
       (value TEST_1P)
       (footprint Measurement_Points:Measurement_Point_Round-TH_Small)
       (libsource (lib conn) (part TEST_1P))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A43D04F))
-    (comp (ref J3)
+    (comp (ref PB1)
       (value TEST_1P)
       (footprint Measurement_Points:Measurement_Point_Round-TH_Small)
       (libsource (lib conn) (part TEST_1P))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A43D328))
-    (comp (ref J4)
+    (comp (ref PB10)
       (value TEST_1P)
       (footprint Measurement_Points:Measurement_Point_Round-TH_Small)
       (libsource (lib conn) (part TEST_1P))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A43D40B))
-    (comp (ref J5)
+    (comp (ref PB11)
       (value TEST_1P)
       (footprint Measurement_Points:Measurement_Point_Round-TH_Small)
       (libsource (lib conn) (part TEST_1P))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A43D49D))
-    (comp (ref J7)
+    (comp (ref PA8)
       (value TEST_1P)
       (footprint Measurement_Points:Measurement_Point_Round-TH_Small)
       (libsource (lib conn) (part TEST_1P))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A43EE7B))
-    (comp (ref J8)
+    (comp (ref PA9)
       (value TEST_1P)
       (footprint Measurement_Points:Measurement_Point_Round-TH_Small)
       (libsource (lib conn) (part TEST_1P))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A43F060))
-    (comp (ref J9)
+    (comp (ref PA10)
       (value TEST_1P)
       (footprint Measurement_Points:Measurement_Point_Round-TH_Small)
       (libsource (lib conn) (part TEST_1P))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A43F0E2))
-    (comp (ref J10)
+    (comp (ref PA0)
       (value TEST_1P)
       (footprint Measurement_Points:Measurement_Point_Round-TH_Small)
       (libsource (lib conn) (part TEST_1P))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A43FB1F))
-    (comp (ref J11)
+    (comp (ref PA1)
       (value TEST_1P)
       (footprint Measurement_Points:Measurement_Point_Round-TH_Small)
       (libsource (lib conn) (part TEST_1P))
@@ -454,16 +454,16 @@
         (pin (num 5) (name GND) (type power_in))
         (pin (num 6) (name shield) (type passive)))))
   (libraries
-    (library (logical hw1-rescue)
-      (uri /home/karlp/src/libopencm3-tests/hw1/hw1-rescue.lib))
     (library (logical device)
       (uri /usr/share/kicad/library/device.lib))
+    (library (logical hw1-rescue)
+      (uri /home/karlp/src/libopencm3-tests/hw1/hw1-rescue.lib))
     (library (logical conn)
       (uri /usr/share/kicad/library/conn.lib))
-    (library (logical karlp-klibs)
-      (uri /home/karlp/src/libopencm3-tests/hw1/karlp-klibs.lib))
     (library (logical stm32)
-      (uri /usr/share/kicad/library/stm32.lib)))
+      (uri /usr/share/kicad/library/stm32.lib))
+    (library (logical karlp-klibs)
+      (uri /home/karlp/src/libopencm3-tests/hw1/karlp-klibs.lib)))
   (nets
     (net (code 1) (name "Net-(U2-Pad4)")
       (node (ref U2) (pin 4)))
@@ -541,40 +541,40 @@
       (node (ref U1) (pin 6))
       (node (ref Y1) (pin 3))
       (node (ref C10) (pin 1)))
-    (net (code 26) (name "Net-(J5-Pad1)")
+    (net (code 26) (name "Net-(PB11-Pad1)")
       (node (ref U1) (pin 22))
-      (node (ref J5) (pin 1)))
+      (node (ref PB11) (pin 1)))
     (net (code 27) (name "Net-(U1-Pad20)")
       (node (ref U1) (pin 20)))
     (net (code 28) (name /VLCD)
       (node (ref U1) (pin 1))
       (node (ref C6) (pin 2)))
-    (net (code 29) (name "Net-(J11-Pad1)")
-      (node (ref J11) (pin 1))
+    (net (code 29) (name "Net-(PA1-Pad1)")
+      (node (ref PA1) (pin 1))
       (node (ref U1) (pin 11)))
-    (net (code 30) (name "Net-(J10-Pad1)")
+    (net (code 30) (name "Net-(PA0-Pad1)")
       (node (ref U1) (pin 10))
-      (node (ref J10) (pin 1)))
-    (net (code 31) (name "Net-(J9-Pad1)")
-      (node (ref J9) (pin 1))
+      (node (ref PA0) (pin 1)))
+    (net (code 31) (name "Net-(PA10-Pad1)")
+      (node (ref PA10) (pin 1))
       (node (ref U1) (pin 31)))
-    (net (code 32) (name "Net-(J8-Pad1)")
-      (node (ref J8) (pin 1))
+    (net (code 32) (name "Net-(PA9-Pad1)")
+      (node (ref PA9) (pin 1))
       (node (ref U1) (pin 30)))
-    (net (code 33) (name "Net-(J7-Pad1)")
+    (net (code 33) (name "Net-(PA8-Pad1)")
       (node (ref U1) (pin 29))
-      (node (ref J7) (pin 1)))
+      (node (ref PA8) (pin 1)))
     (net (code 34) (name "Net-(Y1-Pad4)")
       (node (ref Y1) (pin 4)))
-    (net (code 35) (name "Net-(J4-Pad1)")
+    (net (code 35) (name "Net-(PB10-Pad1)")
       (node (ref U1) (pin 21))
-      (node (ref J4) (pin 1)))
-    (net (code 36) (name "Net-(J3-Pad1)")
+      (node (ref PB10) (pin 1)))
+    (net (code 36) (name "Net-(PB1-Pad1)")
       (node (ref U1) (pin 19))
-      (node (ref J3) (pin 1)))
-    (net (code 37) (name "Net-(J2-Pad1)")
+      (node (ref PB1) (pin 1)))
+    (net (code 37) (name "Net-(PB0-Pad1)")
       (node (ref U1) (pin 18))
-      (node (ref J2) (pin 1)))
+      (node (ref PB0) (pin 1)))
     (net (code 38) (name "Net-(P3-Pad9)")
       (node (ref P3) (pin 9)))
     (net (code 39) (name "Net-(P3-Pad10)")
diff --git a/hw1/hw1.sch b/hw1/hw1.sch
index 8776988..a8106cd 100644
--- a/hw1/hw1.sch
+++ b/hw1/hw1.sch
@@ -1013,10 +1013,10 @@ F 3 "" H 2200 4600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L TEST_1P J2
+L TEST_1P PB0
 U 1 1 5A43D04F
 P 2500 5700
-F 0 "J2" H 2500 5970 50  0000 C CNN
+F 0 "PB0" H 2500 5970 50  0000 C CNN
 F 1 "TEST_1P" H 2500 5900 50  0000 C CNN
 F 2 "Measurement_Points:Measurement_Point_Round-TH_Small" H 2700 5700 50  0001 C CNN
 F 3 "" H 2700 5700 50  0001 C CNN
@@ -1024,10 +1024,10 @@ F 3 "" H 2700 5700 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L TEST_1P J3
+L TEST_1P PB1
 U 1 1 5A43D328
 P 2300 5800
-F 0 "J3" H 2300 6070 50  0000 C CNN
+F 0 "PB1" H 2300 6070 50  0000 C CNN
 F 1 "TEST_1P" H 2300 6000 50  0000 C CNN
 F 2 "Measurement_Points:Measurement_Point_Round-TH_Small" H 2500 5800 50  0001 C CNN
 F 3 "" H 2500 5800 50  0001 C CNN
@@ -1035,10 +1035,10 @@ F 3 "" H 2500 5800 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L TEST_1P J4
+L TEST_1P PB10
 U 1 1 5A43D40B
 P 2250 6700
-F 0 "J4" H 2250 6970 50  0000 C CNN
+F 0 "PB10" H 2250 6970 50  0000 C CNN
 F 1 "TEST_1P" H 2250 6900 50  0000 C CNN
 F 2 "Measurement_Points:Measurement_Point_Round-TH_Small" H 2450 6700 50  0001 C CNN
 F 3 "" H 2450 6700 50  0001 C CNN
@@ -1046,10 +1046,10 @@ F 3 "" H 2450 6700 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L TEST_1P J5
+L TEST_1P PB11
 U 1 1 5A43D49D
 P 2100 6800
-F 0 "J5" H 2100 7070 50  0000 C CNN
+F 0 "PB11" H 2100 7070 50  0000 C CNN
 F 1 "TEST_1P" H 2100 7000 50  0000 C CNN
 F 2 "Measurement_Points:Measurement_Point_Round-TH_Small" H 2300 6800 50  0001 C CNN
 F 3 "" H 2300 6800 50  0001 C CNN
@@ -1065,10 +1065,10 @@ Wire Wire Line
 Wire Wire Line
 	2550 6800 2100 6800
 $Comp
-L TEST_1P J7
+L TEST_1P PA8
 U 1 1 5A43EE7B
 P 10100 6500
-F 0 "J7" H 10100 6770 50  0000 C CNN
+F 0 "PA8" H 10100 6770 50  0000 C CNN
 F 1 "TEST_1P" H 10100 6700 50  0000 C CNN
 F 2 "Measurement_Points:Measurement_Point_Round-TH_Small" H 10300 6500 50  0001 C CNN
 F 3 "" H 10300 6500 50  0001 C CNN
@@ -1076,10 +1076,10 @@ F 3 "" H 10300 6500 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L TEST_1P J8
+L TEST_1P PA9
 U 1 1 5A43F060
 P 10250 6600
-F 0 "J8" H 10250 6870 50  0000 C CNN
+F 0 "PA9" H 10250 6870 50  0000 C CNN
 F 1 "TEST_1P" H 10250 6800 50  0000 C CNN
 F 2 "Measurement_Points:Measurement_Point_Round-TH_Small" H 10450 6600 50  0001 C CNN
 F 3 "" H 10450 6600 50  0001 C CNN
@@ -1087,10 +1087,10 @@ F 3 "" H 10450 6600 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L TEST_1P J9
+L TEST_1P PA10
 U 1 1 5A43F0E2
 P 10400 6700
-F 0 "J9" H 10400 6970 50  0000 C CNN
+F 0 "PA10" H 10400 6970 50  0000 C CNN
 F 1 "TEST_1P" H 10400 6900 50  0000 C CNN
 F 2 "Measurement_Points:Measurement_Point_Round-TH_Small" H 10600 6700 50  0001 C CNN
 F 3 "" H 10600 6700 50  0001 C CNN
@@ -1104,10 +1104,10 @@ Wire Wire Line
 Wire Wire Line
 	9750 6700 10400 6700
 $Comp
-L TEST_1P J10
+L TEST_1P PA0
 U 1 1 5A43FB1F
 P 10300 5700
-F 0 "J10" H 10300 5970 50  0000 C CNN
+F 0 "PA0" H 10300 5970 50  0000 C CNN
 F 1 "TEST_1P" H 10300 5900 50  0000 C CNN
 F 2 "Measurement_Points:Measurement_Point_Round-TH_Small" H 10500 5700 50  0001 C CNN
 F 3 "" H 10500 5700 50  0001 C CNN
@@ -1115,10 +1115,10 @@ F 3 "" H 10500 5700 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L TEST_1P J11
+L TEST_1P PA1
 U 1 1 5A43FBC5
 P 10500 5800
-F 0 "J11" H 10500 6070 50  0000 C CNN
+F 0 "PA1" H 10500 6070 50  0000 C CNN
 F 1 "TEST_1P" H 10500 6000 50  0000 C CNN
 F 2 "Measurement_Points:Measurement_Point_Round-TH_Small" H 10700 5800 50  0001 C CNN
 F 3 "" H 10700 5800 50  0001 C CNN
@@ -1134,4 +1134,6 @@ no need for rtc\nthis is the host board
 Wire Wire Line
 	2550 4800 1350 4800
 NoConn ~ 2550 5900
+Text Notes 10900 5750 0    60   ~ 0
+TODO Jumper RTS/CTS over to I2C on fx2 port?
 $EndSCHEMATC