Upstream merge to make new revision of PortaPack work (#206)

* Power: Turn off additional peripheral clock branches. * Update schematic with new symbol table and KiCad standard symbols. Fix up wires. * Schematic: Update power net labels. * Schematic: Update footprint names to match library changes. * Schematic: Update header vendor and part numbers. * Schematic: Specify (arbitrary) value for PDN# net. * Schematic: Remove fourth fiducial. Not standard practice, and was taking up valuable board space. * Schematic: Add reference oscillator -- options for clipped sine or HCMOS output. * Schematic: Update copyright year. * Schematic: Remove CLKOUT to CPLD. It was a half-baked idea. * Schematic: Add (experimental) GPS circuit. Add note about charging circuit. Update date and revision to match PCB. * PCB: Update from schematic change: now revision 20180819. Diff was extensive due to net renumbering... * PCB: Fix GPS courtyard to accommodate crazy solder paste recommendation in integration manual. PCB: Address DRC clearance violation between via and oscillator pad. * PCB: Update copyright on drawing. * Update schematic and PCB date and revision. * gitignore: Sublime Text editor project/workspace files * Power: Power up or power down peripheral clock at appropriate times, so firmware doesn't freeze... * Clocking: Fix incorrect shift for CGU IDIVx_CTRL.PD field. * LPC43xx: Add CGU IDIVx struct/union type. * Power: Switch off unused IDIV dividers. Make note of active IDIVs and their use. * HackRF Mode: Upgrade firmware to 2018.01.1 (API 1.02) * MAX V CPLD: Refactor class to look more like Xilinx CoolRunner II CPLD class. * MAX V CPLD: Add BYPASS, SAMPLE support. Rename enter_isp -> enable, exit_isp -> disable. Use SAMPLE at start of flash process, which somehow addresses the problem where CFM wouldn't load into SRAM (and become the active bitstream) after flashing. * MAX V CPLD: Reverse verify data checking logic to make it a little faster. * CPLD: After reprogramming flash, immediately clamp I/O signals, load to SRAM, and "execute" the new bitstream. * Si5351: Refactor code, make one of the registers more type-safe. Clock Manager: Track selected reference clock source for later use in user interface. * Clock Manager: Add note about PPM only affecting Si5351C PLLA, which always runs from the HackRF 25MHz crystal. It is assumed an external clock does not need adjustment, though I am open to being convinced otherwise... * PPM UI: Show "EXT" when showing PPM adjustment and reference clock is external. * CPLD: Add pins and logic for new PortaPack hardware feature(s). * CPLD: Bitstream to support new hardware features. * Clock Generator: Add a couple more setter methods for ClockControl registers. * Clock Manager: Use shared MCU CLKIN clock control configuration constant. * Clock Manager: Reduce MCU CLKIN driver current. 2mA should be plenty. * Clock Manager: Remove redundant clock generator output enable. * Bootstrap: Remove unnecessary ldscript hack to locate SPIFI mode change code in RAM. * Bootstrap: Get CPU operating at max frequency as soon as possible. Update SPIFI speed comment. Make some more LPC43xx types into unions with uint32_t. * Bootstrap: Explicitly configure IDIVB for SPIFI, despite LPC43xx bootloader setting it. * Clock Manager: Init peripherals before CPLD reconfig. Do the clock generator setup after, so we can check presence of PortaPack reference clock with the help of the latest CPLD bitstream. * Clock Manager: Reverse sense of conditional that determines crystal or non-crystal reference source. This is for an expected upcoming change where multiple external options can be differentiated. * Bootstrap: Consolidate clock configuration, update SPIFI rate comment. * Clock Manager: Use IDIVA for clock source for all peripherals, instead of PLL1. Should make switching easier going forward. Don't use IRC as clock during initial clock manager configuration. Until we switch to GP_CLKIN, we should go flat out... * ChibiOS M0: Change default clock speed to 204MHz, since bootstrap now maxes out clock speed before starting M0 execution. * PortaPack IO: Expose method to set reference oscillator enable pin. * Pin configuration: Do SPIFI pin config with other pins, in preparation for eliminating separate bootloader. * Pin configuration: Disable input buffers on pins that are never read. * Revert "ChibiOS M0: Change default clock speed to 204MHz, since bootstrap now maxes out clock speed before starting M0 execution." This reverts commit c0e2bb6cc4cc656769323bdbb8ee5a16d2d5bb03. * Remove unused board files. * Add LPC43xx functions. * chibios: Replace code with per-peripheral structs defining clocks, interrupts, and reset bits. * LPC43xx: Add MCPWM peripheral struct. * clock generator: Use recommended PLL reset register value. Datasheet recommends a value. AN619 is quiet on the topic, claims the low nibble is default 0b0000. * GPIO: Tweak masking of SCU function. I don't remember why I thought this was necessary... * HAL: Explicitly turn on timer peripheral clocks used as systicks, during init. * SCU: Add struct to hold pin configuration. * PAL: Add functions to address The Glitch. https://greatscottgadgets.com/2018/02-28-we-fixed-the-glitch/ * PAL/board: New IO initialization code Declare initial state for SCU pin config, GPIOs. Apply initial state during PAL init. Perform VAA slow turn-on to address The Glitch. * Merge M0 and M4 to eliminate need for bootstrap firmware During _early_init, detect if we're running on the M4 or M0. If M4: do M4-specific core initialization, reset peripherals, speed up SPIFI clock, start M0, go to sleep. If M0: do all the other things. * Pins: Miscellaneous SCU configuration tweaks. * Little code clarity improvement. * bootstrap: Remove, not necessary. * Clock Manager: Large re-working to support external references. * Fix merge conflicts
2026-09-10 08:39:29 +00:00 · 2019-01-11 07:56:21 +01:00
parent bbb5dc3c12
commit 920b98f7c9
71 changed files with 9292 additions and 7067 deletions
@@ -1,46 +1,26 @@
-EESchema Schematic File Version 2
-LIBS:portapack_h1-rescue
-LIBS:hackrf_expansion
-LIBS:passive
-LIBS:supply
-LIBS:trs_jack
-LIBS:battery
-LIBS:sd
-LIBS:ck
-LIBS:altera
-LIBS:regulator
-LIBS:tp
-LIBS:header
-LIBS:hole
-LIBS:sharebrained
-LIBS:fiducial
-LIBS:eastrising
-LIBS:on_semi
-LIBS:asahi_kasei
-LIBS:ti
-LIBS:diode
+EESchema Schematic File Version 4
 LIBS:portapack_h1-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 2 5
+Sheet 2 6
 Title "PortaPack H1"
-Date "2017-05-22"
-Rev "20170522"
+Date "2018-08-20"
+Rev "20180820"
 Comp "ShareBrained Technology, Inc."
-Comment1 "Copyright © 2014-2017 Jared Boone"
+Comment1 "Copyright © 2014-2018 Jared Boone"
 Comment2 "License: GNU General Public License, version 2"
 Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L R R11
+L Device:R R11
 U 1 1 53A8C264
 P 6800 2400
 F 0 "R11" V 6880 2400 50  0000 C CNN
 F 1 "33R" V 6800 2400 50  0000 C CNN
-F 2 "ipc_resc:IPC_RESC1608X55L25N" H 6800 2400 60  0001 C CNN
+F 2 "ipc_resc:IPC_RESC160X80X55L25N" H 6800 2400 60  0001 C CNN
 F 3 "" H 6800 2400 60  0000 C CNN
 F 4 "Yageo" V 6800 2400 60  0001 C CNN "Mfr"
 F 5 "RC0603FR-0733RL" V 6800 2400 60  0001 C CNN "Part"
@@ -48,12 +28,12 @@ F 5 "RC0603FR-0733RL" V 6800 2400 60  0001 C CNN "Part"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L R R12
+L Device:R R12
 U 1 1 53A8C26A
 P 6400 2400
 F 0 "R12" V 6480 2400 50  0000 C CNN
 F 1 "33R" V 6400 2400 50  0000 C CNN
-F 2 "ipc_resc:IPC_RESC1608X55L25N" H 6400 2400 60  0001 C CNN
+F 2 "ipc_resc:IPC_RESC160X80X55L25N" H 6400 2400 60  0001 C CNN
 F 3 "" H 6400 2400 60  0000 C CNN
 F 4 "Yageo" V 6400 2400 60  0001 C CNN "Mfr"
 F 5 "RC0603FR-0733RL" V 6400 2400 60  0001 C CNN "Part"
@@ -61,7 +41,7 @@ F 5 "RC0603FR-0733RL" V 6400 2400 60  0001 C CNN "Part"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR02
+L power:GND #PWR02
 U 1 1 53A8C270
 P 6800 2750
 F 0 "#PWR02" H 6800 2750 30  0001 C CNN
@@ -72,7 +52,7 @@ F 3 "" H 6800 2750 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR03
+L power:GND #PWR03
 U 1 1 53A8C276
 P 6400 2750
 F 0 "#PWR03" H 6400 2750 30  0001 C CNN
@@ -87,12 +67,12 @@ LHPOUT
 Text Label 7000 1500 0    60   ~ 0
 RHPOUT
 $Comp
-L C C22
+L Device:C C22
 U 1 1 53A8C27E
 P 6800 1850
 F 0 "C22" H 6850 1950 50  0000 L CNN
 F 1 "220N" H 6850 1750 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC1608X90L35N" H 6800 1850 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC160X80X90L35N" H 6800 1850 60  0001 C CNN
 F 3 "" H 6800 1850 60  0000 C CNN
 F 4 "Murata" H 6800 1850 60  0001 C CNN "Mfr"
 F 5 "GRM188R71A224KA01D" H 6800 1850 60  0001 C CNN "Part"
@@ -100,12 +80,12 @@ F 5 "GRM188R71A224KA01D" H 6800 1850 60  0001 C CNN "Part"
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C23
+L Device:C C23
 U 1 1 53A8C284
 P 6400 1850
 F 0 "C23" H 6450 1950 50  0000 L CNN
 F 1 "220N" H 6450 1750 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC1608X90L35N" H 6400 1850 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC160X80X90L35N" H 6400 1850 60  0001 C CNN
 F 3 "" H 6400 1850 60  0000 C CNN
 F 4 "Murata" H 6400 1850 60  0001 C CNN "Mfr"
 F 5 "GRM188R71A224KA01D" H 6400 1850 60  0001 C CNN "Part"
@@ -113,12 +93,12 @@ F 5 "GRM188R71A224KA01D" H 6400 1850 60  0001 C CNN "Part"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R18
+L Device:R R18
 U 1 1 53A8C29C
 P 5000 5650
 F 0 "R18" V 5080 5650 50  0000 C CNN
 F 1 "2K2" V 5000 5650 50  0000 C CNN
-F 2 "ipc_resc:IPC_RESC1608X55L25N" H 5000 5650 60  0001 C CNN
+F 2 "ipc_resc:IPC_RESC160X80X55L25N" H 5000 5650 60  0001 C CNN
 F 3 "" H 5000 5650 60  0000 C CNN
 F 4 "Yageo" V 5000 5650 60  0001 C CNN "Mfr"
 F 5 "RC0603FR-072K2L" V 5000 5650 60  0001 C CNN "Part"
@@ -126,12 +106,12 @@ F 5 "RC0603FR-072K2L" V 5000 5650 60  0001 C CNN "Part"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L C C25
+L Device:C C25
 U 1 1 53A8C2A2
 P 4700 5600
 F 0 "C25" H 4750 5700 50  0000 L CNN
 F 1 "1U" H 4750 5500 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC1608X90L35N" H 4700 5600 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC160X80X90L35N" H 4700 5600 60  0001 C CNN
 F 3 "" H 4700 5600 60  0000 C CNN
 F 4 "Murata" H 4700 5600 60  0001 C CNN "Mfr"
 F 5 "GRM188R61C105KA93D" H 4700 5600 60  0001 C CNN "Part"
@@ -139,7 +119,7 @@ F 5 "GRM188R61C105KA93D" H 4700 5600 60  0001 C CNN "Part"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L TRRS_SW_JACK P2
+L trs_jack:TRRS_SW_JACK P2
 U 1 1 53A8C2C6
 P 10550 2100
 F 0 "P2" H 10100 2100 60  0000 C CNN
@@ -152,12 +132,12 @@ F 5 "SJ-43514-SMT" H 10550 2100 60  0001 C CNN "Part"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L C C6
+L Device:C C6
 U 1 1 53A8C687
 P 2800 3300
 F 0 "C6" H 2850 3400 50  0000 L CNN
 F 1 "2U2" H 2850 3200 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC1608X90L35N" H 2800 3300 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC160X80X90L35N" H 2800 3300 60  0001 C CNN
 F 3 "" H 2800 3300 60  0000 C CNN
 F 4 "Murata" H 2800 3300 60  0001 C CNN "Mfr"
 F 5 "GRM188R61C225KE15D" H 2800 3300 60  0001 C CNN "Part"
@@ -165,12 +145,12 @@ F 5 "GRM188R61C225KE15D" H 2800 3300 60  0001 C CNN "Part"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L C C10
+L Device:C C10
 U 1 1 53A8C68D
 P 3100 4000
 F 0 "C10" H 3150 4100 50  0000 L CNN
 F 1 "2U2" H 3150 3900 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC1608X90L35N" H 3100 4000 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC160X80X90L35N" H 3100 4000 60  0001 C CNN
 F 3 "" H 3100 4000 60  0000 C CNN
 F 4 "Murata" H 3100 4000 60  0001 C CNN "Mfr"
 F 5 "GRM188R61C225KE15D" H 3100 4000 60  0001 C CNN "Part"
@@ -178,12 +158,12 @@ F 5 "GRM188R61C225KE15D" H 3100 4000 60  0001 C CNN "Part"
 	0    -1   1    0   
 $EndComp
 $Comp
-L C C3
+L Device:C C3
 U 1 1 53A8C69F
 P 2300 7200
 F 0 "C3" H 2350 7300 50  0000 L CNN
 F 1 "100N" H 2350 7100 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC1005X55L25N" H 2300 7200 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC100X50X55L25N" H 2300 7200 60  0001 C CNN
 F 3 "" H 2300 7200 60  0000 C CNN
 F 4 "Murata" H 2300 7200 60  0001 C CNN "Mfr"
 F 5 "GRM155R61A104KA01" H 2300 7200 60  0001 C CNN "Part"
@@ -191,12 +171,12 @@ F 5 "GRM155R61A104KA01" H 2300 7200 60  0001 C CNN "Part"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L C C2
+L Device:C C2
 U 1 1 53A8C6A5
 P 1200 7200
 F 0 "C2" H 1250 7300 50  0000 L CNN
 F 1 "100N" H 1250 7100 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC1005X55L25N" H 1200 7200 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC100X50X55L25N" H 1200 7200 60  0001 C CNN
 F 3 "" H 1200 7200 60  0000 C CNN
 F 4 "Murata" H 1200 7200 60  0001 C CNN "Mfr"
 F 5 "GRM155R61A104KA01" H 1200 7200 60  0001 C CNN "Part"
@@ -204,12 +184,12 @@ F 5 "GRM155R61A104KA01" H 1200 7200 60  0001 C CNN "Part"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L C C5
+L Device:C C5
 U 1 1 53A8C6AB
 P 4500 7200
 F 0 "C5" H 4550 7300 50  0000 L CNN
 F 1 "100N" H 4550 7100 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC1005X55L25N" H 4500 7200 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC100X50X55L25N" H 4500 7200 60  0001 C CNN
 F 3 "" H 4500 7200 60  0000 C CNN
 F 4 "Murata" H 4500 7200 60  0001 C CNN "Mfr"
 F 5 "GRM155R61A104KA01" H 4500 7200 60  0001 C CNN "Part"
@@ -217,12 +197,12 @@ F 5 "GRM155R61A104KA01" H 4500 7200 60  0001 C CNN "Part"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L C C4
+L Device:C C4
 U 1 1 53A8C6B1
 P 3400 7200
 F 0 "C4" H 3450 7300 50  0000 L CNN
 F 1 "100N" H 3450 7100 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC1005X55L25N" H 3400 7200 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC100X50X55L25N" H 3400 7200 60  0001 C CNN
 F 3 "" H 3400 7200 60  0000 C CNN
 F 4 "Murata" H 3400 7200 60  0001 C CNN "Mfr"
 F 5 "GRM155R61A104KA01" H 3400 7200 60  0001 C CNN "Part"
@@ -230,7 +210,7 @@ F 5 "GRM155R61A104KA01" H 3400 7200 60  0001 C CNN "Part"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR04
+L power:GND #PWR04
 U 1 1 53A8C6B7
 P 1200 7500
 F 0 "#PWR04" H 1200 7500 30  0001 C CNN
@@ -241,7 +221,7 @@ F 3 "" H 1200 7500 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR05
+L power:GND #PWR05
 U 1 1 53A8C6BD
 P 2300 7500
 F 0 "#PWR05" H 2300 7500 30  0001 C CNN
@@ -252,7 +232,7 @@ F 3 "" H 2300 7500 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR06
+L power:GND #PWR06
 U 1 1 53A8C6C3
 P 3400 7500
 F 0 "#PWR06" H 3400 7500 30  0001 C CNN
@@ -263,7 +243,7 @@ F 3 "" H 3400 7500 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR07
+L power:GND #PWR07
 U 1 1 53A8C6E9
 P 4500 7500
 F 0 "#PWR07" H 4500 7500 30  0001 C CNN
@@ -274,12 +254,12 @@ F 3 "" H 4500 7500 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C12
+L Device:C C12
 U 1 1 53A8C6F0
 P 3100 4300
 F 0 "C12" H 3150 4400 50  0000 L CNN
 F 1 "2U2" H 3150 4200 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC1608X90L35N" H 3100 4300 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC160X80X90L35N" H 3100 4300 60  0001 C CNN
 F 3 "" H 3100 4300 60  0000 C CNN
 F 4 "Murata" H 3100 4300 60  0001 C CNN "Mfr"
 F 5 "GRM188R61C225KE15D" H 3100 4300 60  0001 C CNN "Part"
@@ -287,12 +267,12 @@ F 5 "GRM188R61C225KE15D" H 3100 4300 60  0001 C CNN "Part"
 	0    -1   1    0   
 $EndComp
 $Comp
-L C C8
+L Device:C C8
 U 1 1 53A8C6F6
 P 3900 3100
 F 0 "C8" H 3950 3200 50  0000 L CNN
 F 1 "2U2" H 3950 3000 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC1608X90L35N" H 3900 3100 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC160X80X90L35N" H 3900 3100 60  0001 C CNN
 F 3 "" H 3900 3100 60  0000 C CNN
 F 4 "Murata" H 3900 3100 60  0001 C CNN "Mfr"
 F 5 "GRM188R61C225KE15D" H 3900 3100 60  0001 C CNN "Part"
@@ -300,12 +280,12 @@ F 5 "GRM188R61C225KE15D" H 3900 3100 60  0001 C CNN "Part"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L C C7
+L Device:C C7
 U 1 1 53A8C70E
 P 1600 7200
 F 0 "C7" H 1650 7300 50  0000 L CNN
 F 1 "10U" H 1650 7100 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC2012X135L45N" H 1600 7200 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC200X125X135L45N" H 1600 7200 60  0001 C CNN
 F 3 "" H 1600 7200 60  0000 C CNN
 F 4 "Murata" H 1600 7200 60  0001 C CNN "Mfr"
 F 5 "GRM21BR61A106KE19" H 1600 7200 60  0001 C CNN "Part"
@@ -313,7 +293,7 @@ F 5 "GRM21BR61A106KE19" H 1600 7200 60  0001 C CNN "Part"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR08
+L power:GND #PWR08
 U 1 1 53A8C714
 P 4900 7500
 F 0 "#PWR08" H 4900 7500 30  0001 C CNN
@@ -324,7 +304,7 @@ F 3 "" H 4900 7500 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR09
+L power:GND #PWR09
 U 1 1 53A8C71A
 P 3800 7500
 F 0 "#PWR09" H 3800 7500 30  0001 C CNN
@@ -335,12 +315,12 @@ F 3 "" H 3800 7500 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C13
+L Device:C C13
 U 1 1 53A8C720
 P 4900 7200
 F 0 "C13" H 4950 7300 50  0000 L CNN
 F 1 "10U" H 4950 7100 50  0001 L CNN
-F 2 "ipc_capc:IPC_CAPC2012X135L45N" H 4900 7200 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC200X125X135L45N" H 4900 7200 60  0001 C CNN
 F 3 "" H 4900 7200 60  0000 C CNN
 F 4 "Murata" H 4900 7200 60  0001 C CNN "Mfr"
 F 5 "GRM21BR61A106KE19" H 4900 7200 60  0001 C CNN "Part"
@@ -349,7 +329,7 @@ F 6 "DNP" H 5000 7100 50  0000 C CNN "DNP"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR010
+L power:GND #PWR010
 U 1 1 53A8C726
 P 1600 7500
 F 0 "#PWR010" H 1600 7500 30  0001 C CNN
@@ -360,12 +340,12 @@ F 3 "" H 1600 7500 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C11
+L Device:C C11
 U 1 1 53A8C72C
 P 3800 7200
 F 0 "C11" H 3850 7300 50  0000 L CNN
 F 1 "10U" H 3850 7100 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC2012X135L45N" H 3800 7200 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC200X125X135L45N" H 3800 7200 60  0001 C CNN
 F 3 "" H 3800 7200 60  0000 C CNN
 F 4 "Murata" H 3800 7200 60  0001 C CNN "Mfr"
 F 5 "GRM21BR61A106KE19" H 3800 7200 60  0001 C CNN "Part"
@@ -391,7 +371,7 @@ SDTI
 Text HLabel 7200 3600 2    60   BiDi ~ 0
 BICK
 $Comp
-L GND #PWR011
+L power:GND #PWR011
 U 1 1 58AF7E95
 P 2700 3800
 F 0 "#PWR011" H 2700 3800 30  0001 C CNN
@@ -402,7 +382,7 @@ F 3 "" H 2700 3800 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR012
+L power:GND #PWR012
 U 1 1 58AF81BD
 P 5200 2800
 F 0 "#PWR012" H 5200 2800 30  0001 C CNN
@@ -413,7 +393,7 @@ F 3 "" H 5200 2800 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR013
+L power:GND #PWR013
 U 1 1 58AF82A8
 P 3800 3400
 F 0 "#PWR013" H 3800 3400 30  0001 C CNN
@@ -424,7 +404,7 @@ F 3 "" H 3800 3400 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L AK4951EN U1
+L asahi_kasei:AK4951EN U1
 U 1 1 58CC98F8
 P 4850 3750
 F 0 "U1" V 4950 3750 60  0000 C CNN
@@ -465,12 +445,12 @@ CN
 Text HLabel 7200 3900 2    60   Input ~ 0
 PDN#
 $Comp
-L R R2
+L Device:R R2
 U 1 1 58CF5E5F
 P 5400 5050
 F 0 "R2" V 5480 5050 50  0000 C CNN
-F 1 "R" V 5400 5050 50  0001 C CNN
-F 2 "ipc_resc:IPC_RESC1608X55L25N" H 5400 5050 60  0001 C CNN
+F 1 "10K" V 5400 5050 50  0001 C CNN
+F 2 "ipc_resc:IPC_RESC160X80X55L25N" H 5400 5050 60  0001 C CNN
 F 3 "" H 5400 5050 60  0000 C CNN
 F 4 "Yageo" V 5400 5050 60  0001 C CNN "Mfr"
 F 5 "DNP" V 5400 5050 50  0000 C CNN "DNP"
@@ -478,7 +458,7 @@ F 5 "DNP" V 5400 5050 50  0000 C CNN "DNP"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR014
+L power:GND #PWR014
 U 1 1 58CF6206
 P 5400 5400
 F 0 "#PWR014" H 5400 5400 30  0001 C CNN
@@ -495,7 +475,7 @@ Init: power down, EXT slave, PLL off\nBICK, LRCK: inputs
 Text Notes 8800 6200 0    60   ~ 0
 Input float OK: [LR]IN[123] 
 $Comp
-L GND #PWR015
+L power:GND #PWR015
 U 1 1 58D2C845
 P 3900 4300
 F 0 "#PWR015" H 3900 4300 30  0001 C CNN
@@ -506,7 +486,7 @@ F 3 "" H 3900 4300 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L NUF4220MN U5
+L esd:NUF4220MN U5
 U 1 1 58D9A047
 P 9700 3250
 F 0 "U5" H 9400 3550 60  0000 L CNN
@@ -519,7 +499,7 @@ F 5 "NUF4220MNT1G" H 9700 3250 60  0001 C CNN "Part"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR016
+L power:GND #PWR016
 U 1 1 53A8C2CC
 P 9700 3800
 F 0 "#PWR016" H 9700 3800 30  0001 C CNN
@@ -530,7 +510,7 @@ F 3 "" H 9700 3800 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR017
+L power:GND #PWR017
 U 1 1 58D9A87F
 P 9100 3200
 F 0 "#PWR017" H 9100 3200 30  0001 C CNN
@@ -565,7 +545,7 @@ RHPOUT
 Text Label 8700 3300 0    60   ~ 0
 MIC
 $Comp
-L TP TP1
+L tp:TP TP1
 U 1 1 58EDDA01
 P 3700 4800
 F 0 "TP1" H 3500 4800 60  0000 C CNN
@@ -576,7 +556,7 @@ F 3 "" H 3700 4800 60  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L TP TP2
+L tp:TP TP2
 U 1 1 58EDDAEE
 P 4500 4800
 F 0 "TP2" H 4300 4800 60  0000 C CNN
@@ -587,7 +567,7 @@ F 3 "" H 4500 4800 60  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L TP TP3
+L tp:TP TP3
 U 1 1 58EDDB69
 P 4600 4800
 F 0 "TP3" H 4400 4800 60  0000 C CNN
@@ -598,7 +578,7 @@ F 3 "" H 4600 4800 60  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L TP TP4
+L tp:TP TP4
 U 1 1 58EDDC3F
 P 4900 4800
 F 0 "TP4" H 4700 4800 60  0000 C CNN
@@ -609,7 +589,7 @@ F 3 "" H 4900 4800 60  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L TP TP5
+L tp:TP TP5
 U 1 1 58EDDCA8
 P 5000 4800
 F 0 "TP5" H 4800 4800 60  0000 C CNN
@@ -620,7 +600,7 @@ F 3 "" H 5000 4800 60  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L TP TP6
+L tp:TP TP6
 U 1 1 58EDDD10
 P 5100 4800
 F 0 "TP6" H 4900 4800 60  0000 C CNN
@@ -631,7 +611,7 @@ F 3 "" H 5100 4800 60  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L HEADER_1X3 J1
+L header:HEADER_1X3 J1
 U 1 1 58F82DA0
 P 5800 2100
 F 0 "J1" H 5800 1850 60  0000 C CNN
@@ -645,7 +625,7 @@ F 6 "DNP" H 5800 2100 60  0000 C CNN "DNP"
 	1    0    0    1   
 $EndComp
 $Comp
-L GND #PWR018
+L power:GND #PWR018
 U 1 1 58F8315C
 P 5400 2100
 F 0 "#PWR018" H 5400 2100 30  0001 C CNN
@@ -658,40 +638,16 @@ $EndComp
 Wire Wire Line
 	9000 1900 10300 1900
 Wire Wire Line
-	4600 1500 7600 1500
+	4600 1500 6400 1500
 Wire Wire Line
-	4700 1600 7600 1600
-Wire Wire Line
-	6400 2650 6400 2750
-Wire Wire Line
-	6800 2750 6800 2650
-Wire Wire Line
-	4500 7400 4500 7500
-Wire Wire Line
-	3400 7400 3400 7500
-Wire Wire Line
-	2300 7400 2300 7500
-Wire Wire Line
-	1200 7400 1200 7500
-Wire Wire Line
-	1600 7400 1600 7500
-Wire Wire Line
-	3800 7400 3800 7500
-Wire Wire Line
-	4900 7400 4900 7500
-Wire Wire Line
-	6400 1500 6400 1650
+	4700 1600 6800 1600
 Connection ~ 6400 1500
-Wire Wire Line
-	6800 2150 6800 2050
-Wire Wire Line
-	6400 2050 6400 2150
 Wire Wire Line
 	5200 2900 5200 2800
 Wire Wire Line
-	3800 3400 4000 3400
+	3800 3400 3900 3400
 Wire Wire Line
-	2700 3800 4000 3800
+	2700 3800 2800 3800
 Wire Wire Line
 	5700 3400 5800 3400
 Wire Wire Line
@@ -701,27 +657,13 @@ Wire Wire Line
 Wire Wire Line
 	4800 2900 4800 2800
 Wire Wire Line
-	1000 6900 1600 6900
-Wire Wire Line
-	1200 6900 1200 7000
-Wire Wire Line
-	1600 6900 1600 7000
+	1000 6900 1200 6900
 Connection ~ 1200 6900
 Wire Wire Line
-	2300 6900 2300 7000
-Wire Wire Line
-	3200 6900 3800 6900
-Wire Wire Line
-	3400 6900 3400 7000
-Wire Wire Line
-	3800 6900 3800 7000
+	3200 6900 3400 6900
 Connection ~ 3400 6900
 Wire Wire Line
-	4300 6900 4900 6900
-Wire Wire Line
-	4500 6900 4500 7000
-Wire Wire Line
-	4900 6900 4900 7000
+	4300 6900 4500 6900
 Connection ~ 4500 6900
 Wire Wire Line
 	4500 2600 4500 2900
@@ -733,12 +675,8 @@ Wire Wire Line
 	3100 3500 3100 3000
 Wire Wire Line
 	3100 3000 2800 3000
-Wire Wire Line
-	2800 3000 2800 3100
 Wire Wire Line
 	2800 3600 4000 3600
-Wire Wire Line
-	2800 3600 2800 3500
 Wire Wire Line
 	5700 4000 5800 4000
 Wire Wire Line
@@ -760,25 +698,13 @@ Wire Wire Line
 Wire Wire Line
 	5200 4600 5200 4700
 Wire Wire Line
-	5200 4700 6600 4700
+	5200 4700 5400 4700
 Wire Wire Line
 	4800 5300 4800 4600
-Wire Wire Line
-	5000 5300 5000 5400
-Wire Wire Line
-	4700 4600 4700 5400
-Wire Wire Line
-	5000 5900 5000 6000
 Wire Wire Line
 	5000 6000 4700 6000
-Wire Wire Line
-	4700 5800 4700 6400
 Connection ~ 4700 6000
-Wire Wire Line
-	5400 4700 5400 4800
 Connection ~ 5400 4700
-Wire Wire Line
-	5400 5300 5400 5400
 Wire Wire Line
 	4700 6400 5200 6400
 Wire Wire Line
@@ -793,8 +719,6 @@ Wire Wire Line
 	9000 2100 10300 2100
 Wire Wire Line
 	5000 5300 4800 5300
-Wire Wire Line
-	6800 1650 6800 1600
 Connection ~ 6800 1600
 Wire Wire Line
 	9000 2200 10100 2200
@@ -828,32 +752,20 @@ Wire Wire Line
 	5100 4700 5100 4600
 Wire Wire Line
 	3700 4100 4000 4100
-Wire Wire Line
-	3900 3300 3900 3400
 Connection ~ 3900 3400
-Wire Wire Line
-	3900 2600 3900 2900
 Wire Wire Line
 	3700 4100 3700 4700
 Wire Wire Line
 	4000 4000 3500 4000
 Wire Wire Line
 	3500 4000 3500 4300
-Wire Wire Line
-	3500 4300 3300 4300
 Wire Wire Line
 	4000 3900 3400 3900
 Wire Wire Line
 	3400 3900 3400 4000
 Wire Wire Line
-	3400 4000 3300 4000
-Wire Wire Line
-	2900 4000 2800 4000
-Wire Wire Line
-	2800 3800 2800 4300
+	2800 3800 2800 4000
 Connection ~ 2800 3800
-Wire Wire Line
-	2800 4300 2900 4300
 Connection ~ 2800 4000
 Wire Wire Line
 	5500 2000 4900 2000
@@ -866,12 +778,12 @@ Wire Wire Line
 Wire Wire Line
 	5500 2100 5400 2100
 $Comp
-L RPACK4 RP1
+L passive:RPACK4 RP1
 U 1 1 58F9564A
 P 6900 3750
 F 0 "RP1" H 6900 4000 60  0000 C CNN
 F 1 "220R" H 6900 3500 60  0000 C CNN
-F 2 "ipc_resc:IPC_RESCAXS8P80_320X160X60L30X45N" H 6900 3750 60  0001 C CNN
+F 2 "ipc_rescax:IPC_RESCAXS8P80_320X160X60L30X45N" H 6900 3750 60  0001 C CNN
 F 3 "https://industrial.panasonic.com/cdbs/www-data/pdf/AOC0000/AOC0000C14.pdf" H 6900 3750 60  0001 C CNN
 F 4 "Panasonic" H 6900 3750 60  0001 C CNN "Mfr"
 F 5 "EXB-38V221JV" H 6900 3750 60  0001 C CNN "Part"
@@ -908,4 +820,92 @@ Text Notes 1800 7700 0    60   ~ 0
 No 10U on DVDD, very near regulator 10U.
 Text Notes 4250 7700 0    60   ~ 0
 No 10U on SVDD to comply with USB inrush spec.
+Wire Wire Line
+	6400 1500 7600 1500
+Wire Wire Line
+	1200 6900 1600 6900
+Wire Wire Line
+	3400 6900 3800 6900
+Wire Wire Line
+	4500 6900 4900 6900
+Wire Wire Line
+	4700 6000 4700 6400
+Wire Wire Line
+	5400 4700 6600 4700
+Wire Wire Line
+	6800 1600 7600 1600
+Wire Wire Line
+	3900 3400 4000 3400
+Wire Wire Line
+	2800 3800 4000 3800
+Wire Wire Line
+	2800 4000 2800 4300
+Wire Wire Line
+	3900 2600 3900 2950
+Wire Wire Line
+	3900 3250 3900 3400
+Wire Wire Line
+	2800 3000 2800 3150
+Wire Wire Line
+	2800 3600 2800 3450
+Wire Wire Line
+	2800 4000 2950 4000
+Wire Wire Line
+	2800 4300 2950 4300
+Wire Wire Line
+	3250 4300 3500 4300
+Wire Wire Line
+	3250 4000 3400 4000
+Wire Wire Line
+	4700 4600 4700 5450
+Wire Wire Line
+	4700 5750 4700 6000
+Wire Wire Line
+	5000 5300 5000 5500
+Wire Wire Line
+	5000 5800 5000 6000
+Wire Wire Line
+	5400 5200 5400 5400
+Wire Wire Line
+	5400 4700 5400 4900
+Wire Wire Line
+	6400 2550 6400 2750
+Wire Wire Line
+	6400 2000 6400 2250
+Wire Wire Line
+	6400 1500 6400 1700
+Wire Wire Line
+	6800 1600 6800 1700
+Wire Wire Line
+	6800 2000 6800 2250
+Wire Wire Line
+	6800 2550 6800 2750
+Wire Wire Line
+	1200 6900 1200 7050
+Wire Wire Line
+	1200 7350 1200 7500
+Wire Wire Line
+	1600 7350 1600 7500
+Wire Wire Line
+	1600 6900 1600 7050
+Wire Wire Line
+	2300 6900 2300 7050
+Wire Wire Line
+	2300 7350 2300 7500
+Wire Wire Line
+	3400 7350 3400 7500
+Wire Wire Line
+	3400 6900 3400 7050
+Wire Wire Line
+	3800 6900 3800 7050
+Wire Wire Line
+	3800 7350 3800 7500
+Wire Wire Line
+	4500 7350 4500 7500
+Wire Wire Line
+	4500 6900 4500 7050
+Wire Wire Line
+	4900 6900 4900 7050
+Wire Wire Line
+	4900 7350 4900 7500
 $EndSCHEMATC
@@ -321,3 +321,27 @@ set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_IO_STBX
 set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_LCD_RDX
 set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_LCD_WRX
 set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_P2_8
+
+set_location_assignment PIN_35 -to GPS_TIMEPULSE
+set_instance_assignment -name IO_STANDARD "3.3-V LVCMOS" -to GPS_TIMEPULSE
+set_instance_assignment -name CURRENT_STRENGTH_NEW "MINIMUM CURRENT" -to GPS_TIMEPULSE
+set_instance_assignment -name SLOW_SLEW_RATE ON -to GPS_TIMEPULSE
+set_instance_assignment -name PCI_IO OFF -to GPS_TIMEPULSE
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to GPS_TIMEPULSE
+
+set_location_assignment PIN_36 -to GPS_TX_READY
+set_instance_assignment -name IO_STANDARD "3.3-V LVCMOS" -to GPS_TX_READY
+set_instance_assignment -name CURRENT_STRENGTH_NEW "MINIMUM CURRENT" -to GPS_TX_READY
+set_instance_assignment -name SLOW_SLEW_RATE ON -to GPS_TX_READY
+set_instance_assignment -name PCI_IO OFF -to GPS_TX_READY
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to GPS_TX_READY
+
+set_location_assignment PIN_5 -to REF_EN
+set_instance_assignment -name IO_STANDARD "3.3-V LVCMOS" -to REF_EN
+set_instance_assignment -name CURRENT_STRENGTH_NEW "MINIMUM CURRENT" -to REF_EN
+set_instance_assignment -name SLOW_SLEW_RATE ON -to REF_EN
+
+set_location_assignment PIN_7 -to GPS_RESETX
+set_instance_assignment -name IO_STANDARD "3.3-V LVCMOS" -to GPS_RESETX
+set_instance_assignment -name CURRENT_STRENGTH_NEW "MINIMUM CURRENT" -to GPS_RESETX
+set_instance_assignment -name SLOW_SLEW_RATE ON -to GPS_RESETX
@@ -53,7 +53,13 @@ entity top is
 		LCD_TE			:	in		std_logic;
 		LCD_BACKLIGHT	:	out	std_logic;

-		AUDIO_RESETX	:	out std_logic
+		AUDIO_RESETX	:	out	std_logic;
+
+		REF_EN			:	out	std_logic;
+
+		GPS_RESETX		:	out	std_logic;
+		GPS_TX_READY	:	in		std_logic;
+		GPS_TIMEPULSE	:	in		std_logic
 	);
 end top;

@@ -83,6 +89,8 @@ architecture rtl of top is

 	signal	audio_reset_q : std_logic := '1';

+	signal	ref_en_q : std_logic := '0';
+
 	signal	dir_read : boolean;
 	signal	dir_write : boolean;
 	
@@ -127,10 +135,15 @@ begin
 	lcd_data_out <= lcd_data_out_q & mcu_data_in;
 	lcd_data_in <= LCD_DB;
 	LCD_DB <= lcd_data_out when lcd_write else (others => 'Z');
-	
+
+	-- Reference clock
+	REF_EN <= ref_en_q;
+
+	-- Peripheral reset control
 	LCD_RESETX <= not lcd_reset_q;
 	AUDIO_RESETX <= not audio_reset_q;
-	
+	GPS_RESETX <= '1';
+
 	-- MCU interface
 	mcu_data_out_lcd <= lcd_data_in(15 downto 8) when lcd_read_strobe else lcd_data_in_q;
 	mcu_data_out_io <= switches;
@@ -166,6 +179,7 @@ begin
 			else
 				lcd_reset_q <= mcu_data_in(0);
 				audio_reset_q <= mcu_data_in(1);
+				ref_en_q <= mcu_data_in(6);
 				lcd_backlight_q <= mcu_data_in(7);
 			end if;
 		end if;
@@ -22,4 +22,9 @@
  (lib (name tp)(type KiCad)(uri ${KISBLIB}/tp.pretty)(options "")(descr ""))
  (lib (name ipc_ledc)(type KiCad)(uri ${KISBLIB}/ipc_ledc.pretty)(options "")(descr ""))
  (lib (name sharebrained)(type KiCad)(uri ${KISBLIB}/sharebrained.pretty)(options "")(descr ""))
+  (lib (name ipc_rescax)(type KiCad)(uri ${KISBLIB}/ipc_rescax.pretty)(options "")(descr ""))
+  (lib (name ipc_osccc)(type KiCad)(uri ${KISBLIB}/ipc_osccc.pretty)(options "")(descr ""))
+  (lib (name ipc_beadc)(type KiCad)(uri ${KISBLIB}/ipc_beadc.pretty)(options "")(descr ""))
+  (lib (name ublox)(type KiCad)(uri ${KISBLIB}/ublox.pretty)(options "")(descr ""))
+  (lib (name amp_te)(type KiCad)(uri ${KISBLIB}/amp_te.pretty)(options "")(descr ""))
 )
@@ -0,0 +1,370 @@
+EESchema Schematic File Version 4
+LIBS:portapack_h1-cache
+EELAYER 26 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 6 6
+Title "PortaPack H1"
+Date "2018-08-20"
+Rev "20180820"
+Comp "ShareBrained Technology, Inc."
+Comment1 "Copyright © 2014-2018 Jared Boone"
+Comment2 "License: GNU General Public License, version 2"
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L ublox:MAX-M8 U8
+U 1 1 5B7E0C1A
+P 5800 2900
+F 0 "U8" H 5800 3650 60  0000 C CNN
+F 1 "MAX-M8" H 5800 3550 60  0000 C CNN
+F 2 "ublox:MAX-M8" H 5800 2900 60  0001 C CNN
+F 3 "" H 5800 2900 60  0001 C CNN
+F 4 "DNP" H 5800 3450 50  0000 C CNN "DNP"
+	1    5800 2900
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C19
+U 1 1 5B7E0D14
+P 4600 3450
+F 0 "C19" V 4250 3450 50  0000 C CNN
+F 1 "10N" V 4350 3450 50  0000 C CNN
+F 2 "ipc_capc:IPC_CAPC100X50X55L25N" H 4638 3300 50  0001 C CNN
+F 3 "~" H 4600 3450 50  0001 C CNN
+F 4 "DNP" V 4450 3450 50  0000 C CNN "DNP"
+	1    4600 3450
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:L L1
+U 1 1 5B7E0E02
+P 4350 2900
+F 0 "L1" H 4403 2946 50  0000 L CNN
+F 1 "27N" H 4403 2855 50  0000 L CNN
+F 2 "ipc_indc:IPC_INDC100X50X60L20N" H 4350 2900 50  0001 C CNN
+F 3 "~" H 4350 2900 50  0001 C CNN
+F 4 "DNP" H 4450 2750 50  0000 C CNN "DNP"
+	1    4350 2900
+	0    -1   -1   0   
+$EndComp
+$Comp
+L power:GND #PWR0108
+U 1 1 5B7E0F42
+P 4600 3700
+F 0 "#PWR0108" H 4600 3450 50  0001 C CNN
+F 1 "GND" H 4605 3527 50  0000 C CNN
+F 2 "" H 4600 3700 50  0001 C CNN
+F 3 "" H 4600 3700 50  0001 C CNN
+	1    4600 3700
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0109
+U 1 1 5B7E0F5A
+P 5100 3400
+F 0 "#PWR0109" H 5100 3150 50  0001 C CNN
+F 1 "GND" H 5105 3227 50  0000 C CNN
+F 2 "" H 5100 3400 50  0001 C CNN
+F 3 "" H 5100 3400 50  0001 C CNN
+	1    5100 3400
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5200 2500 5100 2500
+Wire Wire Line
+	5100 2500 5100 2700
+Wire Wire Line
+	5200 2700 5100 2700
+Connection ~ 5100 2700
+Wire Wire Line
+	5100 2700 5100 3000
+Wire Wire Line
+	5200 2600 4100 2600
+Text HLabel 3200 3100 0    60   BiDi ~ 0
+SDA
+Text HLabel 3200 3500 0    60   BiDi ~ 0
+SCL
+$Comp
+L power:GND #PWR0110
+U 1 1 5B7E1247
+P 6500 3400
+F 0 "#PWR0110" H 6500 3150 50  0001 C CNN
+F 1 "GND" H 6505 3227 50  0000 C CNN
+F 2 "" H 6500 3400 50  0001 C CNN
+F 3 "" H 6500 3400 50  0001 C CNN
+	1    6500 3400
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6400 3300 6500 3300
+Wire Wire Line
+	6500 3300 6500 3400
+Text HLabel 7800 1800 2    60   Input ~ 0
+V_BACKUP
+Text HLabel 6650 1800 0    60   Input ~ 0
+VCC
+Wire Wire Line
+	6400 2600 6800 2600
+Wire Wire Line
+	6400 2700 6800 2700
+$Comp
+L tp:TP TP7
+U 1 1 5B7E1777
+P 4900 3300
+F 0 "TP7" H 4750 3300 50  0000 C CNN
+F 1 "TP" H 4900 3300 50  0001 C CNN
+F 2 "tp:TP_1MM" H 4900 3300 60  0001 C CNN
+F 3 "" H 4900 3300 60  0001 C CNN
+	1    4900 3300
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5000 3300 5200 3300
+Text HLabel 6900 3000 2    60   Output ~ 0
+TIMEPULSE
+Wire Wire Line
+	6400 3000 6900 3000
+$Comp
+L tp:TP TP8
+U 1 1 5B7E20D6
+P 7000 2900
+F 0 "TP8" H 6850 2900 50  0000 C CNN
+F 1 "TP" H 7000 2900 50  0001 C CNN
+F 2 "tp:TP_1MM" H 7000 2900 60  0001 C CNN
+F 3 "" H 7000 2900 60  0001 C CNN
+	1    7000 2900
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	6400 2900 6900 2900
+$Comp
+L tp:TP TP9
+U 1 1 5B7E27BE
+P 7000 3100
+F 0 "TP9" H 6850 3100 50  0000 C CNN
+F 1 "TP" H 7000 3100 50  0001 C CNN
+F 2 "tp:TP_1MM" H 7000 3100 60  0001 C CNN
+F 3 "" H 7000 3100 60  0001 C CNN
+	1    7000 3100
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	6400 3100 6900 3100
+Text HLabel 7800 2500 2    60   Input ~ 0
+RESET#
+Wire Wire Line
+	6400 2500 7700 2500
+$Comp
+L Device:C C20
+U 1 1 5B7E512B
+P 6800 3450
+F 0 "C20" H 6915 3496 50  0000 L CNN
+F 1 "100N" H 6915 3405 50  0000 L CNN
+F 2 "ipc_capc:IPC_CAPC100X50X55L25N" H 6838 3300 50  0001 C CNN
+F 3 "~" H 6800 3450 50  0001 C CNN
+F 4 "DNP" H 7000 3300 50  0000 C CNN "DNP"
+	1    6800 3450
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0111
+U 1 1 5B7E5197
+P 6800 3700
+F 0 "#PWR0111" H 6800 3450 50  0001 C CNN
+F 1 "GND" H 6805 3527 50  0000 C CNN
+F 2 "" H 6800 3700 50  0001 C CNN
+F 3 "" H 6800 3700 50  0001 C CNN
+	1    6800 3700
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6800 3600 6800 3700
+Wire Wire Line
+	6800 2700 6800 2600
+$Comp
+L Device:R R25
+U 1 1 5B7E62C8
+P 7700 2750
+F 0 "R25" H 7770 2796 50  0000 L CNN
+F 1 "100K" V 7700 2650 50  0000 L CNN
+F 2 "ipc_resc:IPC_RESC100X50X40L25N" V 7630 2750 50  0001 C CNN
+F 3 "~" H 7700 2750 50  0001 C CNN
+F 4 "DNP" H 7850 2700 50  0000 C CNN "DNP"
+	1    7700 2750
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0112
+U 1 1 5B7E633A
+P 7700 3000
+F 0 "#PWR0112" H 7700 2750 50  0001 C CNN
+F 1 "GND" H 7705 2827 50  0000 C CNN
+F 2 "" H 7700 3000 50  0001 C CNN
+F 3 "" H 7700 3000 50  0001 C CNN
+	1    7700 3000
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7700 2600 7700 2500
+Connection ~ 7700 2500
+Wire Wire Line
+	7700 2500 7800 2500
+Wire Wire Line
+	7700 2900 7700 3000
+$Comp
+L passive:FBEAD FB1
+U 1 1 5B7E9718
+P 3550 3100
+F 0 "FB1" H 3550 3300 50  0000 C CNN
+F 1 "FBEAD" H 3544 3227 50  0001 C CNN
+F 2 "ipc_beadc:IPC_BEADC160X80X95L40N" H 3544 3234 60  0001 C CNN
+F 3 "" H 3550 3100 60  0000 C CNN
+F 4 "DNP" H 3550 3200 50  0000 C CNN "DNP"
+F 5 "Murata" H 0   0   50  0001 C CNN "Mfr"
+F 6 "BLM18HE152SN1D" H 0   0   50  0001 C CNN "Part"
+	1    3550 3100
+	1    0    0    -1  
+$EndComp
+$Comp
+L passive:FBEAD FB3
+U 1 1 5B7E9798
+P 3550 3500
+F 0 "FB3" H 3550 3700 50  0000 C CNN
+F 1 "FBEAD" H 3544 3627 50  0001 C CNN
+F 2 "ipc_beadc:IPC_BEADC160X80X95L40N" H 3550 3500 60  0001 C CNN
+F 3 "" H 3550 3500 60  0000 C CNN
+F 4 "DNP" H 3550 3600 50  0000 C CNN "DNP"
+F 5 "Murata" H 0   0   50  0001 C CNN "Mfr"
+F 6 "BLM18HE152SN1D" H 0   0   50  0001 C CNN "Part"
+	1    3550 3500
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3200 3100 3300 3100
+Wire Wire Line
+	3200 3500 3300 3500
+Wire Wire Line
+	3800 3500 3900 3500
+Wire Wire Line
+	3900 3500 3900 3200
+Wire Wire Line
+	3900 3200 5200 3200
+$Comp
+L Device:R R24
+U 1 1 5B7EC300
+P 7550 1800
+F 0 "R24" V 7450 1800 50  0000 C CNN
+F 1 "0R" V 7550 1800 50  0000 C CNN
+F 2 "ipc_resc:IPC_RESC100X50X40L25N" V 7480 1800 50  0001 C CNN
+F 3 "~" H 7550 1800 50  0001 C CNN
+F 4 "DNP" V 7650 1800 50  0000 C CNN "DNP"
+	1    7550 1800
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:R R23
+U 1 1 5B7ED5AD
+P 7050 1800
+F 0 "R23" V 6950 1800 50  0000 C CNN
+F 1 "0R" V 7050 1800 50  0000 C CNN
+F 2 "ipc_resc:IPC_RESC100X50X40L25N" V 6980 1800 50  0001 C CNN
+F 3 "~" H 7050 1800 50  0001 C CNN
+F 4 "DNP" V 7150 1800 50  0000 C CNN "DNP"
+	1    7050 1800
+	0    1    1    0   
+$EndComp
+NoConn ~ 5200 2800
+Wire Wire Line
+	5200 3000 5100 3000
+Connection ~ 5100 3000
+Wire Wire Line
+	5100 3000 5100 3400
+Text HLabel 6900 3200 2    60   Output ~ 0
+TX_READY
+Wire Wire Line
+	6400 3200 6900 3200
+$Comp
+L conn_rf:CONN_COAX P1
+U 1 1 5B78522B
+P 2550 2600
+F 0 "P1" H 2505 2844 60  0000 C CNN
+F 1 "CONN_COAX" H 2505 2829 40  0001 C CNN
+F 2 "amp_te:1909763-1" H 2505 2754 60  0001 C CNN
+F 3 "" H 2550 2600 60  0000 C CNN
+F 4 "DNP" H 2505 2746 50  0000 C CNN "DNP"
+F 5 "AMP/TE" H 0   0   50  0001 C CNN "Mfr"
+F 6 "1909763-1" H 0   0   50  0001 C CNN "Part"
+	1    2550 2600
+	-1   0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0113
+U 1 1 5B7852CC
+P 2550 2900
+F 0 "#PWR0113" H 2550 2650 50  0001 C CNN
+F 1 "GND" H 2555 2727 50  0000 C CNN
+F 2 "" H 2550 2900 50  0001 C CNN
+F 3 "" H 2550 2900 50  0001 C CNN
+	1    2550 2900
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2550 2800 2550 2900
+Wire Wire Line
+	3800 3100 5200 3100
+$Comp
+L Device:R R26
+U 1 1 5B78A3E5
+P 4850 2900
+F 0 "R26" V 4750 2900 50  0000 C CNN
+F 1 "10R" V 4850 2900 50  0000 C CNN
+F 2 "ipc_resc:IPC_RESC100X50X40L25N" V 4780 2900 50  0001 C CNN
+F 3 "~" H 4850 2900 50  0001 C CNN
+F 4 "DNP" V 4950 2900 50  0000 C CNN "DNP"
+	1    4850 2900
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	5200 2900 5000 2900
+Wire Wire Line
+	4700 2900 4600 2900
+Wire Wire Line
+	4600 2900 4600 3300
+Wire Wire Line
+	4600 3600 4600 3700
+Wire Wire Line
+	4600 2900 4500 2900
+Connection ~ 4600 2900
+Wire Wire Line
+	4200 2900 4100 2900
+Wire Wire Line
+	4100 2900 4100 2600
+Connection ~ 4100 2600
+Wire Wire Line
+	2700 2600 4100 2600
+Wire Wire Line
+	7800 1800 7700 1800
+Wire Wire Line
+	7400 1800 7300 1800
+Wire Wire Line
+	6650 1800 6800 1800
+Wire Wire Line
+	6800 2600 6800 1800
+Connection ~ 6800 2600
+Connection ~ 6800 1800
+Wire Wire Line
+	6800 1800 6900 1800
+Wire Wire Line
+	6400 2800 7300 2800
+Wire Wire Line
+	7300 1800 7300 2800
+Connection ~ 7300 1800
+Wire Wire Line
+	7300 1800 7200 1800
+Wire Wire Line
+	6800 2700 6800 3300
+Connection ~ 6800 2700
+$EndSCHEMATC
@@ -1,35 +1,15 @@
-EESchema Schematic File Version 2
-LIBS:portapack_h1-rescue
-LIBS:hackrf_expansion
-LIBS:passive
-LIBS:supply
-LIBS:trs_jack
-LIBS:battery
-LIBS:sd
-LIBS:ck
-LIBS:altera
-LIBS:regulator
-LIBS:tp
-LIBS:header
-LIBS:hole
-LIBS:sharebrained
-LIBS:fiducial
-LIBS:eastrising
-LIBS:on_semi
-LIBS:asahi_kasei
-LIBS:ti
-LIBS:diode
+EESchema Schematic File Version 4
 LIBS:portapack_h1-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 4 5
+Sheet 4 6
 Title "PortaPack H1"
-Date "2017-05-22"
-Rev "20170522"
+Date "2018-08-20"
+Rev "20180820"
 Comp "ShareBrained Technology, Inc."
-Comment1 "Copyright © 2014-2017 Jared Boone"
+Comment1 "Copyright © 2014-2018 Jared Boone"
 Comment2 "License: GNU General Public License, version 2"
 Comment3 ""
 Comment4 ""
@@ -37,7 +17,7 @@ $EndDescr
 Text Label 1300 2600 0    60   ~ 0
 MCU_LCD_RD
 $Comp
-L GND #PWR044
+L power:GND #PWR044
 U 1 1 53A8CD34
 P 3700 4200
 F 0 "#PWR044" H 3700 4200 30  0001 C CNN
@@ -48,7 +28,7 @@ F 3 "" H 3700 4200 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR045
+L power:GND #PWR045
 U 1 1 53A8CD3A
 P 3700 4700
 F 0 "#PWR045" H 3700 4700 30  0001 C CNN
@@ -59,7 +39,7 @@ F 3 "" H 3700 4700 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR046
+L power:GND #PWR046
 U 1 1 53A8CD40
 P 3700 3200
 F 0 "#PWR046" H 3700 3200 30  0001 C CNN
@@ -70,7 +50,7 @@ F 3 "" H 3700 3200 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR047
+L power:GND #PWR047
 U 1 1 53A8CD46
 P 3700 2800
 F 0 "#PWR047" H 3700 2800 30  0001 C CNN
@@ -81,7 +61,7 @@ F 3 "" H 3700 2800 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR048
+L power:GND #PWR048
 U 1 1 53A8CD4C
 P 3700 2500
 F 0 "#PWR048" H 3700 2500 30  0001 C CNN
@@ -92,40 +72,40 @@ F 3 "" H 3700 2500 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3.3V #PWR049
+L power:+3V3 #PWR049
 U 1 1 53A8CD52
 P 1900 2900
 F 0 "#PWR049" H 1900 2860 30  0001 C CNN
-F 1 "+3.3V" H 1900 3010 30  0000 C CNN
+F 1 "+3V3" H 1900 3010 30  0000 C CNN
 F 2 "" H 1900 2900 60  0000 C CNN
 F 3 "" H 1900 2900 60  0000 C CNN
 	1    1900 2900
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3.3V #PWR050
+L power:+3V3 #PWR050
 U 1 1 53A8CD58
 P 1900 4200
 F 0 "#PWR050" H 1900 4160 30  0001 C CNN
-F 1 "+3.3V" H 1900 4310 30  0000 C CNN
+F 1 "+3V3" H 1900 4310 30  0000 C CNN
 F 2 "" H 1900 4200 60  0000 C CNN
 F 3 "" H 1900 4200 60  0000 C CNN
 	1    1900 4200
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3.3V #PWR051
+L power:+3V3 #PWR051
 U 1 1 53A8CD5E
 P 1900 900
 F 0 "#PWR051" H 1900 860 30  0001 C CNN
-F 1 "+3.3V" H 1900 1010 30  0000 C CNN
+F 1 "+3V3" H 1900 1010 30  0000 C CNN
 F 2 "" H 1900 900 60  0000 C CNN
 F 3 "" H 1900 900 60  0000 C CNN
 	1    1900 900 
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR052
+L power:GND #PWR052
 U 1 1 53A8CD64
 P 1900 1400
 F 0 "#PWR052" H 1900 1400 30  0001 C CNN
@@ -136,7 +116,7 @@ F 3 "" H 1900 1400 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR053
+L power:GND #PWR053
 U 1 1 53A8CD6A
 P 1900 1500
 F 0 "#PWR053" H 1900 1500 30  0001 C CNN
@@ -147,7 +127,7 @@ F 3 "" H 1900 1500 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR054
+L power:GND #PWR054
 U 1 1 53A8CD70
 P 1900 1700
 F 0 "#PWR054" H 1900 1700 30  0001 C CNN
@@ -159,7 +139,6 @@ F 3 "" H 1900 1700 60  0000 C CNN
 $EndComp
 NoConn ~ 3600 4800
 NoConn ~ 2000 4800
-NoConn ~ 2000 2400
 NoConn ~ 3600 2700
 NoConn ~ 2000 2700
 NoConn ~ 2000 2800
@@ -209,41 +188,41 @@ RESET#
 NoConn ~ 3600 2900
 NoConn ~ 3600 3000
 $Comp
-L HACKRF_ONE_P20 P20
+L hackrf_expansion:HACKRF_ONE_P20 P20
 U 1 1 53A8CDAE
 P 2800 1300
 F 0 "P20" H 2800 1950 60  0000 C CNN
 F 1 "HACKRF_ONE_P20" H 2800 650 60  0000 C CNN
 F 2 "header:HEADER_11X2_REV_SM_254_AP" H 2800 1300 60  0001 C CNN
-F 3 "https://s3.amazonaws.com/mle-assets/parts/TSHSM-1/TSHSM-1.pdf" H 2800 1300 60  0001 C CNN
-F 4 "MLE" H 2800 1300 60  0001 C CNN "Mfr"
-F 5 "TSHSM-111-D-06-T-V-S-P-TR-AP-LF" H 2800 1300 60  0001 C CNN "Part"
+F 3 "https://www.samtec.com/products/tsm-111-01-l-dv-a-p-tr" H 2800 1300 60  0001 C CNN
+F 4 "Samtec" H 2800 1300 60  0001 C CNN "Mfr"
+F 5 "TSM⁃111⁃01⁃L⁃DV⁃A⁃P⁃TR" H 2800 1300 60  0001 C CNN "Part"
 	1    2800 1300
 	1    0    0    -1  
 $EndComp
 $Comp
-L HACKRF_ONE_P22 P22
+L hackrf_expansion:HACKRF_ONE_P22 P22
 U 1 1 53A8CDB6
 P 2800 3000
 F 0 "P22" H 2800 3750 60  0000 C CNN
 F 1 "HACKRF_ONE_P22" H 2800 2250 60  0000 C CNN
 F 2 "header:HEADER_13X2_REV_SM_254_AP" H 2800 3000 60  0001 C CNN
-F 3 "https://s3.amazonaws.com/mle-assets/parts/TSHSM-1/TSHSM-1.pdf" H 2800 3000 60  0001 C CNN
-F 4 "MLE" H 2800 3000 60  0001 C CNN "Mfr"
-F 5 "TSHSM-113-D-06-T-V-S-P-TR-AP-LF" H 2800 3000 60  0001 C CNN "Part"
+F 3 "https://www.samtec.com/products/tsm-113-01-l-dv-a-p-tr" H 2800 3000 60  0001 C CNN
+F 4 "Samtec" H 2800 3000 60  0001 C CNN "Mfr"
+F 5 "TSM⁃113⁃01⁃L⁃DV⁃A⁃P⁃TR" H 2800 3000 60  0001 C CNN "Part"
 	1    2800 3000
 	1    0    0    -1  
 $EndComp
 $Comp
-L HACKRF_ONE_P28 P28
+L hackrf_expansion:HACKRF_ONE_P28 P28
 U 1 1 53A8CDBE
 P 2800 4700
 F 0 "P28" H 2800 5350 60  0000 C CNN
 F 1 "HACKRF_ONE_P28" H 2800 4050 60  0000 C CNN
 F 2 "header:HEADER_11X2_REV_SM_254_AP" H 2800 4700 60  0001 C CNN
-F 3 "https://s3.amazonaws.com/mle-assets/parts/TSHSM-1/TSHSM-1.pdf" H 2800 4700 60  0001 C CNN
-F 4 "MLE" H 2800 4700 60  0001 C CNN "Mfr"
-F 5 "TSHSM-111-D-06-T-V-S-P-TR-AP-LF" H 2800 4700 60  0001 C CNN "Part"
+F 3 "https://www.samtec.com/products/tsm-111-01-l-dv-a-p-tr" H 2800 4700 60  0001 C CNN
+F 4 "Samtec" H 2800 4700 60  0001 C CNN "Mfr"
+F 5 "TSM⁃111⁃01⁃L⁃DV⁃A⁃P⁃TR" H 2800 4700 60  0001 C CNN "Part"
 	1    2800 4700
 	1    0    0    -1  
 $EndComp
@@ -264,7 +243,7 @@ Wire Wire Line
 Wire Wire Line
 	4600 3300 3600 3300
 Wire Wire Line
-	1100 5100 2000 5100
+	1100 5100 1900 5100
 Wire Wire Line
 	3700 3600 3600 3600
 Wire Wire Line
@@ -348,7 +327,7 @@ Wire Wire Line
 Wire Wire Line
 	4600 2600 3600 2600
 $Comp
-L 5M40ZE64 U3
+L altera:5M40ZE64 U3
 U 1 1 53A8D11B
 P 8450 3050
 F 0 "U3" H 8450 3100 60  0000 C CNN
@@ -395,51 +374,51 @@ LCD_DB15
 Text Label 6200 3600 0    60   ~ 0
 PP_CPLD_TMS
 $Comp
-L +3.3V #PWR055
+L power:+3V3 #PWR055
 U 1 1 53A8D13C
 P 8300 4750
 F 0 "#PWR055" H 8300 4710 30  0001 C CNN
-F 1 "+3.3V" H 8300 4860 30  0000 C CNN
+F 1 "+3V3" H 8300 4860 30  0000 C CNN
 F 2 "" H 8300 4750 60  0000 C CNN
 F 3 "" H 8300 4750 60  0000 C CNN
 	1    8300 4750
 	-1   0    0    1   
 $EndComp
 $Comp
-L +3.3V #PWR056
+L power:+3V3 #PWR056
 U 1 1 53A8D142
 P 6750 2800
 F 0 "#PWR056" H 6750 2760 30  0001 C CNN
-F 1 "+3.3V" H 6750 2910 30  0000 C CNN
+F 1 "+3V3" H 6750 2910 30  0000 C CNN
 F 2 "" H 6750 2800 60  0000 C CNN
 F 3 "" H 6750 2800 60  0000 C CNN
 	1    6750 2800
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +1.8V #PWR057
+L power:+1V8 #PWR057
 U 1 1 53A8D148
 P 10150 3000
 F 0 "#PWR057" H 10150 3140 20  0001 C CNN
-F 1 "+1.8V" H 10150 3110 30  0000 C CNN
+F 1 "+1V8" H 10150 3110 30  0000 C CNN
 F 2 "" H 10150 3000 60  0000 C CNN
 F 3 "" H 10150 3000 60  0000 C CNN
 	1    10150 3000
 	0    1    1    0   
 $EndComp
 $Comp
-L +1.8V #PWR058
+L power:+1V8 #PWR058
 U 1 1 53A8D14E
 P 6750 3000
 F 0 "#PWR058" H 6750 3140 20  0001 C CNN
-F 1 "+1.8V" H 6750 3110 30  0000 C CNN
+F 1 "+1V8" H 6750 3110 30  0000 C CNN
 F 2 "" H 6750 3000 60  0000 C CNN
 F 3 "" H 6750 3000 60  0000 C CNN
 	1    6750 3000
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR059
+L power:GND #PWR059
 U 1 1 53A8D154
 P 9650 4750
 F 0 "#PWR059" H 9650 4750 30  0001 C CNN
@@ -460,22 +439,22 @@ MCU_ADDR
 Text Label 9200 5400 1    60   ~ 0
 MCU_IO_STBX
 $Comp
-L +1.8V #PWR060
+L power:+1V8 #PWR060
 U 1 1 53A8D16D
 P 10150 3200
 F 0 "#PWR060" H 10150 3340 20  0001 C CNN
-F 1 "+1.8V" H 10150 3310 30  0000 C CNN
+F 1 "+1V8" H 10150 3310 30  0000 C CNN
 F 2 "" H 10150 3200 60  0000 C CNN
 F 3 "" H 10150 3200 60  0000 C CNN
 	1    10150 3200
 	0    1    1    0   
 $EndComp
 $Comp
-L +1.8V #PWR061
+L power:+1V8 #PWR061
 U 1 1 53A8D173
 P 8400 950
 F 0 "#PWR061" H 8400 1090 20  0001 C CNN
-F 1 "+1.8V" H 8400 1060 30  0000 C CNN
+F 1 "+1V8" H 8400 1060 30  0000 C CNN
 F 2 "" H 8400 950 60  0000 C CNN
 F 3 "" H 8400 950 60  0000 C CNN
 	1    8400 950 
@@ -572,23 +551,23 @@ H1_CPLD_TCK
 Text Label 7700 5400 1    60   ~ 0
 PP_CPLD_TDO
 $Comp
-L +3.3V #PWR062
+L power:+3V3 #PWR062
 U 1 1 53A8D521
 P 4500 5700
 F 0 "#PWR062" H 4500 5660 30  0001 C CNN
-F 1 "+3.3V" H 4500 5810 30  0000 C CNN
+F 1 "+3V3" H 4500 5810 30  0000 C CNN
 F 2 "" H 4500 5700 60  0000 C CNN
 F 3 "" H 4500 5700 60  0000 C CNN
 	1    4500 5700
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C28
+L Device:C C28
 U 1 1 53A8D527
 P 4500 6100
 F 0 "C28" H 4550 6200 50  0000 L CNN
 F 1 "100N" H 4550 6000 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC1005X55L25N" H 4500 6100 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC100X50X55L25N" H 4500 6100 60  0001 C CNN
 F 3 "" H 4500 6100 60  0000 C CNN
 F 4 "Murata" H 4500 6100 60  0001 C CNN "Mfr"
 F 5 "GRM155R61A104KA01" H 4500 6100 60  0001 C CNN "Part"
@@ -596,7 +575,7 @@ F 5 "GRM155R61A104KA01" H 4500 6100 60  0001 C CNN "Part"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR063
+L power:GND #PWR063
 U 1 1 53A8D52D
 P 5700 7400
 F 0 "#PWR063" H 5700 7400 30  0001 C CNN
@@ -607,12 +586,12 @@ F 3 "" H 5700 7400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C30
+L Device:C C30
 U 1 1 53A8D542
 P 4900 6100
 F 0 "C30" H 4950 6200 50  0000 L CNN
 F 1 "100N" H 4950 6000 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC1005X55L25N" H 4900 6100 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC100X50X55L25N" H 4900 6100 60  0001 C CNN
 F 3 "" H 4900 6100 60  0000 C CNN
 F 4 "Murata" H 4900 6100 60  0001 C CNN "Mfr"
 F 5 "GRM155R61A104KA01" H 4900 6100 60  0001 C CNN "Part"
@@ -620,12 +599,12 @@ F 5 "GRM155R61A104KA01" H 4900 6100 60  0001 C CNN "Part"
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C29
+L Device:C C29
 U 1 1 53A8D548
 P 4500 7100
 F 0 "C29" H 4550 7200 50  0000 L CNN
 F 1 "100N" H 4550 7000 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC1005X55L25N" H 4500 7100 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC100X50X55L25N" H 4500 7100 60  0001 C CNN
 F 3 "" H 4500 7100 60  0000 C CNN
 F 4 "Murata" H 4500 7100 60  0001 C CNN "Mfr"
 F 5 "GRM155R61A104KA01" H 4500 7100 60  0001 C CNN "Part"
@@ -633,12 +612,12 @@ F 5 "GRM155R61A104KA01" H 4500 7100 60  0001 C CNN "Part"
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C31
+L Device:C C31
 U 1 1 53A8D54E
 P 4900 7100
 F 0 "C31" H 4950 7200 50  0000 L CNN
 F 1 "100N" H 4950 7000 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC1005X55L25N" H 4900 7100 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC100X50X55L25N" H 4900 7100 60  0001 C CNN
 F 3 "" H 4900 7100 60  0000 C CNN
 F 4 "Murata" H 4900 7100 60  0001 C CNN "Mfr"
 F 5 "GRM155R61A104KA01" H 4900 7100 60  0001 C CNN "Part"
@@ -646,7 +625,7 @@ F 5 "GRM155R61A104KA01" H 4900 7100 60  0001 C CNN "Part"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR064
+L power:GND #PWR064
 U 1 1 53A8D554
 P 4500 6400
 F 0 "#PWR064" H 4500 6400 30  0001 C CNN
@@ -657,7 +636,7 @@ F 3 "" H 4500 6400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR065
+L power:GND #PWR065
 U 1 1 53A8D55A
 P 4900 6400
 F 0 "#PWR065" H 4900 6400 30  0001 C CNN
@@ -668,7 +647,7 @@ F 3 "" H 4900 6400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR066
+L power:GND #PWR066
 U 1 1 53A8D560
 P 4500 7400
 F 0 "#PWR066" H 4500 7400 30  0001 C CNN
@@ -679,7 +658,7 @@ F 3 "" H 4500 7400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR067
+L power:GND #PWR067
 U 1 1 53A8D566
 P 4900 7400
 F 0 "#PWR067" H 4900 7400 30  0001 C CNN
@@ -690,12 +669,12 @@ F 3 "" H 4900 7400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C33
+L Device:C C33
 U 1 1 53A8D56C
 P 5300 7100
 F 0 "C33" H 5350 7200 50  0000 L CNN
 F 1 "100N" H 5350 7000 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC1005X55L25N" H 5300 7100 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC100X50X55L25N" H 5300 7100 60  0001 C CNN
 F 3 "" H 5300 7100 60  0000 C CNN
 F 4 "Murata" H 5300 7100 60  0001 C CNN "Mfr"
 F 5 "GRM155R61A104KA01" H 5300 7100 60  0001 C CNN "Part"
@@ -703,12 +682,12 @@ F 5 "GRM155R61A104KA01" H 5300 7100 60  0001 C CNN "Part"
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C35
+L Device:C C35
 U 1 1 53A8D572
 P 5700 7100
 F 0 "C35" H 5750 7200 50  0000 L CNN
 F 1 "100N" H 5750 7000 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC1005X55L25N" H 5700 7100 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC100X50X55L25N" H 5700 7100 60  0001 C CNN
 F 3 "" H 5700 7100 60  0000 C CNN
 F 4 "Murata" H 5700 7100 60  0001 C CNN "Mfr"
 F 5 "GRM155R61A104KA01" H 5700 7100 60  0001 C CNN "Part"
@@ -716,7 +695,7 @@ F 5 "GRM155R61A104KA01" H 5700 7100 60  0001 C CNN "Part"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR068
+L power:GND #PWR068
 U 1 1 53A8D578
 P 5300 7400
 F 0 "#PWR068" H 5300 7400 30  0001 C CNN
@@ -727,23 +706,23 @@ F 3 "" H 5300 7400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1.8V #PWR069
+L power:+1V8 #PWR069
 U 1 1 53A8D57E
 P 4500 6700
 F 0 "#PWR069" H 4500 6840 20  0001 C CNN
-F 1 "+1.8V" H 4500 6810 30  0000 C CNN
+F 1 "+1V8" H 4500 6810 30  0000 C CNN
 F 2 "" H 4500 6700 60  0000 C CNN
 F 3 "" H 4500 6700 60  0000 C CNN
 	1    4500 6700
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C32
+L Device:C C32
 U 1 1 53A8D5C2
 P 5300 6100
 F 0 "C32" H 5350 6200 50  0000 L CNN
 F 1 "10U" H 5350 6000 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC2012X135L45N" H 5300 6100 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC200X125X135L45N" H 5300 6100 60  0001 C CNN
 F 3 "" H 5300 6100 60  0000 C CNN
 F 4 "Murata" H 5300 6100 60  0001 C CNN "Mfr"
 F 5 "GRM21BR61A106KE19" H 5300 6100 60  0001 C CNN "Part"
@@ -751,12 +730,12 @@ F 5 "GRM21BR61A106KE19" H 5300 6100 60  0001 C CNN "Part"
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C34
+L Device:C C34
 U 1 1 53A8D5C8
 P 5700 6100
 F 0 "C34" H 5750 6200 50  0000 L CNN
 F 1 "10U" H 5750 6000 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC2012X135L45N" H 5700 6100 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC200X125X135L45N" H 5700 6100 60  0001 C CNN
 F 3 "" H 5700 6100 60  0000 C CNN
 F 4 "Murata" H 5700 6100 60  0001 C CNN "Mfr"
 F 5 "GRM21BR61A106KE19" H 5700 6100 60  0001 C CNN "Part"
@@ -764,7 +743,7 @@ F 5 "GRM21BR61A106KE19" H 5700 6100 60  0001 C CNN "Part"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR070
+L power:GND #PWR070
 U 1 1 53A8D5CE
 P 5300 6400
 F 0 "#PWR070" H 5300 6400 30  0001 C CNN
@@ -775,7 +754,7 @@ F 3 "" H 5300 6400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR071
+L power:GND #PWR071
 U 1 1 53A8D5D4
 P 5700 6400
 F 0 "#PWR071" H 5700 6400 30  0001 C CNN
@@ -786,12 +765,12 @@ F 3 "" H 5700 6400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C36
+L Device:C C36
 U 1 1 53A8D5DA
 P 6100 7100
 F 0 "C36" H 6150 7200 50  0000 L CNN
 F 1 "10U" H 6150 7000 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC2012X135L45N" H 6100 7100 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC200X125X135L45N" H 6100 7100 60  0001 C CNN
 F 3 "" H 6100 7100 60  0000 C CNN
 F 4 "Murata" H 6100 7100 60  0001 C CNN "Mfr"
 F 5 "GRM21BR61A106KE19" H 6100 7100 60  0001 C CNN "Part"
@@ -799,12 +778,12 @@ F 5 "GRM21BR61A106KE19" H 6100 7100 60  0001 C CNN "Part"
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C37
+L Device:C C37
 U 1 1 53A8D5E0
 P 6500 7100
 F 0 "C37" H 6550 7200 50  0000 L CNN
 F 1 "10U" H 6550 7000 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC2012X135L45N" H 6500 7100 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC200X125X135L45N" H 6500 7100 60  0001 C CNN
 F 3 "" H 6500 7100 60  0000 C CNN
 F 4 "Murata" H 6500 7100 60  0001 C CNN "Mfr"
 F 5 "GRM21BR61A106KE19" H 6500 7100 60  0001 C CNN "Part"
@@ -812,7 +791,7 @@ F 5 "GRM21BR61A106KE19" H 6500 7100 60  0001 C CNN "Part"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR072
+L power:GND #PWR072
 U 1 1 53A8D5E6
 P 6500 7400
 F 0 "#PWR072" H 6500 7400 30  0001 C CNN
@@ -823,7 +802,7 @@ F 3 "" H 6500 7400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR073
+L power:GND #PWR073
 U 1 1 53A8D5EC
 P 6100 7400
 F 0 "#PWR073" H 6100 7400 30  0001 C CNN
@@ -833,58 +812,22 @@ F 3 "" H 6100 7400 60  0000 C CNN
 	1    6100 7400
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	6500 7300 6500 7400
-Wire Wire Line
-	6100 7300 6100 7400
 Connection ~ 6100 6800
-Wire Wire Line
-	6500 6800 6500 6900
 Connection ~ 5700 6800
-Wire Wire Line
-	6100 6800 6100 6900
-Wire Wire Line
-	5700 6300 5700 6400
 Connection ~ 5300 5800
-Wire Wire Line
-	5700 5800 5700 5900
-Wire Wire Line
-	5300 6300 5300 6400
 Connection ~ 4900 5800
-Wire Wire Line
-	5300 5800 5300 5900
 Connection ~ 5300 6800
-Wire Wire Line
-	5300 6800 5300 6900
 Connection ~ 4900 6800
-Wire Wire Line
-	5300 7300 5300 7400
-Wire Wire Line
-	5700 7300 5700 7400
-Wire Wire Line
-	5700 6800 5700 6900
 Connection ~ 4500 6800
 Wire Wire Line
-	4900 6800 4900 6900
+	4500 6800 4900 6800
 Wire Wire Line
-	4500 6800 6500 6800
-Wire Wire Line
-	4500 6700 4500 6900
+	4500 6700 4500 6800
 Connection ~ 4500 5800
 Wire Wire Line
-	4900 5800 4900 5900
+	4500 5800 4900 5800
 Wire Wire Line
-	4500 5800 6500 5800
-Wire Wire Line
-	4500 5700 4500 5900
-Wire Wire Line
-	4500 6300 4500 6400
-Wire Wire Line
-	4900 6300 4900 6400
-Wire Wire Line
-	4500 7300 4500 7400
-Wire Wire Line
-	4900 7300 4900 7400
+	4500 5700 4500 5800
 Wire Wire Line
 	9100 5500 9100 4650
 Text Label 3900 2600 0    60   ~ 0
@@ -916,8 +859,6 @@ Wire Wire Line
 Wire Wire Line
 	1900 5300 1800 5300
 Connection ~ 1900 5100
-Wire Bus Line
-	7600 650  10750 650 
 Entry Wire Line
 	8200 650  8300 750 
 Entry Wire Line
@@ -1022,19 +963,17 @@ Text HLabel 1800 5300 0    60   Input ~ 0
 I2S0_RX_SDA
 Text Label 10150 3700 0    60   ~ 0
 P2_8
-Wire Bus Line
-	10750 650  10750 2700
 Wire Wire Line
 	10050 3300 10300 3300
 Wire Wire Line
 	10300 3400 10050 3400
 $Comp
-L C C42
+L Device:C C42
 U 1 1 53B1911F
 P 6100 6100
 F 0 "C42" H 6150 6200 50  0000 L CNN
 F 1 "10U" H 6150 6000 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC2012X135L45N" H 6100 6100 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC200X125X135L45N" H 6100 6100 60  0001 C CNN
 F 3 "" H 6100 6100 60  0000 C CNN
 F 4 "Murata" H 6100 6100 60  0001 C CNN "Mfr"
 F 5 "GRM21BR61A106KE19" H 6100 6100 60  0001 C CNN "Part"
@@ -1042,7 +981,7 @@ F 5 "GRM21BR61A106KE19" H 6100 6100 60  0001 C CNN "Part"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR074
+L power:GND #PWR074
 U 1 1 53B1912C
 P 6100 6400
 F 0 "#PWR074" H 6100 6400 30  0001 C CNN
@@ -1052,18 +991,14 @@ F 3 "" H 6100 6400 60  0000 C CNN
 	1    6100 6400
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	6100 6300 6100 6400
-Wire Wire Line
-	6100 5800 6100 5900
 Connection ~ 5700 5800
 $Comp
-L C C43
+L Device:C C43
 U 1 1 53B1A065
 P 6500 6100
 F 0 "C43" H 6550 6200 50  0000 L CNN
 F 1 "10U" H 6550 6000 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC2012X135L45N" H 6500 6100 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC200X125X135L45N" H 6500 6100 60  0001 C CNN
 F 3 "" H 6500 6100 60  0000 C CNN
 F 4 "Murata" H 6500 6100 60  0001 C CNN "Mfr"
 F 5 "GRM21BR61A106KE19" H 6500 6100 60  0001 C CNN "Part"
@@ -1071,7 +1006,7 @@ F 5 "GRM21BR61A106KE19" H 6500 6100 60  0001 C CNN "Part"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR075
+L power:GND #PWR075
 U 1 1 53B1A072
 P 6500 6400
 F 0 "#PWR075" H 6500 6400 30  0001 C CNN
@@ -1081,11 +1016,7 @@ F 3 "" H 6500 6400 60  0000 C CNN
 	1    6500 6400
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	6500 5800 6500 5900
 Connection ~ 6100 5800
-Wire Wire Line
-	6500 6300 6500 6400
 Wire Wire Line
 	6850 2600 6100 2600
 Wire Wire Line
@@ -1128,7 +1059,6 @@ Entry Wire Line
 	10650 2300 10750 2200
 Wire Wire Line
 	7600 1050 7800 1050
-NoConn ~ 10050 3600
 Text HLabel 6100 2600 0    60   Output ~ 0
 AUDIO_RESET#
 Text HLabel 3700 1800 2    60   Input ~ 0
@@ -1143,7 +1073,6 @@ Text Notes 4500 1900 0    60   ~ 0
 Init: I/O is hi-Z with pull-ups.\nSRAM download when VCCINT reaches 1V55.\nUser mode once downloaded and VCCIO OK.\nVCCINT stable to user mode: 200 usec max.\nVCCIOs stable to user mode: 2 usec.\n\nPull-ups: 5-25k @ 3V3, 25-60k @ 1V8.\nExternal R-pull: 1K PD, 10K PU recommended.\nVCCIO=3V3: 2V5, 3V3 inputs OK.\nVCCIO=1V8: 1V5, 1V8, 2V5, 3V3 inputs OK.\n\nJTAG active w/VCCINT, but refers to VCCIO.\nTDI, TMS: weak internal PU\nTCK: weak internal PD (keep low at power-up)
 Wire Wire Line
 	10700 3700 10050 3700
-NoConn ~ 10050 3500
 Entry Wire Line
 	8100 650  8200 750 
 Wire Wire Line
@@ -1152,10 +1081,8 @@ Wire Wire Line
 	11050 2900 10050 2900
 Wire Wire Line
 	11050 3100 10050 3100
-NoConn ~ 6850 2700
-NoConn ~ 6850 2900
 $Comp
-L GND #PWR076
+L power:GND #PWR076
 U 1 1 58FC4CC1
 P 7800 1050
 F 0 "#PWR076" H 7800 1050 30  0001 C CNN
@@ -1165,5 +1092,95 @@ F 3 "" H 7800 1050 60  0000 C CNN
 	1    7800 1050
 	0    -1   -1   0   
 $EndComp
-NoConn ~ 3600 2400
+Wire Wire Line
+	6100 6800 6500 6800
+Wire Wire Line
+	5700 6800 6100 6800
+Wire Wire Line
+	5300 5800 5700 5800
+Wire Wire Line
+	4900 5800 5300 5800
+Wire Wire Line
+	5300 6800 5700 6800
+Wire Wire Line
+	4900 6800 5300 6800
+Wire Wire Line
+	1900 5100 2000 5100
+Wire Wire Line
+	5700 5800 6100 5800
+Wire Wire Line
+	6100 5800 6500 5800
+Wire Wire Line
+	4500 5800 4500 5950
+Wire Wire Line
+	4500 6250 4500 6400
+Wire Wire Line
+	4900 6250 4900 6400
+Wire Wire Line
+	4900 5800 4900 5950
+Wire Wire Line
+	5300 5800 5300 5950
+Wire Wire Line
+	5300 6250 5300 6400
+Wire Wire Line
+	5700 6250 5700 6400
+Wire Wire Line
+	5700 5800 5700 5950
+Wire Wire Line
+	6100 5800 6100 5950
+Wire Wire Line
+	6100 6250 6100 6400
+Wire Wire Line
+	6500 6250 6500 6400
+Wire Wire Line
+	6500 5800 6500 5950
+Wire Wire Line
+	4500 6800 4500 6950
+Wire Wire Line
+	4500 7250 4500 7400
+Wire Wire Line
+	4900 7250 4900 7400
+Wire Wire Line
+	4900 6800 4900 6950
+Wire Wire Line
+	5300 6800 5300 6950
+Wire Wire Line
+	5300 7250 5300 7400
+Wire Wire Line
+	5700 7250 5700 7400
+Wire Wire Line
+	5700 6800 5700 6950
+Wire Wire Line
+	6100 6800 6100 6950
+Wire Wire Line
+	6100 7250 6100 7400
+Wire Wire Line
+	6500 7250 6500 7400
+Wire Wire Line
+	6500 6800 6500 6950
+Wire Wire Line
+	3800 2400 3600 2400
+Text HLabel 3800 2400 2    60   BiDi ~ 0
+CLKIN
+Text HLabel 6100 2700 0    60   Output ~ 0
+REF_EN
+Wire Wire Line
+	6100 2700 6850 2700
+NoConn ~ 2000 2400
+Text HLabel 10300 3500 2    60   Input ~ 0
+GPS_TX_READY
+Wire Wire Line
+	10300 3500 10050 3500
+Text HLabel 10300 3600 2    60   Input ~ 0
+GPS_TIMEPULSE
+Wire Wire Line
+	10050 3600 10300 3600
+Text HLabel 6100 2900 0    60   Output ~ 0
+GPS_RESET#
+Wire Wire Line
+	6100 2900 6850 2900
+Wire Bus Line
+	10750 650  10750 2700
+Wire Bus Line
+	7600 650  10750 650 
 $EndSCHEMATC
@@ -1,41 +1,21 @@
-EESchema Schematic File Version 2
-LIBS:portapack_h1-rescue
-LIBS:hackrf_expansion
-LIBS:passive
-LIBS:supply
-LIBS:trs_jack
-LIBS:battery
-LIBS:sd
-LIBS:ck
-LIBS:altera
-LIBS:regulator
-LIBS:tp
-LIBS:header
-LIBS:hole
-LIBS:sharebrained
-LIBS:fiducial
-LIBS:eastrising
-LIBS:on_semi
-LIBS:asahi_kasei
-LIBS:ti
-LIBS:diode
+EESchema Schematic File Version 4
 LIBS:portapack_h1-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 3 5
+Sheet 3 6
 Title "PortaPack H1"
-Date "2017-05-22"
-Rev "20170522"
+Date "2018-08-20"
+Rev "20180820"
 Comp "ShareBrained Technology, Inc."
-Comment1 "Copyright © 2014-2017 Jared Boone"
+Comment1 "Copyright © 2014-2018 Jared Boone"
 Comment2 "License: GNU General Public License, version 2"
 Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR019
+L power:GND #PWR019
 U 1 1 53A91608
 P 9900 5100
 F 0 "#PWR019" H 9900 5100 30  0001 C CNN
@@ -46,18 +26,18 @@ F 3 "" H 9900 5100 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3.3V #PWR020
+L power:+3V3 #PWR020
 U 1 1 53A91614
 P 9800 5000
 F 0 "#PWR020" H 9800 4960 30  0001 C CNN
-F 1 "+3.3V" H 9800 5110 30  0000 C CNN
+F 1 "+3V3" H 9800 5110 30  0000 C CNN
 F 2 "" H 9800 5000 60  0000 C CNN
 F 3 "" H 9800 5000 60  0000 C CNN
 	1    9800 5000
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR021
+L power:GND #PWR021
 U 1 1 53A91623
 P 9900 6000
 F 0 "#PWR021" H 9900 6000 30  0001 C CNN
@@ -102,12 +82,12 @@ LCD_DB14
 Text Label 9300 2500 0    60   ~ 0
 LCD_DB15
 $Comp
-L R R19
+L Device:R R19
 U 1 1 53A91657
 P 8000 2150
 F 0 "R19" V 8080 2150 50  0000 C CNN
 F 1 "10K" V 8000 2150 50  0001 C CNN
-F 2 "ipc_resc:IPC_RESC1005X40L25N" H 8000 2150 60  0001 C CNN
+F 2 "ipc_resc:IPC_RESC100X50X40L25N" H 8000 2150 60  0001 C CNN
 F 3 "" H 8000 2150 60  0000 C CNN
 F 4 "DNP" V 8000 2150 60  0000 C CNN "DNP"
 F 5 "Yageo" V 8000 2150 60  0001 C CNN "Mfr"
@@ -115,7 +95,7 @@ F 5 "Yageo" V 8000 2150 60  0001 C CNN "Mfr"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR022
+L power:GND #PWR022
 U 1 1 53A9165D
 P 8000 2500
 F 0 "#PWR022" H 8000 2500 30  0001 C CNN
@@ -126,18 +106,18 @@ F 3 "" H 8000 2500 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1.8V #PWR023
+L power:+1V8 #PWR023
 U 1 1 53A91663
 P 9800 4800
 F 0 "#PWR023" H 9800 4940 20  0001 C CNN
-F 1 "+1.8V" H 9800 4910 30  0000 C CNN
+F 1 "+1V8" H 9800 4910 30  0000 C CNN
 F 2 "" H 9800 4800 60  0000 C CNN
 F 3 "" H 9800 4800 60  0000 C CNN
 	1    9800 4800
 	0    -1   -1   0   
 $EndComp
 $Comp
-L MICROSD_DETSW J2
+L sd:MICROSD_DETSW J2
 U 1 1 53A8C6D0
 P 3900 6300
 F 0 "J2" H 3450 6950 60  0000 C CNN
@@ -150,7 +130,7 @@ F 5 "SCHA4B0419" H 3900 6300 60  0001 C CNN "Part"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR024
+L power:GND #PWR024
 U 1 1 53A8C6D6
 P 3100 6300
 F 0 "#PWR024" H 3100 6300 30  0001 C CNN
@@ -161,7 +141,7 @@ F 3 "" H 3100 6300 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR025
+L power:GND #PWR025
 U 1 1 53A8C6E2
 P 3100 6700
 F 0 "#PWR025" H 3100 6700 30  0001 C CNN
@@ -172,12 +152,12 @@ F 3 "" H 3100 6700 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L C C27
+L Device:C C27
 U 1 1 53AA73CE
 P 2800 7100
 F 0 "C27" H 2850 7200 50  0000 L CNN
 F 1 "100N" H 2850 7000 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC1005X55L25N" H 2800 7100 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC100X50X55L25N" H 2800 7100 60  0001 C CNN
 F 3 "" H 2800 7100 60  0000 C CNN
 F 4 "Murata" H 2800 7100 60  0001 C CNN "Mfr"
 F 5 "GRM155R61A104KA01" H 2800 7100 60  0001 C CNN "Part"
@@ -185,7 +165,7 @@ F 5 "GRM155R61A104KA01" H 2800 7100 60  0001 C CNN "Part"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR026
+L power:GND #PWR026
 U 1 1 53A8C6EF
 P 2400 7400
 F 0 "#PWR026" H 2400 7400 30  0001 C CNN
@@ -196,7 +176,7 @@ F 3 "" H 2400 7400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR027
+L power:GND #PWR027
 U 1 1 53A8C6F5
 P 4200 7200
 F 0 "#PWR027" H 4200 7200 30  0001 C CNN
@@ -207,7 +187,7 @@ F 3 "" H 4200 7200 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CK_TSWB-3N-CB SW1
+L ck:CK_TSWB-3N-CB SW1
 U 1 1 53A8C6FD
 P 2500 1450
 F 0 "SW1" H 2500 2050 60  0000 C CNN
@@ -220,7 +200,7 @@ F 5 "TSWB-3N-CB222 LFS" H 2500 1450 60  0001 C CNN "Part"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR028
+L power:GND #PWR028
 U 1 1 53A8C70A
 P 1400 2000
 F 0 "#PWR028" H 1400 2000 30  0001 C CNN
@@ -231,7 +211,7 @@ F 3 "" H 1400 2000 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR029
+L power:GND #PWR029
 U 1 1 53A8C710
 P 3600 2000
 F 0 "#PWR029" H 3600 2000 30  0001 C CNN
@@ -242,7 +222,7 @@ F 3 "" H 3600 2000 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR030
+L power:GND #PWR030
 U 1 1 53A8C716
 P 4000 7200
 F 0 "#PWR030" H 4000 7200 30  0001 C CNN
@@ -253,12 +233,12 @@ F 3 "" H 4000 7200 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C26
+L Device:C C26
 U 1 1 53A8C71C
 P 2400 7100
 F 0 "C26" H 2450 7200 50  0000 L CNN
 F 1 "10U" H 2450 7000 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC2012X135L45N" H 2400 7100 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC200X125X135L45N" H 2400 7100 60  0001 C CNN
 F 3 "" H 2400 7100 60  0000 C CNN
 F 4 "Murata" H 2400 7100 60  0001 C CNN "Mfr"
 F 5 "GRM21BR61A106KE19" H 2400 7100 60  0001 C CNN "Part"
@@ -266,7 +246,7 @@ F 5 "GRM21BR61A106KE19" H 2400 7100 60  0001 C CNN "Part"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR031
+L power:GND #PWR031
 U 1 1 53A8C722
 P 2800 7400
 F 0 "#PWR031" H 2800 7400 30  0001 C CNN
@@ -277,11 +257,11 @@ F 3 "" H 2800 7400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR032
+L power:+3V3 #PWR032
 U 1 1 53A8C728
 P 2800 5700
 F 0 "#PWR032" H 2800 5660 30  0001 C CNN
-F 1 "+3.3V" H 2800 5810 30  0000 C CNN
+F 1 "+3V3" H 2800 5810 30  0000 C CNN
 F 2 "" H 2800 5700 60  0000 C CNN
 F 3 "" H 2800 5700 60  0000 C CNN
 	1    2800 5700
@@ -370,7 +350,7 @@ SD_DAT1
 Text HLabel 2200 6800 0    60   Output ~ 0
 SD_CD
 $Comp
-L ER-TFT024-3_PANEL LCD1
+L eastrising:ER-TFT024-3_PANEL LCD1
 U 1 1 58A60E03
 P 8000 4600
 F 0 "LCD1" H 8000 5650 60  0000 C CNN
@@ -383,7 +363,7 @@ F 5 "ER-TFT024-3" H 8000 4600 60  0001 C CNN "Part"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ER-TFT024-3_FPC J3
+L eastrising:ER-TFT024-3_FPC J3
 U 1 1 58AE3A81
 P 10450 3350
 F 0 "J3" H 10450 5950 60  0000 C CNN
@@ -396,7 +376,7 @@ F 5 "ER-CON50HT-1" H 10450 3350 60  0001 C CNN "Part"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR033
+L power:GND #PWR033
 U 1 1 58AE4008
 P 9900 5800
 F 0 "#PWR033" H 9900 5800 30  0001 C CNN
@@ -407,7 +387,7 @@ F 3 "" H 9900 5800 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR034
+L power:GND #PWR034
 U 1 1 58AE4031
 P 9900 5700
 F 0 "#PWR034" H 9900 5700 30  0001 C CNN
@@ -418,7 +398,7 @@ F 3 "" H 9900 5700 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR035
+L power:GND #PWR035
 U 1 1 58AE405A
 P 9900 5600
 F 0 "#PWR035" H 9900 5600 30  0001 C CNN
@@ -429,7 +409,7 @@ F 3 "" H 9900 5600 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR036
+L power:GND #PWR036
 U 1 1 58AE9874
 P 9800 1900
 F 0 "#PWR036" H 9800 1900 30  0001 C CNN
@@ -440,7 +420,7 @@ F 3 "" H 9800 1900 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR037
+L power:GND #PWR037
 U 1 1 58AE9CF2
 P 9800 1600
 F 0 "#PWR037" H 9800 1600 30  0001 C CNN
@@ -453,7 +433,7 @@ $EndComp
 Text HLabel 9600 4600 0    60   Input ~ 0
 LCD_CS#
 $Comp
-L GND #PWR038
+L power:GND #PWR038
 U 1 1 58B079A0
 P 9900 4200
 F 0 "#PWR038" H 9900 4200 30  0001 C CNN
@@ -465,7 +445,7 @@ F 3 "" H 9900 4200 60  0000 C CNN
 $EndComp
 NoConn ~ 10000 4100
 $Comp
-L CAT4004[_AB] U4
+L on_semi:CAT4004[_AB] U4
 U 1 1 58B747DD
 P 2400 3150
 F 0 "U4" H 2000 3450 60  0000 L CNN
@@ -494,7 +474,7 @@ LEDK2
 Text Label 1300 3200 0    60   ~ 0
 LEDK1
 $Comp
-L GND #PWR039
+L power:GND #PWR039
 U 1 1 58B750FD
 P 2400 3700
 F 0 "#PWR039" H 2400 3700 30  0001 C CNN
@@ -505,7 +485,7 @@ F 3 "" H 2400 3700 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR040
+L power:GND #PWR040
 U 1 1 58B75120
 P 1700 3100
 F 0 "#PWR040" H 1700 3100 30  0001 C CNN
@@ -516,12 +496,12 @@ F 3 "" H 1700 3100 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R20
+L Device:R R20
 U 1 1 58B751E2
 P 3700 3350
 F 0 "R20" V 3780 3350 50  0000 C CNN
 F 1 "3K9" V 3700 3350 50  0001 C CNN
-F 2 "ipc_resc:IPC_RESC1005X40L25N" H 3700 3350 60  0001 C CNN
+F 2 "ipc_resc:IPC_RESC100X50X40L25N" H 3700 3350 60  0001 C CNN
 F 3 "" H 3700 3350 60  0000 C CNN
 F 4 "DNP" V 3700 3350 60  0000 C CNN "DNP"
 F 5 "Yageo" V 3700 3350 60  0001 C CNN "Mfr"
@@ -529,7 +509,7 @@ F 5 "Yageo" V 3700 3350 60  0001 C CNN "Mfr"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR041
+L power:GND #PWR041
 U 1 1 58B75265
 P 3700 3700
 F 0 "#PWR041" H 3700 3700 30  0001 C CNN
@@ -543,12 +523,10 @@ Wire Wire Line
 	2400 3600 2400 3700
 Wire Wire Line
 	3000 3100 3700 3100
-Wire Wire Line
-	3700 3600 3700 3700
 Wire Wire Line
 	1700 3100 1800 3100
 Wire Wire Line
-	3000 3000 4100 3000
+	3000 3000 4000 3000
 Wire Wire Line
 	3500 3300 3000 3300
 Wire Wire Line
@@ -573,9 +551,9 @@ Wire Wire Line
 	9600 4600 10000 4600
 Connection ~ 9900 1600
 Wire Wire Line
-	9900 1500 9900 1700
+	9900 1500 9900 1600
 Wire Wire Line
-	9800 1600 10000 1600
+	9800 1600 9900 1600
 Connection ~ 9900 1900
 Connection ~ 9900 2300
 Wire Wire Line
@@ -592,9 +570,9 @@ Wire Wire Line
 Wire Wire Line
 	9900 2000 10000 2000
 Wire Wire Line
-	9900 1900 9900 2400
+	9900 1900 9900 2000
 Wire Wire Line
-	9800 1900 10000 1900
+	9800 1900 9900 1900
 Wire Wire Line
 	9900 1700 10000 1700
 Wire Wire Line
@@ -614,8 +592,6 @@ Wire Wire Line
 	3200 6700 3100 6700
 Wire Wire Line
 	3200 6800 2200 6800
-Wire Bus Line
-	9100 2100 9100 3900
 Wire Bus Line
 	8950 2100 9100 2100
 Wire Wire Line
@@ -645,9 +621,7 @@ Wire Wire Line
 Wire Wire Line
 	4200 7100 4200 7200
 Wire Wire Line
-	2400 7300 2400 7400
-Wire Wire Line
-	2400 6100 3200 6100
+	2400 6100 2800 6100
 Wire Wire Line
 	3200 6300 3100 6300
 Wire Wire Line
@@ -663,17 +637,9 @@ Wire Wire Line
 Wire Wire Line
 	2200 5800 3200 5800
 Wire Wire Line
-	2800 5700 2800 6900
+	2800 5700 2800 6100
 Connection ~ 2800 6100
-Wire Wire Line
-	2800 7300 2800 7400
-Wire Wire Line
-	2400 6100 2400 6900
-Wire Wire Line
-	8000 2400 8000 2500
 Connection ~ 8000 1800
-Wire Wire Line
-	8000 1800 8000 1900
 Wire Wire Line
 	9200 2500 10000 2500
 Wire Wire Line
@@ -695,7 +661,7 @@ Wire Wire Line
 Wire Wire Line
 	9600 4300 10000 4300
 Wire Wire Line
-	7900 1800 10000 1800
+	7900 1800 8000 1800
 Wire Wire Line
 	9600 4500 10000 4500
 Wire Wire Line
@@ -729,7 +695,7 @@ Wire Wire Line
 Wire Wire Line
 	9800 5000 10000 5000
 Wire Wire Line
-	9800 4800 10000 4800
+	9800 4800 9900 4800
 Wire Wire Line
 	10000 5100 9900 5100
 Wire Wire Line
@@ -737,11 +703,11 @@ Wire Wire Line
 Wire Wire Line
 	10000 1500 9900 1500
 $Comp
-L +1.8V #PWR042
+L power:+1V8 #PWR042
 U 1 1 58BA7696
 P 9900 1400
 F 0 "#PWR042" H 9900 1540 20  0001 C CNN
-F 1 "+1.8V" H 9900 1510 30  0000 C CNN
+F 1 "+1V8" H 9900 1510 30  0000 C CNN
 F 2 "" H 9900 1400 60  0000 C CNN
 F 3 "" H 9900 1400 60  0000 C CNN
 	1    9900 1400
@@ -754,12 +720,12 @@ EN/DIM: 200k PD internal, enable > 1.3V, disable < 0.4V\nRSET: not required, def
 Text HLabel 4100 3000 2    60   Input ~ 0
 LCD_VBL
 $Comp
-L C C14
+L Device:C C14
 U 1 1 58D0DFA2
 P 4000 3300
 F 0 "C14" H 4050 3400 50  0000 L CNN
 F 1 "1U" H 4050 3200 50  0000 L CNN
-F 2 "ipc_capc:IPC_CAPC1608X90L35N" H 4000 3300 60  0001 C CNN
+F 2 "ipc_capc:IPC_CAPC160X80X90L35N" H 4000 3300 60  0001 C CNN
 F 3 "" H 4000 3300 60  0000 C CNN
 F 4 "Murata" H 4000 3300 60  0001 C CNN "Mfr"
 F 5 "GRM188R61C105KA93D" H 4000 3300 60  0001 C CNN "Part"
@@ -767,7 +733,7 @@ F 5 "GRM188R61C105KA93D" H 4000 3300 60  0001 C CNN "Part"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR043
+L power:GND #PWR043
 U 1 1 58D0E0F8
 P 4000 3600
 F 0 "#PWR043" H 4000 3600 30  0001 C CNN
@@ -777,9 +743,49 @@ F 3 "" H 4000 3600 60  0000 C CNN
 	1    4000 3600
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	4000 3500 4000 3600
-Wire Wire Line
-	4000 3100 4000 3000
 Connection ~ 4000 3000
+Wire Wire Line
+	9900 1600 9900 1700
+Wire Wire Line
+	9900 1600 10000 1600
+Wire Wire Line
+	9900 1900 10000 1900
+Wire Wire Line
+	9900 2300 9900 2400
+Wire Wire Line
+	9900 2200 9900 2300
+Wire Wire Line
+	9900 2100 9900 2200
+Wire Wire Line
+	9900 2000 9900 2100
+Wire Wire Line
+	9900 4800 10000 4800
+Wire Wire Line
+	2800 6100 3200 6100
+Wire Wire Line
+	8000 1800 10000 1800
+Wire Wire Line
+	4000 3000 4100 3000
+Wire Wire Line
+	3700 3100 3700 3200
+Wire Wire Line
+	3700 3500 3700 3700
+Wire Wire Line
+	4000 3450 4000 3600
+Wire Wire Line
+	4000 3000 4000 3150
+Wire Wire Line
+	2400 6100 2400 6950
+Wire Wire Line
+	2400 7250 2400 7400
+Wire Wire Line
+	2800 7250 2800 7400
+Wire Wire Line
+	2800 6100 2800 6950
+Wire Wire Line
+	8000 1800 8000 2000
+Wire Wire Line
+	8000 2300 8000 2500
+Wire Bus Line
+	9100 2100 9100 3900
 $EndSCHEMATC
@@ -1,4 +1,4 @@
-update=Mon 19 Jun 2017 03:56:47 PM PDT
+update=Wed 25 Jul 2018 01:46:26 PM PDT
 version=1
 last_client=kicad
 [cvpcb]
@@ -8,30 +8,6 @@ NetIExt=net
 EquName1=devcms
 [general]
 version=1
-[eeschema]
-version=1
-LibDir=../../../library-kicad
-[eeschema/libraries]
-LibName1=portapack_h1-rescue
-LibName2=hackrf_expansion
-LibName3=passive
-LibName4=supply
-LibName5=trs_jack
-LibName6=battery
-LibName7=sd
-LibName8=ck
-LibName9=altera
-LibName10=regulator
-LibName11=tp
-LibName12=header
-LibName13=hole
-LibName14=sharebrained
-LibName15=fiducial
-LibName16=eastrising
-LibName17=on_semi
-LibName18=asahi_kasei
-LibName19=ti
-LibName20=diode
 [pcbnew]
 version=1
 PageLayoutDescrFile=
@@ -61,3 +37,6 @@ NetFmtName=Pcbnew
 SpiceForceRefPrefix=0
 SpiceUseNetNumbers=0
 LabSize=60
+[eeschema]
+version=1
+LibDir=
@@ -1,41 +1,21 @@
-EESchema Schematic File Version 2
-LIBS:portapack_h1-rescue
-LIBS:hackrf_expansion
-LIBS:passive
-LIBS:supply
-LIBS:trs_jack
-LIBS:battery
-LIBS:sd
-LIBS:ck
-LIBS:altera
-LIBS:regulator
-LIBS:tp
-LIBS:header
-LIBS:hole
-LIBS:sharebrained
-LIBS:fiducial
-LIBS:eastrising
-LIBS:on_semi
-LIBS:asahi_kasei
-LIBS:ti
-LIBS:diode
+EESchema Schematic File Version 4
 LIBS:portapack_h1-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 1 5
+Sheet 1 6
 Title "PortaPack H1"
-Date "2017-05-22"
-Rev "20170522"
+Date "2018-08-20"
+Rev "20180820"
 Comp "ShareBrained Technology, Inc."
-Comment1 "Copyright © 2014-2017 Jared Boone"
+Comment1 "Copyright © 2014-2018 Jared Boone"
 Comment2 "License: GNU General Public License, version 2"
 Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L HOLE1 H2
+L hole:HOLE1 H2
 U 1 1 5369BBD8
 P 9500 1900
 F 0 "H2" H 9500 2050 60  0000 C CNN
@@ -46,7 +26,7 @@ F 3 "" H 9500 1900 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L HOLE1 H3
+L hole:HOLE1 H3
 U 1 1 5369BBEC
 P 9500 2400
 F 0 "H3" H 9500 2550 60  0000 C CNN
@@ -57,7 +37,7 @@ F 3 "" H 9500 2400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L HOLE1 H4
+L hole:HOLE1 H4
 U 1 1 5369BC00
 P 9500 2900
 F 0 "H4" H 9500 3050 60  0000 C CNN
@@ -68,7 +48,7 @@ F 3 "" H 9500 2900 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L HOLE1 H5
+L hole:HOLE1 H5
 U 1 1 5369BC14
 P 9500 3400
 F 0 "H5" H 9500 3550 60  0000 C CNN
@@ -180,6 +160,11 @@ F36 "VIN" I R 6600 5200 60
 F37 "VBUS" O R 6600 5000 60 
 F38 "VBUSCTRL" I R 6600 5100 60 
 F39 "VBAT" I L 4700 5200 60 
+F40 "CLKIN" B L 4700 4900 60 
+F41 "REF_EN" O L 4700 5000 60 
+F42 "GPS_TX_READY" I L 4700 2800 60 
+F43 "GPS_TIMEPULSE" I L 4700 2900 60 
+F44 "GPS_RESET#" O L 4700 3000 60 
 $EndSheet
 Wire Wire Line
 	6600 1900 7600 1900
@@ -240,15 +225,15 @@ Wire Wire Line
 Wire Wire Line
 	3700 2300 4700 2300
 Wire Wire Line
-	4700 2500 3700 2500
+	4700 2500 4000 2500
 Wire Wire Line
-	3700 2600 4700 2600
+	3700 2600 4100 2600
 Wire Wire Line
-	9800 1900 9800 3500
+	9800 1900 9800 2400
 Connection ~ 9800 2400
 Connection ~ 9800 2900
 $Comp
-L FIDUCIAL FID1
+L fiducial:FIDUCIAL FID1
 U 1 1 53B309AC
 P 4100 7100
 F 0 "FID1" H 4100 7225 60  0000 C CNN
@@ -259,7 +244,7 @@ F 3 "" H 4100 7100 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FIDUCIAL FID2
+L fiducial:FIDUCIAL FID2
 U 1 1 53B30B4C
 P 4100 7500
 F 0 "FID2" H 4100 7625 60  0000 C CNN
@@ -270,7 +255,7 @@ F 3 "" H 4100 7500 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FIDUCIAL FID3
+L fiducial:FIDUCIAL FID3
 U 1 1 53B30CEC
 P 4700 7100
 F 0 "FID3" H 4700 7225 60  0000 C CNN
@@ -281,18 +266,7 @@ F 3 "" H 4700 7100 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FIDUCIAL FID4
-U 1 1 53B30E8C
-P 4700 7500
-F 0 "FID4" H 4700 7625 60  0000 C CNN
-F 1 "FIDUCIAL" H 4700 7375 60  0000 C CNN
-F 2 "fiducial:FIDUCIAL_65MIL" H 4700 7500 60  0001 C CNN
-F 3 "" H 4700 7500 60  0000 C CNN
-	1    4700 7500
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR01
+L power:GND #PWR01
 U 1 1 53B3303D
 P 9800 3500
 F 0 "#PWR01" H 9800 3500 30  0001 C CNN
@@ -310,7 +284,7 @@ Wire Wire Line
 Wire Wire Line
 	4700 1700 3700 1700
 $Sheet
-S 4700 5600 1900 700 
+S 4700 5600 1900 1000
 U 58CFF3E3
 F0 "power" 50
 F1 "power.sch" 50
@@ -323,6 +297,9 @@ F7 "VBUS" I R 6600 5700 60
 F8 "VBUSCTRL" O R 6600 5800 60 
 F9 "VIN" O R 6600 5900 60 
 F10 "VBAT" O L 4700 5700 60 
+F11 "REF_CLK" O L 4700 6500 60 
+F12 "REF_EN" I L 4700 6400 60 
+F13 "GPS_VCC" O R 6600 6400 60 
 $EndSheet
 Wire Wire Line
 	6600 6200 7600 6200
@@ -358,4 +335,78 @@ Wire Wire Line
 	7000 5200 7000 5900
 Wire Wire Line
 	7000 5900 6600 5900
+Wire Wire Line
+	9800 2400 9800 2900
+Wire Wire Line
+	9800 2900 9800 3400
+Wire Wire Line
+	9800 3400 9800 3500
+Wire Wire Line
+	4700 5000 4300 5000
+Wire Wire Line
+	4300 5000 4300 6400
+Wire Wire Line
+	4300 6400 4700 6400
+Wire Wire Line
+	4700 6500 4200 6500
+Wire Wire Line
+	4200 6500 4200 4900
+Wire Wire Line
+	4200 4900 4700 4900
+$Sheet
+S 4700 600  1900 800 
+U 5B7E0B2A
+F0 "gps" 50
+F1 "gps.sch" 50
+F2 "SDA" B L 4700 800 60 
+F3 "SCL" B L 4700 700 60 
+F4 "V_BACKUP" I L 4700 1300 60 
+F5 "VCC" I R 6600 1300 60 
+F6 "TIMEPULSE" O L 4700 1000 60 
+F7 "RESET#" I L 4700 1100 60 
+F8 "TX_READY" O L 4700 900 60 
+$EndSheet
+Wire Wire Line
+	4700 700  4000 700 
+Wire Wire Line
+	4000 700  4000 2500
+Connection ~ 4000 2500
+Wire Wire Line
+	4000 2500 3700 2500
+Wire Wire Line
+	4700 800  4100 800 
+Wire Wire Line
+	4100 800  4100 2600
+Connection ~ 4100 2600
+Wire Wire Line
+	4100 2600 4700 2600
+Wire Wire Line
+	4700 1300 4500 1300
+Wire Wire Line
+	4500 1300 4500 5200
+Connection ~ 4500 5200
+Wire Wire Line
+	4200 2800 4700 2800
+Wire Wire Line
+	4700 2900 4300 2900
+Wire Wire Line
+	4700 900  4200 900 
+Wire Wire Line
+	4200 900  4200 2800
+Wire Wire Line
+	4700 1000 4300 1000
+Wire Wire Line
+	4300 1000 4300 2900
+Wire Wire Line
+	4700 1100 4400 1100
+Wire Wire Line
+	4400 1100 4400 3000
+Wire Wire Line
+	4400 3000 4700 3000
+Wire Wire Line
+	6600 6400 7100 6400
+Wire Wire Line
+	7100 6400 7100 1300
+Wire Wire Line
+	6600 1300 7100 1300
 $EndSCHEMATC
@@ -0,0 +1,25 @@
+(sym_lib_table
+  (lib (name hackrf_expansion)(type Legacy)(uri ${KISBLIB}/hackrf_expansion.lib)(options "")(descr ""))
+  (lib (name passive)(type Legacy)(uri ${KISBLIB}/passive.lib)(options "")(descr ""))
+  (lib (name trs_jack)(type Legacy)(uri ${KISBLIB}/trs_jack.lib)(options "")(descr ""))
+  (lib (name battery)(type Legacy)(uri ${KISBLIB}/battery.lib)(options "")(descr ""))
+  (lib (name sd)(type Legacy)(uri ${KISBLIB}/sd.lib)(options "")(descr ""))
+  (lib (name ck)(type Legacy)(uri ${KISBLIB}/ck.lib)(options "")(descr ""))
+  (lib (name altera)(type Legacy)(uri ${KISBLIB}/altera.lib)(options "")(descr ""))
+  (lib (name regulator)(type Legacy)(uri ${KISBLIB}/regulator.lib)(options "")(descr ""))
+  (lib (name tp)(type Legacy)(uri ${KISBLIB}/tp.lib)(options "")(descr ""))
+  (lib (name header)(type Legacy)(uri ${KISBLIB}/header.lib)(options "")(descr ""))
+  (lib (name hole)(type Legacy)(uri ${KISBLIB}/hole.lib)(options "")(descr ""))
+  (lib (name sharebrained)(type Legacy)(uri ${KISBLIB}/sharebrained.lib)(options "")(descr ""))
+  (lib (name fiducial)(type Legacy)(uri ${KISBLIB}/fiducial.lib)(options "")(descr ""))
+  (lib (name eastrising)(type Legacy)(uri ${KISBLIB}/eastrising.lib)(options "")(descr ""))
+  (lib (name on_semi)(type Legacy)(uri ${KISBLIB}/on_semi.lib)(options "")(descr ""))
+  (lib (name asahi_kasei)(type Legacy)(uri ${KISBLIB}/asahi_kasei.lib)(options "")(descr ""))
+  (lib (name ti)(type Legacy)(uri ${KISBLIB}/ti.lib)(options "")(descr ""))
+  (lib (name diode)(type Legacy)(uri ${KISBLIB}/diode.lib)(options "")(descr ""))
+  (lib (name esd)(type Legacy)(uri ${KISBLIB}/esd.lib)(options "")(descr ""))
+  (lib (name osc)(type Legacy)(uri ${KISBLIB}/osc.lib)(options "")(descr ""))
+  (lib (name logic)(type Legacy)(uri ${KISBLIB}/logic.lib)(options "")(descr ""))
+  (lib (name ublox)(type Legacy)(uri ${KISBLIB}/ublox.lib)(options "")(descr ""))
+  (lib (name conn_rf)(type Legacy)(uri ${KISBLIB}/conn_rf.lib)(options "")(descr ""))
+)