hw: Re-start placement with M10478-A1 GPS module.

d9d978d8 · Matthieu Cattin · e30ab4ec · d9d978d8 · d9d978d8 · d9d978d8
Commit d9d978d8 authored Jun 10, 2014 by Matthieu Cattin
10 changed files
--- a/hw/freewatch_v1/freewatch_v1.cmp
+++ b/hw/freewatch_v1/freewatch_v1.cmp
-Cmp-Mod V01 Created by Cvpcb (2014-05-28 BZR 4896)-product   date = Sun 01 Jun 2014 04:25:04 PM CEST
-
-BeginCmp
-TimeStamp = /537A663F/53821E01;
-Reference = ANT1;
-ValeurCmp = W3011A;
-IdModule  = freewatch_footprints:ANTENNA_W3011A;
-EndCmp
+Cmp-Mod V01 Created by Cvpcb (2014-06-01 BZR 4909)-product   date = Tue 10 Jun 2014 11:01:30 PM CEST

 BeginCmp
 TimeStamp = /537A65FD/537BB217;
@@ -64,9 +57,9 @@ IdModule  = Capacitors_SMD:c_0603;
 EndCmp

 BeginCmp
-TimeStamp = /537A663F/537C4A70;
+TimeStamp = /537A65FD/539156F2;
 Reference = C9;
-ValeurCmp = 56pF;
+ValeurCmp = 1uF;
 IdModule  = Capacitors_SMD:c_0603;
 EndCmp

@@ -74,27 +67,27 @@ BeginCmp
 TimeStamp = /537A663F/537C472A;
 Reference = C10;
 ValeurCmp = NM;
-IdModule  = Capacitors_SMD:c_0603;
+IdModule  = Capacitors_SMD:c_0402;
 EndCmp

 BeginCmp
 TimeStamp = /537A663F/537C4796;
 Reference = C11;
 ValeurCmp = NM;
-IdModule  = Capacitors_SMD:c_0603;
+IdModule  = Capacitors_SMD:c_0402;
 EndCmp

 BeginCmp
 TimeStamp = /537A663F/53820BAE;
 Reference = C12;
-ValeurCmp = 100pF;
+ValeurCmp = 22pF;
 IdModule  = Capacitors_SMD:c_0603;
 EndCmp

 BeginCmp
 TimeStamp = /537A663F/53820B46;
 Reference = C13;
-ValeurCmp = 33nF;
+ValeurCmp = 22pF;
 IdModule  = Capacitors_SMD:c_0603;
 EndCmp

@@ -108,31 +101,24 @@ EndCmp
 BeginCmp
 TimeStamp = /537A663F/537C5505;
 Reference = C15;
-ValeurCmp = 10uF;
+ValeurCmp = 2.2uF;
 IdModule  = Capacitors_SMD:c_0603;
 EndCmp

 BeginCmp
 TimeStamp = /537A663F/537C5493;
 Reference = C16;
-ValeurCmp = 100nF;
+ValeurCmp = 22pF;
 IdModule  = Capacitors_SMD:c_0603;
 EndCmp

 BeginCmp
-TimeStamp = /537A663F/537C56B6;
+TimeStamp = /537A65FD/53915705;
 Reference = C17;
 ValeurCmp = 4.7uF;
 IdModule  = Capacitors_SMD:c_0603;
 EndCmp

-BeginCmp
-TimeStamp = /537A663F/537C56DE;
-Reference = C18;
-ValeurCmp = 100nF;
-IdModule  = Capacitors_SMD:c_0603;
-EndCmp
-
 BeginCmp
 TimeStamp = /537A663F/537CF6B1;
 Reference = C19;
@@ -315,20 +301,6 @@ ValeurCmp = 100nF;
 IdModule  = Capacitors_SMD:c_0603;
 EndCmp

-BeginCmp
-TimeStamp = /537A663F/537F02DF;
-Reference = D1;
-ValeurCmp = CDBU0130R;
-IdModule  = freewatch_footprints:d_0603;
-EndCmp
-
-BeginCmp
-TimeStamp = /537A663F/537F01F9;
-Reference = D2;
-ValeurCmp = CDBU0130R;
-IdModule  = freewatch_footprints:d_0603;
-EndCmp
-
 BeginCmp
 TimeStamp = /537A663F/538345B8;
 Reference = D3;
@@ -364,6 +336,13 @@ ValeurCmp = LED_STD;
 IdModule  = LEDs:LED-0603;
 EndCmp

+BeginCmp
+TimeStamp = /537A663F/5390F7CE;
+Reference = L1;
+ValeurCmp = IND;
+IdModule  = Capacitors_SMD:c_0402;
+EndCmp
+
 BeginCmp
 TimeStamp = /537A65FD/537A6938;
 Reference = P1;
@@ -392,6 +371,20 @@ ValeurCmp = CONN_6;
 IdModule  = freewatch_footprints:78171-5006;
 EndCmp

+BeginCmp
+TimeStamp = /537A663F/539134C1;
+Reference = Q1;
+ValeurCmp = BSS138;
+IdModule  = Transistors_SMD:sot23;
+EndCmp
+
+BeginCmp
+TimeStamp = /537A663F/53914EE0;
+Reference = Q2;
+ValeurCmp = BSS138;
+IdModule  = Transistors_SMD:sot23;
+EndCmp
+
 BeginCmp
 TimeStamp = /537A65FD/537C0F32;
 Reference = R1;
@@ -406,6 +399,13 @@ ValeurCmp = 100k;
 IdModule  = freewatch_footprints:r_0603;
 EndCmp

+BeginCmp
+TimeStamp = /537A663F/539168AA;
+Reference = R3;
+ValeurCmp = 10k;
+IdModule  = freewatch_footprints:r_0603;
+EndCmp
+
 BeginCmp
 TimeStamp = /537A65FD/537BB4BE;
 Reference = R4;
@@ -449,30 +449,30 @@ IdModule  = freewatch_footprints:r_0603;
 EndCmp

 BeginCmp
-TimeStamp = /537A663F/537C46E1;
+TimeStamp = /537A663F/539167ED;
 Reference = R10;
-ValeurCmp = 0;
+ValeurCmp = 10k;
 IdModule  = freewatch_footprints:r_0603;
 EndCmp

 BeginCmp
 TimeStamp = /537A663F/537C4AEB;
 Reference = R11;
-ValeurCmp = 100;
+ValeurCmp = 10k;
 IdModule  = freewatch_footprints:r_0603;
 EndCmp

 BeginCmp
 TimeStamp = /537A663F/537C4B8B;
 Reference = R12;
-ValeurCmp = 100;
+ValeurCmp = 10k;
 IdModule  = freewatch_footprints:r_0603;
 EndCmp

 BeginCmp
 TimeStamp = /537A663F/537EA484;
 Reference = R13;
-ValeurCmp = 470k;
+ValeurCmp = 10k;
 IdModule  = freewatch_footprints:r_0603;
 EndCmp

@@ -500,28 +500,28 @@ EndCmp
 BeginCmp
 TimeStamp = /537A662B/5383BD39;
 Reference = R17;
-ValeurCmp = 100k;
+ValeurCmp = 91R;
 IdModule  = freewatch_footprints:r_0603;
 EndCmp

 BeginCmp
 TimeStamp = /537A662B/5383BE91;
 Reference = R18;
-ValeurCmp = 100k;
+ValeurCmp = 91R;
 IdModule  = freewatch_footprints:r_0603;
 EndCmp

 BeginCmp
 TimeStamp = /537A662B/5383BECD;
 Reference = R19;
-ValeurCmp = 100k;
+ValeurCmp = 91R;
 IdModule  = freewatch_footprints:r_0603;
 EndCmp

 BeginCmp
 TimeStamp = /537A662B/5383BF0A;
 Reference = R20;
-ValeurCmp = 100k;
+ValeurCmp = 91R;
 IdModule  = freewatch_footprints:r_0603;
 EndCmp

@@ -529,14 +529,14 @@ BeginCmp
 TimeStamp = /537A662B/537D2D0A;
 Reference = R21;
 ValeurCmp = 15R;
-IdModule  = freewatch_footprints:r_0603;
+IdModule  = Capacitors_SMD:c_0402;
 EndCmp

 BeginCmp
 TimeStamp = /537A662B/537D2D6B;
 Reference = R22;
 ValeurCmp = 15R;
-IdModule  = freewatch_footprints:r_0603;
+IdModule  = Capacitors_SMD:c_0402;
 EndCmp

 BeginCmp
@@ -581,6 +581,20 @@ ValeurCmp = 10k;
 IdModule  = freewatch_footprints:r_0603;
 EndCmp

+BeginCmp
+TimeStamp = /537A663F/53914EDA;
+Reference = R29;
+ValeurCmp = 10k;
+IdModule  = freewatch_footprints:r_0603;
+EndCmp
+
+BeginCmp
+TimeStamp = /537A663F/53914ED3;
+Reference = R30;
+ValeurCmp = 10k;
+IdModule  = freewatch_footprints:r_0603;
+EndCmp
+
 BeginCmp
 TimeStamp = /537A662B/5383CD4E;
 Reference = SP1;
@@ -645,17 +659,17 @@ IdModule  = freewatch_footprints:TDFN-10;
 EndCmp

 BeginCmp
-TimeStamp = /537A663F/537C45EB;
+TimeStamp = /537A65FD/539156EB;
 Reference = U5;
-ValeurCmp = MAX2659;
+ValeurCmp = TPS780180300;
 IdModule  = freewatch_footprints:UDFN6;
 EndCmp

 BeginCmp
-TimeStamp = /537A663F/537A7ED7;
+TimeStamp = /537A663F/5390DC07;
 Reference = U6;
-ValeurCmp = L70;
-IdModule  = freewatch_footprints:GPS_L70;
+ValeurCmp = M10478-A1;
+IdModule  = freewatch_footprints:M10478-A1;
 EndCmp

 BeginCmp
@@ -672,13 +686,6 @@ ValeurCmp = ADP198;
 IdModule  = freewatch_footprints:LFCSP_8L;
 EndCmp

-BeginCmp
-TimeStamp = /537A663F/537E7255;
-Reference = U9;
-ValeurCmp = ADP198;
-IdModule  = freewatch_footprints:LFCSP_8L;
-EndCmp
-
 BeginCmp
 TimeStamp = /537A663F/537A7F7B;
 Reference = U10;

--- a/hw/freewatch_v1/freewatch_v1.kicad_pcb
+++ b/hw/freewatch_v1/freewatch_v1.kicad_pcb
--- a/hw/freewatch_v1/freewatch_v1.net
+++ b/hw/freewatch_v1/freewatch_v1.net
 (export (version D)
  (design
    (source /home/mcattin/Documents/freewatch/hw/freewatch_v1/freewatch_v1.sch)
-    (date "Mon 02 Jun 2014 08:30:36 PM CEST")
+    (date "Tue 10 Jun 2014 10:58:25 PM CEST")
    (tool "Eeschema (2014-06-01 BZR 4909)-product"))
  (components
    (comp (ref P1)
@@ -124,11 +124,21 @@
      (libsource (lib freewatch) (part RES))
      (sheetpath (names /USB_POWER/) (tstamps /537A65FD/))
      (tstamp 538775F2))
-    (comp (ref U6)
-      (value L70)
-      (libsource (lib freewatch) (part L70))
-      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
-      (tstamp 537A7ED7))
+    (comp (ref U5)
+      (value TPS780180300)
+      (libsource (lib freewatch) (part TPS780180300))
+      (sheetpath (names /USB_POWER/) (tstamps /537A65FD/))
+      (tstamp 539156EB))
+    (comp (ref C9)
+      (value 1uF)
+      (libsource (lib freewatch) (part CAP))
+      (sheetpath (names /USB_POWER/) (tstamps /537A65FD/))
+      (tstamp 539156F2))
+    (comp (ref C17)
+      (value 4.7uF)
+      (libsource (lib freewatch) (part CAP))
+      (sheetpath (names /USB_POWER/) (tstamps /537A65FD/))
+      (tstamp 53915705))
    (comp (ref U11)
      (value LSM303C)
      (libsource (lib freewatch) (part LSM303C))
@@ -139,16 +149,6 @@
      (libsource (lib freewatch) (part MAX44009))
      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
      (tstamp 537A7F7B))
-    (comp (ref U5)
-      (value MAX2659)
-      (libsource (lib freewatch) (part MAX2659))
-      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
-      (tstamp 537C45EB))
-    (comp (ref R10)
-      (value 0)
-      (libsource (lib freewatch) (part RES))
-      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
-      (tstamp 537C46E1))
    (comp (ref C10)
      (value NM)
      (libsource (lib freewatch) (part CAP))
@@ -159,41 +159,26 @@
      (libsource (lib freewatch) (part CAP))
      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
      (tstamp 537C4796))
-    (comp (ref C9)
-      (value 56pF)
-      (libsource (lib freewatch) (part CAP))
-      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
-      (tstamp 537C4A70))
    (comp (ref R11)
-      (value 100)
+      (value 10k)
      (libsource (lib freewatch) (part RES))
      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
      (tstamp 537C4AEB))
    (comp (ref R12)
-      (value 100)
+      (value 10k)
      (libsource (lib freewatch) (part RES))
      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
      (tstamp 537C4B8B))
    (comp (ref C16)
-      (value 100nF)
+      (value 22pF)
      (libsource (lib freewatch) (part CAP))
      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
      (tstamp 537C5493))
    (comp (ref C15)
-      (value 10uF)
+      (value 2.2uF)
      (libsource (lib freewatch) (part CAP))
      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
      (tstamp 537C5505))
-    (comp (ref C17)
-      (value 4.7uF)
-      (libsource (lib freewatch) (part CAP))
-      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
-      (tstamp 537C56B6))
-    (comp (ref C18)
-      (value 100nF)
-      (libsource (lib freewatch) (part CAP))
-      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
-      (tstamp 537C56DE))
    (comp (ref C19)
      (value 1uF)
      (libsource (lib freewatch) (part CAP))
@@ -224,13 +209,8 @@
      (libsource (lib freewatch) (part CAP))
      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
      (tstamp 537D27F3))
-    (comp (ref U9)
-      (value ADP198)
-      (libsource (lib freewatch) (part ADP198))
-      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
-      (tstamp 537E7255))
    (comp (ref R13)
-      (value 470k)
+      (value 10k)
      (libsource (lib freewatch) (part RES))
      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
      (tstamp 537EA484))
@@ -249,31 +229,16 @@
      (libsource (lib freewatch) (part MICRO_SDCARD_SPI))
      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
      (tstamp 537A7FBA))
-    (comp (ref D2)
-      (value CDBU0130R)
-      (libsource (lib freewatch) (part DIODE_SKY))
-      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
-      (tstamp 537F01F9))
-    (comp (ref D1)
-      (value CDBU0130R)
-      (libsource (lib freewatch) (part DIODE_SKY))
-      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
-      (tstamp 537F02DF))
    (comp (ref C13)
-      (value 33nF)
+      (value 22pF)
      (libsource (lib freewatch) (part CAP))
      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
      (tstamp 53820B46))
    (comp (ref C12)
-      (value 100pF)
+      (value 22pF)
      (libsource (lib freewatch) (part CAP))
      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
      (tstamp 53820BAE))
-    (comp (ref ANT1)
-      (value W3011A)
-      (libsource (lib freewatch) (part W3011A))
-      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
-      (tstamp 53821E01))
    (comp (ref C27)
      (value 100nF)
      (libsource (lib freewatch) (part CAP))
@@ -299,6 +264,46 @@
      (libsource (lib freewatch) (part MS5806-02BA))
      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
      (tstamp 538A4740))
+    (comp (ref U6)
+      (value M10478-A1)
+      (libsource (lib freewatch) (part M10478-A1))
+      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
+      (tstamp 5390DC07))
+    (comp (ref L1)
+      (value IND)
+      (libsource (lib freewatch) (part IND))
+      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
+      (tstamp 5390F7CE))
+    (comp (ref Q1)
+      (value BSS138)
+      (libsource (lib freewatch) (part GEN_MOSFET_N))
+      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
+      (tstamp 539134C1))
+    (comp (ref R30)
+      (value 10k)
+      (libsource (lib freewatch) (part RES))
+      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
+      (tstamp 53914ED3))
+    (comp (ref R29)
+      (value 10k)
+      (libsource (lib freewatch) (part RES))
+      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
+      (tstamp 53914EDA))
+    (comp (ref Q2)
+      (value BSS138)
+      (libsource (lib freewatch) (part GEN_MOSFET_N))
+      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
+      (tstamp 53914EE0))
+    (comp (ref R10)
+      (value 10k)
+      (libsource (lib freewatch) (part RES))
+      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
+      (tstamp 539167ED))
+    (comp (ref R3)
+      (value 10k)
+      (libsource (lib freewatch) (part RES))
+      (sheetpath (names /PERIPHERALS_SENSORS/) (tstamps /537A663F/))
+      (tstamp 539168AA))
    (comp (ref U15)
      (value EFM32GG330)
      (libsource (lib freewatch) (part EFM32GG330))
@@ -480,22 +485,22 @@
      (sheetpath (names /MCU_DISPLAY/) (tstamps /537A662B/))
      (tstamp 53830126))
    (comp (ref R17)
-      (value 100k)
+      (value 91R)
      (libsource (lib freewatch) (part RES))
      (sheetpath (names /MCU_DISPLAY/) (tstamps /537A662B/))
      (tstamp 5383BD39))
    (comp (ref R18)
-      (value 100k)
+      (value 91R)
      (libsource (lib freewatch) (part RES))
      (sheetpath (names /MCU_DISPLAY/) (tstamps /537A662B/))
      (tstamp 5383BE91))
    (comp (ref R19)
-      (value 100k)
+      (value 91R)
      (libsource (lib freewatch) (part RES))
      (sheetpath (names /MCU_DISPLAY/) (tstamps /537A662B/))
      (tstamp 5383BECD))
    (comp (ref R20)
-      (value 100k)
+      (value 91R)
      (libsource (lib freewatch) (part RES))
      (sheetpath (names /MCU_DISPLAY/) (tstamps /537A662B/))
      (tstamp 5383BF0A))
@@ -671,30 +676,14 @@
        (pin (num 62) (name PE14) (type BiDi))
        (pin (num 63) (name PE15) (type BiDi))
        (pin (num 64) (name PA15) (type BiDi))))
-    (libpart (lib freewatch) (part L70)
-      (description "GPS module")
+    (libpart (lib freewatch) (part IND)
+      (description Inductor)
      (fields
-        (field (name Reference) U)
-        (field (name Value) L70))
+        (field (name Reference) L)
+        (field (name Value) IND))
      (pins
-        (pin (num 1) (name GND) (type power_in))
-        (pin (num 2) (name TXD1) (type output))
-        (pin (num 3) (name RXD1) (type input))
-        (pin (num 4) (name 1PPS) (type output))
-        (pin (num 5) (name STANDBY) (type input))
-        (pin (num 6) (name V_BCKP) (type power_in))
-        (pin (num 7) (name NC) (type NotConnected))
-        (pin (num 8) (name VCC) (type power_in))
-        (pin (num 9) (name RESET) (type input))
-        (pin (num 10) (name GND) (type power_in))
-        (pin (num 11) (name RF_IN) (type input))
-        (pin (num 12) (name GND) (type power_in))
-        (pin (num 13) (name ANTON) (type output))
-        (pin (num 14) (name VCC_RF) (type power_out))
-        (pin (num 15) (name NC) (type NotConnected))
-        (pin (num 16) (name RESERVED) (type NotConnected))
-        (pin (num 17) (name RESERVED) (type NotConnected))
-        (pin (num 18) (name TIMER) (type output))))
+        (pin (num 1) (name ~) (type passive))
+        (pin (num 2) (name ~) (type passive))))
    (libpart (lib freewatch) (part LED_STD)
      (description "Simple LED")
      (fields
@@ -737,6 +726,40 @@
        (pin (num 10) (name VDD_IO) (type power_in))
        (pin (num 11) (name DRDY_MAG) (type output))
        (pin (num 12) (name INT_XL) (type output))))
+    (libpart (lib freewatch) (part M10478-A1)
+      (description "GPS RF Antenna Module")
+      (fields
+        (field (name Reference) U)
+        (field (name Value) M10478-A1))
+      (pins
+        (pin (num 1) (name GND) (type power_in))
+        (pin (num 2) (name GND) (type power_in))
+        (pin (num 3) (name GND) (type power_in))
+        (pin (num 4) (name ANT_OUT) (type output))
+        (pin (num 5) (name GND) (type power_in))
+        (pin (num 6) (name ANT_IN) (type input))
+        (pin (num 7) (name GND) (type power_in))
+        (pin (num 8) (name VCC) (type power_in))
+        (pin (num 9) (name GND) (type power_in))
+        (pin (num 10) (name EXT_RST) (type input))
+        (pin (num 11) (name TM) (type output))
+        (pin (num 12) (name EIT) (type BiDi))
+        (pin (num 13) (name DR_I2C_DIO) (type BiDi))
+        (pin (num 14) (name DR_I2C_CLK) (type BiDi))
+        (pin (num 15) (name GND) (type power_in))
+        (pin (num 16) (name ECLK) (type BiDi))
+        (pin (num 17) (name TSYNC) (type BiDi))
+        (pin (num 18) (name WAKUP) (type output))
+        (pin (num 19) (name GND) (type power_in))
+        (pin (num 20) (name TX) (type output))
+        (pin (num 21) (name RX) (type input))
+        (pin (num 22) (name CS_RTS) (type output))
+        (pin (num 23) (name CLK_CTS) (type input))
+        (pin (num 24) (name GND) (type power_in))
+        (pin (num 25) (name GND) (type power_in))
+        (pin (num 26) (name ON_OFF) (type input))
+        (pin (num 27) (name GND) (type power_in))
+        (pin (num 28) (name GND) (type power_in))))
    (libpart (lib freewatch) (part MAX17047)
      (description "ModelGauge m3 Fuel Gauge")
      (fields
@@ -754,18 +777,6 @@
        (pin (num 9) (name THRM) (type output))
        (pin (num 10) (name VBATT) (type power_in))
        (pin (num 11) (name EP) (type input))))
-    (libpart (lib freewatch) (part MAX2659)
-      (description "GPS/GNSS Low-Noise Amplifier")
-      (fields
-        (field (name Reference) U)
-        (field (name Value) MAX2659))
-      (pins
-        (pin (num 1) (name GND) (type power_in))
-        (pin (num 2) (name GND) (type power_in))
-        (pin (num 3) (name RFIN) (type input))
-        (pin (num 4) (name VCC) (type power_in))
-        (pin (num 5) (name SHDN) (type input))
-        (pin (num 6) (name RFOUT) (type output))))
    (libpart (lib freewatch) (part MAX44009)
      (description "Ambient light sensor")
      (fields
@@ -792,7 +803,8 @@
        (pin (num 5) (name CLK) (type input))
        (pin (num 6) (name VSS) (type power_in))
        (pin (num 7) (name DO) (type output))
-        (pin (num 8) (name RSV) (type NotConnected))))
+        (pin (num 8) (name RSV) (type NotConnected))
+        (pin (num 9) (name CASE) (type unspc))))
    (libpart (lib freewatch) (part MS5806-02BA)
      (description "Precision altimeter & thermometer")
      (fields
@@ -851,15 +863,6 @@
        (pin (num 7) (name SHIELD) (type BiDi))
        (pin (num 8) (name SHIELD) (type BiDi))
        (pin (num 9) (name SHIELD) (type BiDi))))
-    (libpart (lib freewatch) (part W3011A)
-      (description "1.575 GHz GPS Ceramic Chip Antenna")
-      (fields
-        (field (name Reference) ANT)
-        (field (name Value) W3011A))
-      (pins
-        (pin (num 1) (name RF) (type input))
-        (pin (num 2) (name GND) (type input))
-        (pin (num 3) (name GND) (type input))))
    (libpart (lib freewatch) (part bq24072)
      (description "1.5A USB-FRIENDLY Li-Ion BATTERY CHARGER AND POWER-PATH MANAGEMENT IC")
      (fields
@@ -882,499 +885,516 @@
        (pin (num 14) (name TMR) (type input))
        (pin (num 15) (name TD) (type input))
        (pin (num 16) (name ISET) (type BiDi))
-        (pin (num 17) (name EP) (type power_in)))))
+        (pin (num 17) (name EP) (type power_in))))
+    (libpart (lib freewatch) (part GEN_MOSFET_N)
+      (description "Generic MOSFET channel N")
+      (docs transistors/mos/*.*)
+      (fields
+        (field (name Reference) Q)
+        (field (name Value) GEN_MOSFET_N))
+      (pins
+        (pin (num 1) (name G) (type input))
+        (pin (num 2) (name S) (type passive))
+        (pin (num 3) (name D) (type passive)))))
  (libraries
    (library (logical device)
      (uri /usr/local/share/kicad/library/device.lib))
-    (library (logical conn)
-      (uri /usr/local/share/kicad/library/conn.lib))
    (library (logical freewatch)
-      (uri /home/mcattin/Documents/freewatch/hw/kicad-sch-lib/freewatch.lib)))
+      (uri /home/mcattin/Documents/freewatch/hw/kicad-sch-lib/freewatch.lib))
+    (library (logical conn)
+      (uri /usr/local/share/kicad/library/conn.lib)))
  (nets
-    (net (code 1) (name VCC)
-      (node (ref R7) (pin 2))
-      (node (ref R26) (pin 1))
-      (node (ref U15) (pin 39))
-      (node (ref U15) (pin 8))
-      (node (ref U12) (pin 3))
-      (node (ref R23) (pin 1))
-      (node (ref C18) (pin 1))
-      (node (ref U10) (pin 1))
-      (node (ref C34) (pin 1))
-      (node (ref C37) (pin 1))
-      (node (ref U13) (pin 8))
-      (node (ref U13) (pin 7))
-      (node (ref U13) (pin 5))
-      (node (ref C4) (pin 1))
-      (node (ref U6) (pin 6))
-      (node (ref R24) (pin 1))
-      (node (ref U11) (pin 9))
-      (node (ref C17) (pin 1))
-      (node (ref C19) (pin 1))
-      (node (ref C25) (pin 1))
-      (node (ref U3) (pin 1))
-      (node (ref U15) (pin 26))
-      (node (ref U15) (pin 27))
-      (node (ref U11) (pin 10))
-      (node (ref U15) (pin 55))
-      (node (ref R1) (pin 2))
-      (node (ref R2) (pin 2))
-      (node (ref C40) (pin 1))
-      (node (ref U15) (pin 23))
-      (node (ref C39) (pin 1))
-      (node (ref C38) (pin 1))
-      (node (ref U8) (pin 8))
-      (node (ref U8) (pin 7))
-      (node (ref U8) (pin 5))
-      (node (ref C20) (pin 1))
-      (node (ref C22) (pin 1))
-      (node (ref C42) (pin 1))
-      (node (ref C21) (pin 1))
-      (node (ref C41) (pin 1))
-      (node (ref R15) (pin 1))
-      (node (ref R16) (pin 1))
-      (node (ref R13) (pin 2))
-      (node (ref P7) (pin 1))
-      (node (ref U9) (pin 8))
-      (node (ref U9) (pin 7))
-      (node (ref U9) (pin 5))
-      (node (ref R25) (pin 1)))
-    (net (code 2) (name "Net-(C7-Pad1)")
-      (node (ref R8) (pin 1))
-      (node (ref C7) (pin 1))
-      (node (ref U4) (pin 2))
-      (node (ref R28) (pin 2)))
+    (net (code 1) (name BC_CHG_N)
+      (node (ref U2) (pin 9))
+      (node (ref R2) (pin 1))
+      (node (ref U15) (pin 56)))
+    (net (code 2) (name BC_PGOOD_N)
+      (node (ref U2) (pin 7))
+      (node (ref R1) (pin 1))
+      (node (ref U15) (pin 57)))
    (net (code 3) (name FG_ALRT_N)
+      (node (ref U4) (pin 8))
      (node (ref U15) (pin 3))
-      (node (ref R7) (pin 1))
-      (node (ref U4) (pin 8)))
+      (node (ref R7) (pin 1)))
    (net (code 4) (name SCL)
+      (node (ref U15) (pin 2))
+      (node (ref R16) (pin 2))
      (node (ref U10) (pin 5))
      (node (ref U4) (pin 3))
-      (node (ref U15) (pin 2))
-      (node (ref U12) (pin 5))
-      (node (ref R16) (pin 2)))
+      (node (ref U12) (pin 5)))
    (net (code 5) (name SDA)
+      (node (ref R15) (pin 2))
+      (node (ref U4) (pin 4))
      (node (ref U10) (pin 6))
      (node (ref U15) (pin 1))
-      (node (ref U4) (pin 4))
-      (node (ref U12) (pin 1))
-      (node (ref R15) (pin 2)))
+      (node (ref U12) (pin 1)))
    (net (code 6) (name "Net-(C8-Pad1)")
      (node (ref C8) (pin 1))
      (node (ref U4) (pin 7)))
-    (net (code 7) (name USB_ID)
-      (node (ref P1) (pin 4))
-      (node (ref U15) (pin 53)))
-    (net (code 8) (name "Net-(R8-Pad2)")
+    (net (code 7) (name "Net-(C7-Pad1)")
+      (node (ref U4) (pin 2))
+      (node (ref R8) (pin 1))
+      (node (ref R28) (pin 2))
+      (node (ref C7) (pin 1)))
+    (net (code 8) (name "Net-(R27-Pad2)")
+      (node (ref U2) (pin 1))
+      (node (ref R27) (pin 2)))
+    (net (code 9) (name "Net-(R8-Pad2)")
      (node (ref R8) (pin 2))
      (node (ref U4) (pin 9)))
-    (net (code 9) (name "Net-(R4-Pad2)")
-      (node (ref R4) (pin 2))
-      (node (ref U2) (pin 16)))
-    (net (code 10) (name "Net-(R5-Pad2)")
+    (net (code 10) (name "Net-(R4-Pad2)")
+      (node (ref U2) (pin 16))
+      (node (ref R4) (pin 2)))
+    (net (code 11) (name "Net-(R5-Pad2)")
      (node (ref U2) (pin 12))
      (node (ref R5) (pin 2)))
-    (net (code 11) (name "Net-(R6-Pad2)")
-      (node (ref U2) (pin 14))
-      (node (ref R6) (pin 2)))
-    (net (code 12) (name GND)
-      (node (ref C39) (pin 2))
-      (node (ref U15) (pin 0))
+    (net (code 12) (name USB_ID)
+      (node (ref U15) (pin 53))
+      (node (ref P1) (pin 4)))
+    (net (code 13) (name +1.8V)
+      (node (ref Q1) (pin 1))
+      (node (ref R13) (pin 2))
+      (node (ref U5) (pin 1))
+      (node (ref R11) (pin 2))
+      (node (ref C17) (pin 1))
+      (node (ref C16) (pin 1))
+      (node (ref Q2) (pin 1))
+      (node (ref R3) (pin 2))
+      (node (ref R29) (pin 2))
+      (node (ref C15) (pin 1))
+      (node (ref U6) (pin 8)))
+    (net (code 14) (name VCC)
+      (node (ref U3) (pin 1))
+      (node (ref C42) (pin 1))
+      (node (ref C41) (pin 1))
+      (node (ref C21) (pin 1))
+      (node (ref C4) (pin 1))
+      (node (ref R7) (pin 2))
+      (node (ref C20) (pin 1))
+      (node (ref C19) (pin 1))
+      (node (ref C25) (pin 1))
+      (node (ref R2) (pin 2))
+      (node (ref C22) (pin 1))
+      (node (ref R1) (pin 2))
+      (node (ref R16) (pin 1))
+      (node (ref C40) (pin 1))
+      (node (ref C39) (pin 1))
+      (node (ref C38) (pin 1))
+      (node (ref U12) (pin 3))
+      (node (ref R26) (pin 1))
+      (node (ref R23) (pin 1))
+      (node (ref U15) (pin 39))
+      (node (ref C9) (pin 1))
+      (node (ref U5) (pin 6))
+      (node (ref U5) (pin 4))
+      (node (ref U8) (pin 8))
+      (node (ref U15) (pin 23))
+      (node (ref C37) (pin 1))
+      (node (ref C34) (pin 1))
+      (node (ref R25) (pin 1))
+      (node (ref U15) (pin 8))
+      (node (ref U13) (pin 5))
+      (node (ref R24) (pin 1))
+      (node (ref P7) (pin 1))
+      (node (ref U8) (pin 5))
+      (node (ref R30) (pin 2))
+      (node (ref U8) (pin 7))
+      (node (ref R12) (pin 2))
+      (node (ref U13) (pin 7))
+      (node (ref U13) (pin 8))
+      (node (ref U10) (pin 1))
+      (node (ref R15) (pin 1))
+      (node (ref U11) (pin 9))
+      (node (ref U11) (pin 10))
+      (node (ref U5) (pin 3))
+      (node (ref U15) (pin 27))
+      (node (ref U15) (pin 26))
+      (node (ref U15) (pin 55)))
+    (net (code 15) (name GND)
+      (node (ref SW3) (pin 1))
+      (node (ref C28) (pin 2))
      (node (ref C36) (pin 2))
-      (node (ref C30) (pin 2))
+      (node (ref C35) (pin 2))
      (node (ref C42) (pin 2))
-      (node (ref C41) (pin 2))
-      (node (ref C40) (pin 2))
+      (node (ref U6) (pin 19))
+      (node (ref C33) (pin 2))
      (node (ref C38) (pin 2))
-      (node (ref SW3) (pin 1))
-      (node (ref C45) (pin 2))
+      (node (ref C39) (pin 2))
+      (node (ref C40) (pin 2))
+      (node (ref C41) (pin 2))
+      (node (ref C30) (pin 2))
+      (node (ref SP1) (pin 2))
+      (node (ref C14) (pin 2))
+      (node (ref U8) (pin 3))
      (node (ref SW2) (pin 1))
+      (node (ref U8) (pin 0))
      (node (ref C44) (pin 2))
+      (node (ref C15) (pin 2))
+      (node (ref C16) (pin 2))
+      (node (ref C11) (pin 2))
+      (node (ref C10) (pin 2))
+      (node (ref U8) (pin 4))
+      (node (ref U15) (pin 0))
+      (node (ref U7) (pin 9))
+      (node (ref U7) (pin 6))
+      (node (ref U11) (pin 6))
+      (node (ref SW1) (pin 1))
      (node (ref C43) (pin 2))
+      (node (ref C22) (pin 2))
+      (node (ref C25) (pin 2))
+      (node (ref C19) (pin 2))
+      (node (ref C45) (pin 2))
+      (node (ref C20) (pin 2))
      (node (ref SW4) (pin 1))
+      (node (ref C23) (pin 2))
+      (node (ref C21) (pin 2))
      (node (ref C46) (pin 2))
+      (node (ref U10) (pin 3))
+      (node (ref U10) (pin 2))
+      (node (ref U10) (pin 0))
+      (node (ref U11) (pin 8))
      (node (ref D4) (pin 2))
-      (node (ref SW1) (pin 1))
      (node (ref D5) (pin 2))
      (node (ref D6) (pin 2))
      (node (ref D7) (pin 2))
-      (node (ref SP1) (pin 2))
+      (node (ref P1) (pin 7))
+      (node (ref U2) (pin 6))
+      (node (ref U2) (pin 8))
      (node (ref U12) (pin 2))
-      (node (ref D3) (pin 1))
-      (node (ref C12) (pin 2))
-      (node (ref U12) (pin 4))
-      (node (ref U13) (pin 3))
-      (node (ref U13) (pin 4))
-      (node (ref ANT1) (pin 2))
-      (node (ref ANT1) (pin 3))
-      (node (ref C27) (pin 2))
-      (node (ref P6) (pin 2))
-      (node (ref U13) (pin 0))
-      (node (ref U7) (pin 6))
-      (node (ref C13) (pin 2))
-      (node (ref C14) (pin 2))
-      (node (ref U8) (pin 0))
-      (node (ref U8) (pin 3))
-      (node (ref U8) (pin 4))
-      (node (ref U9) (pin 0))
-      (node (ref U9) (pin 3))
-      (node (ref U9) (pin 4))
-      (node (ref C23) (pin 2))
-      (node (ref C22) (pin 2))
-      (node (ref C21) (pin 2))
-      (node (ref C20) (pin 2))
-      (node (ref C25) (pin 2))
-      (node (ref C18) (pin 2))
-      (node (ref C16) (pin 2))
-      (node (ref C19) (pin 2))
-      (node (ref U6) (pin 1))
-      (node (ref C10) (pin 2))
-      (node (ref C11) (pin 2))
-      (node (ref U10) (pin 0))
-      (node (ref U10) (pin 2))
-      (node (ref U10) (pin 3))
-      (node (ref U5) (pin 1))
-      (node (ref U6) (pin 10))
-      (node (ref U6) (pin 12))
-      (node (ref U5) (pin 2))
-      (node (ref U11) (pin 6))
-      (node (ref U11) (pin 8))
-      (node (ref C15) (pin 2))
-      (node (ref C17) (pin 2))
-      (node (ref C5) (pin 2))
-      (node (ref C29) (pin 2))
-      (node (ref P7) (pin 6))
-      (node (ref R4) (pin 1))
+      (node (ref U2) (pin 15))
+      (node (ref U2) (pin 17))
      (node (ref U4) (pin 5))
-      (node (ref U14) (pin 10))
-      (node (ref P1) (pin 8))
-      (node (ref P1) (pin 7))
-      (node (ref P1) (pin 6))
      (node (ref P1) (pin 5))
-      (node (ref C32) (pin 1))
-      (node (ref U2) (pin 17))
-      (node (ref U2) (pin 15))
-      (node (ref R6) (pin 1))
-      (node (ref U2) (pin 8))
-      (node (ref U2) (pin 6))
-      (node (ref U2) (pin 4))
-      (node (ref C31) (pin 1))
-      (node (ref U1) (pin 1))
-      (node (ref C2) (pin 2))
-      (node (ref C1) (pin 2))
-      (node (ref C3) (pin 2))
-      (node (ref R9) (pin 2))
+      (node (ref P1) (pin 6))
+      (node (ref P1) (pin 8))
      (node (ref P1) (pin 9))
-      (node (ref U3) (pin 7))
-      (node (ref U3) (pin 5))
+      (node (ref C13) (pin 2))
      (node (ref U3) (pin 3))
+      (node (ref U3) (pin 5))
+      (node (ref U3) (pin 7))
+      (node (ref U2) (pin 4))
      (node (ref U3) (pin 2))
-      (node (ref U14) (pin 9))
-      (node (ref C28) (pin 2))
-      (node (ref C35) (pin 2))
-      (node (ref R27) (pin 1))
-      (node (ref C34) (pin 2))
+      (node (ref R9) (pin 2))
+      (node (ref C1) (pin 2))
+      (node (ref C2) (pin 2))
      (node (ref R5) (pin 1))
+      (node (ref R4) (pin 1))
      (node (ref C4) (pin 2))
+      (node (ref C5) (pin 2))
+      (node (ref U5) (pin 5))
+      (node (ref U5) (pin 7))
+      (node (ref C9) (pin 2))
+      (node (ref C17) (pin 2))
+      (node (ref R6) (pin 1))
+      (node (ref R27) (pin 1))
+      (node (ref C3) (pin 2))
+      (node (ref C34) (pin 2))
      (node (ref C37) (pin 2))
-      (node (ref C33) (pin 2)))
-    (net (code 13) (name "Net-(R27-Pad2)")
-      (node (ref R27) (pin 2))
-      (node (ref U2) (pin 1)))
-    (net (code 14) (name "Net-(C6-Pad2)")
-      (node (ref C7) (pin 2))
-      (node (ref C8) (pin 2))
-      (node (ref R28) (pin 1))
-      (node (ref U4) (pin 11))
-      (node (ref U4) (pin 6))
-      (node (ref C6) (pin 2))
-      (node (ref R9) (pin 1))
-      (node (ref P3) (pin 2)))
-    (net (code 15) (name BC_PGOOD_N)
-      (node (ref R1) (pin 1))
-      (node (ref U15) (pin 57))
-      (node (ref U2) (pin 7)))
-    (net (code 16) (name BC_CHG_N)
-      (node (ref R2) (pin 1))
-      (node (ref U2) (pin 9))
-      (node (ref U15) (pin 56)))
-    (net (code 17) (name +BATT)
-      (node (ref U4) (pin 10))
-      (node (ref C5) (pin 1))
+      (node (ref C12) (pin 2))
+      (node (ref R10) (pin 1))
+      (node (ref C29) (pin 2))
+      (node (ref U6) (pin 28))
+      (node (ref U13) (pin 3))
+      (node (ref U13) (pin 4))
+      (node (ref U14) (pin 10))
+      (node (ref U14) (pin 9))
+      (node (ref U6) (pin 7))
+      (node (ref U13) (pin 0))
+      (node (ref P7) (pin 6))
+      (node (ref U6) (pin 1))
+      (node (ref U6) (pin 2))
+      (node (ref U6) (pin 3))
+      (node (ref U6) (pin 5))
+      (node (ref C27) (pin 2))
+      (node (ref U6) (pin 9))
+      (node (ref U6) (pin 24))
+      (node (ref U6) (pin 15))
+      (node (ref U6) (pin 25))
+      (node (ref U6) (pin 27))
+      (node (ref U12) (pin 4))
+      (node (ref D3) (pin 1))
+      (node (ref U1) (pin 1))
+      (node (ref C32) (pin 1))
+      (node (ref C31) (pin 1))
+      (node (ref P6) (pin 2)))
+    (net (code 16) (name +BATT)
      (node (ref C6) (pin 1))
-      (node (ref P3) (pin 1))
+      (node (ref C5) (pin 1))
+      (node (ref U4) (pin 10))
+      (node (ref U2) (pin 3))
      (node (ref U2) (pin 2))
      (node (ref U4) (pin 1))
-      (node (ref U2) (pin 3)))
-    (net (code 18) (name USB_DM)
+      (node (ref P3) (pin 1)))
+    (net (code 17) (name "Net-(U5-Pad2)")
+      (node (ref U5) (pin 2)))
+    (net (code 18) (name "Net-(C6-Pad2)")
+      (node (ref C8) (pin 2))
+      (node (ref C6) (pin 2))
+      (node (ref R28) (pin 1))
+      (node (ref R9) (pin 1))
+      (node (ref P3) (pin 2))
+      (node (ref C7) (pin 2))
+      (node (ref U4) (pin 11))
+      (node (ref U4) (pin 6)))
+    (net (code 19) (name USB_DP)
+      (node (ref P1) (pin 3))
+      (node (ref R22) (pin 1))
+      (node (ref U1) (pin 2)))
+    (net (code 20) (name USB_DM)
      (node (ref P1) (pin 2))
      (node (ref R14) (pin 1))
      (node (ref U1) (pin 3))
      (node (ref R21) (pin 1)))
-    (net (code 19) (name USB_DP)
-      (node (ref R22) (pin 1))
-      (node (ref U1) (pin 2))
-      (node (ref P1) (pin 3)))
-    (net (code 20) (name +5V)
-      (node (ref U1) (pin 4))
-      (node (ref P1) (pin 1))
-      (node (ref U15) (pin 52))
+    (net (code 21) (name "Net-(R6-Pad2)")
+      (node (ref R6) (pin 2))
+      (node (ref U2) (pin 14)))
+    (net (code 22) (name +5V)
      (node (ref U2) (pin 13))
-      (node (ref C35) (pin 1))
+      (node (ref U15) (pin 52))
+      (node (ref P1) (pin 1))
      (node (ref C1) (pin 1))
-      (node (ref U15) (pin 45)))
-    (net (code 21) (name "Net-(C2-Pad1)")
-      (node (ref U3) (pin 6))
+      (node (ref U1) (pin 4))
+      (node (ref U15) (pin 45))
+      (node (ref C35) (pin 1)))
+    (net (code 23) (name "Net-(C2-Pad1)")
+      (node (ref U2) (pin 10))
+      (node (ref U2) (pin 11))
      (node (ref U2) (pin 5))
-      (node (ref C3) (pin 1))
      (node (ref U3) (pin 4))
+      (node (ref U3) (pin 6))
      (node (ref C2) (pin 1))
-      (node (ref U2) (pin 10))
-      (node (ref U2) (pin 11)))
-    (net (code 22) (name /MCU_DISPLAY/LCD_CLK)
-      (node (ref U15) (pin 60))
-      (node (ref U14) (pin 1)))
-    (net (code 23) (name /MCU_DISPLAY/SWDIO)
+      (node (ref C3) (pin 1)))
+    (net (code 24) (name /MCU_DISPLAY/SWDIO)
      (node (ref U15) (pin 50))
      (node (ref P7) (pin 2)))
-    (net (code 24) (name /MCU_DISPLAY/SWDO)
-      (node (ref U15) (pin 51))
-      (node (ref P7) (pin 4)))
-    (net (code 25) (name /MCU_DISPLAY/LCD_INV)
+    (net (code 25) (name /MCU_DISPLAY/SWDO)
+      (node (ref P7) (pin 4))
+      (node (ref U15) (pin 51)))
+    (net (code 26) (name /MCU_DISPLAY/LCD_CLK)
+      (node (ref U15) (pin 60))
+      (node (ref U14) (pin 1)))
+    (net (code 27) (name /MCU_DISPLAY/LCD_INV)
      (node (ref U15) (pin 62))
      (node (ref U14) (pin 4)))
-    (net (code 26) (name /MCU_DISPLAY/LCD_CS)
-      (node (ref U14) (pin 3))
-      (node (ref U15) (pin 61)))
-    (net (code 27) (name /MCU_DISPLAY/LCD_EN)
+    (net (code 28) (name /MCU_DISPLAY/LCD_CS)
+      (node (ref U15) (pin 61))
+      (node (ref U14) (pin 3)))
+    (net (code 29) (name /MCU_DISPLAY/LCD_EN)
+      (node (ref U15) (pin 10))
      (node (ref C30) (pin 1))
-      (node (ref U14) (pin 5))
-      (node (ref U15) (pin 10)))
-    (net (code 28) (name /MCU_DISPLAY/USB_DMPU)
+      (node (ref U14) (pin 5)))
+    (net (code 30) (name /MCU_DISPLAY/USB_DMPU)
      (node (ref R14) (pin 2)))
-    (net (code 29) (name /MCU_DISPLAY/MCU_RST_N)
-      (node (ref U15) (pin 20))
-      (node (ref P7) (pin 5)))
-    (net (code 30) (name SD_EN)
-      (node (ref U15) (pin 25))
-      (node (ref U8) (pin 6)))
-    (net (code 31) (name "Net-(C32-Pad2)")
-      (node (ref X1) (pin 2))
+    (net (code 31) (name /MCU_DISPLAY/MCU_RST_N)
+      (node (ref P7) (pin 5))
+      (node (ref U15) (pin 20)))
+    (net (code 32) (name SD_EN)
+      (node (ref U8) (pin 6))
+      (node (ref U15) (pin 25)))
+    (net (code 33) (name "Net-(C31-Pad2)")
+      (node (ref U15) (pin 15))
+      (node (ref X1) (pin 1))
+      (node (ref C31) (pin 2)))
+    (net (code 34) (name "Net-(C32-Pad2)")
      (node (ref U15) (pin 16))
+      (node (ref X1) (pin 2))
      (node (ref C32) (pin 2)))
-    (net (code 32) (name "Net-(X1-Pad3)")
+    (net (code 35) (name "Net-(X1-Pad3)")
      (node (ref X1) (pin 3)))
-    (net (code 33) (name "Net-(C33-Pad1)")
-      (node (ref C33) (pin 1))
-      (node (ref U15) (pin 40)))
-    (net (code 34) (name /MCU_DISPLAY/LCD_VCC)
-      (node (ref C29) (pin 1))
+    (net (code 36) (name "Net-(C33-Pad1)")
+      (node (ref U15) (pin 40))
+      (node (ref C33) (pin 1)))
+    (net (code 37) (name /MCU_DISPLAY/SW_TL)
+      (node (ref R23) (pin 2))
+      (node (ref SW1) (pin 2))
+      (node (ref C43) (pin 1))
+      (node (ref U15) (pin 35)))
+    (net (code 38) (name /MCU_DISPLAY/LCD_VCC)
+      (node (ref U14) (pin 7))
+      (node (ref U14) (pin 6))
      (node (ref U14) (pin 8))
+      (node (ref C29) (pin 1))
      (node (ref C28) (pin 1))
-      (node (ref U15) (pin 9))
-      (node (ref U14) (pin 6))
-      (node (ref U14) (pin 7)))
-    (net (code 35) (name AC_CLK)
+      (node (ref U15) (pin 9)))
+    (net (code 39) (name AC_CLK)
      (node (ref U11) (pin 1))
      (node (ref U15) (pin 30)))
-    (net (code 36) (name AC_CS_MAG)
+    (net (code 40) (name AC_CS_MAG)
      (node (ref U15) (pin 31))
      (node (ref U11) (pin 3)))
-    (net (code 37) (name AC_INT_MAG)
+    (net (code 41) (name AC_INT_MAG)
      (node (ref U11) (pin 7))
      (node (ref U15) (pin 22)))
-    (net (code 38) (name AC_DRDY_MAG)
-      (node (ref U11) (pin 11))
-      (node (ref U15) (pin 21)))
-    (net (code 39) (name LS_INT_N)
+    (net (code 42) (name AC_DRDY_MAG)
+      (node (ref U15) (pin 21))
+      (node (ref U11) (pin 11)))
+    (net (code 43) (name LS_INT_N)
      (node (ref U15) (pin 44))
      (node (ref U10) (pin 4)))
-    (net (code 40) (name GPS_TXD)
-      (node (ref U6) (pin 2))
-      (node (ref U15) (pin 33)))
-    (net (code 41) (name GPS_RXD)
-      (node (ref U6) (pin 3))
-      (node (ref U15) (pin 32)))
-    (net (code 42) (name SD_MISO)
+    (net (code 44) (name GPS_TXD)
+      (node (ref U15) (pin 33))
+      (node (ref R12) (pin 1))
+      (node (ref Q1) (pin 3)))
+    (net (code 45) (name GPS_RXD)
+      (node (ref U6) (pin 21))
+      (node (ref U15) (pin 32))
+      (node (ref C13) (pin 1)))
+    (net (code 47) (name SD_MISO)
      (node (ref U7) (pin 7))
      (node (ref U15) (pin 12)))
-    (net (code 43) (name SD_MOSI)
-      (node (ref U15) (pin 11))
-      (node (ref U7) (pin 3)))
-    (net (code 44) (name SD_CLK)
+    (net (code 48) (name SD_MOSI)
+      (node (ref U7) (pin 3))
+      (node (ref U15) (pin 11)))
+    (net (code 49) (name SD_CLK)
      (node (ref U7) (pin 5))
      (node (ref U15) (pin 13)))
-    (net (code 45) (name SD_CS_N)
+    (net (code 50) (name SD_CS_N)
      (node (ref U7) (pin 2))
      (node (ref U15) (pin 14)))
-    (net (code 46) (name GPS_EN)
-      (node (ref D2) (pin 1))
+    (net (code 51) (name GPS_WAKUP)
+      (node (ref R30) (pin 1))
+      (node (ref Q2) (pin 3))
      (node (ref U15) (pin 41)))
-    (net (code 47) (name GPS_RST)
-      (node (ref U6) (pin 9))
-      (node (ref U15) (pin 38)))
-    (net (code 48) (name GPS_PPS)
-      (node (ref U6) (pin 4))
+    (net (code 52) (name "Net-(R22-Pad2)")
+      (node (ref U15) (pin 48))
+      (node (ref R22) (pin 2)))
+    (net (code 53) (name "Net-(U15-Pad36)")
      (node (ref U15) (pin 36)))
-    (net (code 49) (name "Net-(C36-Pad1)")
+    (net (code 54) (name "Net-(C36-Pad1)")
      (node (ref C36) (pin 1))
      (node (ref U15) (pin 46)))
-    (net (code 50) (name GPS_STDBY)
+    (net (code 55) (name GPS_ON_OFF)
      (node (ref U15) (pin 37))
-      (node (ref U6) (pin 5)))
-    (net (code 51) (name "Net-(R21-Pad2)")
+      (node (ref U6) (pin 26)))
+    (net (code 56) (name "Net-(R21-Pad2)")
      (node (ref R21) (pin 2))
      (node (ref U15) (pin 47)))
-    (net (code 52) (name AC_SDIO)
+    (net (code 57) (name AC_SDIO)
      (node (ref U11) (pin 4))
      (node (ref U15) (pin 28)))
-    (net (code 53) (name "Net-(R22-Pad2)")
-      (node (ref U15) (pin 48))
-      (node (ref R22) (pin 2)))
-    (net (code 54) (name /MCU_DISPLAY/LCD_DI)
+    (net (code 58) (name GPS_RST)
+      (node (ref U6) (pin 10))
+      (node (ref U15) (pin 38)))
+    (net (code 59) (name /MCU_DISPLAY/LCD_DI)
      (node (ref U14) (pin 2))
      (node (ref U15) (pin 58)))
-    (net (code 55) (name AC_INT_XL)
-      (node (ref U15) (pin 19))
-      (node (ref U11) (pin 12)))
-    (net (code 56) (name AC_CS_XL)
-      (node (ref U15) (pin 29))
-      (node (ref U11) (pin 2)))
-    (net (code 57) (name /MCU_DISPLAY/SWCLK)
-      (node (ref U15) (pin 49))
-      (node (ref P7) (pin 3)))
-    (net (code 58) (name "Net-(U15-Pad59)")
+    (net (code 60) (name AC_INT_XL)
+      (node (ref U11) (pin 12))
+      (node (ref U15) (pin 19)))
+    (net (code 61) (name AC_CS_XL)
+      (node (ref U11) (pin 2))
+      (node (ref U15) (pin 29)))
+    (net (code 62) (name /MCU_DISPLAY/SWCLK)
+      (node (ref P7) (pin 3))
+      (node (ref U15) (pin 49)))
+    (net (code 63) (name "Net-(U15-Pad59)")
      (node (ref U15) (pin 59)))
-    (net (code 59) (name /MCU_DISPLAY/SW_TL)
-      (node (ref R23) (pin 2))
-      (node (ref SW1) (pin 2))
-      (node (ref C43) (pin 1))
-      (node (ref U15) (pin 35)))
-    (net (code 60) (name /MCU_DISPLAY/SW_BL)
-      (node (ref U15) (pin 42))
-      (node (ref R25) (pin 2))
+    (net (code 64) (name /MCU_DISPLAY/SW_BL)
+      (node (ref SW3) (pin 2))
      (node (ref C45) (pin 1))
-      (node (ref SW3) (pin 2)))
-    (net (code 61) (name /MCU_DISPLAY/SW_BR)
-      (node (ref SW4) (pin 2))
-      (node (ref C46) (pin 1))
+      (node (ref R25) (pin 2))
+      (node (ref U15) (pin 42)))
+    (net (code 65) (name /MCU_DISPLAY/SW_BR)
      (node (ref U15) (pin 4))
-      (node (ref R26) (pin 2)))
-    (net (code 62) (name VM_EN)
+      (node (ref R26) (pin 2))
+      (node (ref SW4) (pin 2))
+      (node (ref C46) (pin 1)))
+    (net (code 66) (name VM_EN)
      (node (ref U13) (pin 6))
      (node (ref U15) (pin 43)))
-    (net (code 63) (name /MCU_DISPLAY/LCD_BKL1)
+    (net (code 67) (name /MCU_DISPLAY/LCD_BKL1)
      (node (ref R20) (pin 1))
-      (node (ref U15) (pin 64))
-      (node (ref R19) (pin 1)))
-    (net (code 64) (name /MCU_DISPLAY/LCD_BKL2)
-      (node (ref U15) (pin 63))
+      (node (ref R19) (pin 1))
+      (node (ref U15) (pin 64)))
+    (net (code 68) (name /MCU_DISPLAY/LCD_BKL2)
      (node (ref R17) (pin 1))
-      (node (ref R18) (pin 1)))
-    (net (code 65) (name "Net-(D5-Pad1)")
-      (node (ref D5) (pin 1))
-      (node (ref R18) (pin 2)))
-    (net (code 66) (name "Net-(D6-Pad1)")
+      (node (ref R18) (pin 1))
+      (node (ref U15) (pin 63)))
+    (net (code 69) (name "Net-(D5-Pad1)")
+      (node (ref R18) (pin 2))
+      (node (ref D5) (pin 1)))
+    (net (code 70) (name "Net-(D6-Pad1)")
      (node (ref D6) (pin 1))
      (node (ref R19) (pin 2)))
-    (net (code 67) (name "Net-(U15-Pad7)")
+    (net (code 71) (name "Net-(U15-Pad7)")
      (node (ref U15) (pin 7)))
-    (net (code 68) (name "Net-(D7-Pad1)")
-      (node (ref R20) (pin 2))
-      (node (ref D7) (pin 1)))
-    (net (code 69) (name /MCU_DISPLAY/BUZ)
+    (net (code 72) (name "Net-(D7-Pad1)")
+      (node (ref D7) (pin 1))
+      (node (ref R20) (pin 2)))
+    (net (code 73) (name /MCU_DISPLAY/BUZ)
      (node (ref SP1) (pin 1))
      (node (ref U15) (pin 18)))
-    (net (code 70) (name "Net-(U15-Pad6)")
+    (net (code 74) (name "Net-(U15-Pad6)")
      (node (ref U15) (pin 6)))
-    (net (code 71) (name "Net-(U15-Pad5)")
+    (net (code 75) (name "Net-(U15-Pad5)")
      (node (ref U15) (pin 5)))
-    (net (code 72) (name "Net-(U15-Pad24)")
+    (net (code 76) (name "Net-(U15-Pad24)")
      (node (ref U15) (pin 24)))
-    (net (code 73) (name "Net-(U15-Pad34)")
+    (net (code 77) (name "Net-(U15-Pad34)")
      (node (ref U15) (pin 34)))
-    (net (code 74) (name "Net-(U15-Pad54)")
+    (net (code 78) (name "Net-(U15-Pad54)")
      (node (ref U15) (pin 54)))
-    (net (code 75) (name "Net-(D4-Pad1)")
-      (node (ref D4) (pin 1))
-      (node (ref R17) (pin 2)))
-    (net (code 76) (name "Net-(C31-Pad2)")
-      (node (ref U15) (pin 15))
-      (node (ref X1) (pin 1))
-      (node (ref C31) (pin 2)))
-    (net (code 77) (name /MCU_DISPLAY/SW_TR)
+    (net (code 79) (name "Net-(D4-Pad1)")
+      (node (ref R17) (pin 2))
+      (node (ref D4) (pin 1)))
+    (net (code 80) (name /MCU_DISPLAY/SW_TR)
+      (node (ref U15) (pin 17))
      (node (ref SW2) (pin 2))
      (node (ref C44) (pin 1))
-      (node (ref U15) (pin 17))
      (node (ref R24) (pin 2)))
-    (net (code 78) (name "Net-(ANT1-Pad1)")
-      (node (ref C10) (pin 1))
-      (node (ref ANT1) (pin 1))
-      (node (ref R10) (pin 1)))
-    (net (code 79) (name "Net-(C11-Pad1)")
-      (node (ref C11) (pin 1))
-      (node (ref U5) (pin 3))
-      (node (ref R10) (pin 2)))
-    (net (code 80) (name "Net-(C9-Pad1)")
-      (node (ref C9) (pin 1))
-      (node (ref U5) (pin 6)))
-    (net (code 81) (name "Net-(R11-Pad1)")
-      (node (ref U5) (pin 5))
+    (net (code 81) (name "Net-(C12-Pad1)")
+      (node (ref C12) (pin 1))
+      (node (ref Q1) (pin 2))
+      (node (ref R13) (pin 1))
+      (node (ref U6) (pin 20)))
+    (net (code 82) (name "Net-(C23-Pad1)")
+      (node (ref C23) (pin 1))
+      (node (ref U11) (pin 5)))
+    (net (code 83) (name "Net-(U7-Pad1)")
+      (node (ref U7) (pin 1)))
+    (net (code 84) (name "Net-(U7-Pad8)")
+      (node (ref U7) (pin 8)))
+    (net (code 85) (name "Net-(C14-Pad1)")
+      (node (ref U7) (pin 4))
+      (node (ref C14) (pin 1))
+      (node (ref U8) (pin 1))
+      (node (ref U8) (pin 2)))
+    (net (code 86) (name "Net-(R11-Pad1)")
+      (node (ref U6) (pin 23))
      (node (ref R11) (pin 1)))
-    (net (code 82) (name "Net-(R12-Pad2)")
-      (node (ref U6) (pin 14))
-      (node (ref R12) (pin 2)))
-    (net (code 83) (name "Net-(R11-Pad2)")
+    (net (code 87) (name "Net-(C10-Pad1)")
+      (node (ref L1) (pin 1))
+      (node (ref U6) (pin 4))
+      (node (ref C10) (pin 1)))
+    (net (code 88) (name "Net-(C11-Pad1)")
+      (node (ref C11) (pin 1))
+      (node (ref U6) (pin 6))
+      (node (ref L1) (pin 2)))
+    (net (code 89) (name "Net-(Q2-Pad2)")
+      (node (ref U6) (pin 18))
+      (node (ref Q2) (pin 2))
+      (node (ref R29) (pin 1)))
+    (net (code 90) (name "Net-(R3-Pad1)")
      (node (ref U6) (pin 13))
-      (node (ref R11) (pin 2)))
-    (net (code 84) (name "Net-(C9-Pad2)")
-      (node (ref U6) (pin 11))
-      (node (ref C9) (pin 2)))
-    (net (code 85) (name "Net-(C23-Pad1)")
-      (node (ref U11) (pin 5))
-      (node (ref C23) (pin 1)))
-    (net (code 86) (name "Net-(U6-Pad15)")
-      (node (ref U6) (pin 15)))
-    (net (code 87) (name "Net-(U6-Pad7)")
-      (node (ref U6) (pin 7)))
-    (net (code 88) (name "Net-(U6-Pad16)")
+      (node (ref R3) (pin 1)))
+    (net (code 91) (name "Net-(R10-Pad2)")
+      (node (ref U6) (pin 14))
+      (node (ref R10) (pin 2)))
+    (net (code 92) (name "Net-(U6-Pad11)")
+      (node (ref U6) (pin 11)))
+    (net (code 93) (name "Net-(U6-Pad22)")
+      (node (ref U6) (pin 22)))
+    (net (code 94) (name "Net-(U6-Pad12)")
+      (node (ref U6) (pin 12)))
+    (net (code 95) (name "Net-(U6-Pad16)")
      (node (ref U6) (pin 16)))
-    (net (code 89) (name "Net-(U6-Pad17)")
+    (net (code 96) (name "Net-(U6-Pad17)")
      (node (ref U6) (pin 17)))
-    (net (code 90) (name "Net-(D1-Pad2)")
-      (node (ref U9) (pin 6))
-      (node (ref D2) (pin 2))
-      (node (ref D1) (pin 2)))
-    (net (code 91) (name "Net-(U7-Pad1)")
-      (node (ref U7) (pin 1)))
-    (net (code 92) (name "Net-(U7-Pad8)")
-      (node (ref U7) (pin 8)))
-    (net (code 93) (name "Net-(C27-Pad1)")
-      (node (ref P6) (pin 1))
+    (net (code 97) (name "Net-(C27-Pad1)")
      (node (ref C27) (pin 1))
-      (node (ref D3) (pin 2))
      (node (ref U13) (pin 1))
+      (node (ref D3) (pin 2))
+      (node (ref P6) (pin 1))
      (node (ref U13) (pin 2)))
-    (net (code 94) (name "Net-(C12-Pad1)")
-      (node (ref R12) (pin 1))
-      (node (ref U5) (pin 4))
-      (node (ref C12) (pin 1))
-      (node (ref C13) (pin 1)))
-    (net (code 95) (name "Net-(U12-Pad6)")
-      (node (ref U12) (pin 6)))
-    (net (code 96) (name "Net-(C15-Pad1)")
-      (node (ref U6) (pin 8))
-      (node (ref C15) (pin 1))
-      (node (ref U9) (pin 1))
-      (node (ref U9) (pin 2))
-      (node (ref C16) (pin 1)))
-    (net (code 97) (name "Net-(D1-Pad1)")
-      (node (ref U6) (pin 18))
-      (node (ref R13) (pin 1))
-      (node (ref D1) (pin 1)))
-    (net (code 98) (name "Net-(C14-Pad1)")
-      (node (ref U8) (pin 2))
-      (node (ref U8) (pin 1))
-      (node (ref U7) (pin 4))
-      (node (ref C14) (pin 1)))))
\ No newline at end of file
+    (net (code 98) (name "Net-(U12-Pad6)")
+      (node (ref U12) (pin 6)))))
\ No newline at end of file
--- a/hw/freewatch_v1/freewatch_v1.pro
+++ b/hw/freewatch_v1/freewatch_v1.pro
-update=Thu 05 Jun 2014 11:56:47 PM CEST
+update=Wed 11 Jun 2014 12:10:51 AM CEST
 version=1
 last_client=kicad
 [cvpcb]

--- a/hw/freewatch_v1/mcu_display.sch
+++ b/hw/freewatch_v1/mcu_display.sch
@@ -144,10 +144,10 @@ F 3 "" H 8800 2000 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR062
+L GND #PWR066
 U 1 1 537D9A0B
 P 9550 2300
-F 0 "#PWR062" H 9550 2300 30  0001 C CNN
+F 0 "#PWR066" H 9550 2300 30  0001 C CNN
 F 1 "GND" H 9550 2230 30  0001 C CNN
 F 2 "" H 9550 2300 60  0000 C CNN
 F 3 "" H 9550 2300 60  0000 C CNN
@@ -155,10 +155,10 @@ F 3 "" H 9550 2300 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR063
+L GND #PWR067
 U 1 1 537DC267
 P 8800 2150
-F 0 "#PWR063" H 8800 2150 30  0001 C CNN
+F 0 "#PWR067" H 8800 2150 30  0001 C CNN
 F 1 "GND" H 8800 2080 30  0001 C CNN
 F 2 "" H 8800 2150 60  0000 C CNN
 F 3 "" H 8800 2150 60  0000 C CNN
@@ -166,10 +166,10 @@ F 3 "" H 8800 2150 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR064
+L GND #PWR068
 U 1 1 537DC279
 P 9050 2150
-F 0 "#PWR064" H 9050 2150 30  0001 C CNN
+F 0 "#PWR068" H 9050 2150 30  0001 C CNN
 F 1 "GND" H 9050 2080 30  0001 C CNN
 F 2 "" H 9050 2150 60  0000 C CNN
 F 3 "" H 9050 2150 60  0000 C CNN
@@ -177,10 +177,10 @@ F 3 "" H 9050 2150 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR065
+L GND #PWR069
 U 1 1 537DC28B
 P 9300 2150
-F 0 "#PWR065" H 9300 2150 30  0001 C CNN
+F 0 "#PWR069" H 9300 2150 30  0001 C CNN
 F 1 "GND" H 9300 2080 30  0001 C CNN
 F 2 "" H 9300 2150 60  0000 C CNN
 F 3 "" H 9300 2150 60  0000 C CNN
@@ -288,10 +288,10 @@ F 3 "" H 5400 5600 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR066
+L GND #PWR070
 U 1 1 537DD069
 P 5150 5750
-F 0 "#PWR066" H 5150 5750 30  0001 C CNN
+F 0 "#PWR070" H 5150 5750 30  0001 C CNN
 F 1 "GND" H 5150 5680 30  0001 C CNN
 F 2 "" H 5150 5750 60  0000 C CNN
 F 3 "" H 5150 5750 60  0000 C CNN
@@ -299,10 +299,10 @@ F 3 "" H 5150 5750 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR067
+L GND #PWR071
 U 1 1 537DD0BA
 P 5000 5750
-F 0 "#PWR067" H 5000 5750 30  0001 C CNN
+F 0 "#PWR071" H 5000 5750 30  0001 C CNN
 F 1 "GND" H 5000 5680 30  0001 C CNN
 F 2 "" H 5000 5750 60  0000 C CNN
 F 3 "" H 5000 5750 60  0000 C CNN
@@ -310,10 +310,10 @@ F 3 "" H 5000 5750 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR068
+L GND #PWR072
 U 1 1 537DD0D3
 P 5400 5750
-F 0 "#PWR068" H 5400 5750 30  0001 C CNN
+F 0 "#PWR072" H 5400 5750 30  0001 C CNN
 F 1 "GND" H 5400 5680 30  0001 C CNN
 F 2 "" H 5400 5750 60  0000 C CNN
 F 3 "" H 5400 5750 60  0000 C CNN
@@ -321,10 +321,10 @@ F 3 "" H 5400 5750 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR069
+L VCC #PWR073
 U 1 1 537DD288
 P 5400 5300
-F 0 "#PWR069" H 5400 5400 30  0001 C CNN
+F 0 "#PWR073" H 5400 5400 30  0001 C CNN
 F 1 "VCC" H 5400 5400 30  0000 C CNN
 F 2 "" H 5400 5300 60  0000 C CNN
 F 3 "" H 5400 5300 60  0000 C CNN
@@ -332,10 +332,10 @@ F 3 "" H 5400 5300 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR070
+L GND #PWR074
 U 1 1 537DD40A
 P 3050 5950
-F 0 "#PWR070" H 3050 5950 30  0001 C CNN
+F 0 "#PWR074" H 3050 5950 30  0001 C CNN
 F 1 "GND" H 3050 5880 30  0001 C CNN
 F 2 "" H 3050 5950 60  0000 C CNN
 F 3 "" H 3050 5950 60  0000 C CNN
@@ -343,10 +343,10 @@ F 3 "" H 3050 5950 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR071
+L VCC #PWR075
 U 1 1 537DD423
 P 1800 5600
-F 0 "#PWR071" H 1800 5700 30  0001 C CNN
+F 0 "#PWR075" H 1800 5700 30  0001 C CNN
 F 1 "VCC" H 1800 5700 30  0000 C CNN
 F 2 "" H 1800 5600 60  0000 C CNN
 F 3 "" H 1800 5600 60  0000 C CNN
@@ -365,10 +365,10 @@ F 3 "" H 1800 5800 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR072
+L GND #PWR076
 U 1 1 537DD77E
 P 2800 5950
-F 0 "#PWR072" H 2800 5950 30  0001 C CNN
+F 0 "#PWR076" H 2800 5950 30  0001 C CNN
 F 1 "GND" H 2800 5880 30  0001 C CNN
 F 2 "" H 2800 5950 60  0000 C CNN
 F 3 "" H 2800 5950 60  0000 C CNN
@@ -376,10 +376,10 @@ F 3 "" H 2800 5950 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR073
+L GND #PWR077
 U 1 1 537DD798
 P 2550 5950
-F 0 "#PWR073" H 2550 5950 30  0001 C CNN
+F 0 "#PWR077" H 2550 5950 30  0001 C CNN
 F 1 "GND" H 2550 5880 30  0001 C CNN
 F 2 "" H 2550 5950 60  0000 C CNN
 F 3 "" H 2550 5950 60  0000 C CNN
@@ -387,10 +387,10 @@ F 3 "" H 2550 5950 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR074
+L GND #PWR078
 U 1 1 537DD7B2
 P 2300 5950
-F 0 "#PWR074" H 2300 5950 30  0001 C CNN
+F 0 "#PWR078" H 2300 5950 30  0001 C CNN
 F 1 "GND" H 2300 5880 30  0001 C CNN
 F 2 "" H 2300 5950 60  0000 C CNN
 F 3 "" H 2300 5950 60  0000 C CNN
@@ -398,10 +398,10 @@ F 3 "" H 2300 5950 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR075
+L GND #PWR079
 U 1 1 537DD7CC
 P 2050 5950
-F 0 "#PWR075" H 2050 5950 30  0001 C CNN
+F 0 "#PWR079" H 2050 5950 30  0001 C CNN
 F 1 "GND" H 2050 5880 30  0001 C CNN
 F 2 "" H 2050 5950 60  0000 C CNN
 F 3 "" H 2050 5950 60  0000 C CNN
@@ -409,10 +409,10 @@ F 3 "" H 2050 5950 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR076
+L GND #PWR080
 U 1 1 537DD7E6
 P 1800 5950
-F 0 "#PWR076" H 1800 5950 30  0001 C CNN
+F 0 "#PWR080" H 1800 5950 30  0001 C CNN
 F 1 "GND" H 1800 5880 30  0001 C CNN
 F 2 "" H 1800 5950 60  0000 C CNN
 F 3 "" H 1800 5950 60  0000 C CNN
@@ -442,10 +442,10 @@ F 3 "" H 5900 5600 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR077
+L GND #PWR081
 U 1 1 537D2613
 P 5650 5750
-F 0 "#PWR077" H 5650 5750 30  0001 C CNN
+F 0 "#PWR081" H 5650 5750 30  0001 C CNN
 F 1 "GND" H 5650 5680 30  0001 C CNN
 F 2 "" H 5650 5750 60  0000 C CNN
 F 3 "" H 5650 5750 60  0000 C CNN
@@ -453,10 +453,10 @@ F 3 "" H 5650 5750 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR078
+L GND #PWR082
 U 1 1 537D262F
 P 5900 5750
-F 0 "#PWR078" H 5900 5750 30  0001 C CNN
+F 0 "#PWR082" H 5900 5750 30  0001 C CNN
 F 1 "GND" H 5900 5680 30  0001 C CNN
 F 2 "" H 5900 5750 60  0000 C CNN
 F 3 "" H 5900 5750 60  0000 C CNN
@@ -464,10 +464,10 @@ F 3 "" H 5900 5750 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR079
+L +5V #PWR083
 U 1 1 537D291C
 P 5150 4900
-F 0 "#PWR079" H 5150 4990 20  0001 C CNN
+F 0 "#PWR083" H 5150 4990 20  0001 C CNN
 F 1 "+5V" H 5150 4990 30  0000 C CNN
 F 2 "" H 5150 4900 60  0000 C CNN
 F 3 "" H 5150 4900 60  0000 C CNN
@@ -559,10 +559,10 @@ F 3 "" H 900 3500 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR080
+L GND #PWR084
 U 1 1 537FCDAB
 P 700 3550
-F 0 "#PWR080" H 700 3550 30  0001 C CNN
+F 0 "#PWR084" H 700 3550 30  0001 C CNN
 F 1 "GND" H 700 3480 30  0001 C CNN
 F 2 "" H 700 3550 60  0000 C CNN
 F 3 "" H 700 3550 60  0000 C CNN
@@ -570,10 +570,10 @@ F 3 "" H 700 3550 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR081
+L GND #PWR085
 U 1 1 537FCDFB
 P 700 3150
-F 0 "#PWR081" H 700 3150 30  0001 C CNN
+F 0 "#PWR085" H 700 3150 30  0001 C CNN
 F 1 "GND" H 700 3080 30  0001 C CNN
 F 2 "" H 700 3150 60  0000 C CNN
 F 3 "" H 700 3150 60  0000 C CNN
@@ -604,10 +604,10 @@ F 3 "" H 3150 1850 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L VCC #PWR082
+L VCC #PWR086
 U 1 1 538245F4
 P 2950 1700
-F 0 "#PWR082" H 2950 1800 30  0001 C CNN
+F 0 "#PWR086" H 2950 1800 30  0001 C CNN
 F 1 "VCC" H 2950 1800 30  0000 C CNN
 F 2 "" H 2950 1700 60  0000 C CNN
 F 3 "" H 2950 1700 60  0000 C CNN
@@ -615,10 +615,10 @@ F 3 "" H 2950 1700 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR083
+L VCC #PWR087
 U 1 1 53824663
 P 3150 1700
-F 0 "#PWR083" H 3150 1800 30  0001 C CNN
+F 0 "#PWR087" H 3150 1800 30  0001 C CNN
 F 1 "VCC" H 3150 1800 30  0000 C CNN
 F 2 "" H 3150 1700 60  0000 C CNN
 F 3 "" H 3150 1700 60  0000 C CNN
@@ -663,10 +663,10 @@ F 3 "" H 9650 5800 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR084
+L VCC #PWR088
 U 1 1 5382C124
 P 9200 5500
-F 0 "#PWR084" H 9200 5600 30  0001 C CNN
+F 0 "#PWR088" H 9200 5600 30  0001 C CNN
 F 1 "VCC" H 9200 5600 30  0000 C CNN
 F 2 "" H 9200 5500 60  0000 C CNN
 F 3 "" H 9200 5500 60  0000 C CNN
@@ -674,10 +674,10 @@ F 3 "" H 9200 5500 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR085
+L GND #PWR089
 U 1 1 5382C149
 P 9200 6100
-F 0 "#PWR085" H 9200 6100 30  0001 C CNN
+F 0 "#PWR089" H 9200 6100 30  0001 C CNN
 F 1 "GND" H 9200 6030 30  0001 C CNN
 F 2 "" H 9200 6100 60  0000 C CNN
 F 3 "" H 9200 6100 60  0000 C CNN
@@ -971,10 +971,10 @@ F 3 "" H 1900 7250 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR086
+L GND #PWR090
 U 1 1 5383008D
 P 1100 7150
-F 0 "#PWR086" H 1100 7150 30  0001 C CNN
+F 0 "#PWR090" H 1100 7150 30  0001 C CNN
 F 1 "GND" H 1100 7080 30  0001 C CNN
 F 2 "" H 1100 7150 60  0000 C CNN
 F 3 "" H 1100 7150 60  0000 C CNN
@@ -993,10 +993,10 @@ F 3 "" H 1900 6950 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR087
+L GND #PWR091
 U 1 1 5383009A
 P 1900 7400
-F 0 "#PWR087" H 1900 7400 30  0001 C CNN
+F 0 "#PWR091" H 1900 7400 30  0001 C CNN
 F 1 "GND" H 1900 7330 30  0001 C CNN
 F 2 "" H 1900 7400 60  0000 C CNN
 F 3 "" H 1900 7400 60  0000 C CNN
@@ -1004,10 +1004,10 @@ F 3 "" H 1900 7400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR088
+L VCC #PWR092
 U 1 1 538300A0
 P 1900 6800
-F 0 "#PWR088" H 1900 6900 30  0001 C CNN
+F 0 "#PWR092" H 1900 6900 30  0001 C CNN
 F 1 "VCC" H 1900 6900 30  0000 C CNN
 F 2 "" H 1900 6800 60  0000 C CNN
 F 3 "" H 1900 6800 60  0000 C CNN
@@ -1050,10 +1050,10 @@ F 3 "" H 3300 7250 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR089
+L GND #PWR093
 U 1 1 538300BE
 P 2500 7150
-F 0 "#PWR089" H 2500 7150 30  0001 C CNN
+F 0 "#PWR093" H 2500 7150 30  0001 C CNN
 F 1 "GND" H 2500 7080 30  0001 C CNN
 F 2 "" H 2500 7150 60  0000 C CNN
 F 3 "" H 2500 7150 60  0000 C CNN
@@ -1072,10 +1072,10 @@ F 3 "" H 3300 6950 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR090
+L GND #PWR094
 U 1 1 538300CB
 P 3300 7400
-F 0 "#PWR090" H 3300 7400 30  0001 C CNN
+F 0 "#PWR094" H 3300 7400 30  0001 C CNN
 F 1 "GND" H 3300 7330 30  0001 C CNN
 F 2 "" H 3300 7400 60  0000 C CNN
 F 3 "" H 3300 7400 60  0000 C CNN
@@ -1083,10 +1083,10 @@ F 3 "" H 3300 7400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR091
+L VCC #PWR095
 U 1 1 538300D1
 P 3300 6800
-F 0 "#PWR091" H 3300 6900 30  0001 C CNN
+F 0 "#PWR095" H 3300 6900 30  0001 C CNN
 F 1 "VCC" H 3300 6900 30  0000 C CNN
 F 2 "" H 3300 6800 60  0000 C CNN
 F 3 "" H 3300 6800 60  0000 C CNN
@@ -1129,10 +1129,10 @@ F 3 "" H 4700 7250 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR092
+L GND #PWR096
 U 1 1 538300EF
 P 3900 7150
-F 0 "#PWR092" H 3900 7150 30  0001 C CNN
+F 0 "#PWR096" H 3900 7150 30  0001 C CNN
 F 1 "GND" H 3900 7080 30  0001 C CNN
 F 2 "" H 3900 7150 60  0000 C CNN
 F 3 "" H 3900 7150 60  0000 C CNN
@@ -1151,10 +1151,10 @@ F 3 "" H 4700 6950 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR093
+L GND #PWR097
 U 1 1 538300FC
 P 4700 7400
-F 0 "#PWR093" H 4700 7400 30  0001 C CNN
+F 0 "#PWR097" H 4700 7400 30  0001 C CNN
 F 1 "GND" H 4700 7330 30  0001 C CNN
 F 2 "" H 4700 7400 60  0000 C CNN
 F 3 "" H 4700 7400 60  0000 C CNN
@@ -1162,10 +1162,10 @@ F 3 "" H 4700 7400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR094
+L VCC #PWR098
 U 1 1 53830102
 P 4700 6800
-F 0 "#PWR094" H 4700 6900 30  0001 C CNN
+F 0 "#PWR098" H 4700 6900 30  0001 C CNN
 F 1 "VCC" H 4700 6900 30  0000 C CNN
 F 2 "" H 4700 6800 60  0000 C CNN
 F 3 "" H 4700 6800 60  0000 C CNN
@@ -1208,10 +1208,10 @@ F 3 "" H 6100 7250 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR095
+L GND #PWR099
 U 1 1 53830120
 P 5300 7150
-F 0 "#PWR095" H 5300 7150 30  0001 C CNN
+F 0 "#PWR099" H 5300 7150 30  0001 C CNN
 F 1 "GND" H 5300 7080 30  0001 C CNN
 F 2 "" H 5300 7150 60  0000 C CNN
 F 3 "" H 5300 7150 60  0000 C CNN
@@ -1230,10 +1230,10 @@ F 3 "" H 6100 6950 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR096
+L GND #PWR0100
 U 1 1 5383012D
 P 6100 7400
-F 0 "#PWR096" H 6100 7400 30  0001 C CNN
+F 0 "#PWR0100" H 6100 7400 30  0001 C CNN
 F 1 "GND" H 6100 7330 30  0001 C CNN
 F 2 "" H 6100 7400 60  0000 C CNN
 F 3 "" H 6100 7400 60  0000 C CNN
@@ -1241,10 +1241,10 @@ F 3 "" H 6100 7400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR097
+L VCC #PWR0101
 U 1 1 53830133
 P 6100 6800
-F 0 "#PWR097" H 6100 6900 30  0001 C CNN
+F 0 "#PWR0101" H 6100 6900 30  0001 C CNN
 F 1 "VCC" H 6100 6900 30  0000 C CNN
 F 2 "" H 6100 6800 60  0000 C CNN
 F 3 "" H 6100 6800 60  0000 C CNN
@@ -1406,10 +1406,10 @@ F 3 "" H 9400 4550 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR098
+L GND #PWR0102
 U 1 1 5383D117
 P 9000 3950
-F 0 "#PWR098" H 9000 3950 30  0001 C CNN
+F 0 "#PWR0102" H 9000 3950 30  0001 C CNN
 F 1 "GND" H 9000 3880 30  0001 C CNN
 F 2 "" H 9000 3950 60  0000 C CNN
 F 3 "" H 9000 3950 60  0000 C CNN
@@ -1417,10 +1417,10 @@ F 3 "" H 9000 3950 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR099
+L GND #PWR0103
 U 1 1 5383D14F
 P 9250 3950
-F 0 "#PWR099" H 9250 3950 30  0001 C CNN
+F 0 "#PWR0103" H 9250 3950 30  0001 C CNN
 F 1 "GND" H 9250 3880 30  0001 C CNN
 F 2 "" H 9250 3950 60  0000 C CNN
 F 3 "" H 9250 3950 60  0000 C CNN
@@ -1428,10 +1428,10 @@ F 3 "" H 9250 3950 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0100
+L GND #PWR0104
 U 1 1 5383D187
 P 9500 3950
-F 0 "#PWR0100" H 9500 3950 30  0001 C CNN
+F 0 "#PWR0104" H 9500 3950 30  0001 C CNN
 F 1 "GND" H 9500 3880 30  0001 C CNN
 F 2 "" H 9500 3950 60  0000 C CNN
 F 3 "" H 9500 3950 60  0000 C CNN
@@ -1439,10 +1439,10 @@ F 3 "" H 9500 3950 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0101
+L GND #PWR0105
 U 1 1 5383D1BF
 P 9750 3950
-F 0 "#PWR0101" H 9750 3950 30  0001 C CNN
+F 0 "#PWR0105" H 9750 3950 30  0001 C CNN
 F 1 "GND" H 9750 3880 30  0001 C CNN
 F 2 "" H 9750 3950 60  0000 C CNN
 F 3 "" H 9750 3950 60  0000 C CNN
@@ -1488,10 +1488,10 @@ BUZ
 Text Label 8700 4550 0    40   ~ 0
 BUZ
 $Comp
-L GND #PWR0102
+L GND #PWR0106
 U 1 1 5383EF3B
 P 9300 4700
-F 0 "#PWR0102" H 9300 4700 30  0001 C CNN
+F 0 "#PWR0106" H 9300 4700 30  0001 C CNN
 F 1 "GND" H 9300 4630 30  0001 C CNN
 F 2 "" H 9300 4700 60  0000 C CNN
 F 3 "" H 9300 4700 60  0000 C CNN
@@ -1536,8 +1536,6 @@ Text GLabel 2850 2950 0    40   Input ~ 0
 AC_INT_XL
 Wire Wire Line
 	4950 2750 5750 2750
-Wire Wire Line
-	4950 2850 5750 2850
 Wire Wire Line
 	2850 4550 3250 4550
 NoConn ~ 4950 2650
@@ -1545,4 +1543,5 @@ NoConn ~ 4950 3350
 NoConn ~ 4950 4250
 Wire Wire Line
 	2850 3750 3250 3750
+NoConn ~ 4950 2850
 $EndSCHEMATC
--- a/hw/freewatch_v1/periph_sensors.sch
+++ b/hw/freewatch_v1/periph_sensors.sch
@@ -68,10 +68,10 @@ F 3 "" H 7800 4050 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR021
+L VCC #PWR026
 U 1 1 537C3EDE
 P 7550 4000
-F 0 "#PWR021" H 7550 4100 30  0001 C CNN
+F 0 "#PWR026" H 7550 4100 30  0001 C CNN
 F 1 "VCC" H 7550 4100 30  0000 C CNN
 F 2 "" H 7550 4000 60  0000 C CNN
 F 3 "" H 7550 4000 60  0000 C CNN
@@ -79,10 +79,10 @@ F 3 "" H 7550 4000 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR022
+L VCC #PWR027
 U 1 1 537C3F18
 P 7350 5250
-F 0 "#PWR022" H 7350 5350 30  0001 C CNN
+F 0 "#PWR027" H 7350 5350 30  0001 C CNN
 F 1 "VCC" H 7350 5350 30  0000 C CNN
 F 2 "" H 7350 5250 60  0000 C CNN
 F 3 "" H 7350 5250 60  0000 C CNN
@@ -90,10 +90,10 @@ F 3 "" H 7350 5250 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR023
+L VCC #PWR028
 U 1 1 537C3F29
 P 1550 4700
-F 0 "#PWR023" H 1550 4800 30  0001 C CNN
+F 0 "#PWR028" H 1550 4800 30  0001 C CNN
 F 1 "VCC" H 1550 4800 30  0000 C CNN
 F 2 "" H 1550 4700 60  0000 C CNN
 F 3 "" H 1550 4700 60  0000 C CNN
@@ -101,10 +101,10 @@ F 3 "" H 1550 4700 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR025
+L GND #PWR029
 U 1 1 537C3F78
 P 7550 4400
-F 0 "#PWR025" H 7550 4400 30  0001 C CNN
+F 0 "#PWR029" H 7550 4400 30  0001 C CNN
 F 1 "GND" H 7550 4330 30  0001 C CNN
 F 2 "" H 7550 4400 60  0000 C CNN
 F 3 "" H 7550 4400 60  0000 C CNN
@@ -112,10 +112,10 @@ F 3 "" H 7550 4400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR026
+L GND #PWR030
 U 1 1 537C3F89
 P 1550 5050
-F 0 "#PWR026" H 1550 5050 30  0001 C CNN
+F 0 "#PWR030" H 1550 5050 30  0001 C CNN
 F 1 "GND" H 1550 4980 30  0001 C CNN
 F 2 "" H 1550 5050 60  0000 C CNN
 F 3 "" H 1550 5050 60  0000 C CNN
@@ -145,10 +145,10 @@ F 3 "" H 1550 2150 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR028
+L GND #PWR031
 U 1 1 537C4830
 P 1150 2300
-F 0 "#PWR028" H 1150 2300 30  0001 C CNN
+F 0 "#PWR031" H 1150 2300 30  0001 C CNN
 F 1 "GND" H 1150 2230 30  0001 C CNN
 F 2 "" H 1150 2300 60  0000 C CNN
 F 3 "" H 1150 2300 60  0000 C CNN
@@ -156,10 +156,10 @@ F 3 "" H 1150 2300 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR029
+L GND #PWR032
 U 1 1 537C4845
 P 1550 2300
-F 0 "#PWR029" H 1550 2300 30  0001 C CNN
+F 0 "#PWR032" H 1550 2300 30  0001 C CNN
 F 1 "GND" H 1550 2230 30  0001 C CNN
 F 2 "" H 1550 2300 60  0000 C CNN
 F 3 "" H 1550 2300 60  0000 C CNN
@@ -211,10 +211,10 @@ F 3 "" H 2100 2300 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR032
+L GND #PWR033
 U 1 1 537C5AE0
 P 2100 2450
-F 0 "#PWR032" H 2100 2450 30  0001 C CNN
+F 0 "#PWR033" H 2100 2450 30  0001 C CNN
 F 1 "GND" H 2100 2380 30  0001 C CNN
 F 2 "" H 2100 2450 60  0000 C CNN
 F 3 "" H 2100 2450 60  0000 C CNN
@@ -222,10 +222,10 @@ F 3 "" H 2100 2450 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR033
+L GND #PWR034
 U 1 1 537C5B1E
 P 2350 2450
-F 0 "#PWR033" H 2350 2450 30  0001 C CNN
+F 0 "#PWR034" H 2350 2450 30  0001 C CNN
 F 1 "GND" H 2350 2380 30  0001 C CNN
 F 2 "" H 2350 2450 60  0000 C CNN
 F 3 "" H 2350 2450 60  0000 C CNN
@@ -269,10 +269,10 @@ F 3 "" H 7350 5450 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR036
+L GND #PWR035
 U 1 1 537D003D
 P 9000 4400
-F 0 "#PWR036" H 9000 4400 30  0001 C CNN
+F 0 "#PWR035" H 9000 4400 30  0001 C CNN
 F 1 "GND" H 9000 4330 30  0001 C CNN
 F 2 "" H 9000 4400 60  0000 C CNN
 F 3 "" H 9000 4400 60  0000 C CNN
@@ -315,9 +315,7 @@ F 3 "" H 1550 4900 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	1150 1800 1150 2000
-Wire Wire Line
-	1150 2000 1150 2050
+	1150 1800 1150 2050
 Connection ~ 1150 2000
 Wire Wire Line
 	1150 2250 1150 2300
@@ -333,46 +331,30 @@ Wire Wire Line
 Connection ~ 2100 2200
 Connection ~ 2350 2200
 Wire Wire Line
-	4300 1900 4900 1900
-Wire Wire Line
-	4900 1900 5750 1900
+	4300 1900 5750 1900
 Wire Wire Line
-	4300 1800 4650 1800
-Wire Wire Line
-	4650 1800 5050 1800
-Wire Wire Line
-	5050 1800 5150 1800
+	4300 1800 5150 1800
 Wire Wire Line
 	4300 2600 5150 2600
-Wire Wire Line
-	4300 2700 5150 2700
 Wire Wire Line
 	7550 4000 7550 4050
 Wire Wire Line
 	7550 4050 7800 4050
 Wire Wire Line
-	7550 4250 7550 4350
-Wire Wire Line
-	7550 4350 7550 4400
+	7550 4250 7550 4400
 Wire Wire Line
 	7550 4250 7800 4250
 Wire Wire Line
 	7800 4350 7550 4350
 Connection ~ 7550 4350
 Wire Wire Line
-	8900 4050 9750 4050
-Wire Wire Line
-	9750 4050 9850 4050
+	8900 4050 9850 4050
 Wire Wire Line
-	8900 4150 9650 4150
-Wire Wire Line
-	9650 4150 9850 4150
+	8900 4150 9850 4150
 Wire Wire Line
 	8900 4250 9250 4250
 Wire Wire Line
-	7350 5250 7350 5300
-Wire Wire Line
-	7350 5300 7350 5350
+	7350 5250 7350 5350
 Connection ~ 7350 5300
 Wire Wire Line
 	7600 5500 7700 5500
@@ -381,10 +363,10 @@ Wire Wire Line
 Wire Wire Line
 	7600 5550 7600 5500
 $Comp
-L GND #PWR037
+L GND #PWR036
 U 1 1 537D094C
 P 7600 5550
-F 0 "#PWR037" H 7600 5550 30  0001 C CNN
+F 0 "#PWR036" H 7600 5550 30  0001 C CNN
 F 1 "GND" H 7600 5480 30  0001 C CNN
 F 2 "" H 7600 5550 60  0000 C CNN
 F 3 "" H 7600 5550 60  0000 C CNN
@@ -392,10 +374,10 @@ F 3 "" H 7600 5550 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR038
+L GND #PWR037
 U 1 1 537D224A
 P 7350 5600
-F 0 "#PWR038" H 7350 5600 30  0001 C CNN
+F 0 "#PWR037" H 7350 5600 30  0001 C CNN
 F 1 "GND" H 7350 5530 30  0001 C CNN
 F 2 "" H 7350 5600 60  0000 C CNN
 F 3 "" H 7350 5600 60  0000 C CNN
@@ -403,10 +385,10 @@ F 3 "" H 7350 5600 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR039
+L GND #PWR038
 U 1 1 537D2691
 P 2650 5400
-F 0 "#PWR039" H 2650 5400 30  0001 C CNN
+F 0 "#PWR038" H 2650 5400 30  0001 C CNN
 F 1 "GND" H 2650 5330 30  0001 C CNN
 F 2 "" H 2650 5400 60  0000 C CNN
 F 3 "" H 2650 5400 60  0000 C CNN
@@ -414,9 +396,7 @@ F 3 "" H 2650 5400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2650 5250 2650 5350
-Wire Wire Line
-	2650 5350 2650 5400
+	2650 5250 2650 5400
 Wire Wire Line
 	2650 5250 2750 5250
 Wire Wire Line
@@ -434,10 +414,10 @@ F 3 "" H 2450 5100 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR040
+L GND #PWR039
 U 1 1 537D2826
 P 2450 5250
-F 0 "#PWR040" H 2450 5250 30  0001 C CNN
+F 0 "#PWR039" H 2450 5250 30  0001 C CNN
 F 1 "GND" H 2450 5180 30  0001 C CNN
 F 2 "" H 2450 5250 60  0000 C CNN
 F 3 "" H 2450 5250 60  0000 C CNN
@@ -451,10 +431,10 @@ Wire Wire Line
 Wire Wire Line
 	2450 4950 2750 4950
 $Comp
-L GND #PWR041
+L GND #PWR040
 U 1 1 537D2A44
 P 2100 5150
-F 0 "#PWR041" H 2100 5150 30  0001 C CNN
+F 0 "#PWR040" H 2100 5150 30  0001 C CNN
 F 1 "GND" H 2100 5080 30  0001 C CNN
 F 2 "" H 2100 5150 60  0000 C CNN
 F 3 "" H 2100 5150 60  0000 C CNN
@@ -464,22 +444,18 @@ $EndComp
 Wire Wire Line
 	2100 5100 2100 5150
 Wire Wire Line
-	2100 4700 2100 4850
-Wire Wire Line
-	2100 4850 2100 4900
+	2100 4700 2100 4900
 Wire Wire Line
 	2100 4850 2750 4850
 Wire Wire Line
 	1800 4800 1800 4750
 Wire Wire Line
-	1550 4750 1800 4750
-Wire Wire Line
-	1800 4750 2750 4750
+	1550 4750 2750 4750
 $Comp
-L VCC #PWR042
+L VCC #PWR041
 U 1 1 537D2E88
 P 2100 4700
-F 0 "#PWR042" H 2100 4800 30  0001 C CNN
+F 0 "#PWR041" H 2100 4800 30  0001 C CNN
 F 1 "VCC" H 2100 4800 30  0000 C CNN
 F 2 "" H 2100 4700 60  0000 C CNN
 F 3 "" H 2100 4700 60  0000 C CNN
@@ -487,16 +463,14 @@ F 3 "" H 2100 4700 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	1550 4700 1550 4750
-Wire Wire Line
-	1550 4750 1550 4800
+	1550 4700 1550 4800
 Connection ~ 1800 4750
 Connection ~ 1550 4750
 $Comp
-L GND #PWR043
+L GND #PWR042
 U 1 1 537D3021
 P 1800 5050
-F 0 "#PWR043" H 1800 5050 30  0001 C CNN
+F 0 "#PWR042" H 1800 5050 30  0001 C CNN
 F 1 "GND" H 1800 4980 30  0001 C CNN
 F 2 "" H 1800 5050 60  0000 C CNN
 F 3 "" H 1800 5050 60  0000 C CNN
@@ -567,14 +541,12 @@ Wire Wire Line
 Wire Wire Line
 	7950 2600 8050 2600
 Wire Wire Line
-	7950 2600 7950 2700
-Wire Wire Line
-	7950 2700 7950 2750
+	7950 2600 7950 2750
 $Comp
-L GND #PWR048
+L GND #PWR043
 U 1 1 537EEDBD
 P 7950 2750
-F 0 "#PWR048" H 7950 2750 30  0001 C CNN
+F 0 "#PWR043" H 7950 2750 30  0001 C CNN
 F 1 "GND" H 7950 2680 30  0001 C CNN
 F 2 "" H 7950 2750 60  0000 C CNN
 F 3 "" H 7950 2750 60  0000 C CNN
@@ -587,9 +559,7 @@ Wire Wire Line
 Wire Wire Line
 	7950 2300 8050 2300
 Wire Wire Line
-	7950 2250 7950 2300
-Wire Wire Line
-	7950 2300 7950 2400
+	7950 2250 7950 2400
 Wire Wire Line
 	8950 2850 9500 2850
 Wire Wire Line
@@ -615,10 +585,10 @@ Wire Wire Line
 Wire Wire Line
 	8850 2600 9050 2600
 $Comp
-L VCC #PWR049
+L VCC #PWR044
 U 1 1 537EE3EE
 P 9050 2450
-F 0 "#PWR049" H 9050 2550 30  0001 C CNN
+F 0 "#PWR044" H 9050 2550 30  0001 C CNN
 F 1 "VCC" H 9050 2550 30  0000 C CNN
 F 2 "" H 9050 2450 60  0000 C CNN
 F 3 "" H 9050 2450 60  0000 C CNN
@@ -626,10 +596,10 @@ F 3 "" H 9050 2450 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR050
+L GND #PWR045
 U 1 1 537EE3E8
 P 9050 2650
-F 0 "#PWR050" H 9050 2650 30  0001 C CNN
+F 0 "#PWR045" H 9050 2650 30  0001 C CNN
 F 1 "GND" H 9050 2580 30  0001 C CNN
 F 2 "" H 9050 2650 60  0000 C CNN
 F 3 "" H 9050 2650 60  0000 C CNN
@@ -637,10 +607,10 @@ F 3 "" H 9050 2650 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR051
+L GND #PWR046
 U 1 1 537ED9B9
 P 9250 2600
-F 0 "#PWR051" H 9250 2600 30  0001 C CNN
+F 0 "#PWR046" H 9250 2600 30  0001 C CNN
 F 1 "GND" H 9250 2530 30  0001 C CNN
 F 2 "" H 9250 2600 60  0000 C CNN
 F 3 "" H 9250 2600 60  0000 C CNN
@@ -674,17 +644,13 @@ SD_EN
 Wire Wire Line
 	10150 2600 9800 2600
 Wire Wire Line
-	10050 2500 10050 2750
+	10050 2500 10050 2850
 Wire Wire Line
 	10150 2500 10050 2500
 Wire Wire Line
 	10150 2400 9800 2400
 Wire Wire Line
-	8850 2300 8950 2300
-Wire Wire Line
-	8950 2300 9250 2300
-Wire Wire Line
-	9250 2300 10150 2300
+	8850 2300 10150 2300
 Wire Wire Line
 	10150 2200 9800 2200
 Wire Wire Line
@@ -698,21 +664,21 @@ SD_MOSI
 Text GLabel 9800 2600 0    40   Output ~ 0
 SD_MISO
 $Comp
-L GND #PWR052
+L GND #PWR047
 U 1 1 537C3FAB
-P 10050 2750
-F 0 "#PWR052" H 10050 2750 30  0001 C CNN
-F 1 "GND" H 10050 2680 30  0001 C CNN
-F 2 "" H 10050 2750 60  0000 C CNN
-F 3 "" H 10050 2750 60  0000 C CNN
-	1    10050 2750
+P 10050 2850
+F 0 "#PWR047" H 10050 2850 30  0001 C CNN
+F 1 "GND" H 10050 2780 30  0001 C CNN
+F 2 "" H 10050 2850 60  0000 C CNN
+F 3 "" H 10050 2850 60  0000 C CNN
+	1    10050 2850
 	-1   0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR053
+L VCC #PWR048
 U 1 1 537C3F07
 P 7950 2250
-F 0 "#PWR053" H 7950 2350 30  0001 C CNN
+F 0 "#PWR048" H 7950 2350 30  0001 C CNN
 F 1 "VCC" H 7950 2350 30  0000 C CNN
 F 2 "" H 7950 2250 60  0000 C CNN
 F 3 "" H 7950 2250 60  0000 C CNN
@@ -724,7 +690,7 @@ L MICRO_SDCARD_SPI U7
 U 1 1 537A7FBA
 P 10150 2000
 F 0 "U7" H 10700 2150 60  0000 C CNN
-F 1 "MICRO_SDCARD_SPI" H 10500 1150 60  0000 C CNN
+F 1 "MICRO_SDCARD_SPI" H 10600 1050 60  0000 C CNN
 F 2 "" H 10150 2000 60  0000 C CNN
 F 3 "" H 10150 2000 60  0000 C CNN
 	1    10150 2000
@@ -753,10 +719,10 @@ F 3 "" H 4650 2050 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR054
+L GND #PWR049
 U 1 1 53820F79
 P 4650 2200
-F 0 "#PWR054" H 4650 2200 30  0001 C CNN
+F 0 "#PWR049" H 4650 2200 30  0001 C CNN
 F 1 "GND" H 4650 2130 30  0001 C CNN
 F 2 "" H 4650 2200 60  0000 C CNN
 F 3 "" H 4650 2200 60  0000 C CNN
@@ -764,10 +730,10 @@ F 3 "" H 4650 2200 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR055
+L GND #PWR050
 U 1 1 53820FB1
 P 4900 2200
-F 0 "#PWR055" H 4900 2200 30  0001 C CNN
+F 0 "#PWR050" H 4900 2200 30  0001 C CNN
 F 1 "GND" H 4900 2130 30  0001 C CNN
 F 2 "" H 4900 2200 60  0000 C CNN
 F 3 "" H 4900 2200 60  0000 C CNN
@@ -790,10 +756,10 @@ F 3 "" H 4100 6850 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR056
+L GND #PWR051
 U 1 1 53831B98
 P 3800 7050
-F 0 "#PWR056" H 3800 7050 30  0001 C CNN
+F 0 "#PWR051" H 3800 7050 30  0001 C CNN
 F 1 "GND" H 3800 6980 30  0001 C CNN
 F 2 "" H 3800 7050 60  0000 C CNN
 F 3 "" H 3800 7050 60  0000 C CNN
@@ -801,10 +767,10 @@ F 3 "" H 3800 7050 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR057
+L VCC #PWR052
 U 1 1 53831B9E
 P 3450 6800
-F 0 "#PWR057" H 3450 6900 30  0001 C CNN
+F 0 "#PWR052" H 3450 6900 30  0001 C CNN
 F 1 "VCC" H 3450 6900 30  0000 C CNN
 F 2 "" H 3450 6800 60  0000 C CNN
 F 3 "" H 3450 6800 60  0000 C CNN
@@ -829,17 +795,9 @@ Wire Wire Line
 Connection ~ 4100 6950
 Connection ~ 3850 6950
 Wire Wire Line
-	3800 6950 3850 6950
-Wire Wire Line
-	3850 6950 4100 6950
-Wire Wire Line
-	4100 6950 4450 6950
-Wire Wire Line
-	3800 6750 3850 6750
-Wire Wire Line
-	3850 6750 4100 6750
+	3800 6950 4450 6950
 Wire Wire Line
-	4100 6750 4450 6750
+	3800 6750 4450 6750
 Connection ~ 4100 6750
 Wire Wire Line
 	3800 6650 3800 6750
@@ -856,10 +814,10 @@ F 3 "" H 3250 6650 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR058
+L GND #PWR053
 U 1 1 53831BC2
 P 3450 7000
-F 0 "#PWR058" H 3450 7000 30  0001 C CNN
+F 0 "#PWR053" H 3450 7000 30  0001 C CNN
 F 1 "GND" H 3450 6930 30  0001 C CNN
 F 2 "" H 3450 7000 60  0000 C CNN
 F 3 "" H 3450 7000 60  0000 C CNN
@@ -867,9 +825,7 @@ F 3 "" H 3450 7000 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2350 6600 2350 6650
-Wire Wire Line
-	2350 6650 2350 6750
+	2350 6600 2350 6750
 Wire Wire Line
 	2350 6750 2450 6750
 Wire Wire Line
@@ -878,9 +834,7 @@ Connection ~ 2350 6650
 Wire Wire Line
 	2450 6950 2350 6950
 Wire Wire Line
-	2350 6950 2350 7050
-Wire Wire Line
-	2350 7050 2350 7100
+	2350 6950 2350 7100
 Wire Wire Line
 	2450 7050 2350 7050
 Connection ~ 2350 7050
@@ -897,15 +851,13 @@ Wire Wire Line
 Wire Wire Line
 	3350 6750 3350 6650
 Wire Wire Line
-	3250 6650 3350 6650
-Wire Wire Line
-	3350 6650 3800 6650
+	3250 6650 3800 6650
 Connection ~ 3350 6650
 $Comp
-L VCC #PWR059
+L VCC #PWR054
 U 1 1 53831BD8
 P 2350 6600
-F 0 "#PWR059" H 2350 6700 30  0001 C CNN
+F 0 "#PWR054" H 2350 6700 30  0001 C CNN
 F 1 "VCC" H 2350 6700 30  0000 C CNN
 F 2 "" H 2350 6600 60  0000 C CNN
 F 3 "" H 2350 6600 60  0000 C CNN
@@ -913,10 +865,10 @@ F 3 "" H 2350 6600 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR060
+L GND #PWR055
 U 1 1 53831BDE
 P 2350 7100
-F 0 "#PWR060" H 2350 7100 30  0001 C CNN
+F 0 "#PWR055" H 2350 7100 30  0001 C CNN
 F 1 "GND" H 2350 7030 30  0001 C CNN
 F 2 "" H 2350 7100 60  0000 C CNN
 F 3 "" H 2350 7100 60  0000 C CNN
@@ -976,10 +928,10 @@ I2C address = b'1110111
 Wire Wire Line
 	7350 5300 7700 5300
 $Comp
-L GND #PWR061
+L GND #PWR056
 U 1 1 538B4514
 P 8950 5550
-F 0 "#PWR061" H 8950 5550 30  0001 C CNN
+F 0 "#PWR056" H 8950 5550 30  0001 C CNN
 F 1 "GND" H 8950 5480 30  0001 C CNN
 F 2 "" H 8950 5550 60  0000 C CNN
 F 3 "" H 8950 5550 60  0000 C CNN
@@ -1001,10 +953,10 @@ Wire Wire Line
 	9750 5400 9750 4050
 Connection ~ 9750 4050
 $Comp
-L M10478-A1 U?
+L M10478-A1 U6
 U 1 1 5390DC07
 P 2750 1800
-F 0 "U?" H 3550 1950 60  0000 C CNN
+F 0 "U6" H 3550 1950 60  0000 C CNN
 F 1 "M10478-A1" H 3500 -50 60  0000 C CNN
 F 2 "" H 2750 1200 60  0000 C CNN
 F 3 "" H 2750 1200 60  0000 C CNN
@@ -1012,16 +964,14 @@ F 3 "" H 2750 1200 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2100 2200 2350 2200
-Wire Wire Line
-	2350 2200 2750 2200
+	2100 2200 2750 2200
 Wire Wire Line
 	2100 2150 2100 2200
 $Comp
-L IND L?
+L IND L1
 U 1 1 5390F7CE
 P 1350 2000
-F 0 "L?" H 1320 2060 39  0000 C CNN
+F 0 "L1" H 1320 2060 39  0000 C CNN
 F 1 "IND" H 1330 1970 30  0000 C CNN
 F 2 "" H 1350 2000 60  0000 C CNN
 F 3 "" H 1350 2000 60  0000 C CNN
@@ -1029,10 +979,10 @@ F 3 "" H 1350 2000 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1.8V #PWR?
+L +1.8V #PWR057
 U 1 1 5390FE7B
 P 2100 2150
-F 0 "#PWR?" H 2100 2290 20  0001 C CNN
+F 0 "#PWR057" H 2100 2290 20  0001 C CNN
 F 1 "+1.8V" H 2100 2260 30  0000 C CNN
 F 2 "" H 2100 2150 60  0000 C CNN
 F 3 "" H 2100 2150 60  0000 C CNN
@@ -1042,16 +992,14 @@ $EndComp
 Wire Wire Line
 	1150 2000 1250 2000
 Wire Wire Line
-	1450 2000 1550 2000
-Wire Wire Line
-	1550 2000 2750 2000
+	1450 2000 2750 2000
 Wire Wire Line
 	2750 1800 1150 1800
 $Comp
-L GND #PWR?
+L GND #PWR058
 U 1 1 53911CB8
 P 2650 3550
-F 0 "#PWR?" H 2650 3550 30  0001 C CNN
+F 0 "#PWR058" H 2650 3550 30  0001 C CNN
 F 1 "GND" H 2650 3480 30  0001 C CNN
 F 2 "" H 2650 3550 60  0000 C CNN
 F 3 "" H 2650 3550 60  0000 C CNN
@@ -1059,29 +1007,7 @@ F 3 "" H 2650 3550 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2650 2400 2650 2500
-Wire Wire Line
-	2650 2500 2650 2600
-Wire Wire Line
-	2650 2600 2650 2700
-Wire Wire Line
-	2650 2700 2650 2800
-Wire Wire Line
-	2650 2800 2650 2900
-Wire Wire Line
-	2650 2900 2650 3000
-Wire Wire Line
-	2650 3000 2650 3100
-Wire Wire Line
-	2650 3100 2650 3200
-Wire Wire Line
-	2650 3200 2650 3300
-Wire Wire Line
-	2650 3300 2650 3400
-Wire Wire Line
-	2650 3400 2650 3500
-Wire Wire Line
-	2650 3500 2650 3550
+	2650 2400 2650 3550
 Wire Wire Line
 	2650 2400 2750 2400
 Wire Wire Line
@@ -1120,16 +1046,14 @@ Connection ~ 2650 3400
 Wire Wire Line
 	5150 2300 4300 2300
 Wire Wire Line
-	4300 2400 6250 2400
-Wire Wire Line
-	6250 2400 6350 2400
+	4300 2400 6350 2400
 Wire Wire Line
 	4300 2900 5650 2900
 $Comp
-L GEN_MOSFET_N Q?
+L GEN_MOSFET_N Q1
 U 1 1 539134C1
 P 5300 1650
-F 0 "Q?" H 5400 1750 40  0000 R CNN
+F 0 "Q1" H 5400 1750 40  0000 R CNN
 F 1 "BSS138" H 5400 1550 40  0000 R CNN
 F 2 "" H 5300 1650 60  0000 C CNN
 F 3 "" H 5300 1650 60  0000 C CNN
@@ -1141,10 +1065,10 @@ Wire Wire Line
 Wire Wire Line
 	4550 2100 4550 1750
 $Comp
-L +1.8V #PWR?
+L +1.8V #PWR059
 U 1 1 53913A59
 P 4550 1500
-F 0 "#PWR?" H 4550 1640 20  0001 C CNN
+F 0 "#PWR059" H 4550 1640 20  0001 C CNN
 F 1 "+1.8V" H 4550 1610 30  0000 C CNN
 F 2 "" H 4550 1500 60  0000 C CNN
 F 3 "" H 4550 1500 60  0000 C CNN
@@ -1154,10 +1078,10 @@ $EndComp
 Wire Wire Line
 	4550 1500 4550 1550
 $Comp
-L +1.8V #PWR?
+L +1.8V #PWR060
 U 1 1 53913B86
 P 5050 1400
-F 0 "#PWR?" H 5050 1540 20  0001 C CNN
+F 0 "#PWR060" H 5050 1540 20  0001 C CNN
 F 1 "+1.8V" H 5050 1510 30  0000 C CNN
 F 2 "" H 5050 1400 60  0000 C CNN
 F 3 "" H 5050 1400 60  0000 C CNN
@@ -1165,10 +1089,10 @@ F 3 "" H 5050 1400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR?
+L VCC #PWR061
 U 1 1 53913BB3
 P 5650 1500
-F 0 "#PWR?" H 5650 1600 30  0001 C CNN
+F 0 "#PWR061" H 5650 1600 30  0001 C CNN
 F 1 "VCC" H 5650 1600 30  0000 C CNN
 F 2 "" H 5650 1500 60  0000 C CNN
 F 3 "" H 5650 1500 60  0000 C CNN
@@ -1176,18 +1100,14 @@ F 3 "" H 5650 1500 60  0000 C CNN
 	-1   0    0    -1  
 $EndComp
 Wire Wire Line
-	5050 1400 5050 1450
-Wire Wire Line
-	5050 1450 5050 1550
+	5050 1400 5050 1550
 Wire Wire Line
 	5650 1500 5650 1550
 Wire Wire Line
 	5050 1750 5050 1800
 Connection ~ 5050 1800
 Wire Wire Line
-	5450 1800 5650 1800
-Wire Wire Line
-	5650 1800 5750 1800
+	5450 1800 5750 1800
 Wire Wire Line
 	5650 1750 5650 1800
 Connection ~ 5650 1800
@@ -1207,10 +1127,10 @@ Wire Wire Line
 	4900 1950 4900 1900
 Connection ~ 4900 1900
 $Comp
-L RES R?
+L RES R30
 U 1 1 53914ED3
 P 6850 2250
-F 0 "R?" H 6820 2310 39  0000 C CNN
+F 0 "R30" H 6820 2310 39  0000 C CNN
 F 1 "10k" H 6850 2250 30  0000 C CNN
 F 2 "" H 6850 2250 60  0000 C CNN
 F 3 "" H 6850 2250 60  0000 C CNN
@@ -1218,10 +1138,10 @@ F 3 "" H 6850 2250 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L RES R?
+L RES R29
 U 1 1 53914EDA
 P 6250 2250
-F 0 "R?" H 6220 2310 39  0000 C CNN
+F 0 "R29" H 6220 2310 39  0000 C CNN
 F 1 "10k" H 6250 2250 30  0000 C CNN
 F 2 "" H 6250 2250 60  0000 C CNN
 F 3 "" H 6250 2250 60  0000 C CNN
@@ -1229,10 +1149,10 @@ F 3 "" H 6250 2250 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GEN_MOSFET_N Q?
+L GEN_MOSFET_N Q2
 U 1 1 53914EE0
 P 6500 2250
-F 0 "Q?" H 6600 2350 40  0000 R CNN
+F 0 "Q2" H 6600 2350 40  0000 R CNN
 F 1 "BSS138" H 6600 2150 40  0000 R CNN
 F 2 "" H 6500 2250 60  0000 C CNN
 F 3 "" H 6500 2250 60  0000 C CNN
@@ -1240,10 +1160,10 @@ F 3 "" H 6500 2250 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +1.8V #PWR?
+L +1.8V #PWR062
 U 1 1 53914EE6
 P 6250 2000
-F 0 "#PWR?" H 6250 2140 20  0001 C CNN
+F 0 "#PWR062" H 6250 2140 20  0001 C CNN
 F 1 "+1.8V" H 6250 2110 30  0000 C CNN
 F 2 "" H 6250 2000 60  0000 C CNN
 F 3 "" H 6250 2000 60  0000 C CNN
@@ -1251,10 +1171,10 @@ F 3 "" H 6250 2000 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR?
+L VCC #PWR063
 U 1 1 53914EEC
 P 6850 2100
-F 0 "#PWR?" H 6850 2200 30  0001 C CNN
+F 0 "#PWR063" H 6850 2200 30  0001 C CNN
 F 1 "VCC" H 6850 2200 30  0000 C CNN
 F 2 "" H 6850 2100 60  0000 C CNN
 F 3 "" H 6850 2100 60  0000 C CNN
@@ -1262,18 +1182,14 @@ F 3 "" H 6850 2100 60  0000 C CNN
 	-1   0    0    -1  
 $EndComp
 Wire Wire Line
-	6250 2000 6250 2050
-Wire Wire Line
-	6250 2050 6250 2150
+	6250 2000 6250 2150
 Wire Wire Line
 	6850 2100 6850 2150
 Wire Wire Line
 	6250 2350 6250 2400
 Connection ~ 6250 2400
 Wire Wire Line
-	6650 2400 6850 2400
-Wire Wire Line
-	6850 2400 6950 2400
+	6650 2400 6950 2400
 Wire Wire Line
 	6850 2350 6850 2400
 Connection ~ 6850 2400
@@ -1285,10 +1201,10 @@ Connection ~ 6250 2050
 Text Notes 6350 2700 0    60   ~ 0
 Do we need the PPS ?
 $Comp
-L RES R?
+L RES R10
 U 1 1 539167ED
 P 5650 3150
-F 0 "R?" H 5620 3210 39  0000 C CNN
+F 0 "R10" H 5620 3210 39  0000 C CNN
 F 1 "10k" H 5650 3150 30  0000 C CNN
 F 2 "" H 5650 3150 60  0000 C CNN
 F 3 "" H 5650 3150 60  0000 C CNN
@@ -1296,10 +1212,10 @@ F 3 "" H 5650 3150 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L RES R?
+L RES R3
 U 1 1 539168AA
 P 5650 2750
-F 0 "R?" H 5620 2810 39  0000 C CNN
+F 0 "R3" H 5620 2810 39  0000 C CNN
 F 1 "10k" H 5650 2750 30  0000 C CNN
 F 2 "" H 5650 2750 60  0000 C CNN
 F 3 "" H 5650 2750 60  0000 C CNN
@@ -1307,10 +1223,10 @@ F 3 "" H 5650 2750 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +1.8V #PWR?
+L +1.8V #PWR064
 U 1 1 53916F6D
 P 5650 2600
-F 0 "#PWR?" H 5650 2740 20  0001 C CNN
+F 0 "#PWR064" H 5650 2740 20  0001 C CNN
 F 1 "+1.8V" H 5650 2710 30  0000 C CNN
 F 2 "" H 5650 2600 60  0000 C CNN
 F 3 "" H 5650 2600 60  0000 C CNN
@@ -1318,10 +1234,10 @@ F 3 "" H 5650 2600 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR065
 U 1 1 53916FCF
 P 5650 3300
-F 0 "#PWR?" H 5650 3300 30  0001 C CNN
+F 0 "#PWR065" H 5650 3300 30  0001 C CNN
 F 1 "GND" H 5650 3230 30  0001 C CNN
 F 2 "" H 5650 3300 60  0000 C CNN
 F 3 "" H 5650 3300 60  0000 C CNN
@@ -1340,4 +1256,8 @@ Wire Wire Line
 	5650 3000 5650 3050
 Text Notes 1100 1750 0    40   ~ 0
 External antenna matching filter
+NoConn ~ 4300 2700
+Wire Wire Line
+	10150 2800 10050 2800
+Connection ~ 10050 2800
 $EndSCHEMATC
--- a/hw/freewatch_v1/usb_power.sch
+++ b/hw/freewatch_v1/usb_power.sch
@@ -816,10 +816,10 @@ Connection ~ 9450 3650
 Text Notes 8350 4100 0    60   ~ 0
 TPS73430 is pin compatible and 250mA
 $Comp
-L TPS780180300 U?
+L TPS780180300 U5
 U 1 1 539156EB
 P 8250 2000
-F 0 "U?" H 8800 2150 60  0000 C CNN
+F 0 "U5" H 8800 2150 60  0000 C CNN
 F 1 "TPS780180300" H 8800 1450 60  0000 C CNN
 F 2 "" H 8250 2000 60  0000 C CNN
 F 3 "" H 8250 2000 60  0000 C CNN
@@ -827,10 +827,10 @@ F 3 "" H 8250 2000 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CAP C?
+L CAP C9
 U 1 1 539156F2
 P 7950 2100
-F 0 "C?" V 7900 2150 39  0000 C CNN
+F 0 "C9" V 7900 2150 39  0000 C CNN
 F 1 "1uF" V 8000 2200 39  0000 C CNN
 F 2 "" H 7950 2100 60  0000 C CNN
 F 3 "" H 7950 2100 60  0000 C CNN
@@ -838,10 +838,10 @@ F 3 "" H 7950 2100 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR020
 U 1 1 539156F9
 P 7950 2250
-F 0 "#PWR?" H 7950 2250 30  0001 C CNN
+F 0 "#PWR020" H 7950 2250 30  0001 C CNN
 F 1 "GND" H 7950 2180 30  0001 C CNN
 F 2 "" H 7950 2250 60  0000 C CNN
 F 3 "" H 7950 2250 60  0000 C CNN
@@ -849,10 +849,10 @@ F 3 "" H 7950 2250 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR021
 U 1 1 539156FF
 P 8150 2450
-F 0 "#PWR?" H 8150 2450 30  0001 C CNN
+F 0 "#PWR021" H 8150 2450 30  0001 C CNN
 F 1 "GND" H 8150 2380 30  0001 C CNN
 F 2 "" H 8150 2450 60  0000 C CNN
 F 3 "" H 8150 2450 60  0000 C CNN
@@ -860,10 +860,10 @@ F 3 "" H 8150 2450 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CAP C?
+L CAP C17
 U 1 1 53915705
 P 9650 2150
-F 0 "C?" V 9600 2200 39  0000 C CNN
+F 0 "C17" V 9600 2200 39  0000 C CNN
 F 1 "4.7uF" V 9700 2250 39  0000 C CNN
 F 2 "" H 9650 2150 60  0000 C CNN
 F 3 "" H 9650 2150 60  0000 C CNN
@@ -871,10 +871,10 @@ F 3 "" H 9650 2150 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR022
 U 1 1 5391570C
 P 9650 2300
-F 0 "#PWR?" H 9650 2300 30  0001 C CNN
+F 0 "#PWR022" H 9650 2300 30  0001 C CNN
 F 1 "GND" H 9650 2230 30  0001 C CNN
 F 2 "" H 9650 2300 60  0000 C CNN
 F 3 "" H 9650 2300 60  0000 C CNN
@@ -908,10 +908,10 @@ Connection ~ 8150 2400
 Wire Wire Line
 	7950 2000 8250 2000
 $Comp
-L +1.8V #PWR?
+L +1.8V #PWR023
 U 1 1 53915721
 P 9650 1950
-F 0 "#PWR?" H 9650 2090 20  0001 C CNN
+F 0 "#PWR023" H 9650 2090 20  0001 C CNN
 F 1 "+1.8V" H 9650 2060 30  0000 C CNN
 F 2 "" H 9650 1950 60  0000 C CNN
 F 3 "" H 9650 1950 60  0000 C CNN
@@ -919,10 +919,10 @@ F 3 "" H 9650 1950 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR?
+L VCC #PWR024
 U 1 1 53915727
 P 7950 1950
-F 0 "#PWR?" H 7950 2050 30  0001 C CNN
+F 0 "#PWR024" H 7950 2050 30  0001 C CNN
 F 1 "VCC" H 7950 2050 30  0000 C CNN
 F 2 "" H 7950 1950 60  0000 C CNN
 F 3 "" H 7950 1950 60  0000 C CNN
@@ -932,10 +932,10 @@ $EndComp
 Wire Wire Line
 	7950 1950 7950 2000
 $Comp
-L VCC #PWR?
+L VCC #PWR025
 U 1 1 5391572E
 P 9450 2150
-F 0 "#PWR?" H 9450 2250 30  0001 C CNN
+F 0 "#PWR025" H 9450 2250 30  0001 C CNN
 F 1 "VCC" H 9450 2250 30  0000 C CNN
 F 2 "" H 9450 2150 60  0000 C CNN
 F 3 "" H 9450 2150 60  0000 C CNN

--- a/hw/kicad-pcb-lib/freewatch.pretty/M10478-A1.kicad_mod
+++ b/hw/kicad-pcb-lib/freewatch.pretty/M10478-A1.kicad_mod
@@ -5,7 +5,7 @@
  (fp_text value VAL** (at 0 15.25) (layer F.SilkS) hide
    (effects (font (size 1 1) (thickness 0.15)))
  )
-  (fp_text user "ECO1 = GND clearance" (at 15.35 0.9) (layer F.SilkS)
+  (fp_text user "ECO1 = GND clearance" (at 15.35 0.9) (layer F.SilkS) hide
    (effects (font (size 1 1) (thickness 0.15)))
  )
  (fp_line (start -3 -0.6) (end -3 4.25) (layer Eco1.User) (width 0.17))

--- a/hw/kicad-sch-lib/freewatch.lib
+++ b/hw/kicad-sch-lib/freewatch.lib
@@ -204,9 +204,9 @@ P 3 0 1 0  125 0  150 0  150 -50 N
 P 3 0 1 0  165 -5  185 -5  175 10 F
 P 4 0 1 0  140 10  140 -10  130 0  140 10 N
 P 4 0 1 0  150 75  175 75  175 -75  150 -75 N
-X D D 150 150 100 D 40 40 1 1 P
-X G G 0 0 100 R 40 40 1 1 I
-X S S 150 -150 100 U 40 40 1 1 P
+X G 1 0 0 100 R 40 40 1 1 I
+X S 2 150 -150 100 U 40 40 1 1 P
+X D 3 150 150 100 D 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #

--- a/hw/kicad_feedback.txt
+++ b/hw/kicad_feedback.txt
@@ -116,4 +116,5 @@ OpenGL
 * Can't resize trace (drag the end).
 * Bottom solder mask is under top copper and solder mask when bottom layer is selected.
 * Ratsnest not refresh when re-loading the netlist.
+* Component lock doesn't work (can still move locked components).
 *