summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Almesberger <werner@almesberger.net>2016-11-13 23:27:09 -0300
committerGenerated from internal repo <nobody@neo900.org>2016-11-13 23:27:09 -0300
commita13217f5ae14df31c99122d0e8bcd22ef2cf6024 (patch)
tree888dcc49822300279893f259a270294981930991
parent93af189bca870203c7bb3a016d5ff19caa1b5bed (diff)
downloadee-a13217f5ae14df31c99122d0e8bcd22ef2cf6024.tar.gz
ee-a13217f5ae14df31c99122d0e8bcd22ef2cf6024.tar.bz2
ee-a13217f5ae14df31c99122d0e8bcd22ef2cf6024.zip
hw/: reset annotations and re-annotate everything
-rw-r--r--hw/ants.sch102
-rw-r--r--hw/b2b.sch90
-rw-r--r--hw/battery.sch90
-rw-r--r--hw/bbcam.sch6
-rw-r--r--hw/bbcpu.sch54
-rw-r--r--hw/bbdisp.sch22
-rw-r--r--hw/bob.sch86
-rw-r--r--hw/cams.sch38
-rw-r--r--hw/charger.sch126
-rw-r--r--hw/codec.sch246
-rw-r--r--hw/display.sch204
-rw-r--r--hw/hb.sch38
-rw-r--r--hw/ir.sch38
-rw-r--r--hw/jack.sch162
-rw-r--r--hw/keys.sch118
-rw-r--r--hw/leds.sch91
-rw-r--r--hw/misc.sch38
-rw-r--r--hw/modem.sch58
-rw-r--r--hw/modempwr.sch114
-rw-r--r--hw/nfc.sch138
-rw-r--r--hw/sensors.sch98
-rw-r--r--hw/sims.sch122
-rw-r--r--hw/v2.sch50
-rw-r--r--hw/wlan.sch70
24 files changed, 1101 insertions, 1098 deletions
diff --git a/hw/ants.sch b/hw/ants.sch
index b856a08..a03c68c 100644
--- a/hw/ants.sch
+++ b/hw/ants.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 8 31
+Sheet 8 25
Title "Modem Antennas"
Date "Intentionally Left Blank"
Rev ""
@@ -265,10 +265,10 @@ F 3 "" H 6900 7350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$812
+L GND #U$705
U 1 1 578BABEC
P 3600 6000
-F 0 "#U$812" H 3510 5900 70 0001 L BNN
+F 0 "#U$705" H 3510 5900 70 0001 L BNN
F 1 "GND" H 3510 5900 70 0001 L BNN
F 2 "" H 3600 6000 60 0001 C CNN
F 3 "" H 3600 6000 60 0001 C CNN
@@ -276,10 +276,10 @@ F 3 "" H 3600 6000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$809
+L GND #U$704
U 1 1 578BAC50
P 2800 6000
-F 0 "#U$809" H 2710 5900 70 0001 L BNN
+F 0 "#U$704" H 2710 5900 70 0001 L BNN
F 1 "GND" H 2710 5900 70 0001 L BNN
F 2 "" H 2800 6000 60 0001 C CNN
F 3 "" H 2800 6000 60 0001 C CNN
@@ -287,10 +287,10 @@ F 3 "" H 2800 6000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$807
+L GND #U$702
U 1 1 578BACB4
P 1900 6050
-F 0 "#U$807" H 1810 5950 70 0001 L BNN
+F 0 "#U$702" H 1810 5950 70 0001 L BNN
F 1 "GND" H 1810 5950 70 0001 L BNN
F 2 "" H 1900 6050 60 0001 C CNN
F 3 "" H 1900 6050 60 0001 C CNN
@@ -298,10 +298,10 @@ F 3 "" H 1900 6050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$804
+L GND #U$701
U 1 1 578BAF0C
P 1800 2750
-F 0 "#U$804" H 1710 2650 70 0001 L BNN
+F 0 "#U$701" H 1710 2650 70 0001 L BNN
F 1 "GND" H 1710 2650 70 0001 L BNN
F 2 "" H 1800 2750 60 0001 C CNN
F 3 "" H 1800 2750 60 0001 C CNN
@@ -309,10 +309,10 @@ F 3 "" H 1800 2750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$805
+L GND #U$703
U 1 1 578BAF70
P 2000 3850
-F 0 "#U$805" H 1910 3750 70 0001 L BNN
+F 0 "#U$703" H 1910 3750 70 0001 L BNN
F 1 "GND" H 1910 3750 70 0001 L BNN
F 2 "" H 2000 3850 60 0001 C CNN
F 3 "" H 2000 3850 60 0001 C CNN
@@ -320,10 +320,10 @@ F 3 "" H 2000 3850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$823
+L GND #U$715
U 1 1 578BB038
P 9300 3750
-F 0 "#U$823" H 9210 3650 70 0001 L BNN
+F 0 "#U$715" H 9210 3650 70 0001 L BNN
F 1 "GND" H 9210 3650 70 0001 L BNN
F 2 "" H 9300 3750 60 0001 C CNN
F 3 "" H 9300 3750 60 0001 C CNN
@@ -331,10 +331,10 @@ F 3 "" H 9300 3750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$815
+L GND #U$710
U 1 1 578BB484
P 6200 3750
-F 0 "#U$815" H 6110 3650 70 0001 L BNN
+F 0 "#U$710" H 6110 3650 70 0001 L BNN
F 1 "GND" H 6110 3650 70 0001 L BNN
F 2 "" H 6200 3750 60 0001 C CNN
F 3 "" H 6200 3750 60 0001 C CNN
@@ -342,10 +342,10 @@ F 3 "" H 6200 3750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$824
+L GND #U$718
U 1 1 578BB4E8
P 9700 3750
-F 0 "#U$824" H 9610 3650 70 0001 L BNN
+F 0 "#U$718" H 9610 3650 70 0001 L BNN
F 1 "GND" H 9610 3650 70 0001 L BNN
F 2 "" H 9700 3750 60 0001 C CNN
F 3 "" H 9700 3750 60 0001 C CNN
@@ -353,10 +353,10 @@ F 3 "" H 9700 3750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$814
+L GND #U$708
U 1 1 578BB5B0
P 5100 5900
-F 0 "#U$814" H 5010 5800 70 0001 L BNN
+F 0 "#U$708" H 5010 5800 70 0001 L BNN
F 1 "GND" H 5010 5800 70 0001 L BNN
F 2 "" H 5100 5900 60 0001 C CNN
F 3 "" H 5100 5900 60 0001 C CNN
@@ -364,10 +364,10 @@ F 3 "" H 5100 5900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$816
+L GND #U$709
U 1 1 578BB614
P 5600 6500
-F 0 "#U$816" H 5510 6400 70 0001 L BNN
+F 0 "#U$709" H 5510 6400 70 0001 L BNN
F 1 "GND" H 5510 6400 70 0001 L BNN
F 2 "" H 5600 6500 60 0001 C CNN
F 3 "" H 5600 6500 60 0001 C CNN
@@ -375,10 +375,10 @@ F 3 "" H 5600 6500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$813
+L GND #U$707
U 1 1 578BB678
P 4700 7850
-F 0 "#U$813" H 4610 7750 70 0001 L BNN
+F 0 "#U$707" H 4610 7750 70 0001 L BNN
F 1 "GND" H 4610 7750 70 0001 L BNN
F 2 "" H 4700 7850 60 0001 C CNN
F 3 "" H 4700 7850 60 0001 C CNN
@@ -386,10 +386,10 @@ F 3 "" H 4700 7850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$821
+L GND #U$713
U 1 1 578BB7A4
P 7200 7850
-F 0 "#U$821" H 7110 7750 70 0001 L BNN
+F 0 "#U$713" H 7110 7750 70 0001 L BNN
F 1 "GND" H 7110 7750 70 0001 L BNN
F 2 "" H 7200 7850 60 0001 C CNN
F 3 "" H 7200 7850 60 0001 C CNN
@@ -397,10 +397,10 @@ F 3 "" H 7200 7850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$822
+L GND #U$714
U 1 1 578BB808
P 7450 7000
-F 0 "#U$822" H 7360 6900 70 0001 L BNN
+F 0 "#U$714" H 7360 6900 70 0001 L BNN
F 1 "GND" H 7360 6900 70 0001 L BNN
F 2 "" H 7450 7000 60 0001 C CNN
F 3 "" H 7450 7000 60 0001 C CNN
@@ -408,10 +408,10 @@ F 3 "" H 7450 7000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$820
+L GND #U$712
U 1 1 578BB86C
P 7100 7000
-F 0 "#U$820" H 7010 6900 70 0001 L BNN
+F 0 "#U$712" H 7010 6900 70 0001 L BNN
F 1 "GND" H 7010 6900 70 0001 L BNN
F 2 "" H 7100 7000 60 0001 C CNN
F 3 "" H 7100 7000 60 0001 C CNN
@@ -419,10 +419,10 @@ F 3 "" H 7100 7000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$817
+L GND #U$711
U 1 1 578BB8D0
P 6400 8350
-F 0 "#U$817" H 6310 8250 70 0001 L BNN
+F 0 "#U$711" H 6310 8250 70 0001 L BNN
F 1 "GND" H 6310 8250 70 0001 L BNN
F 2 "" H 6400 8350 60 0001 C CNN
F 3 "" H 6400 8350 60 0001 C CNN
@@ -537,10 +537,10 @@ F 3 "" H 3300 3150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$811
+L GND #U$706
U 1 1 57E5D83B
P 4100 3400
-F 0 "#U$811" H 4010 3300 70 0001 L BNN
+F 0 "#U$706" H 4010 3300 70 0001 L BNN
F 1 "GND" H 4010 3300 70 0001 L BNN
F 2 "" H 4100 3400 60 0001 C CNN
F 3 "" H 4100 3400 60 0001 C CNN
@@ -598,10 +598,10 @@ F 3 "" H 11600 7800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$803
+L GND #U$720
U 1 1 57E5A29A
P 11600 8200
-F 0 "#U$803" H 11510 8100 70 0001 L BNN
+F 0 "#U$720" H 11510 8100 70 0001 L BNN
F 1 "GND" H 11510 8100 70 0001 L BNN
F 2 "" H 11600 8200 60 0001 C CNN
F 3 "" H 11600 8200 60 0001 C CNN
@@ -611,10 +611,10 @@ $EndComp
Text GLabel 11400 6950 0 60 Input ~ 0
1V8
$Comp
-L GND #U$806
+L GND #U$722
U 1 1 57E5AE66
P 13200 8200
-F 0 "#U$806" H 13110 8100 70 0001 L BNN
+F 0 "#U$722" H 13110 8100 70 0001 L BNN
F 1 "GND" H 13110 8100 70 0001 L BNN
F 2 "" H 13200 8200 60 0001 C CNN
F 3 "" H 13200 8200 60 0001 C CNN
@@ -659,10 +659,10 @@ F 3 "" H 11900 2400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$818
+L GND #U$719
U 1 1 57E8AEF6
P 11300 2800
-F 0 "#U$818" H 11210 2700 70 0001 L BNN
+F 0 "#U$719" H 11210 2700 70 0001 L BNN
F 1 "GND" H 11210 2700 70 0001 L BNN
F 2 "" H 11300 2800 60 0001 C CNN
F 3 "" H 11300 2800 60 0001 C CNN
@@ -670,10 +670,10 @@ F 3 "" H 11300 2800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$819
+L GND #U$721
U 1 1 57E8B285
P 11900 2800
-F 0 "#U$819" H 11810 2700 70 0001 L BNN
+F 0 "#U$721" H 11810 2700 70 0001 L BNN
F 1 "GND" H 11810 2700 70 0001 L BNN
F 2 "" H 11900 2800 60 0001 C CNN
F 3 "" H 11900 2800 60 0001 C CNN
@@ -712,10 +712,10 @@ NoConn ~ 11700 7150
NoConn ~ 11700 7050
NoConn ~ 12500 7950
$Comp
-L POWERED #FLG801
+L POWERED #FLG701
U 1 1 580A096E
P 1800 1850
-F 0 "#FLG801" H 2000 1750 60 0001 C CNN
+F 0 "#FLG701" H 2000 1750 60 0001 C CNN
F 1 "POWERED" H 1800 1900 60 0000 C CNN
F 2 "" H 1800 1850 60 0001 C CNN
F 3 "" H 1800 1850 60 0001 C CNN
@@ -749,10 +749,10 @@ F 3 "" H 14250 9450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$808
+L GND #U$723
U 1 1 58193AB0
P 14250 9850
-F 0 "#U$808" H 14160 9750 70 0001 L BNN
+F 0 "#U$723" H 14160 9750 70 0001 L BNN
F 1 "GND" H 14160 9750 70 0001 L BNN
F 2 "" H 14250 9850 60 0001 C CNN
F 3 "" H 14250 9850 60 0001 C CNN
@@ -760,10 +760,10 @@ F 3 "" H 14250 9850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$810
+L GND #U$724
U 1 1 58193B74
P 14600 9850
-F 0 "#U$810" H 14510 9750 70 0001 L BNN
+F 0 "#U$724" H 14510 9750 70 0001 L BNN
F 1 "GND" H 14510 9750 70 0001 L BNN
F 2 "" H 14600 9850 60 0001 C CNN
F 3 "" H 14600 9850 60 0001 C CNN
@@ -837,10 +837,10 @@ F 3 "" H 9500 7250 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$801
+L GND #U$716
U 1 1 58195E05
P 9500 7650
-F 0 "#U$801" H 9410 7550 70 0001 L BNN
+F 0 "#U$716" H 9410 7550 70 0001 L BNN
F 1 "GND" H 9410 7550 70 0001 L BNN
F 2 "" H 9500 7650 60 0001 C CNN
F 3 "" H 9500 7650 60 0001 C CNN
@@ -1232,10 +1232,10 @@ Connection ~ 9500 6200
Wire Wire Line
10000 6700 10000 7050
$Comp
-L GND #U$802
+L GND #U$717
U 1 1 581B595A
P 9500 9300
-F 0 "#U$802" H 9410 9200 70 0001 L BNN
+F 0 "#U$717" H 9410 9200 70 0001 L BNN
F 1 "GND" H 9410 9200 70 0001 L BNN
F 2 "" H 9500 9300 60 0001 C CNN
F 3 "" H 9500 9300 60 0001 C CNN
diff --git a/hw/b2b.sch b/hw/b2b.sch
index 1390cbd..061346d 100644
--- a/hw/b2b.sch
+++ b/hw/b2b.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 19 31
+Sheet 19 25
Title "B2B LOWER-UPPER"
Date "Intentionally Left Blank"
Rev ""
@@ -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$0292
+L GND #U$1608
U 1 1 57F439C6
P 7700 10000
-F 0 "#U$0292" H 7610 9900 70 0001 L BNN
+F 0 "#U$1608" 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$0293
+L GND #U$1606
U 1 1 57F439D7
P 6500 10000
-F 0 "#U$0293" H 6410 9900 70 0001 L BNN
+F 0 "#U$1606" 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$0294
+L GND #U$1604
U 1 1 57F43F89
P 3400 10000
-F 0 "#U$0294" H 3310 9900 70 0001 L BNN
+F 0 "#U$1604" 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$0295
+L GND #U$1602
U 1 1 57F43F9A
P 2200 10000
-F 0 "#U$0295" H 2110 9900 70 0001 L BNN
+F 0 "#U$1602" 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
@@ -423,10 +423,10 @@ IOX1_INT
Text GLabel 11250 3950 0 60 Input ~ 0
1V8
$Comp
-L GND #U$0296
+L GND #U$1613
U 1 1 57F469A2
P 11800 4550
-F 0 "#U$0296" H 11710 4450 70 0001 L BNN
+F 0 "#U$1613" 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
@@ -445,10 +445,10 @@ F 3 "" H 11400 4150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0297
+L GND #U$1609
U 1 1 57F46C80
P 11400 4550
-F 0 "#U$0297" H 11310 4450 70 0001 L BNN
+F 0 "#U$1609" 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$0298
+L GND #U$1615
U 1 1 57F46F2B
P 11800 7250
-F 0 "#U$0298" H 11710 7150 70 0001 L BNN
+F 0 "#U$1615" 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
@@ -486,10 +486,10 @@ F 3 "" H 11400 6850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0299
+L GND #U$1610
U 1 1 57F46F3E
P 11400 7250
-F 0 "#U$0299" H 11310 7150 70 0001 L BNN
+F 0 "#U$1610" 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$0300
+L GND #U$1617
U 1 1 57F4913B
P 11800 9950
-F 0 "#U$0300" H 11710 9850 70 0001 L BNN
+F 0 "#U$1617" 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
@@ -525,10 +525,10 @@ F 3 "" H 11400 9550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0301
+L GND #U$1611
U 1 1 57F4914C
P 11400 9950
-F 0 "#U$0301" H 11310 9850 70 0001 L BNN
+F 0 "#U$1611" 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$0302
+L GND #U$1612
U 1 1 57F493AF
P 11800 3250
-F 0 "#U$0302" H 11710 3150 70 0001 L BNN
+F 0 "#U$1612" 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$0303
+L GND #U$1614
U 1 1 57F4992B
P 11800 5950
-F 0 "#U$0303" H 11710 5850 70 0001 L BNN
+F 0 "#U$1614" 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$0304
+L GND #U$1616
U 1 1 57F49D8E
P 11800 8650
-F 0 "#U$0304" H 11710 8550 70 0001 L BNN
+F 0 "#U$1616" 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
@@ -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$0305" Part="1"
-F 0 "#U$0305" H 2080 5201 70 0001 L BNN
+AR Path="/578AFF16/57F744B5" Ref="#U$1601" Part="1"
+F 0 "#U$1601" 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$0306" Part="1"
-F 0 "#U$0306" H 3280 5201 70 0001 L BNN
+AR Path="/578AFF16/57F744BB" Ref="#U$1603" Part="1"
+F 0 "#U$1603" 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$0307" Part="1"
-F 0 "#U$0307" H 6380 5201 70 0001 L BNN
+AR Path="/578AFF16/57F744C1" Ref="#U$1605" Part="1"
+F 0 "#U$1605" 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$0308" Part="1"
-F 0 "#U$0308" H 7580 5201 70 0001 L BNN
+AR Path="/578AFF16/57F744C7" Ref="#U$1607" Part="1"
+F 0 "#U$1607" 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 #FLG0309
+L POWERED #FLG1601
U 1 1 580A5A5C
P 2200 1900
-F 0 "#FLG0309" H 2400 1800 60 0001 C CNN
+F 0 "#FLG1601" 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
@@ -957,10 +957,10 @@ $EndComp
Text Notes 14850 7200 0 60 ~ 0
100k x 8
$Comp
-L GND #U$0310
+L GND #U$1618
U 1 1 5827C23E
P 14000 7550
-F 0 "#U$0310" H 13910 7450 70 0001 L BNN
+F 0 "#U$1618" 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$0311
+L GND #U$1620
U 1 1 5827C26A
P 14700 7550
-F 0 "#U$0311" H 14610 7450 70 0001 L BNN
+F 0 "#U$1620" 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
@@ -1696,10 +1696,10 @@ F 3 "" H 14400 8900 70 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$0312
+L GND #U$1619
U 1 1 5827F2E1
P 14000 9400
-F 0 "#U$0312" H 13910 9300 70 0001 L BNN
+F 0 "#U$1619" 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$0313
+L GND #U$1621
U 1 1 5827F310
P 14700 9400
-F 0 "#U$0313" H 14610 9300 70 0001 L BNN
+F 0 "#U$1621" 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 a146154..97fbe33 100644
--- a/hw/battery.sch
+++ b/hw/battery.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 5 31
+Sheet 5 25
Title "Battery"
Date "Intentionally Left Blank"
Rev ""
@@ -288,10 +288,10 @@ F 3 "" H 4800 5100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$501
+L GND #U$301
U 1 1 578B3BD4
P 3750 4000
-F 0 "#U$501" H 3660 3900 70 0001 L BNN
+F 0 "#U$301" H 3660 3900 70 0001 L BNN
F 1 "GND" H 3660 3900 70 0001 L BNN
F 2 "" H 3750 4000 60 0001 C CNN
F 3 "" H 3750 4000 60 0001 C CNN
@@ -299,10 +299,10 @@ F 3 "" H 3750 4000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$514
+L GND #U$314
U 1 1 578B3C38
P 11500 3700
-F 0 "#U$514" H 11410 3600 70 0001 L BNN
+F 0 "#U$314" H 11410 3600 70 0001 L BNN
F 1 "GND" H 11410 3600 70 0001 L BNN
F 2 "" H 11500 3700 60 0001 C CNN
F 3 "" H 11500 3700 60 0001 C CNN
@@ -310,10 +310,10 @@ F 3 "" H 11500 3700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$502
+L GND #U$302
U 1 1 578B3C9C
P 4300 5400
-F 0 "#U$502" H 4210 5300 70 0001 L BNN
+F 0 "#U$302" H 4210 5300 70 0001 L BNN
F 1 "GND" H 4210 5300 70 0001 L BNN
F 2 "" H 4300 5400 60 0001 C CNN
F 3 "" H 4300 5400 60 0001 C CNN
@@ -321,10 +321,10 @@ F 3 "" H 4300 5400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$513
+L GND #U$313
U 1 1 578B3D00
P 10000 4300
-F 0 "#U$513" H 9910 4200 70 0001 L BNN
+F 0 "#U$313" H 9910 4200 70 0001 L BNN
F 1 "GND" H 9910 4200 70 0001 L BNN
F 2 "" H 10000 4300 60 0001 C CNN
F 3 "" H 10000 4300 60 0001 C CNN
@@ -332,10 +332,10 @@ F 3 "" H 10000 4300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$512
+L GND #U$312
U 1 1 578B3D64
P 9500 4300
-F 0 "#U$512" H 9410 4200 70 0001 L BNN
+F 0 "#U$312" H 9410 4200 70 0001 L BNN
F 1 "GND" H 9410 4200 70 0001 L BNN
F 2 "" H 9500 4300 60 0001 C CNN
F 3 "" H 9500 4300 60 0001 C CNN
@@ -343,10 +343,10 @@ F 3 "" H 9500 4300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$505
+L GND #U$305
U 1 1 578B3E2C
P 5500 6000
-F 0 "#U$505" H 5410 5900 70 0001 L BNN
+F 0 "#U$305" H 5410 5900 70 0001 L BNN
F 1 "GND" H 5410 5900 70 0001 L BNN
F 2 "" H 5500 6000 60 0001 C CNN
F 3 "" H 5500 6000 60 0001 C CNN
@@ -354,10 +354,10 @@ F 3 "" H 5500 6000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$510
+L GND #U$310
U 1 1 578B3E90
P 8500 5800
-F 0 "#U$510" H 8410 5700 70 0001 L BNN
+F 0 "#U$310" H 8410 5700 70 0001 L BNN
F 1 "GND" H 8410 5700 70 0001 L BNN
F 2 "" H 8500 5800 60 0001 C CNN
F 3 "" H 8500 5800 60 0001 C CNN
@@ -365,10 +365,10 @@ F 3 "" H 8500 5800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$511
+L GND #U$311
U 1 1 578B3EF4
P 9150 5800
-F 0 "#U$511" H 9060 5700 70 0001 L BNN
+F 0 "#U$311" H 9060 5700 70 0001 L BNN
F 1 "GND" H 9060 5700 70 0001 L BNN
F 2 "" H 9150 5800 60 0001 C CNN
F 3 "" H 9150 5800 60 0001 C CNN
@@ -376,10 +376,10 @@ F 3 "" H 9150 5800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$507
+L GND #U$307
U 1 1 578B3F58
P 6700 7800
-F 0 "#U$507" H 6610 7700 70 0001 L BNN
+F 0 "#U$307" H 6610 7700 70 0001 L BNN
F 1 "GND" H 6610 7700 70 0001 L BNN
F 2 "" H 6700 7800 60 0001 C CNN
F 3 "" H 6700 7800 60 0001 C CNN
@@ -387,10 +387,10 @@ F 3 "" H 6700 7800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$509
+L GND #U$309
U 1 1 578B3FBC
P 8400 7750
-F 0 "#U$509" H 8310 7650 70 0001 L BNN
+F 0 "#U$309" H 8310 7650 70 0001 L BNN
F 1 "GND" H 8310 7650 70 0001 L BNN
F 2 "" H 8400 7750 60 0001 C CNN
F 3 "" H 8400 7750 60 0001 C CNN
@@ -440,10 +440,10 @@ I2C3_SDA
Text Label 5850 3200 0 60 ~ 0
BGND
$Comp
-L GND #U$508
+L GND #U$308
U 1 1 57907684
P 7700 4450
-F 0 "#U$508" H 7610 4350 70 0001 L BNN
+F 0 "#U$308" H 7610 4350 70 0001 L BNN
F 1 "GND" H 7610 4350 70 0001 L BNN
F 2 "" H 7700 4450 60 0001 C CNN
F 3 "" H 7700 4450 60 0001 C CNN
@@ -451,10 +451,10 @@ F 3 "" H 7700 4450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG503
+L POWERED #FLG302
U 1 1 57908456
P 6600 5600
-F 0 "#FLG503" H 6800 5500 60 0001 C CNN
+F 0 "#FLG302" H 6800 5500 60 0001 C CNN
F 1 "POWERED" H 6600 5650 60 0000 C CNN
F 2 "" H 6600 5600 60 0001 C CNN
F 3 "" H 6600 5600 60 0001 C CNN
@@ -462,10 +462,10 @@ F 3 "" H 6600 5600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG501
+L POWERED #FLG301
U 1 1 5790A564
P 5050 2950
-F 0 "#FLG501" H 5250 2850 60 0001 C CNN
+F 0 "#FLG301" H 5250 2850 60 0001 C CNN
F 1 "POWERED" H 5050 3000 60 0000 C CNN
F 2 "" H 5050 2950 60 0001 C CNN
F 3 "" H 5050 2950 60 0001 C CNN
@@ -475,10 +475,10 @@ $EndComp
Text GLabel 8900 7200 2 60 Input ~ 0
BATTID
$Comp
-L GND #M501
+L GND #M301
U 1 1 5794DFFF
P 8700 8900
-F 0 "#M501" H 8700 8900 45 0001 C CNN
+F 0 "#M301" H 8700 8900 45 0001 C CNN
F 1 "GND" H 8700 8900 45 0001 C CNN
F 2 "" H 8700 8900 60 0001 C CNN
F 3 "" H 8700 8900 60 0001 C CNN
@@ -499,10 +499,10 @@ $EndComp
Text Notes 5300 3550 0 60 ~ 0
DNP
$Comp
-L POWERED #FLG504
+L POWERED #FLG303
U 1 1 5794EF24
P 6850 2900
-F 0 "#FLG504" H 7050 2800 60 0001 C CNN
+F 0 "#FLG303" H 7050 2800 60 0001 C CNN
F 1 "POWERED" H 6850 2950 60 0000 C CNN
F 2 "" H 6850 2900 60 0001 C CNN
F 3 "" H 6850 2900 60 0001 C CNN
@@ -741,10 +741,10 @@ F 3 "" H 11900 3200 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$515
+L GND #U$315
U 1 1 58085954
P 11900 3700
-F 0 "#U$515" H 11810 3600 70 0001 L BNN
+F 0 "#U$315" H 11810 3600 70 0001 L BNN
F 1 "GND" H 11810 3600 70 0001 L BNN
F 2 "" H 11900 3700 60 0001 C CNN
F 3 "" H 11900 3700 60 0001 C CNN
@@ -814,10 +814,10 @@ F 3 "" H 4450 1700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$504
+L GND #U$304
U 1 1 58086B09
P 5100 2300
-F 0 "#U$504" H 5010 2200 70 0001 L BNN
+F 0 "#U$304" H 5010 2200 70 0001 L BNN
F 1 "GND" H 5010 2200 70 0001 L BNN
F 2 "" H 5100 2300 60 0001 C CNN
F 3 "" H 5100 2300 60 0001 C CNN
@@ -825,10 +825,10 @@ F 3 "" H 5100 2300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$506
+L GND #U$306
U 1 1 58086B68
P 5550 2300
-F 0 "#U$506" H 5460 2200 70 0001 L BNN
+F 0 "#U$306" H 5460 2200 70 0001 L BNN
F 1 "GND" H 5460 2200 70 0001 L BNN
F 2 "" H 5550 2300 60 0001 C CNN
F 3 "" H 5550 2300 60 0001 C CNN
@@ -854,10 +854,10 @@ F 3 "" H 4800 1950 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$503
+L GND #U$303
U 1 1 58087861
P 4800 2300
-F 0 "#U$503" H 4710 2200 70 0001 L BNN
+F 0 "#U$303" H 4710 2200 70 0001 L BNN
F 1 "GND" H 4710 2200 70 0001 L BNN
F 2 "" H 4800 2300 60 0001 C CNN
F 3 "" H 4800 2300 60 0001 C CNN
@@ -883,10 +883,10 @@ Wire Wire Line
5050 3150 5050 3400
Connection ~ 5050 3400
$Comp
-L POWERED #FLG?
+L POWERED #FLG305
U 1 1 5809DB74
P 8200 4350
-F 0 "#FLG?" H 8400 4250 60 0001 C CNN
+F 0 "#FLG305" H 8400 4250 60 0001 C CNN
F 1 "POWERED" H 8200 4400 60 0000 C CNN
F 2 "" H 8200 4350 60 0001 C CNN
F 3 "" H 8200 4350 60 0001 C CNN
@@ -897,10 +897,10 @@ Wire Wire Line
8200 4550 8200 4700
Connection ~ 8200 4700
$Comp
-L POWERED #FLG?
+L POWERED #FLG304
U 1 1 5809EE68
P 7500 2900
-F 0 "#FLG?" H 7700 2800 60 0001 C CNN
+F 0 "#FLG304" H 7700 2800 60 0001 C CNN
F 1 "POWERED" H 7500 2950 60 0000 C CNN
F 2 "" H 7500 2900 60 0001 C CNN
F 3 "" H 7500 2900 60 0001 C CNN
@@ -964,10 +964,10 @@ F 3 "" H 13300 3500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$?
+L GND #U$316
U 1 1 58120784
P 12900 3300
-F 0 "#U$?" H 12810 3200 70 0001 L BNN
+F 0 "#U$316" H 12810 3200 70 0001 L BNN
F 1 "GND" H 12810 3200 70 0001 L BNN
F 2 "" H 12900 3300 60 0001 C CNN
F 3 "" H 12900 3300 60 0001 C CNN
diff --git a/hw/bbcam.sch b/hw/bbcam.sch
index 495201b..4278d0d 100644
--- a/hw/bbcam.sch
+++ b/hw/bbcam.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 36 31
+Sheet 36 25
Title "BB-xM Adapter (CAM)"
Date "Intentionally Left Blank"
Rev ""
@@ -178,10 +178,10 @@ F 3 "" H 10100 4550 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND #M0402
+L GND #M2501
U 1 1 580FA6DE
P 10600 6400
-F 0 "#M0402" H 10600 6400 45 0001 C CNN
+F 0 "#M2501" H 10600 6400 45 0001 C CNN
F 1 "GND" H 10600 6400 45 0001 C CNN
F 2 "" H 10600 6400 60 0001 C CNN
F 3 "" H 10600 6400 60 0001 C CNN
diff --git a/hw/bbcpu.sch b/hw/bbcpu.sch
index 5272f0a..6d19410 100644
--- a/hw/bbcpu.sch
+++ b/hw/bbcpu.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 34 31
+Sheet 34 25
Title "BB-xM Adapter (CPU)"
Date "Intentionally Left Blank"
Rev ""
@@ -83,10 +83,10 @@ TODO: update pin names in footprint
Text GLabel 10050 2850 2 65 Output ~ 0
nRESWARM_U
$Comp
-L GND #M3407
+L GND #M2307
U 1 1 57F71484
P 9750 2650
-F 0 "#M3407" H 9750 2650 45 0001 C CNN
+F 0 "#M2307" H 9750 2650 45 0001 C CNN
F 1 "GND" H 9750 2650 45 0001 C CNN
F 2 "" H 9750 2650 60 0001 C CNN
F 3 "" H 9750 2650 60 0001 C CNN
@@ -94,10 +94,10 @@ F 3 "" H 9750 2650 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #M3404
+L GND #M2304
U 1 1 57F714BA
P 5950 2650
-F 0 "#M3404" H 5950 2650 45 0001 C CNN
+F 0 "#M2304" H 5950 2650 45 0001 C CNN
F 1 "GND" H 5950 2650 45 0001 C CNN
F 2 "" H 5950 2650 60 0001 C CNN
F 3 "" H 5950 2650 60 0001 C CNN
@@ -117,10 +117,10 @@ Wire Wire Line
Text Notes 5350 5300 2 60 ~ 0
(weak)
$Comp
-L GND #M3405
+L GND #M2305
U 1 1 57F72456
P 6800 9450
-F 0 "#M3405" H 6800 9450 45 0001 C CNN
+F 0 "#M2305" H 6800 9450 45 0001 C CNN
F 1 "GND" H 6800 9450 45 0001 C CNN
F 2 "" H 6800 9450 60 0001 C CNN
F 3 "" H 6800 9450 60 0001 C CNN
@@ -128,10 +128,10 @@ F 3 "" H 6800 9450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #M3406
+L GND #M2306
U 1 1 57F7248F
P 8800 9450
-F 0 "#M3406" H 8800 9450 45 0001 C CNN
+F 0 "#M2306" H 8800 9450 45 0001 C CNN
F 1 "GND" H 8800 9450 45 0001 C CNN
F 2 "" H 8800 9450 60 0001 C CNN
F 3 "" H 8800 9450 60 0001 C CNN
@@ -275,10 +275,10 @@ Text GLabel 11850 3750 0 60 Input ~ 0
Wire Wire Line
11850 3750 12100 3750
$Comp
-L GND #M3408
+L GND #M2308
U 1 1 5807890E
P 12000 5100
-F 0 "#M3408" H 12000 5100 45 0001 C CNN
+F 0 "#M2308" H 12000 5100 45 0001 C CNN
F 1 "GND" H 12000 5100 45 0001 C CNN
F 2 "" H 12000 5100 60 0001 C CNN
F 3 "" H 12000 5100 60 0001 C CNN
@@ -331,10 +331,10 @@ Wire Wire Line
Text GLabel 14250 4250 2 60 BiDi ~ 0
MCBSP4_CLKX_U
$Comp
-L GND #M3409
+L GND #M2309
U 1 1 58078EA2
P 13600 5100
-F 0 "#M3409" H 13600 5100 45 0001 C CNN
+F 0 "#M2309" H 13600 5100 45 0001 C CNN
F 1 "GND" H 13600 5100 45 0001 C CNN
F 2 "" H 13600 5100 60 0001 C CNN
F 3 "" H 13600 5100 60 0001 C CNN
@@ -369,10 +369,10 @@ F 3 "" H 2700 9600 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L GND #M3401
+L GND #M2301
U 1 1 5807A6CC
P 2200 10800
-F 0 "#M3401" H 2200 10800 45 0001 C CNN
+F 0 "#M2301" H 2200 10800 45 0001 C CNN
F 1 "GND" H 2200 10800 45 0001 C CNN
F 2 "" H 2200 10800 60 0001 C CNN
F 3 "" H 2200 10800 60 0001 C CNN
@@ -391,10 +391,10 @@ F 3 "" H 3250 10350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #M3402
+L GND #M2302
U 1 1 5807A7EC
P 3250 10800
-F 0 "#M3402" H 3250 10800 45 0001 C CNN
+F 0 "#M2302" H 3250 10800 45 0001 C CNN
F 1 "GND" H 3250 10800 45 0001 C CNN
F 2 "" H 3250 10800 60 0001 C CNN
F 3 "" H 3250 10800 60 0001 C CNN
@@ -431,10 +431,10 @@ Wire Wire Line
NoConn ~ 2300 9950
NoConn ~ 2300 10050
$Comp
-L GND #M3403
+L GND #M2303
U 1 1 5807AC70
P 3750 10250
-F 0 "#M3403" H 3750 10250 45 0001 C CNN
+F 0 "#M2303" H 3750 10250 45 0001 C CNN
F 1 "GND" H 3750 10250 45 0001 C CNN
F 2 "" H 3750 10250 60 0001 C CNN
F 3 "" H 3750 10250 60 0001 C CNN
@@ -539,8 +539,8 @@ L GND #U$?
U 1 1 580E02D5
P 1750 5450
AR Path="/578AFF16/580E02D5" Ref="#U$?" Part="1"
-AR Path="/578AFF32/580E02D5" Ref="#U$3403" Part="1"
-F 0 "#U$3403" H 1660 5350 70 0001 L BNN
+AR Path="/578AFF32/580E02D5" Ref="#U$2303" Part="1"
+F 0 "#U$2303" H 1660 5350 70 0001 L BNN
F 1 "GND" H 1660 5350 70 0001 L BNN
F 2 "" H 1750 5450 60 0001 C CNN
F 3 "" H 1750 5450 60 0001 C CNN
@@ -574,8 +574,8 @@ L GND #U$?
U 1 1 580E02E7
P 1350 5450
AR Path="/578AFF16/580E02E7" Ref="#U$?" Part="1"
-AR Path="/578AFF32/580E02E7" Ref="#U$3401" Part="1"
-F 0 "#U$3401" H 1260 5350 70 0001 L BNN
+AR Path="/578AFF32/580E02E7" Ref="#U$2301" Part="1"
+F 0 "#U$2301" H 1260 5350 70 0001 L BNN
F 1 "GND" H 1260 5350 70 0001 L BNN
F 2 "" H 1350 5450 60 0001 C CNN
F 3 "" H 1350 5450 60 0001 C CNN
@@ -598,8 +598,8 @@ L GND #U$?
U 1 1 580E0300
P 1750 4150
AR Path="/578AFF16/580E0300" Ref="#U$?" Part="1"
-AR Path="/578AFF32/580E0300" Ref="#U$3402" Part="1"
-F 0 "#U$3402" H 1660 4050 70 0001 L BNN
+AR Path="/578AFF32/580E0300" Ref="#U$2302" Part="1"
+F 0 "#U$2302" H 1660 4050 70 0001 L BNN
F 1 "GND" H 1660 4050 70 0001 L BNN
F 2 "" H 1750 4150 60 0001 C CNN
F 3 "" H 1750 4150 60 0001 C CNN
@@ -767,8 +767,8 @@ L GND #U$?
U 1 1 582129E6
P 4050 4400
AR Path="/578AFF16/582129E6" Ref="#U$?" Part="1"
-AR Path="/578AFF32/582129E6" Ref="#U$3404" Part="1"
-F 0 "#U$3404" H 3960 4300 70 0001 L BNN
+AR Path="/578AFF32/582129E6" Ref="#U$2304" Part="1"
+F 0 "#U$2304" H 3960 4300 70 0001 L BNN
F 1 "GND" H 3960 4300 70 0001 L BNN
F 2 "" H 4050 4400 60 0001 C CNN
F 3 "" H 4050 4400 60 0001 C CNN
diff --git a/hw/bbdisp.sch b/hw/bbdisp.sch
index 484445a..41b09b8 100644
--- a/hw/bbdisp.sch
+++ b/hw/bbdisp.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 35 31
+Sheet 35 25
Title "BB-xM Adapter (DISP)"
Date "Intentionally Left Blank"
Rev ""
@@ -81,10 +81,10 @@ F 3 "" H 9000 6700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-4 #U$3502
+L GND-4 #U$2402
U 1 1 578E4AEF
P 6700 5800
-F 0 "#U$3502" H 6581 5700 70 0001 L BNN
+F 0 "#U$2402" H 6581 5700 70 0001 L BNN
F 1 "GND4" H 6581 5700 70 0001 L BNN
F 2 "" H 6700 5800 60 0001 C CNN
F 3 "" H 6700 5800 60 0001 C CNN
@@ -92,10 +92,10 @@ F 3 "" H 6700 5800 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L GND-4 #U$3505
+L GND-4 #U$2405
U 1 1 578E4B53
P 11300 5800
-F 0 "#U$3505" H 11180 5700 70 0001 L BNN
+F 0 "#U$2405" H 11180 5700 70 0001 L BNN
F 1 "GND4" H 11180 5700 70 0001 L BNN
F 2 "" H 11300 5800 60 0001 C CNN
F 3 "" H 11300 5800 60 0001 C CNN
@@ -103,10 +103,10 @@ F 3 "" H 11300 5800 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND-4 #U$3504
+L GND-4 #U$2404
U 1 1 578E4BB7
P 11300 2300
-F 0 "#U$3504" H 11180 2200 70 0001 L BNN
+F 0 "#U$2404" H 11180 2200 70 0001 L BNN
F 1 "GND4" H 11180 2200 70 0001 L BNN
F 2 "" H 11300 2300 60 0001 C CNN
F 3 "" H 11300 2300 60 0001 C CNN
@@ -114,10 +114,10 @@ F 3 "" H 11300 2300 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND-4 #U$3501
+L GND-4 #U$2401
U 1 1 578E4C1B
P 6650 2300
-F 0 "#U$3501" H 6531 2200 70 0001 L BNN
+F 0 "#U$2401" H 6531 2200 70 0001 L BNN
F 1 "GND4" H 6531 2200 70 0001 L BNN
F 2 "" H 6650 2300 60 0001 C CNN
F 3 "" H 6650 2300 60 0001 C CNN
@@ -295,10 +295,10 @@ F 3 "" H 7450 9250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-4 #U$3503
+L GND-4 #U$2403
U 1 1 582100EC
P 6950 9500
-F 0 "#U$3503" H 6831 9400 70 0001 L BNN
+F 0 "#U$2403" H 6831 9400 70 0001 L BNN
F 1 "GND4" H 6831 9400 70 0001 L BNN
F 2 "" H 6950 9500 60 0001 C CNN
F 3 "" H 6950 9500 60 0001 C CNN
diff --git a/hw/bob.sch b/hw/bob.sch
index 31d5511..3a0d8f2 100644
--- a/hw/bob.sch
+++ b/hw/bob.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 21 31
+Sheet 21 25
Title "uSD Breakout Board"
Date "Intentionally Left Blank"
Rev ""
@@ -116,10 +116,10 @@ F 3 "" H 2350 2600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$2110
+L GND-2 #U$1710
U 1 1 578D1817
P 6600 3800
-F 0 "#U$2110" H 6480 3701 70 0001 L BNN
+F 0 "#U$1710" H 6480 3701 70 0001 L BNN
F 1 "GND2" H 6480 3701 70 0001 L BNN
F 2 "" H 6600 3800 60 0001 C CNN
F 3 "" H 6600 3800 60 0001 C CNN
@@ -127,10 +127,10 @@ F 3 "" H 6600 3800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$2114
+L GND-2 #U$1714
U 1 1 578D19A7
P 9500 4000
-F 0 "#U$2114" H 9380 3901 70 0001 L BNN
+F 0 "#U$1714" H 9380 3901 70 0001 L BNN
F 1 "GND2" H 9380 3901 70 0001 L BNN
F 2 "" H 9500 4000 60 0001 C CNN
F 3 "" H 9500 4000 60 0001 C CNN
@@ -138,10 +138,10 @@ F 3 "" H 9500 4000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$2115
+L GND-2 #U$1715
U 1 1 578D1A0B
P 10050 4200
-F 0 "#U$2115" H 9930 4101 70 0001 L BNN
+F 0 "#U$1715" H 9930 4101 70 0001 L BNN
F 1 "GND2" H 9930 4101 70 0001 L BNN
F 2 "" H 10050 4200 60 0001 C CNN
F 3 "" H 10050 4200 60 0001 C CNN
@@ -149,10 +149,10 @@ F 3 "" H 10050 4200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$2117
+L GND-2 #U$1717
U 1 1 578D1A6F
P 10800 4200
-F 0 "#U$2117" H 10680 4101 70 0001 L BNN
+F 0 "#U$1717" H 10680 4101 70 0001 L BNN
F 1 "GND2" H 10680 4101 70 0001 L BNN
F 2 "" H 10800 4200 60 0001 C CNN
F 3 "" H 10800 4200 60 0001 C CNN
@@ -160,10 +160,10 @@ F 3 "" H 10800 4200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$2103
+L GND-2 #U$1703
U 1 1 578D1AD3
P 2650 3750
-F 0 "#U$2103" H 2530 3651 70 0001 L BNN
+F 0 "#U$1703" H 2530 3651 70 0001 L BNN
F 1 "GND2" H 2530 3651 70 0001 L BNN
F 2 "" H 2650 3750 60 0001 C CNN
F 3 "" H 2650 3750 60 0001 C CNN
@@ -171,10 +171,10 @@ F 3 "" H 2650 3750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$2102
+L GND-2 #U$1702
U 1 1 578D1B37
P 2050 3750
-F 0 "#U$2102" H 1930 3651 70 0001 L BNN
+F 0 "#U$1702" H 1930 3651 70 0001 L BNN
F 1 "GND2" H 1930 3651 70 0001 L BNN
F 2 "" H 2050 3750 60 0001 C CNN
F 3 "" H 2050 3750 60 0001 C CNN
@@ -182,10 +182,10 @@ F 3 "" H 2050 3750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$2105
+L GND-2 #U$1705
U 1 1 578D1B9B
P 3200 2900
-F 0 "#U$2105" H 3080 2801 70 0001 L BNN
+F 0 "#U$1705" H 3080 2801 70 0001 L BNN
F 1 "GND2" H 3080 2801 70 0001 L BNN
F 2 "" H 3200 2900 60 0001 C CNN
F 3 "" H 3200 2900 60 0001 C CNN
@@ -247,10 +247,10 @@ F 3 "" H 8900 7850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$2113
+L GND-2 #U$1713
U 1 1 57D87850
P 8900 8250
-F 0 "#U$2113" H 8780 8151 70 0001 L BNN
+F 0 "#U$1713" H 8780 8151 70 0001 L BNN
F 1 "GND2" H 8780 8151 70 0001 L BNN
F 2 "" H 8900 8250 60 0001 C CNN
F 3 "" H 8900 8250 60 0001 C CNN
@@ -310,10 +310,10 @@ FLASH_A
Text Label 13300 3700 0 60 ~ 0
FLASH_K
$Comp
-L GND-2 #U$2104
+L GND-2 #U$1704
U 1 1 57D8B64E
P 2800 7900
-F 0 "#U$2104" H 2680 7801 70 0001 L BNN
+F 0 "#U$1704" H 2680 7801 70 0001 L BNN
F 1 "GND2" H 2680 7801 70 0001 L BNN
F 2 "" H 2800 7900 60 0001 C CNN
F 3 "" H 2800 7900 60 0001 C CNN
@@ -321,10 +321,10 @@ F 3 "" H 2800 7900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$2107
+L GND-2 #U$1707
U 1 1 57D8B862
P 3800 7900
-F 0 "#U$2107" H 3680 7801 70 0001 L BNN
+F 0 "#U$1707" H 3680 7801 70 0001 L BNN
F 1 "GND2" H 3680 7801 70 0001 L BNN
F 2 "" H 3800 7900 60 0001 C CNN
F 3 "" H 3800 7900 60 0001 C CNN
@@ -332,10 +332,10 @@ F 3 "" H 3800 7900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$2111
+L GND-2 #U$1711
U 1 1 57D8B9FB
P 7900 7900
-F 0 "#U$2111" H 7780 7801 70 0001 L BNN
+F 0 "#U$1711" H 7780 7801 70 0001 L BNN
F 1 "GND2" H 7780 7801 70 0001 L BNN
F 2 "" H 7900 7900 60 0001 C CNN
F 3 "" H 7900 7900 60 0001 C CNN
@@ -438,10 +438,10 @@ F 3 "" H 5900 2500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$2109
+L GND-2 #U$1709
U 1 1 57D92379
P 5900 2900
-F 0 "#U$2109" H 5780 2801 70 0001 L BNN
+F 0 "#U$1709" H 5780 2801 70 0001 L BNN
F 1 "GND2" H 5780 2801 70 0001 L BNN
F 2 "" H 5900 2900 60 0001 C CNN
F 3 "" H 5900 2900 60 0001 C CNN
@@ -483,10 +483,10 @@ F 3 "" H 13800 7950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$2118
+L GND-2 #U$1718
U 1 1 57D9F5AB
P 13300 8600
-F 0 "#U$2118" H 13180 8501 70 0001 L BNN
+F 0 "#U$1718" H 13180 8501 70 0001 L BNN
F 1 "GND2" H 13180 8501 70 0001 L BNN
F 2 "" H 13300 8600 60 0001 C CNN
F 3 "" H 13300 8600 60 0001 C CNN
@@ -494,10 +494,10 @@ F 3 "" H 13300 8600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$2119
+L GND-2 #U$1719
U 1 1 57D9F666
P 14300 8600
-F 0 "#U$2119" H 14180 8501 70 0001 L BNN
+F 0 "#U$1719" H 14180 8501 70 0001 L BNN
F 1 "GND2" H 14180 8501 70 0001 L BNN
F 2 "" H 14300 8600 60 0001 C CNN
F 3 "" H 14300 8600 60 0001 C CNN
@@ -543,10 +543,10 @@ NoConn ~ 3700 7750
NoConn ~ 8000 7750
NoConn ~ 8800 7750
$Comp
-L POWERED #FLG2101
+L POWERED #FLG1701
U 1 1 580A5551
P 2750 2200
-F 0 "#FLG2101" H 2950 2100 60 0001 C CNN
+F 0 "#FLG1701" H 2950 2100 60 0001 C CNN
F 1 "POWERED" H 2750 2250 60 0000 C CNN
F 2 "" H 2750 2200 60 0001 C CNN
F 3 "" H 2750 2200 60 0001 C CNN
@@ -554,10 +554,10 @@ F 3 "" H 2750 2200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG2102
+L POWERED #FLG1702
U 1 1 580B14DA
P 9200 6350
-F 0 "#FLG2102" H 9400 6250 60 0001 C CNN
+F 0 "#FLG1702" H 9400 6250 60 0001 C CNN
F 1 "POWERED" H 9200 6400 60 0000 C CNN
F 2 "" H 9200 6350 60 0001 C CNN
F 3 "" H 9200 6350 60 0001 C CNN
@@ -608,10 +608,10 @@ F 3 "" H 7500 9025 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND-2 #U$2106
+L GND-2 #U$1706
U 1 1 581D7187
P 3200 9300
-F 0 "#U$2106" H 3080 9201 70 0001 L BNN
+F 0 "#U$1706" H 3080 9201 70 0001 L BNN
F 1 "GND2" H 3080 9201 70 0001 L BNN
F 2 "" H 3200 9300 60 0001 C CNN
F 3 "" H 3200 9300 60 0001 C CNN
@@ -619,10 +619,10 @@ F 3 "" H 3200 9300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$2108
+L GND-2 #U$1708
U 1 1 581D7324
P 5400 9300
-F 0 "#U$2108" H 5280 9201 70 0001 L BNN
+F 0 "#U$1708" H 5280 9201 70 0001 L BNN
F 1 "GND2" H 5280 9201 70 0001 L BNN
F 2 "" H 5400 9300 60 0001 C CNN
F 3 "" H 5400 9300 60 0001 C CNN
@@ -630,10 +630,10 @@ F 3 "" H 5400 9300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$2112
+L GND-2 #U$1712
U 1 1 581D7534
P 8200 9300
-F 0 "#U$2112" H 8080 9201 70 0001 L BNN
+F 0 "#U$1712" H 8080 9201 70 0001 L BNN
F 1 "GND2" H 8080 9201 70 0001 L BNN
F 2 "" H 8200 9300 60 0001 C CNN
F 3 "" H 8200 9300 60 0001 C CNN
@@ -652,10 +652,10 @@ F 3 "" H 10000 9025 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND-2 #U$2116
+L GND-2 #U$1716
U 1 1 581D9096
P 10700 9300
-F 0 "#U$2116" H 10580 9201 70 0001 L BNN
+F 0 "#U$1716" H 10580 9201 70 0001 L BNN
F 1 "GND2" H 10580 9201 70 0001 L BNN
F 2 "" H 10700 9300 60 0001 C CNN
F 3 "" H 10700 9300 60 0001 C CNN
@@ -1084,10 +1084,10 @@ F 3 "" H 1800 8100 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND-2 #U$2101
+L GND-2 #U$1701
U 1 1 581DCD70
P 1800 8500
-F 0 "#U$2101" H 1680 8401 70 0001 L BNN
+F 0 "#U$1701" H 1680 8401 70 0001 L BNN
F 1 "GND2" H 1680 8401 70 0001 L BNN
F 2 "" H 1800 8500 60 0001 C CNN
F 3 "" H 1800 8500 60 0001 C CNN
diff --git a/hw/cams.sch b/hw/cams.sch
index 773a22f..da2540e 100644
--- a/hw/cams.sch
+++ b/hw/cams.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 30 31
+Sheet 30 25
Title "Cameras"
Date "Intentionally Left Blank"
Rev ""
@@ -336,10 +336,10 @@ F 3 "" H 4950 7800 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND-3 #U$0324
+L GND-3 #U$2002
U 1 1 578DB37D
P 5950 8650
-F 0 "#U$0324" H 5830 8551 70 0001 L BNN
+F 0 "#U$2002" H 5830 8551 70 0001 L BNN
F 1 "GND3" H 5830 8551 70 0001 L BNN
F 2 "" H 5950 8650 60 0001 C CNN
F 3 "" H 5950 8650 60 0001 C CNN
@@ -347,10 +347,10 @@ F 3 "" H 5950 8650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0325
+L GND-3 #U$2001
U 1 1 578DB3E1
P 5800 6450
-F 0 "#U$0325" H 5680 6351 70 0001 L BNN
+F 0 "#U$2001" H 5680 6351 70 0001 L BNN
F 1 "GND3" H 5680 6351 70 0001 L BNN
F 2 "" H 5800 6450 60 0001 C CNN
F 3 "" H 5800 6450 60 0001 C CNN
@@ -358,10 +358,10 @@ F 3 "" H 5800 6450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0326
+L GND-3 #U$2003
U 1 1 578DB445
P 6950 7100
-F 0 "#U$0326" H 6830 7001 70 0001 L BNN
+F 0 "#U$2003" H 6830 7001 70 0001 L BNN
F 1 "GND3" H 6830 7001 70 0001 L BNN
F 2 "" H 6950 7100 60 0001 C CNN
F 3 "" H 6950 7100 60 0001 C CNN
@@ -369,10 +369,10 @@ F 3 "" H 6950 7100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0327
+L GND-3 #U$2008
U 1 1 578DB4A9
P 12700 4550
-F 0 "#U$0327" H 12580 4451 70 0001 L BNN
+F 0 "#U$2008" H 12580 4451 70 0001 L BNN
F 1 "GND3" H 12580 4451 70 0001 L BNN
F 2 "" H 12700 4550 60 0001 C CNN
F 3 "" H 12700 4550 60 0001 C CNN
@@ -380,10 +380,10 @@ F 3 "" H 12700 4550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0328
+L GND-3 #U$2007
U 1 1 578DB50D
P 9750 5000
-F 0 "#U$0328" H 9630 4901 70 0001 L BNN
+F 0 "#U$2007" H 9630 4901 70 0001 L BNN
F 1 "GND3" H 9630 4901 70 0001 L BNN
F 2 "" H 9750 5000 60 0001 C CNN
F 3 "" H 9750 5000 60 0001 C CNN
@@ -391,10 +391,10 @@ F 3 "" H 9750 5000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0329
+L GND-3 #U$2006
U 1 1 578DB571
P 9750 4300
-F 0 "#U$0329" H 9630 4201 70 0001 L BNN
+F 0 "#U$2006" H 9630 4201 70 0001 L BNN
F 1 "GND3" H 9630 4201 70 0001 L BNN
F 2 "" H 9750 4300 60 0001 C CNN
F 3 "" H 9750 4300 60 0001 C CNN
@@ -402,10 +402,10 @@ F 3 "" H 9750 4300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0330
+L GND-3 #U$2005
U 1 1 578DB5D5
P 9750 3550
-F 0 "#U$0330" H 9630 3451 70 0001 L BNN
+F 0 "#U$2005" H 9630 3451 70 0001 L BNN
F 1 "GND3" H 9630 3451 70 0001 L BNN
F 2 "" H 9750 3550 60 0001 C CNN
F 3 "" H 9750 3550 60 0001 C CNN
@@ -631,10 +631,10 @@ Wire Wire Line
Wire Wire Line
10550 3000 10450 3000
$Comp
-L POWERED #FLG0331
+L POWERED #FLG2001
U 1 1 57908F1F
P 9850 2700
-F 0 "#FLG0331" H 10050 2600 60 0001 C CNN
+F 0 "#FLG2001" H 10050 2600 60 0001 C CNN
F 1 "POWERED" H 9850 2750 60 0000 C CNN
F 2 "" H 9850 2700 60 0001 C CNN
F 3 "" H 9850 2700 60 0001 C CNN
@@ -736,10 +736,10 @@ F 3 "" H 8900 8700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0332
+L GND-3 #U$2004
U 1 1 580906EA
P 8000 8900
-F 0 "#U$0332" H 7880 8801 70 0001 L BNN
+F 0 "#U$2004" H 7880 8801 70 0001 L BNN
F 1 "GND3" H 7880 8801 70 0001 L BNN
F 2 "" H 8000 8900 60 0001 C CNN
F 3 "" H 8000 8900 60 0001 C CNN
diff --git a/hw/charger.sch b/hw/charger.sch
index 313e63d..632a5a7 100644
--- a/hw/charger.sch
+++ b/hw/charger.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 3 31
+Sheet 3 25
Title "Charger/OTG"
Date "Intentionally Left Blank"
Rev ""
@@ -154,10 +154,10 @@ F 3 "" H 11500 5600 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$013
+L GND #U$208
U 1 1 578B135A
P 8500 5800
-F 0 "#U$013" H 8410 5700 70 0001 L BNN
+F 0 "#U$208" H 8410 5700 70 0001 L BNN
F 1 "GND" H 8410 5700 70 0001 L BNN
F 2 "" H 8500 5800 60 0001 C CNN
F 3 "" H 8500 5800 60 0001 C CNN
@@ -165,10 +165,10 @@ F 3 "" H 8500 5800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$014
+L GND #U$210
U 1 1 578B13BE
P 9800 5800
-F 0 "#U$014" H 9710 5700 70 0001 L BNN
+F 0 "#U$210" H 9710 5700 70 0001 L BNN
F 1 "GND" H 9710 5700 70 0001 L BNN
F 2 "" H 9800 5800 60 0001 C CNN
F 3 "" H 9800 5800 60 0001 C CNN
@@ -176,10 +176,10 @@ F 3 "" H 9800 5800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$015
+L GND #U$211
U 1 1 578B1422
P 10900 3700
-F 0 "#U$015" H 10810 3600 70 0001 L BNN
+F 0 "#U$211" H 10810 3600 70 0001 L BNN
F 1 "GND" H 10810 3600 70 0001 L BNN
F 2 "" H 10900 3700 60 0001 C CNN
F 3 "" H 10900 3700 60 0001 C CNN
@@ -187,10 +187,10 @@ F 3 "" H 10900 3700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$016
+L GND #U$212
U 1 1 578B1486
P 11000 5100
-F 0 "#U$016" H 10910 5000 70 0001 L BNN
+F 0 "#U$212" H 10910 5000 70 0001 L BNN
F 1 "GND" H 10910 5000 70 0001 L BNN
F 2 "" H 11000 5100 60 0001 C CNN
F 3 "" H 11000 5100 60 0001 C CNN
@@ -198,10 +198,10 @@ F 3 "" H 11000 5100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$017
+L GND #U$213
U 1 1 578B14EA
P 11500 5950
-F 0 "#U$017" H 11410 5850 70 0001 L BNN
+F 0 "#U$213" H 11410 5850 70 0001 L BNN
F 1 "GND" H 11410 5850 70 0001 L BNN
F 2 "" H 11500 5950 60 0001 C CNN
F 3 "" H 11500 5950 60 0001 C CNN
@@ -209,10 +209,10 @@ F 3 "" H 11500 5950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$018
+L GND #U$214
U 1 1 578B154E
P 11950 3700
-F 0 "#U$018" H 11860 3600 70 0001 L BNN
+F 0 "#U$214" H 11860 3600 70 0001 L BNN
F 1 "GND" H 11860 3600 70 0001 L BNN
F 2 "" H 11950 3700 60 0001 C CNN
F 3 "" H 11950 3700 60 0001 C CNN
@@ -345,10 +345,10 @@ CHG_INT
Text Notes 7350 5150 2 60 ~ 0
100/500 mA selection
$Comp
-L GND #U$019
+L GND #U$209
U 1 1 57E52FBC
P 8900 5800
-F 0 "#U$019" H 8810 5700 70 0001 L BNN
+F 0 "#U$209" H 8810 5700 70 0001 L BNN
F 1 "GND" H 8810 5700 70 0001 L BNN
F 2 "" H 8900 5800 60 0001 C CNN
F 3 "" H 8900 5800 60 0001 C CNN
@@ -392,8 +392,8 @@ L GND #U$?
U 1 1 57F9F504
P 7300 9750
AR Path="/578AFEF6/57F9F504" Ref="#U$?" Part="1"
-AR Path="/578AFEF4/57F9F504" Ref="#U$020" Part="1"
-F 0 "#U$020" H 7210 9650 70 0001 L BNN
+AR Path="/578AFEF4/57F9F504" Ref="#U$206" Part="1"
+F 0 "#U$206" H 7210 9650 70 0001 L BNN
F 1 "GND" H 7210 9650 70 0001 L BNN
F 2 "" H 7300 9750 60 0001 C CNN
F 3 "" H 7300 9750 60 0001 C CNN
@@ -484,8 +484,8 @@ L GND #U$?
U 1 1 58083FF0
P 6100 9700
AR Path="/578AFEF6/58083FF0" Ref="#U$?" Part="1"
-AR Path="/578AFEF4/58083FF0" Ref="#U$021" Part="1"
-F 0 "#U$021" H 6010 9600 70 0001 L BNN
+AR Path="/578AFEF4/58083FF0" Ref="#U$205" Part="1"
+F 0 "#U$205" H 6010 9600 70 0001 L BNN
F 1 "GND" H 6010 9600 70 0001 L BNN
F 2 "" H 6100 9700 60 0001 C CNN
F 3 "" H 6100 9700 60 0001 C CNN
@@ -497,8 +497,8 @@ L GND #U$?
U 1 1 58084025
P 7600 9750
AR Path="/578AFEF6/58084025" Ref="#U$?" Part="1"
-AR Path="/578AFEF4/58084025" Ref="#U$022" Part="1"
-F 0 "#U$022" H 7510 9650 70 0001 L BNN
+AR Path="/578AFEF4/58084025" Ref="#U$207" Part="1"
+F 0 "#U$207" H 7510 9650 70 0001 L BNN
F 1 "GND" H 7510 9650 70 0001 L BNN
F 2 "" H 7600 9750 60 0001 C CNN
F 3 "" H 7600 9750 60 0001 C CNN
@@ -516,8 +516,8 @@ L GND #U$?
U 1 1 580AB1B1
P 12000 9400
AR Path="/578AFEF6/580AB1B1" Ref="#U$?" Part="1"
-AR Path="/578AFEF4/580AB1B1" Ref="#U$023" Part="1"
-F 0 "#U$023" H 11910 9300 70 0001 L BNN
+AR Path="/578AFEF4/580AB1B1" Ref="#U$215" Part="1"
+F 0 "#U$215" H 11910 9300 70 0001 L BNN
F 1 "GND" H 11910 9300 70 0001 L BNN
F 2 "" H 12000 9400 60 0001 C CNN
F 3 "" H 12000 9400 60 0001 C CNN
@@ -525,10 +525,10 @@ F 3 "" H 12000 9400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG024
+L POWERED #FLG204
U 1 1 580AB2BA
P 12000 9000
-F 0 "#FLG024" H 12200 8900 60 0001 C CNN
+F 0 "#FLG204" H 12200 8900 60 0001 C CNN
F 1 "POWERED" H 12000 9050 60 0000 C CNN
F 2 "" H 12000 9000 60 0001 C CNN
F 3 "" H 12000 9000 60 0001 C CNN
@@ -538,10 +538,10 @@ $EndComp
Wire Wire Line
12000 9200 12000 9300
$Comp
-L POWERED #FLG025
+L POWERED #FLG203
U 1 1 580AD2FC
P 12000 8200
-F 0 "#FLG025" H 12200 8100 60 0001 C CNN
+F 0 "#FLG203" H 12200 8100 60 0001 C CNN
F 1 "POWERED" H 12000 8250 60 0000 C CNN
F 2 "" H 12000 8200 60 0001 C CNN
F 3 "" H 12000 8200 60 0001 C CNN
@@ -555,10 +555,10 @@ Wire Wire Line
Wire Wire Line
12000 8600 12150 8600
$Comp
-L POWERED #FLG026
+L POWERED #FLG207
U 1 1 580AE65E
P 12700 9000
-F 0 "#FLG026" H 12900 8900 60 0001 C CNN
+F 0 "#FLG207" H 12900 8900 60 0001 C CNN
F 1 "POWERED" H 12700 9050 60 0000 C CNN
F 2 "" H 12700 9000 60 0001 C CNN
F 3 "" H 12700 9000 60 0001 C CNN
@@ -568,10 +568,10 @@ $EndComp
Wire Wire Line
12700 9200 12700 9300
$Comp
-L POWERED #FLG027
+L POWERED #FLG206
U 1 1 580AF534
P 12700 8200
-F 0 "#FLG027" H 12900 8100 60 0001 C CNN
+F 0 "#FLG206" H 12900 8100 60 0001 C CNN
F 1 "POWERED" H 12700 8250 60 0000 C CNN
F 2 "" H 12700 8200 60 0001 C CNN
F 3 "" H 12700 8200 60 0001 C CNN
@@ -585,10 +585,10 @@ Wire Wire Line
Wire Wire Line
12700 8600 12850 8600
$Comp
-L POWERED #FLG028
+L POWERED #FLG202
U 1 1 580AF775
P 12000 7400
-F 0 "#FLG028" H 12200 7300 60 0001 C CNN
+F 0 "#FLG202" H 12200 7300 60 0001 C CNN
F 1 "POWERED" H 12000 7450 60 0000 C CNN
F 2 "" H 12000 7400 60 0001 C CNN
F 3 "" H 12000 7400 60 0001 C CNN
@@ -602,10 +602,10 @@ Wire Wire Line
Wire Wire Line
12000 7800 12150 7800
$Comp
-L POWERED #FLG029
+L POWERED #FLG205
U 1 1 580AF77E
P 12700 7400
-F 0 "#FLG029" H 12900 7300 60 0001 C CNN
+F 0 "#FLG205" H 12900 7300 60 0001 C CNN
F 1 "POWERED" H 12700 7450 60 0000 C CNN
F 2 "" H 12700 7400 60 0001 C CNN
F 3 "" H 12700 7400 60 0001 C CNN
@@ -619,10 +619,10 @@ Wire Wire Line
Wire Wire Line
12700 7800 12850 7800
$Comp
-L POWERED #FLG030
+L POWERED #FLG208
U 1 1 580B0C2C
P 13400 9000
-F 0 "#FLG030" H 13600 8900 60 0001 C CNN
+F 0 "#FLG208" H 13600 8900 60 0001 C CNN
F 1 "POWERED" H 13400 9050 60 0000 C CNN
F 2 "" H 13400 9000 60 0001 C CNN
F 3 "" H 13400 9000 60 0001 C CNN
@@ -632,10 +632,10 @@ $EndComp
Wire Wire Line
13400 9200 13400 9300
$Comp
-L GND-3 #M031
+L GND-3 #M202
U 1 1 580B0C33
P 13400 9400
-F 0 "#M031" H 13400 9400 45 0001 C CNN
+F 0 "#M202" H 13400 9400 45 0001 C CNN
F 1 "GND-3" H 13400 9400 45 0001 C CNN
F 2 "" H 13400 9400 60 0001 C CNN
F 3 "" H 13400 9400 60 0001 C CNN
@@ -643,10 +643,10 @@ F 3 "" H 13400 9400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #M032
+L GND-2 #M201
U 1 1 580B0C66
P 12700 9400
-F 0 "#M032" H 12700 9400 45 0001 C CNN
+F 0 "#M201" H 12700 9400 45 0001 C CNN
F 1 "GND-2" H 12700 9400 45 0001 C CNN
F 2 "" H 12700 9400 60 0001 C CNN
F 3 "" H 12700 9400 60 0001 C CNN
@@ -654,10 +654,10 @@ F 3 "" H 12700 9400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG033
+L POWERED #FLG209
U 1 1 580B2986
P 13900 7400
-F 0 "#FLG033" H 14100 7300 60 0001 C CNN
+F 0 "#FLG209" H 14100 7300 60 0001 C CNN
F 1 "POWERED" H 13900 7450 60 0000 C CNN
F 2 "" H 13900 7400 60 0001 C CNN
F 3 "" H 13900 7400 60 0001 C CNN
@@ -671,10 +671,10 @@ Wire Wire Line
Text GLabel 14050 7800 2 60 Output ~ 0
VBAT_SWITCHED_U
$Comp
-L POWERED #FLG?
+L POWERED #FLG210
U 1 1 580B2C23
P 14100 9000
-F 0 "#FLG?" H 14300 8900 60 0001 C CNN
+F 0 "#FLG210" H 14300 8900 60 0001 C CNN
F 1 "POWERED" H 14100 9050 60 0000 C CNN
F 2 "" H 14100 9000 60 0001 C CNN
F 3 "" H 14100 9000 60 0001 C CNN
@@ -684,10 +684,10 @@ $EndComp
Wire Wire Line
14100 9200 14100 9300
$Comp
-L GND-4 #M?
+L GND-4 #M203
U 1 1 580B2C87
P 14100 9400
-F 0 "#M?" H 14100 9400 45 0001 C CNN
+F 0 "#M203" H 14100 9400 45 0001 C CNN
F 1 "GND-4" H 14100 9400 45 0001 C CNN
F 2 "" H 14100 9400 60 0001 C CNN
F 3 "" H 14100 9400 60 0001 C CNN
@@ -707,8 +707,8 @@ L C0402 C?
U 1 1 5828FC2E
P 4000 3500
AR Path="/578AFEF2/5828FC2E" Ref="C?" Part="1"
-AR Path="/578AFEF4/5828FC2E" Ref="C?" Part="1"
-F 0 "C?" H 4040 3540 50 0000 L CNN
+AR Path="/578AFEF4/5828FC2E" Ref="C201" Part="1"
+F 0 "C201" H 4040 3540 50 0000 L CNN
F 1 "2.2u;10V" H 4040 3370 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 4030 3650 20 0001 C CNN
F 3 "" H 4000 3500 60 0001 C CNN
@@ -720,8 +720,8 @@ L GND #U$?
U 1 1 5828FC35
P 2300 4400
AR Path="/578AFEF2/5828FC35" Ref="#U$?" Part="1"
-AR Path="/578AFEF4/5828FC35" Ref="#U$?" Part="1"
-F 0 "#U$?" H 2210 4300 70 0001 L BNN
+AR Path="/578AFEF4/5828FC35" Ref="#U$201" Part="1"
+F 0 "#U$201" H 2210 4300 70 0001 L BNN
F 1 "GND" H 2210 4300 70 0001 L BNN
F 2 "" H 2300 4400 60 0001 C CNN
F 3 "" H 2300 4400 60 0001 C CNN
@@ -733,8 +733,8 @@ L GND #U$?
U 1 1 5828FC3B
P 3700 4400
AR Path="/578AFEF2/5828FC3B" Ref="#U$?" Part="1"
-AR Path="/578AFEF4/5828FC3B" Ref="#U$?" Part="1"
-F 0 "#U$?" H 3610 4300 70 0001 L BNN
+AR Path="/578AFEF4/5828FC3B" Ref="#U$202" Part="1"
+F 0 "#U$202" H 3610 4300 70 0001 L BNN
F 1 "GND" H 3610 4300 70 0001 L BNN
F 2 "" H 3700 4400 60 0001 C CNN
F 3 "" H 3700 4400 60 0001 C CNN
@@ -746,8 +746,8 @@ L GND #U$?
U 1 1 5828FC41
P 4000 4400
AR Path="/578AFEF2/5828FC41" Ref="#U$?" Part="1"
-AR Path="/578AFEF4/5828FC41" Ref="#U$?" Part="1"
-F 0 "#U$?" H 3910 4300 70 0001 L BNN
+AR Path="/578AFEF4/5828FC41" Ref="#U$203" Part="1"
+F 0 "#U$203" H 3910 4300 70 0001 L BNN
F 1 "GND" H 3910 4300 70 0001 L BNN
F 2 "" H 4000 4400 60 0001 C CNN
F 3 "" H 4000 4400 60 0001 C CNN
@@ -759,8 +759,8 @@ L GND #U$?
U 1 1 5828FC47
P 4400 4400
AR Path="/578AFEF2/5828FC47" Ref="#U$?" Part="1"
-AR Path="/578AFEF4/5828FC47" Ref="#U$?" Part="1"
-F 0 "#U$?" H 4310 4300 70 0001 L BNN
+AR Path="/578AFEF4/5828FC47" Ref="#U$204" Part="1"
+F 0 "#U$204" H 4310 4300 70 0001 L BNN
F 1 "GND" H 4310 4300 70 0001 L BNN
F 2 "" H 4400 4400 60 0001 C CNN
F 3 "" H 4400 4400 60 0001 C CNN
@@ -773,8 +773,8 @@ U 1 1 5828FC4D
P 5100 3900
AR Path="/5828FC4D" Ref="U?" Part="1"
AR Path="/578AFEF2/5828FC4D" Ref="U?" Part="1"
-AR Path="/578AFEF4/5828FC4D" Ref="U?" Part="1"
-F 0 "U?" H 4550 4350 45 0000 L CNN
+AR Path="/578AFEF4/5828FC4D" Ref="U201" Part="1"
+F 0 "U201" H 4550 4350 45 0000 L CNN
F 1 "IP4220CZ6" H 5100 3650 45 0000 C CNN
F 2 "neo900-legacy:SOT457-6" H 5130 4050 20 0001 C CNN
F 3 "" H 5100 3900 60 0001 C CNN
@@ -818,8 +818,8 @@ L USB-AB-47590-0001 P?
U 1 1 5828FC6D
P 3000 2800
AR Path="/578AFEF2/5828FC6D" Ref="P?" Part="1"
-AR Path="/578AFEF4/5828FC6D" Ref="P?" Part="1"
-F 0 "P?" H 3400 3450 50 0000 R BNN
+AR Path="/578AFEF4/5828FC6D" Ref="P201" Part="1"
+F 0 "P201" H 3400 3450 50 0000 R BNN
F 1 "USB-AB-47590-0001" H 2600 2100 50 0000 L BNN
F 2 "neo900-legacy:SD-47590-0001" H 2990 2590 65 0001 L TNN
F 3 "" H 3000 2800 60 0001 C CNN
@@ -828,10 +828,10 @@ F 3 "" H 3000 2800 60 0001 C CNN
$EndComp
NoConn ~ 5800 3800
$Comp
-L POWERED #FLG?
+L POWERED #FLG201
U 1 1 5828FC75
P 5700 2100
-F 0 "#FLG?" H 5900 2000 60 0001 C CNN
+F 0 "#FLG201" H 5900 2000 60 0001 C CNN
F 1 "POWERED" H 5700 2150 60 0000 C CNN
F 2 "" H 5700 2100 60 0001 C CNN
F 3 "" H 5700 2100 60 0001 C CNN
diff --git a/hw/codec.sch b/hw/codec.sch
index 93b9645..21caeae 100644
--- a/hw/codec.sch
+++ b/hw/codec.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 10 27
+Sheet 10 25
Title "Audio Codec"
Date "Intentionally Left Blank"
Rev ""
@@ -336,10 +336,10 @@ F 3 "" H 5500 9550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1107
+L GND #U$1019
U 1 1 578C343A
P 14850 4700
-F 0 "#U$1107" H 14760 4600 70 0001 L BNN
+F 0 "#U$1019" H 14760 4600 70 0001 L BNN
F 1 "GND" H 14760 4600 70 0001 L BNN
F 2 "" H 14850 4700 60 0001 C CNN
F 3 "" H 14850 4700 60 0001 C CNN
@@ -347,10 +347,10 @@ F 3 "" H 14850 4700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1106
+L GND #U$1017
U 1 1 578C349E
P 12200 4600
-F 0 "#U$1106" H 12110 4500 70 0001 L BNN
+F 0 "#U$1017" H 12110 4500 70 0001 L BNN
F 1 "GND" H 12110 4500 70 0001 L BNN
F 2 "" H 12200 4600 60 0001 C CNN
F 3 "" H 12200 4600 60 0001 C CNN
@@ -358,10 +358,10 @@ F 3 "" H 12200 4600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1105
+L GND #U$1016
U 1 1 578C3502
P 12200 3900
-F 0 "#U$1105" H 12110 3800 70 0001 L BNN
+F 0 "#U$1016" H 12110 3800 70 0001 L BNN
F 1 "GND" H 12110 3800 70 0001 L BNN
F 2 "" H 12200 3900 60 0001 C CNN
F 3 "" H 12200 3900 60 0001 C CNN
@@ -369,10 +369,10 @@ F 3 "" H 12200 3900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1104
+L GND #U$1015
U 1 1 578C3566
P 12200 3200
-F 0 "#U$1104" H 12110 3100 70 0001 L BNN
+F 0 "#U$1015" H 12110 3100 70 0001 L BNN
F 1 "GND" H 12110 3100 70 0001 L BNN
F 2 "" H 12200 3200 60 0001 C CNN
F 3 "" H 12200 3200 60 0001 C CNN
@@ -890,10 +890,10 @@ NoConn ~ 8400 8950
NoConn ~ 8400 9350
NoConn ~ 8400 9550
$Comp
-L POWERED #FLG1101
+L POWERED #FLG1003
U 1 1 57916214
P 12800 2450
-F 0 "#FLG1101" H 13000 2350 60 0001 C CNN
+F 0 "#FLG1003" H 13000 2350 60 0001 C CNN
F 1 "POWERED" H 12800 2500 60 0000 C CNN
F 2 "" H 12800 2450 60 0001 C CNN
F 3 "" H 12800 2450 60 0001 C CNN
@@ -901,10 +901,10 @@ F 3 "" H 12800 2450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG1102
+L POWERED #FLG1004
U 1 1 579165D6
P 12800 3150
-F 0 "#FLG1102" H 13000 3050 60 0001 C CNN
+F 0 "#FLG1004" H 13000 3050 60 0001 C CNN
F 1 "POWERED" H 12800 3200 60 0000 C CNN
F 2 "" H 12800 3150 60 0001 C CNN
F 3 "" H 12800 3150 60 0001 C CNN
@@ -912,10 +912,10 @@ F 3 "" H 12800 3150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG1103
+L POWERED #FLG1005
U 1 1 57916695
P 12800 3850
-F 0 "#FLG1103" H 13000 3750 60 0001 C CNN
+F 0 "#FLG1005" H 13000 3750 60 0001 C CNN
F 1 "POWERED" H 12800 3900 60 0000 C CNN
F 2 "" H 12800 3850 60 0001 C CNN
F 3 "" H 12800 3850 60 0001 C CNN
@@ -962,10 +962,10 @@ Wire Wire Line
Wire Wire Line
4000 1300 4000 2850
$Comp
-L GND #U$1103
+L GND #U$1010
U 1 1 57E87A17
P 7100 3300
-F 0 "#U$1103" H 7010 3200 70 0001 L BNN
+F 0 "#U$1010" H 7010 3200 70 0001 L BNN
F 1 "GND" H 7010 3200 70 0001 L BNN
F 2 "" H 7100 3300 60 0001 C CNN
F 3 "" H 7100 3300 60 0001 C CNN
@@ -973,10 +973,10 @@ F 3 "" H 7100 3300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1101
+L GND #U$1008
U 1 1 57E87F68
P 3900 3300
-F 0 "#U$1101" H 3810 3200 70 0001 L BNN
+F 0 "#U$1008" H 3810 3200 70 0001 L BNN
F 1 "GND" H 3810 3200 70 0001 L BNN
F 2 "" H 3900 3300 60 0001 C CNN
F 3 "" H 3900 3300 60 0001 C CNN
@@ -1134,10 +1134,10 @@ Wire Wire Line
6700 1900 5800 1900
Connection ~ 2400 1900
$Comp
-L GND #U$1102
+L GND #U$1009
U 1 1 58146910
P 5300 5400
-F 0 "#U$1102" H 5210 5300 70 0001 L BNN
+F 0 "#U$1009" H 5210 5300 70 0001 L BNN
F 1 "GND" H 5210 5300 70 0001 L BNN
F 2 "" H 5300 5400 60 0001 C CNN
F 3 "" H 5300 5400 60 0001 C CNN
@@ -1198,10 +1198,10 @@ Wire Wire Line
Text GLabel 9400 9150 2 60 UnSpc ~ 0
HB_AUDIO_GND
$Comp
-L GND #U$?
+L GND #U$1011
U 1 1 581671CE
P 9200 9400
-F 0 "#U$?" H 9110 9300 70 0001 L BNN
+F 0 "#U$1011" H 9110 9300 70 0001 L BNN
F 1 "GND" H 9110 9300 70 0001 L BNN
F 2 "" H 9200 9400 60 0001 C CNN
F 3 "" H 9200 9400 60 0001 C CNN
@@ -1234,10 +1234,10 @@ Wire Wire Line
Text Notes 11650 5450 0 120 ~ 0
Hands-free
$Comp
-L C0603 C?
+L C0603 C1007
U 1 1 582935C5
P 10800 6050
-F 0 "C?" H 10840 6090 50 0000 L CNN
+F 0 "C1007" 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
@@ -1245,10 +1245,10 @@ F 3 "" H 10800 6050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C?
+L C0402 C1009
U 1 1 582935CC
P 11100 6050
-F 0 "C?" H 11140 6090 50 0000 L CNN
+F 0 "C1009" 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
@@ -1256,10 +1256,10 @@ F 3 "" H 11100 6050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C?
+L C0402 C1010
U 1 1 582935D3
P 11400 6050
-F 0 "C?" H 11440 6090 50 0000 L CNN
+F 0 "C1010" 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
@@ -1267,10 +1267,10 @@ F 3 "" H 11400 6050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C?
+L C0402 C1017
U 1 1 582935DA
P 13600 7650
-F 0 "C?" H 13640 7690 50 0000 L CNN
+F 0 "C1017" 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
@@ -1278,10 +1278,10 @@ F 3 "" H 13600 7650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C?
+L C0402 C1019
U 1 1 582935E1
P 13900 7650
-F 0 "C?" H 13940 7690 50 0000 L CNN
+F 0 "C1019" 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
@@ -1289,10 +1289,10 @@ F 3 "" H 13900 7650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C?
+L C0402 C1013
U 1 1 582935E8
P 11400 8000
-F 0 "C?" H 11440 8040 50 0000 L CNN
+F 0 "C1013" H 11440 8040 50 0000 L CNN
F 1 "100n" H 11440 7870 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 11430 8150 20 0001 C CNN
F 3 "" H 11400 8000 60 0001 C CNN
@@ -1300,10 +1300,10 @@ F 3 "" H 11400 8000 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C?
+L C0402 C1014
U 1 1 582935EF
P 11400 8400
-F 0 "C?" H 11440 8440 50 0000 L CNN
+F 0 "C1014" H 11440 8440 50 0000 L CNN
F 1 "100n" H 11440 8270 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 11430 8550 20 0001 C CNN
F 3 "" H 11400 8400 60 0001 C CNN
@@ -1311,10 +1311,10 @@ F 3 "" H 11400 8400 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C?
+L C0402 C1015
U 1 1 582935F6
P 11400 9000
-F 0 "C?" H 11440 9040 50 0000 L CNN
+F 0 "C1015" H 11440 9040 50 0000 L CNN
F 1 "100n" H 11440 8870 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 11430 9150 20 0001 C CNN
F 3 "" H 11400 9000 60 0001 C CNN
@@ -1322,10 +1322,10 @@ F 3 "" H 11400 9000 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C?
+L C0402 C1016
U 1 1 582935FD
P 11400 9400
-F 0 "C?" H 11440 9440 50 0000 L CNN
+F 0 "C1016" H 11440 9440 50 0000 L CNN
F 1 "100n" H 11440 9270 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 11430 9550 20 0001 C CNN
F 3 "" H 11400 9400 60 0001 C CNN
@@ -1333,10 +1333,10 @@ F 3 "" H 11400 9400 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L C0402 C?
+L C0402 C1018
U 1 1 58293604
P 13600 9650
-F 0 "C?" H 13640 9690 50 0000 L CNN
+F 0 "C1018" 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
@@ -1344,10 +1344,10 @@ F 3 "" H 13600 9650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C?
+L C0402 C1020
U 1 1 5829360B
P 13900 9650
-F 0 "C?" H 13940 9690 50 0000 L CNN
+F 0 "C1020" 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
@@ -1359,8 +1359,8 @@ L V5.5MLA0603N D?
U 1 1 58293612
P 14300 7650
AR Path="/578AFF0A/58293612" Ref="D?" Part="1"
-AR Path="/578AFF04/58293612" Ref="D?" Part="1"
-F 0 "D?" V 14450 7600 50 0000 R CNN
+AR Path="/578AFF04/58293612" Ref="D1001" Part="1"
+F 0 "D1001" V 14450 7600 50 0000 R CNN
F 1 "V5.5MLA0603N" V 14650 7350 50 0000 L BNN
F 2 "neo900-legacy:SMD-0603" H 14290 7440 65 0001 L TNN
F 3 "" H 14300 7650 60 0001 C CNN
@@ -1372,8 +1372,8 @@ L V5.5MLA0603N D?
U 1 1 58293619
P 14700 7650
AR Path="/578AFF0A/58293619" Ref="D?" Part="1"
-AR Path="/578AFF04/58293619" Ref="D?" Part="1"
-F 0 "D?" V 14850 7600 50 0000 R CNN
+AR Path="/578AFF04/58293619" Ref="D1003" Part="1"
+F 0 "D1003" V 14850 7600 50 0000 R CNN
F 1 "V5.5MLA0603N" V 14550 7600 50 0000 R CNN
F 2 "neo900-legacy:SMD-0603" H 14690 7440 65 0001 L TNN
F 3 "" H 14700 7650 60 0001 C CNN
@@ -1381,10 +1381,10 @@ F 3 "" H 14700 7650 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L V5.5MLA0603N D?
+L V5.5MLA0603N D1002
U 1 1 58293620
P 14300 9650
-F 0 "D?" V 14450 9700 50 0000 L CNN
+F 0 "D1002" V 14450 9700 50 0000 L CNN
F 1 "V5.5MLA0603N" V 14000 9500 50 0000 L BNN
F 2 "neo900-legacy:SMD-0603" H 14290 9440 65 0001 L TNN
F 3 "" H 14300 9650 60 0001 C CNN
@@ -1396,8 +1396,8 @@ L V5.5MLA0603N D?
U 1 1 58293627
P 14700 9650
AR Path="/578AFF0A/58293627" Ref="D?" Part="1"
-AR Path="/578AFF04/58293627" Ref="D?" Part="1"
-F 0 "D?" V 14750 9450 50 0000 R BNN
+AR Path="/578AFF04/58293627" Ref="D1004" Part="1"
+F 0 "D1004" V 14750 9450 50 0000 R BNN
F 1 "V5.5MLA0603N" V 14650 8900 50 0000 L BNN
F 2 "neo900-legacy:SMD-0603" H 14690 9440 65 0001 L TNN
F 3 "" H 14700 9650 60 0001 C CNN
@@ -1405,10 +1405,10 @@ F 3 "" H 14700 9650 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L L0402 L?
+L L0402 L1003
U 1 1 5829362E
P 13100 8000
-F 0 "L?" V 13042 7850 50 0000 L BNN
+F 0 "L1003" 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
@@ -1416,10 +1416,10 @@ F 3 "" H 13100 8000 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L L0402 L?
+L L0402 L1004
U 1 1 58293635
P 13100 8400
-F 0 "L?" V 13042 8250 50 0000 L BNN
+F 0 "L1004" 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
@@ -1427,10 +1427,10 @@ F 3 "" H 13100 8400 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L L0402 L?
+L L0402 L1005
U 1 1 5829363C
P 13100 9000
-F 0 "L?" V 13042 8850 50 0000 L BNN
+F 0 "L1005" 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
@@ -1438,10 +1438,10 @@ F 3 "" H 13100 9000 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L L0402 L?
+L L0402 L1006
U 1 1 58293643
P 13100 9400
-F 0 "L?" V 13042 9250 50 0000 L BNN
+F 0 "L1006" 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
@@ -1449,10 +1449,10 @@ F 3 "" H 13100 9400 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L SPEAKER-PETRA P?
+L SPEAKER-PETRA P1001
U 1 1 5829364A
P 15200 8200
-F 0 "P?" H 15060 8430 50 0000 L BNN
+F 0 "P1001" H 15060 8430 50 0000 L BNN
F 1 "SPEAKER" H 15050 7930 50 0000 L BNN
F 2 "neo900-legacy:2403-260-00031" H 15190 7990 65 0001 L TNN
F 3 "" H 15200 8200 60 0001 C CNN
@@ -1460,10 +1460,10 @@ F 3 "" H 15200 8200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L SPEAKER-PETRA P?
+L SPEAKER-PETRA P1002
U 1 1 58293651
P 15200 9200
-F 0 "P?" H 15060 9430 50 0000 L BNN
+F 0 "P1002" H 15060 9430 50 0000 L BNN
F 1 "SPEAKER" H 15050 8930 50 0000 L BNN
F 2 "neo900-legacy:2403-260-00031" H 15190 8990 65 0001 L TNN
F 3 "" H 15200 9200 60 0001 C CNN
@@ -1471,10 +1471,10 @@ F 3 "" H 15200 9200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 TP?
+L TEST-POINT-1.25 TP1001
U 1 1 58293658
P 14300 8100
-F 0 "TP?" H 14300 8100 45 0001 L BNN
+F 0 "TP1001" H 14300 8100 45 0001 L BNN
F 1 "SPKR_L_P" H 14360 8075 50 0000 L BNN
F 2 "neo900-legacy:TP-1.25" H 14330 8250 20 0001 C CNN
F 3 "" H 14300 8100 60 0001 C CNN
@@ -1482,10 +1482,10 @@ F 3 "" H 14300 8100 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 TP?
+L TEST-POINT-1.25 TP1002
U 1 1 5829365E
P 14300 8300
-F 0 "TP?" H 14300 8300 45 0001 L BNN
+F 0 "TP1002" H 14300 8300 45 0001 L BNN
F 1 "SPKR_L_M" H 14360 8275 50 0000 L BNN
F 2 "neo900-legacy:TP-1.25" H 14330 8450 20 0001 C CNN
F 3 "" H 14300 8300 60 0001 C CNN
@@ -1493,10 +1493,10 @@ F 3 "" H 14300 8300 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 TP?
+L TEST-POINT-1.25 TP1003
U 1 1 58293664
P 14300 9100
-F 0 "TP?" H 14300 9100 45 0001 L BNN
+F 0 "TP1003" H 14300 9100 45 0001 L BNN
F 1 "SPKR_R_P" H 14350 9100 50 0000 L CNN
F 2 "neo900-legacy:TP-1.25" H 14330 9250 20 0001 C CNN
F 3 "" H 14300 9100 60 0001 C CNN
@@ -1504,10 +1504,10 @@ F 3 "" H 14300 9100 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L TEST-POINT-1.25 TP?
+L TEST-POINT-1.25 TP1004
U 1 1 5829366A
P 14300 9300
-F 0 "TP?" H 14300 9300 45 0001 L BNN
+F 0 "TP1004" H 14300 9300 45 0001 L BNN
F 1 "SPKR_R_M" H 14350 9300 50 0000 L CNN
F 2 "neo900-legacy:TP-1.25" H 14330 9450 20 0001 C CNN
F 3 "" H 14300 9300 60 0001 C CNN
@@ -1515,10 +1515,10 @@ F 3 "" H 14300 9300 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L GND #U$?
+L GND #U$1014
U 1 1 58293670
P 11650 7400
-F 0 "#U$?" H 11560 7300 70 0001 L BNN
+F 0 "#U$1014" H 11560 7300 70 0001 L BNN
F 1 "GND" H 11560 7300 70 0001 L BNN
F 2 "" H 11650 7400 60 0001 C CNN
F 3 "" H 11650 7400 60 0001 C CNN
@@ -1526,10 +1526,10 @@ F 3 "" H 11650 7400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$?
+L GND #U$1013
U 1 1 58293676
P 11500 6550
-F 0 "#U$?" H 11410 6450 70 0001 L BNN
+F 0 "#U$1013" H 11410 6450 70 0001 L BNN
F 1 "GND" H 11410 6450 70 0001 L BNN
F 2 "" H 11500 6550 60 0001 C CNN
F 3 "" H 11500 6550 60 0001 C CNN
@@ -1537,10 +1537,10 @@ F 3 "" H 11500 6550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$?
+L GND #U$1012
U 1 1 5829367C
P 10800 6450
-F 0 "#U$?" H 10710 6350 70 0001 L BNN
+F 0 "#U$1012" H 10710 6350 70 0001 L BNN
F 1 "GND" H 10710 6350 70 0001 L BNN
F 2 "" H 10800 6450 60 0001 C CNN
F 3 "" H 10800 6450 60 0001 C CNN
@@ -1548,10 +1548,10 @@ F 3 "" H 10800 6450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$?
+L GND #U$1018
U 1 1 58293682
P 14500 10100
-F 0 "#U$?" H 14410 10000 70 0001 L BNN
+F 0 "#U$1018" H 14410 10000 70 0001 L BNN
F 1 "GND" H 14410 10000 70 0001 L BNN
F 2 "" H 14500 10100 60 0001 C CNN
F 3 "" H 14500 10100 60 0001 C CNN
@@ -1559,10 +1559,10 @@ F 3 "" H 14500 10100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$?
+L GND #U$1020
U 1 1 58293688
P 15150 7550
-F 0 "#U$?" H 15060 7450 70 0001 L BNN
+F 0 "#U$1020" H 15060 7450 70 0001 L BNN
F 1 "GND" H 15060 7450 70 0001 L BNN
F 2 "" H 15150 7550 60 0001 C CNN
F 3 "" H 15150 7550 60 0001 C CNN
@@ -1570,10 +1570,10 @@ F 3 "" H 15150 7550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TPA2012D2RTJ U?
+L TPA2012D2RTJ U1001
U 1 1 5829368E
P 12200 8200
-F 0 "U?" H 11900 8550 70 0000 L BNN
+F 0 "U1001" 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
@@ -1581,10 +1581,10 @@ F 3 "" H 12200 8200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TPA2012D2RTJ U?
+L TPA2012D2RTJ U1001
U 2 1 58293695
P 12200 6600
-F 0 "U?" H 11901 7440 70 0000 L BNN
+F 0 "U1001" 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
@@ -1592,10 +1592,10 @@ F 3 "" H 12200 6600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TPA2012D2RTJ U?
+L TPA2012D2RTJ U1001
U 3 1 5829369C
P 12200 9200
-F 0 "U?" H 11900 9550 70 0000 L BNN
+F 0 "U1001" 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
@@ -1823,10 +1823,10 @@ Left
Text Notes 15500 9200 0 60 ~ 0
Right
$Comp
-L C0402 C?
+L C0402 C1005
U 1 1 5829370B
P 3450 6000
-F 0 "C?" H 3490 6040 50 0000 L CNN
+F 0 "C1005" 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
@@ -1834,10 +1834,10 @@ F 3 "" H 3450 6000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C?
+L C0402 C1003
U 1 1 58293712
P 1600 6150
-F 0 "C?" H 1640 6190 50 0000 L CNN
+F 0 "C1003" 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
@@ -1845,10 +1845,10 @@ F 3 "" H 1600 6150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C?
+L C0402 C1006
U 1 1 58293719
P 3450 7600
-F 0 "C?" H 3490 7640 50 0000 L CNN
+F 0 "C1006" 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
@@ -1856,10 +1856,10 @@ F 3 "" H 3450 7600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L C0402 C?
+L C0402 C1004
U 1 1 58293720
P 1600 7750
-F 0 "C?" H 1640 7790 50 0000 L CNN
+F 0 "C1004" 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
@@ -1867,10 +1867,10 @@ F 3 "" H 1600 7750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L L-MPZ1608 L?
+L L-MPZ1608 L1001
U 1 1 58293727
P 1700 5600
-F 0 "L?" V 1642 5450 50 0000 L BNN
+F 0 "L1001" V 1642 5450 50 0000 L BNN
F 1 "tbd" V 1830 5451 50 0000 L BNN
F 2 "neo900-legacy:MPZ1608" H 1690 5390 65 0001 L TNN
F 3 "" H 1700 5600 60 0001 C CNN
@@ -1878,10 +1878,10 @@ F 3 "" H 1700 5600 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L L-MPZ1608 L?
+L L-MPZ1608 L1002
U 1 1 5829372E
P 1700 7200
-F 0 "L?" V 1642 7050 50 0000 L BNN
+F 0 "L1002" V 1642 7050 50 0000 L BNN
F 1 "tbd" V 1830 7051 50 0000 L BNN
F 2 "neo900-legacy:MPZ1608" H 1690 6990 65 0001 L TNN
F 3 "" H 1700 7200 60 0001 C CNN
@@ -1889,10 +1889,10 @@ F 3 "" H 1700 7200 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L SPK0415HM4H M?
+L SPK0415HM4H M1001
U 1 1 58293735
P 2550 6000
-F 0 "M?" H 2300 6300 50 0000 L CNN
+F 0 "M1001" H 2300 6300 50 0000 L CNN
F 1 "SPK0415HM4H" H 2575 5700 50 0000 C CNN
F 2 "neo900-legacy:SPK0415HM4H-B" H 2580 6150 20 0001 C CNN
F 3 "" H 2550 6000 60 0001 C CNN
@@ -1900,10 +1900,10 @@ F 3 "" H 2550 6000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L SPK0415HM4H M?
+L SPK0415HM4H M1002
U 1 1 5829373C
P 2550 7600
-F 0 "M?" H 2300 7900 50 0000 L CNN
+F 0 "M1002" H 2300 7900 50 0000 L CNN
F 1 "SPK0415HM4H" H 2575 7300 50 0000 C CNN
F 2 "neo900-legacy:SPK0415HM4H-B" H 2580 7750 20 0001 C CNN
F 3 "" H 2550 7600 60 0001 C CNN
@@ -1911,10 +1911,10 @@ F 3 "" H 2550 7600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$?
+L GND-3 #U$1001
U 1 1 58293743
P 1600 6500
-F 0 "#U$?" H 1480 6401 70 0001 L BNN
+F 0 "#U$1001" H 1480 6401 70 0001 L BNN
F 1 "GND3" H 1480 6401 70 0001 L BNN
F 2 "" H 1600 6500 60 0001 C CNN
F 3 "" H 1600 6500 60 0001 C CNN
@@ -1922,10 +1922,10 @@ F 3 "" H 1600 6500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$?
+L GND-3 #U$1006
U 1 1 58293749
P 3450 6500
-F 0 "#U$?" H 3330 6401 70 0001 L BNN
+F 0 "#U$1006" H 3330 6401 70 0001 L BNN
F 1 "GND3" H 3330 6401 70 0001 L BNN
F 2 "" H 3450 6500 60 0001 C CNN
F 3 "" H 3450 6500 60 0001 C CNN
@@ -1933,10 +1933,10 @@ F 3 "" H 3450 6500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$?
+L GND-3 #U$1004
U 1 1 5829374F
P 3150 6500
-F 0 "#U$?" H 3030 6401 70 0001 L BNN
+F 0 "#U$1004" H 3030 6401 70 0001 L BNN
F 1 "GND3" H 3030 6401 70 0001 L BNN
F 2 "" H 3150 6500 60 0001 C CNN
F 3 "" H 3150 6500 60 0001 C CNN
@@ -1944,10 +1944,10 @@ F 3 "" H 3150 6500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$?
+L GND-3 #U$1002
U 1 1 58293755
P 1600 8100
-F 0 "#U$?" H 1480 8001 70 0001 L BNN
+F 0 "#U$1002" H 1480 8001 70 0001 L BNN
F 1 "GND3" H 1480 8001 70 0001 L BNN
F 2 "" H 1600 8100 60 0001 C CNN
F 3 "" H 1600 8100 60 0001 C CNN
@@ -1955,10 +1955,10 @@ F 3 "" H 1600 8100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$?
+L GND-3 #U$1007
U 1 1 5829375B
P 3450 8100
-F 0 "#U$?" H 3330 8001 70 0001 L BNN
+F 0 "#U$1007" H 3330 8001 70 0001 L BNN
F 1 "GND3" H 3330 8001 70 0001 L BNN
F 2 "" H 3450 8100 60 0001 C CNN
F 3 "" H 3450 8100 60 0001 C CNN
@@ -1966,10 +1966,10 @@ F 3 "" H 3450 8100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$?
+L GND-3 #U$1003
U 1 1 58293764
P 2000 6500
-F 0 "#U$?" H 1880 6401 70 0001 L BNN
+F 0 "#U$1003" H 1880 6401 70 0001 L BNN
F 1 "GND3" H 1880 6401 70 0001 L BNN
F 2 "" H 2000 6500 60 0001 C CNN
F 3 "" H 2000 6500 60 0001 C CNN
@@ -1977,10 +1977,10 @@ F 3 "" H 2000 6500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$?
+L GND-3 #U$1005
U 1 1 5829376A
P 3150 8100
-F 0 "#U$?" H 3030 8001 70 0001 L BNN
+F 0 "#U$1005" H 3030 8001 70 0001 L BNN
F 1 "GND3" H 3030 8001 70 0001 L BNN
F 2 "" H 3150 8100 60 0001 C CNN
F 3 "" H 3150 8100 60 0001 C CNN
@@ -2102,10 +2102,10 @@ Wire Wire Line
Wire Wire Line
1600 7650 1600 7600
$Comp
-L POWERED #FLG?
+L POWERED #FLG1001
U 1 1 582937A1
P 3450 5300
-F 0 "#FLG?" H 3650 5200 60 0001 C CNN
+F 0 "#FLG1001" H 3650 5200 60 0001 C CNN
F 1 "POWERED" H 3450 5350 60 0000 C CNN
F 2 "" H 3450 5300 60 0001 C CNN
F 3 "" H 3450 5300 60 0001 C CNN
@@ -2113,10 +2113,10 @@ F 3 "" H 3450 5300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG?
+L POWERED #FLG1002
U 1 1 582937A7
P 3450 6900
-F 0 "#FLG?" H 3650 6800 60 0001 C CNN
+F 0 "#FLG1002" H 3650 6800 60 0001 C CNN
F 1 "POWERED" H 3450 6950 60 0000 C CNN
F 2 "" H 3450 6900 60 0001 C CNN
F 3 "" H 3450 6900 60 0001 C CNN
diff --git a/hw/display.sch b/hw/display.sch
index 6843e1b..5b6d5c5 100644
--- a/hw/display.sch
+++ b/hw/display.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 21 28
+Sheet 21 25
Title "Display"
Date "Intentionally Left Blank"
Rev ""
@@ -333,10 +333,10 @@ F 3 "" H 8150 3850 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND-3 #U$0299
+L GND-3 #U$1925
U 1 1 578D8B0E
P 12550 7950
-F 0 "#U$0299" H 12430 7851 70 0001 L BNN
+F 0 "#U$1925" H 12430 7851 70 0001 L BNN
F 1 "GND3" H 12430 7851 70 0001 L BNN
F 2 "" H 12550 7950 60 0001 C CNN
F 3 "" H 12550 7950 60 0001 C CNN
@@ -344,10 +344,10 @@ F 3 "" H 12550 7950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0300
+L GND-3 #U$1903
U 1 1 578D8B72
P 3650 2650
-F 0 "#U$0300" H 3530 2551 70 0001 L BNN
+F 0 "#U$1903" H 3530 2551 70 0001 L BNN
F 1 "GND3" H 3530 2551 70 0001 L BNN
F 2 "" H 3650 2650 60 0001 C CNN
F 3 "" H 3650 2650 60 0001 C CNN
@@ -355,10 +355,10 @@ F 3 "" H 3650 2650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0301
+L GND-3 #U$1907
U 1 1 578D8BD6
P 4850 2650
-F 0 "#U$0301" H 4730 2551 70 0001 L BNN
+F 0 "#U$1907" H 4730 2551 70 0001 L BNN
F 1 "GND3" H 4730 2551 70 0001 L BNN
F 2 "" H 4850 2650 60 0001 C CNN
F 3 "" H 4850 2650 60 0001 C CNN
@@ -366,10 +366,10 @@ F 3 "" H 4850 2650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0302
+L GND-3 #U$1917
U 1 1 578D8C3A
P 8150 4250
-F 0 "#U$0302" H 8030 4151 70 0001 L BNN
+F 0 "#U$1917" H 8030 4151 70 0001 L BNN
F 1 "GND3" H 8030 4151 70 0001 L BNN
F 2 "" H 8150 4250 60 0001 C CNN
F 3 "" H 8150 4250 60 0001 C CNN
@@ -377,10 +377,10 @@ F 3 "" H 8150 4250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0303
+L GND-3 #U$1918
U 1 1 578D8C9E
P 8500 4250
-F 0 "#U$0303" H 8380 4151 70 0001 L BNN
+F 0 "#U$1918" H 8380 4151 70 0001 L BNN
F 1 "GND3" H 8380 4151 70 0001 L BNN
F 2 "" H 8500 4250 60 0001 C CNN
F 3 "" H 8500 4250 60 0001 C CNN
@@ -388,10 +388,10 @@ F 3 "" H 8500 4250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0304
+L GND-3 #U$1908
U 1 1 578D8D02
P 5450 1600
-F 0 "#U$0304" H 5330 1501 70 0001 L BNN
+F 0 "#U$1908" H 5330 1501 70 0001 L BNN
F 1 "GND3" H 5330 1501 70 0001 L BNN
F 2 "" H 5450 1600 60 0001 C CNN
F 3 "" H 5450 1600 60 0001 C CNN
@@ -399,10 +399,10 @@ F 3 "" H 5450 1600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0305
+L GND-3 #U$1901
U 1 1 578D8D66
P 2750 2650
-F 0 "#U$0305" H 2630 2551 70 0001 L BNN
+F 0 "#U$1901" H 2630 2551 70 0001 L BNN
F 1 "GND3" H 2630 2551 70 0001 L BNN
F 2 "" H 2750 2650 60 0001 C CNN
F 3 "" H 2750 2650 60 0001 C CNN
@@ -410,10 +410,10 @@ F 3 "" H 2750 2650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0306
+L GND-3 #U$1922
U 1 1 578D8DCA
P 11800 9100
-F 0 "#U$0306" H 11680 9001 70 0001 L BNN
+F 0 "#U$1922" H 11680 9001 70 0001 L BNN
F 1 "GND3" H 11680 9001 70 0001 L BNN
F 2 "" H 11800 9100 60 0001 C CNN
F 3 "" H 11800 9100 60 0001 C CNN
@@ -501,10 +501,10 @@ F 3 "" H 3200 2250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0307
+L GND-3 #U$1902
U 1 1 57EA1082
P 3200 2650
-F 0 "#U$0307" H 3080 2551 70 0001 L BNN
+F 0 "#U$1902" H 3080 2551 70 0001 L BNN
F 1 "GND3" H 3080 2551 70 0001 L BNN
F 2 "" H 3200 2650 60 0001 C CNN
F 3 "" H 3200 2650 60 0001 C CNN
@@ -544,10 +544,10 @@ F 3 "" H 5500 3450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0308
+L GND-3 #U$1910
U 1 1 57EAA1FC
P 5500 3850
-F 0 "#U$0308" H 5380 3751 70 0001 L BNN
+F 0 "#U$1910" H 5380 3751 70 0001 L BNN
F 1 "GND3" H 5380 3751 70 0001 L BNN
F 2 "" H 5500 3850 60 0001 C CNN
F 3 "" H 5500 3850 60 0001 C CNN
@@ -689,10 +689,10 @@ F 3 "" H 3950 3450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0309
+L GND-3 #U$1904
U 1 1 57EAC98D
P 3950 3850
-F 0 "#U$0309" H 3830 3751 70 0001 L BNN
+F 0 "#U$1904" H 3830 3751 70 0001 L BNN
F 1 "GND3" H 3830 3751 70 0001 L BNN
F 2 "" H 3950 3850 60 0001 C CNN
F 3 "" H 3950 3850 60 0001 C CNN
@@ -702,10 +702,10 @@ $EndComp
Text GLabel 3850 2900 0 60 Input ~ 0
1V8
$Comp
-L GND-3 #U$0310
+L GND-3 #U$1906
U 1 1 57EACF94
P 4400 3850
-F 0 "#U$0310" H 4280 3751 70 0001 L BNN
+F 0 "#U$1906" H 4280 3751 70 0001 L BNN
F 1 "GND3" H 4280 3751 70 0001 L BNN
F 2 "" H 4400 3850 60 0001 C CNN
F 3 "" H 4400 3850 60 0001 C CNN
@@ -744,10 +744,10 @@ F 3 "" H 9700 2100 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND-3 #U$0311
+L GND-3 #U$1921
U 1 1 58084500
P 9950 1600
-F 0 "#U$0311" H 9830 1501 70 0001 L BNN
+F 0 "#U$1921" H 9830 1501 70 0001 L BNN
F 1 "GND3" H 9830 1501 70 0001 L BNN
F 2 "" H 9950 1600 60 0001 C CNN
F 3 "" H 9950 1600 60 0001 C CNN
@@ -811,10 +811,10 @@ F 3 "" H 13700 5600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0312
+L GND-3 #U$1923
U 1 1 58085F95
P 12100 6000
-F 0 "#U$0312" H 11980 5901 70 0001 L BNN
+F 0 "#U$1923" H 11980 5901 70 0001 L BNN
F 1 "GND3" H 11980 5901 70 0001 L BNN
F 2 "" H 12100 6000 60 0001 C CNN
F 3 "" H 12100 6000 60 0001 C CNN
@@ -822,10 +822,10 @@ F 3 "" H 12100 6000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0313
+L GND-3 #U$1924
U 1 1 58086059
P 12500 6000
-F 0 "#U$0313" H 12380 5901 70 0001 L BNN
+F 0 "#U$1924" H 12380 5901 70 0001 L BNN
F 1 "GND3" H 12380 5901 70 0001 L BNN
F 2 "" H 12500 6000 60 0001 C CNN
F 3 "" H 12500 6000 60 0001 C CNN
@@ -833,10 +833,10 @@ F 3 "" H 12500 6000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0314
+L GND-3 #U$1927
U 1 1 580860D3
P 12900 6000
-F 0 "#U$0314" H 12780 5901 70 0001 L BNN
+F 0 "#U$1927" H 12780 5901 70 0001 L BNN
F 1 "GND3" H 12780 5901 70 0001 L BNN
F 2 "" H 12900 6000 60 0001 C CNN
F 3 "" H 12900 6000 60 0001 C CNN
@@ -844,10 +844,10 @@ F 3 "" H 12900 6000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0315
+L GND-3 #U$1928
U 1 1 5808614D
P 13300 6000
-F 0 "#U$0315" H 13180 5901 70 0001 L BNN
+F 0 "#U$1928" H 13180 5901 70 0001 L BNN
F 1 "GND3" H 13180 5901 70 0001 L BNN
F 2 "" H 13300 6000 60 0001 C CNN
F 3 "" H 13300 6000 60 0001 C CNN
@@ -855,10 +855,10 @@ F 3 "" H 13300 6000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0316
+L GND-3 #U$1929
U 1 1 580861C7
P 13700 6000
-F 0 "#U$0316" H 13580 5901 70 0001 L BNN
+F 0 "#U$1929" H 13580 5901 70 0001 L BNN
F 1 "GND3" H 13580 5901 70 0001 L BNN
F 2 "" H 13700 6000 60 0001 C CNN
F 3 "" H 13700 6000 60 0001 C CNN
@@ -880,10 +880,10 @@ F 3 "" H 5700 7300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0317
+L GND-3 #U$1911
U 1 1 5808B8B6
P 5800 8000
-F 0 "#U$0317" H 5680 7901 70 0001 L BNN
+F 0 "#U$1911" H 5680 7901 70 0001 L BNN
F 1 "GND3" H 5680 7901 70 0001 L BNN
F 2 "" H 5800 8000 60 0001 C CNN
F 3 "" H 5800 8000 60 0001 C CNN
@@ -905,10 +905,10 @@ F 3 "" H 7200 7300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0318
+L GND-3 #U$1915
U 1 1 5808BB05
P 7300 8000
-F 0 "#U$0318" H 7180 7901 70 0001 L BNN
+F 0 "#U$1915" H 7180 7901 70 0001 L BNN
F 1 "GND3" H 7180 7901 70 0001 L BNN
F 2 "" H 7300 8000 60 0001 C CNN
F 3 "" H 7300 8000 60 0001 C CNN
@@ -927,10 +927,10 @@ F 3 "" H 12400 2100 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND-3 #U$0319
+L GND-3 #U$1926
U 1 1 5808D7E0
P 12650 1600
-F 0 "#U$0319" H 12530 1501 70 0001 L BNN
+F 0 "#U$1926" H 12530 1501 70 0001 L BNN
F 1 "GND3" H 12530 1501 70 0001 L BNN
F 2 "" H 12650 1600 60 0001 C CNN
F 3 "" H 12650 1600 60 0001 C CNN
@@ -1570,10 +1570,10 @@ F 3 "" H 14300 3300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0320
+L GND-3 #U$1930
U 1 1 58093A88
P 13900 3700
-F 0 "#U$0320" H 13780 3601 70 0001 L BNN
+F 0 "#U$1930" H 13780 3601 70 0001 L BNN
F 1 "GND3" H 13780 3601 70 0001 L BNN
F 2 "" H 13900 3700 60 0001 C CNN
F 3 "" H 13900 3700 60 0001 C CNN
@@ -1581,10 +1581,10 @@ F 3 "" H 13900 3700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0321
+L GND-3 #U$1931
U 1 1 58093B23
P 14300 3700
-F 0 "#U$0321" H 14180 3601 70 0001 L BNN
+F 0 "#U$1931" H 14180 3601 70 0001 L BNN
F 1 "GND3" H 14180 3601 70 0001 L BNN
F 2 "" H 14300 3700 60 0001 C CNN
F 3 "" H 14300 3700 60 0001 C CNN
@@ -1614,10 +1614,10 @@ TODO: check choke
Wire Wire Line
12550 7800 12550 7850
$Comp
-L POWERED #FLG?
+L POWERED #FLG1902
U 1 1 580A5F1E
P 12200 4050
-F 0 "#FLG?" H 12400 3950 60 0001 C CNN
+F 0 "#FLG1902" H 12400 3950 60 0001 C CNN
F 1 "POWERED" H 12200 4100 60 0000 C CNN
F 2 "" H 12200 4050 60 0001 C CNN
F 3 "" H 12200 4050 60 0001 C CNN
@@ -1625,10 +1625,10 @@ F 3 "" H 12200 4050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG?
+L POWERED #FLG1903
U 1 1 580A6140
P 12600 4300
-F 0 "#FLG?" H 12800 4200 60 0001 C CNN
+F 0 "#FLG1903" H 12800 4200 60 0001 C CNN
F 1 "POWERED" H 12600 4350 60 0000 C CNN
F 2 "" H 12600 4300 60 0001 C CNN
F 3 "" H 12600 4300 60 0001 C CNN
@@ -1636,10 +1636,10 @@ F 3 "" H 12600 4300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG?
+L POWERED #FLG1904
U 1 1 580A630F
P 13000 4050
-F 0 "#FLG?" H 13200 3950 60 0001 C CNN
+F 0 "#FLG1904" H 13200 3950 60 0001 C CNN
F 1 "POWERED" H 13000 4100 60 0000 C CNN
F 2 "" H 13000 4050 60 0001 C CNN
F 3 "" H 13000 4050 60 0001 C CNN
@@ -1647,10 +1647,10 @@ F 3 "" H 13000 4050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG?
+L POWERED #FLG1905
U 1 1 580A63AA
P 13400 4300
-F 0 "#FLG?" H 13600 4200 60 0001 C CNN
+F 0 "#FLG1905" H 13600 4200 60 0001 C CNN
F 1 "POWERED" H 13400 4350 60 0000 C CNN
F 2 "" H 13400 4300 60 0001 C CNN
F 3 "" H 13400 4300 60 0001 C CNN
@@ -1658,10 +1658,10 @@ F 3 "" H 13400 4300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG?
+L POWERED #FLG1906
U 1 1 580A6445
P 13800 4050
-F 0 "#FLG?" H 14000 3950 60 0001 C CNN
+F 0 "#FLG1906" H 14000 3950 60 0001 C CNN
F 1 "POWERED" H 13800 4100 60 0000 C CNN
F 2 "" H 13800 4050 60 0001 C CNN
F 3 "" H 13800 4050 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="C?" Part="1"
-F 0 "C?" H 7790 9990 50 0000 L CNN
+AR Path="/578AFF20/582957A4" Ref="C1908" Part="1"
+F 0 "C1908" 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 C?
+L C0603 C1911
U 1 1 582957AB
P 8600 9100
-F 0 "C?" H 8640 9140 50 0000 L CNN
+F 0 "C1911" 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 C?
+L C0603 C1910
U 1 1 582957B2
P 8250 9100
-F 0 "C?" H 8290 9140 50 0000 L CNN
+F 0 "C1910" 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 C?
+L C0603 C1909
U 1 1 582957B9
P 7900 9100
-F 0 "C?" H 7940 9140 50 0000 L CNN
+F 0 "C1909" 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="C?" Part="1"
-F 0 "C?" H 6790 10490 50 0000 L CNN
+AR Path="/578AFF20/582957C0" Ref="C1906" Part="1"
+F 0 "C1906" 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="C?" Part="1"
-F 0 "C?" H 6440 10490 50 0000 L CNN
+AR Path="/578AFF20/582957C7" Ref="C1905" Part="1"
+F 0 "C1905" 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="P?" Part="14"
-F 0 "P?" H 10370 9140 50 0001 L BNN
+AR Path="/578AFF20/582957CE" Ref="P1" Part="14"
+F 0 "P1" 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="R?" Part="1"
-F 0 "R?" H 7020 9860 50 0000 L BNN
+AR Path="/578AFF20/582957D5" Ref="R1914" Part="1"
+F 0 "R1914" 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="R?" Part="1"
-F 0 "R?" H 6150 8950 50 0000 L CNN
+AR Path="/578AFF20/582957DC" Ref="R1912" Part="1"
+F 0 "R1912" 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="R?" Part="1"
-F 0 "R?" H 6150 9150 50 0000 L CNN
+AR Path="/578AFF20/582957E3" Ref="R1913" Part="1"
+F 0 "R1913" 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
@@ -1843,10 +1843,10 @@ F 3 "" H 6550 9100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$?
+L GND-3 #U$1916
U 1 1 582957EA
P 7750 10250
-F 0 "#U$?" H 7630 10151 70 0001 L BNN
+F 0 "#U$1916" H 7630 10151 70 0001 L BNN
F 1 "GND3" H 7630 10151 70 0001 L BNN
F 2 "" H 7750 10250 60 0001 C CNN
F 3 "" H 7750 10250 60 0001 C CNN
@@ -1854,10 +1854,10 @@ F 3 "" H 7750 10250 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$?
+L GND-3 #U$1919
U 1 1 582957F0
P 8600 9550
-F 0 "#U$?" H 8480 9451 70 0001 L BNN
+F 0 "#U$1919" H 8480 9451 70 0001 L BNN
F 1 "GND3" H 8480 9451 70 0001 L BNN
F 2 "" H 8600 9550 60 0001 C CNN
F 3 "" H 8600 9550 60 0001 C CNN
@@ -1865,10 +1865,10 @@ F 3 "" H 8600 9550 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$?
+L GND-3 #U$1909
U 1 1 582957F6
P 5450 10850
-F 0 "#U$?" H 5330 10751 70 0001 L BNN
+F 0 "#U$1909" H 5330 10751 70 0001 L BNN
F 1 "GND3" H 5330 10751 70 0001 L BNN
F 2 "" H 5450 10850 60 0001 C CNN
F 3 "" H 5450 10850 60 0001 C CNN
@@ -1876,10 +1876,10 @@ F 3 "" H 5450 10850 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$?
+L GND-3 #U$1912
U 1 1 582957FC
P 6050 10850
-F 0 "#U$?" H 5930 10751 70 0001 L BNN
+F 0 "#U$1912" H 5930 10751 70 0001 L BNN
F 1 "GND3" H 5930 10751 70 0001 L BNN
F 2 "" H 6050 10850 60 0001 C CNN
F 3 "" H 6050 10850 60 0001 C CNN
@@ -1887,10 +1887,10 @@ F 3 "" H 6050 10850 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$?
+L GND-3 #U$1914
U 1 1 58295802
P 6750 10850
-F 0 "#U$?" H 6630 10751 70 0001 L BNN
+F 0 "#U$1914" H 6630 10751 70 0001 L BNN
F 1 "GND3" H 6630 10751 70 0001 L BNN
F 2 "" H 6750 10850 60 0001 C CNN
F 3 "" H 6750 10850 60 0001 C CNN
@@ -1898,10 +1898,10 @@ F 3 "" H 6750 10850 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$?
+L GND-3 #U$1905
U 1 1 58295808
P 3950 8800
-F 0 "#U$?" H 3830 8701 70 0001 L BNN
+F 0 "#U$1905" H 3830 8701 70 0001 L BNN
F 1 "GND3" H 3830 8701 70 0001 L BNN
F 2 "" H 3950 8800 60 0001 C CNN
F 3 "" H 3950 8800 60 0001 C CNN
@@ -1909,10 +1909,10 @@ F 3 "" H 3950 8800 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L CRTOUCH U?
+L CRTOUCH U1903
U 1 1 5829580E
P 5050 9400
-F 0 "U?" H 4850 10300 45 0000 L BNN
+F 0 "U1903" H 4850 10300 45 0000 L BNN
F 1 "CRTOUCH" H 4880 8430 45 0000 L BNN
F 2 "neo900-legacy:QFN-32+E-0.5" H 5080 9550 20 0001 C CNN
F 3 "" H 5050 9400 60 0001 C CNN
@@ -1939,10 +1939,10 @@ NoConn ~ 4250 9200
NoConn ~ 4250 9100
NoConn ~ 4250 8900
$Comp
-L C0603 C?
+L C0603 C1907
U 1 1 58295824
P 7550 9100
-F 0 "C?" H 7590 9140 50 0000 L CNN
+F 0 "C1907" 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
@@ -2072,10 +2072,10 @@ Wire Wire Line
8250 9300 8250 9400
Connection ~ 8250 9400
$Comp
-L GND-3 #U$?
+L GND-3 #U$1913
U 1 1 5829585B
P 6400 10850
-F 0 "#U$?" H 6280 10751 70 0001 L BNN
+F 0 "#U$1913" H 6280 10751 70 0001 L BNN
F 1 "GND3" H 6280 10751 70 0001 L BNN
F 2 "" H 6400 10850 60 0001 C CNN
F 3 "" H 6400 10850 60 0001 C CNN
@@ -2091,10 +2091,10 @@ Wire Wire Line
7750 9800 7750 9850
NoConn ~ 5950 8500
$Comp
-L POWERED #FLG?
+L POWERED #FLG1901
U 1 1 58295866
P 6550 9500
-F 0 "#FLG?" H 6750 9400 60 0001 C CNN
+F 0 "#FLG1901" H 6750 9400 60 0001 C CNN
F 1 "POWERED" H 6550 9550 60 0000 C CNN
F 2 "" H 6550 9500 60 0001 C CNN
F 3 "" H 6550 9500 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 U?
+L ESDA6V1-5P6 U1904
U 1 1 58295871
P 9700 9600
-AR Path="/578AFF20/58295871" Ref="U?" Part="1"
+AR Path="/578AFF20/58295871" Ref="U1904" Part="1"
AR Path="/578AFF1E/58295871" Ref="U?" Part="1"
-F 0 "U?" H 9250 9800 50 0000 R CNN
+F 0 "U1904" 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
@@ -2124,10 +2124,10 @@ F 3 "" H 9700 9600 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$?
+L GND-3 #U$1920
U 1 1 58295878
P 9600 10300
-F 0 "#U$?" H 9480 10201 70 0001 L BNN
+F 0 "#U$1920" H 9480 10201 70 0001 L BNN
F 1 "GND3" H 9480 10201 70 0001 L BNN
F 2 "" H 9600 10300 60 0001 C CNN
F 3 "" H 9600 10300 60 0001 C CNN
diff --git a/hw/hb.sch b/hw/hb.sch
index 18a3889..1431161 100644
--- a/hw/hb.sch
+++ b/hw/hb.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 18 31
+Sheet 18 25
Title "Hackerbus"
Date "Intentionally Left Blank"
Rev ""
@@ -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$1801" Part="1"
-F 0 "#U$1801" H 2610 3550 70 0001 L BNN
+AR Path="/578AFF12/57F474BB" Ref="#U$1401" Part="1"
+F 0 "#U$1401" 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$1802" Part="1"
-F 0 "#U$1802" H 3610 3550 70 0001 L BNN
+AR Path="/578AFF12/57F474C1" Ref="#U$1402" Part="1"
+F 0 "#U$1402" 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$1806" Part="1"
-F 0 "#U$1806" H 7310 3550 70 0001 L BNN
+AR Path="/578AFF12/57F474C7" Ref="#U$1403" Part="1"
+F 0 "#U$1403" 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
@@ -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$1807" Part="1"
-F 0 "#U$1807" H 9910 3100 70 0001 L BNN
+AR Path="/578AFF12/57F47503" Ref="#U$1404" Part="1"
+F 0 "#U$1404" 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 #FLG1801
+L POWERED #FLG1401
U 1 1 57F47944
P 12400 1650
-F 0 "#FLG1801" H 12600 1550 60 0001 C CNN
+F 0 "#FLG1401" 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
@@ -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$1808" Part="1"
-F 0 "#U$1808" H 12160 2450 70 0001 L BNN
+AR Path="/578AFF12/57F479A9" Ref="#U$1405" Part="1"
+F 0 "#U$1405" 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$1809" Part="1"
-F 0 "#U$1809" H 12710 4150 70 0001 L BNN
+AR Path="/578AFF12/57F479AF" Ref="#U$1406" Part="1"
+F 0 "#U$1406" 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$1810" Part="1"
-F 0 "#U$1810" H 13610 5050 70 0001 L BNN
+AR Path="/578AFF12/57F479B5" Ref="#U$1407" Part="1"
+F 0 "#U$1407" 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$1811" Part="1"
-F 0 "#U$1811" H 14510 1700 70 0001 L BNN
+AR Path="/578AFF12/57F479C1" Ref="#U$1408" Part="1"
+F 0 "#U$1408" 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
diff --git a/hw/ir.sch b/hw/ir.sch
index 17ebe49..9634f18 100644
--- a/hw/ir.sch
+++ b/hw/ir.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 19 31
+Sheet 19 25
Title "Infrared"
Date "Intentionally Left Blank"
Rev ""
@@ -191,10 +191,10 @@ F 3 "" H 7300 5500 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$1901
+L GND #U$1501
U 1 1 578CFC75
P 4750 4200
-F 0 "#U$1901" H 4660 4100 70 0001 L BNN
+F 0 "#U$1501" 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$1904
+L GND #U$1504
U 1 1 578CFCD9
P 6700 4200
-F 0 "#U$1904" H 6610 4100 70 0001 L BNN
+F 0 "#U$1504" 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$1909
+L GND #U$1509
U 1 1 578CFDA1
P 12300 5000
-F 0 "#U$1909" H 12210 4900 70 0001 L BNN
+F 0 "#U$1509" 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$1905
+L GND #U$1505
U 1 1 578CFE05
P 7300 5900
-F 0 "#U$1905" H 7210 5800 70 0001 L BNN
+F 0 "#U$1505" 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
@@ -278,10 +278,10 @@ F 3 "" H 11800 4600 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$1908
+L GND #U$1508
U 1 1 57DA047D
P 11800 5000
-F 0 "#U$1908" H 11710 4900 70 0001 L BNN
+F 0 "#U$1508" 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
@@ -314,10 +314,10 @@ F 3 "" H 7850 7900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1906
+L GND #U$1506
U 1 1 57DA24DC
P 7850 8300
-F 0 "#U$1906" H 7760 8200 70 0001 L BNN
+F 0 "#U$1506" 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$1907
+L GND #U$1507
U 1 1 57DA25C4
P 9550 8300
-F 0 "#U$1907" H 9460 8200 70 0001 L BNN
+F 0 "#U$1507" 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
@@ -571,10 +571,10 @@ F 3 "" H 6650 5500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1903
+L GND #U$1503
U 1 1 58150FB7
P 6650 5900
-F 0 "#U$1903" H 6560 5800 70 0001 L BNN
+F 0 "#U$1503" 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$1902
+L GND #U$1502
U 1 1 58151168
P 5800 5850
-F 0 "#U$1902" H 5710 5750 70 0001 L BNN
+F 0 "#U$1502" 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 3cf2bdc..47e081e 100644
--- a/hw/jack.sch
+++ b/hw/jack.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 11 29
+Sheet 11 25
Title "Audio Headset, ECI"
Date "Intentionally Left Blank"
Rev ""
@@ -516,10 +516,10 @@ F 3 "" H 9250 6950 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$1217
+L GND #U$1121
U 1 1 578C6B0C
P 13100 6550
-F 0 "#U$1217" H 13010 6450 70 0001 L BNN
+F 0 "#U$1121" H 13010 6450 70 0001 L BNN
F 1 "GND" H 13010 6450 70 0001 L BNN
F 2 "" H 13100 6550 60 0001 C CNN
F 3 "" H 13100 6550 60 0001 C CNN
@@ -527,10 +527,10 @@ F 3 "" H 13100 6550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-A #U$1205
+L GND-A #U$1110
U 1 1 578C6B70
P 6250 5550
-F 0 "#U$1205" H 6130 5320 70 0001 L BNN
+F 0 "#U$1110" H 6130 5320 70 0001 L BNN
F 1 "GND-A" H 6130 5320 70 0001 L BNN
F 2 "" H 6250 5550 60 0001 C CNN
F 3 "" H 6250 5550 60 0001 C CNN
@@ -538,10 +538,10 @@ F 3 "" H 6250 5550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-A #U$1206
+L GND-A #U$1111
U 1 1 578C6BD4
P 6350 7200
-F 0 "#U$1206" H 6230 6970 70 0001 L BNN
+F 0 "#U$1111" H 6230 6970 70 0001 L BNN
F 1 "GND-A" H 6230 6970 70 0001 L BNN
F 2 "" H 6350 7200 60 0001 C CNN
F 3 "" H 6350 7200 60 0001 C CNN
@@ -549,10 +549,10 @@ F 3 "" H 6350 7200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-A #U$1210
+L GND-A #U$1113
U 1 1 578C6C38
P 7750 7200
-F 0 "#U$1210" H 7630 6970 70 0001 L BNN
+F 0 "#U$1113" H 7630 6970 70 0001 L BNN
F 1 "GND-A" H 7630 6970 70 0001 L BNN
F 2 "" H 7750 7200 60 0001 C CNN
F 3 "" H 7750 7200 60 0001 C CNN
@@ -560,10 +560,10 @@ F 3 "" H 7750 7200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-A #U$1209
+L GND-A #U$1105
U 1 1 578C6C9C
P 4700 3800
-F 0 "#U$1209" H 4580 3570 70 0001 L BNN
+F 0 "#U$1105" H 4580 3570 70 0001 L BNN
F 1 "GND-A" H 4580 3570 70 0001 L BNN
F 2 "" H 4700 3800 60 0001 C CNN
F 3 "" H 4700 3800 60 0001 C CNN
@@ -571,10 +571,10 @@ F 3 "" H 4700 3800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-A #U$1218
+L GND-A #U$1122
U 1 1 578C6D00
P 13800 6450
-F 0 "#U$1218" H 13680 6220 70 0001 L BNN
+F 0 "#U$1122" H 13680 6220 70 0001 L BNN
F 1 "GND-A" H 13680 6220 70 0001 L BNN
F 2 "" H 13800 6450 60 0001 C CNN
F 3 "" H 13800 6450 60 0001 C CNN
@@ -582,10 +582,10 @@ F 3 "" H 13800 6450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-A #U$1207
+L GND-A #U$1112
U 1 1 578C6E2C
P 6650 7200
-F 0 "#U$1207" H 6530 6970 70 0001 L BNN
+F 0 "#U$1112" H 6530 6970 70 0001 L BNN
F 1 "GND-A" H 6530 6970 70 0001 L BNN
F 2 "" H 6650 7200 60 0001 C CNN
F 3 "" H 6650 7200 60 0001 C CNN
@@ -593,10 +593,10 @@ F 3 "" H 6650 7200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-A #U$1213
+L GND-A #U$1115
U 1 1 578C6F58
P 9250 7200
-F 0 "#U$1213" H 9130 6970 70 0001 L BNN
+F 0 "#U$1115" H 9130 6970 70 0001 L BNN
F 1 "GND-A" H 9130 6970 70 0001 L BNN
F 2 "" H 9250 7200 60 0001 C CNN
F 3 "" H 9250 7200 60 0001 C CNN
@@ -604,10 +604,10 @@ F 3 "" H 9250 7200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-A #U$1202
+L GND-A #U$1102
U 1 1 578C6FBC
P 3100 6650
-F 0 "#U$1202" H 2980 6420 70 0001 L BNN
+F 0 "#U$1102" H 2980 6420 70 0001 L BNN
F 1 "GND-A" H 2980 6420 70 0001 L BNN
F 2 "" H 3100 6650 60 0001 C CNN
F 3 "" H 3100 6650 60 0001 C CNN
@@ -615,10 +615,10 @@ F 3 "" H 3100 6650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1201
+L GND #U$1101
U 1 1 578C7020
P 3100 5750
-F 0 "#U$1201" H 3010 5650 70 0001 L BNN
+F 0 "#U$1101" H 3010 5650 70 0001 L BNN
F 1 "GND" H 3010 5650 70 0001 L BNN
F 2 "" H 3100 5750 60 0001 C CNN
F 3 "" H 3100 5750 60 0001 C CNN
@@ -719,10 +719,10 @@ Text GLabel 12050 4750 0 60 Input ~ 0
Text GLabel 13050 5350 2 60 Output ~ 0
HEADPH_SENSE
$Comp
-L POWERED #FLG1201
+L POWERED #FLG1101
U 1 1 57918CB7
P 3500 900
-F 0 "#FLG1201" H 3700 800 60 0001 C CNN
+F 0 "#FLG1101" H 3700 800 60 0001 C CNN
F 1 "POWERED" H 3500 950 60 0000 C CNN
F 2 "" H 3500 900 60 0001 C CNN
F 3 "" H 3500 900 60 0001 C CNN
@@ -747,10 +747,10 @@ TVOUT
Text GLabel 5600 8250 2 60 Input ~ 0
TVOUT_EN
$Comp
-L GND #U$1204
+L GND #U$1108
U 1 1 57F40CD5
P 5300 9050
-F 0 "#U$1204" H 5210 8950 70 0001 L BNN
+F 0 "#U$1108" H 5210 8950 70 0001 L BNN
F 1 "GND" H 5210 8950 70 0001 L BNN
F 2 "" H 5300 9050 60 0001 C CNN
F 3 "" H 5300 9050 60 0001 C CNN
@@ -769,10 +769,10 @@ F 3 "" H 3850 8650 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L GND #U$1203
+L GND #U$1103
U 1 1 57F40EF6
P 3850 9050
-F 0 "#U$1203" H 3760 8950 70 0001 L BNN
+F 0 "#U$1103" H 3760 8950 70 0001 L BNN
F 1 "GND" H 3760 8950 70 0001 L BNN
F 2 "" H 3850 9050 60 0001 C CNN
F 3 "" H 3850 9050 60 0001 C CNN
@@ -782,10 +782,10 @@ $EndComp
Text GLabel 3450 8450 0 60 Input ~ 0
2V7
$Comp
-L GND #U$1215
+L GND #U$1118
U 1 1 57F4857A
P 11350 3050
-F 0 "#U$1215" H 11260 2950 70 0001 L BNN
+F 0 "#U$1118" H 11260 2950 70 0001 L BNN
F 1 "GND" H 11260 2950 70 0001 L BNN
F 2 "" H 11350 3050 60 0001 C CNN
F 3 "" H 11350 3050 60 0001 C CNN
@@ -793,10 +793,10 @@ F 3 "" H 11350 3050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1214
+L GND #U$1116
U 1 1 57F48711
P 10850 5200
-F 0 "#U$1214" H 10760 5100 70 0001 L BNN
+F 0 "#U$1116" H 10760 5100 70 0001 L BNN
F 1 "GND" H 10760 5100 70 0001 L BNN
F 2 "" H 10850 5200 60 0001 C CNN
F 3 "" H 10850 5200 60 0001 C CNN
@@ -806,10 +806,10 @@ $EndComp
Text GLabel 5850 5100 0 60 Input ~ 0
VBAT_SWITCHED
$Comp
-L GND #U$1212
+L GND #U$1109
U 1 1 57F6D837
P 5650 3850
-F 0 "#U$1212" H 5560 3750 70 0001 L BNN
+F 0 "#U$1109" H 5560 3750 70 0001 L BNN
F 1 "GND" H 5560 3750 70 0001 L BNN
F 2 "" H 5650 3850 60 0001 C CNN
F 3 "" H 5650 3850 60 0001 C CNN
@@ -819,10 +819,10 @@ $EndComp
Text Notes 5400 4150 0 60 ~ 0
Bypass to GND\nplane or pin 19
$Comp
-L GND #U$1208
+L GND #U$1104
U 1 1 57F6DF26
P 4250 3900
-F 0 "#U$1208" H 4160 3800 70 0001 L BNN
+F 0 "#U$1104" H 4160 3800 70 0001 L BNN
F 1 "GND" H 4160 3800 70 0001 L BNN
F 2 "" H 4250 3900 60 0001 C CNN
F 3 "" H 4250 3900 60 0001 C CNN
@@ -830,10 +830,10 @@ F 3 "" H 4250 3900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1211
+L GND #U$1106
U 1 1 57F6DFB5
P 4950 3900
-F 0 "#U$1211" H 4860 3800 70 0001 L BNN
+F 0 "#U$1106" H 4860 3800 70 0001 L BNN
F 1 "GND" H 4860 3800 70 0001 L BNN
F 2 "" H 4950 3900 60 0001 C CNN
F 3 "" H 4950 3900 60 0001 C CNN
@@ -1360,10 +1360,10 @@ F 3 "" H 12250 5650 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$1216
+L GND #U$1120
U 1 1 5808F6C7
P 12250 6050
-F 0 "#U$1216" H 12160 5950 70 0001 L BNN
+F 0 "#U$1120" H 12160 5950 70 0001 L BNN
F 1 "GND" H 12160 5950 70 0001 L BNN
F 2 "" H 12250 6050 60 0001 C CNN
F 3 "" H 12250 6050 60 0001 C CNN
@@ -1386,10 +1386,10 @@ Wire Wire Line
Wire Wire Line
12850 5350 13050 5350
$Comp
-L POWERED #FLG1202
+L POWERED #FLG1103
U 1 1 580ABB7B
P 13800 6000
-F 0 "#FLG1202" H 14000 5900 60 0001 C CNN
+F 0 "#FLG1103" H 14000 5900 60 0001 C CNN
F 1 "POWERED" H 13800 6050 60 0000 C CNN
F 2 "" H 13800 6000 60 0001 C CNN
F 3 "" H 13800 6000 60 0001 C CNN
@@ -1465,10 +1465,10 @@ Wire Wire Line
5100 6300 5000 6300
Connection ~ 5100 6100
$Comp
-L GND-A #U$?
+L GND-A #U$1107
U 1 1 5814F420
P 5100 6450
-F 0 "#U$?" H 4980 6220 70 0001 L BNN
+F 0 "#U$1107" H 4980 6220 70 0001 L BNN
F 1 "GND-A" H 4980 6220 70 0001 L BNN
F 2 "" H 5100 6450 60 0001 C CNN
F 3 "" H 5100 6450 60 0001 C CNN
@@ -1498,8 +1498,8 @@ L R0402 R?
U 1 1 58299A35
P 9900 8700
AR Path="/578AFF08/58299A35" Ref="R?" Part="1"
-AR Path="/578AFF06/58299A35" Ref="R?" Part="1"
-F 0 "R?" H 9770 8760 50 0000 L BNN
+AR Path="/578AFF06/58299A35" Ref="R1117" Part="1"
+F 0 "R1117" 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
@@ -1511,8 +1511,8 @@ L R0402 R?
U 1 1 58299A3C
P 10200 8700
AR Path="/578AFF08/58299A3C" Ref="R?" Part="1"
-AR Path="/578AFF06/58299A3C" Ref="R?" Part="1"
-F 0 "R?" H 10070 8760 50 0000 L BNN
+AR Path="/578AFF06/58299A3C" Ref="R1119" Part="1"
+F 0 "R1119" 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
@@ -1524,8 +1524,8 @@ L R0402 R?
U 1 1 58299A43
P 10700 9000
AR Path="/578AFF08/58299A43" Ref="R?" Part="1"
-AR Path="/578AFF06/58299A43" Ref="R?" Part="1"
-F 0 "R?" H 10570 9060 50 0000 L BNN
+AR Path="/578AFF06/58299A43" Ref="R1121" Part="1"
+F 0 "R1121" 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
@@ -1537,8 +1537,8 @@ L R0402 R?
U 1 1 58299A4A
P 11950 9150
AR Path="/578AFF08/58299A4A" Ref="R?" Part="1"
-AR Path="/578AFF06/58299A4A" Ref="R?" Part="1"
-F 0 "R?" H 11820 9210 50 0000 L BNN
+AR Path="/578AFF06/58299A4A" Ref="R1123" Part="1"
+F 0 "R1123" 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
@@ -1550,8 +1550,8 @@ L R0402 R?
U 1 1 58299A51
P 12150 9150
AR Path="/578AFF08/58299A51" Ref="R?" Part="1"
-AR Path="/578AFF06/58299A51" Ref="R?" Part="1"
-F 0 "R?" H 12020 9210 50 0000 L BNN
+AR Path="/578AFF06/58299A51" Ref="R1124" Part="1"
+F 0 "R1124" 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
@@ -1563,8 +1563,8 @@ L R0402 R?
U 1 1 58299A58
P 9550 9350
AR Path="/578AFF08/58299A58" Ref="R?" Part="1"
-AR Path="/578AFF06/58299A58" Ref="R?" Part="1"
-F 0 "R?" H 9420 9410 50 0000 L BNN
+AR Path="/578AFF06/58299A58" Ref="R1115" Part="1"
+F 0 "R1115" 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
@@ -1576,8 +1576,8 @@ L R0402 R?
U 1 1 58299A5F
P 9550 9850
AR Path="/578AFF08/58299A5F" Ref="R?" Part="1"
-AR Path="/578AFF06/58299A5F" Ref="R?" Part="1"
-F 0 "R?" H 9420 9910 50 0000 L BNN
+AR Path="/578AFF06/58299A5F" Ref="R1116" Part="1"
+F 0 "R1116" 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
@@ -1589,8 +1589,8 @@ L R0402 R?
U 1 1 58299A66
P 10700 10400
AR Path="/578AFF08/58299A66" Ref="R?" Part="1"
-AR Path="/578AFF06/58299A66" Ref="R?" Part="1"
-F 0 "R?" H 10570 10460 50 0000 L BNN
+AR Path="/578AFF06/58299A66" Ref="R1122" Part="1"
+F 0 "R1122" 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
@@ -1602,8 +1602,8 @@ L R0402 R?
U 1 1 58299A6D
P 9900 10350
AR Path="/578AFF08/58299A6D" Ref="R?" Part="1"
-AR Path="/578AFF06/58299A6D" Ref="R?" Part="1"
-F 0 "R?" H 9770 10410 50 0000 L BNN
+AR Path="/578AFF06/58299A6D" Ref="R1118" Part="1"
+F 0 "R1118" 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
@@ -1615,8 +1615,8 @@ L R0402 R?
U 1 1 58299A74
P 10200 10350
AR Path="/578AFF08/58299A74" Ref="R?" Part="1"
-AR Path="/578AFF06/58299A74" Ref="R?" Part="1"
-F 0 "R?" H 10070 10410 50 0000 L BNN
+AR Path="/578AFF06/58299A74" Ref="R1120" Part="1"
+F 0 "R1120" 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
@@ -1628,8 +1628,8 @@ L R0402 R?
U 1 1 58299A7B
P 6750 10250
AR Path="/578AFF08/58299A7B" Ref="R?" Part="1"
-AR Path="/578AFF06/58299A7B" Ref="R?" Part="1"
-F 0 "R?" H 6620 10310 50 0000 L BNN
+AR Path="/578AFF06/58299A7B" Ref="R1113" Part="1"
+F 0 "R1113" 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
@@ -1641,8 +1641,8 @@ L GND #U$?
U 1 1 58299A82
P 11000 10800
AR Path="/578AFF08/58299A82" Ref="#U$?" Part="1"
-AR Path="/578AFF06/58299A82" Ref="#U$?" Part="1"
-F 0 "#U$?" H 10910 10700 70 0001 L BNN
+AR Path="/578AFF06/58299A82" Ref="#U$1117" Part="1"
+F 0 "#U$1117" H 10910 10700 70 0001 L BNN
F 1 "GND" H 10910 10700 70 0001 L BNN
F 2 "" H 11000 10800 60 0001 C CNN
F 3 "" H 11000 10800 60 0001 C CNN
@@ -1654,8 +1654,8 @@ L GND #U$?
U 1 1 58299A88
P 8100 9100
AR Path="/578AFF08/58299A88" Ref="#U$?" Part="1"
-AR Path="/578AFF06/58299A88" Ref="#U$?" Part="1"
-F 0 "#U$?" H 8010 9000 70 0001 L BNN
+AR Path="/578AFF06/58299A88" Ref="#U$1114" Part="1"
+F 0 "#U$1114" H 8010 9000 70 0001 L BNN
F 1 "GND" H 8010 9000 70 0001 L BNN
F 2 "" H 8100 9100 60 0001 C CNN
F 3 "" H 8100 9100 60 0001 C CNN
@@ -1667,8 +1667,8 @@ L TLV70230DBV U?
U 1 1 58299A8E
P 8100 8550
AR Path="/578AFF08/58299A8E" Ref="U?" Part="1"
-AR Path="/578AFF06/58299A8E" Ref="U?" Part="1"
-F 0 "U?" H 7951 8800 50 0000 L BNN
+AR Path="/578AFF06/58299A8E" Ref="U1102" Part="1"
+F 0 "U1102" 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
@@ -1676,10 +1676,10 @@ F 3 "" H 8100 8550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L TLV1702DGK U?
+L TLV1702DGK U1103
U 1 1 58299A95
P 10800 9650
-F 0 "U?" H 10590 10120 45 0000 L BNN
+F 0 "U1103" 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
@@ -1813,10 +1813,10 @@ Wire Wire Line
Wire Wire Line
11000 10600 11000 10700
$Comp
-L POWERED #FLG?
+L POWERED #FLG1102
U 1 1 58299AD4
P 8900 8200
-F 0 "#FLG?" H 9100 8100 60 0001 C CNN
+F 0 "#FLG1102" H 9100 8100 60 0001 C CNN
F 1 "POWERED" H 8900 8250 60 0000 C CNN
F 2 "" H 8900 8200 60 0001 C CNN
F 3 "" H 8900 8200 60 0001 C CNN
@@ -1841,8 +1841,8 @@ L R0402 R?
U 1 1 58299AE3
P 9200 8950
AR Path="/578AFF08/58299AE3" Ref="R?" Part="1"
-AR Path="/578AFF06/58299AE3" Ref="R?" Part="1"
-F 0 "R?" H 9070 9010 50 0000 L BNN
+AR Path="/578AFF06/58299AE3" Ref="R1114" Part="1"
+F 0 "R1114" 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
@@ -1859,8 +1859,8 @@ L C0402 C?
U 1 1 58299AED
P 11500 8650
AR Path="/578AFF08/58299AED" Ref="C?" Part="1"
-AR Path="/578AFF06/58299AED" Ref="C?" Part="1"
-F 0 "C?" H 11540 8690 50 0000 L CNN
+AR Path="/578AFF06/58299AED" Ref="C1112" Part="1"
+F 0 "C1112" 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
@@ -1872,8 +1872,8 @@ L GND #U$?
U 1 1 58299AF4
P 11500 9050
AR Path="/578AFF08/58299AF4" Ref="#U$?" Part="1"
-AR Path="/578AFF06/58299AF4" Ref="#U$?" Part="1"
-F 0 "#U$?" H 11410 8950 70 0001 L BNN
+AR Path="/578AFF06/58299AF4" Ref="#U$1119" Part="1"
+F 0 "#U$1119" H 11410 8950 70 0001 L BNN
F 1 "GND" H 11410 8950 70 0001 L BNN
F 2 "" H 11500 9050 60 0001 C CNN
F 3 "" H 11500 9050 60 0001 C CNN
diff --git a/hw/keys.sch b/hw/keys.sch
index 183003c..3495a04 100644
--- a/hw/keys.sch
+++ b/hw/keys.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 21 31
+Sheet 21 25
Title "Keypad and buttons"
Date "Intentionally Left Blank"
Rev ""
@@ -464,10 +464,10 @@ F 3 "" H 8700 1500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$2301
+L GND-3 #U$1806
U 1 1 578D52F0
P 8700 1900
-F 0 "#U$2301" H 8580 1801 70 0001 L BNN
+F 0 "#U$1806" H 8580 1801 70 0001 L BNN
F 1 "GND3" H 8580 1801 70 0001 L BNN
F 2 "" H 8700 1900 60 0001 C CNN
F 3 "" H 8700 1900 60 0001 C CNN
@@ -1137,8 +1137,8 @@ P 13000 9300
AR Path="/578AFEF0/582952AB" Ref="D?" Part="1"
AR Path="/582952AB" Ref="D?" Part="1"
AR Path="/578AFEF2/582952AB" Ref="D?" Part="1"
-AR Path="/578AFF1C/582952AB" Ref="D?" Part="1"
-F 0 "D?" V 13100 9450 50 0000 L BNN
+AR Path="/578AFF1C/582952AB" Ref="D1807" Part="1"
+F 0 "D1807" V 13100 9450 50 0000 L BNN
F 1 "V5.5MLA0603N" V 12850 9350 50 0000 L BNN
F 2 "neo900-legacy:SMD-0603" H 12990 9090 65 0001 L TNN
F 3 "" H 13000 9300 60 0001 C CNN
@@ -1152,8 +1152,8 @@ P 9500 9300
AR Path="/578AFEF0/582952B2" Ref="D?" Part="1"
AR Path="/582952B2" Ref="D?" Part="1"
AR Path="/578AFEF2/582952B2" Ref="D?" Part="1"
-AR Path="/578AFF1C/582952B2" Ref="D?" Part="1"
-F 0 "D?" V 9600 9500 50 0000 L BNN
+AR Path="/578AFF1C/582952B2" Ref="D1806" Part="1"
+F 0 "D1806" V 9600 9500 50 0000 L BNN
F 1 "V5.5MLA0603N" V 9350 9350 50 0000 L BNN
F 2 "neo900-legacy:SMD-0603" H 9490 9090 65 0001 L TNN
F 3 "" H 9500 9300 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="D?" Part="1"
-F 0 "D?" V 1900 9350 50 0000 L BNN
+AR Path="/578AFF1C/582952B9" Ref="D1802" Part="1"
+F 0 "D1802" 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
@@ -1182,8 +1182,8 @@ P 5300 9350
AR Path="/578AFEF0/582952C0" Ref="D?" Part="1"
AR Path="/582952C0" Ref="D?" Part="1"
AR Path="/578AFEF2/582952C0" Ref="D?" Part="1"
-AR Path="/578AFF1C/582952C0" Ref="D?" Part="1"
-F 0 "D?" V 5400 9500 50 0000 L BNN
+AR Path="/578AFF1C/582952C0" Ref="D1804" Part="1"
+F 0 "D1804" V 5400 9500 50 0000 L BNN
F 1 "V5.5MLA0603N" V 5250 9500 50 0000 L BNN
F 2 "neo900-legacy:SMD-0603" H 5290 9140 65 0001 L TNN
F 3 "" H 5300 9350 60 0001 C CNN
@@ -1197,8 +1197,8 @@ P 5300 9950
AR Path="/578AFEF0/582952C7" Ref="D?" Part="1"
AR Path="/582952C7" Ref="D?" Part="1"
AR Path="/578AFEF2/582952C7" Ref="D?" Part="1"
-AR Path="/578AFF1C/582952C7" Ref="D?" Part="1"
-F 0 "D?" V 5300 10100 50 0000 L BNN
+AR Path="/578AFF1C/582952C7" Ref="D1805" Part="1"
+F 0 "D1805" V 5300 10100 50 0000 L BNN
F 1 "V5.5MLA0603N" V 5200 10100 50 0000 L BNN
F 2 "neo900-legacy:SMD-0603" H 5290 9740 65 0001 L TNN
F 3 "" H 5300 9950 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="D?" Part="1"
-F 0 "D?" V 1900 10500 50 0000 L BNN
+AR Path="/578AFF1C/582952CE" Ref="D1803" Part="1"
+F 0 "D1803" 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
@@ -1227,8 +1227,8 @@ P 5950 9650
AR Path="/578AFEF0/582952D5" Ref="P-CAMERA?" Part="1"
AR Path="/582952D5" Ref="P-CAMERA?" Part="1"
AR Path="/578AFEF2/582952D5" Ref="P-CAMERA?" Part="1"
-AR Path="/578AFF1C/582952D5" Ref="P-CAMERA?" Part="1"
-F 0 "P-CAMERA?" H 6650 10100 50 0000 R TNN
+AR Path="/578AFF1C/582952D5" Ref="P-CAMERA1801" Part="1"
+F 0 "P-CAMERA1801" H 6650 10100 50 0000 R TNN
F 1 "EVQ-Q0G03K" H 6350 9200 50 0000 L BNN
F 2 "neo900-legacy:EVQQ0" H 5940 9440 65 0001 L TNN
F 3 "" H 5950 9650 60 0001 C CNN
@@ -1242,8 +1242,8 @@ P 6350 9850
AR Path="/578AFEF0/582952DC" Ref="P-CAMERA?" Part="2"
AR Path="/582952DC" Ref="P-CAMERA?" Part="2"
AR Path="/578AFEF2/582952DC" Ref="P-CAMERA?" Part="2"
-AR Path="/578AFF1C/582952DC" Ref="P-CAMERA?" Part="2"
-F 0 "P-CAMERA?" H 6550 9850 50 0000 L BNN
+AR Path="/578AFF1C/582952DC" Ref="P-CAMERA1801" Part="2"
+F 0 "P-CAMERA1801" H 6550 9850 50 0000 L BNN
F 1 "EVQ-Q0G03K" H 6340 9740 65 0001 L TNN
F 2 "neo900-legacy:EVQQ0" H 6340 9640 65 0001 L TNN
F 3 "" H 6350 9850 60 0001 C CNN
@@ -1257,8 +1257,8 @@ P 6350 9450
AR Path="/578AFEF0/582952E3" Ref="P-CAMERA?" Part="3"
AR Path="/582952E3" Ref="P-CAMERA?" Part="3"
AR Path="/578AFEF2/582952E3" Ref="P-CAMERA?" Part="3"
-AR Path="/578AFF1C/582952E3" Ref="P-CAMERA?" Part="3"
-F 0 "P-CAMERA?" H 6550 9450 50 0000 L BNN
+AR Path="/578AFF1C/582952E3" Ref="P-CAMERA1801" Part="3"
+F 0 "P-CAMERA1801" H 6550 9450 50 0000 L BNN
F 1 "EVQ-Q0G03K" H 6340 9340 65 0001 L TNN
F 2 "neo900-legacy:EVQQ0" H 6340 9240 65 0001 L TNN
F 3 "" H 6350 9450 60 0001 C CNN
@@ -1272,8 +1272,8 @@ P 13500 9200
AR Path="/578AFEF0/582952EA" Ref="P-LOCK?" Part="1"
AR Path="/582952EA" Ref="P-LOCK?" Part="1"
AR Path="/578AFEF2/582952EA" Ref="P-LOCK?" Part="1"
-AR Path="/578AFF1C/582952EA" Ref="P-LOCK?" Part="1"
-F 0 "P-LOCK?" H 14100 9450 50 0000 L TNN
+AR Path="/578AFF1C/582952EA" Ref="P-LOCK1801" Part="1"
+F 0 "P-LOCK1801" H 14100 9450 50 0000 L TNN
F 1 "ESE16J001" H 13900 8750 50 0000 L BNN
F 2 "neo900-legacy:ESE-16J001" H 13490 8990 65 0001 L TNN
F 3 "" H 13500 9200 60 0001 C CNN
@@ -1287,8 +1287,8 @@ P 13900 9400
AR Path="/578AFEF0/582952F1" Ref="P-LOCK?" Part="2"
AR Path="/582952F1" Ref="P-LOCK?" Part="2"
AR Path="/578AFEF2/582952F1" Ref="P-LOCK?" Part="2"
-AR Path="/578AFF1C/582952F1" Ref="P-LOCK?" Part="2"
-F 0 "P-LOCK?" H 14100 9400 50 0000 L BNN
+AR Path="/578AFF1C/582952F1" Ref="P-LOCK1801" Part="2"
+F 0 "P-LOCK1801" H 14100 9400 50 0000 L BNN
F 1 "ESE16J001" H 13890 9290 65 0001 L TNN
F 2 "neo900-legacy:ESE-16J001" H 13890 9190 65 0001 L TNN
F 3 "" H 13900 9400 60 0001 C CNN
@@ -1302,8 +1302,8 @@ P 13900 9000
AR Path="/578AFEF0/582952F8" Ref="P-LOCK?" Part="3"
AR Path="/582952F8" Ref="P-LOCK?" Part="3"
AR Path="/578AFEF2/582952F8" Ref="P-LOCK?" Part="3"
-AR Path="/578AFF1C/582952F8" Ref="P-LOCK?" Part="3"
-F 0 "P-LOCK?" H 13450 9200 50 0000 L BNN
+AR Path="/578AFF1C/582952F8" Ref="P-LOCK1801" Part="3"
+F 0 "P-LOCK1801" H 13450 9200 50 0000 L BNN
F 1 "ESE16J001" H 13890 8890 65 0001 L TNN
F 2 "neo900-legacy:ESE-16J001" H 13890 8790 65 0001 L TNN
F 3 "" H 13900 9000 60 0001 C CNN
@@ -1317,8 +1317,8 @@ P 2200 10250
AR Path="/578AFEF0/582952FF" Ref="P-MINUS?" Part="1"
AR Path="/582952FF" Ref="P-MINUS?" Part="1"
AR Path="/578AFEF2/582952FF" Ref="P-MINUS?" Part="1"
-AR Path="/578AFF1C/582952FF" Ref="P-MINUS?" Part="1"
-F 0 "P-MINUS?" H 2700 10700 50 0000 R TNN
+AR Path="/578AFF1C/582952FF" Ref="P-MINUS1801" Part="1"
+F 0 "P-MINUS1801" H 2700 10700 50 0000 R TNN
F 1 "EVQP42B3M" H 2600 9900 50 0000 L BNN
F 2 "neo900-legacy:EVQP40B3M" H 2190 10040 65 0001 L TNN
F 3 "" H 2200 10250 60 0001 C CNN
@@ -1332,8 +1332,8 @@ P 2600 10350
AR Path="/578AFEF0/58295306" Ref="P-MINUS?" Part="2"
AR Path="/58295306" Ref="P-MINUS?" Part="2"
AR Path="/578AFEF2/58295306" Ref="P-MINUS?" Part="2"
-AR Path="/578AFF1C/58295306" Ref="P-MINUS?" Part="2"
-F 0 "P-MINUS?" H 2800 10350 50 0000 L BNN
+AR Path="/578AFF1C/58295306" Ref="P-MINUS1801" Part="2"
+F 0 "P-MINUS1801" H 2800 10350 50 0000 L BNN
F 1 "EVQP42B3M" H 2590 10240 65 0001 L TNN
F 2 "neo900-legacy:EVQP40B3M" H 2590 10140 65 0001 L TNN
F 3 "" H 2600 10350 60 0001 C CNN
@@ -1347,8 +1347,8 @@ P 2600 10050
AR Path="/578AFEF0/5829530D" Ref="P-MINUS?" Part="3"
AR Path="/5829530D" Ref="P-MINUS?" Part="3"
AR Path="/578AFEF2/5829530D" Ref="P-MINUS?" Part="3"
-AR Path="/578AFF1C/5829530D" Ref="P-MINUS?" Part="3"
-F 0 "P-MINUS?" H 2800 10050 50 0000 L BNN
+AR Path="/578AFF1C/5829530D" Ref="P-MINUS1801" Part="3"
+F 0 "P-MINUS1801" H 2800 10050 50 0000 L BNN
F 1 "EVQP42B3M" H 2590 9940 65 0001 L TNN
F 2 "neo900-legacy:EVQP40B3M" H 2590 9840 65 0001 L TNN
F 3 "" H 2600 10050 60 0001 C CNN
@@ -1362,8 +1362,8 @@ P 9900 9200
AR Path="/578AFEF0/58295314" Ref="P-ON?" Part="1"
AR Path="/58295314" Ref="P-ON?" Part="1"
AR Path="/578AFEF2/58295314" Ref="P-ON?" Part="1"
-AR Path="/578AFF1C/58295314" Ref="P-ON?" Part="1"
-F 0 "P-ON?" H 10350 9650 50 0000 R TNN
+AR Path="/578AFF1C/58295314" Ref="P-ON1801" Part="1"
+F 0 "P-ON1801" H 10350 9650 50 0000 R TNN
F 1 "EVQP40B3M" H 10400 8750 50 0000 L BNN
F 2 "neo900-legacy:EVQP40B3M" V 10110 9080 50 0001 L BNN
F 3 "" H 9900 9200 60 0001 C CNN
@@ -1377,8 +1377,8 @@ P 10400 9400
AR Path="/578AFEF0/5829531B" Ref="P-ON?" Part="2"
AR Path="/5829531B" Ref="P-ON?" Part="2"
AR Path="/578AFEF2/5829531B" Ref="P-ON?" Part="2"
-AR Path="/578AFF1C/5829531B" Ref="P-ON?" Part="2"
-F 0 "P-ON?" H 10600 9400 50 0000 L BNN
+AR Path="/578AFF1C/5829531B" Ref="P-ON1801" Part="2"
+F 0 "P-ON1801" H 10600 9400 50 0000 L BNN
F 1 "EVQP40B3M" H 10390 9290 65 0001 L TNN
F 2 "neo900-legacy:EVQP40B3M" H 10390 9190 65 0001 L TNN
F 3 "" H 10400 9400 60 0001 C CNN
@@ -1392,8 +1392,8 @@ P 10400 9000
AR Path="/578AFEF0/58295322" Ref="P-ON?" Part="3"
AR Path="/58295322" Ref="P-ON?" Part="3"
AR Path="/578AFEF2/58295322" Ref="P-ON?" Part="3"
-AR Path="/578AFF1C/58295322" Ref="P-ON?" Part="3"
-F 0 "P-ON?" H 10600 9000 50 0000 L BNN
+AR Path="/578AFF1C/58295322" Ref="P-ON1801" Part="3"
+F 0 "P-ON1801" H 10600 9000 50 0000 L BNN
F 1 "EVQP40B3M" H 10390 8890 65 0001 L TNN
F 2 "neo900-legacy:EVQP40B3M" H 10390 8790 65 0001 L TNN
F 3 "" H 10400 9000 60 0001 C CNN
@@ -1407,8 +1407,8 @@ P 2200 9100
AR Path="/578AFEF0/58295329" Ref="P-PLUS?" Part="1"
AR Path="/58295329" Ref="P-PLUS?" Part="1"
AR Path="/578AFEF2/58295329" Ref="P-PLUS?" Part="1"
-AR Path="/578AFF1C/58295329" Ref="P-PLUS?" Part="1"
-F 0 "P-PLUS?" H 2650 9550 50 0000 R TNN
+AR Path="/578AFF1C/58295329" Ref="P-PLUS1801" Part="1"
+F 0 "P-PLUS1801" H 2650 9550 50 0000 R TNN
F 1 "EVQP42B3M" H 2600 8750 50 0000 L BNN
F 2 "neo900-legacy:EVQP40B3M" H 2190 8890 65 0001 L TNN
F 3 "" H 2200 9100 60 0001 C CNN
@@ -1422,8 +1422,8 @@ P 2600 9200
AR Path="/578AFEF0/58295330" Ref="P-PLUS?" Part="2"
AR Path="/58295330" Ref="P-PLUS?" Part="2"
AR Path="/578AFEF2/58295330" Ref="P-PLUS?" Part="2"
-AR Path="/578AFF1C/58295330" Ref="P-PLUS?" Part="2"
-F 0 "P-PLUS?" H 2800 9200 50 0000 L BNN
+AR Path="/578AFF1C/58295330" Ref="P-PLUS1801" Part="2"
+F 0 "P-PLUS1801" H 2800 9200 50 0000 L BNN
F 1 "EVQP42B3M" H 2590 9090 65 0001 L TNN
F 2 "neo900-legacy:EVQP40B3M" H 2590 8990 65 0001 L TNN
F 3 "" H 2600 9200 60 0001 C CNN
@@ -1437,8 +1437,8 @@ P 2600 8900
AR Path="/578AFEF0/58295337" Ref="P-PLUS?" Part="3"
AR Path="/58295337" Ref="P-PLUS?" Part="3"
AR Path="/578AFEF2/58295337" Ref="P-PLUS?" Part="3"
-AR Path="/578AFF1C/58295337" Ref="P-PLUS?" Part="3"
-F 0 "P-PLUS?" H 2800 8900 50 0000 L BNN
+AR Path="/578AFF1C/58295337" Ref="P-PLUS1801" Part="3"
+F 0 "P-PLUS1801" H 2800 8900 50 0000 L BNN
F 1 "EVQP42B3M" H 2590 8790 65 0001 L TNN
F 2 "neo900-legacy:EVQP40B3M" H 2590 8690 65 0001 L TNN
F 3 "" H 2600 8900 60 0001 C CNN
@@ -1452,8 +1452,8 @@ P 13000 9850
AR Path="/578AFEF0/5829533E" Ref="#U$?" Part="1"
AR Path="/5829533E" Ref="#U$?" Part="1"
AR Path="/578AFEF2/5829533E" Ref="#U$?" Part="1"
-AR Path="/578AFF1C/5829533E" Ref="#U$?" Part="1"
-F 0 "#U$?" H 12910 9750 70 0001 L BNN
+AR Path="/578AFF1C/5829533E" Ref="#U$1808" Part="1"
+F 0 "#U$1808" H 12910 9750 70 0001 L BNN
F 1 "GND" H 12910 9750 70 0001 L BNN
F 2 "" H 13000 9850 60 0001 C CNN
F 3 "" H 13000 9850 60 0001 C CNN
@@ -1467,8 +1467,8 @@ P 9500 9850
AR Path="/578AFEF0/58295344" Ref="#U$?" Part="1"
AR Path="/58295344" Ref="#U$?" Part="1"
AR Path="/578AFEF2/58295344" Ref="#U$?" Part="1"
-AR Path="/578AFF1C/58295344" Ref="#U$?" Part="1"
-F 0 "#U$?" H 9410 9750 70 0001 L BNN
+AR Path="/578AFF1C/58295344" Ref="#U$1807" Part="1"
+F 0 "#U$1807" H 9410 9750 70 0001 L BNN
F 1 "GND" H 9410 9750 70 0001 L BNN
F 2 "" H 9500 9850 60 0001 C CNN
F 3 "" H 9500 9850 60 0001 C CNN
@@ -1482,8 +1482,8 @@ P 5000 9800
AR Path="/578AFEF0/5829534A" Ref="#U$?" Part="1"
AR Path="/5829534A" Ref="#U$?" Part="1"
AR Path="/578AFEF2/5829534A" Ref="#U$?" Part="1"
-AR Path="/578AFF1C/5829534A" Ref="#U$?" Part="1"
-F 0 "#U$?" H 4910 9700 70 0001 L BNN
+AR Path="/578AFF1C/5829534A" Ref="#U$1803" Part="1"
+F 0 "#U$1803" H 4910 9700 70 0001 L BNN
F 1 "GND" H 4910 9700 70 0001 L BNN
F 2 "" H 5000 9800 60 0001 C CNN
F 3 "" H 5000 9800 60 0001 C CNN
@@ -1497,8 +1497,8 @@ P 1800 10800
AR Path="/578AFEF0/58295350" Ref="#U$?" Part="1"
AR Path="/58295350" Ref="#U$?" Part="1"
AR Path="/578AFEF2/58295350" Ref="#U$?" Part="1"
-AR Path="/578AFF1C/58295350" Ref="#U$?" Part="1"
-F 0 "#U$?" H 1710 10700 70 0001 L BNN
+AR Path="/578AFF1C/58295350" Ref="#U$1802" Part="1"
+F 0 "#U$1802" H 1710 10700 70 0001 L BNN
F 1 "GND" H 1710 10700 70 0001 L BNN
F 2 "" H 1800 10800 60 0001 C CNN
F 3 "" H 1800 10800 60 0001 C CNN
@@ -1512,8 +1512,8 @@ P 1800 9650
AR Path="/578AFEF0/58295356" Ref="#U$?" Part="1"
AR Path="/58295356" Ref="#U$?" Part="1"
AR Path="/578AFEF2/58295356" Ref="#U$?" Part="1"
-AR Path="/578AFF1C/58295356" Ref="#U$?" Part="1"
-F 0 "#U$?" H 1710 9550 70 0001 L BNN
+AR Path="/578AFF1C/58295356" Ref="#U$1801" Part="1"
+F 0 "#U$1801" H 1710 9550 70 0001 L BNN
F 1 "GND" H 1710 9550 70 0001 L BNN
F 2 "" H 1800 9650 60 0001 C CNN
F 3 "" H 1800 9650 60 0001 C CNN
@@ -1564,8 +1564,8 @@ P 5650 9800
AR Path="/578AFEF0/58295373" Ref="#U$?" Part="1"
AR Path="/58295373" Ref="#U$?" Part="1"
AR Path="/578AFEF2/58295373" Ref="#U$?" Part="1"
-AR Path="/578AFF1C/58295373" Ref="#U$?" Part="1"
-F 0 "#U$?" H 5560 9700 70 0001 L BNN
+AR Path="/578AFF1C/58295373" Ref="#U$1804" Part="1"
+F 0 "#U$1804" H 5560 9700 70 0001 L BNN
F 1 "GND" H 5560 9700 70 0001 L BNN
F 2 "" H 5650 9800 60 0001 C CNN
F 3 "" H 5650 9800 60 0001 C CNN
@@ -1581,8 +1581,8 @@ P 6250 10200
AR Path="/578AFEF0/5829537A" Ref="#U$?" Part="1"
AR Path="/5829537A" Ref="#U$?" Part="1"
AR Path="/578AFEF2/5829537A" Ref="#U$?" Part="1"
-AR Path="/578AFF1C/5829537A" Ref="#U$?" Part="1"
-F 0 "#U$?" H 6160 10100 70 0001 L BNN
+AR Path="/578AFF1C/5829537A" Ref="#U$1805" Part="1"
+F 0 "#U$1805" H 6160 10100 70 0001 L BNN
F 1 "GND" H 6160 10100 70 0001 L BNN
F 2 "" H 6250 10200 60 0001 C CNN
F 3 "" H 6250 10200 60 0001 C CNN
diff --git a/hw/leds.sch b/hw/leds.sch
index 1ed77d7..8a1d76f 100644
--- a/hw/leds.sch
+++ b/hw/leds.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 26 31
+Sheet 26 25
Title "LEDs"
Date "Intentionally Left Blank"
Rev ""
@@ -285,10 +285,10 @@ F 3 "" H 8200 3250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0341
+L GND-3 #U$2103
U 1 1 578DDA06
P 4400 5550
-F 0 "#U$0341" H 4280 5451 70 0001 L BNN
+F 0 "#U$2103" H 4280 5451 70 0001 L BNN
F 1 "GND3" H 4280 5451 70 0001 L BNN
F 2 "" H 4400 5550 60 0001 C CNN
F 3 "" H 4400 5550 60 0001 C CNN
@@ -296,10 +296,10 @@ F 3 "" H 4400 5550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0342
+L GND-3 #U$2113
U 1 1 578DDA6A
P 9500 5550
-F 0 "#U$0342" H 9380 5451 70 0001 L BNN
+F 0 "#U$2113" H 9380 5451 70 0001 L BNN
F 1 "GND3" H 9380 5451 70 0001 L BNN
F 2 "" H 9500 5550 60 0001 C CNN
F 3 "" H 9500 5550 60 0001 C CNN
@@ -307,10 +307,10 @@ F 3 "" H 9500 5550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0343
+L GND-3 #U$2102
U 1 1 578DDACE
P 3000 2000
-F 0 "#U$0343" H 2880 1901 70 0001 L BNN
+F 0 "#U$2102" H 2880 1901 70 0001 L BNN
F 1 "GND3" H 2880 1901 70 0001 L BNN
F 2 "" H 3000 2000 60 0001 C CNN
F 3 "" H 3000 2000 60 0001 C CNN
@@ -318,10 +318,10 @@ F 3 "" H 3000 2000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0344
+L GND-3 #U$2111
U 1 1 578DDB32
P 8100 1950
-F 0 "#U$0344" H 7980 1851 70 0001 L BNN
+F 0 "#U$2111" H 7980 1851 70 0001 L BNN
F 1 "GND3" H 7980 1851 70 0001 L BNN
F 2 "" H 8100 1950 60 0001 C CNN
F 3 "" H 8100 1950 60 0001 C CNN
@@ -329,10 +329,10 @@ F 3 "" H 8100 1950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0345
+L GND-3 #U$2101
U 1 1 578DDDEE
P 2700 4150
-F 0 "#U$0345" H 2580 4051 70 0001 L BNN
+F 0 "#U$2101" H 2580 4051 70 0001 L BNN
F 1 "GND3" H 2580 4051 70 0001 L BNN
F 2 "" H 2700 4150 60 0001 C CNN
F 3 "" H 2700 4150 60 0001 C CNN
@@ -340,10 +340,10 @@ F 3 "" H 2700 4150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$0346
+L GND-3 #U$2110
U 1 1 578DDE52
P 7800 4150
-F 0 "#U$0346" H 7680 4051 70 0001 L BNN
+F 0 "#U$2110" H 7680 4051 70 0001 L BNN
F 1 "GND3" H 7680 4051 70 0001 L BNN
F 2 "" H 7800 4150 60 0001 C CNN
F 3 "" H 7800 4150 60 0001 C CNN
@@ -984,10 +984,10 @@ AUX LED
Text Notes 10400 8200 0 120 ~ 0
RGB LED (display connector)
$Comp
-L C0402 C?
+L C0402 C2106
U 1 1 58290F83
P 5100 7400
-F 0 "C?" H 5140 7440 50 0000 L CNN
+F 0 "C2106" 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 C?
+L C0402 C2107
U 1 1 58290F8A
P 5500 7400
-F 0 "C?" H 5540 7440 50 0000 L CNN
+F 0 "C2107" 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 C?
+L C0402 C2108
U 1 1 58290F91
P 6000 10200
-F 0 "C?" H 6040 10240 50 0000 L CNN
+F 0 "C2108" 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,7 +1022,8 @@ U 5 1 58290F98
P 9700 8500
AR Path="/58290F98" Ref="P?" Part="5"
AR Path="/578AFF2C/58290F98" Ref="P?" Part="5"
-F 0 "P?" H 9300 8699 50 0000 L BNN
+AR Path="/578AFF2E/58290F98" Ref="P1" Part="5"
+F 0 "P1" 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
@@ -1030,10 +1031,10 @@ F 3 "" H 9700 8500 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND-3 #U$?
+L GND-3 #U$2106
U 1 1 58290F9F
P 5500 10500
-F 0 "#U$?" H 5380 10401 70 0001 L BNN
+F 0 "#U$2106" H 5380 10401 70 0001 L BNN
F 1 "GND3" H 5380 10401 70 0001 L BNN
F 2 "" H 5500 10500 60 0001 C CNN
F 3 "" H 5500 10500 60 0001 C CNN
@@ -1041,10 +1042,10 @@ F 3 "" H 5500 10500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$?
+L GND-3 #U$2104
U 1 1 58290FA5
P 4400 10500
-F 0 "#U$?" H 4280 10401 70 0001 L BNN
+F 0 "#U$2104" H 4280 10401 70 0001 L BNN
F 1 "GND3" H 4280 10401 70 0001 L BNN
F 2 "" H 4400 10500 60 0001 C CNN
F 3 "" H 4400 10500 60 0001 C CNN
@@ -1052,10 +1053,10 @@ F 3 "" H 4400 10500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$?
+L GND-3 #U$2107
U 1 1 58290FAB
P 6000 10500
-F 0 "#U$?" H 5880 10401 70 0001 L BNN
+F 0 "#U$2107" H 5880 10401 70 0001 L BNN
F 1 "GND3" H 5880 10401 70 0001 L BNN
F 2 "" H 6000 10500 60 0001 C CNN
F 3 "" H 6000 10500 60 0001 C CNN
@@ -1063,10 +1064,10 @@ F 3 "" H 6000 10500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$?
+L GND-3 #U$2105
U 1 1 58290FB1
P 4700 10500
-F 0 "#U$?" H 4580 10401 70 0001 L BNN
+F 0 "#U$2105" H 4580 10401 70 0001 L BNN
F 1 "GND3" H 4580 10401 70 0001 L BNN
F 2 "" H 4700 10500 60 0001 C CNN
F 3 "" H 4700 10500 60 0001 C CNN
@@ -1074,10 +1075,10 @@ F 3 "" H 4700 10500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$?
+L GND-3 #U$2114
U 1 1 58290FB7
P 10300 8700
-F 0 "#U$?" H 10180 8601 70 0001 L BNN
+F 0 "#U$2114" H 10180 8601 70 0001 L BNN
F 1 "GND3" H 10180 8601 70 0001 L BNN
F 2 "" H 10300 8700 60 0001 C CNN
F 3 "" H 10300 8700 60 0001 C CNN
@@ -1085,10 +1086,10 @@ F 3 "" H 10300 8700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$?
+L GND-3 #U$2108
U 1 1 58290FBD
P 7500 7700
-F 0 "#U$?" H 7380 7601 70 0001 L BNN
+F 0 "#U$2108" H 7380 7601 70 0001 L BNN
F 1 "GND3" H 7380 7601 70 0001 L BNN
F 2 "" H 7500 7700 60 0001 C CNN
F 3 "" H 7500 7700 60 0001 C CNN
@@ -1096,10 +1097,10 @@ F 3 "" H 7500 7700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LP55231 U?
+L LP55231 U2107
U 1 1 58290FC3
P 5400 8800
-F 0 "U?" H 4850 9850 50 0000 R CNN
+F 0 "U2107" 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
@@ -1107,10 +1108,10 @@ F 3 "" H 5400 8800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L LP55231 U?
+L LP55231 U2107
U 2 1 58290FCA
P 5500 10000
-F 0 "U?" H 5490 9990 65 0001 L TNN
+F 0 "U2107" 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
@@ -1198,10 +1199,10 @@ Wire Wire Line
Wire Wire Line
6400 9900 6700 9900
$Comp
-L GND-3 #U$?
+L GND-3 #U$2109
U 1 1 58290FFC
P 7600 10250
-F 0 "#U$?" H 7480 10151 70 0001 L BNN
+F 0 "#U$2109" H 7480 10151 70 0001 L BNN
F 1 "GND3" H 7480 10151 70 0001 L BNN
F 2 "" H 7600 10250 60 0001 C CNN
F 3 "" H 7600 10250 60 0001 C CNN
@@ -1235,10 +1236,10 @@ Wire Wire Line
7400 7500 7500 7500
Connection ~ 7500 7500
$Comp
-L MSL0104RGB LED?
+L MSL0104RGB LED2104
U 1 1 58291011
P 7000 7200
-F 0 "LED?" H 6800 7750 45 0000 L CNN
+F 0 "LED2104" 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
@@ -1246,10 +1247,10 @@ F 3 "" H 7000 7500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L MSL0104RGB LED?
+L MSL0104RGB LED2105
U 1 1 58291018
P 7100 9600
-F 0 "LED?" H 6900 10150 45 0000 L CNN
+F 0 "LED2105" 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
@@ -1276,7 +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"
-F 0 "U?" H 9600 7050 50 0000 R CNN
+AR Path="/578AFF2E/58291027" Ref="U2108" Part="1"
+F 0 "U2108" 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
@@ -1289,7 +1291,8 @@ U 1 1 5829102E
P 9250 6900
AR Path="/578AFF20/5829102E" Ref="#U$?" Part="1"
AR Path="/578AFF2C/5829102E" Ref="#U$?" Part="1"
-F 0 "#U$?" H 9130 6801 70 0001 L BNN
+AR Path="/578AFF2E/5829102E" Ref="#U$2112" Part="1"
+F 0 "#U$2112" H 9130 6801 70 0001 L BNN
F 1 "GND3" H 9130 6801 70 0001 L BNN
F 2 "" H 9250 6900 60 0001 C CNN
F 3 "" H 9250 6900 60 0001 C CNN
diff --git a/hw/misc.sch b/hw/misc.sch
index e386484..b40498a 100644
--- a/hw/misc.sch
+++ b/hw/misc.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 12 26
+Sheet 12 25
Title "Misc"
Date "Intentionally Left Blank"
Rev ""
@@ -57,10 +57,10 @@ $EndDescr
Text Notes 7950 6600 0 120 ~ 0
Vibramotor
$Comp
-L GND #U$0210
+L GND #U$1202
U 1 1 578CA477
P 8050 7700
-F 0 "#U$0210" H 7960 7600 70 0001 L BNN
+F 0 "#U$1202" H 7960 7600 70 0001 L BNN
F 1 "GND" H 7960 7600 70 0001 L BNN
F 2 "" H 8050 7700 60 0001 C CNN
F 3 "" H 8050 7700 60 0001 C CNN
@@ -261,8 +261,8 @@ U 1 1 58122EEF
P 8000 4500
AR Path="/578AFF1A/58122EEF" Ref="#U$?" Part="1"
AR Path="/578AFF16/58122EEF" Ref="#U$?" Part="1"
-AR Path="/578AFF0C/58122EEF" Ref="#U$?" Part="1"
-F 0 "#U$?" H 7880 4401 70 0001 L BNN
+AR Path="/578AFF0C/58122EEF" Ref="#U$1201" Part="1"
+F 0 "#U$1201" H 7880 4401 70 0001 L BNN
F 1 "GND3" H 7880 4401 70 0001 L BNN
F 2 "" H 8000 4500 60 0001 C CNN
F 3 "" H 8000 4500 60 0001 C CNN
@@ -275,8 +275,8 @@ U 1 1 58122EF5
P 9300 4500
AR Path="/578AFF1A/58122EF5" Ref="#U$?" Part="1"
AR Path="/578AFF16/58122EF5" Ref="#U$?" Part="1"
-AR Path="/578AFF0C/58122EF5" Ref="#U$?" Part="1"
-F 0 "#U$?" H 9180 4401 70 0001 L BNN
+AR Path="/578AFF0C/58122EF5" Ref="#U$1203" Part="1"
+F 0 "#U$1203" H 9180 4401 70 0001 L BNN
F 1 "GND3" H 9180 4401 70 0001 L BNN
F 2 "" H 9300 4500 60 0001 C CNN
F 3 "" H 9300 4500 60 0001 C CNN
@@ -289,8 +289,8 @@ U 1 1 58122EFB
P 10600 4450
AR Path="/578AFF1A/58122EFB" Ref="#U$?" Part="1"
AR Path="/578AFF16/58122EFB" Ref="#U$?" Part="1"
-AR Path="/578AFF0C/58122EFB" Ref="#U$?" Part="1"
-F 0 "#U$?" H 10480 4351 70 0001 L BNN
+AR Path="/578AFF0C/58122EFB" Ref="#U$1204" Part="1"
+F 0 "#U$1204" H 10480 4351 70 0001 L BNN
F 1 "GND3" H 10480 4351 70 0001 L BNN
F 2 "" H 10600 4450 60 0001 C CNN
F 3 "" H 10600 4450 60 0001 C CNN
@@ -316,10 +316,10 @@ For the key mat
Text Notes 10200 3050 0 70 ~ 0
For the "key frame hook"
$Comp
-L MECHANICAL N?
+L MECHANICAL N1201
U 1 1 5829348D
P 2250 3400
-F 0 "N?" H 2050 3440 70 0000 L BNN
+F 0 "N1201" H 2050 3440 70 0000 L BNN
F 1 "N900 case assembly" H 2050 3301 70 0000 L BNN
F 2 "neo900-legacy:NONE" H 2240 3190 65 0001 L TNN
F 3 "" H 2250 3400 60 0001 C CNN
@@ -327,10 +327,10 @@ F 3 "" H 2250 3400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L N900-CAMERAN97-CAMERA-SPACE N?
+L N900-CAMERAN97-CAMERA-SPACE N1202
U 1 1 58293494
P 2250 4000
-F 0 "N?" H 2050 4040 70 0000 L BNN
+F 0 "N1202" H 2050 4040 70 0000 L BNN
F 1 "N97-CAMERA-HOLE" H 2050 3901 70 0000 L BNN
F 2 "neo900-legacy:N97-CAMERA-SPACE" H 2240 3790 65 0001 L TNN
F 3 "" H 2250 4000 60 0001 C CNN
@@ -338,10 +338,10 @@ F 3 "" H 2250 4000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L MECHANICAL N?
+L MECHANICAL N1205
U 1 1 5829349B
P 4550 4000
-F 0 "N?" H 4350 4040 70 0000 L BNN
+F 0 "N1205" H 4350 4040 70 0000 L BNN
F 1 "headset jack" H 4350 3901 70 0000 L BNN
F 2 "neo900-legacy:NONE" H 4540 3790 65 0001 L TNN
F 3 "" H 4550 4000 60 0001 C CNN
@@ -349,10 +349,10 @@ F 3 "" H 4550 4000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L MECHANICAL-STENCIL N?
+L MECHANICAL-STENCIL N1203
U 1 1 582934A2
P 2250 5200
-F 0 "N?" H 2050 5240 70 0000 L BNN
+F 0 "N1203" H 2050 5240 70 0000 L BNN
F 1 "STENCIL-TOP" H 2050 5101 70 0000 L BNN
F 2 "neo900-legacy:GDC-STENCIL" H 2240 4990 65 0001 L TNN
F 3 "" H 2250 5200 60 0001 C CNN
@@ -360,10 +360,10 @@ F 3 "" H 2250 5200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L MECHANICAL-STENCIL N?
+L MECHANICAL-STENCIL N1204
U 1 1 582934A9
P 2250 5700
-F 0 "N?" H 2050 5740 70 0000 L BNN
+F 0 "N1204" H 2050 5740 70 0000 L BNN
F 1 "STENCIL-BOTTOM" H 2050 5601 70 0000 L BNN
F 2 "neo900-legacy:GDC-STENCIL" H 2240 5490 65 0001 L TNN
F 3 "" H 2250 5700 60 0001 C CNN
diff --git a/hw/modem.sch b/hw/modem.sch
index 0c59f4a..f30aa40 100644
--- a/hw/modem.sch
+++ b/hw/modem.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 6 31
+Sheet 6 25
Title "3G/4G Modem"
Date "Intentionally Left Blank"
Rev ""
@@ -506,10 +506,10 @@ F 3 "" H 6350 7250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$611
+L GND #U$511
U 1 1 578B8242
P 12800 7150
-F 0 "#U$611" H 12710 7050 70 0001 L BNN
+F 0 "#U$511" H 12710 7050 70 0001 L BNN
F 1 "GND" H 12710 7050 70 0001 L BNN
F 2 "" H 12800 7150 60 0001 C CNN
F 3 "" H 12800 7150 60 0001 C CNN
@@ -517,10 +517,10 @@ F 3 "" H 12800 7150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$612
+L GND #U$512
U 1 1 578B82A6
P 13500 7150
-F 0 "#U$612" H 13410 7050 70 0001 L BNN
+F 0 "#U$512" H 13410 7050 70 0001 L BNN
F 1 "GND" H 13410 7050 70 0001 L BNN
F 2 "" H 13500 7150 60 0001 C CNN
F 3 "" H 13500 7150 60 0001 C CNN
@@ -528,10 +528,10 @@ F 3 "" H 13500 7150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$606
+L GND #U$506
U 1 1 578B830A
P 10050 7100
-F 0 "#U$606" H 9960 7000 70 0001 L BNN
+F 0 "#U$506" H 9960 7000 70 0001 L BNN
F 1 "GND" H 9960 7000 70 0001 L BNN
F 2 "" H 10050 7100 60 0001 C CNN
F 3 "" H 10050 7100 60 0001 C CNN
@@ -539,10 +539,10 @@ F 3 "" H 10050 7100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$607
+L GND #U$507
U 1 1 578B836E
P 10050 7650
-F 0 "#U$607" H 9960 7550 70 0001 L BNN
+F 0 "#U$507" H 9960 7550 70 0001 L BNN
F 1 "GND" H 9960 7550 70 0001 L BNN
F 2 "" H 10050 7650 60 0001 C CNN
F 3 "" H 10050 7650 60 0001 C CNN
@@ -550,10 +550,10 @@ F 3 "" H 10050 7650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$609
+L GND #U$509
U 1 1 578B83D2
P 11100 7350
-F 0 "#U$609" H 11010 7250 70 0001 L BNN
+F 0 "#U$509" H 11010 7250 70 0001 L BNN
F 1 "GND" H 11010 7250 70 0001 L BNN
F 2 "" H 11100 7350 60 0001 C CNN
F 3 "" H 11100 7350 60 0001 C CNN
@@ -561,10 +561,10 @@ F 3 "" H 11100 7350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$608
+L GND #U$508
U 1 1 578B8436
P 10850 2950
-F 0 "#U$608" H 10760 2850 70 0001 L BNN
+F 0 "#U$508" H 10760 2850 70 0001 L BNN
F 1 "GND" H 10760 2850 70 0001 L BNN
F 2 "" H 10850 2950 60 0001 C CNN
F 3 "" H 10850 2950 60 0001 C CNN
@@ -572,10 +572,10 @@ F 3 "" H 10850 2950 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND #U$613
+L GND #U$513
U 1 1 578B862A
P 13500 9500
-F 0 "#U$613" H 13410 9400 70 0001 L BNN
+F 0 "#U$513" H 13410 9400 70 0001 L BNN
F 1 "GND" H 13410 9400 70 0001 L BNN
F 2 "" H 13500 9500 60 0001 C CNN
F 3 "" H 13500 9500 60 0001 C CNN
@@ -583,10 +583,10 @@ F 3 "" H 13500 9500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$610
+L GND #U$510
U 1 1 578B868E
P 11150 6450
-F 0 "#U$610" H 11060 6350 70 0001 L BNN
+F 0 "#U$510" H 11060 6350 70 0001 L BNN
F 1 "GND" H 11060 6350 70 0001 L BNN
F 2 "" H 11150 6450 60 0001 C CNN
F 3 "" H 11150 6450 60 0001 C CNN
@@ -926,8 +926,8 @@ L GND #U$?
U 1 1 57F2BA38
P 8950 9450
AR Path="/578AFEFE/57F2BA38" Ref="#U$?" Part="1"
-AR Path="/578AFEFA/57F2BA38" Ref="#U$604" Part="1"
-F 0 "#U$604" H 8860 9350 70 0001 L BNN
+AR Path="/578AFEFA/57F2BA38" Ref="#U$504" Part="1"
+F 0 "#U$504" H 8860 9350 70 0001 L BNN
F 1 "GND" H 8860 9350 70 0001 L BNN
F 2 "" H 8950 9450 60 0001 C CNN
F 3 "" H 8950 9450 60 0001 C CNN
@@ -939,8 +939,8 @@ L GND #U$?
U 1 1 57F2BA3E
P 9350 9450
AR Path="/578AFEFE/57F2BA3E" Ref="#U$?" Part="1"
-AR Path="/578AFEFA/57F2BA3E" Ref="#U$605" Part="1"
-F 0 "#U$605" H 9260 9350 70 0001 L BNN
+AR Path="/578AFEFA/57F2BA3E" Ref="#U$505" Part="1"
+F 0 "#U$505" H 9260 9350 70 0001 L BNN
F 1 "GND" H 9260 9350 70 0001 L BNN
F 2 "" H 9350 9450 60 0001 C CNN
F 3 "" H 9350 9450 60 0001 C CNN
@@ -952,10 +952,10 @@ Wire Wire Line
Wire Wire Line
9350 9150 9500 9150
$Comp
-L GND #U$602
+L GND #U$502
U 1 1 57F2CBE7
P 6750 9450
-F 0 "#U$602" H 6660 9350 70 0001 L BNN
+F 0 "#U$502" H 6660 9350 70 0001 L BNN
F 1 "GND" H 6660 9350 70 0001 L BNN
F 2 "" H 6750 9450 60 0001 C CNN
F 3 "" H 6750 9450 60 0001 C CNN
@@ -963,10 +963,10 @@ F 3 "" H 6750 9450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$603
+L GND #U$503
U 1 1 57F2CBED
P 7150 9450
-F 0 "#U$603" H 7060 9350 70 0001 L BNN
+F 0 "#U$503" H 7060 9350 70 0001 L BNN
F 1 "GND" H 7060 9350 70 0001 L BNN
F 2 "" H 7150 9450 60 0001 C CNN
F 3 "" H 7150 9450 60 0001 C CNN
@@ -1864,10 +1864,10 @@ Wire Wire Line
3450 9600 3450 9500
Connection ~ 3450 9500
$Comp
-L GND #U$601
+L GND #U$501
U 1 1 581758AC
P 1650 10300
-F 0 "#U$601" H 1560 10200 70 0001 L BNN
+F 0 "#U$501" H 1560 10200 70 0001 L BNN
F 1 "GND" H 1560 10200 70 0001 L BNN
F 2 "" H 1650 10300 60 0001 C CNN
F 3 "" H 1650 10300 60 0001 C CNN
@@ -2101,10 +2101,10 @@ F 3 "" H 14000 9250 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L GND #U$614
+L GND #U$514
U 1 1 5818CA66
P 14000 10150
-F 0 "#U$614" H 13910 10050 70 0001 L BNN
+F 0 "#U$514" H 13910 10050 70 0001 L BNN
F 1 "GND" H 13910 10050 70 0001 L BNN
F 2 "" H 14000 10150 60 0001 C CNN
F 3 "" H 14000 10150 60 0001 C CNN
diff --git a/hw/modempwr.sch b/hw/modempwr.sch
index d17ad4d..a052140 100644
--- a/hw/modempwr.sch
+++ b/hw/modempwr.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 4 31
+Sheet 4 25
Title "Modem Power"
Date "Intentionally Left Blank"
Rev ""
@@ -237,10 +237,10 @@ F 3 "" H 10550 2950 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$023
+L GND #U$406
U 1 1 578B2446
P 4050 4850
-F 0 "#U$023" H 3960 4750 70 0001 L BNN
+F 0 "#U$406" H 3960 4750 70 0001 L BNN
F 1 "GND" H 3960 4750 70 0001 L BNN
F 2 "" H 4050 4850 60 0001 C CNN
F 3 "" H 4050 4850 60 0001 C CNN
@@ -248,10 +248,10 @@ F 3 "" H 4050 4850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$024
+L GND #U$403
U 1 1 578B24AA
P 3150 3100
-F 0 "#U$024" H 3060 3000 70 0001 L BNN
+F 0 "#U$403" H 3060 3000 70 0001 L BNN
F 1 "GND" H 3060 3000 70 0001 L BNN
F 2 "" H 3150 3100 60 0001 C CNN
F 3 "" H 3150 3100 60 0001 C CNN
@@ -259,10 +259,10 @@ F 3 "" H 3150 3100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$025
+L GND #U$407
U 1 1 578B250E
P 4850 4550
-F 0 "#U$025" H 4760 4450 70 0001 L BNN
+F 0 "#U$407" H 4760 4450 70 0001 L BNN
F 1 "GND" H 4760 4450 70 0001 L BNN
F 2 "" H 4850 4550 60 0001 C CNN
F 3 "" H 4850 4550 60 0001 C CNN
@@ -270,10 +270,10 @@ F 3 "" H 4850 4550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$026
+L GND #U$410
U 1 1 578B2572
P 7050 4850
-F 0 "#U$026" H 6960 4750 70 0001 L BNN
+F 0 "#U$410" H 6960 4750 70 0001 L BNN
F 1 "GND" H 6960 4750 70 0001 L BNN
F 2 "" H 7050 4850 60 0001 C CNN
F 3 "" H 7050 4850 60 0001 C CNN
@@ -281,10 +281,10 @@ F 3 "" H 7050 4850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$027
+L GND #U$416
U 1 1 578B25D6
P 10150 4750
-F 0 "#U$027" H 10060 4650 70 0001 L BNN
+F 0 "#U$416" H 10060 4650 70 0001 L BNN
F 1 "GND" H 10060 4650 70 0001 L BNN
F 2 "" H 10150 4750 60 0001 C CNN
F 3 "" H 10150 4750 60 0001 C CNN
@@ -292,10 +292,10 @@ F 3 "" H 10150 4750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$028
+L GND #U$412
U 1 1 578B263A
P 7950 4550
-F 0 "#U$028" H 7860 4450 70 0001 L BNN
+F 0 "#U$412" H 7860 4450 70 0001 L BNN
F 1 "GND" H 7860 4450 70 0001 L BNN
F 2 "" H 7950 4550 60 0001 C CNN
F 3 "" H 7950 4550 60 0001 C CNN
@@ -303,10 +303,10 @@ F 3 "" H 7950 4550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$029
+L GND #U$417
U 1 1 578B269E
P 10850 4550
-F 0 "#U$029" H 10760 4450 70 0001 L BNN
+F 0 "#U$417" H 10760 4450 70 0001 L BNN
F 1 "GND" H 10760 4450 70 0001 L BNN
F 2 "" H 10850 4550 60 0001 C CNN
F 3 "" H 10850 4550 60 0001 C CNN
@@ -553,10 +553,10 @@ Connection ~ 5550 3200
Text Label 7300 1700 0 60 ~ 0
VMODEM
$Comp
-L POWERED #FLG030
+L POWERED #FLG401
U 1 1 579106AD
P 4700 2100
-F 0 "#FLG030" H 4900 2000 60 0001 C CNN
+F 0 "#FLG401" H 4900 2000 60 0001 C CNN
F 1 "POWERED" H 4700 2150 60 0000 C CNN
F 2 "" H 4700 2100 60 0001 C CNN
F 3 "" H 4700 2100 60 0001 C CNN
@@ -564,10 +564,10 @@ F 3 "" H 4700 2100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG031
+L POWERED #FLG402
U 1 1 5791070F
P 7800 2100
-F 0 "#FLG031" H 8000 2000 60 0001 C CNN
+F 0 "#FLG402" H 8000 2000 60 0001 C CNN
F 1 "POWERED" H 7800 2150 60 0000 C CNN
F 2 "" H 7800 2100 60 0001 C CNN
F 3 "" H 7800 2100 60 0001 C CNN
@@ -575,10 +575,10 @@ F 3 "" H 7800 2100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG032
+L POWERED #FLG404
U 1 1 5791076A
P 10800 2100
-F 0 "#FLG032" H 11000 2000 60 0001 C CNN
+F 0 "#FLG404" H 11000 2000 60 0001 C CNN
F 1 "POWERED" H 10800 2150 60 0000 C CNN
F 2 "" H 10800 2100 60 0001 C CNN
F 3 "" H 10800 2100 60 0001 C CNN
@@ -629,10 +629,10 @@ F 3 "" H 4400 8500 60 0001 C CNN
$EndComp
NoConn ~ 12400 7800
$Comp
-L GND #U$033
+L GND #U$420
U 1 1 57E27093
P 12250 8200
-F 0 "#U$033" H 12160 8100 70 0001 L BNN
+F 0 "#U$420" H 12160 8100 70 0001 L BNN
F 1 "GND" H 12160 8100 70 0001 L BNN
F 2 "" H 12250 8200 60 0001 C CNN
F 3 "" H 12250 8200 60 0001 C CNN
@@ -640,10 +640,10 @@ F 3 "" H 12250 8200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$034
+L GND #U$422
U 1 1 57E27281
P 13900 8200
-F 0 "#U$034" H 13810 8100 70 0001 L BNN
+F 0 "#U$422" H 13810 8100 70 0001 L BNN
F 1 "GND" H 13810 8100 70 0001 L BNN
F 2 "" H 13900 8200 60 0001 C CNN
F 3 "" H 13900 8200 60 0001 C CNN
@@ -668,10 +668,10 @@ NoConn ~ 13400 9100
NoConn ~ 13400 9000
NoConn ~ 13400 8900
$Comp
-L GND #U$035
+L GND #U$421
U 1 1 57E277C7
P 12300 9500
-F 0 "#U$035" H 12210 9400 70 0001 L BNN
+F 0 "#U$421" H 12210 9400 70 0001 L BNN
F 1 "GND" H 12210 9400 70 0001 L BNN
F 2 "" H 12300 9500 60 0001 C CNN
F 3 "" H 12300 9500 60 0001 C CNN
@@ -679,10 +679,10 @@ F 3 "" H 12300 9500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$036
+L GND #U$423
U 1 1 57E27817
P 13900 9500
-F 0 "#U$036" H 13810 9400 70 0001 L BNN
+F 0 "#U$423" H 13810 9400 70 0001 L BNN
F 1 "GND" H 13810 9400 70 0001 L BNN
F 2 "" H 13900 9500 60 0001 C CNN
F 3 "" H 13900 9500 60 0001 C CNN
@@ -715,10 +715,10 @@ F 3 "" H 11950 7600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$037
+L GND #U$418
U 1 1 57E27FC6
P 11950 8200
-F 0 "#U$037" H 11860 8100 70 0001 L BNN
+F 0 "#U$418" H 11860 8100 70 0001 L BNN
F 1 "GND" H 11860 8100 70 0001 L BNN
F 2 "" H 11950 8200 60 0001 C CNN
F 3 "" H 11950 8200 60 0001 C CNN
@@ -744,10 +744,10 @@ F 3 "" H 11950 8900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$038
+L GND #U$419
U 1 1 57E28982
P 11950 9500
-F 0 "#U$038" H 11860 9400 70 0001 L BNN
+F 0 "#U$419" H 11860 9400 70 0001 L BNN
F 1 "GND" H 11860 9400 70 0001 L BNN
F 2 "" H 11950 9500 60 0001 C CNN
F 3 "" H 11950 9500 60 0001 C CNN
@@ -897,10 +897,10 @@ F 3 "" H 7750 7500 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$039
+L GND #U$413
U 1 1 57E276E5
P 8350 8600
-F 0 "#U$039" H 8260 8500 70 0001 L BNN
+F 0 "#U$413" H 8260 8500 70 0001 L BNN
F 1 "GND" H 8260 8500 70 0001 L BNN
F 2 "" H 8350 8600 60 0001 C CNN
F 3 "" H 8350 8600 60 0001 C CNN
@@ -908,10 +908,10 @@ F 3 "" H 8350 8600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$040
+L GND #U$411
U 1 1 57E27756
P 7750 8600
-F 0 "#U$040" H 7660 8500 70 0001 L BNN
+F 0 "#U$411" H 7660 8500 70 0001 L BNN
F 1 "GND" H 7660 8500 70 0001 L BNN
F 2 "" H 7750 8600 60 0001 C CNN
F 3 "" H 7750 8600 60 0001 C CNN
@@ -953,10 +953,10 @@ Wire Wire Line
8900 7800 7750 7800
Connection ~ 7750 7800
$Comp
-L GND #U$041
+L GND #U$414
U 1 1 57E28962
P 9200 8300
-F 0 "#U$041" H 9110 8200 70 0001 L BNN
+F 0 "#U$414" H 9110 8200 70 0001 L BNN
F 1 "GND" H 9110 8200 70 0001 L BNN
F 2 "" H 9200 8300 60 0001 C CNN
F 3 "" H 9200 8300 60 0001 C CNN
@@ -1006,10 +1006,10 @@ Wire Wire Line
Wire Wire Line
9200 7500 10400 7500
$Comp
-L GND #U$042
+L GND #U$415
U 1 1 57E29C05
P 9600 8600
-F 0 "#U$042" H 9510 8500 70 0001 L BNN
+F 0 "#U$415" H 9510 8500 70 0001 L BNN
F 1 "GND" H 9510 8500 70 0001 L BNN
F 2 "" H 9600 8600 60 0001 C CNN
F 3 "" H 9600 8600 60 0001 C CNN
@@ -1038,10 +1038,10 @@ F 3 "" H 3600 9000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$043
+L GND #U$405
U 1 1 57E2B7C6
P 3600 9400
-F 0 "#U$043" H 3510 9300 70 0001 L BNN
+F 0 "#U$405" H 3510 9300 70 0001 L BNN
F 1 "GND" H 3510 9300 70 0001 L BNN
F 2 "" H 3600 9400 60 0001 C CNN
F 3 "" H 3600 9400 60 0001 C CNN
@@ -1058,10 +1058,10 @@ Connection ~ 3600 8200
Wire Wire Line
3600 9200 3600 9300
$Comp
-L GND #U$044
+L GND #U$408
U 1 1 57E2C509
P 5200 9400
-F 0 "#U$044" H 5110 9300 70 0001 L BNN
+F 0 "#U$408" H 5110 9300 70 0001 L BNN
F 1 "GND" H 5110 9300 70 0001 L BNN
F 2 "" H 5200 9400 60 0001 C CNN
F 3 "" H 5200 9400 60 0001 C CNN
@@ -1157,10 +1157,10 @@ F 3 "" H 6350 8600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$045
+L GND #U$409
U 1 1 57E3133A
P 6050 9300
-F 0 "#U$045" H 5960 9200 70 0001 L BNN
+F 0 "#U$409" H 5960 9200 70 0001 L BNN
F 1 "GND" H 5960 9200 70 0001 L BNN
F 2 "" H 6050 9300 60 0001 C CNN
F 3 "" H 6050 9300 60 0001 C CNN
@@ -1188,10 +1188,10 @@ F 3 "" H 2300 8700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$046
+L GND #U$402
U 1 1 57E322BB
P 2600 9400
-F 0 "#U$046" H 2510 9300 70 0001 L BNN
+F 0 "#U$402" H 2510 9300 70 0001 L BNN
F 1 "GND" H 2510 9300 70 0001 L BNN
F 2 "" H 2600 9400 60 0001 C CNN
F 3 "" H 2600 9400 60 0001 C CNN
@@ -1279,10 +1279,10 @@ F 3 "" H 3450 2700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$047
+L GND #U$401
U 1 1 580848F7
P 1950 3100
-F 0 "#U$047" H 1860 3000 70 0001 L BNN
+F 0 "#U$401" H 1860 3000 70 0001 L BNN
F 1 "GND" H 1860 3000 70 0001 L BNN
F 2 "" H 1950 3100 60 0001 C CNN
F 3 "" H 1950 3100 60 0001 C CNN
@@ -1290,10 +1290,10 @@ F 3 "" H 1950 3100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$048
+L GND #U$404
U 1 1 58084986
P 3450 3100
-F 0 "#U$048" H 3360 3000 70 0001 L BNN
+F 0 "#U$404" H 3360 3000 70 0001 L BNN
F 1 "GND" H 3360 3000 70 0001 L BNN
F 2 "" H 3450 3100 60 0001 C CNN
F 3 "" H 3450 3100 60 0001 C CNN
@@ -1307,10 +1307,10 @@ Wire Wire Line
3450 2900 3450 3000
Connection ~ 3450 2200
$Comp
-L POWERED #FLG049
+L POWERED #FLG405
U 1 1 5809D214
P 13300 6700
-F 0 "#FLG049" H 13500 6600 60 0001 C CNN
+F 0 "#FLG405" H 13500 6600 60 0001 C CNN
F 1 "POWERED" H 13300 6750 60 0000 C CNN
F 2 "" H 13300 6700 60 0001 C CNN
F 3 "" H 13300 6700 60 0001 C CNN
@@ -1321,10 +1321,10 @@ Wire Wire Line
13300 6900 13300 7000
Connection ~ 13300 7000
$Comp
-L POWERED #FLG050
+L POWERED #FLG403
U 1 1 5809D7C2
P 10100 7250
-F 0 "#FLG050" H 10300 7150 60 0001 C CNN
+F 0 "#FLG403" H 10300 7150 60 0001 C CNN
F 1 "POWERED" H 10100 7300 60 0000 C CNN
F 2 "" H 10100 7250 60 0001 C CNN
F 3 "" H 10100 7250 60 0001 C CNN
diff --git a/hw/nfc.sch b/hw/nfc.sch
index ee1b7e9..1607804 100644
--- a/hw/nfc.sch
+++ b/hw/nfc.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 14 29
+Sheet 14 25
Title "RFID/NFC"
Date "Intentionally Left Blank"
Rev ""
@@ -400,10 +400,10 @@ F 3 "" H 14650 5400 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$0204
+L GND #U$1303
U 1 1 578CC054
P 7400 2400
-F 0 "#U$0204" H 7310 2300 70 0001 L BNN
+F 0 "#U$1303" H 7310 2300 70 0001 L BNN
F 1 "GND" H 7310 2300 70 0001 L BNN
F 2 "" H 7400 2400 60 0001 C CNN
F 3 "" H 7400 2400 60 0001 C CNN
@@ -411,10 +411,10 @@ F 3 "" H 7400 2400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0205
+L GND #U$1312
U 1 1 578CC0B8
P 9300 6950
-F 0 "#U$0205" H 9210 6850 70 0001 L BNN
+F 0 "#U$1312" H 9210 6850 70 0001 L BNN
F 1 "GND" H 9210 6850 70 0001 L BNN
F 2 "" H 9300 6950 60 0001 C CNN
F 3 "" H 9300 6950 60 0001 C CNN
@@ -422,10 +422,10 @@ F 3 "" H 9300 6950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0206
+L GND #U$1305
U 1 1 578CC11C
P 8100 6850
-F 0 "#U$0206" H 8010 6750 70 0001 L BNN
+F 0 "#U$1305" H 8010 6750 70 0001 L BNN
F 1 "GND" H 8010 6750 70 0001 L BNN
F 2 "" H 8100 6850 60 0001 C CNN
F 3 "" H 8100 6850 60 0001 C CNN
@@ -433,10 +433,10 @@ F 3 "" H 8100 6850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0207
+L GND #U$1321
U 1 1 578CC180
P 12200 6150
-F 0 "#U$0207" H 12110 6050 70 0001 L BNN
+F 0 "#U$1321" H 12110 6050 70 0001 L BNN
F 1 "GND" H 12110 6050 70 0001 L BNN
F 2 "" H 12200 6150 60 0001 C CNN
F 3 "" H 12200 6150 60 0001 C CNN
@@ -444,10 +444,10 @@ F 3 "" H 12200 6150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0208
+L GND #U$1322
U 1 1 578CC1E4
P 12500 6150
-F 0 "#U$0208" H 12410 6050 70 0001 L BNN
+F 0 "#U$1322" H 12410 6050 70 0001 L BNN
F 1 "GND" H 12410 6050 70 0001 L BNN
F 2 "" H 12500 6150 60 0001 C CNN
F 3 "" H 12500 6150 60 0001 C CNN
@@ -455,10 +455,10 @@ F 3 "" H 12500 6150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0209
+L GND #U$1323
U 1 1 578CC248
P 12800 6150
-F 0 "#U$0209" H 12710 6050 70 0001 L BNN
+F 0 "#U$1323" H 12710 6050 70 0001 L BNN
F 1 "GND" H 12710 6050 70 0001 L BNN
F 2 "" H 12800 6150 60 0001 C CNN
F 3 "" H 12800 6150 60 0001 C CNN
@@ -466,10 +466,10 @@ F 3 "" H 12800 6150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0210
+L GND #U$1324
U 1 1 578CC2AC
P 13550 6150
-F 0 "#U$0210" H 13460 6050 70 0001 L BNN
+F 0 "#U$1324" H 13460 6050 70 0001 L BNN
F 1 "GND" H 13460 6050 70 0001 L BNN
F 2 "" H 13550 6150 60 0001 C CNN
F 3 "" H 13550 6150 60 0001 C CNN
@@ -477,10 +477,10 @@ F 3 "" H 13550 6150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0211
+L GND #U$1325
U 1 1 578CC310
P 13850 6150
-F 0 "#U$0211" H 13760 6050 70 0001 L BNN
+F 0 "#U$1325" H 13760 6050 70 0001 L BNN
F 1 "GND" H 13760 6050 70 0001 L BNN
F 2 "" H 13850 6150 60 0001 C CNN
F 3 "" H 13850 6150 60 0001 C CNN
@@ -488,10 +488,10 @@ F 3 "" H 13850 6150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0212
+L GND #U$1326
U 1 1 578CC374
P 14150 6150
-F 0 "#U$0212" H 14060 6050 70 0001 L BNN
+F 0 "#U$1326" H 14060 6050 70 0001 L BNN
F 1 "GND" H 14060 6050 70 0001 L BNN
F 2 "" H 14150 6150 60 0001 C CNN
F 3 "" H 14150 6150 60 0001 C CNN
@@ -499,10 +499,10 @@ F 3 "" H 14150 6150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0213
+L GND #U$1327
U 1 1 578CC3D8
P 14650 6150
-F 0 "#U$0213" H 14560 6050 70 0001 L BNN
+F 0 "#U$1327" H 14560 6050 70 0001 L BNN
F 1 "GND" H 14560 6050 70 0001 L BNN
F 2 "" H 14650 6150 60 0001 C CNN
F 3 "" H 14650 6150 60 0001 C CNN
@@ -510,10 +510,10 @@ F 3 "" H 14650 6150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0214
+L GND #U$1328
U 1 1 578CC43C
P 14950 6150
-F 0 "#U$0214" H 14860 6050 70 0001 L BNN
+F 0 "#U$1328" H 14860 6050 70 0001 L BNN
F 1 "GND" H 14860 6050 70 0001 L BNN
F 2 "" H 14950 6150 60 0001 C CNN
F 3 "" H 14950 6150 60 0001 C CNN
@@ -521,10 +521,10 @@ F 3 "" H 14950 6150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0215
+L GND #U$1319
U 1 1 578CC4A0
P 10850 7850
-F 0 "#U$0215" H 10760 7750 70 0001 L BNN
+F 0 "#U$1319" H 10760 7750 70 0001 L BNN
F 1 "GND" H 10760 7750 70 0001 L BNN
F 2 "" H 10850 7850 60 0001 C CNN
F 3 "" H 10850 7850 60 0001 C CNN
@@ -532,10 +532,10 @@ F 3 "" H 10850 7850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0216
+L GND #U$1318
U 1 1 578CC504
P 10500 7850
-F 0 "#U$0216" H 10410 7750 70 0001 L BNN
+F 0 "#U$1318" H 10410 7750 70 0001 L BNN
F 1 "GND" H 10410 7750 70 0001 L BNN
F 2 "" H 10500 7850 60 0001 C CNN
F 3 "" H 10500 7850 60 0001 C CNN
@@ -543,10 +543,10 @@ F 3 "" H 10500 7850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0217
+L GND #U$1315
U 1 1 578CC568
P 10050 7850
-F 0 "#U$0217" H 9960 7750 70 0001 L BNN
+F 0 "#U$1315" H 9960 7750 70 0001 L BNN
F 1 "GND" H 9960 7750 70 0001 L BNN
F 2 "" H 10050 7850 60 0001 C CNN
F 3 "" H 10050 7850 60 0001 C CNN
@@ -554,10 +554,10 @@ F 3 "" H 10050 7850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0218
+L GND #U$1313
U 1 1 578CC5CC
P 9600 7850
-F 0 "#U$0218" H 9510 7750 70 0001 L BNN
+F 0 "#U$1313" H 9510 7750 70 0001 L BNN
F 1 "GND" H 9510 7750 70 0001 L BNN
F 2 "" H 9600 7850 60 0001 C CNN
F 3 "" H 9600 7850 60 0001 C CNN
@@ -565,10 +565,10 @@ F 3 "" H 9600 7850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0219
+L GND #U$1310
U 1 1 578CC630
P 9100 7850
-F 0 "#U$0219" H 9010 7750 70 0001 L BNN
+F 0 "#U$1310" H 9010 7750 70 0001 L BNN
F 1 "GND" H 9010 7750 70 0001 L BNN
F 2 "" H 9100 7850 60 0001 C CNN
F 3 "" H 9100 7850 60 0001 C CNN
@@ -576,10 +576,10 @@ F 3 "" H 9100 7850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0220
+L GND #U$1308
U 1 1 578CC694
P 8900 6850
-F 0 "#U$0220" H 8810 6750 70 0001 L BNN
+F 0 "#U$1308" H 8810 6750 70 0001 L BNN
F 1 "GND" H 8810 6750 70 0001 L BNN
F 2 "" H 8900 6850 60 0001 C CNN
F 3 "" H 8900 6850 60 0001 C CNN
@@ -587,10 +587,10 @@ F 3 "" H 8900 6850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0221
+L GND #U$1304
U 1 1 578CC6F8
P 7700 2400
-F 0 "#U$0221" H 7610 2300 70 0001 L BNN
+F 0 "#U$1304" H 7610 2300 70 0001 L BNN
F 1 "GND" H 7610 2300 70 0001 L BNN
F 2 "" H 7700 2400 60 0001 C CNN
F 3 "" H 7700 2400 60 0001 C CNN
@@ -598,10 +598,10 @@ F 3 "" H 7700 2400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0222
+L GND #U$1307
U 1 1 578CC75C
P 8600 2900
-F 0 "#U$0222" H 8510 2800 70 0001 L BNN
+F 0 "#U$1307" H 8510 2800 70 0001 L BNN
F 1 "GND" H 8510 2800 70 0001 L BNN
F 2 "" H 8600 2900 60 0001 C CNN
F 3 "" H 8600 2900 60 0001 C CNN
@@ -609,10 +609,10 @@ F 3 "" H 8600 2900 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND #U$0223
+L GND #U$1309
U 1 1 578CC7C0
P 9100 2900
-F 0 "#U$0223" H 9010 2800 70 0001 L BNN
+F 0 "#U$1309" H 9010 2800 70 0001 L BNN
F 1 "GND" H 9010 2800 70 0001 L BNN
F 2 "" H 9100 2900 60 0001 C CNN
F 3 "" H 9100 2900 60 0001 C CNN
@@ -620,10 +620,10 @@ F 3 "" H 9100 2900 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND #U$0224
+L GND #U$1311
U 1 1 578CC824
P 9300 3650
-F 0 "#U$0224" H 9210 3550 70 0001 L BNN
+F 0 "#U$1311" H 9210 3550 70 0001 L BNN
F 1 "GND" H 9210 3550 70 0001 L BNN
F 2 "" H 9300 3650 60 0001 C CNN
F 3 "" H 9300 3650 60 0001 C CNN
@@ -631,10 +631,10 @@ F 3 "" H 9300 3650 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND #U$0225
+L GND #U$1314
U 1 1 578CC888
P 9800 2900
-F 0 "#U$0225" H 9710 2800 70 0001 L BNN
+F 0 "#U$1314" H 9710 2800 70 0001 L BNN
F 1 "GND" H 9710 2800 70 0001 L BNN
F 2 "" H 9800 2900 60 0001 C CNN
F 3 "" H 9800 2900 60 0001 C CNN
@@ -642,10 +642,10 @@ F 3 "" H 9800 2900 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND #U$0226
+L GND #U$1306
U 1 1 578CC8EC
P 8300 2900
-F 0 "#U$0226" H 8210 2800 70 0001 L BNN
+F 0 "#U$1306" H 8210 2800 70 0001 L BNN
F 1 "GND" H 8210 2800 70 0001 L BNN
F 2 "" H 8300 2900 60 0001 C CNN
F 3 "" H 8300 2900 60 0001 C CNN
@@ -653,10 +653,10 @@ F 3 "" H 8300 2900 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND #U$0227
+L GND #U$1302
U 1 1 578CC950
P 7300 4550
-F 0 "#U$0227" H 7210 4450 70 0001 L BNN
+F 0 "#U$1302" H 7210 4450 70 0001 L BNN
F 1 "GND" H 7210 4450 70 0001 L BNN
F 2 "" H 7300 4550 60 0001 C CNN
F 3 "" H 7300 4550 60 0001 C CNN
@@ -664,10 +664,10 @@ F 3 "" H 7300 4550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0228
+L GND #U$1320
U 1 1 578CCBA8
P 10900 6450
-F 0 "#U$0228" H 10810 6350 70 0001 L BNN
+F 0 "#U$1320" H 10810 6350 70 0001 L BNN
F 1 "GND" H 10810 6350 70 0001 L BNN
F 2 "" H 10900 6450 60 0001 C CNN
F 3 "" H 10900 6450 60 0001 C CNN
@@ -675,10 +675,10 @@ F 3 "" H 10900 6450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0229
+L GND #U$1317
U 1 1 578CCC0C
P 10500 4950
-F 0 "#U$0229" H 10410 4850 70 0001 L BNN
+F 0 "#U$1317" H 10410 4850 70 0001 L BNN
F 1 "GND" H 10410 4850 70 0001 L BNN
F 2 "" H 10500 4950 60 0001 C CNN
F 3 "" H 10500 4950 60 0001 C CNN
@@ -686,10 +686,10 @@ F 3 "" H 10500 4950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0230
+L GND #U$1316
U 1 1 578CCC70
P 10500 4750
-F 0 "#U$0230" H 10410 4650 70 0001 L BNN
+F 0 "#U$1316" H 10410 4650 70 0001 L BNN
F 1 "GND" H 10410 4650 70 0001 L BNN
F 2 "" H 10500 4750 60 0001 C CNN
F 3 "" H 10500 4750 60 0001 C CNN
@@ -729,10 +729,10 @@ Some choices, 3.2 x 2.6 mm, 8-10 pF:\nNDK NX3225GA-27.12M-STD-CRG-2\nNDK NX3225S
Text GLabel 15250 6900 2 60 Output ~ 0
NFC_GND
$Comp
-L GND #U$?
+L GND #U$1329
U 1 1 58090761
P 15100 7100
-F 0 "#U$?" H 15010 7000 70 0001 L BNN
+F 0 "#U$1329" H 15010 7000 70 0001 L BNN
F 1 "GND" H 15010 7000 70 0001 L BNN
F 2 "" H 15100 7100 60 0001 C CNN
F 3 "" H 15100 7100 60 0001 C CNN
@@ -744,8 +744,8 @@ L C0402 C?
U 1 1 58292095
P 3800 3600
AR Path="/578AFF10/58292095" Ref="C?" Part="1"
-AR Path="/578AFF0E/58292095" Ref="C?" Part="1"
-F 0 "C?" H 3840 3640 50 0000 L CNN
+AR Path="/578AFF0E/58292095" Ref="C1301" Part="1"
+F 0 "C1301" H 3840 3640 50 0000 L CNN
F 1 "(47p)" H 3840 3470 50 0000 L CNN
F 2 "neo900-legacy:SMD-0402" H 3830 3750 20 0001 C CNN
F 3 "" H 3800 3600 60 0001 C CNN
@@ -757,8 +757,8 @@ L LED-0603 D?
U 1 1 5829209C
P 1650 3650
AR Path="/578AFF10/5829209C" Ref="D?" Part="1"
-AR Path="/578AFF0E/5829209C" Ref="D?" Part="1"
-F 0 "D?" H 1750 3850 50 0000 R CNN
+AR Path="/578AFF0E/5829209C" Ref="D1301" Part="1"
+F 0 "D1301" H 1750 3850 50 0000 R CNN
F 1 "LTST-C190KRKT" H 1450 3500 50 0000 L CNN
F 2 "neo900-legacy:SMD-0603D" H 1640 3440 65 0001 L TNN
F 3 "" H 1650 3650 60 0001 C CNN
@@ -770,8 +770,8 @@ L R0402 R?
U 1 1 582920A3
P 3500 7500
AR Path="/578AFF10/582920A3" Ref="R?" Part="1"
-AR Path="/578AFF0E/582920A3" Ref="R?" Part="1"
-F 0 "R?" H 3500 7600 50 0000 C CNN
+AR Path="/578AFF0E/582920A3" Ref="R1302" Part="1"
+F 0 "R1302" H 3500 7600 50 0000 C CNN
F 1 "150" H 3500 7500 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 3530 7650 20 0001 C CNN
F 3 "" H 3500 7500 60 0001 C CNN
@@ -783,8 +783,8 @@ L R0402 R?
U 1 1 582920AA
P 3400 7500
AR Path="/578AFF10/582920AA" Ref="R?" Part="1"
-AR Path="/578AFF0E/582920AA" Ref="R?" Part="1"
-F 0 "R?" H 3400 7400 50 0000 C CNN
+AR Path="/578AFF0E/582920AA" Ref="R1301" Part="1"
+F 0 "R1301" H 3400 7400 50 0000 C CNN
F 1 "150" H 3400 7500 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 3430 7650 20 0001 C CNN
F 3 "" H 3400 7500 60 0001 C CNN
@@ -792,10 +792,10 @@ F 3 "" H 3400 7500 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L GND #U$?
+L GND #U$1301
U 1 1 582920B1
P 3800 3300
-F 0 "#U$?" H 3710 3200 70 0001 L BNN
+F 0 "#U$1301" H 3710 3200 70 0001 L BNN
F 1 "GND" H 3710 3200 70 0001 L BNN
F 2 "" H 3800 3300 60 0001 C CNN
F 3 "" H 3800 3300 60 0001 C CNN
@@ -803,10 +803,10 @@ F 3 "" H 3800 3300 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L MKL16Z32VFM4 U?
+L MKL16Z32VFM4 U1301
U 2 1 582920B7
P 3200 5000
-F 0 "U?" H 2400 6000 50 0000 L CNN
+F 0 "U1301" H 2400 6000 50 0000 L CNN
F 1 "MKL16Z128VFM4" H 3200 5150 50 0000 C CNN
F 2 "neo900-legacy:QFN-32+E-0.5" H 3190 4790 65 0001 L TNN
F 3 "" H 3200 5000 60 0001 C CNN
diff --git a/hw/sensors.sch b/hw/sensors.sch
index 254259c..f63687a 100644
--- a/hw/sensors.sch
+++ b/hw/sensors.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 9 29
+Sheet 9 25
Title "Sensors"
Date "Intentionally Left Blank"
Rev ""
@@ -131,10 +131,10 @@ F 3 "" H 4000 2900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0142
+L GND #U$908
U 1 1 578C19EE
P 7400 3200
-F 0 "#U$0142" H 7310 3100 70 0001 L BNN
+F 0 "#U$908" H 7310 3100 70 0001 L BNN
F 1 "GND" H 7310 3100 70 0001 L BNN
F 2 "" H 7400 3200 60 0001 C CNN
F 3 "" H 7400 3200 60 0001 C CNN
@@ -142,10 +142,10 @@ F 3 "" H 7400 3200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0143
+L GND #U$905
U 1 1 578C1BE2
P 3300 3800
-F 0 "#U$0143" H 3210 3700 70 0001 L BNN
+F 0 "#U$905" H 3210 3700 70 0001 L BNN
F 1 "GND" H 3210 3700 70 0001 L BNN
F 2 "" H 3300 3800 60 0001 C CNN
F 3 "" H 3300 3800 60 0001 C CNN
@@ -153,10 +153,10 @@ F 3 "" H 3300 3800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0144
+L GND #U$902
U 1 1 578C1C46
P 2400 2900
-F 0 "#U$0144" H 2310 2800 70 0001 L BNN
+F 0 "#U$902" H 2310 2800 70 0001 L BNN
F 1 "GND" H 2310 2800 70 0001 L BNN
F 2 "" H 2400 2900 60 0001 C CNN
F 3 "" H 2400 2900 60 0001 C CNN
@@ -164,10 +164,10 @@ F 3 "" H 2400 2900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0145
+L GND #U$904
U 1 1 578C1CAA
P 2800 2900
-F 0 "#U$0145" H 2710 2800 70 0001 L BNN
+F 0 "#U$904" H 2710 2800 70 0001 L BNN
F 1 "GND" H 2710 2800 70 0001 L BNN
F 2 "" H 2800 2900 60 0001 C CNN
F 3 "" H 2800 2900 60 0001 C CNN
@@ -175,10 +175,10 @@ F 3 "" H 2800 2900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0146
+L GND #U$901
U 1 1 578C1E9E
P 2150 7700
-F 0 "#U$0146" H 2060 7600 70 0001 L BNN
+F 0 "#U$901" H 2060 7600 70 0001 L BNN
F 1 "GND" H 2060 7600 70 0001 L BNN
F 2 "" H 2150 7700 60 0001 C CNN
F 3 "" H 2150 7700 60 0001 C CNN
@@ -290,10 +290,10 @@ Wire Wire Line
9200 2900 9100 2900
Connection ~ 9200 2600
$Comp
-L GND #U$0147
+L GND #U$909
U 1 1 57D709C4
P 9200 3150
-F 0 "#U$0147" H 9110 3050 70 0001 L BNN
+F 0 "#U$909" H 9110 3050 70 0001 L BNN
F 1 "GND" H 9110 3050 70 0001 L BNN
F 2 "" H 9200 3150 60 0001 C CNN
F 3 "" H 9200 3150 60 0001 C CNN
@@ -441,10 +441,10 @@ Wire Wire Line
2550 6900 3500 6900
Connection ~ 2150 7250
$Comp
-L GND #U$0148
+L GND #U$903
U 1 1 57D7B552
P 2750 7700
-F 0 "#U$0148" H 2660 7600 70 0001 L BNN
+F 0 "#U$903" H 2660 7600 70 0001 L BNN
F 1 "GND" H 2660 7600 70 0001 L BNN
F 2 "" H 2750 7700 60 0001 C CNN
F 3 "" H 2750 7700 60 0001 C CNN
@@ -487,10 +487,10 @@ Wire Wire Line
5200 6250 5200 6100
Connection ~ 5200 6100
$Comp
-L GND #U$0149
+L GND #U$906
U 1 1 57D7C475
P 3400 8200
-F 0 "#U$0149" H 3310 8100 70 0001 L BNN
+F 0 "#U$906" H 3310 8100 70 0001 L BNN
F 1 "GND" H 3310 8100 70 0001 L BNN
F 2 "" H 3400 8200 60 0001 C CNN
F 3 "" H 3400 8200 60 0001 C CNN
@@ -500,10 +500,10 @@ $EndComp
NoConn ~ 3500 7900
NoConn ~ 3500 7800
$Comp
-L GND #U$0150
+L GND #U$907
U 1 1 57D7C52C
P 5000 7350
-F 0 "#U$0150" H 4910 7250 70 0001 L BNN
+F 0 "#U$907" H 4910 7250 70 0001 L BNN
F 1 "GND" H 4910 7250 70 0001 L BNN
F 2 "" H 5000 7350 60 0001 C CNN
F 3 "" H 5000 7350 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="C?" Part="1"
-F 0 "C?" H 10090 6390 50 0000 L CNN
+AR Path="/578AFF02/58290E34" Ref="C912" Part="1"
+F 0 "C912" 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="C?" Part="1"
-F 0 "C?" H 10690 6390 50 0000 L CNN
+AR Path="/578AFF02/58290E3B" Ref="C913" Part="1"
+F 0 "C913" 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="R?" Part="1"
-F 0 "R?" H 10220 5660 50 0000 L BNN
+AR Path="/578AFF02/58290E42" Ref="R901" Part="1"
+F 0 "R901" 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
@@ -609,8 +609,8 @@ L GND-2 #U$?
U 1 1 58290E49
P 10650 6750
AR Path="/578AFF0C/58290E49" Ref="#U$?" Part="1"
-AR Path="/578AFF02/58290E49" Ref="#U$?" Part="1"
-F 0 "#U$?" H 10530 6651 70 0001 L BNN
+AR Path="/578AFF02/58290E49" Ref="#U$911" Part="1"
+F 0 "#U$911" H 10530 6651 70 0001 L BNN
F 1 "GND2" H 10530 6651 70 0001 L BNN
F 2 "" H 10650 6750 60 0001 C CNN
F 3 "" H 10650 6750 60 0001 C CNN
@@ -622,8 +622,8 @@ L GND-2 #U$?
U 1 1 58290E4F
P 10050 6750
AR Path="/578AFF0C/58290E4F" Ref="#U$?" Part="1"
-AR Path="/578AFF02/58290E4F" Ref="#U$?" Part="1"
-F 0 "#U$?" H 9930 6651 70 0001 L BNN
+AR Path="/578AFF02/58290E4F" Ref="#U$910" Part="1"
+F 0 "#U$910" H 9930 6651 70 0001 L BNN
F 1 "GND2" H 9930 6651 70 0001 L BNN
F 2 "" H 10050 6750 60 0001 C CNN
F 3 "" H 10050 6750 60 0001 C CNN
@@ -635,8 +635,8 @@ L GND-2 #U$?
U 1 1 58290E55
P 11000 5900
AR Path="/578AFF0C/58290E55" Ref="#U$?" Part="1"
-AR Path="/578AFF02/58290E55" Ref="#U$?" Part="1"
-F 0 "#U$?" H 10880 5801 70 0001 L BNN
+AR Path="/578AFF02/58290E55" Ref="#U$913" Part="1"
+F 0 "#U$913" H 10880 5801 70 0001 L BNN
F 1 "GND2" H 10880 5801 70 0001 L BNN
F 2 "" H 11000 5900 60 0001 C CNN
F 3 "" H 11000 5900 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="U?" Part="1"
-F 0 "U?" H 11300 6550 50 0000 L CNN
+AR Path="/578AFF02/58290E5B" Ref="U904" Part="1"
+F 0 "U904" 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
@@ -715,8 +715,8 @@ U 1 1 58290E7A
P 11400 9400
AR Path="/578AFF18/58290E7A" Ref="#U$?" Part="1"
AR Path="/578AFF0C/58290E7A" Ref="#U$?" Part="1"
-AR Path="/578AFF02/58290E7A" Ref="#U$?" Part="1"
-F 0 "#U$?" H 11280 9301 70 0001 L BNN
+AR Path="/578AFF02/58290E7A" Ref="#U$914" Part="1"
+F 0 "#U$914" H 11280 9301 70 0001 L BNN
F 1 "GND2" H 11280 9301 70 0001 L BNN
F 2 "" H 11400 9400 60 0001 C CNN
F 3 "" H 11400 9400 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="U?" Part="1"
-F 0 "U?" H 11100 8940 50 0000 L BNN
+AR Path="/578AFF02/58290E80" Ref="U903" Part="1"
+F 0 "U903" 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="C?" Part="1"
-F 0 "C?" H 10740 8140 50 0000 L CNN
+AR Path="/578AFF02/58290E8B" Ref="C914" Part="1"
+F 0 "C914" 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
@@ -768,8 +768,8 @@ L GND-2 #U$?
U 1 1 58290E92
P 10700 8500
AR Path="/578AFF0C/58290E92" Ref="#U$?" Part="1"
-AR Path="/578AFF02/58290E92" Ref="#U$?" Part="1"
-F 0 "#U$?" H 10580 8401 70 0001 L BNN
+AR Path="/578AFF02/58290E92" Ref="#U$912" Part="1"
+F 0 "#U$912" H 10580 8401 70 0001 L BNN
F 1 "GND2" H 10580 8401 70 0001 L BNN
F 2 "" H 10700 8500 60 0001 C CNN
F 3 "" H 10700 8500 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="C?" Part="1"
-F 0 "C?" H 12540 8840 50 0000 L CNN
+AR Path="/578AFF02/58290E9D" Ref="C915" Part="1"
+F 0 "C915" 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
@@ -804,8 +804,8 @@ U 1 1 58290EA4
P 12500 9200
AR Path="/578AFF18/58290EA4" Ref="#U$?" Part="1"
AR Path="/578AFF0C/58290EA4" Ref="#U$?" Part="1"
-AR Path="/578AFF02/58290EA4" Ref="#U$?" Part="1"
-F 0 "#U$?" H 12380 9101 70 0001 L BNN
+AR Path="/578AFF02/58290EA4" Ref="#U$915" Part="1"
+F 0 "#U$915" H 12380 9101 70 0001 L BNN
F 1 "GND2" H 12380 9101 70 0001 L BNN
F 2 "" H 12500 9200 60 0001 C CNN
F 3 "" H 12500 9200 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="R?" Part="1"
-F 0 "R?" V 12350 8400 50 0000 L CNN
+AR Path="/578AFF02/58290EAD" Ref="R902" Part="1"
+F 0 "R902" 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
@@ -840,10 +840,10 @@ Wire Wire Line
12400 8500 12400 8600
Connection ~ 12400 8600
$Comp
-L POWERED #FLG?
+L POWERED #FLG901
U 1 1 58290EB9
P 10750 5300
-F 0 "#FLG?" H 10950 5200 60 0001 C CNN
+F 0 "#FLG901" H 10950 5200 60 0001 C CNN
F 1 "POWERED" H 10750 5350 60 0000 C CNN
F 2 "" H 10750 5300 60 0001 C CNN
F 3 "" H 10750 5300 60 0001 C CNN
diff --git a/hw/sims.sch b/hw/sims.sch
index 3d32d62..152fd53 100644
--- a/hw/sims.sch
+++ b/hw/sims.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 7 31
+Sheet 7 25
Title "SIM cards and switch"
Date "Intentionally Left Blank"
Rev ""
@@ -68,10 +68,10 @@ F 3 "" H 13200 1900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$077
+L GND #U$613
U 1 1 578B8E7F
P 6200 4800
-F 0 "#U$077" H 6110 4700 70 0001 L BNN
+F 0 "#U$613" H 6110 4700 70 0001 L BNN
F 1 "GND" H 6110 4700 70 0001 L BNN
F 2 "" H 6200 4800 60 0001 C CNN
F 3 "" H 6200 4800 60 0001 C CNN
@@ -185,10 +185,10 @@ F 3 "" H 5900 4400 60 0001 C CNN
$EndComp
NoConn ~ 6900 4600
$Comp
-L GND #U$078
+L GND #U$611
U 1 1 57E1D0F5
P 5900 4800
-F 0 "#U$078" H 5810 4700 70 0001 L BNN
+F 0 "#U$611" H 5810 4700 70 0001 L BNN
F 1 "GND" H 5810 4700 70 0001 L BNN
F 2 "" H 5900 4800 60 0001 C CNN
F 3 "" H 5900 4800 60 0001 C CNN
@@ -198,10 +198,10 @@ $EndComp
Text GLabel 2400 700 0 60 Input ~ 0
1V8
$Comp
-L GND #U$079
+L GND #U$606
U 1 1 57E1E0AF
P 4100 2800
-F 0 "#U$079" H 4010 2700 70 0001 L BNN
+F 0 "#U$606" H 4010 2700 70 0001 L BNN
F 1 "GND" H 4010 2700 70 0001 L BNN
F 2 "" H 4100 2800 60 0001 C CNN
F 3 "" H 4100 2800 60 0001 C CNN
@@ -209,10 +209,10 @@ F 3 "" H 4100 2800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$080
+L GND #U$610
U 1 1 57E1E0FC
P 5100 2050
-F 0 "#U$080" H 5010 1950 70 0001 L BNN
+F 0 "#U$610" H 5010 1950 70 0001 L BNN
F 1 "GND" H 5010 1950 70 0001 L BNN
F 2 "" H 5100 2050 60 0001 C CNN
F 3 "" H 5100 2050 60 0001 C CNN
@@ -235,10 +235,10 @@ F 3 "" H 4450 900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$081
+L GND #U$607
U 1 1 57E1EB15
P 4450 1300
-F 0 "#U$081" H 4360 1200 70 0001 L BNN
+F 0 "#U$607" H 4360 1200 70 0001 L BNN
F 1 "GND" H 4360 1200 70 0001 L BNN
F 2 "" H 4450 1300 60 0001 C CNN
F 3 "" H 4450 1300 60 0001 C CNN
@@ -285,10 +285,10 @@ F 3 "" H 2500 5300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$082
+L GND #U$601
U 1 1 57E21C1E
P 2300 6950
-F 0 "#U$082" H 2210 6850 70 0001 L BNN
+F 0 "#U$601" H 2210 6850 70 0001 L BNN
F 1 "GND" H 2210 6850 70 0001 L BNN
F 2 "" H 2300 6950 60 0001 C CNN
F 3 "" H 2300 6950 60 0001 C CNN
@@ -296,10 +296,10 @@ F 3 "" H 2300 6950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$083
+L GND #U$609
U 1 1 57E21C7D
P 4650 5350
-F 0 "#U$083" H 4560 5250 70 0001 L BNN
+F 0 "#U$609" H 4560 5250 70 0001 L BNN
F 1 "GND" H 4560 5250 70 0001 L BNN
F 2 "" H 4650 5350 60 0001 C CNN
F 3 "" H 4650 5350 60 0001 C CNN
@@ -353,10 +353,10 @@ Text GLabel 7100 5750 2 60 Input ~ 0
Text GLabel 7100 7450 2 60 Input ~ 0
1V8
$Comp
-L GND #U$084
+L GND #U$616
U 1 1 57E26D60
P 6350 8650
-F 0 "#U$084" H 6260 8550 70 0001 L BNN
+F 0 "#U$616" H 6260 8550 70 0001 L BNN
F 1 "GND" H 6260 8550 70 0001 L BNN
F 2 "" H 6350 8650 60 0001 C CNN
F 3 "" H 6350 8650 60 0001 C CNN
@@ -364,10 +364,10 @@ F 3 "" H 6350 8650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$085
+L GND #U$615
U 1 1 57E26E89
P 6350 6950
-F 0 "#U$085" H 6260 6850 70 0001 L BNN
+F 0 "#U$615" H 6260 6850 70 0001 L BNN
F 1 "GND" H 6260 6850 70 0001 L BNN
F 2 "" H 6350 6950 60 0001 C CNN
F 3 "" H 6350 6950 60 0001 C CNN
@@ -397,10 +397,10 @@ F 3 "" H 6900 8250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$086
+L GND #U$618
U 1 1 57E27ECF
P 6900 8650
-F 0 "#U$086" H 6810 8550 70 0001 L BNN
+F 0 "#U$618" H 6810 8550 70 0001 L BNN
F 1 "GND" H 6810 8550 70 0001 L BNN
F 2 "" H 6900 8650 60 0001 C CNN
F 3 "" H 6900 8650 60 0001 C CNN
@@ -408,10 +408,10 @@ F 3 "" H 6900 8650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$087
+L GND #U$617
U 1 1 57E2845B
P 6900 6950
-F 0 "#U$087" H 6810 6850 70 0001 L BNN
+F 0 "#U$617" H 6810 6850 70 0001 L BNN
F 1 "GND" H 6810 6850 70 0001 L BNN
F 2 "" H 6900 6950 60 0001 C CNN
F 3 "" H 6900 6950 60 0001 C CNN
@@ -420,10 +420,10 @@ F 3 "" H 6900 6950 60 0001 C CNN
$EndComp
NoConn ~ 6800 6250
$Comp
-L GND #U$088
+L GND #U$602
U 1 1 57E292D3
P 2500 5700
-F 0 "#U$088" H 2410 5600 70 0001 L BNN
+F 0 "#U$602" H 2410 5600 70 0001 L BNN
F 1 "GND" H 2410 5600 70 0001 L BNN
F 2 "" H 2500 5700 60 0001 C CNN
F 3 "" H 2500 5700 60 0001 C CNN
@@ -453,10 +453,10 @@ F 3 "" H 3400 1775 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L GND #U$089
+L GND #U$605
U 1 1 57E226F8
P 3550 2000
-F 0 "#U$089" H 3460 1900 70 0001 L BNN
+F 0 "#U$605" H 3460 1900 70 0001 L BNN
F 1 "GND" H 3460 1900 70 0001 L BNN
F 2 "" H 3550 2000 60 0001 C CNN
F 3 "" H 3550 2000 60 0001 C CNN
@@ -465,10 +465,10 @@ F 3 "" H 3550 2000 60 0001 C CNN
$EndComp
NoConn ~ 6900 10500
$Comp
-L GND #U$090
+L GND #U$614
U 1 1 57E264F5
P 6200 10700
-F 0 "#U$090" H 6110 10600 70 0001 L BNN
+F 0 "#U$614" H 6110 10600 70 0001 L BNN
F 1 "GND" H 6110 10600 70 0001 L BNN
F 2 "" H 6200 10700 60 0001 C CNN
F 3 "" H 6200 10700 60 0001 C CNN
@@ -487,10 +487,10 @@ F 3 "" H 5900 10300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$091
+L GND #U$612
U 1 1 57E26501
P 5900 10700
-F 0 "#U$091" H 5810 10600 70 0001 L BNN
+F 0 "#U$612" H 5810 10600 70 0001 L BNN
F 1 "GND" H 5810 10600 70 0001 L BNN
F 2 "" H 5900 10700 60 0001 C CNN
F 3 "" H 5900 10700 60 0001 C CNN
@@ -519,10 +519,10 @@ F 3 "" H 10150 2750 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$092
+L GND #U$604
U 1 1 57E2B44A
P 3150 6950
-F 0 "#U$092" H 3060 6850 70 0001 L BNN
+F 0 "#U$604" H 3060 6850 70 0001 L BNN
F 1 "GND" H 3060 6850 70 0001 L BNN
F 2 "" H 3150 6950 60 0001 C CNN
F 3 "" H 3150 6950 60 0001 C CNN
@@ -583,10 +583,10 @@ F 3 "" H 4350 6425 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$093
+L GND #U$608
U 1 1 57E2388F
P 4500 6950
-F 0 "#U$093" H 4410 6850 70 0001 L BNN
+F 0 "#U$608" H 4410 6850 70 0001 L BNN
F 1 "GND" H 4410 6850 70 0001 L BNN
F 2 "" H 4500 6950 60 0001 C CNN
F 3 "" H 4500 6950 60 0001 C CNN
@@ -612,10 +612,10 @@ Diodes 74LVC1G32FW4
Text Notes 3700 5250 0 40 ~ 0
Diodes 74LVC1G32FW4
$Comp
-L GND #U$094
+L GND #U$626
U 1 1 57E2D768
P 12200 2900
-F 0 "#U$094" H 12110 2800 70 0001 L BNN
+F 0 "#U$626" H 12110 2800 70 0001 L BNN
F 1 "GND" H 12110 2800 70 0001 L BNN
F 2 "" H 12200 2900 60 0001 C CNN
F 3 "" H 12200 2900 60 0001 C CNN
@@ -623,10 +623,10 @@ F 3 "" H 12200 2900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$095
+L GND #U$628
U 1 1 57E2DAE2
P 14400 2900
-F 0 "#U$095" H 14310 2800 70 0001 L BNN
+F 0 "#U$628" H 14310 2800 70 0001 L BNN
F 1 "GND" H 14310 2800 70 0001 L BNN
F 2 "" H 14400 2900 60 0001 C CNN
F 3 "" H 14400 2900 60 0001 C CNN
@@ -680,10 +680,10 @@ F 3 "" H 11800 2500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$096
+L GND #U$624
U 1 1 57E316A2
P 11800 2900
-F 0 "#U$096" H 11710 2800 70 0001 L BNN
+F 0 "#U$624" H 11710 2800 70 0001 L BNN
F 1 "GND" H 11710 2800 70 0001 L BNN
F 2 "" H 11800 2900 60 0001 C CNN
F 3 "" H 11800 2900 60 0001 C CNN
@@ -702,10 +702,10 @@ F 3 "" H 11450 2500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$097
+L GND #U$622
U 1 1 57E31B3A
P 11450 2900
-F 0 "#U$097" H 11360 2800 70 0001 L BNN
+F 0 "#U$622" H 11360 2800 70 0001 L BNN
F 1 "GND" H 11360 2800 70 0001 L BNN
F 2 "" H 11450 2900 60 0001 C CNN
F 3 "" H 11450 2900 60 0001 C CNN
@@ -726,10 +726,10 @@ F 3 "" H 10000 1100 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L GND #U$098
+L GND #U$619
U 1 1 57E34172
P 9400 1400
-F 0 "#U$098" H 9310 1300 70 0001 L BNN
+F 0 "#U$619" H 9310 1300 70 0001 L BNN
F 1 "GND" H 9310 1300 70 0001 L BNN
F 2 "" H 9400 1400 60 0001 C CNN
F 3 "" H 9400 1400 60 0001 C CNN
@@ -752,10 +752,10 @@ F 3 "" H 13200 6000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$099
+L GND #U$627
U 1 1 57E25FE7
P 12200 7350
-F 0 "#U$099" H 12110 7250 70 0001 L BNN
+F 0 "#U$627" H 12110 7250 70 0001 L BNN
F 1 "GND" H 12110 7250 70 0001 L BNN
F 2 "" H 12200 7350 60 0001 C CNN
F 3 "" H 12200 7350 60 0001 C CNN
@@ -763,10 +763,10 @@ F 3 "" H 12200 7350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0100
+L GND #U$629
U 1 1 57E2622B
P 14400 6950
-F 0 "#U$0100" H 14310 6850 70 0001 L BNN
+F 0 "#U$629" H 14310 6850 70 0001 L BNN
F 1 "GND" H 14310 6850 70 0001 L BNN
F 2 "" H 14400 6950 60 0001 C CNN
F 3 "" H 14400 6950 60 0001 C CNN
@@ -789,10 +789,10 @@ F 3 "" H 11800 6950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0101
+L GND #U$625
U 1 1 57E26CC1
P 11800 7350
-F 0 "#U$0101" H 11710 7250 70 0001 L BNN
+F 0 "#U$625" H 11710 7250 70 0001 L BNN
F 1 "GND" H 11710 7250 70 0001 L BNN
F 2 "" H 11800 7350 60 0001 C CNN
F 3 "" H 11800 7350 60 0001 C CNN
@@ -811,10 +811,10 @@ F 3 "" H 11450 6950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$0102
+L GND #U$623
U 1 1 57E26CCE
P 11450 7350
-F 0 "#U$0102" H 11360 7250 70 0001 L BNN
+F 0 "#U$623" H 11360 7250 70 0001 L BNN
F 1 "GND" H 11360 7250 70 0001 L BNN
F 2 "" H 11450 7350 60 0001 C CNN
F 3 "" H 11450 7350 60 0001 C CNN
@@ -870,10 +870,10 @@ F 3 "" H 11250 4400 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND #U$0103
+L GND #U$621
U 1 1 57E2E04D
P 11350 3900
-F 0 "#U$0103" H 11260 3800 70 0001 L BNN
+F 0 "#U$621" H 11260 3800 70 0001 L BNN
F 1 "GND" H 11260 3800 70 0001 L BNN
F 2 "" H 11350 3900 60 0001 C CNN
F 3 "" H 11350 3900 60 0001 C CNN
@@ -938,10 +938,10 @@ F 3 "" H 4700 8900 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$0104
+L GND #U$603
U 1 1 57E2B73C
P 2800 9950
-F 0 "#U$0104" H 2710 9850 70 0001 L BNN
+F 0 "#U$603" H 2710 9850 70 0001 L BNN
F 1 "GND" H 2710 9850 70 0001 L BNN
F 2 "" H 2800 9950 60 0001 C CNN
F 3 "" H 2800 9950 60 0001 C CNN
@@ -1485,10 +1485,10 @@ F 3 "" H 10150 7050 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$0105
+L GND #U$620
U 1 1 57E47140
P 10150 7450
-F 0 "#U$0105" H 10060 7350 70 0001 L BNN
+F 0 "#U$620" H 10060 7350 70 0001 L BNN
F 1 "GND" H 10060 7350 70 0001 L BNN
F 2 "" H 10150 7450 60 0001 C CNN
F 3 "" H 10150 7450 60 0001 C CNN
@@ -1504,10 +1504,10 @@ NoConn ~ 14300 2700
NoConn ~ 12300 2600
NoConn ~ 12300 2700
$Comp
-L POWERED #FLG?
+L POWERED #FLG601
U 1 1 580A20DE
P 4100 8300
-F 0 "#FLG?" H 4300 8200 60 0001 C CNN
+F 0 "#FLG601" H 4300 8200 60 0001 C CNN
F 1 "POWERED" H 4100 8350 60 0000 C CNN
F 2 "" H 4100 8300 60 0001 C CNN
F 3 "" H 4100 8300 60 0001 C CNN
diff --git a/hw/v2.sch b/hw/v2.sch
index e9e8340..6a09623 100644
--- a/hw/v2.sch
+++ b/hw/v2.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 25 29
+Sheet 25 25
Title "Adaptation (v2 only)"
Date "Intentionally Left Blank"
Rev ""
@@ -70,10 +70,10 @@ F 3 "" H 6600 7850 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND-3 #U$3301
+L GND-3 #U$2204
U 1 1 578E2140
P 7700 7550
-F 0 "#U$3301" H 7580 7451 70 0001 L BNN
+F 0 "#U$2204" H 7580 7451 70 0001 L BNN
F 1 "GND3" H 7580 7451 70 0001 L BNN
F 2 "" H 7700 7550 60 0001 C CNN
F 3 "" H 7700 7550 60 0001 C CNN
@@ -117,10 +117,10 @@ F 3 "" H 6400 10050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #M3302
+L GND #M2202
U 1 1 58079E6A
P 6400 10450
-F 0 "#M3302" H 6400 10450 45 0001 C CNN
+F 0 "#M2202" H 6400 10450 45 0001 C CNN
F 1 "GND" H 6400 10450 45 0001 C CNN
F 2 "" H 6400 10450 60 0001 C CNN
F 3 "" H 6400 10450 60 0001 C CNN
@@ -128,10 +128,10 @@ F 3 "" H 6400 10450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #M3301
+L GND #M2201
U 1 1 58079EB4
P 5200 10450
-F 0 "#M3301" H 5200 10450 45 0001 C CNN
+F 0 "#M2201" H 5200 10450 45 0001 C CNN
F 1 "GND" H 5200 10450 45 0001 C CNN
F 2 "" H 5200 10450 60 0001 C CNN
F 3 "" H 5200 10450 60 0001 C CNN
@@ -172,10 +172,10 @@ F 3 "" H 9200 9700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #M3303
+L GND #M2203
U 1 1 5820D911
P 8600 10450
-F 0 "#M3303" H 8600 10450 45 0001 C CNN
+F 0 "#M2203" H 8600 10450 45 0001 C CNN
F 1 "GND" H 8600 10450 45 0001 C CNN
F 2 "" H 8600 10450 60 0001 C CNN
F 3 "" H 8600 10450 60 0001 C CNN
@@ -183,10 +183,10 @@ F 3 "" H 8600 10450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #M3304
+L GND #M2204
U 1 1 5820D928
P 9800 10450
-F 0 "#M3304" H 9800 10450 45 0001 C CNN
+F 0 "#M2204" H 9800 10450 45 0001 C CNN
F 1 "GND" H 9800 10450 45 0001 C CNN
F 2 "" H 9800 10450 60 0001 C CNN
F 3 "" H 9800 10450 60 0001 C CNN
@@ -238,8 +238,8 @@ L GND-3 #U$?
U 1 1 5828F4B4
P 4600 4400
AR Path="/578AFF28/5828F4B4" Ref="#U$?" Part="1"
-AR Path="/578AFF30/5828F4B4" Ref="#U$?" Part="1"
-F 0 "#U$?" H 4480 4301 70 0001 L BNN
+AR Path="/578AFF30/5828F4B4" Ref="#U$2201" Part="1"
+F 0 "#U$2201" H 4480 4301 70 0001 L BNN
F 1 "GND3" H 4480 4301 70 0001 L BNN
F 2 "" H 4600 4400 60 0001 C CNN
F 3 "" H 4600 4400 60 0001 C CNN
@@ -251,8 +251,8 @@ L TPS73630DBV U?
U 1 1 5828F4BA
P 4600 3800
AR Path="/578AFF28/5828F4BA" Ref="U?" Part="1"
-AR Path="/578AFF30/5828F4BA" Ref="U?" Part="1"
-F 0 "U?" H 4451 4050 50 0000 L BNN
+AR Path="/578AFF30/5828F4BA" Ref="U2201" Part="1"
+F 0 "U2201" H 4451 4050 50 0000 L BNN
F 1 "TPS73601DBV" H 4639 3530 50 0000 L BNN
F 2 "neo900-legacy:SOT23-5" H 4590 3590 65 0001 L TNN
F 3 "" H 4600 3800 60 0001 C CNN
@@ -275,8 +275,8 @@ U 1 1 5828F4C6
P 5500 4000
AR Path="/578AFEFC/5828F4C6" Ref="R?" Part="1"
AR Path="/578AFF28/5828F4C6" Ref="R?" Part="1"
-AR Path="/578AFF30/5828F4C6" Ref="R?" Part="1"
-F 0 "R?" H 5370 4060 50 0000 L BNN
+AR Path="/578AFF30/5828F4C6" Ref="R2201" Part="1"
+F 0 "R2201" H 5370 4060 50 0000 L BNN
F 1 "44k2" H 5500 4000 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5530 4150 20 0001 C CNN
F 3 "" H 5500 4000 60 0001 C CNN
@@ -289,8 +289,8 @@ U 1 1 5828F4CD
P 5500 4600
AR Path="/578AFEFC/5828F4CD" Ref="R?" Part="1"
AR Path="/578AFF28/5828F4CD" Ref="R?" Part="1"
-AR Path="/578AFF30/5828F4CD" Ref="R?" Part="1"
-F 0 "R?" H 5370 4660 50 0000 L BNN
+AR Path="/578AFF30/5828F4CD" Ref="R2202" Part="1"
+F 0 "R2202" H 5370 4660 50 0000 L BNN
F 1 "34k0" H 5500 4600 50 0000 C CNN
F 2 "neo900-legacy:SMD-0402" H 5530 4750 20 0001 C CNN
F 3 "" H 5500 4600 60 0001 C CNN
@@ -302,8 +302,8 @@ L GND-3 #U$?
U 1 1 5828F4D4
P 5500 5000
AR Path="/578AFF28/5828F4D4" Ref="#U$?" Part="1"
-AR Path="/578AFF30/5828F4D4" Ref="#U$?" Part="1"
-F 0 "#U$?" H 5380 4901 70 0001 L BNN
+AR Path="/578AFF30/5828F4D4" Ref="#U$2203" Part="1"
+F 0 "#U$2203" H 5380 4901 70 0001 L BNN
F 1 "GND3" H 5380 4901 70 0001 L BNN
F 2 "" H 5500 5000 60 0001 C CNN
F 3 "" H 5500 5000 60 0001 C CNN
@@ -340,8 +340,8 @@ L TPS73630DBV U?
U 1 1 5828F4E8
P 4650 5600
AR Path="/578AFF28/5828F4E8" Ref="U?" Part="1"
-AR Path="/578AFF30/5828F4E8" Ref="U?" Part="1"
-F 0 "U?" H 4501 5850 50 0000 L BNN
+AR Path="/578AFF30/5828F4E8" Ref="U2202" Part="1"
+F 0 "U2202" H 4501 5850 50 0000 L BNN
F 1 "TPS73618DBV" H 4689 5330 50 0000 L BNN
F 2 "neo900-legacy:SOT23-5" H 4640 5390 65 0001 L TNN
F 3 "" H 4650 5600 60 0001 C CNN
@@ -361,8 +361,8 @@ L GND-3 #U$?
U 1 1 5828F4F4
P 4650 6200
AR Path="/578AFF28/5828F4F4" Ref="#U$?" Part="1"
-AR Path="/578AFF30/5828F4F4" Ref="#U$?" Part="1"
-F 0 "#U$?" H 4530 6101 70 0001 L BNN
+AR Path="/578AFF30/5828F4F4" Ref="#U$2202" Part="1"
+F 0 "#U$2202" H 4530 6101 70 0001 L BNN
F 1 "GND3" H 4530 6101 70 0001 L BNN
F 2 "" H 4650 6200 60 0001 C CNN
F 3 "" H 4650 6200 60 0001 C CNN
diff --git a/hw/wlan.sch b/hw/wlan.sch
index a9fe6c9..f161392 100644
--- a/hw/wlan.sch
+++ b/hw/wlan.sch
@@ -44,7 +44,7 @@ EELAYER 25 0
EELAYER END
$Descr A3 16535 11693
encoding utf-8
-Sheet 9 31
+Sheet 9 25
Title "WLAN, Bluetooth, FM"
Date "Intentionally Left Blank"
Rev ""
@@ -166,10 +166,10 @@ F 3 "" H 2700 9150 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND #U$909
+L GND #U$809
U 1 1 578BFB5B
P 5950 9900
-F 0 "#U$909" H 5860 9800 70 0001 L BNN
+F 0 "#U$809" H 5860 9800 70 0001 L BNN
F 1 "GND" H 5860 9800 70 0001 L BNN
F 2 "" H 5950 9900 60 0001 C CNN
F 3 "" H 5950 9900 60 0001 C CNN
@@ -267,10 +267,10 @@ Text GLabel 6550 8150 0 60 Input ~ 0
FM_RX
NoConn ~ 8450 9150
$Comp
-L GND #U$914
+L GND #U$814
U 1 1 57E8AAF6
P 8550 10350
-F 0 "#U$914" H 8460 10250 70 0001 L BNN
+F 0 "#U$814" H 8460 10250 70 0001 L BNN
F 1 "GND" H 8460 10250 70 0001 L BNN
F 2 "" H 8550 10350 60 0001 C CNN
F 3 "" H 8550 10350 60 0001 C CNN
@@ -286,10 +286,10 @@ Wire Wire Line
Wire Wire Line
6450 9700 6450 9750
$Comp
-L GND #U$906
+L GND #U$806
U 1 1 57E8CB65
P 5150 9350
-F 0 "#U$906" H 5060 9250 70 0001 L BNN
+F 0 "#U$806" H 5060 9250 70 0001 L BNN
F 1 "GND" H 5060 9250 70 0001 L BNN
F 2 "" H 5150 9350 60 0001 C CNN
F 3 "" H 5150 9350 60 0001 C CNN
@@ -526,10 +526,10 @@ Wire Wire Line
14100 4300 14000 4300
Connection ~ 14000 4300
$Comp
-L GND #U$916
+L GND #U$816
U 1 1 57F06499
P 14000 4700
-F 0 "#U$916" H 13910 4600 70 0001 L BNN
+F 0 "#U$816" H 13910 4600 70 0001 L BNN
F 1 "GND" H 13910 4600 70 0001 L BNN
F 2 "" H 14000 4700 60 0001 C CNN
F 3 "" H 14000 4700 60 0001 C CNN
@@ -537,10 +537,10 @@ F 3 "" H 14000 4700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$917
+L GND #U$817
U 1 1 57F066C0
P 15000 5400
-F 0 "#U$917" H 14910 5300 70 0001 L BNN
+F 0 "#U$817" H 14910 5300 70 0001 L BNN
F 1 "GND" H 14910 5300 70 0001 L BNN
F 2 "" H 15000 5400 60 0001 C CNN
F 3 "" H 15000 5400 60 0001 C CNN
@@ -616,10 +616,10 @@ F 3 "" H 2850 3200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$903
+L GND #U$803
U 1 1 57F096F9
P 3250 3600
-F 0 "#U$903" H 3160 3500 70 0001 L BNN
+F 0 "#U$803" H 3160 3500 70 0001 L BNN
F 1 "GND" H 3160 3500 70 0001 L BNN
F 2 "" H 3250 3600 60 0001 C CNN
F 3 "" H 3250 3600 60 0001 C CNN
@@ -631,10 +631,10 @@ Wire Wire Line
Wire Wire Line
2850 2900 2850 3100
$Comp
-L GND #U$901
+L GND #U$801
U 1 1 57F09FF9
P 2500 3600
-F 0 "#U$901" H 2410 3500 70 0001 L BNN
+F 0 "#U$801" H 2410 3500 70 0001 L BNN
F 1 "GND" H 2410 3500 70 0001 L BNN
F 2 "" H 2500 3600 60 0001 C CNN
F 3 "" H 2500 3600 60 0001 C CNN
@@ -642,10 +642,10 @@ F 3 "" H 2500 3600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$902
+L GND #U$802
U 1 1 57F0A052
P 2850 3600
-F 0 "#U$902" H 2760 3500 70 0001 L BNN
+F 0 "#U$802" H 2760 3500 70 0001 L BNN
F 1 "GND" H 2760 3500 70 0001 L BNN
F 2 "" H 2850 3600 60 0001 C CNN
F 3 "" H 2850 3600 60 0001 C CNN
@@ -675,10 +675,10 @@ Wire Wire Line
Connection ~ 2400 2900
Connection ~ 2850 2900
$Comp
-L GND #U$915
+L GND #U$815
U 1 1 57F0DA62
P 10900 6400
-F 0 "#U$915" H 10810 6300 70 0001 L BNN
+F 0 "#U$815" H 10810 6300 70 0001 L BNN
F 1 "GND" H 10810 6300 70 0001 L BNN
F 2 "" H 10900 6400 60 0001 C CNN
F 3 "" H 10900 6400 60 0001 C CNN
@@ -807,10 +807,10 @@ Wire Wire Line
Wire Wire Line
2000 2500 2400 2500
$Comp
-L GND #U$910
+L GND #U$810
U 1 1 57F12BD0
P 6150 3100
-F 0 "#U$910" H 6060 3000 70 0001 L BNN
+F 0 "#U$810" H 6060 3000 70 0001 L BNN
F 1 "GND" H 6060 3000 70 0001 L BNN
F 2 "" H 6150 3100 60 0001 C CNN
F 3 "" H 6150 3100 60 0001 C CNN
@@ -829,10 +829,10 @@ Wire Wire Line
6800 2050 6800 1950
Connection ~ 6800 1950
$Comp
-L GND #U$911
+L GND #U$811
U 1 1 57F13141
P 6800 2650
-F 0 "#U$911" H 6710 2550 70 0001 L BNN
+F 0 "#U$811" H 6710 2550 70 0001 L BNN
F 1 "GND" H 6710 2550 70 0001 L BNN
F 2 "" H 6800 2650 60 0001 C CNN
F 3 "" H 6800 2650 60 0001 C CNN
@@ -840,10 +840,10 @@ F 3 "" H 6800 2650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$912
+L GND #U$812
U 1 1 57F131E2
P 7300 2650
-F 0 "#U$912" H 7210 2550 70 0001 L BNN
+F 0 "#U$812" H 7210 2550 70 0001 L BNN
F 1 "GND" H 7210 2550 70 0001 L BNN
F 2 "" H 7300 2650 60 0001 C CNN
F 3 "" H 7300 2650 60 0001 C CNN
@@ -863,10 +863,10 @@ Wire Wire Line
Wire Wire Line
4600 2900 5050 2900
$Comp
-L GND #U$904
+L GND #U$804
U 1 1 57F13B57
P 5050 2250
-F 0 "#U$904" H 4960 2150 70 0001 L BNN
+F 0 "#U$804" H 4960 2150 70 0001 L BNN
F 1 "GND" H 4960 2150 70 0001 L BNN
F 2 "" H 5050 2250 60 0001 C CNN
F 3 "" H 5050 2250 60 0001 C CNN
@@ -874,10 +874,10 @@ F 3 "" H 5050 2250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$907
+L GND #U$807
U 1 1 57F13BBC
P 5450 2250
-F 0 "#U$907" H 5360 2150 70 0001 L BNN
+F 0 "#U$807" H 5360 2150 70 0001 L BNN
F 1 "GND" H 5360 2150 70 0001 L BNN
F 2 "" H 5450 2250 60 0001 C CNN
F 3 "" H 5450 2250 60 0001 C CNN
@@ -885,10 +885,10 @@ F 3 "" H 5450 2250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$905
+L GND #U$805
U 1 1 57F13C21
P 5050 3200
-F 0 "#U$905" H 4960 3100 70 0001 L BNN
+F 0 "#U$805" H 4960 3100 70 0001 L BNN
F 1 "GND" H 4960 3100 70 0001 L BNN
F 2 "" H 5050 3200 60 0001 C CNN
F 3 "" H 5050 3200 60 0001 C CNN
@@ -896,10 +896,10 @@ F 3 "" H 5050 3200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$908
+L GND #U$808
U 1 1 57F13C86
P 5450 3200
-F 0 "#U$908" H 5360 3100 70 0001 L BNN
+F 0 "#U$808" H 5360 3100 70 0001 L BNN
F 1 "GND" H 5360 3100 70 0001 L BNN
F 2 "" H 5450 3200 60 0001 C CNN
F 3 "" H 5450 3200 60 0001 C CNN
@@ -990,10 +990,10 @@ F 3 "" H 7800 2250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$913
+L GND #U$813
U 1 1 57F1781B
P 7800 2650
-F 0 "#U$913" H 7710 2550 70 0001 L BNN
+F 0 "#U$813" H 7710 2550 70 0001 L BNN
F 1 "GND" H 7710 2550 70 0001 L BNN
F 2 "" H 7800 2650 60 0001 C CNN
F 3 "" H 7800 2650 60 0001 C CNN