summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
Diffstat (limited to 'hw')
-rw-r--r--hw/ants.sch188
-rw-r--r--hw/b2b.sch136
-rw-r--r--hw/battery.sch146
-rw-r--r--hw/bbcam.sch16
-rw-r--r--hw/bbcpu.sch40
-rw-r--r--hw/bbdisp.sch20
-rw-r--r--hw/bob.sch86
-rw-r--r--hw/cams.sch120
-rw-r--r--hw/charger.sch56
-rw-r--r--hw/codec.sch264
-rw-r--r--hw/display.sch322
-rw-r--r--hw/hb.sch204
-rw-r--r--hw/ir.sch116
-rw-r--r--hw/jack.sch288
-rw-r--r--hw/keys.sch188
-rw-r--r--hw/leds.sch224
-rw-r--r--hw/misc.sch52
-rw-r--r--hw/modem.sch416
-rw-r--r--hw/modempwr.sch156
-rw-r--r--hw/nfc.sch132
-rw-r--r--hw/sensors.sch80
-rw-r--r--hw/sims.sch176
-rw-r--r--hw/v2.sch20
-rw-r--r--hw/wlan.sch176
24 files changed, 1803 insertions, 1819 deletions
diff --git a/hw/ants.sch b/hw/ants.sch
index a03c68c..f7382fd 100644
--- a/hw/ants.sch
+++ b/hw/ants.sch
@@ -67,10 +67,10 @@ Text Notes 7000 5100 0 70 ~ 0
Text Notes 7000 2750 2 120 ~ 0
GPS kill
$Comp
-L C0402 C801
+L C0402 C702
U 1 1 578B947C
P 4100 2850
-F 0 "C801" H 4140 2890 50 0000 L CNN
+F 0 "C702" H 4140 2890 50 0000 L CNN
F 1 "1n" H 4140 2720 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 4130 3000 20 0001 C CNN
F 3 "" H 4100 2850 60 0001 C CNN
@@ -78,10 +78,10 @@ F 3 "" H 4100 2850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C802
+L C0402 C701
U 1 1 578B9544
P 3100 4800
-F 0 "C802" V 3150 4500 50 0000 L CNN
+F 0 "C701" V 3150 4500 50 0000 L CNN
F 1 "DNP" V 3050 4550 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 3130 4950 20 0001 C CNN
F 3 "" H 3100 4800 60 0001 C CNN
@@ -89,10 +89,10 @@ F 3 "" H 3100 4800 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C804
+L C0402 C707
U 1 1 578B96D4
P 7450 6600
-F 0 "C804" H 7490 6640 50 0000 L CNN
+F 0 "C707" H 7490 6640 50 0000 L CNN
F 1 "1n" H 7490 6470 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 7480 6750 20 0001 C CNN
F 3 "" H 7450 6600 60 0001 C CNN
@@ -100,10 +100,10 @@ F 3 "" H 7450 6600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C805
+L C0402 C704
U 1 1 578B979C
P 6800 6600
-F 0 "C805" H 6840 6640 50 0000 L CNN
+F 0 "C704" H 6840 6640 50 0000 L CNN
F 1 "15p" H 6840 6470 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 6830 6750 20 0001 C CNN
F 3 "" H 6800 6600 60 0001 C CNN
@@ -111,10 +111,10 @@ F 3 "" H 6800 6600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C806
+L C0402 C705
U 1 1 578B9864
P 7100 6600
-F 0 "C806" H 7140 6640 50 0000 L CNN
+F 0 "C705" H 7140 6640 50 0000 L CNN
F 1 "100n" H 7140 6470 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 7130 6750 20 0001 C CNN
F 3 "" H 7100 6600 60 0001 C CNN
@@ -122,10 +122,10 @@ F 3 "" H 7100 6600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C807
+L C0402 C706
U 1 1 578B992C
P 7200 7550
-F 0 "C807" H 7240 7590 50 0000 L CNN
+F 0 "C706" H 7240 7590 50 0000 L CNN
F 1 "1n" H 7240 7420 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 7230 7700 20 0001 C CNN
F 3 "" H 7200 7550 60 0001 C CNN
@@ -133,10 +133,10 @@ F 3 "" H 7200 7550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C810
+L C0402 C703
U 1 1 578B9B84
P 6400 7950
-F 0 "C810" H 6440 7990 50 0000 L CNN
+F 0 "C703" H 6440 7990 50 0000 L CNN
F 1 "15p" H 6440 7820 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 6430 8100 20 0001 C CNN
F 3 "" H 6400 7950 60 0001 C CNN
@@ -144,10 +144,10 @@ F 3 "" H 6400 7950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L CONNECT-POINTN900-A P802
+L CONNECT-POINTN900-A P701
U 1 1 578B9EA4
P 1500 3150
-F 0 "P802" H 1500 3250 60 0000 C CNN
+F 0 "P701" H 1500 3250 60 0000 C CNN
F 1 "GNSS_RF" H 1600 3150 50 0000 L CNN
F 2 "neo900-legacy:N900-SPRING-A" H 1490 2940 65 0001 L TNN
F 3 "" H 1500 3150 60 0001 C CNN
@@ -155,10 +155,10 @@ F 3 "" H 1500 3150 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L CONNECT-POINTN900-A P803
+L CONNECT-POINTN900-A P702
U 1 1 578B9F6C
P 1500 3450
-F 0 "P803" H 1500 3550 60 0000 C CNN
+F 0 "P702" H 1500 3550 60 0000 C CNN
F 1 "GNSS_GND" H 1600 3450 50 0000 L CNN
F 2 "neo900-legacy:N900-SPRING-A" H 1490 3240 65 0001 L TNN
F 3 "" H 1500 3450 60 0001 C CNN
@@ -166,10 +166,10 @@ F 3 "" H 1500 3450 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L L0402 L801
+L L0402 L703
U 1 1 578BA034
P 3200 2550
-F 0 "L801" V 3142 2400 50 0000 L BNN
+F 0 "L703" V 3142 2400 50 0000 L BNN
F 1 "8n2;LQW15AN8N2G00D" V 3300 1450 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 3190 2340 65 0001 L TNN
F 3 "" H 3200 2550 60 0001 C CNN
@@ -177,10 +177,10 @@ F 3 "" H 3200 2550 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L L0402 L802
+L L0402 L701
U 1 1 578BA0FC
P 2500 3500
-F 0 "L802" V 2441 3350 50 0000 L BNN
+F 0 "L701" V 2441 3350 50 0000 L BNN
F 1 "DNP" V 2630 3350 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 2490 3290 65 0001 L TNN
F 3 "" H 2500 3500 60 0001 C CNN
@@ -188,10 +188,10 @@ F 3 "" H 2500 3500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L L0402 L803
+L L0402 L702
U 1 1 578BA1C4
P 2800 5500
-F 0 "L803" V 2741 5350 50 0000 L BNN
+F 0 "L702" V 2741 5350 50 0000 L BNN
F 1 "DNP" V 2930 5350 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 2790 5290 65 0001 L TNN
F 3 "" H 2800 5500 60 0001 C CNN
@@ -199,10 +199,10 @@ F 3 "" H 2800 5500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L L0402 L804
+L L0402 L704
U 1 1 578BA28C
P 3600 5500
-F 0 "L804" V 3541 5350 50 0000 L BNN
+F 0 "L704" V 3541 5350 50 0000 L BNN
F 1 "DNP" V 3730 5350 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 3590 5290 65 0001 L TNN
F 3 "" H 3600 5500 60 0001 C CNN
@@ -210,10 +210,10 @@ F 3 "" H 3600 5500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R801
+L R0402 R703
U 1 1 578BA674
P 3800 1600
-F 0 "R801" H 3670 1660 50 0000 L BNN
+F 0 "R703" H 3670 1660 50 0000 L BNN
F 1 "100k" H 3800 1600 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 3830 1750 20 0001 C CNN
F 3 "" H 3800 1600 60 0001 C CNN
@@ -221,10 +221,10 @@ F 3 "" H 3800 1600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R803
+L R0402 R701
U 1 1 578BA804
P 1800 2400
-F 0 "R803" H 1670 2460 50 0000 L BNN
+F 0 "R701" H 1670 2460 50 0000 L BNN
F 1 "0" H 1800 2400 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 1830 2550 20 0001 C CNN
F 3 "" H 1800 2400 60 0001 C CNN
@@ -232,10 +232,10 @@ F 3 "" H 1800 2400 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R805
+L R0402 R702
U 1 1 578BA994
P 3200 5200
-F 0 "R805" H 3070 5260 50 0000 L BNN
+F 0 "R702" H 3070 5260 50 0000 L BNN
F 1 "0" H 3200 5200 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 3230 5350 20 0001 C CNN
F 3 "" H 3200 5200 60 0001 C CNN
@@ -243,10 +243,10 @@ F 3 "" H 3200 5200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R806
+L R0402 R707
U 1 1 578BAA5C
P 7000 6000
-F 0 "R806" H 6870 6060 50 0000 L BNN
+F 0 "R707" H 6870 6060 50 0000 L BNN
F 1 "10k" H 7000 6000 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 7030 6150 20 0001 C CNN
F 3 "" H 7000 6000 60 0001 C CNN
@@ -254,10 +254,10 @@ F 3 "" H 7000 6000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R807
+L R0402 R706
U 1 1 578BAB24
P 6900 7350
-F 0 "R807" H 6770 7410 50 0000 L BNN
+F 0 "R706" H 6770 7410 50 0000 L BNN
F 1 "10k" H 6900 7350 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 6930 7500 20 0001 C CNN
F 3 "" H 6900 7350 60 0001 C CNN
@@ -430,10 +430,10 @@ F 3 "" H 6400 8350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L PE2459 U802
+L PE2459 U705
U 1 1 578BBA60
P 6900 3350
-F 0 "U802" H 7300 3000 50 0000 R CNN
+F 0 "U705" H 7300 3000 50 0000 R CNN
F 1 "PE4259" H 6900 3700 50 0000 C CNN
F 2 "neo900-legacy:SC70-6" H 6930 3500 20 0001 C CNN
F 3 "" H 6900 3350 60 0001 C CNN
@@ -441,10 +441,10 @@ F 3 "" H 6900 3350 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L LMV221SD-WRONGPACK U804
+L LMV221SD-WRONGPACK U704
U 1 1 578BBBF0
P 6100 6200
-F 0 "U804" H 5840 6550 70 0000 L BNN
+F 0 "U704" H 5840 6550 70 0000 L BNN
F 1 "LMV221SD-WRONGPACK" H 5400 5700 70 0000 L BNN
F 2 "neo900-legacy:SOT23-6" H 6090 5990 65 0001 L TNN
F 3 "" H 6100 6200 60 0001 C CNN
@@ -452,10 +452,10 @@ F 3 "" H 6100 6200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LMV221SD-WRONGPACK U805
+L LMV221SD-WRONGPACK U703
U 1 1 578BBCB8
P 5200 7550
-F 0 "U805" H 4940 7900 70 0000 L BNN
+F 0 "U703" H 4940 7900 70 0000 L BNN
F 1 "LMV221SD-WRONGPACK" H 4950 7140 70 0000 L BNN
F 2 "neo900-legacy:SOT23-6" H 5190 7340 65 0001 L TNN
F 3 "" H 5200 7550 60 0001 C CNN
@@ -463,10 +463,10 @@ F 3 "" H 5200 7550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L CONNECT-POINTN900-A P801
+L CONNECT-POINTN900-A P703
U 1 1 578BBF10
P 1750 5700
-F 0 "P801" H 1750 5600 60 0000 C CNN
+F 0 "P703" H 1750 5600 60 0000 C CNN
F 1 "CELL_GND" H 1850 5700 50 0000 L CNN
F 2 "neo900-legacy:N900-SPRING-A" H 1740 5490 65 0001 L TNN
F 3 "" H 1750 5700 60 0001 C CNN
@@ -474,10 +474,10 @@ F 3 "" H 1750 5700 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L CONNECT-POINTN900-A P805
+L CONNECT-POINTN900-A P705
U 1 1 578BBFD8
P 2050 5700
-F 0 "P805" H 2050 5600 60 0000 C CNN
+F 0 "P705" H 2050 5600 60 0000 C CNN
F 1 "CELL_GND" H 2150 5700 50 0000 L CNN
F 2 "neo900-legacy:N900-SPRING-A" H 2040 5490 65 0001 L TNN
F 3 "" H 2050 5700 60 0001 C CNN
@@ -485,10 +485,10 @@ F 3 "" H 2050 5700 60 0001 C CNN
1 0 0 1
$EndComp
$Comp
-L CONNECT-POINTN900-A P804
+L CONNECT-POINTN900-A P704
U 1 1 578BC0A0
P 1900 5400
-F 0 "P804" H 1850 5400 60 0000 R CNN
+F 0 "P704" H 1850 5400 60 0000 R CNN
F 1 "CELL_RF" H 2000 5400 50 0000 L CNN
F 2 "neo900-legacy:N900-SPRING-A" H 1890 5190 65 0001 L TNN
F 3 "" H 1900 5400 60 0001 C CNN
@@ -526,10 +526,10 @@ VGNSS_SENSE
Text GLabel 3800 2200 0 60 Input ~ 0
1V8
$Comp
-L BGM1034N7 U801
+L BGM1034N7 U701
U 1 1 578BB998
P 3300 3150
-F 0 "U801" H 2900 3500 70 0000 R CNN
+F 0 "U701" H 2900 3500 70 0000 R CNN
F 1 "BGM1034N7" H 3100 2300 70 0000 L BNN
F 2 "neo900-legacy:TSNP-7-10" H 3290 2940 65 0001 L TNN
F 3 "" H 3300 3150 60 0001 C CNN
@@ -548,10 +548,10 @@ F 3 "" H 4100 3400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L OPT-MINI-RF-TAP J803
+L OPT-MINI-RF-TAP J701
U 1 1 57E5715C
P 9500 3350
-F 0 "J803" H 9400 3500 50 0000 L CNN
+F 0 "J701" H 9400 3500 50 0000 L CNN
F 1 "GNSS_IN" H 9500 3200 50 0000 C CNN
F 2 "OPT-MINI-RF-TAP" H 9530 3500 20 0001 C CNN
F 3 "" H 9500 3350 60 0001 C CNN
@@ -561,10 +561,10 @@ $EndComp
Text Notes 5700 9000 0 60 ~ 0
The RC filter should have C large enough\nenough to hold a charge in pulsed operation,\nyet be fast enough to detect short activity.\nWith 10 kOhm and 1 nF, we get about 16 kHz.\n
$Comp
-L CPL-WBF-00D3 U803
+L CPL-WBF-00D3 U702
U 1 1 57E5B979
P 5000 5300
-F 0 "U803" H 4600 5550 50 0000 L CNN
+F 0 "U702" H 4600 5550 50 0000 L CNN
F 1 "CPL-WBF-00D3" H 5000 5450 50 0000 C CNN
F 2 "SOT23-6" H 5030 5450 20 0001 C CNN
F 3 "" H 5000 5300 60 0001 C CNN
@@ -572,10 +572,10 @@ F 3 "" H 5000 5300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L SLG46531 U806
+L SLG46531 U706
U 1 1 57E5929E
P 12400 7250
-F 0 "U806" H 11900 7800 60 0000 L CNN
+F 0 "U706" H 11900 7800 60 0000 L CNN
F 1 "SLG46531" H 12600 6650 60 0000 L CNN
F 2 "" H 12400 7250 60 0001 C CNN
F 3 "" H 12400 7250 60 0001 C CNN
@@ -587,10 +587,10 @@ CELL_INBOUND
Text Label 8300 7900 0 60 ~ 0
CELL_OUTBOUND
$Comp
-L C0402 C803
+L C0402 C710
U 1 1 57E5A20B
P 11600 7800
-F 0 "C803" H 11640 7840 50 0000 L CNN
+F 0 "C710" H 11640 7840 50 0000 L CNN
F 1 "100n" H 11640 7670 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 11630 7950 20 0001 C CNN
F 3 "" H 11600 7800 60 0001 C CNN
@@ -626,10 +626,10 @@ I2C2_SCL
Text GLabel 12400 8200 3 60 BiDi ~ 0
I2C2_SDA
$Comp
-L L0402 L805
+L L0402 L705
U 1 1 57E8A246
P 11300 2400
-F 0 "L805" V 11241 2250 50 0000 L BNN
+F 0 "L705" V 11241 2250 50 0000 L BNN
F 1 "DNP" V 11430 2250 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 11290 2190 65 0001 L TNN
F 3 "" H 11300 2400 60 0001 C CNN
@@ -637,10 +637,10 @@ F 3 "" H 11300 2400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C809
+L C0402 C709
U 1 1 57E8A2D7
P 11500 2100
-F 0 "C809" V 11550 1950 50 0000 R CNN
+F 0 "C709" V 11550 1950 50 0000 R CNN
F 1 "0R" V 11450 1850 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 11530 2250 20 0001 C CNN
F 3 "" H 11500 2100 60 0001 C CNN
@@ -648,10 +648,10 @@ F 3 "" H 11500 2100 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L L0402 L806
+L L0402 L706
U 1 1 57E8A34D
P 11900 2400
-F 0 "L806" V 11841 2250 50 0000 L BNN
+F 0 "L706" V 11841 2250 50 0000 L BNN
F 1 "DNP" V 12030 2250 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 11890 2190 65 0001 L TNN
F 3 "" H 11900 2400 60 0001 C CNN
@@ -683,10 +683,10 @@ $EndComp
Text GLabel 10600 2100 0 60 UnSpc ~ 0
FM_TX
$Comp
-L C0402 C808
+L C0402 C708
U 1 1 57E8A7D1
P 10850 2100
-F 0 "C808" V 10900 1950 50 0000 R CNN
+F 0 "C708" V 10900 1950 50 0000 R CNN
F 1 "0R" V 10800 1850 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 10880 2250 20 0001 C CNN
F 3 "" H 10850 2100 60 0001 C CNN
@@ -727,10 +727,10 @@ Modem TX monitor
Text Notes 9000 6000 0 70 ~ 14
TODO: see if we can keep ADC1 and ADC2.\n(The Silego can act as ADC by varying the PWM voltages.)
$Comp
-L C0402 C812
+L C0402 C712
U 1 1 581931C3
P 14600 9450
-F 0 "C812" H 14640 9490 50 0000 L CNN
+F 0 "C712" H 14640 9490 50 0000 L CNN
F 1 "1u" H 14640 9320 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 14630 9600 20 0001 C CNN
F 3 "" H 14600 9450 60 0001 C CNN
@@ -738,10 +738,10 @@ F 3 "" H 14600 9450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C811
+L C0402 C711
U 1 1 5819325B
P 14250 9450
-F 0 "C811" H 14290 9490 50 0000 L CNN
+F 0 "C711" H 14290 9490 50 0000 L CNN
F 1 "1u" H 14290 9320 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 14280 9600 20 0001 C CNN
F 3 "" H 14250 9450 60 0001 C CNN
@@ -771,10 +771,10 @@ F 3 "" H 14600 9850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R809
+L R0402 R711
U 1 1 581946A3
P 9500 8900
-F 0 "R809" H 9370 8960 50 0000 L BNN
+F 0 "R711" H 9370 8960 50 0000 L BNN
F 1 "2M" H 9500 8900 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 9530 9050 20 0001 C CNN
F 3 "" H 9500 8900 60 0001 C CNN
@@ -782,10 +782,10 @@ F 3 "" H 9500 8900 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R811
+L R0402 R713
U 1 1 58194AEF
P 9800 8900
-F 0 "R811" H 9670 8960 50 0000 L BNN
+F 0 "R713" H 9670 8960 50 0000 L BNN
F 1 "2M" H 9800 8900 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 9830 9050 20 0001 C CNN
F 3 "" H 9800 8900 60 0001 C CNN
@@ -793,10 +793,10 @@ F 3 "" H 9800 8900 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R808
+L R0402 R710
U 1 1 58195874
P 9500 8200
-F 0 "R808" H 9370 8260 50 0000 L BNN
+F 0 "R710" H 9370 8260 50 0000 L BNN
F 1 "5M" H 9500 8200 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 9530 8350 20 0001 C CNN
F 3 "" H 9500 8200 60 0001 C CNN
@@ -804,10 +804,10 @@ F 3 "" H 9500 8200 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R810
+L R0402 R712
U 1 1 58195922
P 9800 8200
-F 0 "R810" H 9670 8260 50 0000 L BNN
+F 0 "R712" H 9670 8260 50 0000 L BNN
F 1 "5M" H 9800 8200 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 9830 8350 20 0001 C CNN
F 3 "" H 9800 8200 60 0001 C CNN
@@ -815,10 +815,10 @@ F 3 "" H 9800 8200 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R802
+L R0402 R708
U 1 1 58195B97
P 9500 6500
-F 0 "R802" H 9370 6560 50 0000 L BNN
+F 0 "R708" H 9370 6560 50 0000 L BNN
F 1 "5M" H 9500 6500 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 9530 6650 20 0001 C CNN
F 3 "" H 9500 6500 60 0001 C CNN
@@ -826,10 +826,10 @@ F 3 "" H 9500 6500 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R804
+L R0402 R709
U 1 1 58195C39
P 9500 7250
-F 0 "R804" H 9370 7310 50 0000 L BNN
+F 0 "R709" H 9370 7310 50 0000 L BNN
F 1 "2M" H 9500 7250 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 9530 7400 20 0001 C CNN
F 3 "" H 9500 7250 60 0001 C CNN
@@ -1139,10 +1139,10 @@ Wire Wire Line
Wire Wire Line
13950 8950 10900 8950
$Comp
-L R0402 R812
+L R0402 R716
U 1 1 58199DCD
P 14250 8850
-F 0 "R812" H 14120 8910 50 0000 L BNN
+F 0 "R716" H 14120 8910 50 0000 L BNN
F 1 "100k" H 14250 8850 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 14280 9000 20 0001 C CNN
F 3 "" H 14250 8850 60 0001 C CNN
@@ -1150,10 +1150,10 @@ F 3 "" H 14250 8850 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R813
+L R0402 R717
U 1 1 58199F11
P 14600 8850
-F 0 "R813" H 14470 8910 50 0000 L BNN
+F 0 "R717" H 14470 8910 50 0000 L BNN
F 1 "100k" H 14600 8850 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 14630 9000 20 0001 C CNN
F 3 "" H 14600 8850 60 0001 C CNN
@@ -1205,10 +1205,10 @@ Wire Wire Line
Text Label 13900 6450 0 60 ~ 0
CELL_MON_IN_EN
$Comp
-L R0402 R814
+L R0402 R714
U 1 1 581B4773
P 10000 6500
-F 0 "R814" H 9870 6560 50 0000 L BNN
+F 0 "R714" H 9870 6560 50 0000 L BNN
F 1 "5M" H 10000 6500 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 10030 6650 20 0001 C CNN
F 3 "" H 10000 6500 60 0001 C CNN
@@ -1216,10 +1216,10 @@ F 3 "" H 10000 6500 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R815
+L R0402 R715
U 1 1 581B4FF0
P 10000 7250
-F 0 "R815" H 9870 7310 50 0000 L BNN
+F 0 "R715" H 9870 7310 50 0000 L BNN
F 1 "2M" H 10000 7250 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 10030 7400 20 0001 C CNN
F 3 "" H 10000 7250 60 0001 C CNN
@@ -1286,10 +1286,10 @@ ACMP2-
Text Notes 13150 7450 0 60 ~ 0
ACMP0123-
$Comp
-L R0402 R816
+L R0402 R704
U 1 1 581BD23E
P 4000 8300
-F 0 "R816" H 3870 8360 50 0000 L BNN
+F 0 "R704" H 3870 8360 50 0000 L BNN
F 1 "100k" H 4000 8300 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 4030 8450 20 0001 C CNN
F 3 "" H 4000 8300 60 0001 C CNN
@@ -1297,10 +1297,10 @@ F 3 "" H 4000 8300 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R817
+L R0402 R705
U 1 1 581BD67C
P 4250 8300
-F 0 "R817" H 4120 8360 50 0000 L BNN
+F 0 "R705" H 4120 8360 50 0000 L BNN
F 1 "100k" H 4250 8300 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 4280 8450 20 0001 C CNN
F 3 "" H 4250 8300 60 0001 C CNN
diff --git a/hw/b2b.sch b/hw/b2b.sch
index 061346d..1790586 100644
--- a/hw/b2b.sch
+++ b/hw/b2b.sch
@@ -55,10 +55,10 @@ Comment3 ""
Comment4 "Xsheetnumber=20"
$EndDescr
$Comp
-L DF40C-60DS-0.4V P2001
+L DF40C-60DS-0.4V P1502
U 1 1 578D0145
P 2800 8200
-F 0 "P2001" H 2500 9650 60 0000 L CNN
+F 0 "P1502" H 2500 9650 60 0000 L CNN
F 1 "DF40HC-60DS-0.4V" H 2800 6450 60 0000 C CNN
F 2 "neo900-legacy:DF40C-60DS-0.4V" H 2620 6390 70 0001 L BNN
F 3 "" H 2800 8200 60 0001 C CNN
@@ -66,10 +66,10 @@ F 3 "" H 2800 8200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L DF40C-60DS-0.4V P2002
+L DF40C-60DS-0.4V P1504
U 1 1 578D020D
P 7100 8200
-F 0 "P2002" H 6800 9650 60 0000 L CNN
+F 0 "P1504" H 6800 9650 60 0000 L CNN
F 1 "DF40HC-60DS-0.4V" H 7100 6450 60 0000 C CNN
F 2 "neo900-legacy:DF40C-60DS-0.4V" H 6920 6390 70 0001 L BNN
F 3 "" H 7100 8200 60 0001 C CNN
@@ -79,10 +79,10 @@ $EndComp
Text Notes 2100 1200 0 200 ~ 40
This is just the collection of signals we have.\nProper assignment still pending.
$Comp
-L GND #U$1608
+L GND #U$1508
U 1 1 57F439C6
P 7700 10000
-F 0 "#U$1608" H 7610 9900 70 0001 L BNN
+F 0 "#U$1508" H 7610 9900 70 0001 L BNN
F 1 "GND" H 7610 9900 70 0001 L BNN
F 2 "" H 7700 10000 60 0001 C CNN
F 3 "" H 7700 10000 60 0001 C CNN
@@ -90,10 +90,10 @@ F 3 "" H 7700 10000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1606
+L GND #U$1506
U 1 1 57F439D7
P 6500 10000
-F 0 "#U$1606" H 6410 9900 70 0001 L BNN
+F 0 "#U$1506" H 6410 9900 70 0001 L BNN
F 1 "GND" H 6410 9900 70 0001 L BNN
F 2 "" H 6500 10000 60 0001 C CNN
F 3 "" H 6500 10000 60 0001 C CNN
@@ -109,10 +109,10 @@ VSYS
Text GLabel 6400 6900 0 60 Input ~ 0
VSYS
$Comp
-L GND #U$1604
+L GND #U$1504
U 1 1 57F43F89
P 3400 10000
-F 0 "#U$1604" H 3310 9900 70 0001 L BNN
+F 0 "#U$1504" H 3310 9900 70 0001 L BNN
F 1 "GND" H 3310 9900 70 0001 L BNN
F 2 "" H 3400 10000 60 0001 C CNN
F 3 "" H 3400 10000 60 0001 C CNN
@@ -120,10 +120,10 @@ F 3 "" H 3400 10000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1602
+L GND #U$1502
U 1 1 57F43F9A
P 2200 10000
-F 0 "#U$1602" H 2110 9900 70 0001 L BNN
+F 0 "#U$1502" H 2110 9900 70 0001 L BNN
F 1 "GND" H 2110 9900 70 0001 L BNN
F 2 "" H 2200 10000 60 0001 C CNN
F 3 "" H 2200 10000 60 0001 C CNN
@@ -393,10 +393,10 @@ HB_C
Text GLabel 6400 8700 0 60 BiDi ~ 0
HB_D
$Comp
-L XRA1201 U2001
+L XRA1201 U1501
U 1 1 57F464EC
P 12400 3400
-F 0 "U2001" H 12100 4350 60 0000 L CNN
+F 0 "U1501" H 12100 4350 60 0000 L CNN
F 1 "XRA1201P" H 12400 2450 60 0000 C CNN
F 2 "" H 12400 3400 60 0001 C CNN
F 3 "" H 12400 3400 60 0001 C CNN
@@ -404,10 +404,10 @@ F 3 "" H 12400 3400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L XRA1201 U2002
+L XRA1201 U1502
U 1 1 57F46577
P 12400 6100
-F 0 "U2002" H 12100 7050 60 0000 L CNN
+F 0 "U1502" H 12100 7050 60 0000 L CNN
F 1 "XRA1201" H 12400 5150 60 0000 C CNN
F 2 "" H 12400 6100 60 0001 C CNN
F 3 "" H 12400 6100 60 0001 C CNN
@@ -423,10 +423,10 @@ IOX1_INT
Text GLabel 11250 3950 0 60 Input ~ 0
1V8
$Comp
-L GND #U$1613
+L GND #U$1513
U 1 1 57F469A2
P 11800 4550
-F 0 "#U$1613" H 11710 4450 70 0001 L BNN
+F 0 "#U$1513" H 11710 4450 70 0001 L BNN
F 1 "GND" H 11710 4450 70 0001 L BNN
F 2 "" H 11800 4550 60 0001 C CNN
F 3 "" H 11800 4550 60 0001 C CNN
@@ -434,10 +434,10 @@ F 3 "" H 11800 4550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C2001
+L C0402 C1501
U 1 1 57F46BCF
P 11400 4150
-F 0 "C2001" H 11440 4190 50 0000 L CNN
+F 0 "C1501" H 11440 4190 50 0000 L CNN
F 1 "100n" H 11440 4020 50 0000 L CNN
F 2 "SMD-0402" H 11430 4300 20 0001 C CNN
F 3 "" H 11400 4150 60 0001 C CNN
@@ -445,10 +445,10 @@ F 3 "" H 11400 4150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1609
+L GND #U$1509
U 1 1 57F46C80
P 11400 4550
-F 0 "#U$1609" H 11310 4450 70 0001 L BNN
+F 0 "#U$1509" H 11310 4450 70 0001 L BNN
F 1 "GND" H 11310 4450 70 0001 L BNN
F 2 "" H 11400 4550 60 0001 C CNN
F 3 "" H 11400 4550 60 0001 C CNN
@@ -464,10 +464,10 @@ IOX2_INT
Text GLabel 11250 6650 0 60 Input ~ 0
1V8
$Comp
-L GND #U$1615
+L GND #U$1515
U 1 1 57F46F2B
P 11800 7250
-F 0 "#U$1615" H 11710 7150 70 0001 L BNN
+F 0 "#U$1515" H 11710 7150 70 0001 L BNN
F 1 "GND" H 11710 7150 70 0001 L BNN
F 2 "" H 11800 7250 60 0001 C CNN
F 3 "" H 11800 7250 60 0001 C CNN
@@ -475,10 +475,10 @@ F 3 "" H 11800 7250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C2002
+L C0402 C1502
U 1 1 57F46F38
P 11400 6850
-F 0 "C2002" H 11440 6890 50 0000 L CNN
+F 0 "C1502" H 11440 6890 50 0000 L CNN
F 1 "100n" H 11440 6720 50 0000 L CNN
F 2 "SMD-0402" H 11430 7000 20 0001 C CNN
F 3 "" H 11400 6850 60 0001 C CNN
@@ -486,10 +486,10 @@ F 3 "" H 11400 6850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1610
+L GND #U$1510
U 1 1 57F46F3E
P 11400 7250
-F 0 "#U$1610" H 11310 7150 70 0001 L BNN
+F 0 "#U$1510" H 11310 7150 70 0001 L BNN
F 1 "GND" H 11310 7150 70 0001 L BNN
F 2 "" H 11400 7250 60 0001 C CNN
F 3 "" H 11400 7250 60 0001 C CNN
@@ -503,10 +503,10 @@ I2C2_SCL
Text GLabel 11250 9350 0 60 Input ~ 0
1V8
$Comp
-L GND #U$1617
+L GND #U$1517
U 1 1 57F4913B
P 11800 9950
-F 0 "#U$1617" H 11710 9850 70 0001 L BNN
+F 0 "#U$1517" H 11710 9850 70 0001 L BNN
F 1 "GND" H 11710 9850 70 0001 L BNN
F 2 "" H 11800 9950 60 0001 C CNN
F 3 "" H 11800 9950 60 0001 C CNN
@@ -514,10 +514,10 @@ F 3 "" H 11800 9950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C2003
+L C0402 C1503
U 1 1 57F49146
P 11400 9550
-F 0 "C2003" H 11440 9590 50 0000 L CNN
+F 0 "C1503" H 11440 9590 50 0000 L CNN
F 1 "100n" H 11440 9420 50 0000 L CNN
F 2 "SMD-0402" H 11430 9700 20 0001 C CNN
F 3 "" H 11400 9550 60 0001 C CNN
@@ -525,10 +525,10 @@ F 3 "" H 11400 9550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1611
+L GND #U$1511
U 1 1 57F4914C
P 11400 9950
-F 0 "#U$1611" H 11310 9850 70 0001 L BNN
+F 0 "#U$1511" H 11310 9850 70 0001 L BNN
F 1 "GND" H 11310 9850 70 0001 L BNN
F 2 "" H 11400 9950 60 0001 C CNN
F 3 "" H 11400 9950 60 0001 C CNN
@@ -540,10 +540,10 @@ NoConn ~ 12900 8700
NoConn ~ 12900 8600
NoConn ~ 12900 8500
$Comp
-L GND #U$1612
+L GND #U$1512
U 1 1 57F493AF
P 11800 3250
-F 0 "#U$1612" H 11710 3150 70 0001 L BNN
+F 0 "#U$1512" H 11710 3150 70 0001 L BNN
F 1 "GND" H 11710 3150 70 0001 L BNN
F 2 "" H 11800 3250 60 0001 C CNN
F 3 "" H 11800 3250 60 0001 C CNN
@@ -553,10 +553,10 @@ $EndComp
Text Notes 11650 3050 2 70 ~ 0
"0x40" = 0x20
$Comp
-L GND #U$1614
+L GND #U$1514
U 1 1 57F4992B
P 11800 5950
-F 0 "#U$1614" H 11710 5850 70 0001 L BNN
+F 0 "#U$1514" H 11710 5850 70 0001 L BNN
F 1 "GND" H 11710 5850 70 0001 L BNN
F 2 "" H 11800 5950 60 0001 C CNN
F 3 "" H 11800 5950 60 0001 C CNN
@@ -568,10 +568,10 @@ Text GLabel 11700 5600 0 60 Input ~ 0
Text Notes 11600 5850 2 70 ~ 0
"0x42" = 0x21
$Comp
-L GND #U$1616
+L GND #U$1516
U 1 1 57F49D8E
P 11800 8650
-F 0 "#U$1616" H 11710 8550 70 0001 L BNN
+F 0 "#U$1516" H 11710 8550 70 0001 L BNN
F 1 "GND" H 11710 8550 70 0001 L BNN
F 2 "" H 11800 8650 60 0001 C CNN
F 3 "" H 11800 8650 60 0001 C CNN
@@ -589,8 +589,8 @@ L DF40C-60DP-0.4V P?
U 1 1 57F7448C
P 2800 3500
AR Path="/578AFF1A/57F7448C" Ref="P?" Part="1"
-AR Path="/578AFF16/57F7448C" Ref="P2003" Part="1"
-F 0 "P2003" H 2601 4940 70 0000 L BNN
+AR Path="/578AFF16/57F7448C" Ref="P1501" Part="1"
+F 0 "P1501" H 2601 4940 70 0000 L BNN
F 1 "DF40C-60DP-0.4V" H 2800 1750 60 0000 C CNN
F 2 "neo900-legacy:DF40C-60DP-0.4V" H 2620 1690 70 0001 L BNN
F 3 "" H 2800 3500 60 0001 C CNN
@@ -602,8 +602,8 @@ L DF40C-60DP-0.4V P?
U 1 1 57F74493
P 7100 3500
AR Path="/578AFF1A/57F74493" Ref="P?" Part="1"
-AR Path="/578AFF16/57F74493" Ref="P2004" Part="1"
-F 0 "P2004" H 6901 4940 70 0000 L BNN
+AR Path="/578AFF16/57F74493" Ref="P1503" Part="1"
+F 0 "P1503" H 6901 4940 70 0000 L BNN
F 1 "DF40C-60DP-0.4V" H 7100 1750 60 0000 C CNN
F 2 "neo900-legacy:DF40C-60DP-0.4V" H 6920 1690 70 0001 L BNN
F 3 "" H 7100 3500 60 0001 C CNN
@@ -615,8 +615,8 @@ L GND-3 #U$?
U 1 1 57F744B5
P 2200 5300
AR Path="/578AFF1A/57F744B5" Ref="#U$?" Part="1"
-AR Path="/578AFF16/57F744B5" Ref="#U$1601" Part="1"
-F 0 "#U$1601" H 2080 5201 70 0001 L BNN
+AR Path="/578AFF16/57F744B5" Ref="#U$1501" Part="1"
+F 0 "#U$1501" H 2080 5201 70 0001 L BNN
F 1 "GND3" H 2080 5201 70 0001 L BNN
F 2 "" H 2200 5300 60 0001 C CNN
F 3 "" H 2200 5300 60 0001 C CNN
@@ -628,8 +628,8 @@ L GND-3 #U$?
U 1 1 57F744BB
P 3400 5300
AR Path="/578AFF1A/57F744BB" Ref="#U$?" Part="1"
-AR Path="/578AFF16/57F744BB" Ref="#U$1603" Part="1"
-F 0 "#U$1603" H 3280 5201 70 0001 L BNN
+AR Path="/578AFF16/57F744BB" Ref="#U$1503" Part="1"
+F 0 "#U$1503" H 3280 5201 70 0001 L BNN
F 1 "GND3" H 3280 5201 70 0001 L BNN
F 2 "" H 3400 5300 60 0001 C CNN
F 3 "" H 3400 5300 60 0001 C CNN
@@ -641,8 +641,8 @@ L GND-3 #U$?
U 1 1 57F744C1
P 6500 5300
AR Path="/578AFF1A/57F744C1" Ref="#U$?" Part="1"
-AR Path="/578AFF16/57F744C1" Ref="#U$1605" Part="1"
-F 0 "#U$1605" H 6380 5201 70 0001 L BNN
+AR Path="/578AFF16/57F744C1" Ref="#U$1505" Part="1"
+F 0 "#U$1505" H 6380 5201 70 0001 L BNN
F 1 "GND3" H 6380 5201 70 0001 L BNN
F 2 "" H 6500 5300 60 0001 C CNN
F 3 "" H 6500 5300 60 0001 C CNN
@@ -654,8 +654,8 @@ L GND-3 #U$?
U 1 1 57F744C7
P 7700 5300
AR Path="/578AFF1A/57F744C7" Ref="#U$?" Part="1"
-AR Path="/578AFF16/57F744C7" Ref="#U$1607" Part="1"
-F 0 "#U$1607" H 7580 5201 70 0001 L BNN
+AR Path="/578AFF16/57F744C7" Ref="#U$1507" Part="1"
+F 0 "#U$1507" H 7580 5201 70 0001 L BNN
F 1 "GND3" H 7580 5201 70 0001 L BNN
F 2 "" H 7700 5300 60 0001 C CNN
F 3 "" H 7700 5300 60 0001 C CNN
@@ -878,10 +878,10 @@ BATTEMP_COMPANION_U
Text GLabel 3500 4300 2 60 Input ~ 0
FLASH_STROBE_U
$Comp
-L POWERED #FLG1601
+L POWERED #FLG1501
U 1 1 580A5A5C
P 2200 1900
-F 0 "#FLG1601" H 2400 1800 60 0001 C CNN
+F 0 "#FLG1501" H 2400 1800 60 0001 C CNN
F 1 "POWERED" H 2200 1950 60 0000 C CNN
F 2 "" H 2200 1900 60 0001 C CNN
F 3 "" H 2200 1900 60 0001 C CNN
@@ -944,10 +944,10 @@ Text Notes 12100 7250 0 70 ~ 0
Pull-ups disabled after reset
NoConn ~ 12900 5700
$Comp
-L R-ARRAY-8-2COM R2001
+L R-ARRAY-8-2COM R1501
U 1 1 5827BF47
P 14400 7100
-F 0 "R2001" V 14450 7650 60 0000 L CNN
+F 0 "R1501" V 14450 7650 60 0000 L CNN
F 1 "MNR15ERRPJ104" V 14450 6650 60 0000 R CNN
F 2 "" H 14400 7100 70 0001 C CNN
F 3 "" H 14400 7100 70 0001 C CNN
@@ -957,10 +957,10 @@ $EndComp
Text Notes 14850 7200 0 60 ~ 0
100k x 8
$Comp
-L GND #U$1618
+L GND #U$1518
U 1 1 5827C23E
P 14000 7550
-F 0 "#U$1618" H 13910 7450 70 0001 L BNN
+F 0 "#U$1518" H 13910 7450 70 0001 L BNN
F 1 "GND" H 13910 7450 70 0001 L BNN
F 2 "" H 14000 7550 60 0001 C CNN
F 3 "" H 14000 7550 60 0001 C CNN
@@ -968,10 +968,10 @@ F 3 "" H 14000 7550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1620
+L GND #U$1520
U 1 1 5827C26A
P 14700 7550
-F 0 "#U$1620" H 14610 7450 70 0001 L BNN
+F 0 "#U$1520" H 14610 7450 70 0001 L BNN
F 1 "GND" H 14610 7450 70 0001 L BNN
F 2 "" H 14700 7550 60 0001 C CNN
F 3 "" H 14700 7550 60 0001 C CNN
@@ -981,10 +981,10 @@ $EndComp
Text Notes 12100 9950 0 70 ~ 0
Pull-ups disabled after reset
$Comp
-L XRA1201 U2003
+L XRA1201 U1503
U 1 1 57F4912E
P 12400 8800
-F 0 "U2003" H 12100 9750 60 0000 L CNN
+F 0 "U1503" H 12100 9750 60 0000 L CNN
F 1 "XRA1201" H 12400 7850 60 0000 C CNN
F 2 "" H 12400 8800 60 0001 C CNN
F 3 "" H 12400 8800 60 0001 C CNN
@@ -1685,10 +1685,10 @@ Wire Wire Line
Wire Wire Line
13200 4200 12900 4200
$Comp
-L R-ARRAY-8-2COM R2002
+L R-ARRAY-8-2COM R1502
U 1 1 5827F27D
P 14400 8900
-F 0 "R2002" V 14450 9450 60 0000 L CNN
+F 0 "R1502" V 14450 9450 60 0000 L CNN
F 1 "MNR15ERRPJ104" V 14450 8450 60 0000 R CNN
F 2 "" H 14400 8900 70 0001 C CNN
F 3 "" H 14400 8900 70 0001 C CNN
@@ -1696,10 +1696,10 @@ F 3 "" H 14400 8900 70 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$1619
+L GND #U$1519
U 1 1 5827F2E1
P 14000 9400
-F 0 "#U$1619" H 13910 9300 70 0001 L BNN
+F 0 "#U$1519" H 13910 9300 70 0001 L BNN
F 1 "GND" H 13910 9300 70 0001 L BNN
F 2 "" H 14000 9400 60 0001 C CNN
F 3 "" H 14000 9400 60 0001 C CNN
@@ -1707,10 +1707,10 @@ F 3 "" H 14000 9400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1621
+L GND #U$1521
U 1 1 5827F310
P 14700 9400
-F 0 "#U$1621" H 14610 9300 70 0001 L BNN
+F 0 "#U$1521" H 14610 9300 70 0001 L BNN
F 1 "GND" H 14610 9300 70 0001 L BNN
F 2 "" H 14700 9400 60 0001 C CNN
F 3 "" H 14700 9400 60 0001 C CNN
diff --git a/hw/battery.sch b/hw/battery.sch
index 97fbe33..10370d7 100644
--- a/hw/battery.sch
+++ b/hw/battery.sch
@@ -55,10 +55,10 @@ Comment3 ""
Comment4 "Xsheetnumber=3"
$EndDescr
$Comp
-L TEST-POINT-1.25 TP502
+L TEST-POINT-1.25 TP304
U 1 1 578B2AA3
P 10250 3300
-F 0 "TP502" H 10250 3300 45 0001 L BNN
+F 0 "TP304" H 10250 3300 45 0001 L BNN
F 1 "VBAT" H 10310 3275 45 0000 L BNN
F 2 "neo900-legacy:TP-1.25" H 10280 3450 20 0001 C CNN
F 3 "" H 10250 3300 60 0001 C CNN
@@ -66,10 +66,10 @@ F 3 "" H 10250 3300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 TP504
+L TEST-POINT-1.25 TP303
U 1 1 578B2B6B
P 10250 3100
-F 0 "TP504" H 10250 3100 45 0001 L BNN
+F 0 "TP303" H 10250 3100 45 0001 L BNN
F 1 "BGND" H 10310 3075 45 0000 L BNN
F 2 "neo900-legacy:TP-1.25" H 10280 3250 20 0001 C CNN
F 3 "" H 10250 3100 60 0001 C CNN
@@ -77,10 +77,10 @@ F 3 "" H 10250 3100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 TP503
+L TEST-POINT-1.25 TP302
U 1 1 578B2C33
P 10250 2900
-F 0 "TP503" H 10250 2900 45 0001 L BNN
+F 0 "TP302" H 10250 2900 45 0001 L BNN
F 1 "BATTID" H 10310 2875 45 0000 L BNN
F 2 "neo900-legacy:TP-1.25" H 10280 3050 20 0001 C CNN
F 3 "" H 10250 2900 60 0001 C CNN
@@ -88,10 +88,10 @@ F 3 "" H 10250 2900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0603 C501
+L C0603 C301
U 1 1 578B2DC3
P 3750 3600
-F 0 "C501" H 3790 3640 50 0000 L CNN
+F 0 "C301" H 3790 3640 50 0000 L CNN
F 1 "10u" H 3800 3450 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 3780 3750 20 0001 C CNN
F 3 "" H 3750 3600 60 0001 C CNN
@@ -99,10 +99,10 @@ F 3 "" H 3750 3600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0603 C502
+L C0603 C309
U 1 1 578B2E8B
P 8900 4700
-F 0 "C502" V 9050 4500 50 0000 L CNN
+F 0 "C309" V 9050 4500 50 0000 L CNN
F 1 "100n" V 8950 4400 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 8930 4850 20 0001 C CNN
F 3 "" H 8900 4700 60 0001 C CNN
@@ -110,10 +110,10 @@ F 3 "" H 8900 4700 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0603 C503
+L C0603 C310
U 1 1 578B2F53
P 8900 5100
-F 0 "C503" V 8950 5100 50 0000 L CNN
+F 0 "C310" V 8950 5100 50 0000 L CNN
F 1 "100n" V 8850 5100 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 8930 5250 20 0001 C CNN
F 3 "" H 8900 5100 60 0001 C CNN
@@ -121,10 +121,10 @@ F 3 "" H 8900 5100 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0603 C504
+L C0603 C303
U 1 1 578B301B
P 5200 5400
-F 0 "C504" H 5240 5440 50 0000 L CNN
+F 0 "C303" H 5240 5440 50 0000 L CNN
F 1 "100n" H 5250 5250 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 5230 5550 20 0001 C CNN
F 3 "" H 5200 5400 60 0001 C CNN
@@ -132,10 +132,10 @@ F 3 "" H 5200 5400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0603 C505
+L C0603 C304
U 1 1 578B30E3
P 5500 5400
-F 0 "C505" H 5540 5440 50 0000 L CNN
+F 0 "C304" H 5540 5440 50 0000 L CNN
F 1 "100n" H 5550 5250 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 5530 5550 20 0001 C CNN
F 3 "" H 5500 5400 60 0001 C CNN
@@ -143,10 +143,10 @@ F 3 "" H 5500 5400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0603 C506
+L C0603 C305
U 1 1 578B31AB
P 5800 5400
-F 0 "C506" H 5840 5440 50 0000 L CNN
+F 0 "C305" H 5840 5440 50 0000 L CNN
F 1 "100n" H 5850 5250 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 5830 5550 20 0001 C CNN
F 3 "" H 5800 5400 60 0001 C CNN
@@ -154,10 +154,10 @@ F 3 "" H 5800 5400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L V5.5MLA0603N D501
+L V5.5MLA0603N D301
U 1 1 578B3273
P 9500 3900
-F 0 "D501" H 9400 4070 50 0000 L CNN
+F 0 "D301" H 9400 4070 50 0000 L CNN
F 1 "V5.5MLA0603N" H 9300 3700 50 0000 L BNN
F 2 "neo900-legacy:SMD-0603" H 9490 3690 65 0001 L TNN
F 3 "" H 9500 3900 60 0001 C CNN
@@ -165,10 +165,10 @@ F 3 "" H 9500 3900 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L V5.5MLA0603N D502
+L V5.5MLA0603N D302
U 1 1 578B333B
P 10000 3900
-F 0 "D502" H 9900 4070 50 0000 L CNN
+F 0 "D302" H 9900 4070 50 0000 L CNN
F 1 "V5.5MLA0603N" H 9800 3700 50 0000 L BNN
F 2 "neo900-legacy:SMD-0603" H 9990 3690 65 0001 L TNN
F 3 "" H 10000 3900 60 0001 C CNN
@@ -176,12 +176,10 @@ F 3 "" H 10000 3900 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L BATT-3PIN-N900 P501
+L BATT-3PIN-N900 P301
U 1 1 578B3468
P 11000 3200
-AR Path="/578B3468" Ref="P501" Part="1"
-AR Path="/578AFEF8/578B3468" Ref="P501" Part="1"
-F 0 "P501" H 10750 3550 50 0000 L BNN
+F 0 "P301" H 10750 3550 50 0000 L BNN
F 1 "BATT-3PIN-N900" H 10700 2800 50 0000 L BNN
F 2 "neo900:N900-BATTCONN" H 10990 2990 65 0001 L TNN
F 3 "" H 11000 3200 60 0001 C CNN
@@ -189,10 +187,10 @@ F 3 "" H 11000 3200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-HOLE TP501
+L TEST-POINT-HOLE TP301
U 1 1 578B3530
P 6900 6000
-F 0 "TP501" H 6900 6000 45 0001 L BNN
+F 0 "TP301" H 6900 6000 45 0001 L BNN
F 1 "BQ_PGM" H 6960 5975 45 0000 L BNN
F 2 "neo900-legacy:1PIN-HOLE" H 6930 6150 20 0001 C CNN
F 3 "" H 6900 6000 60 0001 C CNN
@@ -200,10 +198,10 @@ F 3 "" H 6900 6000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R501
+L R0402 R309
U 1 1 578B35F8
P 7800 2200
-F 0 "R501" H 7670 2260 50 0000 L BNN
+F 0 "R309" H 7670 2260 50 0000 L BNN
F 1 "10k" H 7800 2200 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 7830 2350 20 0001 C CNN
F 3 "" H 7800 2200 60 0001 C CNN
@@ -211,10 +209,10 @@ F 3 "" H 7800 2200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R502
+L R0402 R311
U 1 1 578B36C0
P 9300 3000
-F 0 "R502" H 9170 3060 50 0000 L BNN
+F 0 "R311" H 9170 3060 50 0000 L BNN
F 1 "100" H 9300 3000 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 9330 3150 20 0001 C CNN
F 3 "" H 9300 3000 60 0001 C CNN
@@ -222,10 +220,10 @@ F 3 "" H 9300 3000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0603 R503
+L R0603 R312
U 1 1 578B3788
P 11500 3200
-F 0 "R503" H 11370 3260 50 0000 L BNN
+F 0 "R312" H 11370 3260 50 0000 L BNN
F 1 "NTCG163JF103F" H 11500 3100 50 0000 C CNN
F 2 "neo900-legacy:SMD-0603" H 11530 3350 20 0001 C CNN
F 3 "" H 11500 3200 60 0001 C CNN
@@ -233,10 +231,10 @@ F 3 "" H 11500 3200 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R504
+L R0402 R310
U 1 1 578B3850
P 8700 4000
-F 0 "R504" H 8570 4060 50 0000 L BNN
+F 0 "R310" H 8570 4060 50 0000 L BNN
F 1 "1k" H 8700 4000 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 8730 4150 20 0001 C CNN
F 3 "" H 8700 4000 60 0001 C CNN
@@ -244,10 +242,10 @@ F 3 "" H 8700 4000 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R505
+L R0402 R307
U 1 1 578B3918
P 5800 4000
-F 0 "R505" H 5670 4060 50 0000 L BNN
+F 0 "R307" H 5670 4060 50 0000 L BNN
F 1 "10k" H 5800 4000 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5830 4150 20 0001 C CNN
F 3 "" H 5800 4000 60 0001 C CNN
@@ -255,10 +253,10 @@ F 3 "" H 5800 4000 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R506
+L R0402 R304
U 1 1 578B39E0
P 4800 4900
-F 0 "R506" H 4670 4960 50 0000 L BNN
+F 0 "R304" H 4670 4960 50 0000 L BNN
F 1 "10k" H 4800 4900 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 4830 5050 20 0001 C CNN
F 3 "" H 4800 4900 60 0001 C CNN
@@ -266,10 +264,10 @@ F 3 "" H 4800 4900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R507
+L R0402 R301
U 1 1 578B3AA8
P 4300 5000
-F 0 "R507" H 4170 5060 50 0000 L BNN
+F 0 "R301" H 4170 5060 50 0000 L BNN
F 1 "20mR" H 4300 5000 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 4330 5150 20 0001 C CNN
F 3 "" H 4300 5000 60 0001 C CNN
@@ -277,10 +275,10 @@ F 3 "" H 4300 5000 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R508
+L R0402 R305
U 1 1 578B3B70
P 4800 5100
-F 0 "R508" H 4670 5160 50 0000 L BNN
+F 0 "R305" H 4670 5160 50 0000 L BNN
F 1 "10k" H 4800 5100 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 4830 5250 20 0001 C CNN
F 3 "" H 4800 5100 60 0001 C CNN
@@ -398,10 +396,10 @@ F 3 "" H 8400 7750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L BQ27X00DRK U501
+L BQ27X00DRK U302
U 1 1 578B4084
P 7500 4800
-F 0 "U501" H 7650 4500 70 0000 L BNN
+F 0 "U302" H 7650 4500 70 0000 L BNN
F 1 "BQ27200DRK" H 7200 5650 70 0000 L BNN
F 2 "neo900-legacy:S-PVSON-N10-4X3" H 7490 4590 65 0001 L TNN
F 3 "" H 7500 4800 60 0001 C CNN
@@ -409,10 +407,10 @@ F 3 "" H 7500 4800 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L BQ27421G1YZF U502
+L BQ27421G1YZF U303
U 1 1 578B414C
P 7500 7200
-F 0 "U502" H 7650 6600 70 0000 L BNN
+F 0 "U303" H 7650 6600 70 0000 L BNN
F 1 "BQ27421YZFR-G1A (4V2)" H 7450 7750 70 0000 C BNN
F 2 "neo900-legacy:S-XBGA-N9-0.5" H 7490 6990 65 0001 L TNN
F 3 "" H 7500 7200 60 0001 C CNN
@@ -486,10 +484,10 @@ F 3 "" H 8700 8900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R509
+L R0402 R306
U 1 1 5794E70F
P 5400 3400
-F 0 "R509" H 5270 3460 50 0000 L BNN
+F 0 "R306" H 5270 3460 50 0000 L BNN
F 1 "0" H 5400 3400 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5430 3550 20 0001 C CNN
F 3 "" H 5400 3400 60 0001 C CNN
@@ -510,10 +508,10 @@ F 3 "" H 6850 2900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0603 C508
+L C0603 C307
U 1 1 5794F687
P 6700 7150
-F 0 "C508" H 6740 7190 50 0000 L CNN
+F 0 "C307" H 6740 7190 50 0000 L CNN
F 1 "10u" H 6750 7000 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 6730 7300 20 0001 C CNN
F 3 "" H 6700 7150 60 0001 C CNN
@@ -523,10 +521,10 @@ $EndComp
Text GLabel 5700 8800 0 60 BiDi ~ 0
BQ_GPOUT
$Comp
-L R0402 R510
+L R0402 R308
U 1 1 57D8FE5D
P 6800 8500
-F 0 "R510" V 6900 8600 50 0000 L CNN
+F 0 "R308" V 6900 8600 50 0000 L CNN
F 1 "100k" H 6800 8500 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 6830 8650 20 0001 C CNN
F 3 "" H 6800 8500 60 0001 C CNN
@@ -534,10 +532,10 @@ F 3 "" H 6800 8500 60 0001 C CNN
0 1 -1 0
$EndComp
$Comp
-L C0603 C507
+L C0603 C308
U 1 1 57DE0EFF
P 8700 8450
-F 0 "C507" H 8740 8490 50 0000 L CNN
+F 0 "C308" H 8740 8490 50 0000 L CNN
F 1 "10u" H 8750 8300 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 8730 8600 20 0001 C CNN
F 3 "" H 8700 8450 60 0001 C CNN
@@ -545,10 +543,10 @@ F 3 "" H 8700 8450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0603 C509
+L C0603 C306
U 1 1 57DE15E7
P 6000 8800
-F 0 "C509" V 6150 8600 50 0000 L CNN
+F 0 "C306" V 6150 8600 50 0000 L CNN
F 1 "1n" V 6050 8550 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 6030 8950 20 0001 C CNN
F 3 "" H 6000 8800 60 0001 C CNN
@@ -730,10 +728,10 @@ Wire Wire Line
Text GLabel 8200 2200 2 60 BiDi ~ 0
BATTID_U
$Comp
-L R0603 R511
+L R0603 R313
U 1 1 580858E9
P 11900 3200
-F 0 "R511" H 11770 3260 50 0000 L BNN
+F 0 "R313" H 11770 3260 50 0000 L BNN
F 1 "NTCG163JF103F" H 11900 3100 50 0000 C CNN
F 2 "neo900-legacy:SMD-0603" H 11930 3350 20 0001 C CNN
F 3 "" H 11900 3200 60 0001 C CNN
@@ -760,10 +758,10 @@ Wire Wire Line
Wire Wire Line
11900 2050 10700 2050
$Comp
-L 74X1G04_6 U503
+L 74X1G04_6 U301
U 1 1 58086617
P 5550 1700
-F 0 "U503" H 5300 1900 60 0000 C CNN
+F 0 "U301" H 5300 1900 60 0000 C CNN
F 1 "SN74AUP1G04DSF" H 5650 1550 60 0000 L CNN
F 2 "" H 5400 1875 60 0001 C CNN
F 3 "" H 5400 1875 60 0001 C CNN
@@ -775,8 +773,8 @@ L C-MK325 C?
U 1 1 5808661E
P 5100 1900
AR Path="/578AFF20/5808661E" Ref="C?" Part="1"
-AR Path="/578AFEF8/5808661E" Ref="C510" Part="1"
-F 0 "C510" H 5160 1914 50 0000 L BNN
+AR Path="/578AFEF8/5808661E" Ref="C302" Part="1"
+F 0 "C302" H 5160 1914 50 0000 L BNN
F 1 "100n" H 5159 1715 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 5090 1690 65 0001 L TNN
F 3 "" H 5100 1900 60 0001 C CNN
@@ -803,10 +801,10 @@ Wire Wire Line
Wire Wire Line
5550 2200 5550 1950
$Comp
-L R0402 R512
+L R0402 R302
U 1 1 580869E0
P 4450 1700
-F 0 "R512" H 4320 1760 50 0000 L BNN
+F 0 "R302" H 4320 1760 50 0000 L BNN
F 1 "1M" H 4450 1700 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 4480 1850 20 0001 C CNN
F 3 "" H 4450 1700 60 0001 C CNN
@@ -843,10 +841,10 @@ Connection ~ 4150 3400
Text GLabel 6400 1700 2 60 Output ~ 0
nBATTERY_PRESENT
$Comp
-L R0402 R513
+L R0402 R303
U 1 1 5808752F
P 4800 1950
-F 0 "R513" H 4670 2010 50 0000 L BNN
+F 0 "R303" H 4670 2010 50 0000 L BNN
F 1 "1M" H 4800 1950 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 4830 2100 20 0001 C CNN
F 3 "" H 4800 1950 60 0001 C CNN
@@ -929,8 +927,8 @@ L SHIELDPAD-3.5X2.5 G?
U 1 1 5812076F
P 13300 2900
AR Path="/578AFF0C/5812076F" Ref="G?" Part="1"
-AR Path="/578AFEF8/5812076F" Ref="G1501" Part="1"
-F 0 "G1501" H 13430 2949 50 0000 L BNN
+AR Path="/578AFEF8/5812076F" Ref="G301" Part="1"
+F 0 "G301" H 13430 2949 50 0000 L BNN
F 1 "SHIELDPAD-3.5X2.5" H 13290 2790 65 0001 L TNN
F 2 "neo900-legacy:PAD-3.5X2.5" H 13290 2690 65 0001 L TNN
F 3 "" H 13300 2900 60 0001 C CNN
@@ -942,8 +940,8 @@ L SHIELDPAD-3.5X2.5 G?
U 1 1 58120776
P 13300 3200
AR Path="/578AFF0C/58120776" Ref="G?" Part="1"
-AR Path="/578AFEF8/58120776" Ref="G1502" Part="1"
-F 0 "G1502" H 13430 3249 50 0000 L BNN
+AR Path="/578AFEF8/58120776" Ref="G302" Part="1"
+F 0 "G302" H 13430 3249 50 0000 L BNN
F 1 "SHIELDPAD-3.5X2.5" H 13290 3090 65 0001 L TNN
F 2 "neo900-legacy:PAD-3.5X2.5" H 13290 2990 65 0001 L TNN
F 3 "" H 13300 3200 60 0001 C CNN
@@ -955,8 +953,8 @@ L SHIELDPAD-3.5X2.5 G?
U 1 1 5812077D
P 13300 3500
AR Path="/578AFF0C/5812077D" Ref="G?" Part="1"
-AR Path="/578AFEF8/5812077D" Ref="G1503" Part="1"
-F 0 "G1503" H 13430 3549 50 0000 L BNN
+AR Path="/578AFEF8/5812077D" Ref="G303" Part="1"
+F 0 "G303" H 13430 3549 50 0000 L BNN
F 1 "SHIELDPAD-3.5X2.5" H 13290 3390 65 0001 L TNN
F 2 "neo900-legacy:PAD-3.5X2.5" H 13290 3290 65 0001 L TNN
F 3 "" H 13300 3500 60 0001 C CNN
diff --git a/hw/bbcam.sch b/hw/bbcam.sch
index 4278d0d..04c23f0 100644
--- a/hw/bbcam.sch
+++ b/hw/bbcam.sch
@@ -109,10 +109,10 @@ I2C2 also on EXPANSION
Text Notes 11000 5750 0 60 ~ 0
I2C2 also on EXPANSION
$Comp
-L BB-XM-AUDIO P3601
+L BB-XM-AUDIO P2502
U 1 1 57F7381D
P 7400 9000
-F 0 "P3601" H 6900 9250 60 0000 L CNN
+F 0 "P2502" H 6900 9250 60 0000 L CNN
F 1 "852-10-020-10-001000" H 7400 8700 60 0000 C CNN
F 2 "" H 7400 9000 60 0001 C CNN
F 3 "" H 7400 9000 60 0001 C CNN
@@ -156,10 +156,10 @@ No UART1_CTS on BB-xM, using GPIO
Text Notes 6300 9800 0 60 ~ 0
This part is a "breakaway" strip (20 positions) and needs to be\ncustomized (cut) before assembly.\nAlternatively, 852-10-100-10-001000 (100 positions) could be used.
$Comp
-L CONN_34 CON3601
+L CONN_34 CON2501
U 1 1 580FA2ED
P 9300 4550
-F 0 "CON3601" H 9300 2750 60 0000 C CNN
+F 0 "CON2501" H 9300 2750 60 0000 C CNN
F 1 "CONN_34" H 9300 6350 60 0000 C CNN
F 2 "" H 9300 4550 60 0001 C CNN
F 3 "" H 9300 4550 60 0001 C CNN
@@ -167,10 +167,10 @@ F 3 "" H 9300 4550 60 0001 C CNN
1 0 0 1
$EndComp
$Comp
-L CONN_34 CON3602
+L CONN_34 CON2502
U 1 1 580FA355
P 10100 4550
-F 0 "CON3602" H 10100 2750 60 0000 C CNN
+F 0 "CON2502" H 10100 2750 60 0000 C CNN
F 1 "CONN_34" H 10100 6350 60 0000 C CNN
F 2 "" H 10100 4550 60 0001 C CNN
F 3 "" H 10100 4550 60 0001 C CNN
@@ -262,10 +262,10 @@ Wire Wire Line
10800 6200 10800 6100
Connection ~ 10800 6100
$Comp
-L BEAGLEBOARD-XM-CAMERA P3602
+L BEAGLEBOARD-XM-CAMERA P2501
U 1 1 578E5E9D
P 6150 4500
-F 0 "P3602" H 5550 6250 60 0000 L CNN
+F 0 "P2501" H 5550 6250 60 0000 L CNN
F 1 "BEAGLEBOARD-XM-CAMERA" H 6140 4390 65 0001 L TNN
F 2 "neo900-legacy:BEAGLEBOARD-XM-CAM" H 6140 4290 65 0001 L TNN
F 3 "" H 6150 4500 60 0001 C CNN
diff --git a/hw/bbcpu.sch b/hw/bbcpu.sch
index 6d19410..7f80a6a 100644
--- a/hw/bbcpu.sch
+++ b/hw/bbcpu.sch
@@ -55,12 +55,12 @@ Comment3 ""
Comment4 "Xsheetnumber=34"
$EndDescr
$Comp
-L BEAGLEBOARD P3401J3
+L BEAGLEBOARD P3401J?
U 1 1 578E24E8
P 7850 3950
-AR Path="/578E24E8" Ref="P3401J3" Part="1"
-AR Path="/578AFF32/578E24E8" Ref="P3401J3" Part="1"
-F 0 "P3401J3" H 6350 5400 60 0000 L CNN
+AR Path="/578E24E8" Ref="P3401J?" Part="1"
+AR Path="/578AFF32/578E24E8" Ref="P3401J2301" Part="1"
+F 0 "P3401J2301" H 6350 5400 60 0000 L CNN
F 1 "435-40-228-00-160000" H 9350 2450 60 0000 R TNN
F 2 "neo900-legacy:BEAGLEBOARD" H 7840 3740 65 0001 L TNN
F 3 "" H 7850 3950 60 0001 C CNN
@@ -229,10 +229,10 @@ Wire Wire Line
Wire Wire Line
9550 4250 12100 4250
$Comp
-L SLG46531 U3401
+L SLG46531 U2303
U 1 1 58078597
P 12800 4050
-F 0 "U3401" H 12300 4600 60 0000 L CNN
+F 0 "U2303" H 12300 4600 60 0000 L CNN
F 1 "SLG46531" H 13000 3450 60 0000 L CNN
F 2 "" H 12800 4050 60 0001 C CNN
F 3 "" H 12800 4050 60 0001 C CNN
@@ -240,10 +240,10 @@ F 3 "" H 12800 4050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C3401
+L C0402 C2303
U 1 1 580785D7
P 12000 4700
-F 0 "C3401" H 12040 4740 50 0000 L CNN
+F 0 "C2303" H 12040 4740 50 0000 L CNN
F 1 "100n" H 12050 4550 50 0000 L CNN
F 2 "SMD-0402" H 12030 4850 20 0001 C CNN
F 3 "" H 12000 4700 60 0001 C CNN
@@ -358,10 +358,10 @@ MCBSP4_FSX_U
NoConn ~ 12900 4750
NoConn ~ 12100 3850
$Comp
-L 74X4051 U3402
+L 74X4051 U2302
U 1 1 5807A50E
P 2700 9750
-F 0 "U3402" H 2900 10300 60 0000 R CNN
+F 0 "U2302" H 2900 10300 60 0000 R CNN
F 1 "NX3L4051PW" H 2700 9150 60 0000 C CNN
F 2 "" H 2700 9600 60 0001 C CNN
F 3 "" H 2700 9600 60 0001 C CNN
@@ -380,10 +380,10 @@ F 3 "" H 2200 10800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C3402
+L C0402 C2302
U 1 1 5807A744
P 3250 10350
-F 0 "C3402" H 3290 10390 50 0000 L CNN
+F 0 "C2302" H 3290 10390 50 0000 L CNN
F 1 "100n" H 3300 10200 50 0000 L CNN
F 2 "SMD-0402" H 3280 10500 20 0001 C CNN
F 3 "" H 3250 10350 60 0001 C CNN
@@ -561,8 +561,8 @@ L C0402 C?
U 1 1 580E02E0
P 1350 5050
AR Path="/578AFF16/580E02E0" Ref="C?" Part="1"
-AR Path="/578AFF32/580E02E0" Ref="C3403" Part="1"
-F 0 "C3403" H 1390 5090 50 0000 L CNN
+AR Path="/578AFF32/580E02E0" Ref="C2301" Part="1"
+F 0 "C2301" H 1390 5090 50 0000 L CNN
F 1 "100n" H 1390 4920 50 0000 L CNN
F 2 "SMD-0402" H 1380 5200 20 0001 C CNN
F 3 "" H 1350 5050 60 0001 C CNN
@@ -665,10 +665,10 @@ UART3_CTS_RCTX_U
Text Notes 5450 8300 2 60 ~ 0
No UART3_CTS on BB-xM, using GPIO
$Comp
-L BB-XM-AUX P3402
+L BB-XM-AUX P2301
U 1 1 57F7240B
P 7800 8350
-F 0 "P3402" H 7100 9400 60 0000 L CNN
+F 0 "P2301" H 7100 9400 60 0000 L CNN
F 1 "852-10-020-10-001000" H 7800 7250 60 0000 C CNN
F 2 "" H 7800 8350 60 0001 C CNN
F 3 "" H 7800 8350 60 0001 C CNN
@@ -694,8 +694,8 @@ L LED-0603 D?
U 1 1 58121E17
P 4050 3900
AR Path="/578AFF10/58121E17" Ref="D?" Part="1"
-AR Path="/578AFF32/58121E17" Ref="D3401" Part="1"
-F 0 "D3401" V 4100 4100 50 0000 L CNN
+AR Path="/578AFF32/58121E17" Ref="D2301" Part="1"
+F 0 "D2301" V 4100 4100 50 0000 L CNN
F 1 "LTST-C190KRKT" V 4000 4100 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603D" H 4040 3690 65 0001 L TNN
F 3 "" H 4050 3900 60 0001 C CNN
@@ -713,10 +713,10 @@ HB_C_U
Text GLabel 3050 4700 2 60 BiDi ~ 0
HB_D_U
$Comp
-L XRA1201 U3403
+L XRA1201 U2301
U 1 1 580E02C7
P 2350 4300
-F 0 "U3403" H 2050 5250 60 0000 L CNN
+F 0 "U2301" H 2050 5250 60 0000 L CNN
F 1 "XRA1201" H 2350 3350 60 0000 C CNN
F 2 "" H 2350 4300 60 0001 C CNN
F 3 "" H 2350 4300 60 0001 C CNN
diff --git a/hw/bbdisp.sch b/hw/bbdisp.sch
index 41b09b8..2add9c8 100644
--- a/hw/bbdisp.sch
+++ b/hw/bbdisp.sch
@@ -55,12 +55,12 @@ Comment3 ""
Comment4 "Xsheetnumber=35"
$EndDescr
$Comp
-L BEAGLEBOARD P3401
+L BEAGLEBOARD P?
U 2 1 578E3A87
P 9000 3200
-AR Path="/578E3A87" Ref="P3401" Part="2"
-AR Path="/578AFF34/578E3A87" Ref="P3401" Part="2"
-F 0 "P3401" H 8801 4300 60 0000 L BNN
+AR Path="/578E3A87" Ref="P?" Part="2"
+AR Path="/578AFF34/578E3A87" Ref="P2401" Part="2"
+F 0 "P2401" H 8801 4300 60 0000 L BNN
F 1 "852-10-020-10-001000" H 10800 2100 60 0000 R TNN
F 2 "neo900-legacy:BEAGLEBOARD" H 8990 2990 65 0001 L TNN
F 3 "" H 9000 3200 60 0001 C CNN
@@ -68,12 +68,12 @@ F 3 "" H 9000 3200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L BEAGLEBOARD P3401
+L BEAGLEBOARD P?
U 3 1 578E3AEB
P 9000 6700
-AR Path="/578E3AEB" Ref="P3401" Part="3"
-AR Path="/578AFF34/578E3AEB" Ref="P3401" Part="3"
-F 0 "P3401" H 8801 7800 60 0000 L BNN
+AR Path="/578E3AEB" Ref="P?" Part="3"
+AR Path="/578AFF34/578E3AEB" Ref="P2401" Part="3"
+F 0 "P2401" H 8801 7800 60 0000 L BNN
F 1 "852-10-020-10-001000" H 10800 5600 60 0000 R TNN
F 2 "neo900-legacy:BEAGLEBOARD" H 8990 6490 65 0001 L TNN
F 3 "" H 9000 6700 60 0001 C CNN
@@ -284,10 +284,10 @@ Same part, as "breakaway" strip (100 positions):\n852-10-1000-10-001000
Text Notes 7700 9200 0 60 ~ 0
Connect to BB-xM P4.3 (S-Video connector)
$Comp
-L CONN_2 CON3501
+L CONN_2 CON2401
U 1 1 58210049
P 7450 9250
-F 0 "CON3501" H 7450 9400 60 0000 C CNN
+F 0 "CON2401" H 7450 9400 60 0000 C CNN
F 1 "DNP" H 7450 9100 60 0000 C CNN
F 2 "" H 7450 9250 60 0001 C CNN
F 3 "" H 7450 9250 60 0001 C CNN
diff --git a/hw/bob.sch b/hw/bob.sch
index 3a0d8f2..4c0f151 100644
--- a/hw/bob.sch
+++ b/hw/bob.sch
@@ -61,10 +61,10 @@ Battery Cover detect
Text Notes 2500 1750 0 120 ~ 0
Camera Cover detect
$Comp
-L C0402 C2101
+L C0402 C1701
U 1 1 578D03C6
P 2050 3350
-F 0 "C2101" H 2090 3390 50 0000 L CNN
+F 0 "C1701" H 2090 3390 50 0000 L CNN
F 1 "1u" H 2090 3220 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 2080 3500 20 0001 C CNN
F 3 "" H 2050 3350 60 0001 C CNN
@@ -72,10 +72,10 @@ F 3 "" H 2050 3350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C2102
+L C0402 C1702
U 1 1 578D048E
P 2650 3350
-F 0 "C2102" H 2690 3390 50 0000 L CNN
+F 0 "C1702" H 2690 3390 50 0000 L CNN
F 1 "1u" H 2690 3220 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 2680 3500 20 0001 C CNN
F 3 "" H 2650 3350 60 0001 C CNN
@@ -83,10 +83,10 @@ F 3 "" H 2650 3350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0603 C2104
+L C0603 C1705
U 1 1 578D0556
P 9500 3600
-F 0 "C2104" H 9540 3640 50 0000 L CNN
+F 0 "C1705" H 9540 3640 50 0000 L CNN
F 1 "100n" H 9550 3450 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 9530 3750 20 0001 C CNN
F 3 "" H 9500 3600 60 0001 C CNN
@@ -94,10 +94,10 @@ F 3 "" H 9500 3600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 TP2101
+L TEST-POINT-1.25 TP1701
U 1 1 578D07AE
P 11700 2150
-F 0 "TP2101" H 11690 2140 65 0001 L TNN
+F 0 "TP1701" H 11690 2140 65 0001 L TNN
F 1 "SD_CD" H 11750 2150 60 0000 L CNN
F 2 "neo900-legacy:TP-1.25" H 11690 1940 65 0001 L TNN
F 3 "" H 11700 2150 60 0001 C CNN
@@ -105,10 +105,10 @@ F 3 "" H 11700 2150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R2101
+L R0402 R1701
U 1 1 578D17B2
P 2350 2600
-F 0 "R2101" H 2220 2660 50 0000 L BNN
+F 0 "R1701" H 2220 2660 50 0000 L BNN
F 1 "22" H 2350 2600 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 2380 2750 20 0001 C CNN
F 3 "" H 2350 2600 60 0001 C CNN
@@ -193,10 +193,10 @@ F 3 "" H 3200 2900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L MLX90248ESE U2101
+L MLX90248ESE U1704
U 1 1 578D1DF3
P 6600 3000
-F 0 "U2101" H 6300 3340 50 0000 L BNN
+F 0 "U1704" H 6300 3340 50 0000 L BNN
F 1 "MLX90248ESE" H 6650 2600 50 0000 L BNN
F 2 "neo900-legacy:SOT23" H 6590 2790 65 0001 L TNN
F 3 "" H 6600 3000 60 0001 C CNN
@@ -208,10 +208,10 @@ Text Label 5500 2300 0 60 ~ 0
Text Label 7800 3000 2 60 ~ 0
BATT_LID
$Comp
-L SD-SLOT+CD P2101
+L SD-SLOT+CD P1701
U 1 1 578D0EB6
P 10700 2900
-F 0 "P2101" H 10400 3750 50 0000 L BNN
+F 0 "P1701" H 10400 3750 50 0000 L BNN
F 1 "ST1W008S4BR1500" V 11250 2400 50 0000 L CNN
F 2 "neo900-legacy:ST1W008S4BR1500" H 10300 2000 50 0001 L BNN
F 3 "" H 10700 2900 60 0001 C CNN
@@ -219,10 +219,10 @@ F 3 "" H 10700 2900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TMD2671 U2102
+L TMD2671 U1702
U 1 1 57D840BB
P 3800 3000
-F 0 "U2102" H 3500 3550 50 0000 L CNN
+F 0 "U1702" H 3500 3550 50 0000 L CNN
F 1 "TMD26713" H 3800 2550 50 0000 C CNN
F 2 "TMD2671" H 3800 2450 20 0001 C CNN
F 3 "" H 3050 3150 60 0001 C CNN
@@ -236,10 +236,10 @@ I2C2_SCL
Text Label 5150 3000 2 60 ~ 0
CAM_COVER_INT
$Comp
-L C0603 C2103
+L C0603 C1704
U 1 1 57D87736
P 8900 7850
-F 0 "C2103" H 8940 7890 50 0000 L CNN
+F 0 "C1704" H 8940 7890 50 0000 L CNN
F 1 "22u" H 8950 7700 50 0000 L CNN
F 2 "neo900-legacy:SMD-1206" H 8930 8000 20 0001 C CNN
F 3 "" H 8900 7850 60 0001 C CNN
@@ -258,10 +258,10 @@ F 3 "" H 8900 8250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LED-0603 LED2101
+L LED-0603 LED1702
U 1 1 57D858D2
P 13900 2600
-F 0 "LED2101" V 13950 2450 50 0000 R CNN
+F 0 "LED1702" V 13950 2450 50 0000 R CNN
F 1 "L130-5780002011001" V 13850 2450 50 0000 R CNN
F 2 "neo900-legacy:SMD-0603D" H 13890 2390 65 0001 L TNN
F 3 "" H 13900 2600 60 0001 C CNN
@@ -269,10 +269,10 @@ F 3 "" H 13900 2600 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L LED-0603 LED2102
+L LED-0603 LED1703
U 1 1 57D8623C
P 13900 3300
-F 0 "LED2102" V 13950 3150 50 0000 R CNN
+F 0 "LED1703" V 13950 3150 50 0000 R CNN
F 1 "L130-5780002011001" V 13850 3150 50 0000 R CNN
F 2 "neo900-legacy:SMD-0603D" H 13890 3090 65 0001 L TNN
F 3 "" H 13900 3300 60 0001 C CNN
@@ -280,10 +280,10 @@ F 3 "" H 13900 3300 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L CONN_11_10_S2 CON2101
+L CONN_11_10_S2 CON1701
U 1 1 57D8AD9B
P 3300 7100
-F 0 "CON2101" H 3300 7700 60 0000 C CNN
+F 0 "CON1701" H 3300 7700 60 0000 C CNN
F 1 "DF9-21P-1V" H 3300 6350 60 0000 C CNN
F 2 "" H 3300 7100 60 0001 C CNN
F 3 "" H 3300 7100 60 0001 C CNN
@@ -291,10 +291,10 @@ F 3 "" H 3300 7100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L CONN_11_10_S2 CON2102
+L CONN_11_10_S2 CON1702
U 1 1 57D8AF84
P 8400 7100
-F 0 "CON2102" H 8400 7700 60 0000 C CNN
+F 0 "CON1702" H 8400 7700 60 0000 C CNN
F 1 "DF9-21P-1V" H 8400 6350 60 0000 C CNN
F 2 "" H 8400 7100 60 0001 C CNN
F 3 "" H 8400 7100 60 0001 C CNN
@@ -427,10 +427,10 @@ SD_VDD
Text Label 8900 2200 0 60 ~ 0
SD_DAT3
$Comp
-L C0402 C2105
+L C0402 C1703
U 1 1 57D91A11
P 5900 2500
-F 0 "C2105" H 5940 2540 50 0000 L CNN
+F 0 "C1703" H 5940 2540 50 0000 L CNN
F 1 "10n" H 5940 2370 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 5930 2650 20 0001 C CNN
F 3 "" H 5900 2500 60 0001 C CNN
@@ -451,12 +451,10 @@ $EndComp
Text Notes 6950 3800 0 70 ~ 0
Output filter is on LOWER,\ndue to access to 1.8 V rail.
$Comp
-L LED-RGB-SMLP36 LED2101
+L LED-RGB-SMLP36 LED1701
U 1 1 57D8FE56
P 13800 5300
-AR Path="/57D8FE56" Ref="LED2101" Part="1"
-AR Path="/578AFF18/57D8FE56" Ref="LED2103" Part="1"
-F 0 "LED2103" H 13600 5850 45 0000 L CNN
+F 0 "LED1701" H 13600 5850 45 0000 L CNN
F 1 "LED-RGB-SMLP36" H 13800 4800 45 0000 C CNN
F 2 "SMLP36RGB2W3" H 13800 4700 20 0001 C CNN
F 3 "" H 13800 5300 60 0001 C CNN
@@ -472,10 +470,10 @@ PRIVACY_G
Text Label 12400 5000 0 60 ~ 0
VBAT_SWITCHED
$Comp
-L CONN_10X2 CON2103
+L CONN_10X2 CON1703
U 1 1 57D9F188
P 13800 7950
-F 0 "CON2103" H 13800 8500 60 0000 C CNN
+F 0 "CON1703" H 13800 8500 60 0000 C CNN
F 1 "M50-3151042" H 13800 7400 60 0000 C CNN
F 2 "" H 13800 7950 60 0001 C CNN
F 3 "" H 13800 7950 60 0001 C CNN
@@ -575,10 +573,10 @@ Camera flash
Text Notes 13200 4450 0 120 ~ 0
Privacy LED
$Comp
-L SP7538P U2103
+L SP7538P U1701
U 1 1 581D599F
P 2500 9100
-F 0 "U2103" V 2500 9600 60 0000 L CNN
+F 0 "U1701" V 2500 9600 60 0000 L CNN
F 1 "SP7538P" V 2300 9150 60 0000 C CNN
F 2 "" H 2500 9025 60 0001 C CNN
F 3 "" H 2500 9025 60 0001 C CNN
@@ -586,10 +584,10 @@ F 3 "" H 2500 9025 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L SP7538P U2104
+L SP7538P U1703
U 1 1 581D5DB7
P 4700 9100
-F 0 "U2104" V 4700 9600 60 0000 L CNN
+F 0 "U1703" V 4700 9600 60 0000 L CNN
F 1 "SP7538P" V 4500 9150 60 0000 C CNN
F 2 "" H 4700 9025 60 0001 C CNN
F 3 "" H 4700 9025 60 0001 C CNN
@@ -597,10 +595,10 @@ F 3 "" H 4700 9025 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L SP7538P U2105
+L SP7538P U1705
U 1 1 581D5E1C
P 7500 9100
-F 0 "U2105" V 7500 9600 60 0000 L CNN
+F 0 "U1705" V 7500 9600 60 0000 L CNN
F 1 "SP7538P" V 7300 9150 60 0000 C CNN
F 2 "" H 7500 9025 60 0001 C CNN
F 3 "" H 7500 9025 60 0001 C CNN
@@ -641,10 +639,10 @@ F 3 "" H 8200 9300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L SP7538P U2106
+L SP7538P U1706
U 1 1 581D7FFE
P 10000 9100
-F 0 "U2106" V 10000 9600 60 0000 L CNN
+F 0 "U1706" V 10000 9600 60 0000 L CNN
F 1 "SP7538P" V 9800 9150 60 0000 C CNN
F 2 "" H 10000 9025 60 0001 C CNN
F 3 "" H 10000 9025 60 0001 C CNN
@@ -1075,8 +1073,8 @@ P 1800 8100
AR Path="/578AFEF0/581DCD19" Ref="D?" Part="1"
AR Path="/581DCD19" Ref="D?" Part="1"
AR Path="/578AFEF2/581DCD19" Ref="D?" Part="1"
-AR Path="/578AFF18/581DCD19" Ref="D2101" Part="1"
-F 0 "D2101" V 1900 8250 50 0000 L BNN
+AR Path="/578AFF18/581DCD19" Ref="D1701" Part="1"
+F 0 "D1701" V 1900 8250 50 0000 L BNN
F 1 "V9MLA0603N" V 1650 8150 50 0000 L BNN
F 2 "neo900-legacy:SMD-0603" H 1790 7890 65 0001 L TNN
F 3 "" H 1800 8100 60 0001 C CNN
diff --git a/hw/cams.sch b/hw/cams.sch
index da2540e..287ae45 100644
--- a/hw/cams.sch
+++ b/hw/cams.sch
@@ -59,10 +59,10 @@ Main Camera
Text Notes 9300 6950 0 120 ~ 0
Front camera (display connector)
$Comp
-L C0402 C3001
+L C0402 C2003
U 1 1 578DA379
P 9450 3150
-F 0 "C3001" H 9490 3190 50 0000 L CNN
+F 0 "C2003" H 9490 3190 50 0000 L CNN
F 1 "27p" H 9490 3020 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 9480 3300 20 0001 C CNN
F 3 "" H 9450 3150 60 0001 C CNN
@@ -70,10 +70,10 @@ F 3 "" H 9450 3150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C3002
+L C0402 C2005
U 1 1 578DA441
P 9750 3150
-F 0 "C3002" H 9790 3190 50 0000 L CNN
+F 0 "C2005" H 9790 3190 50 0000 L CNN
F 1 "2u2" H 9790 3020 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 9780 3300 20 0001 C CNN
F 3 "" H 9750 3150 60 0001 C CNN
@@ -81,10 +81,10 @@ F 3 "" H 9750 3150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C3003
+L C0402 C2004
U 1 1 578DA509
P 9450 3900
-F 0 "C3003" H 9490 3940 50 0000 L CNN
+F 0 "C2004" H 9490 3940 50 0000 L CNN
F 1 "27p" H 9490 3770 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 9480 4050 20 0001 C CNN
F 3 "" H 9450 3900 60 0001 C CNN
@@ -92,10 +92,10 @@ F 3 "" H 9450 3900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C3004
+L C0402 C2006
U 1 1 578DA5D1
P 9750 3900
-F 0 "C3004" H 9790 3940 50 0000 L CNN
+F 0 "C2006" H 9790 3940 50 0000 L CNN
F 1 "2u2" H 9790 3770 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 9780 4050 20 0001 C CNN
F 3 "" H 9750 3900 60 0001 C CNN
@@ -103,10 +103,10 @@ F 3 "" H 9750 3900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C3005
+L C0402 C2007
U 1 1 578DA699
P 9750 4650
-F 0 "C3005" H 9790 4690 50 0000 L CNN
+F 0 "C2007" H 9790 4690 50 0000 L CNN
F 1 "2u2" H 9790 4520 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 9780 4800 20 0001 C CNN
F 3 "" H 9750 4650 60 0001 C CNN
@@ -114,10 +114,10 @@ F 3 "" H 9750 4650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C3006
+L C0402 C2001
U 1 1 578DA761
P 6650 6800
-F 0 "C3006" H 6690 6840 50 0000 L CNN
+F 0 "C2001" H 6690 6840 50 0000 L CNN
F 1 "100n" H 6690 6670 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 6680 6950 20 0001 C CNN
F 3 "" H 6650 6800 60 0001 C CNN
@@ -125,10 +125,10 @@ F 3 "" H 6650 6800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C3007
+L C0402 C2002
U 1 1 578DA829
P 6950 6800
-F 0 "C3007" H 6990 6840 50 0000 L CNN
+F 0 "C2002" H 6990 6840 50 0000 L CNN
F 1 "100n" H 6990 6670 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 6980 6950 20 0001 C CNN
F 3 "" H 6950 6800 60 0001 C CNN
@@ -136,10 +136,10 @@ F 3 "" H 6950 6800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L L0402 L3001
+L L0402 L2001
U 1 1 578DA9B9
P 10250 3000
-F 0 "L3001" V 10192 2850 50 0000 L BNN
+F 0 "L2001" V 10192 2850 50 0000 L BNN
F 1 "~" H 10240 2890 65 0001 L TNN
F 2 "neo900-legacy:SMD-0402" H 10240 2790 65 0001 L TNN
F 3 "" H 10250 3000 60 0001 C CNN
@@ -147,10 +147,10 @@ F 3 "" H 10250 3000 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L N900-CAMERAN97 N3001
+L N900-CAMERAN97 N2001
U 1 1 578DAA81
P 11800 3150
-F 0 "N3001" H 11600 3190 70 0000 L BNN
+F 0 "N2001" H 11600 3190 70 0000 L BNN
F 1 "N97-CAMERA" H 11600 3051 70 0000 L BNN
F 2 "neo900-legacy:N97-CAMERA" H 11600 3051 70 0001 L BNN
F 3 "" H 11800 3150 60 0001 C CNN
@@ -158,12 +158,12 @@ F 3 "" H 11800 3150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L N900-DISPLAY P1
+L N900-DISPLAY P?
U 1 1 578DAB49
P 9900 7650
-AR Path="/578DAB49" Ref="P1" Part="1"
-AR Path="/578AFF2A/578DAB49" Ref="P1" Part="1"
-F 0 "P1" H 9741 7990 70 0000 L BNN
+AR Path="/578DAB49" Ref="P?" Part="1"
+AR Path="/578AFF2A/578DAB49" Ref="P1901" Part="1"
+F 0 "P1901" H 9741 7990 70 0000 L BNN
F 1 "N900-DISPLAY" H 9700 7250 70 0000 L BNN
F 2 "neo900-legacy:500024-6471" H 9890 7440 65 0001 L TNN
F 3 "" H 9900 7650 60 0001 C CNN
@@ -171,10 +171,10 @@ F 3 "" H 9900 7650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L DF37NB-20DS-0.4_N97CAM P3001
+L DF37NB-20DS-0.4_N97CAM P2001
U 1 1 578DAC11
P 9900 5750
-F 0 "P3001" H 9741 6090 70 0000 L BNN
+F 0 "P2001" H 9741 6090 70 0000 L BNN
F 1 "DF37NB-20DS-0.4/N97CAM" H 9700 5350 70 0000 L BNN
F 2 "neo900-legacy:DF37NB-20SD-0.4V" H 9890 5540 65 0001 L TNN
F 3 "" H 9900 5750 60 0001 C CNN
@@ -182,10 +182,10 @@ F 3 "" H 9900 5750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L DF37NB-20DS-0.4_N97CAM P3001
+L DF37NB-20DS-0.4_N97CAM P2001
U 2 1 578DAC75
P 8700 3750
-F 0 "P3001" H 8400 4300 65 0000 L CNN
+F 0 "P2001" H 8400 4300 65 0000 L CNN
F 1 "DF37NB-20DS-0.4/N97CAM" H 8690 3640 65 0001 L TNN
F 2 "neo900-legacy:DF37NB-20SD-0.4V" H 8690 3540 65 0001 L TNN
F 3 "" H 8700 3750 60 0001 C CNN
@@ -193,10 +193,10 @@ F 3 "" H 8700 3750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L DF37NB-20DS-0.4_N97CAM P3001
+L DF37NB-20DS-0.4_N97CAM P2001
U 3 1 578DACD9
P 12900 3550
-F 0 "P3001" H 12890 3540 65 0001 L TNN
+F 0 "P2001" H 12890 3540 65 0001 L TNN
F 1 "DF37NB-20DS-0.4/N97CAM" H 12890 3440 65 0001 L TNN
F 2 "neo900-legacy:DF37NB-20SD-0.4V" H 12890 3340 65 0001 L TNN
F 3 "" H 12900 3550 60 0001 C CNN
@@ -204,10 +204,10 @@ F 3 "" H 12900 3550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L DF37NB-20DS-0.4_N97CAM P3001
+L DF37NB-20DS-0.4_N97CAM P2001
U 4 1 578DAD3D
P 12900 3650
-F 0 "P3001" H 12890 3640 65 0001 L TNN
+F 0 "P2001" H 12890 3640 65 0001 L TNN
F 1 "DF37NB-20DS-0.4/N97CAM" H 12890 3540 65 0001 L TNN
F 2 "neo900-legacy:DF37NB-20SD-0.4V" H 12890 3440 65 0001 L TNN
F 3 "" H 12900 3650 60 0001 C CNN
@@ -215,10 +215,10 @@ F 3 "" H 12900 3650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L DF37NB-20DS-0.4_N97CAM P3001
+L DF37NB-20DS-0.4_N97CAM P2001
U 5 1 578DADA1
P 12900 3750
-F 0 "P3001" H 12890 3740 65 0001 L TNN
+F 0 "P2001" H 12890 3740 65 0001 L TNN
F 1 "DF37NB-20DS-0.4/N97CAM" H 12890 3640 65 0001 L TNN
F 2 "neo900-legacy:DF37NB-20SD-0.4V" H 12890 3540 65 0001 L TNN
F 3 "" H 12900 3750 60 0001 C CNN
@@ -226,10 +226,10 @@ F 3 "" H 12900 3750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L DF37NB-20DS-0.4_N97CAM P3001
+L DF37NB-20DS-0.4_N97CAM P2001
U 6 1 578DAE05
P 12900 3850
-F 0 "P3001" H 12890 3840 65 0001 L TNN
+F 0 "P2001" H 12890 3840 65 0001 L TNN
F 1 "DF37NB-20DS-0.4/N97CAM" H 12890 3740 65 0001 L TNN
F 2 "neo900-legacy:DF37NB-20SD-0.4V" H 12890 3640 65 0001 L TNN
F 3 "" H 12900 3850 60 0001 C CNN
@@ -237,10 +237,10 @@ F 3 "" H 12900 3850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L DF37NB-20DS-0.4_N97CAM P3001
+L DF37NB-20DS-0.4_N97CAM P2001
U 7 1 578DAE69
P 12900 3950
-F 0 "P3001" H 12890 3940 65 0001 L TNN
+F 0 "P2001" H 12890 3940 65 0001 L TNN
F 1 "DF37NB-20DS-0.4/N97CAM" H 12890 3840 65 0001 L TNN
F 2 "neo900-legacy:DF37NB-20SD-0.4V" H 12890 3740 65 0001 L TNN
F 3 "" H 12900 3950 60 0001 C CNN
@@ -248,10 +248,10 @@ F 3 "" H 12900 3950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L DF37NB-20DS-0.4_N97CAM P3001
+L DF37NB-20DS-0.4_N97CAM P2001
U 8 1 578DAECD
P 12900 4050
-F 0 "P3001" H 12890 4040 65 0001 L TNN
+F 0 "P2001" H 12890 4040 65 0001 L TNN
F 1 "DF37NB-20DS-0.4/N97CAM" H 12890 3940 65 0001 L TNN
F 2 "neo900-legacy:DF37NB-20SD-0.4V" H 12890 3840 65 0001 L TNN
F 3 "" H 12900 4050 60 0001 C CNN
@@ -259,10 +259,10 @@ F 3 "" H 12900 4050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L DF37NB-20DS-0.4_N97CAM P3001
+L DF37NB-20DS-0.4_N97CAM P2001
U 9 1 578DAF31
P 12900 5150
-F 0 "P3001" H 12791 5400 50 0000 L BNN
+F 0 "P2001" H 12791 5400 50 0000 L BNN
F 1 "DF37NB-20DS-0.4/N97CAM" H 12400 4850 50 0000 L BNN
F 2 "neo900-legacy:DF37NB-20SD-0.4V" H 12890 4940 65 0001 L TNN
F 3 "" H 12900 5150 60 0001 C CNN
@@ -270,10 +270,10 @@ F 3 "" H 12900 5150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L DF37NB-20DS-0.4_N97CAM P3001
+L DF37NB-20DS-0.4_N97CAM P2001
U 10 1 578DAF95
P 12900 4150
-F 0 "P3001" H 12890 4140 65 0001 L TNN
+F 0 "P2001" H 12890 4140 65 0001 L TNN
F 1 "DF37NB-20DS-0.4/N97CAM" H 12890 4040 65 0001 L TNN
F 2 "neo900-legacy:DF37NB-20SD-0.4V" H 12890 3940 65 0001 L TNN
F 3 "" H 12900 4150 60 0001 C CNN
@@ -281,10 +281,10 @@ F 3 "" H 12900 4150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L DF37NB-20DS-0.4_N97CAM P3001
+L DF37NB-20DS-0.4_N97CAM P2001
U 11 1 578DAFF9
P 12900 4250
-F 0 "P3001" H 12890 4240 65 0001 L TNN
+F 0 "P2001" H 12890 4240 65 0001 L TNN
F 1 "DF37NB-20DS-0.4/N97CAM" H 12890 4140 65 0001 L TNN
F 2 "neo900-legacy:DF37NB-20SD-0.4V" H 12890 4040 65 0001 L TNN
F 3 "" H 12900 4250 60 0001 C CNN
@@ -292,10 +292,10 @@ F 3 "" H 12900 4250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R3001
+L R0402 R2001
U 1 1 578DB0C1
P 4900 3550
-F 0 "R3001" H 4770 3610 50 0000 L BNN
+F 0 "R2001" H 4770 3610 50 0000 L BNN
F 1 "47" H 4900 3550 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 4930 3700 20 0001 C CNN
F 3 "" H 4900 3550 60 0001 C CNN
@@ -303,10 +303,10 @@ F 3 "" H 4900 3550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R3002
+L R0402 R2002
U 1 1 578DB189
P 4900 3750
-F 0 "R3002" H 4770 3810 50 0000 L BNN
+F 0 "R2002" H 4770 3810 50 0000 L BNN
F 1 "47" H 4900 3750 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 4930 3900 20 0001 C CNN
F 3 "" H 4900 3750 60 0001 C CNN
@@ -314,10 +314,10 @@ F 3 "" H 4900 3750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R3003
+L R0402 R2003
U 1 1 578DB251
P 4950 5600
-F 0 "R3003" H 4820 5660 50 0000 L BNN
+F 0 "R2003" H 4820 5660 50 0000 L BNN
F 1 "100" H 4950 5600 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 4980 5750 20 0001 C CNN
F 3 "" H 4950 5600 60 0001 C CNN
@@ -325,10 +325,10 @@ F 3 "" H 4950 5600 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R3004
+L R0402 R2004
U 1 1 578DB319
P 4950 7800
-F 0 "R3004" H 4820 7860 50 0000 L BNN
+F 0 "R2004" H 4820 7860 50 0000 L BNN
F 1 "100" H 4950 7800 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 4980 7950 20 0001 C CNN
F 3 "" H 4950 7800 60 0001 C CNN
@@ -413,12 +413,10 @@ F 3 "" H 9750 3550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TS3DS26227YZT U3001
+L TS3DS26227YZT U2001
U 1 1 578DB765
P 5950 5450
-AR Path="/578DB765" Ref="U3001" Part="1"
-AR Path="/578AFF2A/578DB765" Ref="U3001" Part="1"
-F 0 "U3001" H 5550 6100 50 0000 L CNN
+F 0 "U2001" H 5550 6100 50 0000 L CNN
F 1 "TS3DS26227" H 6050 4800 50 0000 L CNN
F 2 "neo900-legacy:R-XBGA-N12-0.5" H 5980 5600 20 0001 C CNN
F 3 "" H 5950 5450 60 0001 C CNN
@@ -426,12 +424,10 @@ F 3 "" H 5950 5450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TS3DS26227YZT U3002
+L TS3DS26227YZT U2002
U 1 1 578DB82D
P 5950 7650
-AR Path="/578DB82D" Ref="U3002" Part="1"
-AR Path="/578AFF2A/578DB82D" Ref="U3002" Part="1"
-F 0 "U3002" H 5550 8300 50 0000 L CNN
+F 0 "U2002" H 5550 8300 50 0000 L CNN
F 1 "TS3DS26227" H 6050 7000 50 0000 L CNN
F 2 "neo900-legacy:R-XBGA-N12-0.5" H 5980 7800 20 0001 C CNN
F 3 "" H 5950 7650 60 0001 C CNN
@@ -727,8 +723,8 @@ U 1 1 5809058F
P 8900 8700
AR Path="/5809058F" Ref="U?" Part="1"
AR Path="/578AFEF2/5809058F" Ref="U?" Part="1"
-AR Path="/578AFF2A/5809058F" Ref="U3003" Part="1"
-F 0 "U3003" H 8500 9150 50 0000 R CNN
+AR Path="/578AFF2A/5809058F" Ref="U2003" Part="1"
+F 0 "U2003" H 8500 9150 50 0000 R CNN
F 1 "IP4220CZ6" H 8900 8450 45 0000 C CNN
F 2 "neo900-legacy:SOT457-6" H 8930 8850 20 0001 C CNN
F 3 "" H 8900 8700 60 0001 C CNN
diff --git a/hw/charger.sch b/hw/charger.sch
index 632a5a7..c4db2f8 100644
--- a/hw/charger.sch
+++ b/hw/charger.sch
@@ -55,10 +55,10 @@ Comment3 ""
Comment4 "Xsheetnumber=2"
$EndDescr
$Comp
-L C0603 C301
+L C0603 C206
U 1 1 578B0C51
P 10900 3100
-F 0 "C301" H 10940 3140 50 0000 L CNN
+F 0 "C206" H 10940 3140 50 0000 L CNN
F 1 "47n" H 10950 2950 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 10930 3250 20 0001 C CNN
F 3 "" H 10900 3100 60 0001 C CNN
@@ -66,10 +66,10 @@ F 3 "" H 10900 3100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0603 C302
+L C0603 C204
U 1 1 578B0D19
P 8200 3300
-F 0 "C302" V 8350 3150 50 0000 L CNN
+F 0 "C204" V 8350 3150 50 0000 L CNN
F 1 "4u7;10V" V 8050 3100 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 8230 3450 20 0001 C CNN
F 3 "" H 8200 3300 60 0001 C CNN
@@ -77,10 +77,10 @@ F 3 "" H 8200 3300 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0603 C303
+L C0603 C205
U 1 1 578B0DE1
P 8700 3300
-F 0 "C303" V 8850 3150 50 0000 L CNN
+F 0 "C205" V 8850 3150 50 0000 L CNN
F 1 "8.2u;10V" V 8550 3100 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 8730 3450 20 0001 C CNN
F 3 "" H 8700 3300 60 0001 C CNN
@@ -88,10 +88,10 @@ F 3 "" H 8700 3300 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0603 C304
+L C0603 C208
U 1 1 578B0EA9
P 11950 3300
-F 0 "C304" H 11990 3340 50 0000 L CNN
+F 0 "C208" H 11990 3340 50 0000 L CNN
F 1 "10u" H 12000 3150 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 11980 3450 20 0001 C CNN
F 3 "" H 11950 3300 60 0001 C CNN
@@ -99,10 +99,10 @@ F 3 "" H 11950 3300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0603 C305
+L C0603 C207
U 1 1 578B0F71
P 11000 4800
-F 0 "C305" H 11040 4840 50 0000 L CNN
+F 0 "C207" H 11040 4840 50 0000 L CNN
F 1 "4u7" H 11050 4650 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 11030 4950 20 0001 C CNN
F 3 "" H 11000 4800 60 0001 C CNN
@@ -110,10 +110,10 @@ F 3 "" H 11000 4800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L L1212 L301
+L L1212 L201
U 1 1 578B109E
P 11350 3000
-F 0 "L301" V 11292 2850 50 0000 L BNN
+F 0 "L201" V 11292 2850 50 0000 L BNN
F 1 "1u" V 11480 2851 50 0000 L BNN
F 2 "neo900-legacy:SMD-1212" H 11340 2790 65 0001 L TNN
F 3 "" H 11350 3000 60 0001 C CNN
@@ -121,10 +121,10 @@ F 3 "" H 11350 3000 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L R0402 R301
+L R0402 R202
U 1 1 578B1166
P 8750 4200
-F 0 "R301" H 8620 4260 50 0000 L BNN
+F 0 "R202" H 8620 4260 50 0000 L BNN
F 1 "317" H 8750 4200 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 8780 4350 20 0001 C CNN
F 3 "" H 8750 4200 60 0001 C CNN
@@ -132,10 +132,10 @@ F 3 "" H 8750 4200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R302
+L R0402 R203
U 1 1 578B122E
P 11400 4950
-F 0 "R302" H 11270 5010 50 0000 L BNN
+F 0 "R203" H 11270 5010 50 0000 L BNN
F 1 "5k52" H 11400 4950 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 11430 5100 20 0001 C CNN
F 3 "" H 11400 4950 60 0001 C CNN
@@ -143,10 +143,10 @@ F 3 "" H 11400 4950 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R303
+L R0402 R204
U 1 1 578B12F6
P 11500 5600
-F 0 "R303" H 11370 5660 50 0000 L BNN
+F 0 "R204" H 11370 5660 50 0000 L BNN
F 1 "31k23" H 11500 5600 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 11530 5750 20 0001 C CNN
F 3 "" H 11500 5600 60 0001 C CNN
@@ -220,10 +220,10 @@ F 3 "" H 11950 3700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L BQ2429XRGE U301
+L BQ2429XRGE U203
U 1 1 578B167A
P 9900 4000
-F 0 "U301" H 9200 5150 50 0000 L CNN
+F 0 "U203" H 9200 5150 50 0000 L CNN
F 1 "BQ24297RGE" H 9850 3700 50 0000 C CNN
F 2 "neo900-legacy:S-PVQFN-N24-0.5" H 9890 3790 65 0001 L TNN
F 3 "" H 9900 4000 60 0001 C CNN
@@ -379,8 +379,8 @@ L R0402 R?
U 1 1 57F9F4FD
P 6700 8300
AR Path="/578AFEF6/57F9F4FD" Ref="R?" Part="1"
-AR Path="/578AFEF4/57F9F4FD" Ref="R304" Part="1"
-F 0 "R304" H 6570 8360 50 0000 L BNN
+AR Path="/578AFEF4/57F9F4FD" Ref="R201" Part="1"
+F 0 "R201" H 6570 8360 50 0000 L BNN
F 1 "(0)" H 6700 8300 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 6730 8450 20 0001 C CNN
F 3 "" H 6700 8300 60 0001 C CNN
@@ -405,8 +405,8 @@ L TPS22964CYZP U?
U 1 1 57F9F50A
P 6700 8800
AR Path="/578AFEF6/57F9F50A" Ref="U?" Part="1"
-AR Path="/578AFEF4/57F9F50A" Ref="U302" Part="1"
-F 0 "U302" H 6400 9150 50 0000 L CNN
+AR Path="/578AFEF4/57F9F50A" Ref="U202" Part="1"
+F 0 "U202" H 6400 9150 50 0000 L CNN
F 1 "TPS22963CYZP" H 6700 8450 50 0000 C CNN
F 2 "neo900-legacy:R-XBGA-N6-0.5" H 6730 8950 20 0001 C CNN
F 3 "" H 6700 8800 60 0001 C CNN
@@ -458,10 +458,10 @@ Wire Wire Line
Wire Wire Line
7200 9000 7300 9000
$Comp
-L C0603 C306
+L C0603 C202
U 1 1 580838E8
P 6100 9300
-F 0 "C306" H 6140 9340 50 0000 L CNN
+F 0 "C202" H 6140 9340 50 0000 L CNN
F 1 "1u" H 6150 9150 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 6130 9450 20 0001 C CNN
F 3 "" H 6100 9300 60 0001 C CNN
@@ -469,10 +469,10 @@ F 3 "" H 6100 9300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0603 C307
+L C0603 C203
U 1 1 58083C29
P 7600 9300
-F 0 "C307" H 7640 9340 50 0000 L CNN
+F 0 "C203" H 7640 9340 50 0000 L CNN
F 1 "100n" H 7650 9150 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 7630 9450 20 0001 C CNN
F 3 "" H 7600 9300 60 0001 C CNN
diff --git a/hw/codec.sch b/hw/codec.sch
index 12d4aee..847eba7 100644
--- a/hw/codec.sch
+++ b/hw/codec.sch
@@ -61,10 +61,10 @@ mcbsp2
Text Notes 13900 1850 0 70 ~ 0
Channel A+B
$Comp
-L C0402 C1101
+L C0402 C1009
U 1 1 578C204E
P 8600 5050
-F 0 "C1101" H 8640 5090 50 0000 L CNN
+F 0 "C1009" H 8640 5090 50 0000 L CNN
F 1 "3n3" H 8640 4920 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 8630 5200 20 0001 C CNN
F 3 "" H 8600 5050 60 0001 C CNN
@@ -72,10 +72,10 @@ F 3 "" H 8600 5050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1102
+L C0402 C1017
U 1 1 578C2116
P 11900 2850
-F 0 "C1102" H 11940 2890 50 0000 L CNN
+F 0 "C1017" H 11940 2890 50 0000 L CNN
F 1 "2u2" H 11940 2720 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 11930 3000 20 0001 C CNN
F 3 "" H 11900 2850 60 0001 C CNN
@@ -83,10 +83,10 @@ F 3 "" H 11900 2850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1103
+L C0402 C1020
U 1 1 578C21DE
P 12200 2850
-F 0 "C1103" H 12240 2890 50 0000 L CNN
+F 0 "C1020" H 12240 2890 50 0000 L CNN
F 1 "100n" H 12240 2720 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 12230 3000 20 0001 C CNN
F 3 "" H 12200 2850 60 0001 C CNN
@@ -94,10 +94,10 @@ F 3 "" H 12200 2850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1104
+L C0402 C1018
U 1 1 578C22A6
P 11900 3550
-F 0 "C1104" H 11940 3590 50 0000 L CNN
+F 0 "C1018" H 11940 3590 50 0000 L CNN
F 1 "2u2" H 11940 3420 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 11930 3700 20 0001 C CNN
F 3 "" H 11900 3550 60 0001 C CNN
@@ -105,10 +105,10 @@ F 3 "" H 11900 3550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1105
+L C0402 C1021
U 1 1 578C236E
P 12200 3550
-F 0 "C1105" H 12240 3590 50 0000 L CNN
+F 0 "C1021" H 12240 3590 50 0000 L CNN
F 1 "100n" H 12240 3420 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 12230 3700 20 0001 C CNN
F 3 "" H 12200 3550 60 0001 C CNN
@@ -116,10 +116,10 @@ F 3 "" H 12200 3550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1106
+L C0402 C1005
U 1 1 578C2436
P 6000 6950
-F 0 "C1106" H 6040 6990 50 0000 L CNN
+F 0 "C1005" H 6040 6990 50 0000 L CNN
F 1 "3n3" H 6040 6820 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 6030 7100 20 0001 C CNN
F 3 "" H 6000 6950 60 0001 C CNN
@@ -127,10 +127,10 @@ F 3 "" H 6000 6950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1107
+L C0402 C1019
U 1 1 578C24FE
P 11900 4250
-F 0 "C1107" H 11940 4290 50 0000 L CNN
+F 0 "C1019" H 11940 4290 50 0000 L CNN
F 1 "2u2" H 11940 4120 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 11930 4400 20 0001 C CNN
F 3 "" H 11900 4250 60 0001 C CNN
@@ -138,10 +138,10 @@ F 3 "" H 11900 4250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1108
+L C0402 C1022
U 1 1 578C25C6
P 12200 4250
-F 0 "C1108" H 12240 4290 50 0000 L CNN
+F 0 "C1022" H 12240 4290 50 0000 L CNN
F 1 "100n" H 12240 4120 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 12230 4400 20 0001 C CNN
F 3 "" H 12200 4250 60 0001 C CNN
@@ -149,10 +149,10 @@ F 3 "" H 12200 4250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1109
+L C0402 C1006
U 1 1 578C268E
P 6000 7550
-F 0 "C1109" H 6040 7590 50 0000 L CNN
+F 0 "C1006" H 6040 7590 50 0000 L CNN
F 1 "3n3" H 6040 7420 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 6030 7700 20 0001 C CNN
F 3 "" H 6000 7550 60 0001 C CNN
@@ -160,10 +160,10 @@ F 3 "" H 6000 7550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1110
+L C0402 C1007
U 1 1 578C2756
P 6000 8150
-F 0 "C1110" H 6040 8190 50 0000 L CNN
+F 0 "C1007" H 6040 8190 50 0000 L CNN
F 1 "3n3" H 6040 8020 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 6030 8300 20 0001 C CNN
F 3 "" H 6000 8150 60 0001 C CNN
@@ -171,10 +171,10 @@ F 3 "" H 6000 8150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1111
+L C0402 C1008
U 1 1 578C281E
P 6000 8750
-F 0 "C1111" H 6040 8790 50 0000 L CNN
+F 0 "C1008" H 6040 8790 50 0000 L CNN
F 1 "3n3" H 6040 8620 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 6030 8900 20 0001 C CNN
F 3 "" H 6000 8750 60 0001 C CNN
@@ -182,10 +182,10 @@ F 3 "" H 6000 8750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L L-MPZ1608 L1101
+L L-MPZ1608 L1003
U 1 1 578C29AE
P 11600 2700
-F 0 "L1101" V 11542 2550 50 0000 L BNN
+F 0 "L1003" V 11542 2550 50 0000 L BNN
F 1 "tdb." V 11730 2551 50 0000 L BNN
F 2 "neo900-legacy:MPZ1608" H 11590 2490 65 0001 L TNN
F 3 "" H 11600 2700 60 0001 C CNN
@@ -193,10 +193,10 @@ F 3 "" H 11600 2700 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L L-MPZ1608 L1102
+L L-MPZ1608 L1004
U 1 1 578C2A76
P 11600 3400
-F 0 "L1102" V 11542 3250 50 0000 L BNN
+F 0 "L1004" V 11542 3250 50 0000 L BNN
F 1 "tbd." V 11730 3251 50 0000 L BNN
F 2 "neo900-legacy:MPZ1608" H 11590 3190 65 0001 L TNN
F 3 "" H 11600 3400 60 0001 C CNN
@@ -204,10 +204,10 @@ F 3 "" H 11600 3400 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L L-MPZ1608 L1103
+L L-MPZ1608 L1005
U 1 1 578C2B3E
P 11600 4100
-F 0 "L1103" V 11542 3950 50 0000 L BNN
+F 0 "L1005" V 11542 3950 50 0000 L BNN
F 1 "tbd." V 11730 3951 50 0000 L BNN
F 2 "neo900-legacy:MPZ1608" H 11590 3890 65 0001 L TNN
F 3 "" H 11600 4100 60 0001 C CNN
@@ -215,10 +215,10 @@ F 3 "" H 11600 4100 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L R0402 R1101
+L R0402 R1001
U 1 1 578C2C06
P 3700 2950
-F 0 "R1101" H 3570 3010 50 0000 L BNN
+F 0 "R1001" H 3570 3010 50 0000 L BNN
F 1 "100" H 3700 2950 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 3730 3100 20 0001 C CNN
F 3 "" H 3700 2950 60 0001 C CNN
@@ -226,10 +226,10 @@ F 3 "" H 3700 2950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1102
+L R0402 R1005
U 1 1 578C2CCE
P 5600 6850
-F 0 "R1102" H 5470 6910 50 0000 L BNN
+F 0 "R1005" H 5470 6910 50 0000 L BNN
F 1 "560" H 5600 6850 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5630 7000 20 0001 C CNN
F 3 "" H 5600 6850 60 0001 C CNN
@@ -237,10 +237,10 @@ F 3 "" H 5600 6850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1103
+L R0402 R1006
U 1 1 578C2D96
P 5600 7050
-F 0 "R1103" H 5470 7110 50 0000 L BNN
+F 0 "R1006" H 5470 7110 50 0000 L BNN
F 1 "560" H 5600 7050 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5630 7200 20 0001 C CNN
F 3 "" H 5600 7050 60 0001 C CNN
@@ -248,10 +248,10 @@ F 3 "" H 5600 7050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1104
+L R0402 R1007
U 1 1 578C2E5E
P 5600 7450
-F 0 "R1104" H 5470 7510 50 0000 L BNN
+F 0 "R1007" H 5470 7510 50 0000 L BNN
F 1 "560" H 5600 7450 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5630 7600 20 0001 C CNN
F 3 "" H 5600 7450 60 0001 C CNN
@@ -259,10 +259,10 @@ F 3 "" H 5600 7450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1105
+L R0402 R1008
U 1 1 578C2F26
P 5600 7650
-F 0 "R1105" H 5470 7710 50 0000 L BNN
+F 0 "R1008" H 5470 7710 50 0000 L BNN
F 1 "560" H 5600 7650 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5630 7800 20 0001 C CNN
F 3 "" H 5600 7650 60 0001 C CNN
@@ -270,10 +270,10 @@ F 3 "" H 5600 7650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1106
+L R0402 R1009
U 1 1 578C2FEE
P 5600 8150
-F 0 "R1106" H 5470 8210 50 0000 L BNN
+F 0 "R1009" H 5470 8210 50 0000 L BNN
F 1 "560" H 5600 8150 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5630 8300 20 0001 C CNN
F 3 "" H 5600 8150 60 0001 C CNN
@@ -281,10 +281,10 @@ F 3 "" H 5600 8150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1107
+L R0402 R1010
U 1 1 578C30B6
P 5600 8350
-F 0 "R1107" H 5470 8410 50 0000 L BNN
+F 0 "R1010" H 5470 8410 50 0000 L BNN
F 1 "560" H 5600 8350 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5630 8500 20 0001 C CNN
F 3 "" H 5600 8350 60 0001 C CNN
@@ -292,10 +292,10 @@ F 3 "" H 5600 8350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1108
+L R0402 R1011
U 1 1 578C317E
P 5600 8750
-F 0 "R1108" H 5470 8810 50 0000 L BNN
+F 0 "R1011" H 5470 8810 50 0000 L BNN
F 1 "560" H 5600 8750 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5630 8900 20 0001 C CNN
F 3 "" H 5600 8750 60 0001 C CNN
@@ -303,10 +303,10 @@ F 3 "" H 5600 8750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1109
+L R0402 R1012
U 1 1 578C3246
P 5600 8950
-F 0 "R1109" H 5470 9010 50 0000 L BNN
+F 0 "R1012" H 5470 9010 50 0000 L BNN
F 1 "560" H 5600 8950 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5630 9100 20 0001 C CNN
F 3 "" H 5600 8950 60 0001 C CNN
@@ -314,10 +314,10 @@ F 3 "" H 5600 8950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1110
+L R0402 R1002
U 1 1 578C330E
P 5500 9350
-F 0 "R1110" H 5370 9410 50 0000 L BNN
+F 0 "R1002" H 5370 9410 50 0000 L BNN
F 1 "560" H 5500 9350 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5530 9500 20 0001 C CNN
F 3 "" H 5500 9350 60 0001 C CNN
@@ -325,10 +325,10 @@ F 3 "" H 5500 9350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1111
+L R0402 R1003
U 1 1 578C33D6
P 5500 9550
-F 0 "R1111" H 5370 9610 50 0000 L BNN
+F 0 "R1003" H 5370 9610 50 0000 L BNN
F 1 "560" H 5500 9550 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5530 9700 20 0001 C CNN
F 3 "" H 5500 9550 60 0001 C CNN
@@ -380,10 +380,10 @@ F 3 "" H 12200 3200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TLV320AIC34ZAS U1101
+L TLV320AIC34ZAS U1001
U 1 1 578C3FF2
P 4700 3450
-F 0 "U1101" H 4351 4210 50 0000 L BNN
+F 0 "U1001" H 4351 4210 50 0000 L BNN
F 1 "tlv320aic34" H 4350 2750 50 0000 L BNN
F 2 "neo900-legacy:S-PBGA-N87-0.5" H 4690 3240 65 0001 L TNN
F 3 "" H 4700 3450 60 0001 C CNN
@@ -391,10 +391,10 @@ F 3 "" H 4700 3450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TLV320AIC34ZAS U1101
+L TLV320AIC34ZAS U1001
U 3 1 578C40BA
P 4800 6950
-F 0 "U1101" H 4601 7210 50 0000 L BNN
+F 0 "U1001" H 4601 7210 50 0000 L BNN
F 1 "tlv320aic34" H 4500 6751 50 0001 L BNN
F 2 "neo900-legacy:S-PBGA-N87-0.5" H 4790 6740 65 0001 L TNN
F 3 "" H 4800 6950 60 0001 C CNN
@@ -402,10 +402,10 @@ F 3 "" H 4800 6950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TLV320AIC34ZAS U1101
+L TLV320AIC34ZAS U1001
U 4 1 578C411E
P 8000 6950
-F 0 "U1101" H 7801 7210 50 0000 L BNN
+F 0 "U1001" H 7801 7210 50 0000 L BNN
F 1 "tlv320aic34" H 7700 6751 50 0001 L BNN
F 2 "neo900-legacy:S-PBGA-N87-0.5" H 7990 6740 65 0001 L TNN
F 3 "" H 8000 6950 60 0001 C CNN
@@ -413,10 +413,10 @@ F 3 "" H 8000 6950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TLV320AIC34ZAS U1101
+L TLV320AIC34ZAS U1001
U 5 1 578C4182
P 4800 7550
-F 0 "U1101" H 4601 7810 50 0000 L BNN
+F 0 "U1001" H 4601 7810 50 0000 L BNN
F 1 "tlv320aic34" H 4500 7351 50 0001 L BNN
F 2 "neo900-legacy:S-PBGA-N87-0.5" H 4790 7340 65 0001 L TNN
F 3 "" H 4800 7550 60 0001 C CNN
@@ -424,10 +424,10 @@ F 3 "" H 4800 7550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TLV320AIC34ZAS U1101
+L TLV320AIC34ZAS U1001
U 6 1 578C41E6
P 8000 7550
-F 0 "U1101" H 7801 7810 50 0000 L BNN
+F 0 "U1001" H 7801 7810 50 0000 L BNN
F 1 "tlv320aic34" H 7700 7351 50 0001 L BNN
F 2 "neo900-legacy:S-PBGA-N87-0.5" H 7990 7340 65 0001 L TNN
F 3 "" H 8000 7550 60 0001 C CNN
@@ -435,10 +435,10 @@ F 3 "" H 8000 7550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TLV320AIC34ZAS U1101
+L TLV320AIC34ZAS U1001
U 7 1 578C424A
P 13600 1950
-F 0 "U1101" H 13491 2200 50 0000 L BNN
+F 0 "U1001" H 13491 2200 50 0000 L BNN
F 1 "tlv320aic34" H 13490 1670 50 0000 L BNN
F 2 "neo900-legacy:S-PBGA-N87-0.5" H 13590 1740 65 0001 L TNN
F 3 "" H 13600 1950 60 0001 C CNN
@@ -446,10 +446,10 @@ F 3 "" H 13600 1950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TLV320AIC34ZAS U1101
+L TLV320AIC34ZAS U1001
U 8 1 578C42AE
P 4800 8250
-F 0 "U1101" H 4601 8510 50 0000 L BNN
+F 0 "U1001" H 4601 8510 50 0000 L BNN
F 1 "tlv320aic34" H 4500 8051 50 0001 L BNN
F 2 "neo900-legacy:S-PBGA-N87-0.5" H 4790 8040 65 0001 L TNN
F 3 "" H 4800 8250 60 0001 C CNN
@@ -457,10 +457,10 @@ F 3 "" H 4800 8250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TLV320AIC34ZAS U1101
+L TLV320AIC34ZAS U1001
U 9 1 578C4312
P 8000 8250
-F 0 "U1101" H 7801 8510 50 0000 L BNN
+F 0 "U1001" H 7801 8510 50 0000 L BNN
F 1 "tlv320aic34" H 7700 8051 50 0001 L BNN
F 2 "neo900-legacy:S-PBGA-N87-0.5" H 7990 8040 65 0001 L TNN
F 3 "" H 8000 8250 60 0001 C CNN
@@ -468,10 +468,10 @@ F 3 "" H 8000 8250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TLV320AIC34ZAS U1101
+L TLV320AIC34ZAS U1001
U 14 1 578C443E
P 4800 4550
-F 0 "U1101" H 4601 4810 50 0000 L BNN
+F 0 "U1001" H 4601 4810 50 0000 L BNN
F 1 "tlv320aic34" H 4500 4351 50 0001 L BNN
F 2 "neo900-legacy:S-PBGA-N87-0.5" H 4790 4340 65 0001 L TNN
F 3 "" H 4800 4550 60 0001 C CNN
@@ -479,10 +479,10 @@ F 3 "" H 4800 4550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TLV320AIC34ZAS U1101
+L TLV320AIC34ZAS U1001
U 15 1 578C44A2
P 8000 4550
-F 0 "U1101" H 7801 4810 50 0000 L BNN
+F 0 "U1001" H 7801 4810 50 0000 L BNN
F 1 "tlv320aic34" H 7700 4351 50 0001 L BNN
F 2 "neo900-legacy:S-PBGA-N87-0.5" H 7990 4340 65 0001 L TNN
F 3 "" H 8000 4550 60 0001 C CNN
@@ -490,10 +490,10 @@ F 3 "" H 8000 4550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TLV320AIC34ZAS U1101
+L TLV320AIC34ZAS U1001
U 16 1 578C4506
P 4800 5150
-F 0 "U1101" H 4601 5410 50 0000 L BNN
+F 0 "U1001" H 4601 5410 50 0000 L BNN
F 1 "tlv320aic34" H 4500 4951 50 0001 L BNN
F 2 "neo900-legacy:S-PBGA-N87-0.5" H 4790 4940 65 0001 L TNN
F 3 "" H 4800 5150 60 0001 C CNN
@@ -501,10 +501,10 @@ F 3 "" H 4800 5150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TLV320AIC34ZAS U1101
+L TLV320AIC34ZAS U1001
U 17 1 578C456A
P 8000 5150
-F 0 "U1101" H 7801 5410 50 0000 L BNN
+F 0 "U1001" H 7801 5410 50 0000 L BNN
F 1 "tlv320aic34" H 7700 4951 50 0001 L BNN
F 2 "neo900-legacy:S-PBGA-N87-0.5" H 7990 4940 65 0001 L TNN
F 3 "" H 8000 5150 60 0001 C CNN
@@ -512,10 +512,10 @@ F 3 "" H 8000 5150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TLV320AIC34ZAS U1101
+L TLV320AIC34ZAS U1001
U 20 1 578C45CE
P 4800 9450
-F 0 "U1101" H 4601 9710 50 0000 L BNN
+F 0 "U1001" H 4601 9710 50 0000 L BNN
F 1 "tlv320aic34" H 4600 9150 50 0000 L BNN
F 2 "neo900-legacy:S-PBGA-N87-0.5" H 4790 9240 65 0001 L TNN
F 3 "" H 4800 9450 60 0001 C CNN
@@ -523,10 +523,10 @@ F 3 "" H 4800 9450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TLV320AIC34ZAS U1101
+L TLV320AIC34ZAS U1001
U 21 1 578C4632
P 8000 9450
-F 0 "U1101" H 7801 9710 50 0000 L BNN
+F 0 "U1001" H 7801 9710 50 0000 L BNN
F 1 "tlv320aic34" H 7750 9200 50 0000 L CNN
F 2 "neo900-legacy:S-PBGA-N87-0.5" H 7990 9240 65 0001 L TNN
F 3 "" H 8000 9450 60 0001 C CNN
@@ -534,10 +534,10 @@ F 3 "" H 8000 9450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TLV320AIC34ZAS U1101
+L TLV320AIC34ZAS U1001
U 22 1 578C4696
P 14000 3600
-F 0 "U1101" H 13421 4630 50 0000 L BNN
+F 0 "U1001" H 13421 4630 50 0000 L BNN
F 1 "tlv320aic34" H 13400 2600 50 0000 L BNN
F 2 "neo900-legacy:S-PBGA-N87-0.5" H 13990 3390 65 0001 L TNN
F 3 "" H 14000 3600 60 0001 C CNN
@@ -545,10 +545,10 @@ F 3 "" H 14000 3600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TLV320AIC34ZAS U1101
+L TLV320AIC34ZAS U1001
U 23 1 578C46FA
P 4800 8850
-F 0 "U1101" H 4601 9110 50 0000 L BNN
+F 0 "U1001" H 4601 9110 50 0000 L BNN
F 1 "tlv320aic34" H 4500 8651 50 0001 L BNN
F 2 "neo900-legacy:S-PBGA-N87-0.5" H 4790 8640 65 0001 L TNN
F 3 "" H 4800 8850 60 0001 C CNN
@@ -556,10 +556,10 @@ F 3 "" H 4800 8850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TLV320AIC34ZAS U1101
+L TLV320AIC34ZAS U1001
U 24 1 578C475E
P 8000 8850
-F 0 "U1101" H 7801 9110 50 0000 L BNN
+F 0 "U1001" H 7801 9110 50 0000 L BNN
F 1 "tlv320aic34" H 7700 8651 50 0001 L BNN
F 2 "neo900-legacy:S-PBGA-N87-0.5" H 7990 8640 65 0001 L TNN
F 3 "" H 8000 8850 60 0001 C CNN
@@ -768,10 +768,10 @@ MIC_P
Text GLabel 5500 5850 2 60 Input ~ 0
MIC_M
$Comp
-L TLV320AIC34ZAS U1101
+L TLV320AIC34ZAS U1001
U 10 1 578C4376
P 4800 5750
-F 0 "U1101" H 4601 6010 50 0000 L BNN
+F 0 "U1001" H 4601 6010 50 0000 L BNN
F 1 "tlv320aic34" H 4500 5551 50 0001 L BNN
F 2 "neo900-legacy:S-PBGA-N87-0.5" H 4790 5540 65 0001 L TNN
F 3 "" H 4800 5750 60 0001 C CNN
@@ -916,10 +916,10 @@ Wire Wire Line
Wire Wire Line
3900 3150 3900 3200
$Comp
-L TLV320AIC34ZAS U1101
+L TLV320AIC34ZAS U1001
U 12 1 580864A7
P 4800 6350
-F 0 "U1101" H 4601 6610 50 0000 L BNN
+F 0 "U1001" H 4601 6610 50 0000 L BNN
F 1 "tlv320aic34" H 4500 6151 50 0001 L BNN
F 2 "neo900-legacy:S-PBGA-N87-0.5" H 4790 6140 65 0001 L TNN
F 3 "" H 4800 6350 60 0001 C CNN
@@ -927,10 +927,10 @@ F 3 "" H 4800 6350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TLV320AIC34ZAS U1101
+L TLV320AIC34ZAS U1001
U 13 1 58086559
P 8000 6350
-F 0 "U1101" H 7801 6610 50 0000 L BNN
+F 0 "U1001" H 7801 6610 50 0000 L BNN
F 1 "tlv320aic34" H 7700 6151 50 0001 L BNN
F 2 "neo900-legacy:S-PBGA-N87-0.5" H 7990 6140 65 0001 L TNN
F 3 "" H 8000 6350 60 0001 C CNN
@@ -983,10 +983,10 @@ Wire Wire Line
Wire Wire Line
14800 4400 14850 4400
$Comp
-L R0402 R1112
+L R0402 R1004
U 1 1 58142D0C
P 5600 1900
-F 0 "R1112" H 5450 1950 50 0000 R CNN
+F 0 "R1004" H 5450 1950 50 0000 R CNN
F 1 "1k" H 5600 1900 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5630 2050 20 0001 C CNN
F 3 "" H 5600 1900 60 0001 C CNN
@@ -1064,10 +1064,10 @@ Wire Wire Line
5200 5250 5300 5250
Connection ~ 5300 5250
$Comp
-L TLV320AIC34ZAS U1101
+L TLV320AIC34ZAS U1001
U 11 1 578C43DA
P 8000 5750
-F 0 "U1101" H 7801 6010 50 0000 L BNN
+F 0 "U1001" H 7801 6010 50 0000 L BNN
F 1 "tlv320aic34" H 7700 5551 50 0001 L BNN
F 2 "neo900-legacy:S-PBGA-N87-0.5" H 7990 5540 65 0001 L TNN
F 3 "" H 8000 5750 60 0001 C CNN
@@ -1125,10 +1125,10 @@ HB_DMIC_CLOCK
Text GLabel 6300 3050 0 60 Input ~ 0
HB_DMIC_DATA
$Comp
-L TLV320AIC34ZAS U1101
+L TLV320AIC34ZAS U1001
U 2 1 578C4056
P 7900 3450
-F 0 "U1101" H 7551 4210 50 0000 L BNN
+F 0 "U1001" H 7551 4210 50 0000 L BNN
F 1 "tlv320aic34" H 7550 2750 50 0000 L BNN
F 2 "neo900-legacy:S-PBGA-N87-0.5" H 7890 3240 65 0001 L TNN
F 3 "" H 7900 3450 60 0001 C CNN
@@ -1142,10 +1142,10 @@ Wire Wire Line
Text Notes 11650 5450 0 120 ~ 0
Hands-free
$Comp
-L C0603 C1007
+L C0603 C1010
U 1 1 582935C5
P 10800 6050
-F 0 "C1007" H 10840 6090 50 0000 L CNN
+F 0 "C1010" H 10840 6090 50 0000 L CNN
F 1 "10u" H 10850 5900 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 10830 6200 20 0001 C CNN
F 3 "" H 10800 6050 60 0001 C CNN
@@ -1153,10 +1153,10 @@ F 3 "" H 10800 6050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1009
+L C0402 C1011
U 1 1 582935CC
P 11100 6050
-F 0 "C1009" H 11140 6090 50 0000 L CNN
+F 0 "C1011" H 11140 6090 50 0000 L CNN
F 1 "100n" H 11140 5920 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 11130 6200 20 0001 C CNN
F 3 "" H 11100 6050 60 0001 C CNN
@@ -1164,10 +1164,10 @@ F 3 "" H 11100 6050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1010
+L C0402 C1012
U 1 1 582935D3
P 11400 6050
-F 0 "C1010" H 11440 6090 50 0000 L CNN
+F 0 "C1012" H 11440 6090 50 0000 L CNN
F 1 "27p" H 11440 5920 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 11430 6200 20 0001 C CNN
F 3 "" H 11400 6050 60 0001 C CNN
@@ -1175,10 +1175,10 @@ F 3 "" H 11400 6050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1017
+L C0402 C1023
U 1 1 582935DA
P 13600 7650
-F 0 "C1017" H 13640 7690 50 0000 L CNN
+F 0 "C1023" H 13640 7690 50 0000 L CNN
F 1 "1n" H 13640 7520 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 13630 7800 20 0001 C CNN
F 3 "" H 13600 7650 60 0001 C CNN
@@ -1186,10 +1186,10 @@ F 3 "" H 13600 7650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1019
+L C0402 C1025
U 1 1 582935E1
P 13900 7650
-F 0 "C1019" H 13940 7690 50 0000 L CNN
+F 0 "C1025" H 13940 7690 50 0000 L CNN
F 1 "1n" H 13940 7520 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 13930 7800 20 0001 C CNN
F 3 "" H 13900 7650 60 0001 C CNN
@@ -1241,10 +1241,10 @@ F 3 "" H 11400 9400 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C1018
+L C0402 C1024
U 1 1 58293604
P 13600 9650
-F 0 "C1018" H 13640 9690 50 0000 L CNN
+F 0 "C1024" H 13640 9690 50 0000 L CNN
F 1 "1n" H 13640 9520 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 13630 9800 20 0001 C CNN
F 3 "" H 13600 9650 60 0001 C CNN
@@ -1252,10 +1252,10 @@ F 3 "" H 13600 9650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1020
+L C0402 C1026
U 1 1 5829360B
P 13900 9650
-F 0 "C1020" H 13940 9690 50 0000 L CNN
+F 0 "C1026" H 13940 9690 50 0000 L CNN
F 1 "1n" H 13940 9520 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 13930 9800 20 0001 C CNN
F 3 "" H 13900 9650 60 0001 C CNN
@@ -1313,10 +1313,10 @@ F 3 "" H 14700 9650 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L L0402 L1003
+L L0402 L1006
U 1 1 5829362E
P 13100 8000
-F 0 "L1003" V 13042 7850 50 0000 L BNN
+F 0 "L1006" V 13042 7850 50 0000 L BNN
F 1 "MPZ1608S221A" V 13200 8000 65 0000 C CNN
F 2 "neo900-legacy:SMD-0603" H 13090 7790 65 0001 L TNN
F 3 "" H 13100 8000 60 0001 C CNN
@@ -1324,10 +1324,10 @@ F 3 "" H 13100 8000 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L L0402 L1004
+L L0402 L1007
U 1 1 58293635
P 13100 8400
-F 0 "L1004" V 13042 8250 50 0000 L BNN
+F 0 "L1007" V 13042 8250 50 0000 L BNN
F 1 "MPZ1608S221A" V 13200 8400 65 0000 C CNN
F 2 "neo900-legacy:SMD-0603" H 13090 8190 65 0001 L TNN
F 3 "" H 13100 8400 60 0001 C CNN
@@ -1335,10 +1335,10 @@ F 3 "" H 13100 8400 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L L0402 L1005
+L L0402 L1008
U 1 1 5829363C
P 13100 9000
-F 0 "L1005" V 13042 8850 50 0000 L BNN
+F 0 "L1008" V 13042 8850 50 0000 L BNN
F 1 "MPZ1608S221A" V 13200 9000 65 0000 C CNN
F 2 "neo900-legacy:SMD-0603" H 13090 8790 65 0001 L TNN
F 3 "" H 13100 9000 60 0001 C CNN
@@ -1346,10 +1346,10 @@ F 3 "" H 13100 9000 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L L0402 L1006
+L L0402 L1009
U 1 1 58293643
P 13100 9400
-F 0 "L1006" V 13042 9250 50 0000 L BNN
+F 0 "L1009" V 13042 9250 50 0000 L BNN
F 1 "MPZ1608S221A" V 13200 9400 65 0000 C CNN
F 2 "neo900-legacy:SMD-0603" H 13090 9190 65 0001 L TNN
F 3 "" H 13100 9400 60 0001 C CNN
@@ -1478,10 +1478,10 @@ F 3 "" H 15150 7550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TPA2012D2RTJ U1001
+L TPA2012D2RTJ U1002
U 1 1 5829368E
P 12200 8200
-F 0 "U1001" H 11900 8550 70 0000 L BNN
+F 0 "U1002" H 11900 8550 70 0000 L BNN
F 1 "TPA2012D2RTJ" H 11900 7800 70 0000 L BNN
F 2 "neo900-legacy:S-PWQFN-N20-0.5" H 12190 7990 65 0001 L TNN
F 3 "" H 12200 8200 60 0001 C CNN
@@ -1489,10 +1489,10 @@ F 3 "" H 12200 8200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TPA2012D2RTJ U1001
+L TPA2012D2RTJ U1002
U 2 1 58293695
P 12200 6600
-F 0 "U1001" H 11901 7440 70 0000 L BNN
+F 0 "U1002" H 11901 7440 70 0000 L BNN
F 1 "TPA2012D2RTJ" H 11900 5800 70 0000 L BNN
F 2 "neo900-legacy:S-PWQFN-N20-0.5" H 12190 6390 65 0001 L TNN
F 3 "" H 12200 6600 60 0001 C CNN
@@ -1500,10 +1500,10 @@ F 3 "" H 12200 6600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TPA2012D2RTJ U1001
+L TPA2012D2RTJ U1002
U 3 1 5829369C
P 12200 9200
-F 0 "U1001" H 11900 9550 70 0000 L BNN
+F 0 "U1002" H 11900 9550 70 0000 L BNN
F 1 "TPA2012D2RTJ" H 11900 8800 70 0000 L BNN
F 2 "neo900-legacy:S-PWQFN-N20-0.5" H 12190 8990 65 0001 L TNN
F 3 "" H 12200 9200 60 0001 C CNN
@@ -1679,10 +1679,10 @@ Left
Text Notes 15500 9200 0 60 ~ 0
Right
$Comp
-L C0402 C1005
+L C0402 C1003
U 1 1 5829370B
P 3450 6000
-F 0 "C1005" H 3490 6040 50 0000 L CNN
+F 0 "C1003" H 3490 6040 50 0000 L CNN
F 1 "100n" H 3490 5870 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 3480 6150 20 0001 C CNN
F 3 "" H 3450 6000 60 0001 C CNN
@@ -1690,10 +1690,10 @@ F 3 "" H 3450 6000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1003
+L C0402 C1001
U 1 1 58293712
P 1600 6150
-F 0 "C1003" H 1640 6190 50 0000 L CNN
+F 0 "C1001" H 1640 6190 50 0000 L CNN
F 1 "27p" H 1640 6020 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 1630 6300 20 0001 C CNN
F 3 "" H 1600 6150 60 0001 C CNN
@@ -1701,10 +1701,10 @@ F 3 "" H 1600 6150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1006
+L C0402 C1004
U 1 1 58293719
P 3450 7600
-F 0 "C1006" H 3490 7640 50 0000 L CNN
+F 0 "C1004" H 3490 7640 50 0000 L CNN
F 1 "100n" H 3490 7470 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 3480 7750 20 0001 C CNN
F 3 "" H 3450 7600 60 0001 C CNN
@@ -1712,10 +1712,10 @@ F 3 "" H 3450 7600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1004
+L C0402 C1002
U 1 1 58293720
P 1600 7750
-F 0 "C1004" H 1640 7790 50 0000 L CNN
+F 0 "C1002" H 1640 7790 50 0000 L CNN
F 1 "27p" H 1640 7620 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 1630 7900 20 0001 C CNN
F 3 "" H 1600 7750 60 0001 C CNN
diff --git a/hw/display.sch b/hw/display.sch
index 5b6d5c5..32bcf07 100644
--- a/hw/display.sch
+++ b/hw/display.sch
@@ -65,10 +65,10 @@ not shown here:
Text Notes 14400 7500 0 70 ~ 0
Camera, Touch, LEDs
$Comp
-L C-MK325 C2501
+L C-MK325 C1902
U 1 1 578D7401
P 3650 2250
-F 0 "C2501" H 3710 2264 50 0000 L BNN
+F 0 "C1902" H 3710 2264 50 0000 L BNN
F 1 "1u" H 3709 2065 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 3640 2040 65 0001 L TNN
F 3 "" H 3650 2250 60 0001 C CNN
@@ -76,10 +76,10 @@ F 3 "" H 3650 2250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C-MK325 C2502
+L C-MK325 C1904
U 1 1 578D74C9
P 5450 1300
-F 0 "C2502" H 5490 1340 50 0000 L CNN
+F 0 "C1904" H 5490 1340 50 0000 L CNN
F 1 "1u;50V" H 5500 1150 50 0000 L CNN
F 2 "neo900-legacy:SMD-0805" H 5480 1450 20 0001 C CNN
F 3 "" H 5450 1300 60 0001 C CNN
@@ -87,10 +87,10 @@ F 3 "" H 5450 1300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L D-SCHOTTKY-CRS02 D2501
+L D-SCHOTTKY-CRS02 D1901
U 1 1 578D7591
P 5150 1100
-F 0 "D2501" H 5025 1250 50 0000 L CNN
+F 0 "D1901" H 5025 1250 50 0000 L CNN
F 1 "RSX101M-30" H 4900 950 50 0000 L CNN
F 2 "neo900-legacy:CRS02" H 5180 1250 20 0001 C CNN
F 3 "" H 5150 1100 60 0001 C CNN
@@ -98,10 +98,10 @@ F 3 "" H 5150 1100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L L-LB2016 L2501
+L L-LB2016 L1901
U 1 1 578D77E9
P 4250 1100
-F 0 "L2501" V 4192 950 50 0000 L BNN
+F 0 "L1901" V 4192 950 50 0000 L BNN
F 1 "10uH,750mA,LQH3NPN100NM0" V 4350 1100 50 0000 C CNN
F 2 "neo900-legacy:SMD-1212" H 4240 890 65 0001 L TNN
F 3 "" H 4250 1100 60 0001 C CNN
@@ -109,10 +109,10 @@ F 3 "" H 4250 1100 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L COMMON-MODE-FILTERACM2012H L2502
+L COMMON-MODE-FILTERACM2012H L1902
U 1 1 578D78B1
P 9300 6900
-F 0 "L2502" H 9150 7059 50 0000 L BNN
+F 0 "L1902" H 9150 7059 50 0000 L BNN
F 1 "ACM2012H" H 9150 6670 50 0000 L BNN
F 2 "neo900-legacy:ACM2012H" H 9150 6670 50 0001 L BNN
F 3 "" H 9300 6900 60 0001 C CNN
@@ -120,10 +120,10 @@ F 3 "" H 9300 6900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L COMMON-MODE-FILTERACM2012H L2503
+L COMMON-MODE-FILTERACM2012H L1903
U 1 1 578D7979
P 9300 7450
-F 0 "L2503" H 9150 7609 50 0000 L BNN
+F 0 "L1903" H 9150 7609 50 0000 L BNN
F 1 "ACM2012H" H 9150 7220 50 0000 L BNN
F 2 "neo900-legacy:ACM2012H" H 9150 7220 50 0001 L BNN
F 3 "" H 9300 7450 60 0001 C CNN
@@ -131,10 +131,10 @@ F 3 "" H 9300 7450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L COMMON-MODE-FILTERACM2012H L2504
+L COMMON-MODE-FILTERACM2012H L1904
U 1 1 578D7A41
P 9300 8000
-F 0 "L2504" H 9150 8159 50 0000 L BNN
+F 0 "L1904" H 9150 8159 50 0000 L BNN
F 1 "ACM2012H" H 9150 7770 50 0000 L BNN
F 2 "neo900-legacy:ACM2012H" H 9150 7770 50 0001 L BNN
F 3 "" H 9300 8000 60 0001 C CNN
@@ -142,12 +142,12 @@ F 3 "" H 9300 8000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L N900-DISPLAY P1
+L N900-DISPLAY P?
U 2 1 578D7B09
P 10950 5100
-AR Path="/578D7B09" Ref="P1" Part="2"
-AR Path="/578AFF20/578D7B09" Ref="P1" Part="2"
-F 0 "P1" H 10400 5740 50 0000 L BNN
+AR Path="/578D7B09" Ref="P?" Part="2"
+AR Path="/578AFF20/578D7B09" Ref="P1901" Part="2"
+F 0 "P1901" H 10400 5740 50 0000 L BNN
F 1 "N900-DISPLAY" H 10400 4400 50 0000 L BNN
F 2 "neo900-legacy:500024-6471" H 10940 4890 65 0001 L TNN
F 3 "" H 10950 5100 60 0001 C CNN
@@ -155,12 +155,12 @@ F 3 "" H 10950 5100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L N900-DISPLAY P1
+L N900-DISPLAY P?
U 3 1 578D7B6D
P 11350 2900
-AR Path="/578D7B6D" Ref="P1" Part="3"
-AR Path="/578AFF20/578D7B6D" Ref="P1" Part="3"
-F 0 "P1" H 11210 3130 50 0001 L BNN
+AR Path="/578D7B6D" Ref="P?" Part="3"
+AR Path="/578AFF20/578D7B6D" Ref="P1901" Part="3"
+F 0 "P1901" H 11210 3130 50 0001 L BNN
F 1 "N900-DISPLAY" H 11201 2630 50 0001 L BNN
F 2 "neo900-legacy:500024-6471" H 11340 2690 65 0001 L TNN
F 3 "" H 11350 2900 60 0001 C CNN
@@ -168,12 +168,12 @@ F 3 "" H 11350 2900 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L N900-DISPLAY P1
+L N900-DISPLAY P?
U 4 1 578D7BD1
P 11350 3500
-AR Path="/578D7BD1" Ref="P1" Part="4"
-AR Path="/578AFF20/578D7BD1" Ref="P1" Part="4"
-F 0 "P1" H 11240 3750 50 0001 L BNN
+AR Path="/578D7BD1" Ref="P?" Part="4"
+AR Path="/578AFF20/578D7BD1" Ref="P1901" Part="4"
+F 0 "P1901" H 11240 3750 50 0001 L BNN
F 1 "N900-DISPLAY" V 11241 3220 50 0001 L BNN
F 2 "neo900-legacy:500024-6471" H 11340 3290 65 0001 L TNN
F 3 "" H 11350 3500 60 0001 C CNN
@@ -181,12 +181,12 @@ F 3 "" H 11350 3500 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L N900-DISPLAY P1
+L N900-DISPLAY P?
U 6 1 578D7C35
P 10550 3500
-AR Path="/578D7C35" Ref="P1" Part="6"
-AR Path="/578AFF20/578D7C35" Ref="P1" Part="6"
-F 0 "P1" H 10431 3730 50 0001 L BNN
+AR Path="/578D7C35" Ref="P?" Part="6"
+AR Path="/578AFF20/578D7C35" Ref="P1901" Part="6"
+F 0 "P1901" H 10431 3730 50 0001 L BNN
F 1 "N900-DISPLAY" H 10430 3220 50 0000 L BNN
F 2 "neo900-legacy:500024-6471" H 10540 3290 65 0001 L TNN
F 3 "" H 10550 3500 60 0001 C CNN
@@ -194,12 +194,12 @@ F 3 "" H 10550 3500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L N900-DISPLAY P1
+L N900-DISPLAY P?
U 7 1 578D7C99
P 10550 2900
-AR Path="/578D7C99" Ref="P1" Part="7"
-AR Path="/578AFF20/578D7C99" Ref="P1" Part="7"
-F 0 "P1" H 10431 3130 50 0000 L BNN
+AR Path="/578D7C99" Ref="P?" Part="7"
+AR Path="/578AFF20/578D7C99" Ref="P1901" Part="7"
+F 0 "P1901" H 10431 3130 50 0000 L BNN
F 1 "N900-DISPLAY" H 10430 2620 50 0001 L BNN
F 2 "neo900-legacy:500024-6471" H 10540 2690 65 0001 L TNN
F 3 "" H 10550 2900 60 0001 C CNN
@@ -207,12 +207,12 @@ F 3 "" H 10550 2900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L N900-DISPLAY P1
+L N900-DISPLAY P?
U 8 1 578D7CFD
P 12900 7200
-AR Path="/578D7CFD" Ref="P1" Part="8"
-AR Path="/578AFF20/578D7CFD" Ref="P1" Part="8"
-F 0 "P1" H 13030 7249 50 0000 L BNN
+AR Path="/578D7CFD" Ref="P?" Part="8"
+AR Path="/578AFF20/578D7CFD" Ref="P1901" Part="8"
+F 0 "P1901" H 13030 7249 50 0000 L BNN
F 1 "N900-DISPLAY" H 12890 7090 65 0001 L TNN
F 2 "neo900-legacy:500024-6471" H 12890 6990 65 0001 L TNN
F 3 "" H 12900 7200 60 0001 C CNN
@@ -220,12 +220,12 @@ F 3 "" H 12900 7200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L N900-DISPLAY P1
+L N900-DISPLAY P?
U 9 1 578D7D61
P 12900 7400
-AR Path="/578D7D61" Ref="P1" Part="9"
-AR Path="/578AFF20/578D7D61" Ref="P1" Part="9"
-F 0 "P1" H 13030 7449 50 0000 L BNN
+AR Path="/578D7D61" Ref="P?" Part="9"
+AR Path="/578AFF20/578D7D61" Ref="P1901" Part="9"
+F 0 "P1901" H 13030 7449 50 0000 L BNN
F 1 "N900-DISPLAY" H 12890 7290 65 0001 L TNN
F 2 "neo900-legacy:500024-6471" H 12890 7190 65 0001 L TNN
F 3 "" H 12900 7400 60 0001 C CNN
@@ -233,12 +233,12 @@ F 3 "" H 12900 7400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L N900-DISPLAY P1
+L N900-DISPLAY P?
U 10 1 578D7DC5
P 12900 7600
-AR Path="/578D7DC5" Ref="P1" Part="10"
-AR Path="/578AFF20/578D7DC5" Ref="P1" Part="10"
-F 0 "P1" H 13030 7649 50 0000 L BNN
+AR Path="/578D7DC5" Ref="P?" Part="10"
+AR Path="/578AFF20/578D7DC5" Ref="P1901" Part="10"
+F 0 "P1901" H 13030 7649 50 0000 L BNN
F 1 "N900-DISPLAY" H 12890 7490 65 0001 L TNN
F 2 "neo900-legacy:500024-6471" H 12890 7390 65 0001 L TNN
F 3 "" H 12900 7600 60 0001 C CNN
@@ -246,12 +246,12 @@ F 3 "" H 12900 7600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L N900-DISPLAY P1
+L N900-DISPLAY P?
U 11 1 578D7E29
P 12900 7800
-AR Path="/578D7E29" Ref="P1" Part="11"
-AR Path="/578AFF20/578D7E29" Ref="P1" Part="11"
-F 0 "P1" H 13030 7849 50 0000 L BNN
+AR Path="/578D7E29" Ref="P?" Part="11"
+AR Path="/578AFF20/578D7E29" Ref="P1901" Part="11"
+F 0 "P1901" H 13030 7849 50 0000 L BNN
F 1 "N900-DISPLAY" H 12890 7690 65 0001 L TNN
F 2 "neo900-legacy:500024-6471" H 12890 7590 65 0001 L TNN
F 3 "" H 12900 7800 60 0001 C CNN
@@ -259,12 +259,12 @@ F 3 "" H 12900 7800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L N900-DISPLAY P1
+L N900-DISPLAY P?
U 12 1 578D7E8D
P 10650 7300
-AR Path="/578D7E8D" Ref="P1" Part="12"
-AR Path="/578AFF20/578D7E8D" Ref="P1" Part="12"
-F 0 "P1" H 10491 7840 70 0001 L BNN
+AR Path="/578D7E8D" Ref="P?" Part="12"
+AR Path="/578AFF20/578D7E8D" Ref="P1901" Part="12"
+F 0 "P1901" H 10491 7840 70 0001 L BNN
F 1 "N900-DISPLAY" H 10450 6800 70 0001 L BNN
F 2 "neo900-legacy:500024-6471" H 10640 7090 65 0001 L TNN
F 3 "" H 10650 7300 60 0001 C CNN
@@ -272,12 +272,12 @@ F 3 "" H 10650 7300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L N900-DISPLAY P1
+L N900-DISPLAY P?
U 13 1 578D7EF1
P 10550 6300
-AR Path="/578D7EF1" Ref="P1" Part="13"
-AR Path="/578AFF20/578D7EF1" Ref="P1" Part="13"
-F 0 "P1" H 10200 6750 50 0001 L CNN
+AR Path="/578D7EF1" Ref="P?" Part="13"
+AR Path="/578AFF20/578D7EF1" Ref="P1901" Part="13"
+F 0 "P1901" H 10200 6750 50 0001 L CNN
F 1 "N900-DISPLAY" H 10150 5800 50 0001 L BNN
F 2 "neo900-legacy:500024-6471" H 10540 6090 65 0001 L TNN
F 3 "" H 10550 6300 60 0001 C CNN
@@ -285,12 +285,12 @@ F 3 "" H 10550 6300 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L N900-DISPLAY P1
+L N900-DISPLAY P?
U 15 1 578D7F55
P 11550 4200
-AR Path="/578D7F55" Ref="P1" Part="15"
-AR Path="/578AFF20/578D7F55" Ref="P1" Part="15"
-F 0 "P1" H 11540 4190 65 0001 L TNN
+AR Path="/578D7F55" Ref="P?" Part="15"
+AR Path="/578AFF20/578D7F55" Ref="P1901" Part="15"
+F 0 "P1901" H 11540 4190 65 0001 L TNN
F 1 "N900-DISPLAY" H 11540 4090 65 0001 L TNN
F 2 "neo900-legacy:500024-6471" H 11540 3990 65 0001 L TNN
F 3 "" H 11550 4200 60 0001 C CNN
@@ -298,12 +298,12 @@ F 3 "" H 11550 4200 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L N900-DISPLAY P1
+L N900-DISPLAY P?
U 16 1 578D7FB9
P 11550 7900
-AR Path="/578D7FB9" Ref="P1" Part="16"
-AR Path="/578AFF20/578D7FB9" Ref="P1" Part="16"
-F 0 "P1" H 11540 7890 65 0001 L TNN
+AR Path="/578D7FB9" Ref="P?" Part="16"
+AR Path="/578AFF20/578D7FB9" Ref="P1901" Part="16"
+F 0 "P1901" H 11540 7890 65 0001 L TNN
F 1 "N900-DISPLAY" H 11540 7790 65 0001 L TNN
F 2 "neo900-legacy:500024-6471" H 11540 7690 65 0001 L TNN
F 3 "" H 11550 7900 60 0001 C CNN
@@ -311,10 +311,10 @@ F 3 "" H 11550 7900 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L R0402 R2502
+L R0402 R1903
U 1 1 578D891A
P 2750 2300
-F 0 "R2502" H 2620 2360 50 0000 L BNN
+F 0 "R1903" H 2620 2360 50 0000 L BNN
F 1 "DNP" H 2750 2300 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 2780 2450 20 0001 C CNN
F 3 "" H 2750 2300 60 0001 C CNN
@@ -322,10 +322,10 @@ F 3 "" H 2750 2300 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0603 R2503
+L R0603 R1913
U 1 1 578D89E2
P 8150 3850
-F 0 "R2503" H 8020 3910 50 0000 L BNN
+F 0 "R1913" H 8020 3910 50 0000 L BNN
F 1 "0" H 8150 3850 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 8180 4000 20 0001 C CNN
F 3 "" H 8150 3850 60 0001 C CNN
@@ -479,10 +479,10 @@ CDP_CLK_M
Text Notes 700 2100 0 60 ~ 0
LCD_LEDS_PWM shall connect to\nTWL4030, GPIO6/PWM0, ball M4.
$Comp
-L TPS61160DRV U2501
+L TPS61160DRV U1901
U 1 1 57EA0C38
P 4300 1800
-F 0 "U2501" H 4000 2150 50 0000 L CNN
+F 0 "U1901" H 4000 2150 50 0000 L CNN
F 1 "TPS61160DRV" H 4300 1450 50 0000 C CNN
F 2 "SOT23-5" H 4330 1950 20 0001 C CNN
F 3 "" H 4300 1800 60 0001 C CNN
@@ -490,10 +490,10 @@ F 3 "" H 4300 1800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C-MK325 C2503
+L C-MK325 C1901
U 1 1 57EA100A
P 3200 2250
-F 0 "C2503" H 3260 2264 50 0000 L BNN
+F 0 "C1901" H 3260 2264 50 0000 L BNN
F 1 "220n" H 3259 2065 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 3190 2040 65 0001 L TNN
F 3 "" H 3200 2250 60 0001 C CNN
@@ -512,10 +512,10 @@ F 3 "" H 3200 2650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L DUALPNP Q2501
+L DUALPNP Q1901
U 1 1 57EA005E
P 7000 2150
-F 0 "Q2501" H 6950 2500 60 0000 C CNN
+F 0 "Q1901" H 6950 2500 60 0000 C CNN
F 1 "PMBT3906VS" H 7000 1800 60 0000 C CNN
F 2 "" H 7000 2150 60 0000 C CNN
F 3 "" H 7000 2150 60 0000 C CNN
@@ -533,10 +533,10 @@ CABC
Text Notes 4050 2300 0 60 ~ 0
(or other)
$Comp
-L C-MK325 C2504
+L C-MK325 C1905
U 1 1 57EAA17C
P 5500 3450
-F 0 "C2504" H 5560 3464 50 0000 L BNN
+F 0 "C1905" H 5560 3464 50 0000 L BNN
F 1 "DNP" H 5559 3265 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 5490 3240 65 0001 L TNN
F 3 "" H 5500 3450 60 0001 C CNN
@@ -555,10 +555,10 @@ F 3 "" H 5500 3850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R2505
+L R0402 R1905
U 1 1 57EAA2E3
P 5200 3250
-F 0 "R2505" H 5070 3310 50 0000 L BNN
+F 0 "R1905" H 5070 3310 50 0000 L BNN
F 1 "DNP" H 5200 3250 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5230 3400 20 0001 C CNN
F 3 "" H 5200 3250 60 0001 C CNN
@@ -566,10 +566,10 @@ F 3 "" H 5200 3250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R2504
+L R0402 R1902
U 1 1 57EAAAD5
P 2400 2300
-F 0 "R2504" H 2270 2360 50 0000 L BNN
+F 0 "R1902" H 2270 2360 50 0000 L BNN
F 1 "DNP" H 2400 2300 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 2430 2450 20 0001 C CNN
F 3 "" H 2400 2300 60 0001 C CNN
@@ -577,10 +577,10 @@ F 3 "" H 2400 2300 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R2501
+L R0402 R1901
U 1 1 57EAAF16
P 1850 1800
-F 0 "R2501" H 1720 1860 50 0000 L BNN
+F 0 "R1901" H 1720 1860 50 0000 L BNN
F 1 "0" H 1850 1800 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 1880 1950 20 0001 C CNN
F 3 "" H 1850 1800 60 0001 C CNN
@@ -588,10 +588,10 @@ F 3 "" H 1850 1800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R2507
+L R0402 R1907
U 1 1 57EABD30
P 6500 1500
-F 0 "R2507" H 6370 1560 50 0000 L BNN
+F 0 "R1907" H 6370 1560 50 0000 L BNN
F 1 "10" H 6500 1500 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 6530 1650 20 0001 C CNN
F 3 "" H 6500 1500 60 0001 C CNN
@@ -599,10 +599,10 @@ F 3 "" H 6500 1500 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R2509
+L R0402 R1911
U 1 1 57EABE60
P 7600 1500
-F 0 "R2509" H 7470 1560 50 0000 L BNN
+F 0 "R1911" H 7470 1560 50 0000 L BNN
F 1 "10" H 7600 1500 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 7630 1650 20 0001 C CNN
F 3 "" H 7600 1500 60 0001 C CNN
@@ -610,10 +610,10 @@ F 3 "" H 7600 1500 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0603 R2511
+L R0603 R1915
U 1 1 57EAC52F
P 8500 3850
-F 0 "R2511" H 8370 3910 50 0000 L BNN
+F 0 "R1915" H 8370 3910 50 0000 L BNN
F 1 "15" H 8500 3850 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 8530 4000 20 0001 C CNN
F 3 "" H 8500 3850 60 0001 C CNN
@@ -621,10 +621,10 @@ F 3 "" H 8500 3850 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0603 R2510
+L R0603 R1914
U 1 1 57EACC57
P 8500 3150
-F 0 "R2510" H 8370 3210 50 0000 L BNN
+F 0 "R1914" H 8370 3210 50 0000 L BNN
F 1 "0" H 8500 3150 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 8530 3300 20 0001 C CNN
F 3 "" H 8500 3150 60 0001 C CNN
@@ -632,10 +632,10 @@ F 3 "" H 8500 3150 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0603 R2506
+L R0603 R1906
U 1 1 57EAE970
P 5500 2450
-F 0 "R2506" H 5370 2510 50 0000 L BNN
+F 0 "R1906" H 5370 2510 50 0000 L BNN
F 1 "4k7" H 5500 2450 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5530 2600 20 0001 C CNN
F 3 "" H 5500 2450 60 0001 C CNN
@@ -643,10 +643,10 @@ F 3 "" H 5500 2450 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R2514
+L R0402 R1912
U 1 1 57EAB809
P 8150 1450
-F 0 "R2514" H 8020 1510 50 0000 L BNN
+F 0 "R1912" H 8020 1510 50 0000 L BNN
F 1 "0" H 8150 1450 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 8180 1600 20 0001 C CNN
F 3 "" H 8150 1450 60 0001 C CNN
@@ -654,10 +654,10 @@ F 3 "" H 8150 1450 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R2512
+L R0402 R1904
U 1 1 57EAD955
P 2950 3250
-F 0 "R2512" H 2820 3310 50 0000 L BNN
+F 0 "R1904" H 2820 3310 50 0000 L BNN
F 1 "100k" H 2950 3250 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 2980 3400 20 0001 C CNN
F 3 "" H 2950 3250 60 0001 C CNN
@@ -665,10 +665,10 @@ F 3 "" H 2950 3250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L 74X1G04_6 U2503
+L 74X1G04_6 U1902
U 1 1 57EAB915
P 4400 3250
-F 0 "U2503" H 4150 3450 60 0000 C CNN
+F 0 "U1902" H 4150 3450 60 0000 C CNN
F 1 "SN74LVC1G04DSF" H 4500 3100 60 0000 L CNN
F 2 "" H 4250 3425 60 0001 C CNN
F 3 "" H 4250 3425 60 0001 C CNN
@@ -678,10 +678,10 @@ $EndComp
Text GLabel 1500 3000 0 60 BiDi ~ 0
LCD_CABC
$Comp
-L C-MK325 C2505
+L C-MK325 C1903
U 1 1 57EAC8EE
P 3950 3450
-F 0 "C2505" H 4010 3464 50 0000 L BNN
+F 0 "C1903" H 4010 3464 50 0000 L BNN
F 1 "100n" H 4009 3265 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 3940 3240 65 0001 L TNN
F 3 "" H 3950 3450 60 0001 C CNN
@@ -733,10 +733,10 @@ Populate EITHER parallel (with current\nmirror) OR serial.
Text Notes 4500 3550 0 60 ~ 0
NXP 74LVC1G04GF
$Comp
-L ESDA6V1-5P6 U2505
+L ESDA6V1-5P6 U1906
U 1 1 5808428D
P 9700 2100
-F 0 "U2505" H 10300 1750 50 0000 R CNN
+F 0 "U1906" H 10300 1750 50 0000 R CNN
F 1 "ESDA25-4BP6" H 9250 2100 50 0000 R CNN
F 2 "SOT666IP" H 9730 2250 20 0001 C CNN
F 3 "" H 9700 2100 60 0001 C CNN
@@ -756,10 +756,10 @@ F 3 "" H 9950 1600 60 0001 C CNN
$EndComp
NoConn ~ 9200 2600
$Comp
-L C-MK325 C2506
+L C-MK325 C1913
U 1 1 580853C3
P 12100 5600
-F 0 "C2506" H 12160 5614 50 0000 L BNN
+F 0 "C1913" H 12160 5614 50 0000 L BNN
F 1 "100n" H 12159 5415 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 12090 5390 65 0001 L TNN
F 3 "" H 12100 5600 60 0001 C CNN
@@ -767,10 +767,10 @@ F 3 "" H 12100 5600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C-MK325 C2507
+L C-MK325 C1914
U 1 1 5808560F
P 12500 5600
-F 0 "C2507" H 12560 5614 50 0000 L BNN
+F 0 "C1914" H 12560 5614 50 0000 L BNN
F 1 "100n" H 12559 5415 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 12490 5390 65 0001 L TNN
F 3 "" H 12500 5600 60 0001 C CNN
@@ -778,10 +778,10 @@ F 3 "" H 12500 5600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C-MK325 C2508
+L C-MK325 C1915
U 1 1 58085693
P 12900 5600
-F 0 "C2508" H 12960 5614 50 0000 L BNN
+F 0 "C1915" H 12960 5614 50 0000 L BNN
F 1 "100n" H 12959 5415 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 12890 5390 65 0001 L TNN
F 3 "" H 12900 5600 60 0001 C CNN
@@ -789,10 +789,10 @@ F 3 "" H 12900 5600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C-MK325 C2509
+L C-MK325 C1916
U 1 1 5808574A
P 13300 5600
-F 0 "C2509" H 13360 5614 50 0000 L BNN
+F 0 "C1916" H 13360 5614 50 0000 L BNN
F 1 "100n" H 13359 5415 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 13290 5390 65 0001 L TNN
F 3 "" H 13300 5600 60 0001 C CNN
@@ -800,10 +800,10 @@ F 3 "" H 13300 5600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C-MK325 C2510
+L C-MK325 C1917
U 1 1 580859ED
P 13700 5600
-F 0 "C2510" H 13760 5614 50 0000 L BNN
+F 0 "C1917" H 13760 5614 50 0000 L BNN
F 1 "100n" H 13759 5415 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 13690 5390 65 0001 L TNN
F 3 "" H 13700 5600 60 0001 C CNN
@@ -871,8 +871,8 @@ U 1 1 5808B272
P 5700 7300
AR Path="/5808B272" Ref="U?" Part="1"
AR Path="/578AFEFC/5808B272" Ref="U?" Part="1"
-AR Path="/578AFF20/5808B272" Ref="U2502" Part="1"
-F 0 "U2502" H 5250 7550 50 0000 R CNN
+AR Path="/578AFF20/5808B272" Ref="U1904" Part="1"
+F 0 "U1904" H 5250 7550 50 0000 R CNN
F 1 "ESDA6V1-5P6" H 5900 6900 50 0000 L CNN
F 2 "SOT666IP" H 5730 7450 20 0001 C CNN
F 3 "" H 5700 7300 60 0001 C CNN
@@ -896,8 +896,8 @@ U 1 1 5808BAFF
P 7200 7300
AR Path="/5808BAFF" Ref="U?" Part="1"
AR Path="/578AFEFC/5808BAFF" Ref="U?" Part="1"
-AR Path="/578AFF20/5808BAFF" Ref="U2504" Part="1"
-F 0 "U2504" H 6750 7550 50 0000 R CNN
+AR Path="/578AFF20/5808BAFF" Ref="U1905" Part="1"
+F 0 "U1905" H 6750 7550 50 0000 R CNN
F 1 "ESDA6V1-5P6" H 7400 6900 50 0000 L CNN
F 2 "SOT666IP" H 7230 7450 20 0001 C CNN
F 3 "" H 7200 7300 60 0001 C CNN
@@ -916,10 +916,10 @@ F 3 "" H 7300 8000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L ESDA6V1-5P6 U2506
+L ESDA6V1-5P6 U1908
U 1 1 5808D7DA
P 12400 2100
-F 0 "U2506" H 13000 1750 50 0000 R CNN
+F 0 "U1908" H 13000 1750 50 0000 R CNN
F 1 "ESDA6V1-5P6" H 11950 2100 50 0000 R CNN
F 2 "SOT666IP" H 12430 2250 20 0001 C CNN
F 3 "" H 12400 2100 60 0001 C CNN
@@ -1482,10 +1482,10 @@ Wire Wire Line
Connection ~ 12500 2800
NoConn ~ 12700 2600
$Comp
-L L0603 L2505
+L L0603 L1906
U 1 1 580922A0
P 14150 4600
-F 0 "L2505" V 14066 4450 50 0000 L CNN
+F 0 "L1906" V 14066 4450 50 0000 L CNN
F 1 "120R/100MHz" V 14200 4800 50 0000 L CNN
F 2 "SMD-0603" H 14180 4750 50 0001 C CNN
F 3 "" H 14150 4600 60 0001 C CNN
@@ -1493,10 +1493,10 @@ F 3 "" H 14150 4600 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L L0603 L2506
+L L0603 L1907
U 1 1 5809262D
P 14150 4800
-F 0 "L2506" V 14066 4650 50 0000 L CNN
+F 0 "L1907" V 14066 4650 50 0000 L CNN
F 1 "120R/100MHz" V 14200 5000 50 0000 L CNN
F 2 "SMD-0603" H 14180 4950 50 0001 C CNN
F 3 "" H 14150 4800 60 0001 C CNN
@@ -1504,10 +1504,10 @@ F 3 "" H 14150 4800 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L L0603 L2507
+L L0603 L1908
U 1 1 580926BF
P 14150 5000
-F 0 "L2507" V 14066 4850 50 0000 L CNN
+F 0 "L1908" V 14066 4850 50 0000 L CNN
F 1 "120R/100MHz" V 14200 5200 50 0000 L CNN
F 2 "SMD-0603" H 14180 5150 50 0001 C CNN
F 3 "" H 14150 5000 60 0001 C CNN
@@ -1515,10 +1515,10 @@ F 3 "" H 14150 5000 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L L0603 L2508
+L L0603 L1909
U 1 1 58092754
P 14150 5200
-F 0 "L2508" V 14066 5050 50 0000 L CNN
+F 0 "L1909" V 14066 5050 50 0000 L CNN
F 1 "120R/100MHz" V 14200 5400 50 0000 L CNN
F 2 "SMD-0603" H 14180 5350 50 0001 C CNN
F 3 "" H 14150 5200 60 0001 C CNN
@@ -1526,10 +1526,10 @@ F 3 "" H 14150 5200 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L L0603 L2509
+L L0603 L1910
U 1 1 580927EE
P 14150 5400
-F 0 "L2509" V 14066 5250 50 0000 L CNN
+F 0 "L1910" V 14066 5250 50 0000 L CNN
F 1 "120R/100MHz" V 14200 5600 50 0000 L CNN
F 2 "SMD-0603" H 14180 5550 50 0001 C CNN
F 3 "" H 14150 5400 60 0001 C CNN
@@ -1537,10 +1537,10 @@ F 3 "" H 14150 5400 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L COMMON-MODE-FILTERACM2012H L2510
+L COMMON-MODE-FILTERACM2012H L1905
U 1 1 58093050
P 13450 2900
-F 0 "L2510" H 13300 3059 50 0000 L BNN
+F 0 "L1905" H 13300 3059 50 0000 L BNN
F 1 "ACM2012H" H 13300 2670 50 0000 L BNN
F 2 "neo900-legacy:ACM2012H" H 13300 2670 50 0001 L BNN
F 3 "" H 13450 2900 60 0001 C CNN
@@ -1548,10 +1548,10 @@ F 3 "" H 13450 2900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C-MK325 C2511
+L C-MK325 C1918
U 1 1 5809368F
P 13900 3300
-F 0 "C2511" H 13960 3314 50 0000 L BNN
+F 0 "C1918" H 13960 3314 50 0000 L BNN
F 1 "1n" H 13959 3115 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 13890 3090 65 0001 L TNN
F 3 "" H 13900 3300 60 0001 C CNN
@@ -1559,10 +1559,10 @@ F 3 "" H 13900 3300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C-MK325 C2512
+L C-MK325 C1919
U 1 1 58093768
P 14300 3300
-F 0 "C2512" H 14360 3314 50 0000 L BNN
+F 0 "C1919" H 14360 3314 50 0000 L BNN
F 1 "1n" H 14359 3115 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 14290 3090 65 0001 L TNN
F 3 "" H 14300 3300 60 0001 C CNN
@@ -1722,8 +1722,8 @@ L C0603 C?
U 1 1 582957A4
P 7750 9950
AR Path="/578AFF1E/582957A4" Ref="C?" Part="1"
-AR Path="/578AFF20/582957A4" Ref="C1908" Part="1"
-F 0 "C1908" H 7790 9990 50 0000 L CNN
+AR Path="/578AFF20/582957A4" Ref="C1909" Part="1"
+F 0 "C1909" H 7790 9990 50 0000 L CNN
F 1 "4u7" H 7800 9800 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 7780 10100 20 0001 C CNN
F 3 "" H 7750 9950 60 0001 C CNN
@@ -1731,10 +1731,10 @@ F 3 "" H 7750 9950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0603 C1911
+L C0603 C1912
U 1 1 582957AB
P 8600 9100
-F 0 "C1911" H 8640 9140 50 0000 L CNN
+F 0 "C1912" H 8640 9140 50 0000 L CNN
F 1 "1n" H 8650 8950 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 8630 9250 20 0001 C CNN
F 3 "" H 8600 9100 60 0001 C CNN
@@ -1742,10 +1742,10 @@ F 3 "" H 8600 9100 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L C0603 C1910
+L C0603 C1911
U 1 1 582957B2
P 8250 9100
-F 0 "C1910" H 8290 9140 50 0000 L CNN
+F 0 "C1911" H 8290 9140 50 0000 L CNN
F 1 "1n" H 8300 8950 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 8280 9250 20 0001 C CNN
F 3 "" H 8250 9100 60 0001 C CNN
@@ -1753,10 +1753,10 @@ F 3 "" H 8250 9100 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L C0603 C1909
+L C0603 C1910
U 1 1 582957B9
P 7900 9100
-F 0 "C1909" H 7940 9140 50 0000 L CNN
+F 0 "C1910" H 7940 9140 50 0000 L CNN
F 1 "1n" H 7950 8950 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 7930 9250 20 0001 C CNN
F 3 "" H 7900 9100 60 0001 C CNN
@@ -1768,8 +1768,8 @@ L C0402 C?
U 1 1 582957C0
P 6750 10450
AR Path="/578AFF1E/582957C0" Ref="C?" Part="1"
-AR Path="/578AFF20/582957C0" Ref="C1906" Part="1"
-F 0 "C1906" H 6790 10490 50 0000 L CNN
+AR Path="/578AFF20/582957C0" Ref="C1907" Part="1"
+F 0 "C1907" H 6790 10490 50 0000 L CNN
F 1 "100n" H 6790 10320 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 6780 10600 20 0001 C CNN
F 3 "" H 6750 10450 60 0001 C CNN
@@ -1781,8 +1781,8 @@ L C0402 C?
U 1 1 582957C7
P 6400 10450
AR Path="/578AFF1E/582957C7" Ref="C?" Part="1"
-AR Path="/578AFF20/582957C7" Ref="C1905" Part="1"
-F 0 "C1905" H 6440 10490 50 0000 L CNN
+AR Path="/578AFF20/582957C7" Ref="C1906" Part="1"
+F 0 "C1906" H 6440 10490 50 0000 L CNN
F 1 "100n" H 6440 10320 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 6430 10600 20 0001 C CNN
F 3 "" H 6400 10450 60 0001 C CNN
@@ -1795,8 +1795,8 @@ U 14 1 582957CE
P 10650 8800
AR Path="/582957CE" Ref="P?" Part="14"
AR Path="/578AFF1E/582957CE" Ref="P?" Part="14"
-AR Path="/578AFF20/582957CE" Ref="P1" Part="14"
-F 0 "P1" H 10370 9140 50 0001 L BNN
+AR Path="/578AFF20/582957CE" Ref="P1901" Part="14"
+F 0 "P1901" H 10370 9140 50 0001 L BNN
F 1 "N900-DISPLAY" H 10950 8500 70 0000 R CNN
F 2 "neo900-legacy:500024-6471" H 10640 8590 65 0001 L TNN
F 3 "" H 10650 8800 60 0001 C CNN
@@ -1808,8 +1808,8 @@ L R0402 R?
U 1 1 582957D5
P 7150 9800
AR Path="/578AFF1E/582957D5" Ref="R?" Part="1"
-AR Path="/578AFF20/582957D5" Ref="R1914" Part="1"
-F 0 "R1914" H 7020 9860 50 0000 L BNN
+AR Path="/578AFF20/582957D5" Ref="R1910" Part="1"
+F 0 "R1910" H 7020 9860 50 0000 L BNN
F 1 "10" H 7150 9800 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 7180 9950 20 0001 C CNN
F 3 "" H 7150 9800 60 0001 C CNN
@@ -1821,8 +1821,8 @@ L R0402 R?
U 1 1 582957DC
P 6550 8900
AR Path="/578AFF1E/582957DC" Ref="R?" Part="1"
-AR Path="/578AFF20/582957DC" Ref="R1912" Part="1"
-F 0 "R1912" H 6150 8950 50 0000 L CNN
+AR Path="/578AFF20/582957DC" Ref="R1908" Part="1"
+F 0 "R1908" H 6150 8950 50 0000 L CNN
F 1 "560;1%" H 6850 8850 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 6580 9050 20 0001 C CNN
F 3 "" H 6550 8900 60 0001 C CNN
@@ -1834,8 +1834,8 @@ L R0402 R?
U 1 1 582957E3
P 6550 9100
AR Path="/578AFF1E/582957E3" Ref="R?" Part="1"
-AR Path="/578AFF20/582957E3" Ref="R1913" Part="1"
-F 0 "R1913" H 6150 9150 50 0000 L CNN
+AR Path="/578AFF20/582957E3" Ref="R1909" Part="1"
+F 0 "R1909" H 6150 9150 50 0000 L CNN
F 1 "560;1%" H 6850 9050 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 6580 9250 20 0001 C CNN
F 3 "" H 6550 9100 60 0001 C CNN
@@ -1939,10 +1939,10 @@ NoConn ~ 4250 9200
NoConn ~ 4250 9100
NoConn ~ 4250 8900
$Comp
-L C0603 C1907
+L C0603 C1908
U 1 1 58295824
P 7550 9100
-F 0 "C1907" H 7590 9140 50 0000 L CNN
+F 0 "C1908" H 7590 9140 50 0000 L CNN
F 1 "1n" H 7600 8950 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 7580 9250 20 0001 C CNN
F 3 "" H 7550 9100 60 0001 C CNN
@@ -2111,12 +2111,12 @@ Wire Wire Line
Text Notes 5150 8300 2 120 ~ 0
Touch screen controller
$Comp
-L ESDA6V1-5P6 U1904
+L ESDA6V1-5P6 U1907
U 1 1 58295871
P 9700 9600
-AR Path="/578AFF20/58295871" Ref="U1904" Part="1"
+AR Path="/578AFF20/58295871" Ref="U1907" Part="1"
AR Path="/578AFF1E/58295871" Ref="U?" Part="1"
-F 0 "U1904" H 9250 9800 50 0000 R CNN
+F 0 "U1907" H 9250 9800 50 0000 R CNN
F 1 "ESDA6V1-5P6" H 9700 9200 50 0000 R CNN
F 2 "SOT666IP" H 9730 9750 20 0001 C CNN
F 3 "" H 9700 9600 60 0001 C CNN
diff --git a/hw/hb.sch b/hw/hb.sch
index 1431161..3dbb8e8 100644
--- a/hw/hb.sch
+++ b/hw/hb.sch
@@ -55,10 +55,10 @@ Comment3 ""
Comment4 "Xsheetnumber=18"
$EndDescr
$Comp
-L PIN-PIN-0.8 TP20
+L PIN-PIN-0.8 TP1601
U 1 1 578CE9FA
P 9200 4300
-F 0 "TP20" H 9200 4400 60 0000 C CNN
+F 0 "TP1601" H 9200 4400 60 0000 C CNN
F 1 "USB_DP" H 9130 4320 60 0000 R CNN
F 2 "neo900-legacy:1PIN-1.5-0.8" H 9190 4090 65 0001 L TNN
F 3 "" H 9200 4300 60 0001 C CNN
@@ -66,10 +66,10 @@ F 3 "" H 9200 4300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L PIN-PIN-0.8 TP22
+L PIN-PIN-0.8 TP1602
U 1 1 578CEB8A
P 9200 4550
-F 0 "TP22" H 9200 4650 60 0000 C CNN
+F 0 "TP1602" H 9200 4650 60 0000 C CNN
F 1 "USB_DM" H 9100 4550 60 0000 R CNN
F 2 "neo900-legacy:1PIN-1.5-0.8" H 9190 4340 65 0001 L TNN
F 3 "" H 9200 4550 60 0001 C CNN
@@ -77,10 +77,10 @@ F 3 "" H 9200 4550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L CONN_11_10 CON1801
+L CONN_11_10 CON1601
U 1 1 57F4747C
P 3200 2850
-F 0 "CON1801" H 3200 3450 60 0000 C CNN
+F 0 "CON1601" H 3200 3450 60 0000 C CNN
F 1 "DF9-21S-1V" H 3200 2250 60 0000 C CNN
F 2 "" H 3200 2850 60 0001 C CNN
F 3 "" H 3200 2850 60 0001 C CNN
@@ -88,10 +88,10 @@ F 3 "" H 3200 2850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L CONN_11_10 CON1802
+L CONN_11_10 CON1602
U 1 1 57F47483
P 7900 2850
-F 0 "CON1802" H 7900 3450 60 0000 C CNN
+F 0 "CON1602" H 7900 3450 60 0000 C CNN
F 1 "DF9-21S-1V" H 7900 2250 60 0000 C CNN
F 2 "" H 7900 2850 60 0001 C CNN
F 3 "" H 7900 2850 60 0001 C CNN
@@ -195,8 +195,8 @@ L GND #U$?
U 1 1 57F474BB
P 2700 3650
AR Path="/578AFF0C/57F474BB" Ref="#U$?" Part="1"
-AR Path="/578AFF12/57F474BB" Ref="#U$1401" Part="1"
-F 0 "#U$1401" H 2610 3550 70 0001 L BNN
+AR Path="/578AFF12/57F474BB" Ref="#U$1601" Part="1"
+F 0 "#U$1601" H 2610 3550 70 0001 L BNN
F 1 "GND" H 2610 3550 70 0001 L BNN
F 2 "" H 2700 3650 60 0001 C CNN
F 3 "" H 2700 3650 60 0001 C CNN
@@ -208,8 +208,8 @@ L GND #U$?
U 1 1 57F474C1
P 3700 3650
AR Path="/578AFF0C/57F474C1" Ref="#U$?" Part="1"
-AR Path="/578AFF12/57F474C1" Ref="#U$1402" Part="1"
-F 0 "#U$1402" H 3610 3550 70 0001 L BNN
+AR Path="/578AFF12/57F474C1" Ref="#U$1602" Part="1"
+F 0 "#U$1602" H 3610 3550 70 0001 L BNN
F 1 "GND" H 3610 3550 70 0001 L BNN
F 2 "" H 3700 3650 60 0001 C CNN
F 3 "" H 3700 3650 60 0001 C CNN
@@ -221,8 +221,8 @@ L GND #U$?
U 1 1 57F474C7
P 7400 3650
AR Path="/578AFF0C/57F474C7" Ref="#U$?" Part="1"
-AR Path="/578AFF12/57F474C7" Ref="#U$1403" Part="1"
-F 0 "#U$1403" H 7310 3550 70 0001 L BNN
+AR Path="/578AFF12/57F474C7" Ref="#U$1603" Part="1"
+F 0 "#U$1603" H 7310 3550 70 0001 L BNN
F 1 "GND" H 7310 3550 70 0001 L BNN
F 2 "" H 7400 3650 60 0001 C CNN
F 3 "" H 7400 3650 60 0001 C CNN
@@ -289,8 +289,8 @@ U 1 1 57F474F2
P 10000 2800
AR Path="/578AFF18/57F474F2" Ref="C?" Part="1"
AR Path="/578AFF0C/57F474F2" Ref="C?" Part="1"
-AR Path="/578AFF12/57F474F2" Ref="C1801" Part="1"
-F 0 "C1801" H 10040 2840 50 0000 L CNN
+AR Path="/578AFF12/57F474F2" Ref="C1601" Part="1"
+F 0 "C1601" H 10040 2840 50 0000 L CNN
F 1 "100p" H 10050 2650 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 10030 2950 20 0001 C CNN
F 3 "" H 10000 2800 60 0001 C CNN
@@ -302,8 +302,8 @@ L R R?
U 1 1 57F474F9
P 9900 2100
AR Path="/578AFF0C/57F474F9" Ref="R?" Part="1"
-AR Path="/578AFF12/57F474F9" Ref="R1809" Part="1"
-F 0 "R1809" V 9850 2200 50 0000 L CNN
+AR Path="/578AFF12/57F474F9" Ref="R1609" Part="1"
+F 0 "R1609" V 9850 2200 50 0000 L CNN
F 1 "100k" H 9900 2100 50 0000 C CNN
F 2 "SMD-0402" H 9930 2250 20 0001 C CNN
F 3 "" H 9900 2100 60 0001 C CNN
@@ -321,8 +321,8 @@ L GND #U$?
U 1 1 57F47503
P 10000 3200
AR Path="/578AFF0C/57F47503" Ref="#U$?" Part="1"
-AR Path="/578AFF12/57F47503" Ref="#U$1404" Part="1"
-F 0 "#U$1404" H 9910 3100 70 0001 L BNN
+AR Path="/578AFF12/57F47503" Ref="#U$1604" Part="1"
+F 0 "#U$1604" H 9910 3100 70 0001 L BNN
F 1 "GND" H 9910 3100 70 0001 L BNN
F 2 "" H 10000 3200 60 0001 C CNN
F 3 "" H 10000 3200 60 0001 C CNN
@@ -379,10 +379,10 @@ Connection ~ 12400 1950
Wire Wire Line
12400 1950 12400 1850
$Comp
-L POWERED #FLG1401
+L POWERED #FLG1601
U 1 1 57F47944
P 12400 1650
-F 0 "#FLG1401" H 12600 1550 60 0001 C CNN
+F 0 "#FLG1601" H 12600 1550 60 0001 C CNN
F 1 "POWERED" H 12400 1700 60 0000 C CNN
F 2 "" H 12400 1650 60 0001 C CNN
F 3 "" H 12400 1650 60 0001 C CNN
@@ -436,8 +436,8 @@ L ADP1653 U?
U 5 1 57F47962
P 13500 4650
AR Path="/578AFF0C/57F47962" Ref="U?" Part="5"
-AR Path="/578AFF12/57F47962" Ref="U1801" Part="5"
-F 0 "U1801" H 13490 4640 65 0001 L TNN
+AR Path="/578AFF12/57F47962" Ref="U1601" Part="5"
+F 0 "U1601" H 13490 4640 65 0001 L TNN
F 1 "ADP1653" H 13490 4540 65 0001 L TNN
F 2 "neo900-legacy:QFN-16+E-0.5" H 13490 4440 65 0001 L TNN
F 3 "" H 13500 4650 60 0001 C CNN
@@ -449,8 +449,8 @@ L ADP1653 U?
U 4 1 57F47968
P 13600 4650
AR Path="/578AFF0C/57F47968" Ref="U?" Part="4"
-AR Path="/578AFF12/57F47968" Ref="U1801" Part="4"
-F 0 "U1801" H 13590 4640 65 0001 L TNN
+AR Path="/578AFF12/57F47968" Ref="U1601" Part="4"
+F 0 "U1601" H 13590 4640 65 0001 L TNN
F 1 "ADP1653" H 13590 4540 65 0001 L TNN
F 2 "neo900-legacy:QFN-16+E-0.5" H 13590 4440 65 0001 L TNN
F 3 "" H 13600 4650 60 0001 C CNN
@@ -462,8 +462,8 @@ L ADP1653 U?
U 3 1 57F4796E
P 13700 4650
AR Path="/578AFF0C/57F4796E" Ref="U?" Part="3"
-AR Path="/578AFF12/57F4796E" Ref="U1801" Part="3"
-F 0 "U1801" H 13690 4640 65 0001 L TNN
+AR Path="/578AFF12/57F4796E" Ref="U1601" Part="3"
+F 0 "U1601" H 13690 4640 65 0001 L TNN
F 1 "ADP1653" H 13690 4540 65 0001 L TNN
F 2 "neo900-legacy:QFN-16+E-0.5" H 13690 4440 65 0001 L TNN
F 3 "" H 13700 4650 60 0001 C CNN
@@ -476,8 +476,8 @@ U 2 1 57F47974
P 14500 4450
AR Path="/578AFF18/57F47974" Ref="U?" Part="2"
AR Path="/578AFF0C/57F47974" Ref="U?" Part="2"
-AR Path="/578AFF12/57F47974" Ref="U1801" Part="2"
-F 0 "U1801" H 14390 4700 50 0000 L BNN
+AR Path="/578AFF12/57F47974" Ref="U1601" Part="2"
+F 0 "U1601" H 14390 4700 50 0000 L BNN
F 1 "ADP1653" H 15100 3300 50 0000 C CNN
F 2 "neo900-legacy:QFN-16+E-0.5" H 14490 4240 65 0001 L TNN
F 3 "" H 14500 4450 60 0001 C CNN
@@ -489,8 +489,8 @@ L ADP1653 U?
U 1 1 57F4797B
P 13900 2950
AR Path="/578AFF0C/57F4797B" Ref="U?" Part="1"
-AR Path="/578AFF12/57F4797B" Ref="U1801" Part="1"
-F 0 "U1801" H 13890 2940 65 0001 L TNN
+AR Path="/578AFF12/57F4797B" Ref="U1601" Part="1"
+F 0 "U1601" H 13890 2940 65 0001 L TNN
F 1 "ADP1653" H 13890 2840 65 0001 L TNN
F 2 "neo900-legacy:QFN-16+E-0.5" H 13890 2740 65 0001 L TNN
F 3 "" H 13900 2950 60 0001 C CNN
@@ -503,8 +503,8 @@ U 1 1 57F47981
P 13400 1950
AR Path="/578AFF18/57F47981" Ref="L?" Part="1"
AR Path="/578AFF0C/57F47981" Ref="L?" Part="1"
-AR Path="/578AFF12/57F47981" Ref="L1802" Part="1"
-F 0 "L1802" V 13500 1950 50 0000 C CNN
+AR Path="/578AFF12/57F47981" Ref="L1602" Part="1"
+F 0 "L1602" V 13500 1950 50 0000 C CNN
F 1 "2u2;MDMK3030T2R2MM" V 13300 2150 50 0000 R CNN
F 2 "neo900-legacy:SMD-1212" H 13390 1740 65 0001 L TNN
F 3 "" H 13400 1950 60 0001 C CNN
@@ -517,8 +517,8 @@ U 1 1 57F47988
P 11950 1950
AR Path="/578AFF18/57F47988" Ref="L?" Part="1"
AR Path="/578AFF0C/57F47988" Ref="L?" Part="1"
-AR Path="/578AFF12/57F47988" Ref="L1801" Part="1"
-F 0 "L1801" V 11892 1800 50 0000 L BNN
+AR Path="/578AFF12/57F47988" Ref="L1601" Part="1"
+F 0 "L1601" V 11892 1800 50 0000 L BNN
F 1 "ferrite" V 12080 1801 50 0000 L BNN
F 2 "neo900-legacy:SMD-0805" H 11940 1740 65 0001 L TNN
F 3 "" H 11950 1950 60 0001 C CNN
@@ -531,8 +531,8 @@ U 1 1 57F4798F
P 13850 1950
AR Path="/578AFF18/57F4798F" Ref="D?" Part="1"
AR Path="/578AFF0C/57F4798F" Ref="D?" Part="1"
-AR Path="/578AFF12/57F4798F" Ref="D1801" Part="1"
-F 0 "D1801" H 13725 2100 50 0000 L CNN
+AR Path="/578AFF12/57F4798F" Ref="D1601" Part="1"
+F 0 "D1601" H 13725 2100 50 0000 L CNN
F 1 "RSX101M-30" H 13650 1800 50 0000 L CNN
F 2 "neo900-legacy:CRS02" H 13880 2100 20 0001 C CNN
F 3 "" H 13850 1950 60 0001 C CNN
@@ -545,8 +545,8 @@ U 1 1 57F47996
P 12250 2150
AR Path="/578AFF18/57F47996" Ref="C?" Part="1"
AR Path="/578AFF0C/57F47996" Ref="C?" Part="1"
-AR Path="/578AFF12/57F47996" Ref="C1802" Part="1"
-F 0 "C1802" H 12290 2190 50 0000 L CNN
+AR Path="/578AFF12/57F47996" Ref="C1602" Part="1"
+F 0 "C1602" H 12290 2190 50 0000 L CNN
F 1 "10u" H 12300 2000 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 12280 2300 20 0001 C CNN
F 3 "" H 12250 2150 60 0001 C CNN
@@ -559,8 +559,8 @@ U 1 1 57F4799D
P 14600 1400
AR Path="/578AFF18/57F4799D" Ref="C?" Part="1"
AR Path="/578AFF0C/57F4799D" Ref="C?" Part="1"
-AR Path="/578AFF12/57F4799D" Ref="C1803" Part="1"
-F 0 "C1803" H 14640 1440 50 0000 L CNN
+AR Path="/578AFF12/57F4799D" Ref="C1603" Part="1"
+F 0 "C1603" H 14640 1440 50 0000 L CNN
F 1 "4u7; 12V" H 14650 1250 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 14630 1550 20 0001 C CNN
F 3 "" H 14600 1400 60 0001 C CNN
@@ -582,8 +582,8 @@ L GND #U$?
U 1 1 57F479A9
P 12250 2550
AR Path="/578AFF0C/57F479A9" Ref="#U$?" Part="1"
-AR Path="/578AFF12/57F479A9" Ref="#U$1405" Part="1"
-F 0 "#U$1405" H 12160 2450 70 0001 L BNN
+AR Path="/578AFF12/57F479A9" Ref="#U$1605" Part="1"
+F 0 "#U$1605" H 12160 2450 70 0001 L BNN
F 1 "GND" H 12160 2450 70 0001 L BNN
F 2 "" H 12250 2550 60 0001 C CNN
F 3 "" H 12250 2550 60 0001 C CNN
@@ -595,8 +595,8 @@ L GND #U$?
U 1 1 57F479AF
P 12800 4250
AR Path="/578AFF0C/57F479AF" Ref="#U$?" Part="1"
-AR Path="/578AFF12/57F479AF" Ref="#U$1406" Part="1"
-F 0 "#U$1406" H 12710 4150 70 0001 L BNN
+AR Path="/578AFF12/57F479AF" Ref="#U$1606" Part="1"
+F 0 "#U$1606" H 12710 4150 70 0001 L BNN
F 1 "GND" H 12710 4150 70 0001 L BNN
F 2 "" H 12800 4250 60 0001 C CNN
F 3 "" H 12800 4250 60 0001 C CNN
@@ -608,8 +608,8 @@ L GND #U$?
U 1 1 57F479B5
P 13700 5150
AR Path="/578AFF0C/57F479B5" Ref="#U$?" Part="1"
-AR Path="/578AFF12/57F479B5" Ref="#U$1407" Part="1"
-F 0 "#U$1407" H 13610 5050 70 0001 L BNN
+AR Path="/578AFF12/57F479B5" Ref="#U$1607" Part="1"
+F 0 "#U$1607" H 13610 5050 70 0001 L BNN
F 1 "GND" H 13610 5050 70 0001 L BNN
F 2 "" H 13700 5150 60 0001 C CNN
F 3 "" H 13700 5150 60 0001 C CNN
@@ -632,8 +632,8 @@ L GND #U$?
U 1 1 57F479C1
P 14600 1800
AR Path="/578AFF0C/57F479C1" Ref="#U$?" Part="1"
-AR Path="/578AFF12/57F479C1" Ref="#U$1408" Part="1"
-F 0 "#U$1408" H 14510 1700 70 0001 L BNN
+AR Path="/578AFF12/57F479C1" Ref="#U$1608" Part="1"
+F 0 "#U$1608" H 14510 1700 70 0001 L BNN
F 1 "GND" H 14510 1700 70 0001 L BNN
F 2 "" H 14600 1800 60 0001 C CNN
F 3 "" H 14600 1800 60 0001 C CNN
@@ -665,10 +665,10 @@ OTG_DP
Text GLabel 9600 4550 2 60 BiDi ~ 0
OTG_DM
$Comp
-L DUALNMOSFET-PAR Q1801
+L DUALNMOSFET-PAR Q1601
U 1 1 58050628
P 2800 5700
-F 0 "Q1801" H 2600 6225 60 0000 C CNN
+F 0 "Q1601" H 2600 6225 60 0000 C CNN
F 1 "FC6946010R" H 2800 5050 60 0000 C CNN
F 2 "" H 2800 5700 60 0001 C CNN
F 3 "" H 2800 5700 60 0001 C CNN
@@ -676,10 +676,10 @@ F 3 "" H 2800 5700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L DUALNMOSFET-PAR Q1802
+L DUALNMOSFET-PAR Q1602
U 1 1 58050F1F
P 2800 7100
-F 0 "Q1802" H 2600 7625 60 0000 C CNN
+F 0 "Q1602" H 2600 7625 60 0000 C CNN
F 1 "FC6946010R" H 2800 6450 60 0000 C CNN
F 2 "" H 2800 7100 60 0001 C CNN
F 3 "" H 2800 7100 60 0001 C CNN
@@ -689,10 +689,10 @@ $EndComp
Text GLabel 1750 4700 0 60 Input ~ 0
1V8
$Comp
-L R0402 R1801
+L R0402 R1601
U 1 1 58051285
P 1900 5400
-F 0 "R1801" H 1770 5480 50 0000 L CNN
+F 0 "R1601" H 1770 5480 50 0000 L CNN
F 1 "100" H 1900 5400 50 0000 C CNN
F 2 "SMD-0402" H 1930 5550 20 0001 C CNN
F 3 "" H 1900 5400 60 0001 C CNN
@@ -700,10 +700,10 @@ F 3 "" H 1900 5400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1803
+L R0402 R1602
U 1 1 580517AD
P 1900 5900
-F 0 "R1803" H 1770 5980 50 0000 L CNN
+F 0 "R1602" H 1770 5980 50 0000 L CNN
F 1 "100" H 1900 5900 50 0000 C CNN
F 2 "SMD-0402" H 1930 6050 20 0001 C CNN
F 3 "" H 1900 5900 60 0001 C CNN
@@ -711,10 +711,10 @@ F 3 "" H 1900 5900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1802
+L R0402 R1603
U 1 1 58051F4D
P 1900 6800
-F 0 "R1802" H 1770 6880 50 0000 L CNN
+F 0 "R1603" H 1770 6880 50 0000 L CNN
F 1 "100" H 1900 6800 50 0000 C CNN
F 2 "SMD-0402" H 1930 6950 20 0001 C CNN
F 3 "" H 1900 6800 60 0001 C CNN
@@ -722,10 +722,10 @@ F 3 "" H 1900 6800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1804
+L R0402 R1604
U 1 1 58052024
P 1900 7300
-F 0 "R1804" H 1770 7380 50 0000 L CNN
+F 0 "R1604" H 1770 7380 50 0000 L CNN
F 1 "100" H 1900 7300 50 0000 C CNN
F 2 "SMD-0402" H 1930 7450 20 0001 C CNN
F 3 "" H 1900 7300 60 0001 C CNN
@@ -772,10 +772,10 @@ HB_UART_CTS
Text Label 4200 5400 2 60 ~ 0
HB_UART_TX
$Comp
-L DUALNMOSFET-PAR Q1803
+L DUALNMOSFET-PAR Q1603
U 1 1 58055460
P 6700 5700
-F 0 "Q1803" H 6500 6225 60 0000 C CNN
+F 0 "Q1603" H 6500 6225 60 0000 C CNN
F 1 "FC6946010R" H 6700 5050 60 0000 C CNN
F 2 "" H 6700 5700 60 0001 C CNN
F 3 "" H 6700 5700 60 0001 C CNN
@@ -783,10 +783,10 @@ F 3 "" H 6700 5700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L DUALNMOSFET-PAR Q1804
+L DUALNMOSFET-PAR Q1604
U 1 1 58055466
P 6700 7100
-F 0 "Q1804" H 6500 7625 60 0000 C CNN
+F 0 "Q1604" H 6500 7625 60 0000 C CNN
F 1 "FC6946010R" H 6700 6450 60 0000 C CNN
F 2 "" H 6700 7100 60 0001 C CNN
F 3 "" H 6700 7100 60 0001 C CNN
@@ -794,10 +794,10 @@ F 3 "" H 6700 7100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1805
+L R0402 R1605
U 1 1 5805546D
P 5800 5400
-F 0 "R1805" H 5670 5480 50 0000 L CNN
+F 0 "R1605" H 5670 5480 50 0000 L CNN
F 1 "100" H 5800 5400 50 0000 C CNN
F 2 "SMD-0402" H 5830 5550 20 0001 C CNN
F 3 "" H 5800 5400 60 0001 C CNN
@@ -805,10 +805,10 @@ F 3 "" H 5800 5400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1807
+L R0402 R1606
U 1 1 58055473
P 5800 5900
-F 0 "R1807" H 5670 5980 50 0000 L CNN
+F 0 "R1606" H 5670 5980 50 0000 L CNN
F 1 "100" H 5800 5900 50 0000 C CNN
F 2 "SMD-0402" H 5830 6050 20 0001 C CNN
F 3 "" H 5800 5900 60 0001 C CNN
@@ -816,10 +816,10 @@ F 3 "" H 5800 5900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1806
+L R0402 R1607
U 1 1 58055479
P 5800 6800
-F 0 "R1806" H 5670 6880 50 0000 L CNN
+F 0 "R1607" H 5670 6880 50 0000 L CNN
F 1 "100" H 5800 6800 50 0000 C CNN
F 2 "SMD-0402" H 5830 6950 20 0001 C CNN
F 3 "" H 5800 6800 60 0001 C CNN
@@ -827,10 +827,10 @@ F 3 "" H 5800 6800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1808
+L R0402 R1608
U 1 1 5805547F
P 5800 7300
-F 0 "R1808" H 5670 7380 50 0000 L CNN
+F 0 "R1608" H 5670 7380 50 0000 L CNN
F 1 "100" H 5800 7300 50 0000 C CNN
F 2 "SMD-0402" H 5830 7450 20 0001 C CNN
F 3 "" H 5800 7300 60 0001 C CNN
@@ -879,10 +879,10 @@ HB_GPIO_A
Text Notes 1800 8200 0 60 ~ 0
Q18xx alternative: DMN63D8LV by Diodes Inc.
$Comp
-L FUSE F1801
+L FUSE F1601
U 1 1 5807BB89
P 1800 1900
-F 0 "F1801" H 1800 2000 60 0000 C CNN
+F 0 "F1601" H 1800 2000 60 0000 C CNN
F 1 "0ZCH0175FF2E" H 1800 1800 60 0000 C CNN
F 2 "" H 1800 1900 60 0001 C CNN
F 3 "" H 1800 1900 60 0001 C CNN
@@ -938,8 +938,8 @@ L TEST-POINT-0.75 TP?
U 1 1 5816E3E9
P 12600 7000
AR Path="/578AFEFA/5816E3E9" Ref="TP?" Part="1"
-AR Path="/578AFF12/5816E3E9" Ref="TP1801" Part="1"
-F 0 "TP1801" H 12650 7000 50 0000 L CNN
+AR Path="/578AFF12/5816E3E9" Ref="TP1603" Part="1"
+F 0 "TP1603" H 12650 7000 50 0000 L CNN
F 1 "DTR" H 12660 6975 50 0001 L BNN
F 2 "neo900-legacy:TP-0.75" H 12590 6790 65 0001 L TNN
F 3 "" H 12600 7000 60 0001 C CNN
@@ -955,8 +955,8 @@ L TEST-POINT-0.75 TP?
U 1 1 5816E754
P 12600 7150
AR Path="/578AFEFA/5816E754" Ref="TP?" Part="1"
-AR Path="/578AFF12/5816E754" Ref="TP1802" Part="1"
-F 0 "TP1802" H 12650 7150 50 0000 L CNN
+AR Path="/578AFF12/5816E754" Ref="TP1604" Part="1"
+F 0 "TP1604" H 12650 7150 50 0000 L CNN
F 1 "DTR" H 12660 7125 50 0001 L BNN
F 2 "neo900-legacy:TP-0.75" H 12590 6940 65 0001 L TNN
F 3 "" H 12600 7150 60 0001 C CNN
@@ -970,8 +970,8 @@ L TEST-POINT-0.75 TP?
U 1 1 5816E91D
P 12600 7350
AR Path="/578AFEFA/5816E91D" Ref="TP?" Part="1"
-AR Path="/578AFF12/5816E91D" Ref="TP1803" Part="1"
-F 0 "TP1803" H 12650 7350 50 0000 L CNN
+AR Path="/578AFF12/5816E91D" Ref="TP1605" Part="1"
+F 0 "TP1605" H 12650 7350 50 0000 L CNN
F 1 "DTR" H 12660 7325 50 0001 L BNN
F 2 "neo900-legacy:TP-0.75" H 12590 7140 65 0001 L TNN
F 3 "" H 12600 7350 60 0001 C CNN
@@ -983,8 +983,8 @@ L TEST-POINT-0.75 TP?
U 1 1 5816E9D7
P 12600 7550
AR Path="/578AFEFA/5816E9D7" Ref="TP?" Part="1"
-AR Path="/578AFF12/5816E9D7" Ref="TP1804" Part="1"
-F 0 "TP1804" H 12650 7550 50 0000 L CNN
+AR Path="/578AFF12/5816E9D7" Ref="TP1606" Part="1"
+F 0 "TP1606" H 12650 7550 50 0000 L CNN
F 1 "DTR" H 12660 7525 50 0001 L BNN
F 2 "neo900-legacy:TP-0.75" H 12590 7340 65 0001 L TNN
F 3 "" H 12600 7550 60 0001 C CNN
@@ -1000,8 +1000,8 @@ L TEST-POINT-0.75 TP?
U 1 1 5816E9DF
P 12600 7700
AR Path="/578AFEFA/5816E9DF" Ref="TP?" Part="1"
-AR Path="/578AFF12/5816E9DF" Ref="TP1805" Part="1"
-F 0 "TP1805" H 12650 7700 50 0000 L CNN
+AR Path="/578AFF12/5816E9DF" Ref="TP1607" Part="1"
+F 0 "TP1607" H 12650 7700 50 0000 L CNN
F 1 "DTR" H 12660 7675 50 0001 L BNN
F 2 "neo900-legacy:TP-0.75" H 12590 7490 65 0001 L TNN
F 3 "" H 12600 7700 60 0001 C CNN
@@ -1013,8 +1013,8 @@ L TEST-POINT-0.75 TP?
U 1 1 5816EA85
P 12600 7850
AR Path="/578AFEFA/5816EA85" Ref="TP?" Part="1"
-AR Path="/578AFF12/5816EA85" Ref="TP1806" Part="1"
-F 0 "TP1806" H 12650 7850 50 0000 L CNN
+AR Path="/578AFF12/5816EA85" Ref="TP1608" Part="1"
+F 0 "TP1608" H 12650 7850 50 0000 L CNN
F 1 "DTR" H 12660 7825 50 0001 L BNN
F 2 "neo900-legacy:TP-0.75" H 12590 7640 65 0001 L TNN
F 3 "" H 12600 7850 60 0001 C CNN
@@ -1030,8 +1030,8 @@ L TEST-POINT-0.75 TP?
U 1 1 5816EA8D
P 12600 8000
AR Path="/578AFEFA/5816EA8D" Ref="TP?" Part="1"
-AR Path="/578AFF12/5816EA8D" Ref="TP1807" Part="1"
-F 0 "TP1807" H 12650 8000 50 0000 L CNN
+AR Path="/578AFF12/5816EA8D" Ref="TP1609" Part="1"
+F 0 "TP1609" H 12650 8000 50 0000 L CNN
F 1 "DTR" H 12660 7975 50 0001 L BNN
F 2 "neo900-legacy:TP-0.75" H 12590 7790 65 0001 L TNN
F 3 "" H 12600 8000 60 0001 C CNN
@@ -1043,8 +1043,8 @@ L TEST-POINT-0.75 TP?
U 1 1 5816ED53
P 12600 8200
AR Path="/578AFEFA/5816ED53" Ref="TP?" Part="1"
-AR Path="/578AFF12/5816ED53" Ref="TP1808" Part="1"
-F 0 "TP1808" H 12650 8200 50 0000 L CNN
+AR Path="/578AFF12/5816ED53" Ref="TP1610" Part="1"
+F 0 "TP1610" H 12650 8200 50 0000 L CNN
F 1 "DTR" H 12660 8175 50 0001 L BNN
F 2 "neo900-legacy:TP-0.75" H 12590 7990 65 0001 L TNN
F 3 "" H 12600 8200 60 0001 C CNN
@@ -1060,8 +1060,8 @@ L TEST-POINT-0.75 TP?
U 1 1 5816ED5B
P 12600 8350
AR Path="/578AFEFA/5816ED5B" Ref="TP?" Part="1"
-AR Path="/578AFF12/5816ED5B" Ref="TP1809" Part="1"
-F 0 "TP1809" H 12650 8350 50 0000 L CNN
+AR Path="/578AFF12/5816ED5B" Ref="TP1611" Part="1"
+F 0 "TP1611" H 12650 8350 50 0000 L CNN
F 1 "DTR" H 12660 8325 50 0001 L BNN
F 2 "neo900-legacy:TP-0.75" H 12590 8140 65 0001 L TNN
F 3 "" H 12600 8350 60 0001 C CNN
@@ -1073,8 +1073,8 @@ L TEST-POINT-0.75 TP?
U 1 1 5816ED61
P 12600 8500
AR Path="/578AFEFA/5816ED61" Ref="TP?" Part="1"
-AR Path="/578AFF12/5816ED61" Ref="TP1810" Part="1"
-F 0 "TP1810" H 12650 8500 50 0000 L CNN
+AR Path="/578AFF12/5816ED61" Ref="TP1612" Part="1"
+F 0 "TP1612" H 12650 8500 50 0000 L CNN
F 1 "DTR" H 12660 8475 50 0001 L BNN
F 2 "neo900-legacy:TP-0.75" H 12590 8290 65 0001 L TNN
F 3 "" H 12600 8500 60 0001 C CNN
@@ -1090,8 +1090,8 @@ L TEST-POINT-0.75 TP?
U 1 1 5816ED69
P 12600 8650
AR Path="/578AFEFA/5816ED69" Ref="TP?" Part="1"
-AR Path="/578AFF12/5816ED69" Ref="TP1811" Part="1"
-F 0 "TP1811" H 12650 8650 50 0000 L CNN
+AR Path="/578AFF12/5816ED69" Ref="TP1613" Part="1"
+F 0 "TP1613" H 12650 8650 50 0000 L CNN
F 1 "DTR" H 12660 8625 50 0001 L BNN
F 2 "neo900-legacy:TP-0.75" H 12590 8440 65 0001 L TNN
F 3 "" H 12600 8650 60 0001 C CNN
@@ -1103,8 +1103,8 @@ L TEST-POINT-0.75 TP?
U 1 1 5816EE5F
P 12600 8850
AR Path="/578AFEFA/5816EE5F" Ref="TP?" Part="1"
-AR Path="/578AFF12/5816EE5F" Ref="TP1812" Part="1"
-F 0 "TP1812" H 12650 8850 50 0000 L CNN
+AR Path="/578AFF12/5816EE5F" Ref="TP1614" Part="1"
+F 0 "TP1614" H 12650 8850 50 0000 L CNN
F 1 "DTR" H 12660 8825 50 0001 L BNN
F 2 "neo900-legacy:TP-0.75" H 12590 8640 65 0001 L TNN
F 3 "" H 12600 8850 60 0001 C CNN
@@ -1120,8 +1120,8 @@ L TEST-POINT-0.75 TP?
U 1 1 5816EE67
P 12600 9000
AR Path="/578AFEFA/5816EE67" Ref="TP?" Part="1"
-AR Path="/578AFF12/5816EE67" Ref="TP1813" Part="1"
-F 0 "TP1813" H 12650 9000 50 0000 L CNN
+AR Path="/578AFF12/5816EE67" Ref="TP1615" Part="1"
+F 0 "TP1615" H 12650 9000 50 0000 L CNN
F 1 "DTR" H 12660 8975 50 0001 L BNN
F 2 "neo900-legacy:TP-0.75" H 12590 8790 65 0001 L TNN
F 3 "" H 12600 9000 60 0001 C CNN
diff --git a/hw/ir.sch b/hw/ir.sch
index 9634f18..04d5418 100644
--- a/hw/ir.sch
+++ b/hw/ir.sch
@@ -59,10 +59,10 @@ TODO: update D1901 footprint
Text Notes 3700 2300 0 70 ~ 0
NOTE: 1V8 may be quite noisy~
$Comp
-L C0402 C1901
+L C0402 C1401
U 1 1 578CEF91
P 3900 3400
-F 0 "C1901" V 3950 3450 50 0000 L CNN
+F 0 "C1401" V 3950 3450 50 0000 L CNN
F 1 "1n" V 3850 3450 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 3930 3550 20 0001 C CNN
F 3 "" H 3900 3400 60 0001 C CNN
@@ -70,10 +70,10 @@ F 3 "" H 3900 3400 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C1902
+L C0402 C1403
U 1 1 578CF059
P 6700 3700
-F 0 "C1902" H 6740 3740 50 0000 L CNN
+F 0 "C1403" H 6740 3740 50 0000 L CNN
F 1 "100n" H 6740 3570 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 6730 3850 20 0001 C CNN
F 3 "" H 6700 3700 60 0001 C CNN
@@ -81,10 +81,10 @@ F 3 "" H 6700 3700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L VEMD2023SLX01 D1901
+L VEMD2023SLX01 D1401
U 1 1 578CF2B1
P 4300 3000
-F 0 "D1901" V 4450 3050 50 0000 L CNN
+F 0 "D1401" V 4450 3050 50 0000 L CNN
F 1 "VEMD10940F" H 4150 2850 50 0000 L CNN
F 2 "neo900-legacy:VSMB2948SL" H 4290 2790 65 0001 L TNN
F 3 "" H 4300 3000 60 0001 C CNN
@@ -92,10 +92,10 @@ F 3 "" H 4300 3000 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L LED-VSMB2943SL D1902
+L LED-VSMB2943SL D1402
U 1 1 578CF379
P 12300 3000
-F 0 "D1902" V 12400 2800 50 0000 R CNN
+F 0 "D1402" V 12400 2800 50 0000 R CNN
F 1 "VSMB2948SL" V 12300 2800 50 0000 R CNN
F 2 "neo900-legacy:VSMB2948SL" H 12100 3160 50 0001 L BNN
F 3 "" H 12300 3000 60 0001 C CNN
@@ -103,10 +103,10 @@ F 3 "" H 12300 3000 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R1901
+L R0402 R1401
U 1 1 578CF509
P 4750 2900
-F 0 "R1901" H 4620 2960 50 0000 L BNN
+F 0 "R1401" H 4620 2960 50 0000 L BNN
F 1 "4M7" H 4750 2900 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 4780 3050 20 0001 C CNN
F 3 "" H 4750 2900 60 0001 C CNN
@@ -114,10 +114,10 @@ F 3 "" H 4750 2900 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R1902
+L R0402 R1406
U 1 1 578CF5D1
P 7800 2700
-F 0 "R1902" H 7670 2760 50 0000 L BNN
+F 0 "R1406" H 7670 2760 50 0000 L BNN
F 1 "10M" H 7800 2700 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 7830 2850 20 0001 C CNN
F 3 "" H 7800 2700 60 0001 C CNN
@@ -125,10 +125,10 @@ F 3 "" H 7800 2700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1903
+L R0402 R1403
U 1 1 578CF699
P 5150 3800
-F 0 "R1903" H 5020 3860 50 0000 L BNN
+F 0 "R1403" H 5020 3860 50 0000 L BNN
F 1 "50k" H 5150 3800 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5180 3950 20 0001 C CNN
F 3 "" H 5150 3800 60 0001 C CNN
@@ -136,10 +136,10 @@ F 3 "" H 5150 3800 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R1904
+L R0402 R1404
U 1 1 578CF761
P 6950 3400
-F 0 "R1904" H 6820 3460 50 0000 L BNN
+F 0 "R1404" H 6820 3460 50 0000 L BNN
F 1 "33k" H 6950 3400 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 6980 3550 20 0001 C CNN
F 3 "" H 6950 3400 60 0001 C CNN
@@ -147,10 +147,10 @@ F 3 "" H 6950 3400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1905
+L R0402 R1409
U 1 1 578CF829
P 10100 7400
-F 0 "R1905" H 9970 7460 50 0000 L BNN
+F 0 "R1409" H 9970 7460 50 0000 L BNN
F 1 "10k" H 10100 7400 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 10130 7550 20 0001 C CNN
F 3 "" H 10100 7400 60 0001 C CNN
@@ -158,10 +158,10 @@ F 3 "" H 10100 7400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1906
+L R0402 R1402
U 1 1 578CF8F1
P 4750 3800
-F 0 "R1906" H 4620 3860 50 0000 L BNN
+F 0 "R1402" H 4620 3860 50 0000 L BNN
F 1 "1M5" H 4750 3800 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 4780 3950 20 0001 C CNN
F 3 "" H 4750 3800 60 0001 C CNN
@@ -169,10 +169,10 @@ F 3 "" H 4750 3800 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R1907
+L R0402 R1411
U 1 1 578CF9B9
P 12300 4600
-F 0 "R1907" H 12170 4660 50 0000 L BNN
+F 0 "R1411" H 12170 4660 50 0000 L BNN
F 1 "4R7" H 12300 4600 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 12330 4750 20 0001 C CNN
F 3 "" H 12300 4600 60 0001 C CNN
@@ -180,10 +180,10 @@ F 3 "" H 12300 4600 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R1908
+L R0402 R1405
U 1 1 578CFA81
P 7300 5500
-F 0 "R1908" H 7170 5560 50 0000 L BNN
+F 0 "R1405" H 7170 5560 50 0000 L BNN
F 1 "22k" H 7300 5500 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 7330 5650 20 0001 C CNN
F 3 "" H 7300 5500 60 0001 C CNN
@@ -191,10 +191,10 @@ F 3 "" H 7300 5500 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$1501
+L GND #U$1401
U 1 1 578CFC75
P 4750 4200
-F 0 "#U$1501" H 4660 4100 70 0001 L BNN
+F 0 "#U$1401" H 4660 4100 70 0001 L BNN
F 1 "GND" H 4660 4100 70 0001 L BNN
F 2 "" H 4750 4200 60 0001 C CNN
F 3 "" H 4750 4200 60 0001 C CNN
@@ -202,10 +202,10 @@ F 3 "" H 4750 4200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1504
+L GND #U$1404
U 1 1 578CFCD9
P 6700 4200
-F 0 "#U$1504" H 6610 4100 70 0001 L BNN
+F 0 "#U$1404" H 6610 4100 70 0001 L BNN
F 1 "GND" H 6610 4100 70 0001 L BNN
F 2 "" H 6700 4200 60 0001 C CNN
F 3 "" H 6700 4200 60 0001 C CNN
@@ -213,10 +213,10 @@ F 3 "" H 6700 4200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1509
+L GND #U$1409
U 1 1 578CFDA1
P 12300 5000
-F 0 "#U$1509" H 12210 4900 70 0001 L BNN
+F 0 "#U$1409" H 12210 4900 70 0001 L BNN
F 1 "GND" H 12210 4900 70 0001 L BNN
F 2 "" H 12300 5000 60 0001 C CNN
F 3 "" H 12300 5000 60 0001 C CNN
@@ -224,10 +224,10 @@ F 3 "" H 12300 5000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1505
+L GND #U$1405
U 1 1 578CFE05
P 7300 5900
-F 0 "#U$1505" H 7210 5800 70 0001 L BNN
+F 0 "#U$1405" H 7210 5800 70 0001 L BNN
F 1 "GND" H 7210 5800 70 0001 L BNN
F 2 "" H 7300 5900 60 0001 C CNN
F 3 "" H 7300 5900 60 0001 C CNN
@@ -245,10 +245,10 @@ BQ_GPIO
Text GLabel 11700 2600 0 60 Input ~ 0
VBAT_SWITCHED
$Comp
-L SLG46531 U1901
+L SLG46531 U1402
U 1 1 57DA0A95
P 8700 7400
-F 0 "U1901" H 8200 7950 60 0000 L CNN
+F 0 "U1402" H 8200 7950 60 0000 L CNN
F 1 "SLG46531" H 8900 6800 60 0000 L CNN
F 2 "" H 8700 7400 60 0001 C CNN
F 3 "" H 8700 7400 60 0001 C CNN
@@ -256,10 +256,10 @@ F 3 "" H 8700 7400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L NMOSFET-GSD Q1901
+L NMOSFET-GSD Q1401
U 1 1 57D9FDC2
P 12200 3900
-F 0 "Q1901" H 12500 3950 60 0000 L CNN
+F 0 "Q1401" H 12500 3950 60 0000 L CNN
F 1 "DMN26D0UT" H 12500 3800 60 0000 L CNN
F 2 "" H 12200 3900 60 0001 C CNN
F 3 "" H 12200 3900 60 0001 C CNN
@@ -267,10 +267,10 @@ F 3 "" H 12200 3900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1909
+L R0402 R1410
U 1 1 57DA0426
P 11800 4600
-F 0 "R1909" H 11670 4660 50 0000 L BNN
+F 0 "R1410" H 11670 4660 50 0000 L BNN
F 1 "1M" H 11800 4600 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 11830 4750 20 0001 C CNN
F 3 "" H 11800 4600 60 0001 C CNN
@@ -278,10 +278,10 @@ F 3 "" H 11800 4600 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$1508
+L GND #U$1408
U 1 1 57DA047D
P 11800 5000
-F 0 "#U$1508" H 11710 4900 70 0001 L BNN
+F 0 "#U$1408" H 11710 4900 70 0001 L BNN
F 1 "GND" H 11710 4900 70 0001 L BNN
F 2 "" H 11800 5000 60 0001 C CNN
F 3 "" H 11800 5000 60 0001 C CNN
@@ -303,10 +303,10 @@ I2C2_SDA
Text GLabel 7000 7100 0 60 Input ~ 0
1V8
$Comp
-L C0402 C1903
+L C0402 C1404
U 1 1 57DA21EE
P 7850 7900
-F 0 "C1903" H 7890 7940 50 0000 L CNN
+F 0 "C1404" H 7890 7940 50 0000 L CNN
F 1 "100n" H 7890 7770 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 7880 8050 20 0001 C CNN
F 3 "" H 7850 7900 60 0001 C CNN
@@ -314,10 +314,10 @@ F 3 "" H 7850 7900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1506
+L GND #U$1406
U 1 1 57DA24DC
P 7850 8300
-F 0 "#U$1506" H 7760 8200 70 0001 L BNN
+F 0 "#U$1406" H 7760 8200 70 0001 L BNN
F 1 "GND" H 7760 8200 70 0001 L BNN
F 2 "" H 7850 8300 60 0001 C CNN
F 3 "" H 7850 8300 60 0001 C CNN
@@ -325,10 +325,10 @@ F 3 "" H 7850 8300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1507
+L GND #U$1407
U 1 1 57DA25C4
P 9550 8300
-F 0 "#U$1507" H 9460 8200 70 0001 L BNN
+F 0 "#U$1407" H 9460 8200 70 0001 L BNN
F 1 "GND" H 9460 8200 70 0001 L BNN
F 2 "" H 9550 8300 60 0001 C CNN
F 3 "" H 9550 8300 60 0001 C CNN
@@ -480,10 +480,10 @@ Wire Wire Line
Wire Wire Line
7300 3400 8100 3400
$Comp
-L R0402 R1911
+L R0402 R1408
U 1 1 57FDB778
P 10100 7200
-F 0 "R1911" H 9950 7250 50 0000 R CNN
+F 0 "R1408" H 9950 7250 50 0000 R CNN
F 1 "10k" H 10100 7200 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 10130 7350 20 0001 C CNN
F 3 "" H 10100 7200 60 0001 C CNN
@@ -491,10 +491,10 @@ F 3 "" H 10100 7200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1910
+L R0402 R1407
U 1 1 57FDBA76
P 10100 7100
-F 0 "R1910" H 9950 7150 50 0000 R CNN
+F 0 "R1407" H 9950 7150 50 0000 R CNN
F 1 "10k" H 10100 7100 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 10130 7250 20 0001 C CNN
F 3 "" H 10100 7100 60 0001 C CNN
@@ -539,10 +539,10 @@ NoConn ~ 8800 8100
Wire Wire Line
10500 7500 9400 7500
$Comp
-L NX3V1G66_6 U1902
+L NX3V1G66_6 U1401
U 1 1 5814FF87
P 5800 5200
-F 0 "U1902" H 5650 5550 60 0000 R CNN
+F 0 "U1401" H 5650 5550 60 0000 R CNN
F 1 "NX3V1G66GM" H 5950 5000 60 0000 L CNN
F 2 "" H 5800 5200 60 0001 C CNN
F 3 "" H 5800 5200 60 0001 C CNN
@@ -560,10 +560,10 @@ Wire Wire Line
5800 4600 5800 4700
Connection ~ 4750 2500
$Comp
-L C0402 C1904
+L C0402 C1402
U 1 1 58150F0B
P 6650 5500
-F 0 "C1904" H 6690 5540 50 0000 L CNN
+F 0 "C1402" H 6690 5540 50 0000 L CNN
F 1 "100n" H 6690 5370 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 6680 5650 20 0001 C CNN
F 3 "" H 6650 5500 60 0001 C CNN
@@ -571,10 +571,10 @@ F 3 "" H 6650 5500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1503
+L GND #U$1403
U 1 1 58150FB7
P 6650 5900
-F 0 "#U$1503" H 6560 5800 70 0001 L BNN
+F 0 "#U$1403" H 6560 5800 70 0001 L BNN
F 1 "GND" H 6560 5800 70 0001 L BNN
F 2 "" H 6650 5900 60 0001 C CNN
F 3 "" H 6650 5900 60 0001 C CNN
@@ -589,10 +589,10 @@ Connection ~ 5800 4600
Wire Wire Line
6650 5700 6650 5800
$Comp
-L GND #U$1502
+L GND #U$1402
U 1 1 58151168
P 5800 5850
-F 0 "#U$1502" H 5710 5750 70 0001 L BNN
+F 0 "#U$1402" H 5710 5750 70 0001 L BNN
F 1 "GND" H 5710 5750 70 0001 L BNN
F 2 "" H 5800 5850 60 0001 C CNN
F 3 "" H 5800 5850 60 0001 C CNN
diff --git a/hw/jack.sch b/hw/jack.sch
index 45710e2..9d6b059 100644
--- a/hw/jack.sch
+++ b/hw/jack.sch
@@ -65,10 +65,10 @@ Microphone Switch
Text Notes 4000 7400 0 120 ~ 0
Video Switch
$Comp
-L C0402 C1203
+L C0402 C1112
U 1 1 578C49D8
P 4750 1750
-F 0 "C1203" V 4800 1400 50 0000 L CNN
+F 0 "C1112" V 4800 1400 50 0000 L CNN
F 1 "1u" V 4700 1550 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 4780 1900 20 0001 C CNN
F 3 "" H 4750 1750 60 0001 C CNN
@@ -76,10 +76,10 @@ F 3 "" H 4750 1750 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C1204
+L C0402 C1105
U 1 1 578C4AA0
P 2750 2550
-F 0 "C1204" V 2800 2200 50 0000 L CNN
+F 0 "C1105" V 2800 2200 50 0000 L CNN
F 1 "470n" V 2700 2250 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 2780 2700 20 0001 C CNN
F 3 "" H 2750 2550 60 0001 C CNN
@@ -87,10 +87,10 @@ F 3 "" H 2750 2550 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C1205
+L C0402 C1120
U 1 1 578C4B68
P 12700 2400
-F 0 "C1205" V 12750 2400 50 0000 L CNN
+F 0 "C1120" V 12750 2400 50 0000 L CNN
F 1 "22p" V 12650 2400 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 12730 2550 20 0001 C CNN
F 3 "" H 12700 2400 60 0001 C CNN
@@ -98,10 +98,10 @@ F 3 "" H 12700 2400 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C1206
+L C0402 C1103
U 1 1 578C4C30
P 2550 2650
-F 0 "C1206" V 2600 2650 50 0000 L CNN
+F 0 "C1103" V 2600 2650 50 0000 L CNN
F 1 "470n" V 2500 2650 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 2580 2800 20 0001 C CNN
F 3 "" H 2550 2650 60 0001 C CNN
@@ -109,10 +109,10 @@ F 3 "" H 2550 2650 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C1207
+L C0402 C1106
U 1 1 578C4CF8
P 2750 2850
-F 0 "C1207" V 2800 2500 50 0000 L CNN
+F 0 "C1106" V 2800 2500 50 0000 L CNN
F 1 "470n" V 2700 2550 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 2780 3000 20 0001 C CNN
F 3 "" H 2750 2850 60 0001 C CNN
@@ -120,10 +120,10 @@ F 3 "" H 2750 2850 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C1208
+L C0402 C1121
U 1 1 578C4DC0
P 12700 2700
-F 0 "C1208" V 12750 2700 50 0000 L CNN
+F 0 "C1121" V 12750 2700 50 0000 L CNN
F 1 "22p" V 12650 2700 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 12730 2850 20 0001 C CNN
F 3 "" H 12700 2700 60 0001 C CNN
@@ -131,10 +131,10 @@ F 3 "" H 12700 2700 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C1209
+L C0402 C1104
U 1 1 578C4E88
P 2550 2950
-F 0 "C1209" V 2600 2950 50 0000 L CNN
+F 0 "C1104" V 2600 2950 50 0000 L CNN
F 1 "470n" V 2500 2950 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 2580 3100 20 0001 C CNN
F 3 "" H 2550 2950 60 0001 C CNN
@@ -142,10 +142,10 @@ F 3 "" H 2550 2950 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C1210
+L C0402 C1113
U 1 1 578C4F50
P 5650 3350
-F 0 "C1210" H 5690 3390 50 0000 L CNN
+F 0 "C1113" H 5690 3390 50 0000 L CNN
F 1 "1u" H 5690 3220 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 5680 3500 20 0001 C CNN
F 3 "" H 5650 3350 60 0001 C CNN
@@ -153,10 +153,10 @@ F 3 "" H 5650 3350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1211
+L C0402 C1115
U 1 1 578C5018
P 6250 5300
-F 0 "C1211" H 6290 5340 50 0000 L CNN
+F 0 "C1115" H 6290 5340 50 0000 L CNN
F 1 "100n" H 6290 5170 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 6280 5450 20 0001 C CNN
F 3 "" H 6250 5300 60 0001 C CNN
@@ -164,10 +164,10 @@ F 3 "" H 6250 5300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1212
+L C0402 C1108
U 1 1 578C50E0
P 3100 5450
-F 0 "C1212" H 3140 5490 50 0000 L CNN
+F 0 "C1108" H 3140 5490 50 0000 L CNN
F 1 "2u2" H 3140 5320 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 3130 5600 20 0001 C CNN
F 3 "" H 3100 5450 60 0001 C CNN
@@ -175,10 +175,10 @@ F 3 "" H 3100 5450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1213
+L C0402 C1101
U 1 1 578C51A8
P 2250 5900
-F 0 "C1213" V 2300 5550 50 0000 L CNN
+F 0 "C1101" V 2300 5550 50 0000 L CNN
F 1 "33n" V 2200 5650 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 2280 6050 20 0001 C CNN
F 3 "" H 2250 5900 60 0001 C CNN
@@ -186,10 +186,10 @@ F 3 "" H 2250 5900 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C1214
+L C0402 C1102
U 1 1 578C5270
P 2250 6100
-F 0 "C1214" V 2300 5750 50 0000 L CNN
+F 0 "C1102" V 2300 5750 50 0000 L CNN
F 1 "33n" V 2200 5850 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 2280 6250 20 0001 C CNN
F 3 "" H 2250 6100 60 0001 C CNN
@@ -197,10 +197,10 @@ F 3 "" H 2250 6100 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C1215
+L C0402 C1107
U 1 1 578C5338
P 2800 6350
-F 0 "C1215" H 2840 6390 50 0000 L CNN
+F 0 "C1107" H 2840 6390 50 0000 L CNN
F 1 "1n" H 2840 6220 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 2830 6500 20 0001 C CNN
F 3 "" H 2800 6350 60 0001 C CNN
@@ -208,10 +208,10 @@ F 3 "" H 2800 6350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1217
+L C0402 C1116
U 1 1 578C54C8
P 6650 6900
-F 0 "C1217" H 6690 6940 50 0000 L CNN
+F 0 "C1116" H 6690 6940 50 0000 L CNN
F 1 "100n" H 6690 6770 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 6680 7050 20 0001 C CNN
F 3 "" H 6650 6900 60 0001 C CNN
@@ -219,10 +219,10 @@ F 3 "" H 6650 6900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L V5.5MLA0603N D1201
+L V5.5MLA0603N D1102
U 1 1 578C5590
P 10550 2950
-F 0 "D1201" H 10200 3000 50 0000 L CNN
+F 0 "D1102" H 10200 3000 50 0000 L CNN
F 1 "V5.5MLA0603N" H 10450 2750 50 0000 C CNN
F 2 "neo900-legacy:SMD-0603" H 10540 2740 65 0001 L TNN
F 3 "" H 10550 2950 60 0001 C CNN
@@ -230,10 +230,10 @@ F 3 "" H 10550 2950 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L V5.5MLA0603N D1202
+L V5.5MLA0603N D1104
U 1 1 578C5658
P 10950 2950
-F 0 "D1202" H 10600 3000 50 0000 L CNN
+F 0 "D1104" H 10600 3000 50 0000 L CNN
F 1 "V5.5MLA0603N" H 10850 2750 50 0000 C CNN
F 2 "neo900-legacy:SMD-0603" H 10940 2740 65 0001 L TNN
F 3 "" H 10950 2950 60 0001 C CNN
@@ -241,10 +241,10 @@ F 3 "" H 10950 2950 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L V5.5MLA0603N D1203
+L V5.5MLA0603N D1101
U 1 1 578C5720
P 10450 4600
-F 0 "D1203" H 10100 4650 50 0000 L CNN
+F 0 "D1101" H 10100 4650 50 0000 L CNN
F 1 "V5.5MLA0603N" H 10450 4400 50 0000 C CNN
F 2 "neo900-legacy:SMD-0603" H 10440 4390 65 0001 L TNN
F 3 "" H 10450 4600 60 0001 C CNN
@@ -252,10 +252,10 @@ F 3 "" H 10450 4600 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L V5.5MLA0603N D1204
+L V5.5MLA0603N D1103
U 1 1 578C57E8
P 10850 4600
-F 0 "D1204" H 10500 4650 50 0000 L CNN
+F 0 "D1103" H 10500 4650 50 0000 L CNN
F 1 "V5.5MLA0603N" H 10850 4400 50 0000 C CNN
F 2 "neo900-legacy:SMD-0603" H 10840 4390 65 0001 L TNN
F 3 "" H 10850 4600 60 0001 C CNN
@@ -263,10 +263,10 @@ F 3 "" H 10850 4600 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L V5.5MLA0603N D1205
+L V5.5MLA0603N D1105
U 1 1 578C58B0
P 11250 4600
-F 0 "D1205" H 10900 4650 50 0000 L CNN
+F 0 "D1105" H 10900 4650 50 0000 L CNN
F 1 "V5.5MLA0603N" H 11250 4400 50 0000 C CNN
F 2 "neo900-legacy:SMD-0603" H 11240 4390 65 0001 L TNN
F 3 "" H 11250 4600 60 0001 C CNN
@@ -274,10 +274,10 @@ F 3 "" H 11250 4600 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L TEST-POINT-1.25 HS-1201
+L TEST-POINT-1.25 HS-1101
U 1 1 578C5A40
P 13200 3100
-F 0 "HS-1201" H 13200 3100 45 0001 L BNN
+F 0 "HS-1101" H 13200 3100 45 0001 L BNN
F 1 "HS_GND" H 13250 3100 50 0000 L CNN
F 2 "neo900-legacy:TP-1.25" H 13230 3250 20 0001 C CNN
F 3 "" H 13200 3100 60 0001 C CNN
@@ -285,10 +285,10 @@ F 3 "" H 13200 3100 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 HS-1202
+L TEST-POINT-1.25 HS-1102
U 1 1 578C5B08
P 13200 3300
-F 0 "HS-1202" H 13200 3300 45 0001 L BNN
+F 0 "HS-1102" H 13200 3300 45 0001 L BNN
F 1 "HS_SH" H 13250 3300 50 0000 L CNN
F 2 "neo900-legacy:TP-1.25" H 13230 3450 20 0001 C CNN
F 3 "" H 13200 3300 60 0001 C CNN
@@ -296,10 +296,10 @@ F 3 "" H 13200 3300 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 HS-1203
+L TEST-POINT-1.25 HS-1103
U 1 1 578C5BD0
P 13200 3500
-F 0 "HS-1203" H 13200 3500 45 0001 L BNN
+F 0 "HS-1103" H 13200 3500 45 0001 L BNN
F 1 "HS_R" H 13250 3500 50 0000 L CNN
F 2 "neo900-legacy:TP-1.25" H 13230 3650 20 0001 C CNN
F 3 "" H 13200 3500 60 0001 C CNN
@@ -307,10 +307,10 @@ F 3 "" H 13200 3500 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 HS-1204
+L TEST-POINT-1.25 HS-1104
U 1 1 578C5C98
P 13200 3700
-F 0 "HS-1204" H 13200 3700 45 0001 L BNN
+F 0 "HS-1104" H 13200 3700 45 0001 L BNN
F 1 "HS_SW" H 13250 3700 50 0000 L CNN
F 2 "neo900-legacy:TP-1.25" H 13230 3850 20 0001 C CNN
F 3 "" H 13200 3700 60 0001 C CNN
@@ -318,10 +318,10 @@ F 3 "" H 13200 3700 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 HS-1205
+L TEST-POINT-1.25 HS-1105
U 1 1 578C5D60
P 13200 3900
-F 0 "HS-1205" H 13200 3900 45 0001 L BNN
+F 0 "HS-1105" H 13200 3900 45 0001 L BNN
F 1 "HS_L" H 13250 3900 50 0000 L CNN
F 2 "neo900-legacy:TP-1.25" H 13230 4050 20 0001 C CNN
F 3 "" H 13200 3900 60 0001 C CNN
@@ -329,10 +329,10 @@ F 3 "" H 13200 3900 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 HS-1206
+L TEST-POINT-1.25 HS-1106
U 1 1 578C5E28
P 13200 4100
-F 0 "HS-1206" H 13200 4100 45 0001 L BNN
+F 0 "HS-1106" H 13200 4100 45 0001 L BNN
F 1 "HS_M" H 13250 4100 50 0000 L CNN
F 2 "neo900-legacy:TP-1.25" H 13230 4250 20 0001 C CNN
F 3 "" H 13200 4100 60 0001 C CNN
@@ -340,10 +340,10 @@ F 3 "" H 13200 4100 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L L-MPZ1608 L1201
+L L-MPZ1608 L1101
U 1 1 578C5EF0
P 3050 1150
-F 0 "L1201" V 2992 1000 50 0000 L BNN
+F 0 "L1101" V 2992 1000 50 0000 L BNN
F 1 "MPZ1608S221A" V 3180 1001 50 0000 L BNN
F 2 "neo900-legacy:MPZ1608" H 3040 940 65 0001 L TNN
F 3 "" H 3050 1150 60 0001 C CNN
@@ -351,10 +351,10 @@ F 3 "" H 3050 1150 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L L0402 L1202
+L L0402 L1102
U 1 1 578C5FB8
P 12000 3400
-F 0 "L1202" V 11942 3250 50 0000 R CNN
+F 0 "L1102" V 11942 3250 50 0000 R CNN
F 1 "tbd" V 12100 3350 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 11990 3190 65 0001 L TNN
F 3 "" H 12000 3400 60 0001 C CNN
@@ -362,10 +362,10 @@ F 3 "" H 12000 3400 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L L0402 L1203
+L L0402 L1103
U 1 1 578C6080
P 12000 3600
-F 0 "L1203" V 11942 3450 50 0000 R CNN
+F 0 "L1103" V 11942 3450 50 0000 R CNN
F 1 "tbd" V 12100 3550 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 11990 3390 65 0001 L TNN
F 3 "" H 12000 3600 60 0001 C CNN
@@ -373,10 +373,10 @@ F 3 "" H 12000 3600 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L L0402 L1204
+L L0402 L1104
U 1 1 578C6148
P 12000 3800
-F 0 "L1204" V 11942 3650 50 0000 R CNN
+F 0 "L1104" V 11942 3650 50 0000 R CNN
F 1 "tbd" V 12100 3750 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 11990 3590 65 0001 L TNN
F 3 "" H 12000 3800 60 0001 C CNN
@@ -384,10 +384,10 @@ F 3 "" H 12000 3800 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L L0402 L1205
+L L0402 L1105
U 1 1 578C6210
P 12000 4000
-F 0 "L1205" V 11942 3850 50 0000 R CNN
+F 0 "L1105" V 11942 3850 50 0000 R CNN
F 1 "tbd" V 12100 3950 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 11990 3790 65 0001 L TNN
F 3 "" H 12000 4000 60 0001 C CNN
@@ -395,10 +395,10 @@ F 3 "" H 12000 4000 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L L0402 L1206
+L L0402 L1106
U 1 1 578C62D8
P 12000 4200
-F 0 "L1206" V 11942 4050 50 0000 R CNN
+F 0 "L1106" V 11942 4050 50 0000 R CNN
F 1 "tbd" V 12100 4150 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 11990 3990 65 0001 L TNN
F 3 "" H 12000 4200 60 0001 C CNN
@@ -406,10 +406,10 @@ F 3 "" H 12000 4200 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L L-MPZ1608 L1207
+L L-MPZ1608 L1107
U 1 1 578C63A0
P 13450 6350
-F 0 "L1207" V 13392 6200 50 0000 L BNN
+F 0 "L1107" V 13392 6200 50 0000 L BNN
F 1 "MPZ1608S221A" V 13550 6350 50 0000 C CNN
F 2 "neo900-legacy:MPZ1608" H 13440 6140 65 0001 L TNN
F 3 "" H 13450 6350 60 0001 C CNN
@@ -417,10 +417,10 @@ F 3 "" H 13450 6350 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L N900-HEADSET P1201
+L N900-HEADSET P1101
U 1 1 578C6468
P 14200 3700
-F 0 "P1201" H 14041 4340 50 0000 L BNN
+F 0 "P1101" H 14041 4340 50 0000 L BNN
F 1 "N900-HEADSET" H 14000 3000 50 0000 L BNN
F 2 "neo900-legacy:N900-HEADSET" H 14000 3000 50 0001 L BNN
F 3 "" H 14200 3700 60 0001 C CNN
@@ -428,10 +428,10 @@ F 3 "" H 14200 3700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1201
+L R0402 R1105
U 1 1 578C6530
P 6650 5400
-F 0 "R1201" H 6520 5460 50 0000 L BNN
+F 0 "R1105" H 6520 5460 50 0000 L BNN
F 1 "470k" H 6650 5400 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 6680 5550 20 0001 C CNN
F 3 "" H 6650 5400 60 0001 C CNN
@@ -439,10 +439,10 @@ F 3 "" H 6650 5400 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R1202
+L R0402 R1120
U 1 1 578C65F8
P 12150 5050
-F 0 "R1202" H 12020 5110 50 0000 L BNN
+F 0 "R1120" H 12020 5110 50 0000 L BNN
F 1 "1M" H 12150 5050 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 12180 5200 20 0001 C CNN
F 3 "" H 12150 5050 60 0001 C CNN
@@ -450,10 +450,10 @@ F 3 "" H 12150 5050 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R1203
+L R0402 R1123
U 1 1 578C66C0
P 12650 5350
-F 0 "R1203" H 12520 5410 50 0000 L BNN
+F 0 "R1123" H 12520 5410 50 0000 L BNN
F 1 "470k" H 12650 5350 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 12680 5500 20 0001 C CNN
F 3 "" H 12650 5350 60 0001 C CNN
@@ -461,10 +461,10 @@ F 3 "" H 12650 5350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1204
+L R0402 R1101
U 1 1 578C6788
P 2600 5300
-F 0 "R1204" H 2470 5360 50 0000 L BNN
+F 0 "R1101" H 2470 5360 50 0000 L BNN
F 1 "220" H 2600 5300 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 2630 5450 20 0001 C CNN
F 3 "" H 2600 5300 60 0001 C CNN
@@ -472,10 +472,10 @@ F 3 "" H 2600 5300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1205
+L R0402 R1104
U 1 1 578C6850
P 3550 5300
-F 0 "R1205" H 3420 5360 50 0000 L BNN
+F 0 "R1104" H 3420 5360 50 0000 L BNN
F 1 "2k" H 3550 5300 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 3580 5450 20 0001 C CNN
F 3 "" H 3550 5300 60 0001 C CNN
@@ -483,10 +483,10 @@ F 3 "" H 3550 5300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1206
+L R0402 R1102
U 1 1 578C6918
P 3500 5900
-F 0 "R1206" H 3370 5960 50 0000 L BNN
+F 0 "R1102" H 3370 5960 50 0000 L BNN
F 1 "2k2" H 3500 5900 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 3530 6050 20 0001 C CNN
F 3 "" H 3500 5900 60 0001 C CNN
@@ -494,10 +494,10 @@ F 3 "" H 3500 5900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1207
+L R0402 R1103
U 1 1 578C69E0
P 3500 6100
-F 0 "R1207" H 3370 6160 50 0000 L BNN
+F 0 "R1103" H 3370 6160 50 0000 L BNN
F 1 "2k2" H 3500 6100 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 3530 6250 20 0001 C CNN
F 3 "" H 3500 6100 60 0001 C CNN
@@ -505,10 +505,10 @@ F 3 "" H 3500 6100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1208
+L R0402 R1110
U 1 1 578C6AA8
P 9250 6950
-F 0 "R1208" H 9120 7010 50 0000 L BNN
+F 0 "R1110" H 9120 7010 50 0000 L BNN
F 1 "10k" H 9250 6950 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 9280 7100 20 0001 C CNN
F 3 "" H 9250 6950 60 0001 C CNN
@@ -626,12 +626,12 @@ F 3 "" H 3100 5750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TPA6130A2RTJ U1202
+L TPA6130A2RTJ U?
U 1 1 578C7278
P 3750 1700
-AR Path="/578C7278" Ref="U1202" Part="1"
-AR Path="/578AFF06/578C7278" Ref="U1202" Part="1"
-F 0 "U1202" H 3641 1950 50 0000 L BNN
+AR Path="/578C7278" Ref="U?" Part="1"
+AR Path="/578AFF06/578C7278" Ref="U1101" Part="1"
+F 0 "U1101" H 3641 1950 50 0000 L BNN
F 1 "TPA6130A2RTJ" H 3640 1420 50 0001 L BNN
F 2 "neo900-legacy:S-PWQFN-N20-0.5" H 3740 1490 65 0001 L TNN
F 3 "" H 3750 1700 60 0001 C CNN
@@ -639,10 +639,10 @@ F 3 "" H 3750 1700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TS3A225ERTE U1203
+L TS3A225ERTE U1103
U 1 1 578C73A4
P 7350 4700
-F 0 "U1203" H 7241 4950 50 0000 L BNN
+F 0 "U1103" H 7241 4950 50 0000 L BNN
F 1 "TS3A225ERTE" H 7240 4420 50 0000 L BNN
F 2 "neo900-legacy:S-PWQFN-N16-0.5" H 7340 4490 65 0001 L TNN
F 3 "" H 7350 4700 60 0001 C CNN
@@ -680,12 +680,12 @@ VAUDIO
Text GLabel 13250 2400 2 60 Output ~ 0
FM_RX
$Comp
-L TPA6130A2RTJ U1202
+L TPA6130A2RTJ U?
U 2 1 578C72DC
P 4950 2850
-AR Path="/578C72DC" Ref="U1202" Part="2"
-AR Path="/578AFF06/578C72DC" Ref="U1202" Part="2"
-F 0 "U1202" H 3900 3400 50 0000 L BNN
+AR Path="/578C72DC" Ref="U?" Part="2"
+AR Path="/578AFF06/578C72DC" Ref="U1101" Part="2"
+F 0 "U1101" H 3900 3400 50 0000 L BNN
F 1 "TPA6130A2RTJ" H 4950 2250 50 0000 L BNN
F 2 "neo900-legacy:S-PWQFN-N20-0.5" H 4940 2640 65 0001 L TNN
F 3 "" H 4950 2850 60 0001 C CNN
@@ -693,10 +693,10 @@ F 3 "" H 4950 2850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1216
+L C0402 C1109
U 1 1 578C5400
P 3100 6350
-F 0 "C1216" H 3140 6390 50 0000 L CNN
+F 0 "C1109" H 3140 6390 50 0000 L CNN
F 1 "1n" H 3140 6220 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 3130 6500 20 0001 C CNN
F 3 "" H 3100 6350 60 0001 C CNN
@@ -704,10 +704,10 @@ F 3 "" H 3100 6350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TS3A225ERTE U1203
+L TS3A225ERTE U1103
U 2 1 578C7408
P 7850 6400
-F 0 "U1203" H 7200 7150 50 0000 L BNN
+F 0 "U1103" H 7200 7150 50 0000 L BNN
F 1 "TS3A225ERTE" H 8179 5700 50 0000 L BNN
F 2 "neo900-legacy:S-PWQFN-N16-0.5" H 7840 6190 65 0001 L TNN
F 3 "" H 7850 6400 60 0001 C CNN
@@ -732,10 +732,10 @@ $EndComp
Text GLabel 8150 5400 2 60 Input ~ 0
VBAT_SWITCHED
$Comp
-L TSA5A22366 U1201
+L TSA5A22366 U1102
U 1 1 57F40086
P 4600 8250
-F 0 "U1201" H 5000 8750 60 0000 R CNN
+F 0 "U1102" H 5000 8750 60 0000 R CNN
F 1 "TSA5A22366" H 4600 7800 60 0000 C CNN
F 2 "" H 4600 8250 60 0001 C CNN
F 3 "" H 4600 8250 60 0001 C CNN
@@ -758,10 +758,10 @@ F 3 "" H 5300 9050 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L C0402 C1218
+L C0402 C1111
U 1 1 57F40DE8
P 3850 8650
-F 0 "C1218" H 3890 8690 50 0000 L CNN
+F 0 "C1111" H 3890 8690 50 0000 L CNN
F 1 "1u" H 3890 8520 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 3880 8800 20 0001 C CNN
F 3 "" H 3850 8650 60 0001 C CNN
@@ -841,10 +841,10 @@ F 3 "" H 4950 3900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1201
+L C0402 C1110
U 1 1 57F6E202
P 3200 3350
-F 0 "C1201" H 3240 3390 50 0000 L CNN
+F 0 "C1110" H 3240 3390 50 0000 L CNN
F 1 "1u" H 3240 3220 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 3230 3500 20 0001 C CNN
F 3 "" H 3200 3350 60 0001 C CNN
@@ -852,10 +852,10 @@ F 3 "" H 3200 3350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1202
+L C0402 C1114
U 1 1 57F6F306
P 6050 3350
-F 0 "C1202" H 6090 3390 50 0000 L CNN
+F 0 "C1114" H 6090 3390 50 0000 L CNN
F 1 "1u" H 6090 3220 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 6080 3500 20 0001 C CNN
F 3 "" H 6050 3350 60 0001 C CNN
@@ -1241,10 +1241,10 @@ Wire Notes Line
Text Notes 4150 5850 0 60 ~ 0
Detour for TV, ECI
$Comp
-L R0402 R1209
+L R0402 R1122
U 1 1 5808F55C
P 12250 5650
-F 0 "R1209" H 12120 5710 50 0000 L BNN
+F 0 "R1122" H 12120 5710 50 0000 L BNN
F 1 "1M" H 12250 5650 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 12280 5800 20 0001 C CNN
F 3 "" H 12250 5650 60 0001 C CNN
@@ -1286,10 +1286,10 @@ F 3 "" H 13800 6000 60 0001 C CNN
$EndComp
Connection ~ 13800 6350
$Comp
-L R0402 R1210
+L R0402 R1107
U 1 1 58148582
P 8550 2550
-F 0 "R1210" H 8420 2610 50 0000 L BNN
+F 0 "R1107" H 8420 2610 50 0000 L BNN
F 1 "1k" H 8550 2550 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 8580 2700 20 0001 C CNN
F 3 "" H 8550 2550 60 0001 C CNN
@@ -1297,10 +1297,10 @@ F 3 "" H 8550 2550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1211
+L R0402 R1108
U 1 1 58148682
P 8550 2850
-F 0 "R1211" H 8420 2910 50 0000 L BNN
+F 0 "R1108" H 8420 2910 50 0000 L BNN
F 1 "1k" H 8550 2850 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 8580 3000 20 0001 C CNN
F 3 "" H 8550 2850 60 0001 C CNN
@@ -1308,10 +1308,10 @@ F 3 "" H 8550 2850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1219
+L C0402 C1117
U 1 1 58148874
P 9200 2550
-F 0 "C1219" V 9250 2400 50 0000 R CNN
+F 0 "C1117" V 9250 2400 50 0000 R CNN
F 1 "1u" V 9150 2400 50 0000 R CNN
F 2 "neo900-legacy:SMD-0402" H 9230 2700 20 0001 C CNN
F 3 "" H 9200 2550 60 0001 C CNN
@@ -1319,10 +1319,10 @@ F 3 "" H 9200 2550 60 0001 C CNN
0 1 -1 0
$EndComp
$Comp
-L C0402 C1220
+L C0402 C1118
U 1 1 58148958
P 9200 2850
-F 0 "C1220" V 9250 2700 50 0000 R CNN
+F 0 "C1118" V 9250 2700 50 0000 R CNN
F 1 "1u" V 9150 2700 50 0000 R CNN
F 2 "neo900-legacy:SMD-0402" H 9230 3000 20 0001 C CNN
F 3 "" H 9200 2850 60 0001 C CNN
@@ -1384,8 +1384,8 @@ L R0402 R?
U 1 1 58299A35
P 9900 8700
AR Path="/578AFF08/58299A35" Ref="R?" Part="1"
-AR Path="/578AFF06/58299A35" Ref="R1117" Part="1"
-F 0 "R1117" H 9770 8760 50 0000 L BNN
+AR Path="/578AFF06/58299A35" Ref="R1113" Part="1"
+F 0 "R1113" H 9770 8760 50 0000 L BNN
F 1 "6k8" H 9900 8700 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 9930 8850 20 0001 C CNN
F 3 "" H 9900 8700 60 0001 C CNN
@@ -1397,8 +1397,8 @@ L R0402 R?
U 1 1 58299A3C
P 10200 8700
AR Path="/578AFF08/58299A3C" Ref="R?" Part="1"
-AR Path="/578AFF06/58299A3C" Ref="R1119" Part="1"
-F 0 "R1119" H 10070 8760 50 0000 L BNN
+AR Path="/578AFF06/58299A3C" Ref="R1115" Part="1"
+F 0 "R1115" H 10070 8760 50 0000 L BNN
F 1 "22k" H 10200 8700 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 10230 8850 20 0001 C CNN
F 3 "" H 10200 8700 60 0001 C CNN
@@ -1410,8 +1410,8 @@ L R0402 R?
U 1 1 58299A43
P 10700 9000
AR Path="/578AFF08/58299A43" Ref="R?" Part="1"
-AR Path="/578AFF06/58299A43" Ref="R1121" Part="1"
-F 0 "R1121" H 10570 9060 50 0000 L BNN
+AR Path="/578AFF06/58299A43" Ref="R1117" Part="1"
+F 0 "R1117" H 10570 9060 50 0000 L BNN
F 1 "22k" H 10700 9000 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 10730 9150 20 0001 C CNN
F 3 "" H 10700 9000 60 0001 C CNN
@@ -1423,8 +1423,8 @@ L R0402 R?
U 1 1 58299A4A
P 11950 9150
AR Path="/578AFF08/58299A4A" Ref="R?" Part="1"
-AR Path="/578AFF06/58299A4A" Ref="R1123" Part="1"
-F 0 "R1123" H 11820 9210 50 0000 L BNN
+AR Path="/578AFF06/58299A4A" Ref="R1119" Part="1"
+F 0 "R1119" H 11820 9210 50 0000 L BNN
F 1 "47k" H 11950 9150 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 11980 9300 20 0001 C CNN
F 3 "" H 11950 9150 60 0001 C CNN
@@ -1436,8 +1436,8 @@ L R0402 R?
U 1 1 58299A51
P 12150 9150
AR Path="/578AFF08/58299A51" Ref="R?" Part="1"
-AR Path="/578AFF06/58299A51" Ref="R1124" Part="1"
-F 0 "R1124" H 12020 9210 50 0000 L BNN
+AR Path="/578AFF06/58299A51" Ref="R1121" Part="1"
+F 0 "R1121" H 12020 9210 50 0000 L BNN
F 1 "47k" H 12150 9150 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 12180 9300 20 0001 C CNN
F 3 "" H 12150 9150 60 0001 C CNN
@@ -1449,8 +1449,8 @@ L R0402 R?
U 1 1 58299A58
P 9550 9350
AR Path="/578AFF08/58299A58" Ref="R?" Part="1"
-AR Path="/578AFF06/58299A58" Ref="R1115" Part="1"
-F 0 "R1115" H 9420 9410 50 0000 L BNN
+AR Path="/578AFF06/58299A58" Ref="R1111" Part="1"
+F 0 "R1111" H 9420 9410 50 0000 L BNN
F 1 "470" H 9550 9350 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 9580 9500 20 0001 C CNN
F 3 "" H 9550 9350 60 0001 C CNN
@@ -1462,8 +1462,8 @@ L R0402 R?
U 1 1 58299A5F
P 9550 9850
AR Path="/578AFF08/58299A5F" Ref="R?" Part="1"
-AR Path="/578AFF06/58299A5F" Ref="R1116" Part="1"
-F 0 "R1116" H 9420 9910 50 0000 L BNN
+AR Path="/578AFF06/58299A5F" Ref="R1112" Part="1"
+F 0 "R1112" H 9420 9910 50 0000 L BNN
F 1 "1k" H 9550 9850 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 9580 10000 20 0001 C CNN
F 3 "" H 9550 9850 60 0001 C CNN
@@ -1475,8 +1475,8 @@ L R0402 R?
U 1 1 58299A66
P 10700 10400
AR Path="/578AFF08/58299A66" Ref="R?" Part="1"
-AR Path="/578AFF06/58299A66" Ref="R1122" Part="1"
-F 0 "R1122" H 10570 10460 50 0000 L BNN
+AR Path="/578AFF06/58299A66" Ref="R1118" Part="1"
+F 0 "R1118" H 10570 10460 50 0000 L BNN
F 1 "22k" H 10700 10400 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 10730 10550 20 0001 C CNN
F 3 "" H 10700 10400 60 0001 C CNN
@@ -1488,8 +1488,8 @@ L R0402 R?
U 1 1 58299A6D
P 9900 10350
AR Path="/578AFF08/58299A6D" Ref="R?" Part="1"
-AR Path="/578AFF06/58299A6D" Ref="R1118" Part="1"
-F 0 "R1118" H 9770 10410 50 0000 L BNN
+AR Path="/578AFF06/58299A6D" Ref="R1114" Part="1"
+F 0 "R1114" H 9770 10410 50 0000 L BNN
F 1 "22k" H 9900 10350 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 9930 10500 20 0001 C CNN
F 3 "" H 9900 10350 60 0001 C CNN
@@ -1501,8 +1501,8 @@ L R0402 R?
U 1 1 58299A74
P 10200 10350
AR Path="/578AFF08/58299A74" Ref="R?" Part="1"
-AR Path="/578AFF06/58299A74" Ref="R1120" Part="1"
-F 0 "R1120" H 10070 10410 50 0000 L BNN
+AR Path="/578AFF06/58299A74" Ref="R1116" Part="1"
+F 0 "R1116" H 10070 10410 50 0000 L BNN
F 1 "6k8" H 10200 10350 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 10230 10500 20 0001 C CNN
F 3 "" H 10200 10350 60 0001 C CNN
@@ -1514,8 +1514,8 @@ L R0402 R?
U 1 1 58299A7B
P 6750 10250
AR Path="/578AFF08/58299A7B" Ref="R?" Part="1"
-AR Path="/578AFF06/58299A7B" Ref="R1113" Part="1"
-F 0 "R1113" H 6620 10310 50 0000 L BNN
+AR Path="/578AFF06/58299A7B" Ref="R1106" Part="1"
+F 0 "R1106" H 6620 10310 50 0000 L BNN
F 1 "1k" H 6750 10250 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 6780 10400 20 0001 C CNN
F 3 "" H 6750 10250 60 0001 C CNN
@@ -1553,8 +1553,8 @@ L TLV70230DBV U?
U 1 1 58299A8E
P 8100 8550
AR Path="/578AFF08/58299A8E" Ref="U?" Part="1"
-AR Path="/578AFF06/58299A8E" Ref="U1102" Part="1"
-F 0 "U1102" H 7951 8800 50 0000 L BNN
+AR Path="/578AFF06/58299A8E" Ref="U1104" Part="1"
+F 0 "U1104" H 7951 8800 50 0000 L BNN
F 1 "TLV70225DBV" H 8139 8280 50 0000 L BNN
F 2 "neo900-legacy:SOT23-5" H 8090 8340 65 0001 L TNN
F 3 "" H 8100 8550 60 0001 C CNN
@@ -1562,10 +1562,10 @@ F 3 "" H 8100 8550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TLV1702DGK U1103
+L TLV1702DGK U1105
U 1 1 58299A95
P 10800 9650
-F 0 "U1103" H 10590 10120 45 0000 L BNN
+F 0 "U1105" H 10590 10120 45 0000 L BNN
F 1 "TLV1702DGK" H 10650 9600 45 0000 L CNN
F 2 "neo900-legacy:R-PDSO-G8-0.65" H 10830 9800 20 0001 C CNN
F 3 "" H 10800 9650 60 0001 C CNN
@@ -1693,8 +1693,8 @@ L R0402 R?
U 1 1 58299AE3
P 9200 8950
AR Path="/578AFF08/58299AE3" Ref="R?" Part="1"
-AR Path="/578AFF06/58299AE3" Ref="R1114" Part="1"
-F 0 "R1114" H 9070 9010 50 0000 L BNN
+AR Path="/578AFF06/58299AE3" Ref="R1109" Part="1"
+F 0 "R1109" H 9070 9010 50 0000 L BNN
F 1 "4k7" H 9200 8950 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 9230 9100 20 0001 C CNN
F 3 "" H 9200 8950 60 0001 C CNN
@@ -1711,8 +1711,8 @@ L C0402 C?
U 1 1 58299AED
P 11500 8650
AR Path="/578AFF08/58299AED" Ref="C?" Part="1"
-AR Path="/578AFF06/58299AED" Ref="C1112" Part="1"
-F 0 "C1112" H 11540 8690 50 0000 L CNN
+AR Path="/578AFF06/58299AED" Ref="C1119" Part="1"
+F 0 "C1119" H 11540 8690 50 0000 L CNN
F 1 "100n" H 11540 8520 50 0000 L CNN
F 2 "SMD-0402" H 11530 8800 20 0001 C CNN
F 3 "" H 11500 8650 60 0001 C CNN
diff --git a/hw/keys.sch b/hw/keys.sch
index 3495a04..25041e1 100644
--- a/hw/keys.sch
+++ b/hw/keys.sch
@@ -57,10 +57,10 @@ $EndDescr
Text Notes 10000 2200 0 70 ~ 0
Address: 0x34
$Comp
-L BUTTON-N900 B1
+L BUTTON-N900 B1803
U 1 1 578D2D0C
P 2000 7000
-F 0 "B1" V 2150 7000 50 0000 C CNN
+F 0 "B1803" V 2150 7000 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 2210 6880 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 1990 6790 65 0001 L TNN
F 3 "" H 2000 7000 60 0001 C CNN
@@ -69,10 +69,10 @@ F 4 "Shift" V 1900 7000 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B2
+L BUTTON-N900 B1807
U 1 1 578D2DD4
P 3650 7000
-F 0 "B2" V 3800 7000 50 0000 C CNN
+F 0 "B1807" V 3800 7000 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 3860 6880 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 3640 6790 65 0001 L TNN
F 3 "" H 3650 7000 60 0001 C CNN
@@ -81,10 +81,10 @@ F 4 "Z" V 3550 7000 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B3
+L BUTTON-N900 B1811
U 1 1 578D2E9C
P 4350 7000
-F 0 "B3" V 4500 7000 50 0000 C CNN
+F 0 "B1811" V 4500 7000 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 4560 6880 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 4340 6790 65 0001 L TNN
F 3 "" H 4350 7000 60 0001 C CNN
@@ -93,10 +93,10 @@ F 4 "X" V 4250 7000 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B4
+L BUTTON-N900 B1815
U 1 1 578D2F64
P 5050 7000
-F 0 "B4" V 5200 7000 50 0000 C CNN
+F 0 "B1815" V 5200 7000 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 5260 6880 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 5040 6790 65 0001 L TNN
F 3 "" H 5050 7000 60 0001 C CNN
@@ -105,10 +105,10 @@ F 4 "C" V 4950 7000 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B5
+L BUTTON-N900 B1819
U 1 1 578D302C
P 5750 7000
-F 0 "B5" V 5900 7000 50 0000 C CNN
+F 0 "B1819" V 5900 7000 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 5960 6880 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 5740 6790 65 0001 L TNN
F 3 "" H 5750 7000 60 0001 C CNN
@@ -117,10 +117,10 @@ F 4 "V" V 5650 7000 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B6
+L BUTTON-N900 B1823
U 1 1 578D30F4
P 6450 7000
-F 0 "B6" V 6600 7000 50 0000 C CNN
+F 0 "B1823" V 6600 7000 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 6660 6880 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 6440 6790 65 0001 L TNN
F 3 "" H 6450 7000 60 0001 C CNN
@@ -129,10 +129,10 @@ F 4 "B" V 6350 7000 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B7
+L BUTTON-N900 B1827
U 1 1 578D31BC
P 7150 7000
-F 0 "B7" V 7300 7000 50 0000 C CNN
+F 0 "B1827" V 7300 7000 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 7360 6880 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 7140 6790 65 0001 L TNN
F 3 "" H 7150 7000 60 0001 C CNN
@@ -141,10 +141,10 @@ F 4 "N" V 7050 7000 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B8
+L BUTTON-N900 B1831
U 1 1 578D3284
P 7850 7000
-F 0 "B8" V 8000 7000 50 0000 C CNN
+F 0 "B1831" V 8000 7000 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 8060 6880 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 7840 6790 65 0001 L TNN
F 3 "" H 7850 7000 60 0001 C CNN
@@ -153,10 +153,10 @@ F 4 "M" V 7750 7100 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B9
+L BUTTON-N900 B1835
U 1 1 578D334C
P 8550 7000
-F 0 "B9" V 8700 7000 50 0000 C CNN
+F 0 "B1835" V 8700 7000 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 8760 6880 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 8540 6790 65 0001 L TNN
F 3 "" H 8550 7000 60 0001 C CNN
@@ -165,10 +165,10 @@ F 4 "Space-L" V 8450 7050 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B10
+L BUTTON-N900 B1839
U 1 1 578D3414
P 9250 7000
-F 0 "B10" V 9400 7000 50 0000 C CNN
+F 0 "B1839" V 9400 7000 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 9460 6880 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 9240 6790 65 0001 L TNN
F 3 "" H 9250 7000 60 0001 C CNN
@@ -177,10 +177,10 @@ F 4 "Space-R" V 9150 7000 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B11
+L BUTTON-N900 B1802
U 1 1 578D34DC
P 2000 6400
-F 0 "B11" V 2150 6400 50 0000 C CNN
+F 0 "B1802" V 2150 6400 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 2210 6280 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 1990 6190 65 0001 L TNN
F 3 "" H 2000 6400 60 0001 C CNN
@@ -189,10 +189,10 @@ F 4 "Fn" V 1900 6400 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B12
+L BUTTON-N900 B1806
U 1 1 578D35A4
P 3650 6400
-F 0 "B12" V 3800 6400 50 0000 C CNN
+F 0 "B1806" V 3800 6400 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 3860 6280 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 3640 6190 65 0001 L TNN
F 3 "" H 3650 6400 60 0001 C CNN
@@ -201,10 +201,10 @@ F 4 "A" V 3550 6400 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B13
+L BUTTON-N900 B1810
U 1 1 578D366C
P 4350 6400
-F 0 "B13" V 4500 6400 50 0000 C CNN
+F 0 "B1810" V 4500 6400 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 4560 6280 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 4340 6190 65 0001 L TNN
F 3 "" H 4350 6400 60 0001 C CNN
@@ -213,10 +213,10 @@ F 4 "S" V 4250 6400 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B14
+L BUTTON-N900 B1814
U 1 1 578D3734
P 5050 6400
-F 0 "B14" V 5200 6400 50 0000 C CNN
+F 0 "B1814" V 5200 6400 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 5260 6280 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 5040 6190 65 0001 L TNN
F 3 "" H 5050 6400 60 0001 C CNN
@@ -225,10 +225,10 @@ F 4 "D" V 4950 6400 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B15
+L BUTTON-N900 B1818
U 1 1 578D37FC
P 5750 6400
-F 0 "B15" V 5900 6400 50 0000 C CNN
+F 0 "B1818" V 5900 6400 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 5960 6280 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 5740 6190 65 0001 L TNN
F 3 "" H 5750 6400 60 0001 C CNN
@@ -237,10 +237,10 @@ F 4 "F" V 5650 6400 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B16
+L BUTTON-N900 B1822
U 1 1 578D38C4
P 6450 6400
-F 0 "B16" V 6600 6400 50 0000 C CNN
+F 0 "B1822" V 6600 6400 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 6660 6280 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 6440 6190 65 0001 L TNN
F 3 "" H 6450 6400 60 0001 C CNN
@@ -249,10 +249,10 @@ F 4 "G" V 6350 6400 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B17
+L BUTTON-N900 B1826
U 1 1 578D398C
P 7150 6400
-F 0 "B17" V 7300 6400 50 0000 C CNN
+F 0 "B1826" V 7300 6400 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 7360 6280 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 7140 6190 65 0001 L TNN
F 3 "" H 7150 6400 60 0001 C CNN
@@ -261,10 +261,10 @@ F 4 "H" V 7050 6400 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B18
+L BUTTON-N900 B1830
U 1 1 578D3A54
P 7850 6400
-F 0 "B18" V 8000 6400 50 0000 C CNN
+F 0 "B1830" V 8000 6400 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 8060 6280 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 7840 6190 65 0001 L TNN
F 3 "" H 7850 6400 60 0001 C CNN
@@ -273,10 +273,10 @@ F 4 "J" V 7750 6400 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B19
+L BUTTON-N900 B1834
U 1 1 578D3B1C
P 8550 6400
-F 0 "B19" V 8700 6400 50 0000 C CNN
+F 0 "B1834" V 8700 6400 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 8760 6280 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 8540 6190 65 0001 L TNN
F 3 "" H 8550 6400 60 0001 C CNN
@@ -285,10 +285,10 @@ F 4 "K" V 8450 6400 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B20
+L BUTTON-N900 B1838
U 1 1 578D3BE4
P 9250 6400
-F 0 "B20" V 9400 6400 50 0000 C CNN
+F 0 "B1838" V 9400 6400 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 9460 6280 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 9240 6190 65 0001 L TNN
F 3 "" H 9250 6400 60 0001 C CNN
@@ -297,10 +297,10 @@ F 4 "L" V 9150 6400 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B21
+L BUTTON-N900 B1801
U 1 1 578D3CAC
P 2000 5800
-F 0 "B21" V 2150 5800 50 0000 C CNN
+F 0 "B1801" V 2150 5800 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 2210 5680 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 1990 5590 65 0001 L TNN
F 3 "" H 2000 5800 60 0001 C CNN
@@ -309,10 +309,10 @@ F 4 "Ctrl" V 1900 5800 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B22
+L BUTTON-N900 B1805
U 1 1 578D3D74
P 3650 5800
-F 0 "B22" V 3800 5800 50 0000 C CNN
+F 0 "B1805" V 3800 5800 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 3860 5680 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 3640 5590 65 0001 L TNN
F 3 "" H 3650 5800 60 0001 C CNN
@@ -321,10 +321,10 @@ F 4 "Q" V 3550 5800 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B23
+L BUTTON-N900 B1809
U 1 1 578D3E3C
P 4350 5800
-F 0 "B23" V 4500 5800 50 0000 C CNN
+F 0 "B1809" V 4500 5800 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 4560 5680 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 4340 5590 65 0001 L TNN
F 3 "" H 4350 5800 60 0001 C CNN
@@ -333,10 +333,10 @@ F 4 "W" V 4250 5800 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B24
+L BUTTON-N900 B1813
U 1 1 578D3F04
P 5050 5800
-F 0 "B24" V 5200 5800 50 0000 C CNN
+F 0 "B1813" V 5200 5800 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 5260 5680 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 5040 5590 65 0001 L TNN
F 3 "" H 5050 5800 60 0001 C CNN
@@ -345,10 +345,10 @@ F 4 "E" V 4950 5800 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B25
+L BUTTON-N900 B1817
U 1 1 578D3FCC
P 5750 5800
-F 0 "B25" V 5900 5800 50 0000 C CNN
+F 0 "B1817" V 5900 5800 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 5960 5680 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 5740 5590 65 0001 L TNN
F 3 "" H 5750 5800 60 0001 C CNN
@@ -357,10 +357,10 @@ F 4 "R" V 5650 5800 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B26
+L BUTTON-N900 B1821
U 1 1 578D4094
P 6450 5800
-F 0 "B26" V 6600 5800 50 0000 C CNN
+F 0 "B1821" V 6600 5800 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 6660 5680 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 6440 5590 65 0001 L TNN
F 3 "" H 6450 5800 60 0001 C CNN
@@ -369,10 +369,10 @@ F 4 "T" V 6350 5800 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B27
+L BUTTON-N900 B1825
U 1 1 578D415C
P 7150 5800
-F 0 "B27" V 7300 5800 50 0000 C CNN
+F 0 "B1825" V 7300 5800 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 7360 5680 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 7140 5590 65 0001 L TNN
F 3 "" H 7150 5800 60 0001 C CNN
@@ -381,10 +381,10 @@ F 4 "Y" V 7050 5800 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B28
+L BUTTON-N900 B1829
U 1 1 578D4224
P 7850 5800
-F 0 "B28" V 8000 5800 50 0000 C CNN
+F 0 "B1829" V 8000 5800 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 8060 5680 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 7840 5590 65 0001 L TNN
F 3 "" H 7850 5800 60 0001 C CNN
@@ -393,10 +393,10 @@ F 4 "U" V 7750 5800 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B29
+L BUTTON-N900 B1833
U 1 1 578D42EC
P 8550 5800
-F 0 "B29" V 8700 5800 50 0000 C CNN
+F 0 "B1833" V 8700 5800 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 8760 5680 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 8540 5590 65 0001 L TNN
F 3 "" H 8550 5800 60 0001 C CNN
@@ -405,10 +405,10 @@ F 4 "I" V 8450 5800 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B30
+L BUTTON-N900 B1837
U 1 1 578D43B4
P 9250 5800
-F 0 "B30" V 9400 5800 50 0000 C CNN
+F 0 "B1837" V 9400 5800 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 9460 5680 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 9240 5590 65 0001 L TNN
F 3 "" H 9250 5800 60 0001 C CNN
@@ -417,10 +417,10 @@ F 4 "O" V 9150 5800 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B32
+L BUTTON-N900 B1804
U 1 1 578D447C
P 3650 5200
-F 0 "B32" V 3800 5200 50 0000 C CNN
+F 0 "B1804" V 3800 5200 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 3860 5080 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 3640 4990 65 0001 L TNN
F 3 "" H 3650 5200 60 0001 C CNN
@@ -429,10 +429,10 @@ F 4 "Left" V 3550 5200 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B33
+L BUTTON-N900 B1808
U 1 1 578D4544
P 4350 5200
-F 0 "B33" V 4500 5200 50 0000 C CNN
+F 0 "B1808" V 4500 5200 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 4560 5080 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 4340 4990 65 0001 L TNN
F 3 "" H 4350 5200 60 0001 C CNN
@@ -441,10 +441,10 @@ F 4 "Down" V 4250 5200 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B34
+L BUTTON-N900 B1812
U 1 1 578D460C
P 5050 5200
-F 0 "B34" V 5200 5200 50 0000 C CNN
+F 0 "B1812" V 5200 5200 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 5260 5080 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 5040 4990 65 0001 L TNN
F 3 "" H 5050 5200 60 0001 C CNN
@@ -453,10 +453,10 @@ F 4 "Right" V 4950 5200 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L C0603 C2301
+L C0603 C1801
U 1 1 578D4B84
P 8700 1500
-F 0 "C2301" H 8740 1540 50 0000 L CNN
+F 0 "C1801" H 8740 1540 50 0000 L CNN
F 1 "100n" H 8750 1350 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 8730 1650 20 0001 C CNN
F 3 "" H 8700 1500 60 0001 C CNN
@@ -475,10 +475,10 @@ F 3 "" H 8700 1900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TCA8418RTW U2301
+L TCA8418RTW U1801
U 1 1 578D53B8
P 10000 3200
-F 0 "U2301" H 9891 5040 50 0000 L BNN
+F 0 "U1801" H 9891 5040 50 0000 L BNN
F 1 "TCA8418RTW" H 9900 2300 50 0000 L BNN
F 2 "neo900-legacy:LPCC-24" H 9990 2990 65 0001 L TNN
F 3 "" H 10000 3200 60 0001 C CNN
@@ -694,10 +694,10 @@ VOL_UP_U
Text GLabel 12500 5750 0 60 Input ~ 0
VOL_DOWN_U
$Comp
-L R0402 R2302
+L R0402 R1801
U 1 1 57F46B3C
P 12700 4800
-F 0 "R2302" V 12650 4900 50 0000 L CNN
+F 0 "R1801" V 12650 4900 50 0000 L CNN
F 1 "1M" V 12750 4900 50 0000 L CNN
F 2 "SMD-0402" H 12730 4950 20 0001 C CNN
F 3 "" H 12700 4800 60 0001 C CNN
@@ -707,10 +707,10 @@ $EndComp
Text Label 12100 4300 0 60 ~ 0
ROW7
$Comp
-L R0402 R2303
+L R0402 R1802
U 1 1 57F46F6B
P 13200 4800
-F 0 "R2303" V 13150 4900 50 0000 L CNN
+F 0 "R1802" V 13150 4900 50 0000 L CNN
F 1 "1M" V 13250 4900 50 0000 L CNN
F 2 "SMD-0402" H 13230 4950 20 0001 C CNN
F 3 "" H 13200 4800 60 0001 C CNN
@@ -906,10 +906,10 @@ Wire Wire Line
4850 5200 4800 5200
Connection ~ 4800 5200
$Comp
-L BUTTON-N900 B35
+L BUTTON-N900 B1816
U 1 1 5817E274
P 5750 5200
-F 0 "B35" V 5900 5200 50 0000 C CNN
+F 0 "B1816" V 5900 5200 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 5960 5080 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 5740 4990 65 0001 L TNN
F 3 "" H 5750 5200 60 0001 C CNN
@@ -918,10 +918,10 @@ F 4 "Dot" V 5650 5200 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B36
+L BUTTON-N900 B1820
U 1 1 5817E409
P 6450 5200
-F 0 "B36" V 6600 5200 50 0000 C CNN
+F 0 "B1820" V 6600 5200 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 6660 5080 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 6440 4990 65 0001 L TNN
F 3 "" H 6450 5200 60 0001 C CNN
@@ -930,10 +930,10 @@ F 4 "Up" V 6350 5200 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B37
+L BUTTON-N900 B1824
U 1 1 5817F52D
P 7150 5200
-F 0 "B37" V 7300 5200 50 0000 C CNN
+F 0 "B1824" V 7300 5200 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 7360 5080 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 7140 4990 65 0001 L TNN
F 3 "" H 7150 5200 60 0001 C CNN
@@ -942,10 +942,10 @@ F 4 "Enter" V 7050 5200 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B38
+L BUTTON-N900 B1828
U 1 1 5817F72F
P 7850 5200
-F 0 "B38" V 8000 5200 50 0000 C CNN
+F 0 "B1828" V 8000 5200 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 8060 5080 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 7840 4990 65 0001 L TNN
F 3 "" H 7850 5200 60 0001 C CNN
@@ -954,10 +954,10 @@ F 4 "P" V 7750 5200 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B39
+L BUTTON-N900 B1832
U 1 1 5817F7E1
P 8550 5200
-F 0 "B39" V 8700 5200 50 0000 C CNN
+F 0 "B1832" V 8700 5200 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 8760 5080 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 8540 4990 65 0001 L TNN
F 3 "" H 8550 5200 60 0001 C CNN
@@ -966,10 +966,10 @@ F 4 "Comma" V 8450 5200 60 0000 C CNN "Field4"
0 -1 -1 0
$EndComp
$Comp
-L BUTTON-N900 B40
+L BUTTON-N900 B1836
U 1 1 5817F894
P 9250 5200
-F 0 "B40" V 9400 5200 50 0000 C CNN
+F 0 "B1836" V 9400 5200 50 0000 C CNN
F 1 "BUTTONMAEANDER" V 9460 5080 50 0001 L BNN
F 2 "neo900-legacy:N900-BUTTON" H 9240 4990 65 0001 L TNN
F 3 "" H 9250 5200 60 0001 C CNN
@@ -1028,10 +1028,10 @@ Wire Wire Line
Wire Wire Line
9100 1700 9100 1000
$Comp
-L DUALPMOSFET-PAR Q2301
+L DUALPMOSFET-PAR Q1801
U 1 1 5816F9FB
P 14400 5300
-F 0 "Q2301" H 14200 5825 60 0000 C CNN
+F 0 "Q1801" H 14200 5825 60 0000 C CNN
F 1 "NX3008PBKV" H 14400 4650 60 0000 C CNN
F 2 "" H 14400 5300 60 0001 C CNN
F 3 "" H 14400 5300 60 0001 C CNN
@@ -1104,10 +1104,10 @@ Wire Wire Line
Text Notes 2150 7500 0 60 ~ 0
Alternative: Diodes Inc. BAS16VV-7\nWarning: Diodes Inc. have cathodes on pin 1 side, NXP anodes !
$Comp
-L DIODE-3-NXP D2301
+L DIODE-3-NXP D1803
U 1 1 58170A5A
P 2800 6850
-F 0 "D2301" H 2800 7150 60 0000 C CNN
+F 0 "D1803" H 2800 7150 60 0000 C CNN
F 1 "NXP BAS16VV,115" H 2800 6550 60 0000 C CNN
F 2 "" H 2800 6850 60 0001 C CNN
F 3 "" H 2800 6850 60 0001 C CNN
@@ -1167,8 +1167,8 @@ P 1800 9200
AR Path="/578AFEF0/582952B9" Ref="D?" Part="1"
AR Path="/582952B9" Ref="D?" Part="1"
AR Path="/578AFEF2/582952B9" Ref="D?" Part="1"
-AR Path="/578AFF1C/582952B9" Ref="D1802" Part="1"
-F 0 "D1802" V 1900 9350 50 0000 L BNN
+AR Path="/578AFF1C/582952B9" Ref="D1801" Part="1"
+F 0 "D1801" V 1900 9350 50 0000 L BNN
F 1 "V5.5MLA0603N" V 1650 9250 50 0000 L BNN
F 2 "neo900-legacy:SMD-0603" H 1790 8990 65 0001 L TNN
F 3 "" H 1800 9200 60 0001 C CNN
@@ -1212,8 +1212,8 @@ P 1800 10350
AR Path="/578AFEF0/582952CE" Ref="D?" Part="1"
AR Path="/582952CE" Ref="D?" Part="1"
AR Path="/578AFEF2/582952CE" Ref="D?" Part="1"
-AR Path="/578AFF1C/582952CE" Ref="D1803" Part="1"
-F 0 "D1803" V 1900 10500 50 0000 L BNN
+AR Path="/578AFF1C/582952CE" Ref="D1802" Part="1"
+F 0 "D1802" V 1900 10500 50 0000 L BNN
F 1 "V5.5MLA0603N" V 1650 10400 50 0000 L BNN
F 2 "neo900-legacy:SMD-0603" H 1790 10140 65 0001 L TNN
F 3 "" H 1800 10350 60 0001 C CNN
diff --git a/hw/leds.sch b/hw/leds.sch
index 8a1d76f..0c4f571 100644
--- a/hw/leds.sch
+++ b/hw/leds.sch
@@ -65,10 +65,10 @@ Kbd
Text Notes 12600 3000 0 120 ~ 0
Kbd
$Comp
-L C0402 C3201
+L C0402 C2101
U 1 1 578DC48A
P 3000 1550
-F 0 "C3201" H 3040 1590 50 0000 L CNN
+F 0 "C2101" H 3040 1590 50 0000 L CNN
F 1 "2u2" H 3040 1420 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 3030 1700 20 0001 C CNN
F 3 "" H 3000 1550 60 0001 C CNN
@@ -76,10 +76,10 @@ F 3 "" H 3000 1550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C3202
+L C0402 C2104
U 1 1 578DC552
P 3300 1550
-F 0 "C3202" H 3340 1590 50 0000 L CNN
+F 0 "C2104" H 3340 1590 50 0000 L CNN
F 1 "100n" H 3340 1420 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 3330 1700 20 0001 C CNN
F 3 "" H 3300 1550 60 0001 C CNN
@@ -87,10 +87,10 @@ F 3 "" H 3300 1550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C3203
+L C0402 C2108
U 1 1 578DC61A
P 8100 1550
-F 0 "C3203" H 8140 1590 50 0000 L CNN
+F 0 "C2108" H 8140 1590 50 0000 L CNN
F 1 "2u2" H 8140 1420 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 8130 1700 20 0001 C CNN
F 3 "" H 8100 1550 60 0001 C CNN
@@ -98,10 +98,10 @@ F 3 "" H 8100 1550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C3204
+L C0402 C2111
U 1 1 578DC6E2
P 8400 1550
-F 0 "C3204" H 8440 1590 50 0000 L CNN
+F 0 "C2111" H 8440 1590 50 0000 L CNN
F 1 "100n" H 8440 1420 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 8430 1700 20 0001 C CNN
F 3 "" H 8400 1550 60 0001 C CNN
@@ -109,10 +109,10 @@ F 3 "" H 8400 1550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C3205
+L C0402 C2102
U 1 1 578DC7AA
P 3100 2650
-F 0 "C3205" V 3150 2650 50 0000 L CNN
+F 0 "C2102" V 3150 2650 50 0000 L CNN
F 1 "1u" V 3050 2450 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 3130 2800 20 0001 C CNN
F 3 "" H 3100 2650 60 0001 C CNN
@@ -120,10 +120,10 @@ F 3 "" H 3100 2650 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C3206
+L C0402 C2109
U 1 1 578DC872
P 8200 2650
-F 0 "C3206" V 8250 2650 50 0000 L CNN
+F 0 "C2109" V 8250 2650 50 0000 L CNN
F 1 "1u" V 8150 2450 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 8230 2800 20 0001 C CNN
F 3 "" H 8200 2650 60 0001 C CNN
@@ -131,10 +131,10 @@ F 3 "" H 8200 2650 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C3207
+L C0402 C2103
U 1 1 578DC93A
P 3100 2850
-F 0 "C3207" V 3150 2850 50 0000 L CNN
+F 0 "C2103" V 3150 2850 50 0000 L CNN
F 1 "100n" V 3050 2550 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 3130 3000 20 0001 C CNN
F 3 "" H 3100 2850 60 0001 C CNN
@@ -142,10 +142,10 @@ F 3 "" H 3100 2850 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C3208
+L C0402 C2110
U 1 1 578DCA02
P 8200 2850
-F 0 "C3208" V 8250 2850 50 0000 L CNN
+F 0 "C2110" V 8250 2850 50 0000 L CNN
F 1 "100n" V 8150 2550 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 8230 3000 20 0001 C CNN
F 3 "" H 8200 2850 60 0001 C CNN
@@ -153,10 +153,10 @@ F 3 "" H 8200 2850 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L LED-RGB-COMMON-A-MSL0201RGB LED3201
+L LED-RGB-COMMON-A-MSL0201RGB LED2101
U 1 1 578DCEB2
P 6000 2050
-F 0 "LED3201" H 6450 2100 50 0000 L CNN
+F 0 "LED2101" H 6450 2100 50 0000 L CNN
F 1 "MSL0201RGB" H 6450 2000 50 0000 L CNN
F 2 "neo900-legacy:MSL0201RGB" H 5990 1840 65 0001 L TNN
F 3 "" H 6000 2050 60 0001 C CNN
@@ -164,10 +164,10 @@ F 3 "" H 6000 2050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LED-RGB-COMMON-A-MSL0201RGB LED3202
+L LED-RGB-COMMON-A-MSL0201RGB LED2107
U 1 1 578DCF7A
P 11300 2050
-F 0 "LED3202" H 11750 2100 50 0000 L CNN
+F 0 "LED2107" H 11750 2100 50 0000 L CNN
F 1 "MSL0201RGB" H 11750 2000 50 0000 L CNN
F 2 "neo900-legacy:MSL0201RGB" H 11290 1840 65 0001 L TNN
F 3 "" H 11300 2050 60 0001 C CNN
@@ -175,10 +175,10 @@ F 3 "" H 11300 2050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LED-RGB-COMMON-A-MSL0201RGB LED3203
+L LED-RGB-COMMON-A-MSL0201RGB LED2103
U 1 1 578DD042
P 6600 2950
-F 0 "LED3203" H 6550 3550 50 0000 L CNN
+F 0 "LED2103" H 6550 3550 50 0000 L CNN
F 1 "MSL0201RGB" H 6650 2400 50 0000 L CNN
F 2 "neo900-legacy:MSL0201RGB" H 6590 2740 65 0001 L TNN
F 3 "" H 6600 2950 60 0001 C CNN
@@ -186,10 +186,10 @@ F 3 "" H 6600 2950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LED-RGB-COMMON-A-MSL0201RGB LED3204
+L LED-RGB-COMMON-A-MSL0201RGB LED2108
U 1 1 578DD10A
P 11800 2950
-F 0 "LED3204" H 11800 3550 50 0000 L CNN
+F 0 "LED2108" H 11800 3550 50 0000 L CNN
F 1 "MSL0201RGB" H 11750 2350 50 0000 L CNN
F 2 "neo900-legacy:MSL0201RGB" H 11790 2740 65 0001 L TNN
F 3 "" H 11800 2950 60 0001 C CNN
@@ -197,10 +197,10 @@ F 3 "" H 11800 2950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LED-0603 LED3207
+L LED-0603 LED2109
U 1 1 578DD42A
P 11900 4400
-F 0 "LED3207" H 11300 4450 50 0000 L CNN
+F 0 "LED2109" H 11300 4450 50 0000 L CNN
F 1 "LTST-C190KRKT" H 11550 4250 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603D" H 11890 4190 65 0001 L TNN
F 3 "" H 11900 4400 60 0001 C CNN
@@ -208,10 +208,10 @@ F 3 "" H 11900 4400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LED-RGB-COMMON-A-MSL0201RGB LED3208
+L LED-RGB-COMMON-A-MSL0201RGB LED2104
U 1 1 578DD4F2
P 6600 4750
-F 0 "LED3208" H 7050 4800 50 0000 L CNN
+F 0 "LED2104" H 7050 4800 50 0000 L CNN
F 1 "MSL0201RGB" H 7050 4700 50 0000 L CNN
F 2 "neo900-legacy:MSL0201RGB" H 6590 4540 65 0001 L TNN
F 3 "" H 6600 4750 60 0001 C CNN
@@ -219,10 +219,10 @@ F 3 "" H 6600 4750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LED-0603 LED3209
+L LED-0603 LED2110
U 1 1 578DD5BA
P 11900 4750
-F 0 "LED3209" H 11300 4800 50 0000 L CNN
+F 0 "LED2110" H 11300 4800 50 0000 L CNN
F 1 "LTST-C190KFKT" H 11550 4600 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603D" H 11890 4540 65 0001 L TNN
F 3 "" H 11900 4750 60 0001 C CNN
@@ -230,10 +230,10 @@ F 3 "" H 11900 4750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LED-0603 LED3210
+L LED-0603 LED2111
U 1 1 578DD682
P 11900 5100
-F 0 "LED3210" H 11300 5150 50 0000 L CNN
+F 0 "LED2111" H 11300 5150 50 0000 L CNN
F 1 "LTST-C190TBKT" H 12050 5000 50 0000 L BNN
F 2 "neo900-legacy:SMD-0603D" H 11890 4890 65 0001 L TNN
F 3 "" H 11900 5100 60 0001 C CNN
@@ -241,10 +241,10 @@ F 3 "" H 11900 5100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R3201
+L R0402 R2101
U 1 1 578DD74A
P 3000 3050
-F 0 "R3201" H 2870 3110 50 0000 L BNN
+F 0 "R2101" H 2870 3110 50 0000 L BNN
F 1 "tbd." H 3000 3050 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 3030 3200 20 0001 C CNN
F 3 "" H 3000 3050 60 0001 C CNN
@@ -252,10 +252,10 @@ F 3 "" H 3000 3050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R3202
+L R0402 R2103
U 1 1 578DD812
P 8100 3050
-F 0 "R3202" H 7970 3110 50 0000 L BNN
+F 0 "R2103" H 7970 3110 50 0000 L BNN
F 1 "tbd." H 8100 3050 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 8130 3200 20 0001 C CNN
F 3 "" H 8100 3050 60 0001 C CNN
@@ -263,10 +263,10 @@ F 3 "" H 8100 3050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R3203
+L R0402 R2102
U 1 1 578DD8DA
P 3100 3250
-F 0 "R3203" H 2970 3310 50 0000 L BNN
+F 0 "R2102" H 2970 3310 50 0000 L BNN
F 1 "tbd." H 3100 3250 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 3130 3400 20 0001 C CNN
F 3 "" H 3100 3250 60 0001 C CNN
@@ -274,10 +274,10 @@ F 3 "" H 3100 3250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R3204
+L R0402 R2104
U 1 1 578DD9A2
P 8200 3250
-F 0 "R3204" H 8070 3310 50 0000 L BNN
+F 0 "R2104" H 8070 3310 50 0000 L BNN
F 1 "tbd." H 8200 3250 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 8230 3400 20 0001 C CNN
F 3 "" H 8200 3250 60 0001 C CNN
@@ -351,10 +351,10 @@ F 3 "" H 7800 4150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LP55281YZR U3201
+L LP55281YZR U2101
U 1 1 578DDF1A
P 3800 4850
-F 0 "U3201" H 3691 5100 50 0000 L BNN
+F 0 "U2101" H 3691 5100 50 0000 L BNN
F 1 "LP55281YZR" H 3690 4570 50 0000 L BNN
F 2 "neo900-legacy:YZR0036" H 3790 4640 65 0001 L TNN
F 3 "" H 3800 4850 60 0001 C CNN
@@ -362,10 +362,10 @@ F 3 "" H 3800 4850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LP55281YZR U3201
+L LP55281YZR U2101
U 2 1 578DDF7E
P 5500 2050
-F 0 "U3201" H 5050 2400 50 0000 L BNN
+F 0 "U2101" H 5050 2400 50 0000 L BNN
F 1 "LP55281YZR" H 5040 1670 50 0000 L BNN
F 2 "neo900-legacy:YZR0036" H 5490 1840 65 0001 L TNN
F 3 "" H 5500 2050 60 0001 C CNN
@@ -373,10 +373,10 @@ F 3 "" H 5500 2050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LP55281YZR U3201
+L LP55281YZR U2101
U 3 1 578DDFE2
P 5500 2950
-F 0 "U3201" H 5050 3300 50 0000 L BNN
+F 0 "U2101" H 5050 3300 50 0000 L BNN
F 1 "LP55281YZR" H 5040 2570 50 0000 L BNN
F 2 "neo900-legacy:YZR0036" H 5490 2740 65 0001 L TNN
F 3 "" H 5500 2950 60 0001 C CNN
@@ -384,10 +384,10 @@ F 3 "" H 5500 2950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LP55281YZR U3201
+L LP55281YZR U2101
U 4 1 578DE046
P 5500 3850
-F 0 "U3201" H 5050 4200 50 0000 L BNN
+F 0 "U2101" H 5050 4200 50 0000 L BNN
F 1 "LP55281YZR" H 5040 3470 50 0000 L BNN
F 2 "neo900-legacy:YZR0036" H 5490 3640 65 0001 L TNN
F 3 "" H 5500 3850 60 0001 C CNN
@@ -395,10 +395,10 @@ F 3 "" H 5500 3850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LP55281YZR U3201
+L LP55281YZR U2101
U 5 1 578DE0AA
P 5500 4750
-F 0 "U3201" H 5050 5100 50 0000 L BNN
+F 0 "U2101" H 5050 5100 50 0000 L BNN
F 1 "LP55281YZR" H 5040 4370 50 0000 L BNN
F 2 "neo900-legacy:YZR0036" H 5490 4540 65 0001 L TNN
F 3 "" H 5500 4750 60 0001 C CNN
@@ -406,10 +406,10 @@ F 3 "" H 5500 4750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LP55281YZR U3201
+L LP55281YZR U2101
U 6 1 578DE10E
P 4300 1950
-F 0 "U3201" H 4290 1940 65 0001 L TNN
+F 0 "U2101" H 4290 1940 65 0001 L TNN
F 1 "LP55281YZR" H 4290 1840 65 0001 L TNN
F 2 "neo900-legacy:YZR0036" H 4290 1740 65 0001 L TNN
F 3 "" H 4300 1950 60 0001 C CNN
@@ -417,10 +417,10 @@ F 3 "" H 4300 1950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LP55281YZR U3201
+L LP55281YZR U2101
U 7 1 578DE172
P 4000 3350
-F 0 "U3201" H 3990 3340 65 0001 L TNN
+F 0 "U2101" H 3990 3340 65 0001 L TNN
F 1 "LP55281YZR" H 3990 3240 65 0001 L TNN
F 2 "neo900-legacy:YZR0036" H 3990 3140 65 0001 L TNN
F 3 "" H 4000 3350 60 0001 C CNN
@@ -428,10 +428,10 @@ F 3 "" H 4000 3350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LP55281YZR U3201
+L LP55281YZR U2101
U 8 1 578DE1D6
P 4400 5050
-F 0 "U3201" H 4390 5040 65 0001 L TNN
+F 0 "U2101" H 4390 5040 65 0001 L TNN
F 1 "LP55281YZR" H 4390 4940 65 0001 L TNN
F 2 "neo900-legacy:YZR0036" H 4390 4840 65 0001 L TNN
F 3 "" H 4400 5050 60 0001 C CNN
@@ -439,10 +439,10 @@ F 3 "" H 4400 5050 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L LP55281YZR U3201
+L LP55281YZR U2101
U 9 1 578DE23A
P 4500 5050
-F 0 "U3201" H 4490 5040 65 0001 L TNN
+F 0 "U2101" H 4490 5040 65 0001 L TNN
F 1 "LP55281YZR" H 4490 4940 65 0001 L TNN
F 2 "neo900-legacy:YZR0036" H 4490 4840 65 0001 L TNN
F 3 "" H 4500 5050 60 0001 C CNN
@@ -450,10 +450,10 @@ F 3 "" H 4500 5050 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L LP55281YZR U3201
+L LP55281YZR U2101
U 10 1 578DE29E
P 4600 5050
-F 0 "U3201" H 4590 5040 65 0001 L TNN
+F 0 "U2101" H 4590 5040 65 0001 L TNN
F 1 "LP55281YZR" H 4590 4940 65 0001 L TNN
F 2 "neo900-legacy:YZR0036" H 4590 4840 65 0001 L TNN
F 3 "" H 4600 5050 60 0001 C CNN
@@ -461,10 +461,10 @@ F 3 "" H 4600 5050 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L LP55281YZR U3201
+L LP55281YZR U2101
U 11 1 578DE302
P 4700 5050
-F 0 "U3201" H 4690 5040 65 0001 L TNN
+F 0 "U2101" H 4690 5040 65 0001 L TNN
F 1 "LP55281YZR" H 4690 4940 65 0001 L TNN
F 2 "neo900-legacy:YZR0036" H 4690 4840 65 0001 L TNN
F 3 "" H 4700 5050 60 0001 C CNN
@@ -472,10 +472,10 @@ F 3 "" H 4700 5050 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L LP55281YZR U3201
+L LP55281YZR U2101
U 12 1 578DE366
P 4800 5050
-F 0 "U3201" H 4790 5040 65 0001 L TNN
+F 0 "U2101" H 4790 5040 65 0001 L TNN
F 1 "LP55281YZR" H 4790 4940 65 0001 L TNN
F 2 "neo900-legacy:YZR0036" H 4790 4840 65 0001 L TNN
F 3 "" H 4800 5050 60 0001 C CNN
@@ -483,10 +483,10 @@ F 3 "" H 4800 5050 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L LP55281YZR U3201
+L LP55281YZR U2101
U 13 1 578DE3CA
P 4900 5050
-F 0 "U3201" H 4890 5040 65 0001 L TNN
+F 0 "U2101" H 4890 5040 65 0001 L TNN
F 1 "LP55281YZR" H 4890 4940 65 0001 L TNN
F 2 "neo900-legacy:YZR0036" H 4890 4840 65 0001 L TNN
F 3 "" H 4900 5050 60 0001 C CNN
@@ -494,10 +494,10 @@ F 3 "" H 4900 5050 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L LP55281YZR U3202
+L LP55281YZR U2103
U 1 1 578DE492
P 8900 4850
-F 0 "U3202" H 8791 5100 50 0000 L BNN
+F 0 "U2103" H 8791 5100 50 0000 L BNN
F 1 "LP55281YZR" H 8790 4570 50 0000 L BNN
F 2 "neo900-legacy:YZR0036" H 8890 4640 65 0001 L TNN
F 3 "" H 8900 4850 60 0001 C CNN
@@ -505,10 +505,10 @@ F 3 "" H 8900 4850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LP55281YZR U3202
+L LP55281YZR U2103
U 2 1 578DE4F6
P 10600 2050
-F 0 "U3202" H 10150 2400 50 0000 L BNN
+F 0 "U2103" H 10150 2400 50 0000 L BNN
F 1 "LP55281YZR" H 10140 1670 50 0000 L BNN
F 2 "neo900-legacy:YZR0036" H 10590 1840 65 0001 L TNN
F 3 "" H 10600 2050 60 0001 C CNN
@@ -516,10 +516,10 @@ F 3 "" H 10600 2050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LP55281YZR U3202
+L LP55281YZR U2103
U 3 1 578DE55A
P 10600 2950
-F 0 "U3202" H 10150 3300 50 0000 L BNN
+F 0 "U2103" H 10150 3300 50 0000 L BNN
F 1 "LP55281YZR" H 10140 2570 50 0000 L BNN
F 2 "neo900-legacy:YZR0036" H 10590 2740 65 0001 L TNN
F 3 "" H 10600 2950 60 0001 C CNN
@@ -527,10 +527,10 @@ F 3 "" H 10600 2950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LP55281YZR U3202
+L LP55281YZR U2103
U 4 1 578DE5BE
P 10600 3850
-F 0 "U3202" H 10150 4200 50 0000 L BNN
+F 0 "U2103" H 10150 4200 50 0000 L BNN
F 1 "LP55281YZR" H 10140 3470 50 0000 L BNN
F 2 "neo900-legacy:YZR0036" H 10590 3640 65 0001 L TNN
F 3 "" H 10600 3850 60 0001 C CNN
@@ -538,10 +538,10 @@ F 3 "" H 10600 3850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LP55281YZR U3202
+L LP55281YZR U2103
U 5 1 578DE622
P 10600 4750
-F 0 "U3202" H 10150 5100 50 0000 L BNN
+F 0 "U2103" H 10150 5100 50 0000 L BNN
F 1 "LP55281YZR" H 10140 4370 50 0000 L BNN
F 2 "neo900-legacy:YZR0036" H 10590 4540 65 0001 L TNN
F 3 "" H 10600 4750 60 0001 C CNN
@@ -549,10 +549,10 @@ F 3 "" H 10600 4750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LP55281YZR U3202
+L LP55281YZR U2103
U 6 1 578DE686
P 9400 1950
-F 0 "U3202" H 9390 1940 65 0001 L TNN
+F 0 "U2103" H 9390 1940 65 0001 L TNN
F 1 "LP55281YZR" H 9390 1840 65 0001 L TNN
F 2 "neo900-legacy:YZR0036" H 9390 1740 65 0001 L TNN
F 3 "" H 9400 1950 60 0001 C CNN
@@ -560,10 +560,10 @@ F 3 "" H 9400 1950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LP55281YZR U3202
+L LP55281YZR U2103
U 7 1 578DE6EA
P 9100 3350
-F 0 "U3202" H 9090 3340 65 0001 L TNN
+F 0 "U2103" H 9090 3340 65 0001 L TNN
F 1 "LP55281YZR" H 9090 3240 65 0001 L TNN
F 2 "neo900-legacy:YZR0036" H 9090 3140 65 0001 L TNN
F 3 "" H 9100 3350 60 0001 C CNN
@@ -571,10 +571,10 @@ F 3 "" H 9100 3350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LP55281YZR U3202
+L LP55281YZR U2103
U 8 1 578DE74E
P 10000 5050
-F 0 "U3202" H 9990 5040 65 0001 L TNN
+F 0 "U2103" H 9990 5040 65 0001 L TNN
F 1 "LP55281YZR" H 9990 4940 65 0001 L TNN
F 2 "neo900-legacy:YZR0036" H 9990 4840 65 0001 L TNN
F 3 "" H 10000 5050 60 0001 C CNN
@@ -582,10 +582,10 @@ F 3 "" H 10000 5050 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L LP55281YZR U3202
+L LP55281YZR U2103
U 9 1 578DE7B2
P 9900 5050
-F 0 "U3202" H 9890 5040 65 0001 L TNN
+F 0 "U2103" H 9890 5040 65 0001 L TNN
F 1 "LP55281YZR" H 9890 4940 65 0001 L TNN
F 2 "neo900-legacy:YZR0036" H 9890 4840 65 0001 L TNN
F 3 "" H 9900 5050 60 0001 C CNN
@@ -593,10 +593,10 @@ F 3 "" H 9900 5050 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L LP55281YZR U3202
+L LP55281YZR U2103
U 10 1 578DE816
P 9800 5050
-F 0 "U3202" H 9790 5040 65 0001 L TNN
+F 0 "U2103" H 9790 5040 65 0001 L TNN
F 1 "LP55281YZR" H 9790 4940 65 0001 L TNN
F 2 "neo900-legacy:YZR0036" H 9790 4840 65 0001 L TNN
F 3 "" H 9800 5050 60 0001 C CNN
@@ -604,10 +604,10 @@ F 3 "" H 9800 5050 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L LP55281YZR U3202
+L LP55281YZR U2103
U 11 1 578DE87A
P 9700 5050
-F 0 "U3202" H 9690 5040 65 0001 L TNN
+F 0 "U2103" H 9690 5040 65 0001 L TNN
F 1 "LP55281YZR" H 9690 4940 65 0001 L TNN
F 2 "neo900-legacy:YZR0036" H 9690 4840 65 0001 L TNN
F 3 "" H 9700 5050 60 0001 C CNN
@@ -615,10 +615,10 @@ F 3 "" H 9700 5050 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L LP55281YZR U3202
+L LP55281YZR U2103
U 12 1 578DE8DE
P 9600 5050
-F 0 "U3202" H 9590 5040 65 0001 L TNN
+F 0 "U2103" H 9590 5040 65 0001 L TNN
F 1 "LP55281YZR" H 9590 4940 65 0001 L TNN
F 2 "neo900-legacy:YZR0036" H 9590 4840 65 0001 L TNN
F 3 "" H 9600 5050 60 0001 C CNN
@@ -626,10 +626,10 @@ F 3 "" H 9600 5050 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L LP55281YZR U3202
+L LP55281YZR U2103
U 13 1 578DE942
P 9500 5050
-F 0 "U3202" H 9490 5040 65 0001 L TNN
+F 0 "U2103" H 9490 5040 65 0001 L TNN
F 1 "LP55281YZR" H 9490 4940 65 0001 L TNN
F 2 "neo900-legacy:YZR0036" H 9490 4840 65 0001 L TNN
F 3 "" H 9500 5050 60 0001 C CNN
@@ -852,10 +852,10 @@ Wire Wire Line
Wire Wire Line
5700 3650 5900 3650
$Comp
-L LED-RGB-COMMON-A-MSL0201RGB LED3205
+L LED-RGB-COMMON-A-MSL0201RGB LED2102
U 1 1 578DD1D2
P 6100 3850
-F 0 "LED3205" H 6550 3900 50 0000 L CNN
+F 0 "LED2102" H 6550 3900 50 0000 L CNN
F 1 "MSL0201RGB" H 6550 3800 50 0000 L CNN
F 2 "neo900-legacy:MSL0201RGB" H 6090 3640 65 0001 L TNN
F 3 "" H 6100 3850 60 0001 C CNN
@@ -984,10 +984,10 @@ AUX LED
Text Notes 10400 8200 0 120 ~ 0
RGB LED (display connector)
$Comp
-L C0402 C2106
+L C0402 C2105
U 1 1 58290F83
P 5100 7400
-F 0 "C2106" H 5140 7440 50 0000 L CNN
+F 0 "C2105" H 5140 7440 50 0000 L CNN
F 1 "470n" H 5140 7270 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 5130 7550 20 0001 C CNN
F 3 "" H 5100 7400 60 0001 C CNN
@@ -995,10 +995,10 @@ F 3 "" H 5100 7400 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C2107
+L C0402 C2106
U 1 1 58290F8A
P 5500 7400
-F 0 "C2107" H 5540 7440 50 0000 L CNN
+F 0 "C2106" H 5540 7440 50 0000 L CNN
F 1 "470n" H 5540 7270 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 5530 7550 20 0001 C CNN
F 3 "" H 5500 7400 60 0001 C CNN
@@ -1006,10 +1006,10 @@ F 3 "" H 5500 7400 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C2108
+L C0402 C2107
U 1 1 58290F91
P 6000 10200
-F 0 "C2108" H 6040 10240 50 0000 L CNN
+F 0 "C2107" H 6040 10240 50 0000 L CNN
F 1 "1u" H 6040 10070 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 6030 10350 20 0001 C CNN
F 3 "" H 6000 10200 60 0001 C CNN
@@ -1022,8 +1022,8 @@ U 5 1 58290F98
P 9700 8500
AR Path="/58290F98" Ref="P?" Part="5"
AR Path="/578AFF2C/58290F98" Ref="P?" Part="5"
-AR Path="/578AFF2E/58290F98" Ref="P1" Part="5"
-F 0 "P1" H 9300 8699 50 0000 L BNN
+AR Path="/578AFF2E/58290F98" Ref="P1901" Part="5"
+F 0 "P1901" H 9300 8699 50 0000 L BNN
F 1 "N900-DISPLAY" H 9300 8300 50 0000 L BNN
F 2 "neo900-legacy:500024-6471" H 9690 8290 65 0001 L TNN
F 3 "" H 9700 8500 60 0001 C CNN
@@ -1097,10 +1097,10 @@ F 3 "" H 7500 7700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LP55231 U2107
+L LP55231 U2102
U 1 1 58290FC3
P 5400 8800
-F 0 "U2107" H 4850 9850 50 0000 R CNN
+F 0 "U2102" H 4850 9850 50 0000 R CNN
F 1 "LP55231" H 5000 7500 50 0000 L BNN
F 2 "neo900-legacy:QFN-24+E-0.5" H 5390 8590 65 0001 L TNN
F 3 "" H 5400 8800 60 0001 C CNN
@@ -1108,10 +1108,10 @@ F 3 "" H 5400 8800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LP55231 U2107
+L LP55231 U2102
U 2 1 58290FCA
P 5500 10000
-F 0 "U2107" H 5490 9990 65 0001 L TNN
+F 0 "U2102" H 5490 9990 65 0001 L TNN
F 1 "LP55231" H 5490 9890 65 0001 L TNN
F 2 "neo900-legacy:QFN-24+E-0.5" H 5490 9790 65 0001 L TNN
F 3 "" H 5500 10000 60 0001 C CNN
@@ -1236,10 +1236,10 @@ Wire Wire Line
7400 7500 7500 7500
Connection ~ 7500 7500
$Comp
-L MSL0104RGB LED2104
+L MSL0104RGB LED2105
U 1 1 58291011
P 7000 7200
-F 0 "LED2104" H 6800 7750 45 0000 L CNN
+F 0 "LED2105" H 6800 7750 45 0000 L CNN
F 1 "MSL0104RGBU1" H 7000 6700 45 0000 C CNN
F 2 "MSL0104RGB" H 7000 6600 20 0001 C CNN
F 3 "" H 7000 7500 60 0001 C CNN
@@ -1247,10 +1247,10 @@ F 3 "" H 7000 7500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L MSL0104RGB LED2105
+L MSL0104RGB LED2106
U 1 1 58291018
P 7100 9600
-F 0 "LED2105" H 6900 10150 45 0000 L CNN
+F 0 "LED2106" H 6900 10150 45 0000 L CNN
F 1 "MSL0104RGBU1" H 7100 9100 45 0000 C CNN
F 2 "MSL0104RGB" H 7100 9000 20 0001 C CNN
F 3 "" H 7100 9900 60 0001 C CNN
@@ -1277,8 +1277,8 @@ U 1 1 58291027
P 9000 7400
AR Path="/578AFF20/58291027" Ref="U?" Part="1"
AR Path="/578AFF2C/58291027" Ref="U?" Part="1"
-AR Path="/578AFF2E/58291027" Ref="U2108" Part="1"
-F 0 "U2108" H 9600 7050 50 0000 R CNN
+AR Path="/578AFF2E/58291027" Ref="U2104" Part="1"
+F 0 "U2104" H 9600 7050 50 0000 R CNN
F 1 "ESDA6V1-5P6" H 8550 7400 50 0000 R CNN
F 2 "SOT666IP" H 9030 7550 20 0001 C CNN
F 3 "" H 9000 7400 60 0001 C CNN
diff --git a/hw/misc.sch b/hw/misc.sch
index b40498a..c36af23 100644
--- a/hw/misc.sch
+++ b/hw/misc.sch
@@ -68,10 +68,10 @@ F 3 "" H 8050 7700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 TP1501
+L TEST-POINT-1.25 TP1201
U 1 1 578CA5A3
P 7850 6900
-F 0 "TP1501" H 7840 6890 65 0001 L TNN
+F 0 "TP1201" H 7840 6890 65 0001 L TNN
F 1 "VIB+" H 7800 6900 60 0000 R CNN
F 2 "neo900-legacy:TP-1.25" H 7840 6690 65 0001 L TNN
F 3 "" H 7850 6900 60 0001 C CNN
@@ -79,10 +79,10 @@ F 3 "" H 7850 6900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 TP1502
+L TEST-POINT-1.25 TP1202
U 1 1 578CA66B
P 7850 7300
-F 0 "TP1502" H 7840 7290 65 0001 L TNN
+F 0 "TP1202" H 7840 7290 65 0001 L TNN
F 1 "VIB-" H 7800 7300 60 0000 R CNN
F 2 "neo900-legacy:TP-1.25" H 7840 7090 65 0001 L TNN
F 3 "" H 7850 7300 60 0001 C CNN
@@ -90,10 +90,10 @@ F 3 "" H 7850 7300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L SPEAKER-SHIELD-304-106 VIB1501
+L SPEAKER-SHIELD-304-106 VIB1201
U 1 1 578CA733
P 8350 7600
-F 0 "VIB1501" H 8480 7649 50 0000 L BNN
+F 0 "VIB1201" H 8480 7649 50 0000 L BNN
F 1 "PREC-MICRO-304-106" H 8340 7490 65 0001 L TNN
F 2 "neo900-legacy:PREC-MICRO-304-106" H 8340 7390 65 0001 L TNN
F 3 "" H 8350 7600 60 0001 C CNN
@@ -101,10 +101,10 @@ F 3 "" H 8350 7600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L SPEAKER-SHIELD-304-106 VIB1501
+L SPEAKER-SHIELD-304-106 VIB1201
U 2 1 578AF664
P 8450 7100
-F 0 "VIB1501" H 8310 7330 50 0000 L BNN
+F 0 "VIB1201" H 8310 7330 50 0000 L BNN
F 1 "PREC-MICRO-304-106" H 8300 6830 50 0000 L BNN
F 2 "neo900-legacy:PREC-MICRO-304-106" H 8300 6830 50 0001 L BNN
F 3 "" H 8450 7100 60 0001 C CNN
@@ -135,8 +135,8 @@ U 1 1 58122EB0
P 8100 3300
AR Path="/578AFF1A/58122EB0" Ref="G?" Part="1"
AR Path="/578AFF16/58122EB0" Ref="G?" Part="1"
-AR Path="/578AFF0C/58122EB0" Ref="G2201" Part="1"
-F 0 "G2201" H 8230 3349 50 0000 L BNN
+AR Path="/578AFF0C/58122EB0" Ref="G1201" Part="1"
+F 0 "G1201" H 8230 3349 50 0000 L BNN
F 1 "SHIELDN900" H 8090 3190 65 0001 L TNN
F 2 "neo900-legacy:N900-SPRING-A" H 8090 3090 65 0001 L TNN
F 3 "" H 8100 3300 60 0001 C CNN
@@ -149,8 +149,8 @@ U 1 1 58122EB7
P 9400 3300
AR Path="/578AFF1A/58122EB7" Ref="G?" Part="1"
AR Path="/578AFF16/58122EB7" Ref="G?" Part="1"
-AR Path="/578AFF0C/58122EB7" Ref="G2202" Part="1"
-F 0 "G2202" H 9530 3349 50 0000 L BNN
+AR Path="/578AFF0C/58122EB7" Ref="G1205" Part="1"
+F 0 "G1205" H 9530 3349 50 0000 L BNN
F 1 "SHIELDN900" H 9390 3190 65 0001 L TNN
F 2 "neo900-legacy:N900-SPRING-A" H 9390 3090 65 0001 L TNN
F 3 "" H 9400 3300 60 0001 C CNN
@@ -163,8 +163,8 @@ U 1 1 58122EBE
P 10700 3250
AR Path="/578AFF1A/58122EBE" Ref="G?" Part="1"
AR Path="/578AFF16/58122EBE" Ref="G?" Part="1"
-AR Path="/578AFF0C/58122EBE" Ref="G2203" Part="1"
-F 0 "G2203" H 10830 3299 50 0000 L BNN
+AR Path="/578AFF0C/58122EBE" Ref="G1207" Part="1"
+F 0 "G1207" H 10830 3299 50 0000 L BNN
F 1 "SHIELDPAD-3.5X2.5" H 10690 3140 65 0001 L TNN
F 2 "neo900-legacy:PAD-3.5X2.5" H 10690 3040 65 0001 L TNN
F 3 "" H 10700 3250 60 0001 C CNN
@@ -177,8 +177,8 @@ U 1 1 58122EC5
P 8100 3600
AR Path="/578AFF1A/58122EC5" Ref="G?" Part="1"
AR Path="/578AFF16/58122EC5" Ref="G?" Part="1"
-AR Path="/578AFF0C/58122EC5" Ref="G2204" Part="1"
-F 0 "G2204" H 8230 3649 50 0000 L BNN
+AR Path="/578AFF0C/58122EC5" Ref="G1202" Part="1"
+F 0 "G1202" H 8230 3649 50 0000 L BNN
F 1 "SHIELDN900" H 8090 3490 65 0001 L TNN
F 2 "neo900-legacy:N900-SPRING-A" H 8090 3390 65 0001 L TNN
F 3 "" H 8100 3600 60 0001 C CNN
@@ -191,8 +191,8 @@ U 1 1 58122ECC
P 9400 3600
AR Path="/578AFF1A/58122ECC" Ref="G?" Part="1"
AR Path="/578AFF16/58122ECC" Ref="G?" Part="1"
-AR Path="/578AFF0C/58122ECC" Ref="G2205" Part="1"
-F 0 "G2205" H 9530 3649 50 0000 L BNN
+AR Path="/578AFF0C/58122ECC" Ref="G1206" Part="1"
+F 0 "G1206" H 9530 3649 50 0000 L BNN
F 1 "SHIELDN900" H 9390 3490 65 0001 L TNN
F 2 "neo900-legacy:N900-SPRING-A" H 9390 3390 65 0001 L TNN
F 3 "" H 9400 3600 60 0001 C CNN
@@ -205,8 +205,8 @@ U 1 1 58122ED3
P 10700 3550
AR Path="/578AFF1A/58122ED3" Ref="G?" Part="1"
AR Path="/578AFF16/58122ED3" Ref="G?" Part="1"
-AR Path="/578AFF0C/58122ED3" Ref="G2206" Part="1"
-F 0 "G2206" H 10830 3599 50 0000 L BNN
+AR Path="/578AFF0C/58122ED3" Ref="G1208" Part="1"
+F 0 "G1208" H 10830 3599 50 0000 L BNN
F 1 "SHIELDPAD-3.5X2.5" H 10690 3440 65 0001 L TNN
F 2 "neo900-legacy:PAD-3.5X2.5" H 10690 3340 65 0001 L TNN
F 3 "" H 10700 3550 60 0001 C CNN
@@ -219,8 +219,8 @@ U 1 1 58122EDA
P 8100 3900
AR Path="/578AFF1A/58122EDA" Ref="G?" Part="1"
AR Path="/578AFF16/58122EDA" Ref="G?" Part="1"
-AR Path="/578AFF0C/58122EDA" Ref="G2207" Part="1"
-F 0 "G2207" H 8230 3949 50 0000 L BNN
+AR Path="/578AFF0C/58122EDA" Ref="G1203" Part="1"
+F 0 "G1203" H 8230 3949 50 0000 L BNN
F 1 "SHIELDN900" H 8090 3790 65 0001 L TNN
F 2 "neo900-legacy:N900-SPRING-A" H 8090 3690 65 0001 L TNN
F 3 "" H 8100 3900 60 0001 C CNN
@@ -233,8 +233,8 @@ U 1 1 58122EE1
P 10700 3850
AR Path="/578AFF1A/58122EE1" Ref="G?" Part="1"
AR Path="/578AFF16/58122EE1" Ref="G?" Part="1"
-AR Path="/578AFF0C/58122EE1" Ref="G2208" Part="1"
-F 0 "G2208" H 10830 3899 50 0000 L BNN
+AR Path="/578AFF0C/58122EE1" Ref="G1209" Part="1"
+F 0 "G1209" H 10830 3899 50 0000 L BNN
F 1 "SHIELDPAD-3.5X2.5" H 10690 3740 65 0001 L TNN
F 2 "neo900-legacy:PAD-3.5X2.5" H 10690 3640 65 0001 L TNN
F 3 "" H 10700 3850 60 0001 C CNN
@@ -247,8 +247,8 @@ U 1 1 58122EE8
P 8100 4200
AR Path="/578AFF1A/58122EE8" Ref="G?" Part="1"
AR Path="/578AFF16/58122EE8" Ref="G?" Part="1"
-AR Path="/578AFF0C/58122EE8" Ref="G2209" Part="1"
-F 0 "G2209" H 8230 4249 50 0000 L BNN
+AR Path="/578AFF0C/58122EE8" Ref="G1204" Part="1"
+F 0 "G1204" H 8230 4249 50 0000 L BNN
F 1 "SHIELDN900" H 8090 4090 65 0001 L TNN
F 2 "neo900-legacy:N900-SPRING-A" H 8090 3990 65 0001 L TNN
F 3 "" H 8100 4200 60 0001 C CNN
diff --git a/hw/modem.sch b/hw/modem.sch
index f30aa40..789c6e1 100644
--- a/hw/modem.sch
+++ b/hw/modem.sch
@@ -55,10 +55,10 @@ Comment3 ""
Comment4 "Xsheetnumber=5"
$EndDescr
$Comp
-L C0805 C601
+L C0805 C509
U 1 1 578B42FA
P 11150 6150
-F 0 "C601" H 11190 6190 50 0000 L CNN
+F 0 "C509" H 11190 6190 50 0000 L CNN
F 1 "47u" H 11190 6020 50 0000 L CNN
F 2 "neo900-legacy:SMD-0805" H 11180 6300 20 0001 C CNN
F 3 "" H 11150 6150 60 0001 C CNN
@@ -66,10 +66,10 @@ F 3 "" H 11150 6150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C602
+L C0402 C501
U 1 1 578B43C2
P 9750 6650
-F 0 "C602" H 9790 6690 50 0000 L CNN
+F 0 "C501" H 9790 6690 50 0000 L CNN
F 1 "10p" H 9790 6520 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 9780 6800 20 0001 C CNN
F 3 "" H 9750 6650 60 0001 C CNN
@@ -77,10 +77,10 @@ F 3 "" H 9750 6650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C603
+L C0402 C503
U 1 1 578B448A
P 10050 6650
-F 0 "C603" H 10090 6690 50 0000 L CNN
+F 0 "C503" H 10090 6690 50 0000 L CNN
F 1 "39p" H 10090 6520 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 10080 6800 20 0001 C CNN
F 3 "" H 10050 6650 60 0001 C CNN
@@ -88,10 +88,10 @@ F 3 "" H 10050 6650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0805 C604
+L C0805 C505
U 1 1 578B4552
P 10350 6650
-F 0 "C604" H 10390 6690 50 0000 L CNN
+F 0 "C505" H 10390 6690 50 0000 L CNN
F 1 "47u" H 10390 6520 50 0000 L CNN
F 2 "neo900-legacy:SMD-0805" H 10380 6800 20 0001 C CNN
F 3 "" H 10350 6650 60 0001 C CNN
@@ -99,10 +99,10 @@ F 3 "" H 10350 6650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C605
+L C0402 C507
U 1 1 578B461A
P 10800 7050
-F 0 "C605" H 10840 7090 50 0000 L CNN
+F 0 "C507" H 10840 7090 50 0000 L CNN
F 1 "10p" H 10840 6920 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 10830 7200 20 0001 C CNN
F 3 "" H 10800 7050 60 0001 C CNN
@@ -110,10 +110,10 @@ F 3 "" H 10800 7050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C606
+L C0402 C508
U 1 1 578B46E2
P 11100 7050
-F 0 "C606" H 11140 7090 50 0000 L CNN
+F 0 "C508" H 11140 7090 50 0000 L CNN
F 1 "39p" H 11140 6920 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 11130 7200 20 0001 C CNN
F 3 "" H 11100 7050 60 0001 C CNN
@@ -121,10 +121,10 @@ F 3 "" H 11100 7050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0805 C607
+L C0805 C510
U 1 1 578B47AA
P 11400 7050
-F 0 "C607" H 11440 7090 50 0000 L CNN
+F 0 "C510" H 11440 7090 50 0000 L CNN
F 1 "47u" H 11440 6920 50 0000 L CNN
F 2 "neo900-legacy:SMD-0805" H 11430 7200 20 0001 C CNN
F 3 "" H 11400 7050 60 0001 C CNN
@@ -132,10 +132,10 @@ F 3 "" H 11400 7050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C608
+L C0402 C502
U 1 1 578B4872
P 9750 7350
-F 0 "C608" H 9790 7390 50 0000 L CNN
+F 0 "C502" H 9790 7390 50 0000 L CNN
F 1 "10p" H 9790 7220 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 9780 7500 20 0001 C CNN
F 3 "" H 9750 7350 60 0001 C CNN
@@ -143,10 +143,10 @@ F 3 "" H 9750 7350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C609
+L C0402 C504
U 1 1 578B493A
P 10050 7350
-F 0 "C609" H 10090 7390 50 0000 L CNN
+F 0 "C504" H 10090 7390 50 0000 L CNN
F 1 "39p" H 10090 7220 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 10080 7500 20 0001 C CNN
F 3 "" H 10050 7350 60 0001 C CNN
@@ -154,10 +154,10 @@ F 3 "" H 10050 7350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0805 C610
+L C0805 C506
U 1 1 578B4A02
P 10350 7350
-F 0 "C610" H 10390 7390 50 0000 L CNN
+F 0 "C506" H 10390 7390 50 0000 L CNN
F 1 "47u" H 10390 7220 50 0000 L CNN
F 2 "neo900-legacy:SMD-0805" H 10380 7500 20 0001 C CNN
F 3 "" H 10350 7350 60 0001 C CNN
@@ -165,10 +165,10 @@ F 3 "" H 10350 7350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP605
+L TEST-POINT-0.75 TP547
U 1 1 578B4C5A
P 6350 6650
-F 0 "TP605" H 6300 6650 50 0000 R CNN
+F 0 "TP547" H 6300 6650 50 0000 R CNN
F 1 "CTS" H 6410 6625 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 6340 6440 65 0001 L TNN
F 3 "" H 6350 6650 60 0001 C CNN
@@ -176,10 +176,10 @@ F 3 "" H 6350 6650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 TP613
+L TEST-POINT-1.25 TP555
U 1 1 578B4D22
P 10000 4500
-F 0 "TP613" H 9850 4500 50 0000 R CNN
+F 0 "TP555" H 9850 4500 50 0000 R CNN
F 1 "MODEM_DP" H 10060 4475 50 0000 L BNN
F 2 "neo900-legacy:TP-1.25" H 9990 4290 65 0001 L TNN
F 3 "" H 10000 4500 60 0001 C CNN
@@ -187,10 +187,10 @@ F 3 "" H 10000 4500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 TP614
+L TEST-POINT-1.25 TP556
U 1 1 578B4DEA
P 10000 4700
-F 0 "TP614" H 9850 4700 50 0000 R CNN
+F 0 "TP556" H 9850 4700 50 0000 R CNN
F 1 "MODEM_DM" H 10060 4675 50 0000 L BNN
F 2 "neo900-legacy:TP-1.25" H 9990 4490 65 0001 L TNN
F 3 "" H 10000 4700 60 0001 C CNN
@@ -198,10 +198,10 @@ F 3 "" H 10000 4700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP611
+L TEST-POINT-0.75 TP552
U 1 1 578B4EB2
P 6350 7750
-F 0 "TP611" H 6350 7850 50 0000 C CNN
+F 0 "TP552" H 6350 7850 50 0000 C CNN
F 1 "DCD" H 6410 7725 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 6340 7540 65 0001 L TNN
F 3 "" H 6350 7750 60 0001 C CNN
@@ -209,10 +209,10 @@ F 3 "" H 6350 7750 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP608
+L TEST-POINT-0.75 TP553
U 1 1 578B4F7A
P 6350 7950
-F 0 "TP608" H 6350 8050 50 0000 C CNN
+F 0 "TP553" H 6350 8050 50 0000 C CNN
F 1 "DSR" H 6410 7925 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 6340 7740 65 0001 L TNN
F 3 "" H 6350 7950 60 0001 C CNN
@@ -220,10 +220,10 @@ F 3 "" H 6350 7950 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP612
+L TEST-POINT-0.75 TP554
U 1 1 578B5042
P 6350 8150
-F 0 "TP612" H 6350 8250 50 0000 C CNN
+F 0 "TP554" H 6350 8250 50 0000 C CNN
F 1 "DTR" H 6410 8125 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 6340 7940 65 0001 L TNN
F 3 "" H 6350 8150 60 0001 C CNN
@@ -231,10 +231,10 @@ F 3 "" H 6350 8150 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 GPIO601
+L TEST-POINT-1.25 GPIO501
U 1 1 578B51D2
P 11050 3100
-F 0 "GPIO601" H 11040 3090 65 0001 L TNN
+F 0 "GPIO501" H 11040 3090 65 0001 L TNN
F 1 "MODEM_IGT" H 11100 3100 50 0000 L CNN
F 2 "neo900-legacy:TP-1.25" H 11040 2890 65 0001 L TNN
F 3 "" H 11050 3100 60 0001 C CNN
@@ -242,10 +242,10 @@ F 3 "" H 11050 3100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 TP616
+L TEST-POINT-1.25 TP560
U 1 1 578B529A
P 10000 5600
-F 0 "TP616" H 9850 5600 50 0000 R CNN
+F 0 "TP560" H 9850 5600 50 0000 R CNN
F 1 "LC" H 10060 5575 50 0000 L BNN
F 2 "neo900-legacy:TP-1.25" H 9990 5390 65 0001 L TNN
F 3 "" H 10000 5600 60 0001 C CNN
@@ -253,10 +253,10 @@ F 3 "" H 10000 5600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L PHS8-CLEAN M601
+L PHS8-CLEAN M501
U 1 1 578B5362
P 7050 7050
-F 0 "M601" H 6800 7050 50 0000 L CNN
+F 0 "M501" H 6800 7050 50 0000 L CNN
F 1 "PHS8" H 6871 6580 50 0000 L BNN
F 2 "neo900-legacy:P*S8" H 7040 6840 65 0001 L TNN
F 3 "" H 7050 7050 60 0001 C CNN
@@ -264,10 +264,10 @@ F 3 "" H 7050 7050 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L PHS8-CLEAN M601
+L PHS8-CLEAN M501
U 2 1 578B53C6
P 7550 8250
-F 0 "M601" H 7600 8300 50 0000 L BNN
+F 0 "M501" H 7600 8300 50 0000 L BNN
F 1 "PHS8" H 7540 8140 65 0001 L TNN
F 2 "neo900-legacy:P*S8" H 7540 8040 65 0001 L TNN
F 3 "" H 7550 8250 60 0001 C CNN
@@ -275,10 +275,10 @@ F 3 "" H 7550 8250 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L PHS8-CLEAN M601
+L PHS8-CLEAN M501
U 3 1 578B542A
P 9250 7750
-F 0 "M601" H 9300 7600 50 0000 L BNN
+F 0 "M501" H 9300 7600 50 0000 L BNN
F 1 "PHS8" H 9240 7640 65 0001 L TNN
F 2 "neo900-legacy:P*S8" H 9240 7540 65 0001 L TNN
F 3 "" H 9250 7750 60 0001 C CNN
@@ -286,10 +286,10 @@ F 3 "" H 9250 7750 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L PHS8-CLEAN M601
+L PHS8-CLEAN M501
U 4 1 578B548E
P 8550 8250
-F 0 "M601" H 8600 8300 50 0000 L BNN
+F 0 "M501" H 8600 8300 50 0000 L BNN
F 1 "PHS8" H 8540 8140 65 0001 L TNN
F 2 "neo900-legacy:P*S8" H 8540 8040 65 0001 L TNN
F 3 "" H 8550 8250 60 0001 C CNN
@@ -297,10 +297,10 @@ F 3 "" H 8550 8250 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L PHS8-CLEAN M601
+L PHS8-CLEAN M501
U 5 1 578B54F2
P 7050 7850
-F 0 "M601" H 6880 8290 50 0000 L BNN
+F 0 "M501" H 6880 8290 50 0000 L BNN
F 1 "PHS8" V 6800 7500 50 0000 L CNN
F 2 "neo900-legacy:P*S8" H 7040 7640 65 0001 L TNN
F 3 "" H 7050 7850 60 0001 C CNN
@@ -308,10 +308,10 @@ F 3 "" H 7050 7850 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L PHS8-CLEAN M601
+L PHS8-CLEAN M501
U 6 1 578B5556
P 13000 9000
-F 0 "M601" H 12740 9430 50 0000 L BNN
+F 0 "M501" H 12740 9430 50 0000 L BNN
F 1 "PHS8" H 12730 8520 50 0000 L BNN
F 2 "neo900-legacy:P*S8" H 12990 8790 65 0001 L TNN
F 3 "" H 13000 9000 60 0001 C CNN
@@ -319,10 +319,10 @@ F 3 "" H 13000 9000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L PHS8-CLEAN M601
+L PHS8-CLEAN M501
U 7 1 578B70AE
P 8150 4550
-F 0 "M601" V 7900 4900 50 0000 R CNN
+F 0 "M501" V 7900 4900 50 0000 R CNN
F 1 "PHS8" H 7980 4070 50 0000 L BNN
F 2 "neo900-legacy:P*S8" H 8140 4340 65 0001 L TNN
F 3 "" H 8150 4550 60 0001 C CNN
@@ -330,10 +330,10 @@ F 3 "" H 8150 4550 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L PHS8-CLEAN M601
+L PHS8-CLEAN M501
U 8 1 578B7112
P 7350 4550
-F 0 "M601" H 7190 4980 50 0000 L BNN
+F 0 "M501" H 7190 4980 50 0000 L BNN
F 1 "PHS8" V 7100 3400 50 0000 L CNN
F 2 "neo900-legacy:P*S8" H 7340 4340 65 0001 L TNN
F 3 "" H 7350 4550 60 0001 C CNN
@@ -341,10 +341,10 @@ F 3 "" H 7350 4550 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L PHS8-CLEAN M601
+L PHS8-CLEAN M501
U 9 1 578B7176
P 8850 6950
-F 0 "M601" H 8840 6940 65 0001 L TNN
+F 0 "M501" H 8840 6940 65 0001 L TNN
F 1 "PHS8" H 8840 6840 65 0001 L TNN
F 2 "neo900-legacy:P*S8" H 8840 6740 65 0001 L TNN
F 3 "" H 8850 6950 60 0001 C CNN
@@ -352,10 +352,10 @@ F 3 "" H 8850 6950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L PHS8-CLEAN M601
+L PHS8-CLEAN M501
U 10 1 578B71DA
P 7150 5950
-F 0 "M601" V 7300 6400 50 0000 R CNN
+F 0 "M501" V 7300 6400 50 0000 R CNN
F 1 "PHS8" V 7300 5500 50 0000 L CNN
F 2 "neo900-legacy:P*S8" H 7140 5740 65 0001 L TNN
F 3 "" H 7150 5950 60 0001 C CNN
@@ -363,10 +363,10 @@ F 3 "" H 7150 5950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L PHS8-CLEAN M601
+L PHS8-CLEAN M501
U 11 1 578B723E
P 8950 4750
-F 0 "M601" H 8740 5100 50 0000 L CNN
+F 0 "M501" H 8740 5100 50 0000 L CNN
F 1 "PHS8" H 8741 4370 50 0000 L BNN
F 2 "neo900-legacy:P*S8" H 8940 4540 65 0001 L TNN
F 3 "" H 8950 4750 60 0001 C CNN
@@ -374,10 +374,10 @@ F 3 "" H 8950 4750 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L TEST-POINT-1.25 TP603
+L TEST-POINT-1.25 TP545
U 1 1 578B7306
P 6050 3800
-F 0 "TP603" H 5900 3800 50 0000 R CNN
+F 0 "TP545" H 5900 3800 50 0000 R CNN
F 1 "PCB-CLK" H 6110 3775 50 0000 L BNN
F 2 "neo900-legacy:TP-1.25" H 6040 3590 65 0001 L TNN
F 3 "" H 6050 3800 60 0001 C CNN
@@ -385,10 +385,10 @@ F 3 "" H 6050 3800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 TP601
+L TEST-POINT-1.25 TP543
U 1 1 578B73CE
P 6050 3400
-F 0 "TP601" H 5900 3400 50 0000 R CNN
+F 0 "TP543" H 5900 3400 50 0000 R CNN
F 1 "PCM-OUT" H 6110 3375 50 0000 L BNN
F 2 "neo900-legacy:TP-1.25" H 6040 3190 65 0001 L TNN
F 3 "" H 6050 3400 60 0001 C CNN
@@ -396,10 +396,10 @@ F 3 "" H 6050 3400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 TP602
+L TEST-POINT-1.25 TP544
U 1 1 578B7496
P 6050 3600
-F 0 "TP602" H 5900 3600 50 0000 R CNN
+F 0 "TP544" H 5900 3600 50 0000 R CNN
F 1 "PCM-IN" H 6110 3575 50 0000 L BNN
F 2 "neo900-legacy:TP-1.25" H 6040 3390 65 0001 L TNN
F 3 "" H 6050 3600 60 0001 C CNN
@@ -407,10 +407,10 @@ F 3 "" H 6050 3600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 TP604
+L TEST-POINT-1.25 TP546
U 1 1 578B755E
P 6050 4000
-F 0 "TP604" H 5900 4000 50 0000 R CNN
+F 0 "TP546" H 5900 4000 50 0000 R CNN
F 1 "PCM-SYNC" H 6110 3975 50 0000 L BNN
F 2 "neo900-legacy:TP-1.25" H 6040 3790 65 0001 L TNN
F 3 "" H 6050 4000 60 0001 C CNN
@@ -418,10 +418,10 @@ F 3 "" H 6050 4000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 TP615
+L TEST-POINT-1.25 TP559
U 1 1 578B77B6
P 10000 5500
-F 0 "TP615" H 9850 5500 50 0000 R CNN
+F 0 "TP559" H 9850 5500 50 0000 R CNN
F 1 "RESET" H 10060 5475 50 0000 L BNN
F 2 "neo900-legacy:TP-1.25" H 10030 5650 20 0001 C CNN
F 3 "" H 10000 5500 60 0001 C CNN
@@ -429,10 +429,10 @@ F 3 "" H 10000 5500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP607
+L TEST-POINT-0.75 TP551
U 1 1 578B7AD6
P 6350 7450
-F 0 "TP607" H 6300 7450 50 0000 R CNN
+F 0 "TP551" H 6300 7450 50 0000 R CNN
F 1 "RING" H 6410 7425 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 6340 7240 65 0001 L TNN
F 3 "" H 6350 7450 60 0001 C CNN
@@ -440,10 +440,10 @@ F 3 "" H 6350 7450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP606
+L TEST-POINT-0.75 TP549
U 1 1 578B7B9E
P 6350 7050
-F 0 "TP606" H 6300 7050 50 0000 R CNN
+F 0 "TP549" H 6300 7050 50 0000 R CNN
F 1 "RTS" H 6410 7025 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 6340 6840 65 0001 L TNN
F 3 "" H 6350 7050 60 0001 C CNN
@@ -451,10 +451,10 @@ F 3 "" H 6350 7050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP609
+L TEST-POINT-0.75 TP548
U 1 1 578B7C66
P 6350 6850
-F 0 "TP609" H 6300 6850 50 0000 R CNN
+F 0 "TP548" H 6300 6850 50 0000 R CNN
F 1 "RX" H 6410 6825 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 6340 6640 65 0001 L TNN
F 3 "" H 6350 6850 60 0001 C CNN
@@ -462,10 +462,10 @@ F 3 "" H 6350 6850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 TP617
+L TEST-POINT-1.25 TP561
U 1 1 578B7D2E
P 10000 5700
-F 0 "TP617" H 9850 5700 50 0000 R CNN
+F 0 "TP561" H 9850 5700 50 0000 R CNN
F 1 "STATUS" H 10060 5675 50 0000 L BNN
F 2 "neo900-legacy:TP-1.25" H 9990 5490 65 0001 L TNN
F 3 "" H 10000 5700 60 0001 C CNN
@@ -473,10 +473,10 @@ F 3 "" H 10000 5700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L T-NPN-DUAL-UMG5N T601
+L T-NPN-DUAL-UMG5N T501
U 1 1 578B7DF6
P 10850 3850
-F 0 "T601" H 10740 4190 50 0000 L BNN
+F 0 "T501" H 10740 4190 50 0000 L BNN
F 1 "UMG5N" H 10721 3480 50 0000 L BNN
F 2 "neo900-legacy:SC88A" H 10840 3640 65 0001 L TNN
F 3 "" H 10850 3850 60 0001 C CNN
@@ -484,10 +484,10 @@ F 3 "" H 10850 3850 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L TEST-POINT-1.25 TP2
+L TEST-POINT-1.25 TP558
U 1 1 578B7EBE
P 10000 5300
-F 0 "TP2" H 9850 5300 50 0000 R CNN
+F 0 "TP558" H 9850 5300 50 0000 R CNN
F 1 "EMERG" H 10060 5275 50 0000 L BNN
F 2 "neo900-legacy:TP-1.25" H 10030 5450 20 0001 C CNN
F 3 "" H 10000 5300 60 0001 C CNN
@@ -495,10 +495,10 @@ F 3 "" H 10000 5300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP610
+L TEST-POINT-0.75 TP550
U 1 1 578B7F86
P 6350 7250
-F 0 "TP610" H 6300 7250 50 0000 R CNN
+F 0 "TP550" H 6300 7250 50 0000 R CNN
F 1 "TX" H 6410 7225 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 6340 7040 65 0001 L TNN
F 3 "" H 6350 7250 60 0001 C CNN
@@ -594,10 +594,10 @@ F 3 "" H 11150 6450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 TP618
+L TEST-POINT-1.25 TP562
U 1 1 578B894A
P 10000 5800
-F 0 "TP618" H 9850 5800 50 0000 R CNN
+F 0 "TP562" H 9850 5800 50 0000 R CNN
F 1 "WAKEUP" H 10060 5775 50 0000 L BNN
F 2 "neo900-legacy:TP-1.25" H 9990 5590 65 0001 L TNN
F 3 "" H 10000 5800 60 0001 C CNN
@@ -911,10 +911,10 @@ Wire Wire Line
Wire Wire Line
8950 9350 8950 9250
$Comp
-L OPT-MINI-RF-TAP J602
+L OPT-MINI-RF-TAP J502
U 1 1 57F2BA31
P 9150 9150
-F 0 "J602" H 9050 9300 50 0000 L CNN
+F 0 "J502" H 9050 9300 50 0000 L CNN
F 1 "CELL_IN" H 9150 9000 50 0000 C CNN
F 2 "OPT-MINI-RF-TAP" H 9180 9300 20 0001 C CNN
F 3 "" H 9150 9150 60 0001 C CNN
@@ -974,10 +974,10 @@ F 3 "" H 7150 9450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L OPT-MINI-RF-TAP J601
+L OPT-MINI-RF-TAP J501
U 1 1 57F2CBF3
P 6950 9150
-F 0 "J601" H 6850 9300 50 0000 L CNN
+F 0 "J501" H 6850 9300 50 0000 L CNN
F 1 "ANT_DRX" H 6950 9000 50 0000 C CNN
F 2 "OPT-MINI-RF-TAP" H 6980 9300 20 0001 C CNN
F 3 "" H 6950 9150 60 0001 C CNN
@@ -1023,10 +1023,10 @@ Text Notes 8650 8800 0 60 ~ 0
Text Notes 7450 8800 2 60 ~ 0
50 Ohm
$Comp
-L PHS8-CLEAN M601
+L PHS8-CLEAN M501
U 12 1 57F0EE9D
P 13100 5150
-F 0 "M601" H 12900 7000 50 0000 L CNN
+F 0 "M501" H 12900 7000 50 0000 L CNN
F 1 "PHS8" H 12891 4770 50 0001 L BNN
F 2 "neo900-legacy:P*S8" H 13090 4940 65 0001 L TNN
F 3 "" H 13100 5150 60 0001 C CNN
@@ -1034,10 +1034,10 @@ F 3 "" H 13100 5150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L PHS8-CLEAN M601
+L PHS8-CLEAN M501
U 13 1 57F0F11B
P 13800 5150
-F 0 "M601" H 13600 7000 50 0000 L CNN
+F 0 "M501" H 13600 7000 50 0000 L CNN
F 1 "PHS8" H 13591 4770 50 0001 L BNN
F 2 "neo900-legacy:P*S8" H 13790 4940 65 0001 L TNN
F 3 "" H 13800 5150 60 0001 C CNN
@@ -1254,10 +1254,10 @@ Wire Wire Line
13600 6750 13500 6750
Connection ~ 13500 6750
$Comp
-L TEST-POINT-0.75 TP619
+L TEST-POINT-0.75 TP528
U 1 1 57F43185
P 2700 2600
-F 0 "TP619" H 2700 2700 50 0000 C CNN
+F 0 "TP528" H 2700 2700 50 0000 C CNN
F 1 "VSIM_B" H 2760 2575 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 2690 2390 65 0001 L TNN
F 3 "" H 2700 2600 60 0001 C CNN
@@ -1265,10 +1265,10 @@ F 3 "" H 2700 2600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP620
+L TEST-POINT-0.75 TP529
U 1 1 57F43272
P 2700 2800
-F 0 "TP620" H 2700 2900 50 0000 C CNN
+F 0 "TP529" H 2700 2900 50 0000 C CNN
F 1 "MODEM_RST_B" H 2760 2775 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 2690 2590 65 0001 L TNN
F 3 "" H 2700 2800 60 0001 C CNN
@@ -1276,10 +1276,10 @@ F 3 "" H 2700 2800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP621
+L TEST-POINT-0.75 TP530
U 1 1 57F432F5
P 2700 3000
-F 0 "TP621" H 2700 3100 50 0000 C CNN
+F 0 "TP530" H 2700 3100 50 0000 C CNN
F 1 "MODEM_DATA_B" H 2760 2975 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 2690 2790 65 0001 L TNN
F 3 "" H 2700 3000 60 0001 C CNN
@@ -1287,10 +1287,10 @@ F 3 "" H 2700 3000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP622
+L TEST-POINT-0.75 TP531
U 1 1 57F43379
P 2700 3200
-F 0 "TP622" H 2700 3300 50 0000 C CNN
+F 0 "TP531" H 2700 3300 50 0000 C CNN
F 1 "MODEM_CLK_B" H 2760 3175 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 2690 2990 65 0001 L TNN
F 3 "" H 2700 3200 60 0001 C CNN
@@ -1298,10 +1298,10 @@ F 3 "" H 2700 3200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP623
+L TEST-POINT-0.75 TP532
U 1 1 57F43400
P 2700 3400
-F 0 "TP623" H 2700 3500 50 0000 C CNN
+F 0 "TP532" H 2700 3500 50 0000 C CNN
F 1 "MODEM_CD_B" H 2760 3375 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 2690 3190 65 0001 L TNN
F 3 "" H 2700 3400 60 0001 C CNN
@@ -1311,10 +1311,10 @@ $EndComp
Wire Wire Line
9450 5350 10650 5350
$Comp
-L TEST-POINT-1.25 TP624
+L TEST-POINT-1.25 TP557
U 1 1 57F7DDFD
P 10000 4900
-F 0 "TP624" H 9850 4900 50 0000 R CNN
+F 0 "TP557" H 9850 4900 50 0000 R CNN
F 1 "VUSB_MODEM" H 10060 4875 50 0000 L BNN
F 2 "neo900-legacy:TP-1.25" H 9990 4690 65 0001 L TNN
F 3 "" H 10000 4900 60 0001 C CNN
@@ -1331,10 +1331,10 @@ NoConn ~ 8050 4150
NoConn ~ 8250 4150
NoConn ~ 8450 4150
$Comp
-L PHS8-CLEAN M601
+L PHS8-CLEAN M501
U 14 1 58173093
P 1200 5700
-F 0 "M601" H 1000 6650 50 0000 L CNN
+F 0 "M501" H 1000 6650 50 0000 L CNN
F 1 "PHS8" H 1200 4750 50 0000 C CNN
F 2 "PHS8-CLEAN" H 1150 4800 20 0001 C CNN
F 3 "" H 1150 6350 60 0001 C CNN
@@ -1342,10 +1342,10 @@ F 3 "" H 1150 6350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L PHS8-CLEAN M601
+L PHS8-CLEAN M501
U 15 1 58173167
P 1100 9000
-F 0 "M601" H 800 9550 50 0000 L CNN
+F 0 "M501" H 800 9550 50 0000 L CNN
F 1 "PHS8" H 1100 8350 50 0000 C CNN
F 2 "PHS8-CLEAN" H 1050 8100 20 0001 C CNN
F 3 "" H 1050 9650 60 0001 C CNN
@@ -1355,10 +1355,10 @@ $EndComp
Text Notes 2800 7650 0 60 ~ 0
Pads that are DNU in PHS8 but\nhave a GPIO or ADC function\nassigned to them in PLS8.
$Comp
-L TEST-POINT-0.75 TP625
+L TEST-POINT-0.75 TP501
U 1 1 58176C5D
P 2000 4900
-F 0 "TP625" H 1950 4950 50 0000 R CNN
+F 0 "TP501" H 1950 4950 50 0000 R CNN
F 1 "MODEM_A7" H 2060 4875 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 4690 65 0001 L TNN
F 3 "" H 2000 4900 60 0001 C CNN
@@ -1366,10 +1366,10 @@ F 3 "" H 2000 4900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP632
+L TEST-POINT-0.75 TP502
U 1 1 58177829
P 2000 5000
-F 0 "TP632" H 1950 5050 50 0000 R CNN
+F 0 "TP502" H 1950 5050 50 0000 R CNN
F 1 "MODEM_F14" H 2060 4975 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 4790 65 0001 L TNN
F 3 "" H 2000 5000 60 0001 C CNN
@@ -1377,10 +1377,10 @@ F 3 "" H 2000 5000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP633
+L TEST-POINT-0.75 TP503
U 1 1 581778F0
P 2000 5100
-F 0 "TP633" H 1950 5150 50 0000 R CNN
+F 0 "TP503" H 1950 5150 50 0000 R CNN
F 1 "MODEM_F15" H 2060 5075 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 4890 65 0001 L TNN
F 3 "" H 2000 5100 60 0001 C CNN
@@ -1388,10 +1388,10 @@ F 3 "" H 2000 5100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP634
+L TEST-POINT-0.75 TP504
U 1 1 581779BA
P 2000 5200
-F 0 "TP634" H 1950 5250 50 0000 R CNN
+F 0 "TP504" H 1950 5250 50 0000 R CNN
F 1 "MODEM_G4" H 2060 5175 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 4990 65 0001 L TNN
F 3 "" H 2000 5200 60 0001 C CNN
@@ -1399,10 +1399,10 @@ F 3 "" H 2000 5200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP635
+L TEST-POINT-0.75 TP505
U 1 1 58177A87
P 2000 5300
-F 0 "TP635" H 1950 5350 50 0000 R CNN
+F 0 "TP505" H 1950 5350 50 0000 R CNN
F 1 "MODEM_H13" H 2060 5275 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 5090 65 0001 L TNN
F 3 "" H 2000 5300 60 0001 C CNN
@@ -1410,10 +1410,10 @@ F 3 "" H 2000 5300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP636
+L TEST-POINT-0.75 TP506
U 1 1 58177B57
P 2000 5400
-F 0 "TP636" H 1950 5450 50 0000 R CNN
+F 0 "TP506" H 1950 5450 50 0000 R CNN
F 1 "MODEM_K12" H 2060 5375 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 5190 65 0001 L TNN
F 3 "" H 2000 5400 60 0001 C CNN
@@ -1421,10 +1421,10 @@ F 3 "" H 2000 5400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP637
+L TEST-POINT-0.75 TP507
U 1 1 58177C2A
P 2000 5500
-F 0 "TP637" H 1950 5550 50 0000 R CNN
+F 0 "TP507" H 1950 5550 50 0000 R CNN
F 1 "MODEM_K13" H 2060 5475 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 5290 65 0001 L TNN
F 3 "" H 2000 5500 60 0001 C CNN
@@ -1432,10 +1432,10 @@ F 3 "" H 2000 5500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP638
+L TEST-POINT-0.75 TP508
U 1 1 58177D04
P 2000 5600
-F 0 "TP638" H 1950 5650 50 0000 R CNN
+F 0 "TP508" H 1950 5650 50 0000 R CNN
F 1 "MODEM_L5" H 2060 5575 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 5390 65 0001 L TNN
F 3 "" H 2000 5600 60 0001 C CNN
@@ -1443,10 +1443,10 @@ F 3 "" H 2000 5600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP639
+L TEST-POINT-0.75 TP509
U 1 1 58177DDD
P 2000 5700
-F 0 "TP639" H 1950 5750 50 0000 R CNN
+F 0 "TP509" H 1950 5750 50 0000 R CNN
F 1 "MODEM_L6" H 2060 5675 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 5490 65 0001 L TNN
F 3 "" H 2000 5700 60 0001 C CNN
@@ -1454,10 +1454,10 @@ F 3 "" H 2000 5700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP640
+L TEST-POINT-0.75 TP510
U 1 1 58177F41
P 2000 5800
-F 0 "TP640" H 1950 5850 50 0000 R CNN
+F 0 "TP510" H 1950 5850 50 0000 R CNN
F 1 "MODEM_L7" H 2060 5775 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 5590 65 0001 L TNN
F 3 "" H 2000 5800 60 0001 C CNN
@@ -1465,10 +1465,10 @@ F 3 "" H 2000 5800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP641
+L TEST-POINT-0.75 TP511
U 1 1 58178020
P 2000 5900
-F 0 "TP641" H 1950 5950 50 0000 R CNN
+F 0 "TP511" H 1950 5950 50 0000 R CNN
F 1 "MODEM_L8" H 2060 5875 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 5690 65 0001 L TNN
F 3 "" H 2000 5900 60 0001 C CNN
@@ -1476,10 +1476,10 @@ F 3 "" H 2000 5900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP642
+L TEST-POINT-0.75 TP512
U 1 1 58178102
P 2000 6000
-F 0 "TP642" H 1950 6050 50 0000 R CNN
+F 0 "TP512" H 1950 6050 50 0000 R CNN
F 1 "MODEM_L9" H 2060 5975 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 5790 65 0001 L TNN
F 3 "" H 2000 6000 60 0001 C CNN
@@ -1487,10 +1487,10 @@ F 3 "" H 2000 6000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP643
+L TEST-POINT-0.75 TP513
U 1 1 581784BB
P 2000 6100
-F 0 "TP643" H 1950 6150 50 0000 R CNN
+F 0 "TP513" H 1950 6150 50 0000 R CNN
F 1 "MODEM_L10" H 2060 6075 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 5890 65 0001 L TNN
F 3 "" H 2000 6100 60 0001 C CNN
@@ -1498,10 +1498,10 @@ F 3 "" H 2000 6100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP644
+L TEST-POINT-0.75 TP514
U 1 1 581785A3
P 2000 6200
-F 0 "TP644" H 1950 6250 50 0000 R CNN
+F 0 "TP514" H 1950 6250 50 0000 R CNN
F 1 "MODEM_L11" H 2060 6175 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 5990 65 0001 L TNN
F 3 "" H 2000 6200 60 0001 C CNN
@@ -1509,10 +1509,10 @@ F 3 "" H 2000 6200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP645
+L TEST-POINT-0.75 TP515
U 1 1 5817868E
P 2000 6300
-F 0 "TP645" H 1950 6350 50 0000 R CNN
+F 0 "TP515" H 1950 6350 50 0000 R CNN
F 1 "MODEM_L12" H 2060 6275 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 6090 65 0001 L TNN
F 3 "" H 2000 6300 60 0001 C CNN
@@ -1520,10 +1520,10 @@ F 3 "" H 2000 6300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP646
+L TEST-POINT-0.75 TP516
U 1 1 5817877C
P 2000 6400
-F 0 "TP646" H 1950 6450 50 0000 R CNN
+F 0 "TP516" H 1950 6450 50 0000 R CNN
F 1 "MODEM_L13" H 2060 6375 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 6190 65 0001 L TNN
F 3 "" H 2000 6400 60 0001 C CNN
@@ -1531,10 +1531,10 @@ F 3 "" H 2000 6400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP648
+L TEST-POINT-0.75 TP517
U 1 1 58178961
P 2000 6500
-F 0 "TP648" H 1950 6550 50 0000 R CNN
+F 0 "TP517" H 1950 6550 50 0000 R CNN
F 1 "MODEM_N12" H 2060 6475 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 6290 65 0001 L TNN
F 3 "" H 2000 6500 60 0001 C CNN
@@ -1574,10 +1574,10 @@ Wire Wire Line
Wire Wire Line
2000 6500 1600 6500
$Comp
-L TEST-POINT-0.75 TP649
+L TEST-POINT-0.75 TP533
U 1 1 5817DBBD
P 3950 8600
-F 0 "TP649" H 3900 8650 50 0000 R CNN
+F 0 "TP533" H 3900 8650 50 0000 R CNN
F 1 "MODEM_C12" H 4010 8575 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 3940 8390 65 0001 L TNN
F 3 "" H 3950 8600 60 0001 C CNN
@@ -1585,10 +1585,10 @@ F 3 "" H 3950 8600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP650
+L TEST-POINT-0.75 TP534
U 1 1 5817DCC9
P 3950 8700
-F 0 "TP650" H 3900 8750 50 0000 R CNN
+F 0 "TP534" H 3900 8750 50 0000 R CNN
F 1 "MODEM_C13" H 4010 8675 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 3940 8490 65 0001 L TNN
F 3 "" H 3950 8700 60 0001 C CNN
@@ -1596,10 +1596,10 @@ F 3 "" H 3950 8700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP651
+L TEST-POINT-0.75 TP535
U 1 1 5817DDC6
P 3950 8800
-F 0 "TP651" H 3900 8850 50 0000 R CNN
+F 0 "TP535" H 3900 8850 50 0000 R CNN
F 1 "MODEM_D12" H 4010 8775 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 3940 8590 65 0001 L TNN
F 3 "" H 3950 8800 60 0001 C CNN
@@ -1607,10 +1607,10 @@ F 3 "" H 3950 8800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP652
+L TEST-POINT-0.75 TP536
U 1 1 5817DEC6
P 3950 8900
-F 0 "TP652" H 3900 8950 50 0000 R CNN
+F 0 "TP536" H 3900 8950 50 0000 R CNN
F 1 "MODEM_D13" H 4010 8875 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 3940 8690 65 0001 L TNN
F 3 "" H 3950 8900 60 0001 C CNN
@@ -1618,10 +1618,10 @@ F 3 "" H 3950 8900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP653
+L TEST-POINT-0.75 TP537
U 1 1 5817DFC9
P 3950 9000
-F 0 "TP653" H 3900 9050 50 0000 R CNN
+F 0 "TP537" H 3900 9050 50 0000 R CNN
F 1 "MODEM_D14" H 4010 8975 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 3940 8790 65 0001 L TNN
F 3 "" H 3950 9000 60 0001 C CNN
@@ -1629,10 +1629,10 @@ F 3 "" H 3950 9000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP654
+L TEST-POINT-0.75 TP538
U 1 1 5817E0CF
P 3950 9100
-F 0 "TP654" H 3900 9150 50 0000 R CNN
+F 0 "TP538" H 3900 9150 50 0000 R CNN
F 1 "MODEM_E12" H 4010 9075 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 3940 8890 65 0001 L TNN
F 3 "" H 3950 9100 60 0001 C CNN
@@ -1640,10 +1640,10 @@ F 3 "" H 3950 9100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP655
+L TEST-POINT-0.75 TP539
U 1 1 5817E1D8
P 3950 9200
-F 0 "TP655" H 3900 9250 50 0000 R CNN
+F 0 "TP539" H 3900 9250 50 0000 R CNN
F 1 "MODEM_E13" H 4010 9175 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 3940 8990 65 0001 L TNN
F 3 "" H 3950 9200 60 0001 C CNN
@@ -1651,10 +1651,10 @@ F 3 "" H 3950 9200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP656
+L TEST-POINT-0.75 TP540
U 1 1 5817E338
P 3950 9300
-F 0 "TP656" H 3900 9350 50 0000 R CNN
+F 0 "TP540" H 3900 9350 50 0000 R CNN
F 1 "MODEM_E14" H 4010 9275 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 3940 9090 65 0001 L TNN
F 3 "" H 3950 9300 60 0001 C CNN
@@ -1662,10 +1662,10 @@ F 3 "" H 3950 9300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP657
+L TEST-POINT-0.75 TP541
U 1 1 5817E447
P 3950 9400
-F 0 "TP657" H 3900 9450 50 0000 R CNN
+F 0 "TP541" H 3900 9450 50 0000 R CNN
F 1 "MODEM_F13" H 4010 9375 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 3940 9190 65 0001 L TNN
F 3 "" H 3950 9400 60 0001 C CNN
@@ -1673,10 +1673,10 @@ F 3 "" H 3950 9400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP658
+L TEST-POINT-0.75 TP542
U 1 1 5817E559
P 3950 9500
-F 0 "TP658" H 3900 9550 50 0000 R CNN
+F 0 "TP542" H 3900 9550 50 0000 R CNN
F 1 "MODEM_G13" H 4010 9475 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 3940 9290 65 0001 L TNN
F 3 "" H 3950 9500 60 0001 C CNN
@@ -1708,8 +1708,8 @@ L R0402 R?
U 1 1 58180F1E
P 1650 9800
AR Path="/578AFF1C/58180F1E" Ref="R?" Part="1"
-AR Path="/578AFEFA/58180F1E" Ref="R601" Part="1"
-F 0 "R601" H 1650 9700 50 0000 C CNN
+AR Path="/578AFEFA/58180F1E" Ref="R501" Part="1"
+F 0 "R501" H 1650 9700 50 0000 C CNN
F 1 "0" V 1650 9800 50 0000 C CNN
F 2 "SMD-0402" H 1680 9950 20 0001 C CNN
F 3 "" H 1650 9800 60 0001 C CNN
@@ -1721,8 +1721,8 @@ L R0402 R?
U 1 1 58173ADF
P 1850 9800
AR Path="/578AFF1C/58173ADF" Ref="R?" Part="1"
-AR Path="/578AFEFA/58173ADF" Ref="R602" Part="1"
-F 0 "R602" H 1850 9700 50 0000 C CNN
+AR Path="/578AFEFA/58173ADF" Ref="R502" Part="1"
+F 0 "R502" H 1850 9700 50 0000 C CNN
F 1 "0" V 1850 9800 50 0000 C CNN
F 2 "SMD-0402" H 1880 9950 20 0001 C CNN
F 3 "" H 1850 9800 60 0001 C CNN
@@ -1734,8 +1734,8 @@ L R0402 R?
U 1 1 58173BFE
P 2050 9800
AR Path="/578AFF1C/58173BFE" Ref="R?" Part="1"
-AR Path="/578AFEFA/58173BFE" Ref="R603" Part="1"
-F 0 "R603" H 2050 9700 50 0000 C CNN
+AR Path="/578AFEFA/58173BFE" Ref="R503" Part="1"
+F 0 "R503" H 2050 9700 50 0000 C CNN
F 1 "0" V 2050 9800 50 0000 C CNN
F 2 "SMD-0402" H 2080 9950 20 0001 C CNN
F 3 "" H 2050 9800 60 0001 C CNN
@@ -1747,8 +1747,8 @@ L R0402 R?
U 1 1 58173D20
P 2250 9800
AR Path="/578AFF1C/58173D20" Ref="R?" Part="1"
-AR Path="/578AFEFA/58173D20" Ref="R604" Part="1"
-F 0 "R604" H 2250 9700 50 0000 C CNN
+AR Path="/578AFEFA/58173D20" Ref="R504" Part="1"
+F 0 "R504" H 2250 9700 50 0000 C CNN
F 1 "0" V 2250 9800 50 0000 C CNN
F 2 "SMD-0402" H 2280 9950 20 0001 C CNN
F 3 "" H 2250 9800 60 0001 C CNN
@@ -1760,8 +1760,8 @@ L R0402 R?
U 1 1 58173E49
P 2450 9800
AR Path="/578AFF1C/58173E49" Ref="R?" Part="1"
-AR Path="/578AFEFA/58173E49" Ref="R605" Part="1"
-F 0 "R605" H 2450 9700 50 0000 C CNN
+AR Path="/578AFEFA/58173E49" Ref="R505" Part="1"
+F 0 "R505" H 2450 9700 50 0000 C CNN
F 1 "0" V 2450 9800 50 0000 C CNN
F 2 "SMD-0402" H 2480 9950 20 0001 C CNN
F 3 "" H 2450 9800 60 0001 C CNN
@@ -1773,8 +1773,8 @@ L R0402 R?
U 1 1 58173F71
P 2650 9800
AR Path="/578AFF1C/58173F71" Ref="R?" Part="1"
-AR Path="/578AFEFA/58173F71" Ref="R606" Part="1"
-F 0 "R606" H 2650 9700 50 0000 C CNN
+AR Path="/578AFEFA/58173F71" Ref="R506" Part="1"
+F 0 "R506" H 2650 9700 50 0000 C CNN
F 1 "0" V 2650 9800 50 0000 C CNN
F 2 "SMD-0402" H 2680 9950 20 0001 C CNN
F 3 "" H 2650 9800 60 0001 C CNN
@@ -1786,8 +1786,8 @@ L R0402 R?
U 1 1 581740A0
P 2850 9800
AR Path="/578AFF1C/581740A0" Ref="R?" Part="1"
-AR Path="/578AFEFA/581740A0" Ref="R607" Part="1"
-F 0 "R607" H 2850 9700 50 0000 C CNN
+AR Path="/578AFEFA/581740A0" Ref="R507" Part="1"
+F 0 "R507" H 2850 9700 50 0000 C CNN
F 1 "0" V 2850 9800 50 0000 C CNN
F 2 "SMD-0402" H 2880 9950 20 0001 C CNN
F 3 "" H 2850 9800 60 0001 C CNN
@@ -1799,8 +1799,8 @@ L R0402 R?
U 1 1 581741CE
P 3050 9800
AR Path="/578AFF1C/581741CE" Ref="R?" Part="1"
-AR Path="/578AFEFA/581741CE" Ref="R608" Part="1"
-F 0 "R608" H 3050 9700 50 0000 C CNN
+AR Path="/578AFEFA/581741CE" Ref="R508" Part="1"
+F 0 "R508" H 3050 9700 50 0000 C CNN
F 1 "0" V 3050 9800 50 0000 C CNN
F 2 "SMD-0402" H 3080 9950 20 0001 C CNN
F 3 "" H 3050 9800 60 0001 C CNN
@@ -1812,8 +1812,8 @@ L R0402 R?
U 1 1 581742FF
P 3250 9800
AR Path="/578AFF1C/581742FF" Ref="R?" Part="1"
-AR Path="/578AFEFA/581742FF" Ref="R609" Part="1"
-F 0 "R609" H 3250 9700 50 0000 C CNN
+AR Path="/578AFEFA/581742FF" Ref="R509" Part="1"
+F 0 "R509" H 3250 9700 50 0000 C CNN
F 1 "0" V 3250 9800 50 0000 C CNN
F 2 "SMD-0402" H 3280 9950 20 0001 C CNN
F 3 "" H 3250 9800 60 0001 C CNN
@@ -1825,8 +1825,8 @@ L R0402 R?
U 1 1 58174493
P 3450 9800
AR Path="/578AFF1C/58174493" Ref="R?" Part="1"
-AR Path="/578AFEFA/58174493" Ref="R610" Part="1"
-F 0 "R610" H 3450 9700 50 0000 C CNN
+AR Path="/578AFEFA/58174493" Ref="R510" Part="1"
+F 0 "R510" H 3450 9700 50 0000 C CNN
F 1 "0" V 3450 9800 50 0000 C CNN
F 2 "SMD-0402" H 3480 9950 20 0001 C CNN
F 3 "" H 3450 9800 60 0001 C CNN
@@ -1906,10 +1906,10 @@ Wire Wire Line
3250 10000 3250 10100
Connection ~ 3250 10100
$Comp
-L TEST-POINT-0.75 TP659
+L TEST-POINT-0.75 TP518
U 1 1 581786A1
P 2000 7100
-F 0 "TP659" H 1950 7150 50 0000 R CNN
+F 0 "TP518" H 1950 7150 50 0000 R CNN
F 1 "MODEM_F16" H 2060 7075 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 6890 65 0001 L TNN
F 3 "" H 2000 7100 60 0001 C CNN
@@ -1917,10 +1917,10 @@ F 3 "" H 2000 7100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L PHS8-CLEAN M601
+L PHS8-CLEAN M501
U 16 1 5817321E
P 1100 7500
-F 0 "M601" H 800 8050 50 0000 L CNN
+F 0 "M501" H 800 8050 50 0000 L CNN
F 1 "PHS8" H 1100 6850 50 0000 C CNN
F 2 "PHS8-CLEAN" H 1050 6600 20 0001 C CNN
F 3 "" H 1050 8150 60 0001 C CNN
@@ -1928,10 +1928,10 @@ F 3 "" H 1050 8150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP660
+L TEST-POINT-0.75 TP519
U 1 1 58178D4D
P 2000 7200
-F 0 "TP660" H 1950 7250 50 0000 R CNN
+F 0 "TP519" H 1950 7250 50 0000 R CNN
F 1 "MODEM_G14" H 2060 7175 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 6990 65 0001 L TNN
F 3 "" H 2000 7200 60 0001 C CNN
@@ -1939,10 +1939,10 @@ F 3 "" H 2000 7200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP661
+L TEST-POINT-0.75 TP520
U 1 1 58178E88
P 2000 7300
-F 0 "TP661" H 1950 7350 50 0000 R CNN
+F 0 "TP520" H 1950 7350 50 0000 R CNN
F 1 "MODEM_G15" H 2060 7275 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 7090 65 0001 L TNN
F 3 "" H 2000 7300 60 0001 C CNN
@@ -1950,10 +1950,10 @@ F 3 "" H 2000 7300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP662
+L TEST-POINT-0.75 TP521
U 1 1 58178FC4
P 2000 7400
-F 0 "TP662" H 1950 7450 50 0000 R CNN
+F 0 "TP521" H 1950 7450 50 0000 R CNN
F 1 "MODEM_G16" H 2060 7375 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 7190 65 0001 L TNN
F 3 "" H 2000 7400 60 0001 C CNN
@@ -1961,10 +1961,10 @@ F 3 "" H 2000 7400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP664
+L TEST-POINT-0.75 TP522
U 1 1 58179245
P 2000 7500
-F 0 "TP664" H 1950 7550 50 0000 R CNN
+F 0 "TP522" H 1950 7550 50 0000 R CNN
F 1 "MODEM_H15" H 2060 7475 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 7290 65 0001 L TNN
F 3 "" H 2000 7500 60 0001 C CNN
@@ -1972,10 +1972,10 @@ F 3 "" H 2000 7500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP666
+L TEST-POINT-0.75 TP523
U 1 1 581794D2
P 2000 7600
-F 0 "TP666" H 1950 7650 50 0000 R CNN
+F 0 "TP523" H 1950 7650 50 0000 R CNN
F 1 "MODEM_J14" H 2060 7575 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 7390 65 0001 L TNN
F 3 "" H 2000 7600 60 0001 C CNN
@@ -1983,10 +1983,10 @@ F 3 "" H 2000 7600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP667
+L TEST-POINT-0.75 TP524
U 1 1 5817961D
P 2000 7700
-F 0 "TP667" H 1950 7750 50 0000 R CNN
+F 0 "TP524" H 1950 7750 50 0000 R CNN
F 1 "MODEM_J15" H 2060 7675 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 7490 65 0001 L TNN
F 3 "" H 2000 7700 60 0001 C CNN
@@ -1994,10 +1994,10 @@ F 3 "" H 2000 7700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP668
+L TEST-POINT-0.75 TP525
U 1 1 5817976F
P 2000 7800
-F 0 "TP668" H 1950 7850 50 0000 R CNN
+F 0 "TP525" H 1950 7850 50 0000 R CNN
F 1 "MODEM_J16" H 2060 7775 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 7590 65 0001 L TNN
F 3 "" H 2000 7800 60 0001 C CNN
@@ -2005,10 +2005,10 @@ F 3 "" H 2000 7800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP669
+L TEST-POINT-0.75 TP526
U 1 1 581798C0
P 2000 7900
-F 0 "TP669" H 1950 7950 50 0000 R CNN
+F 0 "TP526" H 1950 7950 50 0000 R CNN
F 1 "MODEM_M12" H 2060 7875 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 7690 65 0001 L TNN
F 3 "" H 2000 7900 60 0001 C CNN
@@ -2016,10 +2016,10 @@ F 3 "" H 2000 7900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP670
+L TEST-POINT-0.75 TP527
U 1 1 58179A16
P 2000 8000
-F 0 "TP670" H 1950 8050 50 0000 R CNN
+F 0 "TP527" H 1950 8050 50 0000 R CNN
F 1 "MODEM_M13" H 2060 7975 50 0000 L BNN
F 2 "neo900-legacy:TP-0.75" H 1990 7790 65 0001 L TNN
F 3 "" H 2000 8000 60 0001 C CNN
@@ -2079,8 +2079,8 @@ L R0402 R?
U 1 1 5818A983
P 14000 9750
AR Path="/578AFF1C/5818A983" Ref="R?" Part="1"
-AR Path="/578AFEFA/5818A983" Ref="R612" Part="1"
-F 0 "R612" V 13950 9850 50 0000 L CNN
+AR Path="/578AFEFA/5818A983" Ref="R512" Part="1"
+F 0 "R512" V 13950 9850 50 0000 L CNN
F 1 "100k" V 14050 9850 50 0000 L CNN
F 2 "SMD-0402" H 14030 9900 20 0001 C CNN
F 3 "" H 14000 9750 60 0001 C CNN
@@ -2092,8 +2092,8 @@ L R0402 R?
U 1 1 5818C472
P 14000 9250
AR Path="/578AFF1C/5818C472" Ref="R?" Part="1"
-AR Path="/578AFEFA/5818C472" Ref="R611" Part="1"
-F 0 "R611" V 13950 9350 50 0000 L CNN
+AR Path="/578AFEFA/5818C472" Ref="R511" Part="1"
+F 0 "R511" V 13950 9350 50 0000 L CNN
F 1 "100k" V 14050 9350 50 0000 L CNN
F 2 "SMD-0402" H 14030 9400 20 0001 C CNN
F 3 "" H 14000 9250 60 0001 C CNN
diff --git a/hw/modempwr.sch b/hw/modempwr.sch
index a052140..65d4122 100644
--- a/hw/modempwr.sch
+++ b/hw/modempwr.sch
@@ -61,10 +61,10 @@ Addr: 0x4E
Text Notes 11500 4780 0 70 ~ 0
Addr: 0x4D
$Comp
-L C0603 C401
+L C0603 C404
U 1 1 578B1762
P 4050 4350
-F 0 "C401" H 4090 4390 50 0000 L CNN
+F 0 "C404" H 4090 4390 50 0000 L CNN
F 1 "100n" H 4100 4200 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 4080 4500 20 0001 C CNN
F 3 "" H 4050 4350 60 0001 C CNN
@@ -72,10 +72,10 @@ F 3 "" H 4050 4350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0603 C402
+L C0603 C405
U 1 1 578B182A
P 4450 4350
-F 0 "C402" H 4490 4390 50 0000 L CNN
+F 0 "C405" H 4490 4390 50 0000 L CNN
F 1 "100n" H 4500 4200 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 4480 4500 20 0001 C CNN
F 3 "" H 4450 4350 60 0001 C CNN
@@ -83,10 +83,10 @@ F 3 "" H 4450 4350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0603 C403
+L C0603 C406
U 1 1 578B18F2
P 7050 4350
-F 0 "C403" H 7090 4390 50 0000 L CNN
+F 0 "C406" H 7090 4390 50 0000 L CNN
F 1 "100n" H 7100 4200 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 7080 4500 20 0001 C CNN
F 3 "" H 7050 4350 60 0001 C CNN
@@ -94,10 +94,10 @@ F 3 "" H 7050 4350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0603 C404
+L C0603 C407
U 1 1 578B19BA
P 7450 4350
-F 0 "C404" H 7490 4390 50 0000 L CNN
+F 0 "C407" H 7490 4390 50 0000 L CNN
F 1 "100n" H 7500 4200 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 7480 4500 20 0001 C CNN
F 3 "" H 7450 4350 60 0001 C CNN
@@ -105,10 +105,10 @@ F 3 "" H 7450 4350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0603 C405
+L C0603 C409
U 1 1 578B1A82
P 10150 4250
-F 0 "C405" H 10190 4290 50 0000 L CNN
+F 0 "C409" H 10190 4290 50 0000 L CNN
F 1 "100n" H 10200 4100 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 10180 4400 20 0001 C CNN
F 3 "" H 10150 4250 60 0001 C CNN
@@ -116,10 +116,10 @@ F 3 "" H 10150 4250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0603 C406
+L C0603 C410
U 1 1 578B1B4A
P 10550 4250
-F 0 "C406" H 10590 4290 50 0000 L CNN
+F 0 "C410" H 10590 4290 50 0000 L CNN
F 1 "100n" H 10600 4100 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 10580 4400 20 0001 C CNN
F 3 "" H 10550 4250 60 0001 C CNN
@@ -127,10 +127,10 @@ F 3 "" H 10550 4250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R401
+L R0402 R402
U 1 1 578B1CDA
P 2550 1700
-F 0 "R401" H 2420 1760 50 0000 L BNN
+F 0 "R402" H 2420 1760 50 0000 L BNN
F 1 "(0)" H 2550 1700 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 2580 1850 20 0001 C CNN
F 3 "" H 2550 1700 60 0001 C CNN
@@ -138,10 +138,10 @@ F 3 "" H 2550 1700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R402
+L R0402 R405
U 1 1 578B1DA2
P 4250 2350
-F 0 "R402" H 4120 2410 50 0000 L BNN
+F 0 "R405" H 4120 2410 50 0000 L BNN
F 1 "20mR" H 4250 2350 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 4280 2500 20 0001 C CNN
F 3 "" H 4250 2350 60 0001 C CNN
@@ -149,10 +149,10 @@ F 3 "" H 4250 2350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R403
+L R0402 R410
U 1 1 578B1E6A
P 7250 2350
-F 0 "R403" H 7120 2410 50 0000 L BNN
+F 0 "R410" H 7120 2410 50 0000 L BNN
F 1 "20mR" H 7250 2350 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 7280 2500 20 0001 C CNN
F 3 "" H 7250 2350 60 0001 C CNN
@@ -160,10 +160,10 @@ F 3 "" H 7250 2350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R404
+L R0402 R419
U 1 1 578B1F32
P 10350 2350
-F 0 "R404" H 10220 2410 50 0000 L BNN
+F 0 "R419" H 10220 2410 50 0000 L BNN
F 1 "20mR" H 10350 2350 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 10380 2500 20 0001 C CNN
F 3 "" H 10350 2350 60 0001 C CNN
@@ -171,10 +171,10 @@ F 3 "" H 10350 2350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R405
+L R0402 R404
U 1 1 578B1FFA
P 4050 2950
-F 0 "R405" H 3920 3010 50 0000 L BNN
+F 0 "R404" H 3920 3010 50 0000 L BNN
F 1 "10k" H 4050 2950 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 4080 3100 20 0001 C CNN
F 3 "" H 4050 2950 60 0001 C CNN
@@ -193,10 +193,10 @@ F 3 "" H 4450 2950 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R407
+L R0402 R409
U 1 1 578B218A
P 7050 2950
-F 0 "R407" H 6920 3010 50 0000 L BNN
+F 0 "R409" H 6920 3010 50 0000 L BNN
F 1 "10k" H 7050 2950 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 7080 3100 20 0001 C CNN
F 3 "" H 7050 2950 60 0001 C CNN
@@ -204,10 +204,10 @@ F 3 "" H 7050 2950 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R408
+L R0402 R411
U 1 1 578B2252
P 7450 2950
-F 0 "R408" H 7320 3010 50 0000 L BNN
+F 0 "R411" H 7320 3010 50 0000 L BNN
F 1 "10k" H 7450 2950 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 7480 3100 20 0001 C CNN
F 3 "" H 7450 2950 60 0001 C CNN
@@ -215,10 +215,10 @@ F 3 "" H 7450 2950 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R409
+L R0402 R418
U 1 1 578B231A
P 10150 2950
-F 0 "R409" H 10020 3010 50 0000 L BNN
+F 0 "R418" H 10020 3010 50 0000 L BNN
F 1 "10k" H 10150 2950 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 10180 3100 20 0001 C CNN
F 3 "" H 10150 2950 60 0001 C CNN
@@ -226,10 +226,10 @@ F 3 "" H 10150 2950 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R410
+L R0402 R420
U 1 1 578B23E2
P 10550 2950
-F 0 "R410" H 10420 3010 50 0000 L BNN
+F 0 "R420" H 10420 3010 50 0000 L BNN
F 1 "10k" H 10550 2950 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 10580 3100 20 0001 C CNN
F 3 "" H 10550 2950 60 0001 C CNN
@@ -325,10 +325,10 @@ F 3 "" H 2550 2200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L INA231YFF U402
+L INA231YFF U403
U 1 1 578B282E
P 5550 4050
-F 0 "U402" H 5101 4700 50 0000 L BNN
+F 0 "U403" H 5101 4700 50 0000 L BNN
F 1 "INA231YFF" H 5100 3360 50 0000 L BNN
F 2 "neo900-legacy:R-XBGA-N12-0.4" H 5540 3840 65 0001 L TNN
F 3 "" H 5550 4050 60 0001 C CNN
@@ -336,10 +336,10 @@ F 3 "" H 5550 4050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L INA231YFF U403
+L INA231YFF U404
U 1 1 578B28F6
P 8650 4050
-F 0 "U403" H 8201 4700 50 0000 L BNN
+F 0 "U404" H 8201 4700 50 0000 L BNN
F 1 "INA231YFF" H 8200 3360 50 0000 L BNN
F 2 "neo900-legacy:R-XBGA-N12-0.4" H 8640 3840 65 0001 L TNN
F 3 "" H 8650 4050 60 0001 C CNN
@@ -347,10 +347,10 @@ F 3 "" H 8650 4050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L INA231YFF U404
+L INA231YFF U406
U 1 1 578B29BE
P 11650 4050
-F 0 "U404" H 11201 4700 50 0000 L BNN
+F 0 "U406" H 11201 4700 50 0000 L BNN
F 1 "INA231YFF" H 11200 3360 50 0000 L BNN
F 2 "neo900-legacy:R-XBGA-N12-0.4" H 11640 3840 65 0001 L TNN
F 3 "" H 11650 4050 60 0001 C CNN
@@ -617,10 +617,10 @@ F 3 "" H 12900 8900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L SLG46531 U405
+L SLG46531 U402
U 1 1 57E26D3F
P 4400 8500
-F 0 "U405" H 3900 9050 60 0000 L CNN
+F 0 "U402" H 3900 9050 60 0000 L CNN
F 1 "SLG46531" H 4600 7900 60 0000 L CNN
F 2 "" H 4400 8500 60 0001 C CNN
F 3 "" H 4400 8500 60 0001 C CNN
@@ -704,10 +704,10 @@ NoConn ~ 12400 9100
Text GLabel 11750 7400 0 60 Input ~ 0
1V8
$Comp
-L C0603 C409
+L C0603 C411
U 1 1 57E27EA8
P 11950 7600
-F 0 "C409" H 11990 7640 50 0000 L CNN
+F 0 "C411" H 11990 7640 50 0000 L CNN
F 1 "100n" H 12000 7450 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 11980 7750 20 0001 C CNN
F 3 "" H 11950 7600 60 0001 C CNN
@@ -733,10 +733,10 @@ Wire Wire Line
11750 7400 12400 7400
Connection ~ 11950 7400
$Comp
-L C0603 C410
+L C0603 C412
U 1 1 57E2897C
P 11950 8900
-F 0 "C410" H 11990 8940 50 0000 L CNN
+F 0 "C412" H 11990 8940 50 0000 L CNN
F 1 "100n" H 12000 8750 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 11980 9050 20 0001 C CNN
F 3 "" H 11950 8900 60 0001 C CNN
@@ -772,10 +772,10 @@ VSIM_1
Text GLabel 14350 8800 2 60 Output ~ 0
VSIM_2
$Comp
-L C0603 C412
+L C0603 C414
U 1 1 57E29081
P 13600 9000
-F 0 "C412" H 13640 9040 50 0000 L CNN
+F 0 "C414" H 13640 9040 50 0000 L CNN
F 1 "1u" H 13650 8850 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 13630 9150 20 0001 C CNN
F 3 "" H 13600 9000 60 0001 C CNN
@@ -783,10 +783,10 @@ F 3 "" H 13600 9000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0603 C414
+L C0603 C416
U 1 1 57E2910B
P 13900 9000
-F 0 "C414" H 13940 9040 50 0000 L CNN
+F 0 "C416" H 13940 9040 50 0000 L CNN
F 1 "1u" H 13950 8850 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 13930 9150 20 0001 C CNN
F 3 "" H 13900 9000 60 0001 C CNN
@@ -794,10 +794,10 @@ F 3 "" H 13900 9000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0603 C411
+L C0603 C413
U 1 1 57E2929D
P 13600 7700
-F 0 "C411" H 13640 7740 50 0000 L CNN
+F 0 "C413" H 13640 7740 50 0000 L CNN
F 1 "1u" H 13650 7550 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 13630 7850 20 0001 C CNN
F 3 "" H 13600 7700 60 0001 C CNN
@@ -805,10 +805,10 @@ F 3 "" H 13600 7700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0603 C413
+L C0603 C415
U 1 1 57E29341
P 13900 7700
-F 0 "C413" H 13940 7740 50 0000 L CNN
+F 0 "C415" H 13940 7740 50 0000 L CNN
F 1 "1u" H 13950 7550 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 13930 7850 20 0001 C CNN
F 3 "" H 13900 7700 60 0001 C CNN
@@ -842,10 +842,10 @@ Wire Wire Line
13900 7600 13900 7500
Connection ~ 13900 7500
$Comp
-L ADA4505-1ACBZ U406
+L ADA4505-1ACBZ U405
U 1 1 57E276C6
P 9200 7850
-F 0 "U406" H 8950 8100 60 0000 C CNN
+F 0 "U405" H 8950 8100 60 0000 C CNN
F 1 "ADA4505-1ACBZ" H 8650 7200 60 0000 L CNN
F 2 "" H 9200 7850 60 0001 C CNN
F 3 "" H 9200 7850 60 0001 C CNN
@@ -853,10 +853,10 @@ F 3 "" H 9200 7850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R416
+L R0402 R413
U 1 1 57E27215
P 7750 8200
-F 0 "R416" H 7620 8260 50 0000 L BNN
+F 0 "R413" H 7620 8260 50 0000 L BNN
F 1 "100k" H 7750 8200 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 7780 8350 20 0001 C CNN
F 3 "" H 7750 8200 60 0001 C CNN
@@ -864,10 +864,10 @@ F 3 "" H 7750 8200 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R419
+L R0402 R416
U 1 1 57E27482
P 8350 8200
-F 0 "R419" H 8220 8260 50 0000 L BNN
+F 0 "R416" H 8220 8260 50 0000 L BNN
F 1 "105k" H 8350 8200 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 8380 8350 20 0001 C CNN
F 3 "" H 8350 8200 60 0001 C CNN
@@ -875,10 +875,10 @@ F 3 "" H 8350 8200 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R418
+L R0402 R415
U 1 1 57E275C8
P 8350 7500
-F 0 "R418" H 8220 7560 50 0000 L BNN
+F 0 "R415" H 8220 7560 50 0000 L BNN
F 1 "180k" H 8350 7500 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 8380 7650 20 0001 C CNN
F 3 "" H 8350 7500 60 0001 C CNN
@@ -886,10 +886,10 @@ F 3 "" H 8350 7500 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R415
+L R0402 R412
U 1 1 57E27667
P 7750 7500
-F 0 "R415" H 7620 7560 50 0000 L BNN
+F 0 "R412" H 7620 7560 50 0000 L BNN
F 1 "180k" H 7750 7500 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 7780 7650 20 0001 C CNN
F 3 "" H 7750 7500 60 0001 C CNN
@@ -919,10 +919,10 @@ F 3 "" H 7750 8600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R417
+L R0402 R414
U 1 1 57E27899
P 8050 7000
-F 0 "R417" H 7920 7060 50 0000 L BNN
+F 0 "R414" H 7920 7060 50 0000 L BNN
F 1 "2" H 8050 7000 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 8080 7150 20 0001 C CNN
F 3 "" H 8050 7000 60 0001 C CNN
@@ -977,10 +977,10 @@ F 3 "" H 9600 8050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R420
+L R0402 R417
U 1 1 57E28CAC
P 9200 7300
-F 0 "R420" H 9070 7360 50 0000 L BNN
+F 0 "R417" H 9070 7360 50 0000 L BNN
F 1 "1M1" H 9200 7300 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 9230 7450 20 0001 C CNN
F 3 "" H 9200 7300 60 0001 C CNN
@@ -1027,10 +1027,10 @@ VSIM
Text GLabel 10400 7500 2 60 Input ~ 0
VINTANA2
$Comp
-L C0603 C407
+L C0603 C403
U 1 1 57E2B5A8
P 3600 9000
-F 0 "C407" H 3640 9040 50 0000 L CNN
+F 0 "C403" H 3640 9040 50 0000 L CNN
F 1 "100n" H 3650 8850 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 3630 9150 20 0001 C CNN
F 3 "" H 3600 9000 60 0001 C CNN
@@ -1124,10 +1124,10 @@ VSEL_2_EN
Text Label 11000 9300 0 60 ~ 0
VSEL_2_3V_n1V8
$Comp
-L R0402 R413
+L R0402 R407
U 1 1 57E30E4D
P 6050 8900
-F 0 "R413" H 5920 8960 50 0000 L BNN
+F 0 "R407" H 5920 8960 50 0000 L BNN
F 1 "100k" H 6050 8900 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 6080 9050 20 0001 C CNN
F 3 "" H 6050 8900 60 0001 C CNN
@@ -1135,10 +1135,10 @@ F 3 "" H 6050 8900 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R412
+L R0402 R403
U 1 1 57E30F25
P 2600 9000
-F 0 "R412" H 2470 9060 50 0000 L BNN
+F 0 "R403" H 2470 9060 50 0000 L BNN
F 1 "100k" H 2600 9000 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 2630 9150 20 0001 C CNN
F 3 "" H 2600 9000 60 0001 C CNN
@@ -1146,10 +1146,10 @@ F 3 "" H 2600 9000 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R414
+L R0402 R408
U 1 1 57E30FCD
P 6350 8600
-F 0 "R414" H 6220 8660 50 0000 L BNN
+F 0 "R408" H 6220 8660 50 0000 L BNN
F 1 "100k" H 6350 8600 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 6380 8750 20 0001 C CNN
F 3 "" H 6350 8600 60 0001 C CNN
@@ -1177,10 +1177,10 @@ Wire Wire Line
Wire Wire Line
6550 8600 6650 8600
$Comp
-L R0402 R411
+L R0402 R401
U 1 1 57E31FDF
P 2300 8700
-F 0 "R411" H 2170 8760 50 0000 L BNN
+F 0 "R401" H 2170 8760 50 0000 L BNN
F 1 "100k" H 2300 8700 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 2330 8850 20 0001 C CNN
F 3 "" H 2300 8700 60 0001 C CNN
@@ -1257,10 +1257,10 @@ Wire Wire Line
Wire Wire Line
3050 2400 3150 2400
$Comp
-L C0603 C415
+L C0603 C401
U 1 1 580843F8
P 1950 2700
-F 0 "C415" H 1990 2740 50 0000 L CNN
+F 0 "C401" H 1990 2740 50 0000 L CNN
F 1 "1u" H 2000 2550 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 1980 2850 20 0001 C CNN
F 3 "" H 1950 2700 60 0001 C CNN
@@ -1268,10 +1268,10 @@ F 3 "" H 1950 2700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0603 C416
+L C0603 C402
U 1 1 580847F3
P 3450 2700
-F 0 "C416" H 3490 2740 50 0000 L CNN
+F 0 "C402" H 3490 2740 50 0000 L CNN
F 1 "100n" H 3500 2550 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 3480 2850 20 0001 C CNN
F 3 "" H 3450 2700 60 0001 C CNN
diff --git a/hw/nfc.sch b/hw/nfc.sch
index 5c9bdec..718f30f 100644
--- a/hw/nfc.sch
+++ b/hw/nfc.sch
@@ -59,10 +59,10 @@ Text Notes 6800 2300 0 70 ~ 0
Text Notes 6800 2550 0 70 ~ 0
1.8 - VIN
$Comp
-L C0402 C1601
+L C0402 C1302
U 1 1 578CA81B
P 7400 2750
-F 0 "C1601" H 7440 2790 50 0000 L CNN
+F 0 "C1302" H 7440 2790 50 0000 L CNN
F 1 "2u2" H 7440 2620 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 7430 2900 20 0001 C CNN
F 3 "" H 7400 2750 60 0001 C CNN
@@ -70,10 +70,10 @@ F 3 "" H 7400 2750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1602
+L C0402 C1303
U 1 1 578CA8E3
P 7700 2750
-F 0 "C1602" H 7740 2790 50 0000 L CNN
+F 0 "C1303" H 7740 2790 50 0000 L CNN
F 1 "10n" H 7740 2620 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 7730 2900 20 0001 C CNN
F 3 "" H 7700 2750 60 0001 C CNN
@@ -81,10 +81,10 @@ F 3 "" H 7700 2750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1603
+L C0402 C1304
U 1 1 578CA9AB
P 8600 3850
-F 0 "C1603" H 8640 3890 50 0000 L CNN
+F 0 "C1304" H 8640 3890 50 0000 L CNN
F 1 "2u2" H 8640 3720 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 8630 4000 20 0001 C CNN
F 3 "" H 8600 3850 60 0001 C CNN
@@ -92,10 +92,10 @@ F 3 "" H 8600 3850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1604
+L C0402 C1305
U 1 1 578CAA73
P 9100 3850
-F 0 "C1604" H 9140 3890 50 0000 L CNN
+F 0 "C1305" H 9140 3890 50 0000 L CNN
F 1 "10n" H 9140 3720 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 9130 4000 20 0001 C CNN
F 3 "" H 9100 3850 60 0001 C CNN
@@ -103,10 +103,10 @@ F 3 "" H 9100 3850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1605
+L C0402 C1322
U 1 1 578CAB3B
P 13000 5400
-F 0 "C1605" H 13040 5440 50 0000 L CNN
+F 0 "C1322" H 13040 5440 50 0000 L CNN
F 1 "10p" H 13040 5270 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 13030 5550 20 0001 C CNN
F 3 "" H 13000 5400 60 0001 C CNN
@@ -114,10 +114,10 @@ F 3 "" H 13000 5400 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C1606
+L C0402 C1327
U 1 1 578CAC03
P 14350 5400
-F 0 "C1606" H 14410 5415 50 0000 L BNN
+F 0 "C1327" H 14410 5415 50 0000 L BNN
F 1 "47p" H 14410 5215 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 14340 5190 65 0001 L TNN
F 3 "" H 14350 5400 60 0001 C CNN
@@ -125,10 +125,10 @@ F 3 "" H 14350 5400 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C1607
+L C0402 C1316
U 1 1 578CACCB
P 11200 5650
-F 0 "C1607" V 11250 5650 50 0000 L CNN
+F 0 "C1316" V 11250 5650 50 0000 L CNN
F 1 "1n5" V 11250 5400 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 11230 5800 20 0001 C CNN
F 3 "" H 11200 5650 60 0001 C CNN
@@ -136,10 +136,10 @@ F 3 "" H 11200 5650 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C1608
+L C0402 C1328
U 1 1 578CAD93
P 14350 5750
-F 0 "C1608" H 14410 5765 50 0000 L BNN
+F 0 "C1328" H 14410 5765 50 0000 L BNN
F 1 "10p" H 14410 5565 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 14340 5540 65 0001 L TNN
F 3 "" H 14350 5750 60 0001 C CNN
@@ -147,10 +147,10 @@ F 3 "" H 14350 5750 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C1609
+L C0402 C1317
U 1 1 578CAE5B
P 11200 5850
-F 0 "C1609" V 11150 5850 50 0000 L CNN
+F 0 "C1317" V 11150 5850 50 0000 L CNN
F 1 "1n5" V 11150 5600 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 11230 6000 20 0001 C CNN
F 3 "" H 11200 5850 60 0001 C CNN
@@ -158,10 +158,10 @@ F 3 "" H 11200 5850 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C1610
+L C0402 C1308
U 1 1 578CAF23
P 10500 5950
-F 0 "C1610" V 10550 5600 50 0000 L CNN
+F 0 "C1308" V 10550 5600 50 0000 L CNN
F 1 "10n" V 10450 5700 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 10530 6100 20 0001 C CNN
F 3 "" H 10500 5950 60 0001 C CNN
@@ -169,10 +169,10 @@ F 3 "" H 10500 5950 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C1611
+L C0402 C1318
U 1 1 578CAFEB
P 12200 6050
-F 0 "C1611" H 12240 6090 50 0000 L CNN
+F 0 "C1318" H 12240 6090 50 0000 L CNN
F 1 "1n2" H 12240 5920 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 12230 6200 20 0001 C CNN
F 3 "" H 12200 6050 60 0001 C CNN
@@ -180,10 +180,10 @@ F 3 "" H 12200 6050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1612
+L C0402 C1320
U 1 1 578CB0B3
P 12500 6050
-F 0 "C1612" H 12540 6090 50 0000 L CNN
+F 0 "C1320" H 12540 6090 50 0000 L CNN
F 1 "680p" H 12540 5920 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 12530 6200 20 0001 C CNN
F 3 "" H 12500 6050 60 0001 C CNN
@@ -191,10 +191,10 @@ F 3 "" H 12500 6050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1613
+L C0402 C1321
U 1 1 578CB17B
P 12800 6050
-F 0 "C1613" H 12840 6090 50 0000 L CNN
+F 0 "C1321" H 12840 6090 50 0000 L CNN
F 1 "DNP" H 12840 5920 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 12830 6200 20 0001 C CNN
F 3 "" H 12800 6050 60 0001 C CNN
@@ -202,10 +202,10 @@ F 3 "" H 12800 6050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1614
+L C0402 C1323
U 1 1 578CB243
P 13550 6050
-F 0 "C1614" H 13590 6090 50 0000 L CNN
+F 0 "C1323" H 13590 6090 50 0000 L CNN
F 1 "220p" H 13590 5920 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 13580 6200 20 0001 C CNN
F 3 "" H 13550 6050 60 0001 C CNN
@@ -213,10 +213,10 @@ F 3 "" H 13550 6050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1615
+L C0402 C1325
U 1 1 578CB30B
P 13850 6050
-F 0 "C1615" H 13890 6090 50 0000 L CNN
+F 0 "C1325" H 13890 6090 50 0000 L CNN
F 1 "100p" H 13890 5920 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 13880 6200 20 0001 C CNN
F 3 "" H 13850 6050 60 0001 C CNN
@@ -224,10 +224,10 @@ F 3 "" H 13850 6050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1616
+L C0402 C1326
U 1 1 578CB3D3
P 14150 6050
-F 0 "C1616" H 14190 6090 50 0000 L CNN
+F 0 "C1326" H 14190 6090 50 0000 L CNN
F 1 "27p" H 14190 5920 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 14180 6200 20 0001 C CNN
F 3 "" H 14150 6050 60 0001 C CNN
@@ -235,10 +235,10 @@ F 3 "" H 14150 6050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1617
+L C0402 C1329
U 1 1 578CB49B
P 14950 6050
-F 0 "C1617" H 14990 6090 50 0000 L CNN
+F 0 "C1329" H 14990 6090 50 0000 L CNN
F 1 "DNP" H 14990 5920 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 14980 6200 20 0001 C CNN
F 3 "" H 14950 6050 60 0001 C CNN
@@ -246,10 +246,10 @@ F 3 "" H 14950 6050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1618
+L C0402 C1309
U 1 1 578CB563
P 10500 6150
-F 0 "C1618" V 10550 5800 50 0000 L CNN
+F 0 "C1309" V 10550 5800 50 0000 L CNN
F 1 "2u2" V 10450 5900 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 10530 6300 20 0001 C CNN
F 3 "" H 10500 6150 60 0001 C CNN
@@ -257,10 +257,10 @@ F 3 "" H 10500 6150 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C1619
+L C0402 C1310
U 1 1 578CB62B
P 10500 6350
-F 0 "C1619" V 10550 6000 50 0000 L CNN
+F 0 "C1310" V 10550 6000 50 0000 L CNN
F 1 "10n" V 10450 6100 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 10530 6500 20 0001 C CNN
F 3 "" H 10500 6350 60 0001 C CNN
@@ -268,10 +268,10 @@ F 3 "" H 10500 6350 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C1620
+L C0402 C1319
U 1 1 578CB6F3
P 12200 6450
-F 0 "C1620" H 12240 6490 50 0000 L CNN
+F 0 "C1319" H 12240 6490 50 0000 L CNN
F 1 "1n2" H 12240 6320 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 12230 6600 20 0001 C CNN
F 3 "" H 12200 6450 60 0001 C CNN
@@ -279,10 +279,10 @@ F 3 "" H 12200 6450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1621
+L C0402 C1324
U 1 1 578CB7BB
P 13550 6450
-F 0 "C1621" H 13590 6490 50 0000 L CNN
+F 0 "C1324" H 13590 6490 50 0000 L CNN
F 1 "680p" H 13590 6320 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 13580 6600 20 0001 C CNN
F 3 "" H 13550 6450 60 0001 C CNN
@@ -290,10 +290,10 @@ F 3 "" H 13550 6450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1622
+L C0402 C1311
U 1 1 578CB883
P 10500 6550
-F 0 "C1622" V 10550 6200 50 0000 L CNN
+F 0 "C1311" V 10550 6200 50 0000 L CNN
F 1 "2u2" V 10450 6300 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 10530 6700 20 0001 C CNN
F 3 "" H 10500 6550 60 0001 C CNN
@@ -301,10 +301,10 @@ F 3 "" H 10500 6550 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C1623
+L C0402 C1312
U 1 1 578CB94B
P 10500 6750
-F 0 "C1623" V 10550 6400 50 0000 L CNN
+F 0 "C1312" V 10550 6400 50 0000 L CNN
F 1 "10n" V 10450 6500 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 10530 6900 20 0001 C CNN
F 3 "" H 10500 6750 60 0001 C CNN
@@ -312,10 +312,10 @@ F 3 "" H 10500 6750 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C1624
+L C0402 C1313
U 1 1 578CBA13
P 10500 6950
-F 0 "C1624" V 10550 6600 50 0000 L CNN
+F 0 "C1313" V 10550 6600 50 0000 L CNN
F 1 "2u2" V 10450 6700 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 10530 7100 20 0001 C CNN
F 3 "" H 10500 6950 60 0001 C CNN
@@ -323,10 +323,10 @@ F 3 "" H 10500 6950 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C1625
+L C0402 C1306
U 1 1 578CBADB
P 9100 8250
-F 0 "C1625" H 9140 8290 50 0000 L CNN
+F 0 "C1306" H 9140 8290 50 0000 L CNN
F 1 "8p" H 9140 8120 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 9130 8400 20 0001 C CNN
F 3 "" H 9100 8250 60 0001 C CNN
@@ -334,10 +334,10 @@ F 3 "" H 9100 8250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1626
+L C0402 C1307
U 1 1 578AF684
P 10050 8250
-F 0 "C1626" H 10090 8290 50 0000 L CNN
+F 0 "C1307" H 10090 8290 50 0000 L CNN
F 1 "8p" H 10090 8120 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 10080 8400 20 0001 C CNN
F 3 "" H 10050 8250 60 0001 C CNN
@@ -345,10 +345,10 @@ F 3 "" H 10050 8250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1627
+L C0402 C1314
U 1 1 578CBC08
P 10500 8250
-F 0 "C1627" H 10540 8290 50 0000 L CNN
+F 0 "C1314" H 10540 8290 50 0000 L CNN
F 1 "2u2" H 10540 8120 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 10530 8400 20 0001 C CNN
F 3 "" H 10500 8250 60 0001 C CNN
@@ -356,10 +356,10 @@ F 3 "" H 10500 8250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1628
+L C0402 C1315
U 1 1 578CBCD0
P 10850 8250
-F 0 "C1628" H 10890 8290 50 0000 L CNN
+F 0 "C1315" H 10890 8290 50 0000 L CNN
F 1 "10n" H 10890 8120 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 10880 8400 20 0001 C CNN
F 3 "" H 10850 8250 60 0001 C CNN
@@ -367,10 +367,10 @@ F 3 "" H 10850 8250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L L0603 L1601
+L L0603 L1301
U 1 1 578CBE60
P 11750 5750
-F 0 "L1601" V 11691 5600 50 0000 L BNN
+F 0 "L1301" V 11691 5600 50 0000 L BNN
F 1 "150n" V 11880 5600 50 0000 L BNN
F 2 "neo900-legacy:SMD-0603" H 11740 5540 65 0001 L TNN
F 3 "" H 11750 5750 60 0001 C CNN
@@ -378,10 +378,10 @@ F 3 "" H 11750 5750 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L L0603 L1602
+L L0603 L1302
U 1 1 578CBF28
P 13100 5750
-F 0 "L1602" V 13042 5600 50 0000 L BNN
+F 0 "L1302" V 13042 5600 50 0000 L BNN
F 1 "330n" V 13230 5601 50 0000 L BNN
F 2 "neo900-legacy:SMD-0603" H 13090 5540 65 0001 L TNN
F 3 "" H 13100 5750 60 0001 C CNN
@@ -389,10 +389,10 @@ F 3 "" H 13100 5750 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L R0402 R1601
+L R0402 R1303
U 1 1 578CBFF0
P 14650 6100
-F 0 "R1601" H 14520 6160 50 0000 L BNN
+F 0 "R1303" H 14520 6160 50 0000 L BNN
F 1 "1k" H 14650 6100 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 14680 6250 20 0001 C CNN
F 3 "" H 14650 6100 60 0001 C CNN
@@ -697,10 +697,10 @@ F 3 "" H 10500 5450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TRF796XS-PQFP-N32_RHB_ U1601
+L TRF796XS-PQFP-N32_RHB_ U1302
U 1 1 578CCD38
P 9800 5550
-F 0 "U1601" H 10600 5850 70 0000 L BNN
+F 0 "U1302" H 10600 5850 70 0000 L BNN
F 1 "TRF7970A" H 10600 6050 70 0000 L BNN
F 2 "neo900-legacy:TRF7960_61" H 9790 5340 65 0001 L TNN
F 3 "" H 9800 5550 60 0001 C CNN
@@ -708,10 +708,10 @@ F 3 "" H 9800 5550 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L XTAL-4-3225 X1601
+L XTAL-4-3225 X1301
U 1 1 578CCE64
P 9600 7850
-F 0 "X1601" H 9650 8050 45 0000 L CNN
+F 0 "X1301" H 9650 8050 45 0000 L CNN
F 1 "27.12MHz" H 9625 7650 45 0000 L CNN
F 2 "neo900-legacy:XO-3225" H 9630 8000 20 0001 C CNN
F 3 "" H 9600 7850 60 0001 C CNN
diff --git a/hw/sensors.sch b/hw/sensors.sch
index f63687a..4b73c82 100644
--- a/hw/sensors.sch
+++ b/hw/sensors.sch
@@ -65,10 +65,10 @@ Addr: 0x18/68/10
Text Notes 3350 8700 0 70 ~ 0
keep away from magnets and metal
$Comp
-L C0402 C1001
+L C0402 C902
U 1 1 578C07F6
P 2400 2500
-F 0 "C1001" H 2440 2540 50 0000 L CNN
+F 0 "C902" H 2440 2540 50 0000 L CNN
F 1 "10u" H 2440 2370 50 0000 L CNN
F 2 "neo900-legacy:SMD-0805" H 2430 2650 20 0001 C CNN
F 3 "" H 2400 2500 60 0001 C CNN
@@ -76,10 +76,10 @@ F 3 "" H 2400 2500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1002
+L C0402 C904
U 1 1 578C08BE
P 2800 2500
-F 0 "C1002" H 2840 2540 50 0000 L CNN
+F 0 "C904" H 2840 2540 50 0000 L CNN
F 1 "100n" H 2840 2370 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 2830 2650 20 0001 C CNN
F 3 "" H 2800 2500 60 0001 C CNN
@@ -87,10 +87,10 @@ F 3 "" H 2800 2500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1008
+L C0402 C901
U 1 1 578C0D6E
P 2150 7000
-F 0 "C1008" H 2190 7040 50 0000 L CNN
+F 0 "C901" H 2190 7040 50 0000 L CNN
F 1 "100n" H 2190 6870 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 2180 7150 20 0001 C CNN
F 3 "" H 2150 7000 60 0001 C CNN
@@ -98,10 +98,10 @@ F 3 "" H 2150 7000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1011
+L C0402 C903
U 1 1 578C0FC6
P 2750 7200
-F 0 "C1011" H 2790 7240 50 0000 L CNN
+F 0 "C903" H 2790 7240 50 0000 L CNN
F 1 "100n" H 2790 7070 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 2780 7350 20 0001 C CNN
F 3 "" H 2750 7200 60 0001 C CNN
@@ -109,10 +109,10 @@ F 3 "" H 2750 7200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C1012
+L C0402 C905
U 1 1 578C108E
P 7400 2500
-F 0 "C1012" H 7440 2540 50 0000 L CNN
+F 0 "C905" H 7440 2540 50 0000 L CNN
F 1 "100n" H 7440 2370 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 7430 2650 20 0001 C CNN
F 3 "" H 7400 2500 60 0001 C CNN
@@ -120,10 +120,10 @@ F 3 "" H 7400 2500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LIS302DLTR S1001
+L LIS302DLTR S901
U 1 1 578C13AE
P 4000 2900
-F 0 "S1001" H 3600 3650 50 0000 L CNN
+F 0 "S901" H 3600 3650 50 0000 L CNN
F 1 "LIS302DLTR" H 4000 2150 50 0000 C CNN
F 2 "neo900-legacy:LGA-DIL-12+2" H 4030 3050 20 0001 C CNN
F 3 "" H 4000 2900 60 0001 C CNN
@@ -266,10 +266,10 @@ I2C3_SDA_U
Text GLabel 9750 2800 2 60 Input ~ 0
I2C3_SCL_U
$Comp
-L BME280 S1005
+L BME280 S903
U 1 1 57D6FEE4
P 8500 2800
-F 0 "S1005" H 8100 3150 45 0000 L CNN
+F 0 "S903" H 8100 3150 45 0000 L CNN
F 1 "BME280" H 8500 2875 45 0000 C CNN
F 2 "BME280" H 8530 2950 20 0001 C CNN
F 3 "" H 8500 2800 60 0001 C CNN
@@ -310,10 +310,10 @@ Wire Wire Line
7900 2900 7400 2900
Connection ~ 7400 2900
$Comp
-L BMX055 S1004
+L BMX055 S902
U 1 1 57D790BF
P 4200 7400
-F 0 "S1004" H 3700 8250 50 0000 L CNN
+F 0 "S902" H 3700 8250 50 0000 L CNN
F 1 "BMX055" H 4200 7050 50 0000 C CNN
F 2 "BNO050" H 4230 7550 20 0001 C CNN
F 3 "" H 4200 7400 60 0001 C CNN
@@ -327,10 +327,10 @@ Wire Wire Line
Text GLabel 6450 7600 2 60 Output ~ 0
SENS_INT2
$Comp
-L R0402 R1001
+L R0402 R901
U 1 1 57D79950
P 5200 6450
-F 0 "R1001" V 5150 6350 50 0000 R CNN
+F 0 "R901" V 5150 6350 50 0000 R CNN
F 1 "10k" H 5200 6450 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5230 6600 20 0001 C CNN
F 3 "" H 5200 6450 60 0001 C CNN
@@ -338,10 +338,10 @@ F 3 "" H 5200 6450 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L R0402 R1002
+L R0402 R902
U 1 1 57D799F0
P 5400 6450
-F 0 "R1002" V 5350 6550 50 0000 L CNN
+F 0 "R902" V 5350 6550 50 0000 L CNN
F 1 "10k" H 5400 6450 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5430 6600 20 0001 C CNN
F 3 "" H 5400 6450 60 0001 C CNN
@@ -368,10 +368,10 @@ Connection ~ 5000 7500
Wire Wire Line
4900 7800 5100 7800
$Comp
-L R0402 R1003
+L R0402 R903
U 1 1 57D79CC3
P 5900 7900
-F 0 "R1003" H 5750 7950 50 0000 R CNN
+F 0 "R903" H 5750 7950 50 0000 R CNN
F 1 "10k" H 5900 7900 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5930 8050 20 0001 C CNN
F 3 "" H 5900 7900 60 0001 C CNN
@@ -379,10 +379,10 @@ F 3 "" H 5900 7900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R1004
+L R0402 R904
U 1 1 57D79D66
P 5900 8000
-F 0 "R1004" H 5750 8050 50 0000 R CNN
+F 0 "R904" H 5750 8050 50 0000 R CNN
F 1 "10k" H 5900 8000 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5930 8150 20 0001 C CNN
F 3 "" H 5900 8000 60 0001 C CNN
@@ -570,8 +570,8 @@ L C0402 C?
U 1 1 58290E34
P 10050 6350
AR Path="/578AFF0C/58290E34" Ref="C?" Part="1"
-AR Path="/578AFF02/58290E34" Ref="C912" Part="1"
-F 0 "C912" H 10090 6390 50 0000 L CNN
+AR Path="/578AFF02/58290E34" Ref="C906" Part="1"
+F 0 "C906" H 10090 6390 50 0000 L CNN
F 1 "1u" H 10090 6220 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 10080 6500 20 0001 C CNN
F 3 "" H 10050 6350 60 0001 C CNN
@@ -583,8 +583,8 @@ L C0402 C?
U 1 1 58290E3B
P 10650 6350
AR Path="/578AFF0C/58290E3B" Ref="C?" Part="1"
-AR Path="/578AFF02/58290E3B" Ref="C913" Part="1"
-F 0 "C913" H 10690 6390 50 0000 L CNN
+AR Path="/578AFF02/58290E3B" Ref="C907" Part="1"
+F 0 "C907" H 10690 6390 50 0000 L CNN
F 1 "1u" H 10690 6220 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 10680 6500 20 0001 C CNN
F 3 "" H 10650 6350 60 0001 C CNN
@@ -596,8 +596,8 @@ L R0402 R?
U 1 1 58290E42
P 10350 5600
AR Path="/578AFF0C/58290E42" Ref="R?" Part="1"
-AR Path="/578AFF02/58290E42" Ref="R901" Part="1"
-F 0 "R901" H 10220 5660 50 0000 L BNN
+AR Path="/578AFF02/58290E42" Ref="R905" Part="1"
+F 0 "R905" H 10220 5660 50 0000 L BNN
F 1 "22" H 10350 5600 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 10380 5750 20 0001 C CNN
F 3 "" H 10350 5600 60 0001 C CNN
@@ -648,8 +648,8 @@ L TMD2671 U?
U 1 1 58290E5B
P 11600 6000
AR Path="/578AFF0C/58290E5B" Ref="U?" Part="1"
-AR Path="/578AFF02/58290E5B" Ref="U904" Part="1"
-F 0 "U904" H 11300 6550 50 0000 L CNN
+AR Path="/578AFF02/58290E5B" Ref="U902" Part="1"
+F 0 "U902" H 11300 6550 50 0000 L CNN
F 1 "TMD26713" H 11600 5550 50 0000 C CNN
F 2 "TMD2671" H 11600 5450 20 0001 C CNN
F 3 "" H 10850 6150 60 0001 C CNN
@@ -728,8 +728,8 @@ L MLX90248ESE U?
U 1 1 58290E80
P 11400 8600
AR Path="/578AFF0C/58290E80" Ref="U?" Part="1"
-AR Path="/578AFF02/58290E80" Ref="U903" Part="1"
-F 0 "U903" H 11100 8940 50 0000 L BNN
+AR Path="/578AFF02/58290E80" Ref="U901" Part="1"
+F 0 "U901" H 11100 8940 50 0000 L BNN
F 1 "MLX90248ESE" H 11450 8200 50 0000 L BNN
F 2 "neo900-legacy:SOT23" H 11390 8390 65 0001 L TNN
F 3 "" H 11400 8600 60 0001 C CNN
@@ -755,8 +755,8 @@ L C0402 C?
U 1 1 58290E8B
P 10700 8100
AR Path="/578AFF0C/58290E8B" Ref="C?" Part="1"
-AR Path="/578AFF02/58290E8B" Ref="C914" Part="1"
-F 0 "C914" H 10740 8140 50 0000 L CNN
+AR Path="/578AFF02/58290E8B" Ref="C908" Part="1"
+F 0 "C908" H 10740 8140 50 0000 L CNN
F 1 "10n" H 10740 7970 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 10730 8250 20 0001 C CNN
F 3 "" H 10700 8100 60 0001 C CNN
@@ -790,8 +790,8 @@ L C0402 C?
U 1 1 58290E9D
P 12500 8800
AR Path="/578AFF0C/58290E9D" Ref="C?" Part="1"
-AR Path="/578AFF02/58290E9D" Ref="C915" Part="1"
-F 0 "C915" H 12540 8840 50 0000 L CNN
+AR Path="/578AFF02/58290E9D" Ref="C909" Part="1"
+F 0 "C909" H 12540 8840 50 0000 L CNN
F 1 "100p" H 12540 8670 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 12530 8950 20 0001 C CNN
F 3 "" H 12500 8800 60 0001 C CNN
@@ -822,8 +822,8 @@ L R0402 R?
U 1 1 58290EAD
P 12400 8300
AR Path="/578AFF0C/58290EAD" Ref="R?" Part="1"
-AR Path="/578AFF02/58290EAD" Ref="R902" Part="1"
-F 0 "R902" V 12350 8400 50 0000 L CNN
+AR Path="/578AFF02/58290EAD" Ref="R906" Part="1"
+F 0 "R906" V 12350 8400 50 0000 L CNN
F 1 "100k" H 12400 8300 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 12430 8450 20 0001 C CNN
F 3 "" H 12400 8300 60 0001 C CNN
diff --git a/hw/sims.sch b/hw/sims.sch
index 152fd53..1f201ed 100644
--- a/hw/sims.sch
+++ b/hw/sims.sch
@@ -55,12 +55,10 @@ Comment3 ""
Comment4 "Xsheetnumber=6"
$EndDescr
$Comp
-L SIM-SLOT-6PIN+CD P701
+L SIM-SLOT-6PIN+CD P601
U 1 1 578B8AFB
P 13200 1900
-AR Path="/578B8AFB" Ref="P701" Part="1"
-AR Path="/578AFEFC/578B8AFB" Ref="P701" Part="1"
-F 0 "P701" H 12500 2650 45 0000 L CNN
+F 0 "P601" H 12500 2650 45 0000 L CNN
F 1 "SF7W006S4ER1500" V 13700 1600 45 0000 L CNN
F 2 "neo900-legacy:SJ106220" H 13230 2050 20 0001 C CNN
F 3 "" H 13200 1900 60 0001 C CNN
@@ -79,12 +77,10 @@ F 3 "" H 6200 4800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L 74X1G32_6 U?
+L 74X1G32_6 U607
U 1 1 57E1A26F
P 5100 1600
-AR Path="/57E1A26F" Ref="U?" Part="1"
-AR Path="/578AFEFC/57E1A26F" Ref="U707" Part="1"
-F 0 "U707" H 5300 1850 60 0000 C CNN
+F 0 "U607" H 5300 1850 60 0000 C CNN
F 1 "SN74LVC1G32DSF" H 5250 1400 60 0000 L CNN
F 2 "" H 5200 1600 60 0001 C CNN
F 3 "" H 5200 1600 60 0001 C CNN
@@ -92,12 +88,10 @@ F 3 "" H 5200 1600 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L 74X1G32_6 U?
+L 74X1G32_6 U606
U 1 1 57E1A32B
P 4650 4900
-AR Path="/57E1A32B" Ref="U?" Part="1"
-AR Path="/578AFEFC/57E1A32B" Ref="U705" Part="1"
-F 0 "U705" H 4300 5100 60 0000 L CNN
+F 0 "U606" H 4300 5100 60 0000 L CNN
F 1 "SN74LVC1G32DSF" H 3700 4700 60 0000 L CNN
F 2 "" H 4750 4900 60 0001 C CNN
F 3 "" H 4750 4900 60 0001 C CNN
@@ -105,10 +99,10 @@ F 3 "" H 4750 4900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L 74x1G123 U701
+L 74x1G123 U601
U 1 1 57E1A382
P 2300 6250
-F 0 "U701" H 1900 6650 60 0000 L CNN
+F 0 "U601" H 1900 6650 60 0000 L CNN
F 1 "SN74LVC1G123YZP" H 1300 5850 60 0000 L CNN
F 2 "" H 2375 6250 60 0001 C CNN
F 3 "" H 2375 6250 60 0001 C CNN
@@ -116,12 +110,10 @@ F 3 "" H 2375 6250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L 74X2G07_6 U?
+L 74X2G07_6 U603
U 2 1 57E1A61B
P 3500 2350
-AR Path="/57E1A61B" Ref="U?" Part="1"
-AR Path="/578AFEFC/57E1A61B" Ref="U702" Part="2"
-F 0 "U702" H 3650 2500 60 0000 C CNN
+F 0 "U603" H 3650 2500 60 0000 C CNN
F 1 "SN74LVC2G07DSF" H 3500 2200 60 0000 L CNN
F 2 "" H 3350 2525 60 0001 C CNN
F 3 "" H 3350 2525 60 0001 C CNN
@@ -129,10 +121,10 @@ F 3 "" H 3350 2525 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L 74x1G74_6D U708
+L 74x1G74_6D U608
U 1 1 57E1A68E
P 6350 6300
-F 0 "U708" H 6000 6600 60 0000 L CNN
+F 0 "U608" H 6000 6600 60 0000 L CNN
F 1 "SN74LVC1G74DQE" H 5950 5450 60 0000 L CNN
F 2 "" H 6350 6300 60 0001 C CNN
F 3 "" H 6350 6300 60 0001 C CNN
@@ -140,10 +132,10 @@ F 3 "" H 6350 6300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L 74x1G74_6D U709
+L 74x1G74_6D U609
U 1 1 57E1A6FF
P 6350 8000
-F 0 "U709" H 6000 8300 60 0000 L CNN
+F 0 "U609" H 6000 8300 60 0000 L CNN
F 1 "SN74LVC1G74DQE" H 5350 7600 60 0000 L CNN
F 2 "" H 6350 8000 60 0001 C CNN
F 3 "" H 6350 8000 60 0001 C CNN
@@ -151,10 +143,10 @@ F 3 "" H 6350 8000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L FSA2866 U710
+L FSA2866 U610
U 1 1 57E1A9A5
P 6900 3900
-F 0 "U710" H 7300 4650 60 0000 R CNN
+F 0 "U610" H 7300 4650 60 0000 R CNN
F 1 "FSA2866" H 6850 3350 60 0000 R CNN
F 2 "" H 5900 4450 60 0001 C CNN
F 3 "" H 5900 4450 60 0001 C CNN
@@ -162,10 +154,10 @@ F 3 "" H 5900 4450 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L FSA2866 U711
+L FSA2866 U611
U 1 1 57E1AA9E
P 6900 9800
-F 0 "U711" H 7300 10550 60 0000 R CNN
+F 0 "U611" H 7300 10550 60 0000 R CNN
F 1 "FSA2866" H 6850 9250 60 0000 R CNN
F 2 "" H 5900 10350 60 0001 C CNN
F 3 "" H 5900 10350 60 0001 C CNN
@@ -173,10 +165,10 @@ F 3 "" H 5900 10350 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L C0402 C708
+L C0402 C604
U 1 1 57E1C7D6
P 5900 4400
-F 0 "C708" H 5940 4440 50 0000 L CNN
+F 0 "C604" H 5940 4440 50 0000 L CNN
F 1 "100n" H 5940 4270 50 0000 L CNN
F 2 "SMD-0402" H 5930 4550 20 0001 C CNN
F 3 "" H 5900 4400 60 0001 C CNN
@@ -224,10 +216,10 @@ MODEM_CD_A
Text GLabel 2400 2350 0 60 Output ~ 0
MODEM_CD_B
$Comp
-L C0402 C703
+L C0402 C603
U 1 1 57E1EA16
P 4450 900
-F 0 "C703" H 4490 940 50 0000 L CNN
+F 0 "C603" H 4490 940 50 0000 L CNN
F 1 "1u" H 4490 770 50 0000 L CNN
F 2 "SMD-0402" H 4480 1050 20 0001 C CNN
F 3 "" H 4450 900 60 0001 C CNN
@@ -252,10 +244,10 @@ MUX_SEL
Text GLabel 1300 5100 0 60 Input ~ 0
1V8
$Comp
-L C0402 C702
+L C0402 C602
U 1 1 57E204A1
P 3150 5800
-F 0 "C702" H 3190 5840 50 0000 L CNN
+F 0 "C602" H 3190 5840 50 0000 L CNN
F 1 "1u" H 3190 5670 50 0000 L CNN
F 2 "SMD-0402" H 3180 5950 20 0001 C CNN
F 3 "" H 3150 5800 60 0001 C CNN
@@ -263,10 +255,10 @@ F 3 "" H 3150 5800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R701
+L R0402 R601
U 1 1 57E20DFF
P 3150 5400
-F 0 "R701" H 3020 5460 50 0000 L BNN
+F 0 "R601" H 3020 5460 50 0000 L BNN
F 1 "470k" H 3150 5400 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 3180 5550 20 0001 C CNN
F 3 "" H 3150 5400 60 0001 C CNN
@@ -274,10 +266,10 @@ F 3 "" H 3150 5400 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C701
+L C0402 C601
U 1 1 57E21B68
P 2500 5300
-F 0 "C701" H 2540 5340 50 0000 L CNN
+F 0 "C601" H 2540 5340 50 0000 L CNN
F 1 "100n" H 2540 5170 50 0000 L CNN
F 2 "SMD-0402" H 2530 5450 20 0001 C CNN
F 3 "" H 2500 5300 60 0001 C CNN
@@ -321,10 +313,10 @@ MODEM_CLK_B
Text GLabel 2500 4050 0 60 BiDi ~ 0
MODEM_DATA_B
$Comp
-L R0402 R706
+L R0402 R606
U 1 1 57E2422D
P 6200 1000
-F 0 "R706" H 6070 1060 50 0000 L BNN
+F 0 "R606" H 6070 1060 50 0000 L BNN
F 1 "100k" H 6200 1000 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 6230 1150 20 0001 C CNN
F 3 "" H 6200 1000 60 0001 C CNN
@@ -332,10 +324,10 @@ F 3 "" H 6200 1000 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R705
+L R0402 R605
U 1 1 57E24479
P 6000 1000
-F 0 "R705" H 5870 1060 50 0000 L BNN
+F 0 "R605" H 5870 1060 50 0000 L BNN
F 1 "100k" H 6000 1000 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 6030 1150 20 0001 C CNN
F 3 "" H 6000 1000 60 0001 C CNN
@@ -375,10 +367,10 @@ F 3 "" H 6350 6950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C710
+L C0402 C606
U 1 1 57E275D0
P 6900 6550
-F 0 "C710" H 6940 6590 50 0000 L CNN
+F 0 "C606" H 6940 6590 50 0000 L CNN
F 1 "100n" H 6940 6420 50 0000 L CNN
F 2 "SMD-0402" H 6930 6700 20 0001 C CNN
F 3 "" H 6900 6550 60 0001 C CNN
@@ -386,10 +378,10 @@ F 3 "" H 6900 6550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C711
+L C0402 C607
U 1 1 57E27719
P 6900 8250
-F 0 "C711" H 6940 8290 50 0000 L CNN
+F 0 "C607" H 6940 8290 50 0000 L CNN
F 1 "100n" H 6940 8120 50 0000 L CNN
F 2 "SMD-0402" H 6930 8400 20 0001 C CNN
F 3 "" H 6900 8250 60 0001 C CNN
@@ -431,10 +423,10 @@ F 3 "" H 2500 5700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L 74X1G32_6 U704
+L 74X1G32_6 U604
U 1 1 57E219E1
P 4100 2350
-F 0 "U704" H 3950 2550 60 0000 C CNN
+F 0 "U604" H 3950 2550 60 0000 C CNN
F 1 "SN74LVC1G32DSF" H 3150 2200 60 0000 L CNN
F 2 "" H 4200 2350 60 0001 C CNN
F 3 "" H 4200 2350 60 0001 C CNN
@@ -442,10 +434,10 @@ F 3 "" H 4200 2350 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L 74X2G07_6 U702
+L 74X2G07_6 U603
U 1 1 57E21F88
P 3550 1600
-F 0 "U702" H 3800 1750 60 0000 C CNN
+F 0 "U603" H 3800 1750 60 0000 C CNN
F 1 "SN74LVC2G07DSF" H 3700 1450 60 0000 L CNN
F 2 "" H 3400 1775 60 0001 C CNN
F 3 "" H 3400 1775 60 0001 C CNN
@@ -476,10 +468,10 @@ F 3 "" H 6200 10700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C709
+L C0402 C605
U 1 1 57E264FB
P 5900 10300
-F 0 "C709" H 5940 10340 50 0000 L CNN
+F 0 "C605" H 5940 10340 50 0000 L CNN
F 1 "100n" H 5940 10170 50 0000 L CNN
F 2 "SMD-0402" H 5930 10450 20 0001 C CNN
F 3 "" H 5900 10300 60 0001 C CNN
@@ -508,10 +500,10 @@ VBAT_SWITCHED
Text GLabel 9050 3300 2 60 Input ~ 0
nBATTERY_PRESENT
$Comp
-L R0402 R708
+L R0402 R608
U 1 1 57E2B072
P 10150 2750
-F 0 "R708" H 10020 2810 50 0000 L BNN
+F 0 "R608" H 10020 2810 50 0000 L BNN
F 1 "47k" H 10150 2750 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 10180 2900 20 0001 C CNN
F 3 "" H 10150 2750 60 0001 C CNN
@@ -572,10 +564,10 @@ SIM_CLK_2
Text Label 7700 9950 0 60 ~ 0
SIM_DATA_2
$Comp
-L 74X1G04_6 U706
+L 74X1G04_6 U605
U 1 1 57E22F9A
P 4500 6250
-F 0 "U706" H 4300 6450 60 0000 C CNN
+F 0 "U605" H 4300 6450 60 0000 C CNN
F 1 "SN74LVC1G04DSF" H 3650 6000 60 0000 L CNN
F 2 "" H 4350 6425 60 0001 C CNN
F 3 "" H 4350 6425 60 0001 C CNN
@@ -636,10 +628,10 @@ $EndComp
Text GLabel 14950 2000 2 60 BiDi ~ 0
SWIO_1
$Comp
-L R0402 R712
+L R0402 R612
U 1 1 57E3070E
P 10950 2700
-F 0 "R712" H 10820 2760 50 0000 L BNN
+F 0 "R612" H 10820 2760 50 0000 L BNN
F 1 "51" H 10950 2700 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 10980 2850 20 0001 C CNN
F 3 "" H 10950 2700 60 0001 C CNN
@@ -647,10 +639,10 @@ F 3 "" H 10950 2700 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R713
+L R0402 R613
U 1 1 57E307AC
P 11150 2700
-F 0 "R713" H 11020 2760 50 0000 L BNN
+F 0 "R613" H 11020 2760 50 0000 L BNN
F 1 "51" H 11150 2700 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 11180 2850 20 0001 C CNN
F 3 "" H 11150 2700 60 0001 C CNN
@@ -658,10 +650,10 @@ F 3 "" H 11150 2700 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R714
+L R0402 R614
U 1 1 57E30853
P 14650 2700
-F 0 "R714" H 14520 2760 50 0000 L BNN
+F 0 "R614" H 14520 2760 50 0000 L BNN
F 1 "51" H 14650 2700 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 14680 2850 20 0001 C CNN
F 3 "" H 14650 2700 60 0001 C CNN
@@ -669,10 +661,10 @@ F 3 "" H 14650 2700 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C714
+L C0402 C610
U 1 1 57E31297
P 11800 2500
-F 0 "C714" H 11840 2540 50 0000 L CNN
+F 0 "C610" H 11840 2540 50 0000 L CNN
F 1 "220n" H 11840 2370 50 0000 L CNN
F 2 "SMD-0402" H 11830 2650 20 0001 C CNN
F 3 "" H 11800 2500 60 0001 C CNN
@@ -691,10 +683,10 @@ F 3 "" H 11800 2900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C712
+L C0402 C608
U 1 1 57E31A8A
P 11450 2500
-F 0 "C712" H 11490 2540 50 0000 L CNN
+F 0 "C608" H 11490 2540 50 0000 L CNN
F 1 "1n" H 11490 2370 50 0000 L CNN
F 2 "SMD-0402" H 11480 2650 20 0001 C CNN
F 3 "" H 11450 2500 60 0001 C CNN
@@ -717,8 +709,8 @@ L ESDA6V1-5P6 U?
U 1 1 57E31E60
P 10000 1100
AR Path="/57E31E60" Ref="U?" Part="1"
-AR Path="/578AFEFC/57E31E60" Ref="U712" Part="1"
-F 0 "U712" V 9550 800 50 0000 L CNN
+AR Path="/578AFEFC/57E31E60" Ref="U612" Part="1"
+F 0 "U612" V 9550 800 50 0000 L CNN
F 1 "ESDA6V1-5P6" V 10650 1100 50 0000 C CNN
F 2 "SOT666IP" H 10030 1250 20 0001 C CNN
F 3 "" H 10000 1100 60 0001 C CNN
@@ -741,10 +733,10 @@ VSIM_1
Text Label 7700 9650 0 60 ~ 0
VSIM_2
$Comp
-L 101-00271-82 P702
+L 101-00271-82 P602
U 1 1 57E24C88
P 13200 6000
-F 0 "P702" H 12500 6750 50 0000 L CNN
+F 0 "P602" H 12500 6750 50 0000 L CNN
F 1 "101-00271-82" H 13200 5150 50 0000 C CNN
F 2 "SJ106220" H 13230 6150 20 0001 C CNN
F 3 "" H 13200 6000 60 0001 C CNN
@@ -778,10 +770,10 @@ SWIO_2
NoConn ~ 14300 5500
NoConn ~ 12300 5500
$Comp
-L C0402 C715
+L C0402 C611
U 1 1 57E26CBB
P 11800 6950
-F 0 "C715" H 11840 6990 50 0000 L CNN
+F 0 "C611" H 11840 6990 50 0000 L CNN
F 1 "220n" H 11840 6820 50 0000 L CNN
F 2 "SMD-0402" H 11830 7100 20 0001 C CNN
F 3 "" H 11800 6950 60 0001 C CNN
@@ -800,10 +792,10 @@ F 3 "" H 11800 7350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C713
+L C0402 C609
U 1 1 57E26CC8
P 11450 6950
-F 0 "C713" H 11490 6990 50 0000 L CNN
+F 0 "C609" H 11490 6990 50 0000 L CNN
F 1 "1n" H 11490 6820 50 0000 L CNN
F 2 "SMD-0402" H 11480 7100 20 0001 C CNN
F 3 "" H 11450 6950 60 0001 C CNN
@@ -822,10 +814,10 @@ F 3 "" H 11450 7350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R711
+L R0402 R611
U 1 1 57E27826
P 10450 6100
-F 0 "R711" H 10320 6160 50 0000 L BNN
+F 0 "R611" H 10320 6160 50 0000 L BNN
F 1 "51" H 10450 6100 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 10480 6250 20 0001 C CNN
F 3 "" H 10450 6100 60 0001 C CNN
@@ -833,10 +825,10 @@ F 3 "" H 10450 6100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R710
+L R0402 R610
U 1 1 57E279E9
P 10450 5800
-F 0 "R710" H 10320 5860 50 0000 L BNN
+F 0 "R610" H 10320 5860 50 0000 L BNN
F 1 "51" H 10450 5800 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 10480 5950 20 0001 C CNN
F 3 "" H 10450 5800 60 0001 C CNN
@@ -844,10 +836,10 @@ F 3 "" H 10450 5800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R709
+L R0402 R609
U 1 1 57E2949D
P 10450 5100
-F 0 "R709" H 10320 5160 50 0000 L BNN
+F 0 "R609" H 10320 5160 50 0000 L BNN
F 1 "51" H 10450 5100 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 10480 5250 20 0001 C CNN
F 3 "" H 10450 5100 60 0001 C CNN
@@ -861,8 +853,8 @@ L ESDA6V1-5P6 U?
U 1 1 57E2DD36
P 11250 4400
AR Path="/57E2DD36" Ref="U?" Part="1"
-AR Path="/578AFEFC/57E2DD36" Ref="U713" Part="1"
-F 0 "U713" H 11850 4050 50 0000 R CNN
+AR Path="/578AFEFC/57E2DD36" Ref="U613" Part="1"
+F 0 "U613" H 11850 4050 50 0000 R CNN
F 1 "ESDA6V1-5P6" H 10800 4500 50 0000 R CNN
F 2 "SOT666IP" H 11280 4550 20 0001 C CNN
F 3 "" H 11250 4400 60 0001 C CNN
@@ -881,10 +873,10 @@ F 3 "" H 11350 3900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R707
+L R0402 R607
U 1 1 57E31964
P 9800 3050
-F 0 "R707" H 9670 3110 50 0000 L BNN
+F 0 "R607" H 9670 3110 50 0000 L BNN
F 1 "100k" H 9800 3050 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 9830 3200 20 0001 C CNN
F 3 "" H 9800 3050 60 0001 C CNN
@@ -894,10 +886,10 @@ $EndComp
Text GLabel 9500 3050 0 60 Output ~ 0
CPU_CD_2
$Comp
-L LSF204RUT U703
+L LSF204RUT U602
U 1 1 57E26010
P 3450 9400
-F 0 "U703" H 3100 9850 60 0000 L CNN
+F 0 "U602" H 3100 9850 60 0000 L CNN
F 1 "LSF0204RUT" H 3450 8950 60 0000 C CNN
F 2 "" H 3450 9400 60 0001 C CNN
F 3 "" H 3450 9400 60 0001 C CNN
@@ -905,10 +897,10 @@ F 3 "" H 3450 9400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R702
+L R0402 R602
U 1 1 57E27911
P 4300 8900
-F 0 "R702" H 4170 8960 50 0000 L BNN
+F 0 "R602" H 4170 8960 50 0000 L BNN
F 1 "100k" H 4300 8900 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 4330 9050 20 0001 C CNN
F 3 "" H 4300 8900 60 0001 C CNN
@@ -916,10 +908,10 @@ F 3 "" H 4300 8900 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R703
+L R0402 R603
U 1 1 57E279E6
P 4500 8900
-F 0 "R703" H 4370 8960 50 0000 L BNN
+F 0 "R603" H 4370 8960 50 0000 L BNN
F 1 "100k" H 4500 8900 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 4530 9050 20 0001 C CNN
F 3 "" H 4500 8900 60 0001 C CNN
@@ -927,10 +919,10 @@ F 3 "" H 4500 8900 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L R0402 R704
+L R0402 R604
U 1 1 57E27AB8
P 4700 8900
-F 0 "R704" H 4570 8960 50 0000 L BNN
+F 0 "R604" H 4570 8960 50 0000 L BNN
F 1 "100k" H 4700 8900 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 4730 9050 20 0001 C CNN
F 3 "" H 4700 8900 60 0001 C CNN
@@ -1476,8 +1468,8 @@ P 10150 7050
AR Path="/578AFEF0/57E46F7D" Ref="D?" Part="1"
AR Path="/57E46F7D" Ref="D?" Part="1"
AR Path="/578AFEF2/57E46F7D" Ref="D?" Part="1"
-AR Path="/578AFEFC/57E46F7D" Ref="D701" Part="1"
-F 0 "D701" V 10250 7250 50 0000 L BNN
+AR Path="/578AFEFC/57E46F7D" Ref="D601" Part="1"
+F 0 "D601" V 10250 7250 50 0000 L BNN
F 1 "V5.5MLA0603N" V 10000 7100 50 0000 L BNN
F 2 "neo900-legacy:SMD-0603" H 10140 6840 65 0001 L TNN
F 3 "" H 10150 7050 60 0001 C CNN
diff --git a/hw/v2.sch b/hw/v2.sch
index 6a09623..5550ba0 100644
--- a/hw/v2.sch
+++ b/hw/v2.sch
@@ -59,10 +59,10 @@ connect to BB
Text Notes 4100 7950 0 70 ~ 0
by some Micro-USB cable
$Comp
-L USB-AB-NEW-105017-0001 P3304
+L USB-AB-NEW-105017-0001 P2201
U 5 1 578DEAF4
P 6600 7850
-F 0 "P3304" H 7000 7200 50 0000 R CNN
+F 0 "P2201" H 7000 7200 50 0000 R CNN
F 1 "105017-0001" H 6600 8500 50 0000 C CNN
F 2 "neo900-legacy:105017-0001" H 6491 7170 50 0001 L BNN
F 3 "" H 6600 7850 60 0001 C CNN
@@ -93,10 +93,10 @@ USB_MODEM_DM_U
NoConn ~ 7200 7650
NoConn ~ 7200 8250
$Comp
-L XO-QUAD-EN U3302
+L XO-QUAD-EN U2203
U 1 1 58079D09
P 5800 9700
-F 0 "U3302" H 5500 9950 60 0000 L CNN
+F 0 "U2203" H 5500 9950 60 0000 L CNN
F 1 "CSX-252FAP32768" H 5800 9400 60 0000 C CNN
F 2 "" H 5800 9700 60 0001 C CNN
F 3 "" H 5800 9700 60 0001 C CNN
@@ -106,10 +106,10 @@ $EndComp
Text GLabel 6600 9600 2 60 Input ~ 0
1V8_U
$Comp
-L C0603 C3303
+L C0603 C2201
U 1 1 58079DBC
P 6400 10050
-F 0 "C3303" H 6440 10090 50 0000 L CNN
+F 0 "C2201" H 6440 10090 50 0000 L CNN
F 1 "1u" H 6450 9900 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 6430 10200 20 0001 C CNN
F 3 "" H 6400 10050 60 0001 C CNN
@@ -161,10 +161,10 @@ Modem USB
Text Notes 5250 9200 0 120 ~ 0
32 kHz clock
$Comp
-L XO-QUAD-EN U3301
+L XO-QUAD-EN U2204
U 1 1 5820D8E1
P 9200 9700
-F 0 "U3301" H 8900 9950 60 0000 L CNN
+F 0 "U2204" H 8900 9950 60 0000 L CNN
F 1 "SG-210STF 19.2000ML" H 9200 9400 60 0000 C CNN
F 2 "" H 9200 9700 60 0001 C CNN
F 3 "" H 9200 9700 60 0001 C CNN
@@ -194,10 +194,10 @@ F 3 "" H 9800 10450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0603 C3301
+L C0603 C2202
U 1 1 5820D93F
P 9800 10050
-F 0 "C3301" H 9840 10090 50 0000 L CNN
+F 0 "C2202" H 9840 10090 50 0000 L CNN
F 1 "100n" H 9850 9900 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 9830 10200 20 0001 C CNN
F 3 "" H 9800 10050 60 0001 C CNN
diff --git a/hw/wlan.sch b/hw/wlan.sch
index f161392..74b38f7 100644
--- a/hw/wlan.sch
+++ b/hw/wlan.sch
@@ -67,10 +67,10 @@ filter 3-4 GHz
Text Notes 600 1050 0 70 ~ 0
WiLink8
$Comp
-L C0402 C901
+L C0402 C806
U 1 1 578BC3E2
P 6800 8150
-F 0 "C901" H 6840 8190 50 0000 L CNN
+F 0 "C806" H 6840 8190 50 0000 L CNN
F 1 "1n" H 6840 8020 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 6830 8300 20 0001 C CNN
F 3 "" H 6800 8150 60 0001 C CNN
@@ -78,10 +78,10 @@ F 3 "" H 6800 8150 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C902
+L C0402 C804
U 1 1 578BC4AA
P 5950 9500
-F 0 "C902" H 5990 9540 50 0000 L CNN
+F 0 "C804" H 5990 9540 50 0000 L CNN
F 1 "100n" H 5990 9370 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 5980 9650 20 0001 C CNN
F 3 "" H 5950 9500 60 0001 C CNN
@@ -89,10 +89,10 @@ F 3 "" H 5950 9500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C903
+L C0402 C805
U 1 1 578BC572
P 6450 9500
-F 0 "C903" H 6490 9540 50 0000 L CNN
+F 0 "C805" H 6490 9540 50 0000 L CNN
F 1 "100n" H 6490 9370 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 6480 9650 20 0001 C CNN
F 3 "" H 6450 9500 60 0001 C CNN
@@ -100,10 +100,10 @@ F 3 "" H 6450 9500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L V5.5MLA0603N D901
+L V5.5MLA0603N D801
U 1 1 578BCA22
P 3550 8850
-F 0 "D901" H 3450 9020 50 0000 L BNN
+F 0 "D801" H 3450 9020 50 0000 L BNN
F 1 "V5.5MLA0603N" V 3450 8700 50 0000 R BNN
F 2 "neo900-legacy:SMD-0603" H 3540 8640 65 0001 L TNN
F 3 "" H 3550 8850 60 0001 C CNN
@@ -111,10 +111,10 @@ F 3 "" H 3550 8850 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L L0603 L901
+L L0603 L801
U 1 1 578BCED2
P 4550 8550
-F 0 "L901" V 4491 8400 50 0000 L BNN
+F 0 "L801" V 4491 8400 50 0000 L BNN
F 1 "MLZ1608M100W" V 4650 8250 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 4540 8340 65 0001 L TNN
F 3 "" H 4550 8550 60 0001 C CNN
@@ -122,10 +122,10 @@ F 3 "" H 4550 8550 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L L0402 L902
+L L0402 L802
U 1 1 578BCF9A
P 4950 8850
-F 0 "L902" V 4891 8700 50 0000 L BNN
+F 0 "L802" V 4891 8700 50 0000 L BNN
F 1 "120n" V 5080 8700 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 4940 8640 65 0001 L TNN
F 3 "" H 4950 8850 60 0001 C CNN
@@ -133,10 +133,10 @@ F 3 "" H 4950 8850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R904
+L R0402 R801
U 1 1 578BF25F
P 4050 8550
-F 0 "R904" H 3920 8610 50 0000 L BNN
+F 0 "R801" H 3920 8610 50 0000 L BNN
F 1 "2" H 4050 8550 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 4080 8700 20 0001 C CNN
F 3 "" H 4050 8550 60 0001 C CNN
@@ -144,10 +144,10 @@ F 3 "" H 4050 8550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-PIN-0.8 TP1401
+L TEST-POINT-PIN-0.8 TP803
U 1 1 578BF89F
P 2700 8550
-F 0 "TP1401" H 2690 8540 65 0001 L TNN
+F 0 "TP803" H 2690 8540 65 0001 L TNN
F 1 "LOOP+" H 2760 8526 50 0000 L BNN
F 2 "neo900-legacy:1PIN-1.5-0.8" H 2690 8340 65 0001 L TNN
F 3 "" H 2700 8550 60 0001 C CNN
@@ -155,10 +155,10 @@ F 3 "" H 2700 8550 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L TEST-POINT-SQ-0.8 TP1402
+L TEST-POINT-SQ-0.8 TP804
U 1 1 578BF967
P 2700 9150
-F 0 "TP1402" H 2690 9140 65 0001 L TNN
+F 0 "TP804" H 2690 9140 65 0001 L TNN
F 1 "LOOP-" H 2760 9126 50 0000 L BNN
F 2 "neo900-legacy:1PIN-1.5SQ-0.8" H 2690 8940 65 0001 L TNN
F 3 "" H 2700 9150 60 0001 C CNN
@@ -177,10 +177,10 @@ F 3 "" H 5950 9900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L SI4721BG U902
+L SI4721BG U802
U 1 1 578C019B
P 7750 9050
-F 0 "U902" H 7581 10290 70 0000 L BNN
+F 0 "U802" H 7581 10290 70 0000 L BNN
F 1 "SI4721-B20-GM" H 7750 7750 70 0000 C CNN
F 2 "neo900-legacy:QFN-16+4+E-0.5" H 7740 8840 65 0001 L TNN
F 3 "" H 7750 9050 60 0001 C CNN
@@ -312,10 +312,10 @@ Wire Wire Line
3750 8300 3650 8300
Connection ~ 3750 8550
$Comp
-L WL1837MOD U901
+L WL1837MOD U801
U 5 1 57F02A53
P 14300 3000
-F 0 "U901" H 14300 4450 50 0000 L CNN
+F 0 "U801" H 14300 4450 50 0000 L CNN
F 1 "WL1837MODGIMOC" H 14500 1400 50 0000 C CNN
F 2 "WL1837MOD" H 14250 2100 20 0001 C CNN
F 3 "" H 13550 3250 60 0001 C CNN
@@ -323,10 +323,10 @@ F 3 "" H 13550 3250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L WL1837MOD U901
+L WL1837MOD U801
U 6 1 57F02B1C
P 15300 3400
-F 0 "U901" H 15300 5250 50 0000 L CNN
+F 0 "U801" H 15300 5250 50 0000 L CNN
F 1 "WL1837MODGIMOC" H 15550 1400 50 0000 C CNN
F 2 "WL1837MOD" H 15250 2500 20 0001 C CNN
F 3 "" H 14550 3650 60 0001 C CNN
@@ -550,10 +550,10 @@ $EndComp
Connection ~ 15000 5200
Connection ~ 14000 4400
$Comp
-L WL1837MOD U901
+L WL1837MOD U801
U 2 1 57F06E55
P 9700 5300
-F 0 "U901" H 9200 5850 50 0000 L CNN
+F 0 "U801" H 9200 5850 50 0000 L CNN
F 1 "WL1837MODGIMOC" H 9450 4750 50 0000 C CNN
F 2 "WL1837MOD" H 9650 4400 20 0001 C CNN
F 3 "" H 8950 5550 60 0001 C CNN
@@ -561,10 +561,10 @@ F 3 "" H 8950 5550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L WL1837MOD U901
+L WL1837MOD U801
U 3 1 57F06F41
P 2100 5300
-F 0 "U901" H 1600 5850 50 0000 L CNN
+F 0 "U801" H 1600 5850 50 0000 L CNN
F 1 "WL1837MODGIMOC" H 1850 4650 50 0000 C CNN
F 2 "WL1837MOD" H 2050 4400 20 0001 C CNN
F 3 "" H 1350 5550 60 0001 C CNN
@@ -572,10 +572,10 @@ F 3 "" H 1350 5550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L WL1837MOD U901
+L WL1837MOD U801
U 4 1 57F07025
P 6000 5500
-F 0 "U901" H 5500 6250 50 0000 L CNN
+F 0 "U801" H 5500 6250 50 0000 L CNN
F 1 "WL1837MODGIMOC" H 5750 4850 50 0000 C CNN
F 2 "WL1837MOD" H 5950 4600 20 0001 C CNN
F 3 "" H 5250 5750 60 0001 C CNN
@@ -583,10 +583,10 @@ F 3 "" H 5250 5750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C906
+L C0402 C803
U 1 1 57F08ED2
P 3250 3200
-F 0 "C906" H 3290 3240 50 0000 L CNN
+F 0 "C803" H 3290 3240 50 0000 L CNN
F 1 "1u" H 3290 3070 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 3280 3350 20 0001 C CNN
F 3 "" H 3250 3200 60 0001 C CNN
@@ -594,10 +594,10 @@ F 3 "" H 3250 3200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C904
+L C0402 C801
U 1 1 57F09469
P 2500 3200
-F 0 "C904" H 2540 3240 50 0000 L CNN
+F 0 "C801" H 2540 3240 50 0000 L CNN
F 1 "100n" H 2540 3070 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 2530 3350 20 0001 C CNN
F 3 "" H 2500 3200 60 0001 C CNN
@@ -605,10 +605,10 @@ F 3 "" H 2500 3200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C905
+L C0402 C802
U 1 1 57F0955D
P 2850 3200
-F 0 "C905" H 2890 3240 50 0000 L CNN
+F 0 "C802" H 2890 3240 50 0000 L CNN
F 1 "10u" H 2890 3070 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603" H 2880 3350 20 0001 C CNN
F 3 "" H 2850 3200 60 0001 C CNN
@@ -704,10 +704,10 @@ Wire Wire Line
Wire Wire Line
6450 6000 6200 6000
$Comp
-L WL1837MOD U901
+L WL1837MOD U801
U 1 1 57F06D3A
P 1800 2450
-F 0 "U901" H 1300 3100 50 0000 L CNN
+F 0 "U801" H 1300 3100 50 0000 L CNN
F 1 "WL1837MODGIMOC" H 1550 1850 50 0000 C CNN
F 2 "WL1837MOD" H 1750 1550 20 0001 C CNN
F 3 "" H 1050 2700 60 0001 C CNN
@@ -715,10 +715,10 @@ F 3 "" H 1050 2700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L L0402 L904
+L L0402 L804
U 1 1 57F102B2
P 7300 2250
-F 0 "L904" V 7241 2100 50 0000 L BNN
+F 0 "L804" V 7241 2100 50 0000 L BNN
F 1 "1.3n" V 7430 2100 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 7290 2040 65 0001 L TNN
F 3 "" H 7300 2250 60 0001 C CNN
@@ -726,10 +726,10 @@ F 3 "" H 7300 2250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L L0402 L903
+L L0402 L803
U 1 1 57F10331
P 6800 2250
-F 0 "L903" V 6741 2100 50 0000 L BNN
+F 0 "L803" V 6741 2100 50 0000 L BNN
F 1 "NC" V 6930 2100 50 0000 L BNN
F 2 "neo900-legacy:SMD-0402" H 6790 2040 65 0001 L TNN
F 3 "" H 6800 2250 60 0001 C CNN
@@ -737,10 +737,10 @@ F 3 "" H 6800 2250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C907
+L C0402 C807
U 1 1 57F10393
P 7000 1950
-F 0 "C907" H 7040 1990 50 0000 L CNN
+F 0 "C807" H 7040 1990 50 0000 L CNN
F 1 "1p" H 7040 1820 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 7030 2100 20 0001 C CNN
F 3 "" H 7000 1950 60 0001 C CNN
@@ -748,10 +748,10 @@ F 3 "" H 7000 1950 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L OPT-MINI-RF-TAP J901
+L OPT-MINI-RF-TAP J801
U 1 1 57F104A1
P 5250 1950
-F 0 "J901" H 5150 2100 50 0000 L CNN
+F 0 "J801" H 5150 2100 50 0000 L CNN
F 1 "WL_ANT1" H 5250 1800 50 0000 C CNN
F 2 "OPT-MINI-RF-TAP" H 5280 2100 20 0001 C CNN
F 3 "" H 5250 1950 60 0001 C CNN
@@ -759,10 +759,10 @@ F 3 "" H 5250 1950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L OPT-MINI-RF-TAP J902
+L OPT-MINI-RF-TAP J802
U 1 1 57F1051A
P 5250 2900
-F 0 "J902" H 5150 3050 50 0000 L CNN
+F 0 "J802" H 5150 3050 50 0000 L CNN
F 1 "WL_ANT2" H 5250 2750 50 0000 C CNN
F 2 "OPT-MINI-RF-TAP" H 5280 3050 20 0001 C CNN
F 3 "" H 5250 2900 60 0001 C CNN
@@ -770,10 +770,10 @@ F 3 "" H 5250 2900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R907
+L R0402 R802
U 1 1 57F10A2B
P 5850 2900
-F 0 "R907" H 5720 2960 50 0000 L BNN
+F 0 "R802" H 5720 2960 50 0000 L BNN
F 1 "50" H 5850 2900 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5880 3050 20 0001 C CNN
F 3 "" H 5850 2900 60 0001 C CNN
@@ -781,10 +781,10 @@ F 3 "" H 5850 2900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP901
+L TEST-POINT-0.75 TP801
U 1 1 57F10D1B
P 2400 2400
-F 0 "TP901" H 2350 2450 50 0000 R CNN
+F 0 "TP801" H 2350 2450 50 0000 R CNN
F 1 "WL_TX" H 2460 2375 50 0000 L BNN
F 2 "TP-0.75" H 2430 2550 20 0001 C CNN
F 3 "" H 2400 2400 60 0001 C CNN
@@ -792,10 +792,10 @@ F 3 "" H 2400 2400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP902
+L TEST-POINT-0.75 TP802
U 1 1 57F10D81
P 2400 2500
-F 0 "TP902" H 2350 2550 50 0000 R CNN
+F 0 "TP802" H 2350 2550 50 0000 R CNN
F 1 "WL_RX" H 2460 2475 50 0000 L BNN
F 2 "TP-0.75" H 2430 2650 20 0001 C CNN
F 3 "" H 2400 2500 60 0001 C CNN
@@ -961,10 +961,10 @@ Wire Notes Line
Text Notes 5900 1850 0 60 ~ 0
50 Ohm
$Comp
-L CONNECT-POINTN900-A P901
+L CONNECT-POINTN900-A P801
U 1 1 57F15735
P 7800 1950
-F 0 "P901" H 7800 2050 50 0000 C CNN
+F 0 "P801" H 7800 2050 50 0000 C CNN
F 1 "WLAN_RF" H 7860 1925 50 0000 L BNN
F 2 "N900-SPRING-A" H 7830 2100 20 0001 C CNN
F 3 "" H 7800 1950 60 0001 C CNN
@@ -979,10 +979,10 @@ WL_ANT1
Text Notes 5800 1950 0 30 ~ 0
WL_ANT1
$Comp
-L CONNECT-POINTN900-A P902
+L CONNECT-POINTN900-A P802
U 1 1 57F177B6
P 7800 2250
-F 0 "P902" H 7800 2350 50 0000 C CNN
+F 0 "P802" H 7800 2350 50 0000 C CNN
F 1 "WLAN_GND" H 7860 2225 50 0000 L BNN
F 2 "N900-SPRING-A" H 7830 2400 20 0001 C CNN
F 3 "" H 7800 2250 60 0001 C CNN
@@ -1005,10 +1005,10 @@ Wire Wire Line
Text Notes 7800 1000 0 120 ~ 24
TODO: assign footprints for c-spring contacts
$Comp
-L TEST-POINT-0.75 TP911
+L TEST-POINT-0.75 TP813
U 1 1 57F1A4A6
P 10900 5500
-F 0 "TP911" H 10850 5550 50 0000 R CNN
+F 0 "TP813" H 10850 5550 50 0000 R CNN
F 1 "WL_GPIO4" H 10960 5475 50 0000 L BNN
F 2 "TP-0.75" H 10930 5650 20 0001 C CNN
F 3 "" H 10900 5500 60 0001 C CNN
@@ -1016,10 +1016,10 @@ F 3 "" H 10900 5500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L R0402 R908
+L R0402 R803
U 1 1 57F1B75E
P 10900 6000
-F 0 "R908" H 10770 6060 50 0000 L BNN
+F 0 "R803" H 10770 6060 50 0000 L BNN
F 1 "0" H 10900 6000 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 10930 6150 20 0001 C CNN
F 3 "" H 10900 6000 60 0001 C CNN
@@ -1029,10 +1029,10 @@ $EndComp
Wire Wire Line
10900 6200 10900 6300
$Comp
-L TEST-POINT-0.75 TP910
+L TEST-POINT-0.75 TP812
U 1 1 57F1BA94
P 10900 5400
-F 0 "TP910" H 10850 5450 50 0000 R CNN
+F 0 "TP812" H 10850 5450 50 0000 R CNN
F 1 "WL_RSV2" H 10960 5375 50 0000 L BNN
F 2 "TP-0.75" H 10930 5550 20 0001 C CNN
F 3 "" H 10900 5400 60 0001 C CNN
@@ -1040,10 +1040,10 @@ F 3 "" H 10900 5400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP909
+L TEST-POINT-0.75 TP811
U 1 1 57F1BB11
P 10900 5300
-F 0 "TP909" H 10850 5350 50 0000 R CNN
+F 0 "TP811" H 10850 5350 50 0000 R CNN
F 1 "WL_RSV1" H 10960 5275 50 0000 L BNN
F 2 "TP-0.75" H 10930 5450 20 0001 C CNN
F 3 "" H 10900 5300 60 0001 C CNN
@@ -1051,10 +1051,10 @@ F 3 "" H 10900 5300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP906
+L TEST-POINT-0.75 TP808
U 1 1 57F1BBB5
P 10900 5000
-F 0 "TP906" H 10850 5050 50 0000 R CNN
+F 0 "TP808" H 10850 5050 50 0000 R CNN
F 1 "WL_GPIO9" H 10960 4975 50 0000 L BNN
F 2 "TP-0.75" H 10930 5150 20 0001 C CNN
F 3 "" H 10900 5000 60 0001 C CNN
@@ -1062,10 +1062,10 @@ F 3 "" H 10900 5000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP907
+L TEST-POINT-0.75 TP809
U 1 1 57F1BC42
P 10900 5100
-F 0 "TP907" H 10850 5150 50 0000 R CNN
+F 0 "TP809" H 10850 5150 50 0000 R CNN
F 1 "WL_GPIO10" H 10960 5075 50 0000 L BNN
F 2 "TP-0.75" H 10930 5250 20 0001 C CNN
F 3 "" H 10900 5100 60 0001 C CNN
@@ -1073,10 +1073,10 @@ F 3 "" H 10900 5100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP905
+L TEST-POINT-0.75 TP807
U 1 1 57F1BCC8
P 10900 4900
-F 0 "TP905" H 10850 4950 50 0000 R CNN
+F 0 "TP807" H 10850 4950 50 0000 R CNN
F 1 "WL_GPIO11" H 10960 4875 50 0000 L BNN
F 2 "TP-0.75" H 10930 5050 20 0001 C CNN
F 3 "" H 10900 4900 60 0001 C CNN
@@ -1084,10 +1084,10 @@ F 3 "" H 10900 4900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP908
+L TEST-POINT-0.75 TP810
U 1 1 57F1BE51
P 10900 5200
-F 0 "TP908" H 10850 5250 50 0000 R CNN
+F 0 "TP810" H 10850 5250 50 0000 R CNN
F 1 "WL_GPIO12" H 10960 5175 50 0000 L BNN
F 2 "TP-0.75" H 10930 5350 20 0001 C CNN
F 3 "" H 10900 5200 60 0001 C CNN
@@ -1095,10 +1095,10 @@ F 3 "" H 10900 5200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP912
+L TEST-POINT-0.75 TP814
U 1 1 57F1BED9
P 10900 5600
-F 0 "TP912" H 10850 5650 50 0000 R CNN
+F 0 "TP814" H 10850 5650 50 0000 R CNN
F 1 "WL_RSV3" H 10960 5575 50 0000 L BNN
F 2 "TP-0.75" H 10930 5750 20 0001 C CNN
F 3 "" H 10900 5600 60 0001 C CNN
@@ -1180,10 +1180,10 @@ Wire Wire Line
Wire Wire Line
2550 5400 2300 5400
$Comp
-L TEST-POINT-0.75 TP903
+L TEST-POINT-0.75 TP805
U 1 1 57F225AF
P 2800 6000
-F 0 "TP903" H 2750 6050 50 0000 R CNN
+F 0 "TP805" H 2750 6050 50 0000 R CNN
F 1 "WL_UART_DBG" H 2860 5975 50 0000 L BNN
F 2 "TP-0.75" H 2830 6150 20 0001 C CNN
F 3 "" H 2800 6000 60 0001 C CNN
@@ -1191,10 +1191,10 @@ F 3 "" H 2800 6000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-0.75 TP904
+L TEST-POINT-0.75 TP806
U 1 1 57F229F1
P 6700 5350
-F 0 "TP904" H 6650 5400 50 0000 R CNN
+F 0 "TP806" H 6650 5400 50 0000 R CNN
F 1 "BT_UART_DBG" H 6760 5325 50 0000 L BNN
F 2 "TP-0.75" H 6730 5500 20 0001 C CNN
F 3 "" H 6700 5350 60 0001 C CNN
@@ -1251,10 +1251,10 @@ Text GLabel 9650 8950 2 60 Output ~ 0
FM_nINT
NoConn ~ 8450 8150
$Comp
-L C0402 C910
+L C0402 C810
U 1 1 57F36BFC
P 8750 8550
-F 0 "C910" V 8790 8590 50 0000 L CNN
+F 0 "C810" V 8790 8590 50 0000 L CNN
F 1 "470n" V 8800 8400 50 0000 R CNN
F 2 "neo900-legacy:SMD-0402" H 8780 8700 20 0001 C CNN
F 3 "" H 8750 8550 60 0001 C CNN
@@ -1270,10 +1270,10 @@ Wire Wire Line
Wire Wire Line
9650 8550 8950 8550
$Comp
-L C0402 C911
+L C0402 C811
U 1 1 57F378A5
P 8750 8750
-F 0 "C911" V 8790 8790 50 0000 L CNN
+F 0 "C811" V 8790 8790 50 0000 L CNN
F 1 "470n" V 8800 8600 50 0000 R CNN
F 2 "neo900-legacy:SMD-0402" H 8780 8900 20 0001 C CNN
F 3 "" H 8750 8750 60 0001 C CNN
@@ -1281,10 +1281,10 @@ F 3 "" H 8750 8750 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C909
+L C0402 C809
U 1 1 57F37C49
P 8750 8350
-F 0 "C909" V 8790 8390 50 0000 L CNN
+F 0 "C809" V 8790 8390 50 0000 L CNN
F 1 "470n" V 8800 8200 50 0000 R CNN
F 2 "neo900-legacy:SMD-0402" H 8780 8500 20 0001 C CNN
F 3 "" H 8750 8350 60 0001 C CNN
@@ -1292,10 +1292,10 @@ F 3 "" H 8750 8350 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C908
+L C0402 C808
U 1 1 57F37CD8
P 8700 7950
-F 0 "C908" V 8740 7990 50 0000 L CNN
+F 0 "C808" V 8740 7990 50 0000 L CNN
F 1 "470n" V 8750 7800 50 0000 R CNN
F 2 "neo900-legacy:SMD-0402" H 8730 8100 20 0001 C CNN
F 3 "" H 8700 7950 60 0001 C CNN