Added pcb.io compatibility, made X1 (Y1) easier to hand-solder, rerou…

…ted trace

hardware/fp-info-cache

@@ -1,4 +1,4 @@
-19085488119964766
+19087092057684611
 AI03 Keyswitches
 ALPS-1.5U
 
@@ -50683,6 +50683,13 @@ Custom Parts
 Switch_TSTPHWM_6.2x6.2
 
 
+0
+4
+2
+Custom Parts
+Switch_Tactile_SPST_Angled_MJTP1117
+tactile switch SPST right angle, PTS645VL39-2 LFS
+tactile switch SPST angled PTS645VL39-2 LFS C&K Button
 0
 4
 2
@@ -50715,28 +50722,28 @@ TRRS_MidMount_SJ2-35355A-SMT-TR
 6
 4
 Custom Parts
-USB_C-C168688
+USB-C_C168688
 
 
 0
-16
-11
+30
+9
 Custom Parts
-USB_C_MidMount_Receptacle_Power_Only
+USB-C_MidMount_Receptacle_Power_Only
 
 
 0
 10
 7
 Custom Parts
-USB_C_Receptacle_Power_Only
+USB-C_Receptacle_Power_Only
 USB Type-C receptacle for USB 2.0 and PD, http://www.krhro.com/uploads/soft/180320/1-1P320120243.pdf
 usb usb-c 2.0 pd
 0
 10
 7
 Custom Parts
-USB_C_USB_312
+USB-C_USB_312
 http://www.palpilot.com/wp-content/uploads/2017/05/UTC027-GKN-OR-Rev-A.pdf
 USB C Type-C Receptacle USB2.0
 0
@@ -84042,11 +84049,11 @@ E73-2G4M08S1C-52840
 43
 43
 nrfmicro
-USB-C-C168688
+USB-C_C168688
 
 
 0
-16
+30
 11
 nrfmicro
 connector_bat

hardware/nrfmicro.pretty/USB-C_C168688.kicad_mod

@@ -0,0 +1,63 @@
+(module USB-C_C168688 (layer F.Cu) (tedit 5F83BA86)
+  (attr smd)
+  (fp_text reference J2 (at 0 5.78866) (layer F.SilkS) hide
+    (effects (font (size 0.75 0.75) (thickness 0.1)))
+  )
+  (fp_text value "USB-C USB 2.0 MC-372" (at 0 -0.5) (layer F.Fab)
+    (effects (font (size 0.75 0.75) (thickness 0.1)))
+  )
+  (fp_line (start -4.525 0) (end -4.525 6.6) (layer Dwgs.User) (width 0.12))
+  (fp_line (start 4.525 0) (end 4.525 6.6) (layer Dwgs.User) (width 0.12))
+  (fp_line (start -4.525 6.6) (end 4.525 6.6) (layer Dwgs.User) (width 0.12))
+  (fp_line (start -4.525 0) (end 4.525 0) (layer Dwgs.User) (width 0.12))
+  (fp_text user CUT (at 0 2.2) (layer Dwgs.User)
+    (effects (font (size 0.75 0.75) (thickness 0.1)))
+  )
+  (pad B5 smd rect (at -1.75 7) (size 0.3 0.8) (layers F.Cu F.Paste F.Mask)
+    (clearance 0.15))
+  (pad A5 smd rect (at 1.25 7) (size 0.3 0.8) (layers F.Cu F.Paste F.Mask)
+    (clearance 0.15))
+  (pad A6 smd rect (at 0.25 7) (size 0.3 0.8) (layers F.Cu F.Paste F.Mask)
+    (clearance 0.15))
+  (pad A7 smd rect (at -0.25 7) (size 0.3 0.8) (layers F.Cu F.Paste F.Mask)
+    (clearance 0.15))
+  (pad B7 smd rect (at 0.75 7) (size 0.3 0.8) (layers F.Cu F.Paste F.Mask)
+    (clearance 0.15))
+  (pad B6 smd rect (at -0.75 7) (size 0.3 0.8) (layers F.Cu F.Paste F.Mask)
+    (clearance 0.15))
+  (pad A4 smd rect (at -2.4 7) (size 0.54 0.8) (layers F.Cu F.Paste F.Mask)
+    (clearance 0.15))
+  (pad A4 smd rect (at 2.4 7) (size 0.54 0.8) (layers F.Cu F.Paste F.Mask)
+    (clearance 0.15))
+  (pad A1 smd rect (at 3.2 7) (size 0.54 0.8) (layers F.Cu F.Paste F.Mask)
+    (clearance 0.15))
+  (pad A1 smd rect (at -3.2 7) (size 0.54 0.8) (layers F.Cu F.Paste F.Mask)
+    (clearance 0.15))
+  (pad S1 thru_hole circle (at -5.5753 6.2357) (size 1 1) (drill 0.6) (layers *.Cu *.Mask))
+  (pad S1 thru_hole circle (at -5.575 5.719) (size 1 1) (drill 0.6) (layers *.Cu *.Mask))
+  (pad S1 thru_hole circle (at -5.575 6.481) (size 1 1) (drill 0.6) (layers *.Cu *.Mask))
+  (pad S1 thru_hole circle (at -5.575 5.9817) (size 1 1) (drill 0.6) (layers *.Cu *.Mask))
+  (pad S1 thru_hole circle (at 5.5756 5.9817) (size 1 1) (drill 0.6) (layers *.Cu *.Mask))
+  (pad S1 thru_hole circle (at 5.5756 6.481) (size 1 1) (drill 0.6) (layers *.Cu *.Mask))
+  (pad S1 thru_hole circle (at 5.5756 5.719) (size 1 1) (drill 0.6) (layers *.Cu *.Mask))
+  (pad S1 thru_hole circle (at 5.5753 6.2357) (size 1 1) (drill 0.6) (layers *.Cu *.Mask))
+  (pad S1 thru_hole circle (at 5.5753 2.413) (size 1 1) (drill 0.6) (layers *.Cu *.Mask))
+  (pad S1 thru_hole circle (at 5.5753 2.7051) (size 1 1) (drill 0.6) (layers *.Cu *.Mask))
+  (pad S1 thru_hole circle (at 5.575 1.4859) (size 1 1) (drill 0.6) (layers *.Cu *.Mask))
+  (pad S1 thru_hole circle (at 5.5753 1.7653) (size 1 1) (drill 0.6) (layers *.Cu *.Mask))
+  (pad S1 thru_hole circle (at 5.5753 2.0701) (size 1 1) (drill 0.6) (layers *.Cu *.Mask))
+  (pad S1 thru_hole circle (at -5.5753 2.6924) (size 1 1) (drill 0.6) (layers *.Cu *.Mask))
+  (pad S1 thru_hole circle (at -5.5753 2.4003) (size 1 1) (drill 0.6) (layers *.Cu *.Mask))
+  (pad S1 thru_hole circle (at -5.5753 2.0574) (size 1 1) (drill 0.6) (layers *.Cu *.Mask))
+  (pad S1 thru_hole circle (at -5.5753 1.7526) (size 1 1) (drill 0.6) (layers *.Cu *.Mask))
+  (pad S1 thru_hole circle (at -5.5756 1.4732) (size 1 1) (drill 0.6) (layers *.Cu *.Mask))
+  (pad A8 smd rect (at -1.25 7) (size 0.3 0.8) (layers F.Cu F.Paste F.Mask)
+    (clearance 0.15))
+  (pad B8 smd rect (at 1.758 7) (size 0.3 0.8) (layers F.Cu F.Paste F.Mask)
+    (clearance 0.15))
+  (model ${KIPRJMOD}/nrfmicro.pretty/3d/USB-C-C168688.step
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 180))
+  )
+)

hardware/nrfmicro.sch

@@ -239,7 +239,7 @@ U 1 1 5C743564
 P 9875 1800
 F 0 "J1" H 9875 2625 50  0000 C CNN
 F 1 "USB-C Conn" H 9875 2550 50  0000 C CNN
-F 2 "nrfmicro:USB-C-C168688" H 9982 2575 50  0001 C CNN
+F 2 "nrfmicro:USB-C_C168688" H 9982 2575 50  0001 C CNN
 F 3 "https://www.usb.org/sites/default/files/documents/usb_type-c.zip" H 10025 1800 50  0001 C CNN
 	1    9875 1800
 	1    0    0    -1  
@@ -848,10 +848,10 @@ Wire Wire Line
 Text GLabel 8325 750  0    60   Input ~ 0
 nRF_VDD
 $Comp
-L Device:Crystal_Small Y1
+L Device:Crystal_Small X1
 U 1 1 5F764467
 P 1300 2150
-F 0 "Y1" V 1350 1800 50  0000 L CNN
+F 0 "X1" V 1350 1800 50  0000 L CNN
 F 1 "32.768kHz" V 1250 1650 50  0000 L CNN
 F 2 "Crystal:Crystal_SMD_MicroCrystal_CM9V-T1A-2Pin_1.6x1.0mm" H 1300 2150 50  0001 C CNN
 F 3 "~" H 1300 2150 50  0001 C CNN

hardware/nrfmicro.sch-bak

@@ -182,8 +182,6 @@ F 3 "~" H 8525 850 50  0001 C CNN
 $EndComp
 Text GLabel 3000 2950 2    60   Input ~ 0
 DCCH
-Text GLabel 3000 3150 2    60   Input ~ 0
-VDDH
 Text Label 1650 2750 2    60   ~ 0
 P0.04
 Text GLabel 10475 1800 2    60   Input ~ 0
@@ -241,7 +239,7 @@ U 1 1 5C743564
 P 9875 1800
 F 0 "J1" H 9875 2625 50  0000 C CNN
 F 1 "USB-C Conn" H 9875 2550 50  0000 C CNN
-F 2 "nrfmicro:USB-C-C168688" H 9982 2575 50  0001 C CNN
+F 2 "nrfmicro:USB-C_C168688" H 9982 2575 50  0001 C CNN
 F 3 "https://www.usb.org/sites/default/files/documents/usb_type-c.zip" H 10025 1800 50  0001 C CNN
 	1    9875 1800
 	1    0    0    -1  
@@ -710,18 +708,16 @@ Wire Wire Line
 $Comp
 L power:GND #PWR0108
 U 1 1 5F8195E6
-P 3375 3100
-F 0 "#PWR0108" H 3375 2850 50  0001 C CNN
-F 1 "GND" H 3380 2927 50  0000 C CNN
-F 2 "" H 3375 3100 50  0001 C CNN
-F 3 "" H 3375 3100 50  0001 C CNN
-	1    3375 3100
+P 3525 3100
+F 0 "#PWR0108" H 3525 2850 50  0001 C CNN
+F 1 "GND" H 3530 2927 50  0000 C CNN
+F 2 "" H 3525 3100 50  0001 C CNN
+F 3 "" H 3525 3100 50  0001 C CNN
+	1    3525 3100
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3375 3100 3375 3050
-Wire Wire Line
-	3000 3050 3375 3050
+	3525 3100 3525 3050
 $Comp
 L power:GND #PWR0109
 U 1 1 5F81C075
@@ -866,4 +862,8 @@ Wire Wire Line
 	1300 2050 1650 2050
 Wire Wire Line
 	1650 2250 1300 2250
+Text GLabel 3000 3150 2    60   Input ~ 0
+nRF_VDD
+Wire Wire Line
+	3000 3050 3525 3050
 $EndSCHEMATC