From: Uwe Hermann <redacted>
Date: Wed, 6 Jun 2012 21:35:53 +0000 (+0200)
Subject: schematic: Various simplifications and fixes, regen netlist.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=77ffbe1136e930158be90dc70e01e04c9a22d1cf;p=fx2grok.git

schematic: Various simplifications and fixes, regen netlist.

Drop two LEDs to save space. Use only one pullup for both SCL and SDA
(should work as I2C is not used anyway). Probe connector: pins 9 + 10 are GND.
Remove unneeded resistor/bridge for the USB connector SHIELD/GND connection.
---

diff --git a/hardware/fx2grok-cube/0.1/fx2grok-cube.net b/hardware/fx2grok-cube/0.1/fx2grok-cube.net
index 981ea41..f274db5 100644
--- a/hardware/fx2grok-cube/0.1/fx2grok-cube.net
+++ b/hardware/fx2grok-cube/0.1/fx2grok-cube.net
@@ -1,4 +1,4 @@
-# EESchema Netlist Version 1.1 created  Tue 05 Jun 2012 12:09:06 AM CEST
+# EESchema Netlist Version 1.1 created  Wed 06 Jun 2012 11:39:24 PM CEST
 (
  ( /4FCD30A0 CONN-5x2-SMD-127MM  P1 CONN_5X2 {Lib=CONN_5X2}
   (    1 /PB0 )
@@ -10,25 +10,25 @@
   (    7 /PB6 )
   (    8 /PB7 )
   (    9 GND )
-  (   10 ? )
+  (   10 GND )
  )
  ( /4FCBF38C ABM11  X1 QUARTZCMS4 {Lib=QUARTZCMS4}
   (    1 /XTALIN )
   (    3 /XTALOUT )
  )
- ( /4FCBEB98 SM0402  C16 1uF {Lib=C}
+ ( /4FCBEB98 SM0402  C1 1uF {Lib=C}
   (    1 +3.3V )
   (    2 GND )
  )
  ( /4FCAB259 RPACK-8-SMD-0402  RP1 R_PACK8 {Lib=R_PACK8}
   (    1 N-000051 )
-  (    2 N-000028 )
+  (    2 N-000026 )
   (    3 N-000050 )
-  (    4 N-000020 )
+  (    4 N-000012 )
   (    5 N-000049 )
-  (    6 N-000015 )
+  (    6 N-000014 )
   (    7 N-000048 )
-  (    8 N-000035 )
+  (    8 N-000034 )
   (    9 /PB7 )
   (   10 /PB6 )
   (   11 /PB5 )
@@ -38,39 +38,23 @@
   (   15 /PB1 )
   (   16 /PB0 )
  )
- ( /4FCAAF6B SM0402  R8 2K2 {Lib=R}
-  (    1 N-000043 )
-  (    2 +3.3V )
- )
- ( /4FCAAF69 SM0402  D3 PWRLED {Lib=LED}
-  (    1 N-000043 )
-  (    2 GND )
- )
- ( /4FCAAF48 SM0402  D2 LED2 {Lib=LED}
-  (    1 N-000044 )
-  (    2 GND )
- )
- ( /4FCAAF46 SM0402  R7 2K2 {Lib=R}
-  (    1 N-000044 )
-  (    2 /PD1 )
- )
- ( /4FCAAEBE SM0402  R6 2K2 {Lib=R}
-  (    1 N-000053 )
-  (    2 /PD0 )
+ ( /4FCAAEBE SM0402  R4 2K7 {Lib=R}
+  (    1 N-000045 )
+  (    2 /PA0 )
  )
  ( /4FCAAEBC SM0402  D1 LED1 {Lib=LED}
-  (    1 N-000053 )
+  (    1 N-000045 )
   (    2 GND )
  )
- ( /4FCAA86B SM0402  C14 100nF {Lib=C}
-  (    1 N-000003 )
+ ( /4FCAA86B SM0402  C15 100nF {Lib=C}
+  (    1 N-000043 )
   (    2 GND )
  )
- ( /4FCAA863 SM0402  C15 2.2uF {Lib=C}
+ ( /4FCAA863 SM0402  C16 2.2uF {Lib=C}
   (    1 +3.3V )
   (    2 GND )
  )
- ( /4FCAA85F SM0402  C13 1uF {Lib=C}
+ ( /4FCAA85F SM0402  C14 1uF {Lib=C}
   (    1 +5V )
   (    2 GND )
  )
@@ -78,7 +62,7 @@
   (    1 +5V )
   (    2 GND )
   (    3 +5V )
-  (    4 N-000003 )
+  (    4 N-000043 )
   (    5 +3.3V )
  )
  ( /4FCAA5E6 MICRO-USB-B-SMD  U1 MICRO-USB-B-SMD {Lib=MICRO-USB-B-SMD}
@@ -87,52 +71,52 @@
   (    3 /DP )
   (    4 ? )
   (    5 GND )
-  (    6 /SHIELD )
-  (    7 /SHIELD )
-  (    8 /SHIELD )
-  (    9 /SHIELD )
+  (    6 GND )
+  (    7 GND )
+  (    8 GND )
+  (    9 GND )
  )
  ( /4FCAA3E6 SM0402  R2 2K7 {Lib=R}
   (    1 +3.3V )
   (    2 /RESET# )
  )
- ( /4FCA9C86 SM0402  C10 100nF {Lib=C}
+ ( /4FCA9C86 SM0402  C11 100nF {Lib=C}
   (    1 +3.3V )
   (    2 GND )
  )
- ( /4FCA9C7E SM0402  C7 100nF {Lib=C}
+ ( /4FCA9C7E SM0402  C8 100nF {Lib=C}
   (    1 +3.3V )
   (    2 GND )
  )
- ( /4FCA9C79 SM0402  C5 2.2uF {Lib=C}
+ ( /4FCA9C79 SM0402  C6 2.2uF {Lib=C}
   (    1 +3.3V )
   (    2 GND )
  )
- ( /4FCA9C5D SM0402  C2 2.2uF {Lib=C}
+ ( /4FCA9C5D SM0402  C3 2.2uF {Lib=C}
   (    1 +3.3V )
   (    2 GND )
  )
- ( /4FCA97A0 SM0402  C12 100nF {Lib=C}
+ ( /4FCA97A0 SM0402  C13 100nF {Lib=C}
   (    1 +3.3V )
   (    2 GND )
  )
- ( /4FCA9799 SM0402  C11 100nF {Lib=C}
+ ( /4FCA9799 SM0402  C12 100nF {Lib=C}
   (    1 +3.3V )
   (    2 GND )
  )
- ( /4FCA9793 SM0402  C6 100nF {Lib=C}
+ ( /4FCA9793 SM0402  C7 100nF {Lib=C}
   (    1 +3.3V )
   (    2 GND )
  )
- ( /4FCA9777 SM0402  C4 100nF {Lib=C}
+ ( /4FCA9777 SM0402  C5 100nF {Lib=C}
   (    1 +3.3V )
   (    2 GND )
  )
- ( /4FCA9724 SM0402  C9 100nF {Lib=C}
+ ( /4FCA9724 SM0402  C10 100nF {Lib=C}
   (    1 +3.3V )
   (    2 GND )
  )
- ( /4FCA96AB SM0402  C1 100nF {Lib=C}
+ ( /4FCA96AB SM0402  C2 100nF {Lib=C}
   (    1 +3.3V )
   (    2 GND )
  )
@@ -140,26 +124,18 @@
   (    1 +3.3V )
   (    2 /WAKEUP )
  )
- ( /4FCA93C6 SM0402  R5 2K2 {Lib=R}
-  (    1 +3.3V )
-  (    2 /SDA )
- )
- ( /4FCA93BD SM0402  R4 2K2 {Lib=R}
-  (    1 +3.3V )
-  (    2 /SCL )
+ ( /4FCA93BD SM0402  R3 2K7 {Lib=R}
+  (    1 /SCL )
+  (    2 +3.3V )
  )
- ( /4FC8F6F8 SM0402  C3 12pF {Lib=C}
+ ( /4FC8F6F8 SM0402  C4 12pF {Lib=C}
   (    1 /XTALIN )
   (    2 GND )
  )
- ( /4FC8F6F5 SM0402  C8 12pF {Lib=C}
+ ( /4FC8F6F5 SM0402  C9 12pF {Lib=C}
   (    1 /XTALOUT )
   (    2 GND )
  )
- ( /4FC8F58A SM0402  R3 0R {Lib=R}
-  (    1 /SHIELD )
-  (    2 GND )
- )
  ( /4FC8F245 QFN56  IC1 CY7C68013A-56 {Lib=CY7C68013A-56}
   (    1 ? )
   (    2 ? )
@@ -176,16 +152,16 @@
   (   13 ? )
   (   14 GND )
   (   15 /SCL )
-  (   16 /SDA )
+  (   16 /SCL )
   (   17 +3.3V )
   (   18 N-000051 )
-  (   19 N-000028 )
+  (   19 N-000026 )
   (   20 N-000050 )
-  (   21 N-000020 )
+  (   21 N-000012 )
   (   22 N-000049 )
-  (   23 N-000015 )
+  (   23 N-000014 )
   (   24 N-000048 )
-  (   25 N-000035 )
+  (   25 N-000034 )
   (   26 GND )
   (   27 +3.3V )
   (   28 GND )
@@ -193,7 +169,7 @@
   (   30 ? )
   (   31 ? )
   (   32 +3.3V )
-  (   33 ? )
+  (   33 /PA0 )
   (   34 ? )
   (   35 ? )
   (   36 ? )
@@ -205,8 +181,8 @@
   (   42 /RESET# )
   (   43 +3.3V )
   (   44 /WAKEUP )
-  (   45 /PD0 )
-  (   46 /PD1 )
+  (   45 ? )
+  (   46 ? )
   (   47 ? )
   (   48 ? )
   (   49 ? )
@@ -221,44 +197,12 @@
 )
 *
 { Allowed footprints by component:
-$component C16
+$component C1
  SM*
  C?
  C1-1
 $endlist
-$component R8
- R?
- SM0603
- SM0805
- R?-*
- SM1206
-$endlist
-$component D3
- LED-3MM
- LED-5MM
- LED-10MM
- LED-0603
- LED-0805
- LED-1206
- LEDV
-$endlist
-$component D2
- LED-3MM
- LED-5MM
- LED-10MM
- LED-0603
- LED-0805
- LED-1206
- LEDV
-$endlist
-$component R7
- R?
- SM0603
- SM0805
- R?-*
- SM1206
-$endlist
-$component R6
+$component R4
  R?
  SM0603
  SM0805
@@ -274,17 +218,17 @@ $component D1
  LED-1206
  LEDV
 $endlist
-$component C14
+$component C15
  SM*
  C?
  C1-1
 $endlist
-$component C15
+$component C16
  SM*
  C?
  C1-1
 $endlist
-$component C13
+$component C14
  SM*
  C?
  C1-1
@@ -296,52 +240,52 @@ $component R2
  R?-*
  SM1206
 $endlist
-$component C10
+$component C11
  SM*
  C?
  C1-1
 $endlist
-$component C7
+$component C8
  SM*
  C?
  C1-1
 $endlist
-$component C5
+$component C6
  SM*
  C?
  C1-1
 $endlist
-$component C2
+$component C3
  SM*
  C?
  C1-1
 $endlist
-$component C12
+$component C13
  SM*
  C?
  C1-1
 $endlist
-$component C11
+$component C12
  SM*
  C?
  C1-1
 $endlist
-$component C6
+$component C7
  SM*
  C?
  C1-1
 $endlist
-$component C4
+$component C5
  SM*
  C?
  C1-1
 $endlist
-$component C9
+$component C10
  SM*
  C?
  C1-1
 $endlist
-$component C1
+$component C2
  SM*
  C?
  C1-1
@@ -353,168 +297,155 @@ $component R1
  R?-*
  SM1206
 $endlist
-$component R5
- R?
- SM0603
- SM0805
- R?-*
- SM1206
-$endlist
-$component R4
+$component R3
  R?
  SM0603
  SM0805
  R?-*
  SM1206
 $endlist
-$component C3
+$component C4
  SM*
  C?
  C1-1
 $endlist
-$component C8
+$component C9
  SM*
  C?
  C1-1
 $endlist
-$component R3
- R?
- SM0603
- SM0805
- R?-*
- SM1206
-$endlist
 $endfootprintlist
 }
 { Pin List by Nets
-Net 1 "GND" "GND"
- IC1 26
- IC1 14
- C16 2
- IC1 56
+Net 1 "+3.3V" "+3.3V"
+ IC1 27
+ IC1 17
+ IC1 3
+ C1 1
+ R2 1
+ IC1 55
+ IC1 11
+ C5 1
+ C10 1
+ IC1 7
+ C8 1
+ C16 1
+ C6 1
+ C11 1
+ U2 5
+ C3 1
+ C13 1
+ C12 1
+ C7 1
+ R3 2
+ IC1 43
+ C2 1
+ R1 1
+ IC1 32
+Net 2 "GND" "GND"
+ C9 2
+ C4 2
+ P1 10
+ C1 2
  P1 9
+ C15 2
+ D1 2
+ U1 5
+ U1 9
+ U1 8
+ U1 7
+ U1 6
+ C14 2
+ C16 2
+ C6 2
+ C8 2
+ C11 2
+ IC1 53
  IC1 12
- C10 2
  IC1 41
- IC1 53
+ IC1 14
  IC1 10
  IC1 6
  IC1 28
- R3 2
- C8 2
- C3 2
- D3 2
- D2 2
- C9 2
- C1 2
  C7 2
- C4 2
- U1 5
- U2 2
+ C12 2
  C13 2
- C5 2
+ C3 2
+ U2 2
  C2 2
- C12 2
- C11 2
- C6 2
- C15 2
- C14 2
- D1 2
-Net 2 "+3.3V" "+3.3V"
- C5 1
- R8 2
- C12 1
- R1 1
- IC1 32
- R4 1
- R5 1
- C9 1
- C1 1
- C15 1
- C7 1
- C11 1
- C6 1
- C2 1
- C10 1
- IC1 27
- R2 1
- IC1 55
- IC1 17
- C4 1
- IC1 3
- IC1 7
- U2 5
- IC1 11
- C16 1
- IC1 43
-Net 3 "" ""
- C14 1
- U2 4
-Net 4 "/RESET#" "RESET#"
+ C10 2
+ C5 2
+ IC1 56
+ IC1 26
+Net 3 "/RESET#" "RESET#"
  R2 2
  IC1 42
-Net 8 "/PB0" "PB0"
+Net 7 "/PB0" "PB0"
  RP1 16
  P1 1
-Net 9 "/PB2" "PB2"
+Net 8 "/PB2" "PB2"
  P1 3
  RP1 14
-Net 10 "/PB4" "PB4"
+Net 9 "/PB4" "PB4"
  RP1 12
  P1 5
-Net 11 "/PB5" "PB5"
+Net 10 "/PB5" "PB5"
  P1 6
  RP1 11
-Net 12 "/PB7" "PB7"
+Net 11 "/PB7" "PB7"
  P1 8
  RP1 9
-Net 15 "" ""
+Net 12 "" ""
+ IC1 21
+ RP1 4
+Net 13 "/PA0" "PA0"
+ IC1 33
+ R4 2
+Net 14 "" ""
  RP1 6
  IC1 23
-Net 20 "" ""
- RP1 4
- IC1 21
-Net 23 "/XTALIN" "XTALIN"
- C3 1
- X1 1
- IC1 5
-Net 24 "/XTALOUT" "XTALOUT"
- X1 3
- IC1 4
- C8 1
-Net 28 "" ""
- IC1 19
+Net 26 "" ""
  RP1 2
-Net 35 "" ""
+ IC1 19
+Net 34 "" ""
  IC1 25
  RP1 8
-Net 37 "/WAKEUP" "WAKEUP"
+Net 36 "/WAKEUP" "WAKEUP"
  IC1 44
  R1 2
-Net 39 "/DP" "DP"
- U1 3
+Net 38 "/DP" "DP"
  IC1 8
-Net 40 "/DM" "DM"
+ U1 3
+Net 39 "/DM" "DM"
  U1 2
  IC1 9
-Net 41 "/SCL" "SCL"
- R4 2
- IC1 15
-Net 42 "/SDA" "SDA"
- R5 2
+Net 40 "/SCL" "SCL"
+ R3 1
  IC1 16
+ IC1 15
+Net 41 "/XTALOUT" "XTALOUT"
+ C9 1
+ IC1 4
+ X1 3
+Net 42 "/XTALIN" "XTALIN"
+ X1 1
+ C4 1
+ IC1 5
 Net 43 "" ""
- R8 1
- D3 1
-Net 44 "" ""
- D2 1
- R7 1
-Net 46 "/PD0" "PD0"
- R6 2
- IC1 45
-Net 47 "/PD1" "PD1"
- R7 2
- IC1 46
+ U2 4
+ C15 1
+Net 44 "/PB3" "PB3"
+ RP1 13
+ P1 4
+Net 45 "" ""
+ D1 1
+ R4 1
+Net 46 "/PB1" "PB1"
+ RP1 15
+ P1 2
+Net 47 "/PB6" "PB6"
+ RP1 10
+ P1 7
 Net 48 "" ""
  RP1 7
  IC1 24
@@ -522,33 +453,15 @@ Net 49 "" ""
  RP1 5
  IC1 22
 Net 50 "" ""
- RP1 3
  IC1 20
+ RP1 3
 Net 51 "" ""
- RP1 1
  IC1 18
-Net 52 "/PB6" "PB6"
- RP1 10
- P1 7
-Net 53 "" ""
- D1 1
- R6 1
-Net 54 "/PB1" "PB1"
- P1 2
- RP1 15
-Net 55 "/PB3" "PB3"
- P1 4
- RP1 13
-Net 56 "/SHIELD" "SHIELD"
- U1 9
- R3 1
- U1 8
- U1 7
- U1 6
-Net 57 "+5V" "+5V"
- C13 1
- U2 1
- U2 3
+ RP1 1
+Net 52 "+5V" "+5V"
  U1 1
+ U2 3
+ U2 1
+ C14 1
 }
 #End
diff --git a/hardware/fx2grok-cube/0.1/fx2grok-cube.sch b/hardware/fx2grok-cube/0.1/fx2grok-cube.sch
index d513ed1..8dce481 100644
--- a/hardware/fx2grok-cube/0.1/fx2grok-cube.sch
+++ b/hardware/fx2grok-cube/0.1/fx2grok-cube.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Tue 05 Jun 2012 11:49:34 PM CEST
+EESchema Schematic File Version 2  date Wed 06 Jun 2012 11:39:31 PM CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -30,13 +30,14 @@ LIBS:atmel
 LIBS:contrib
 LIBS:valves
 LIBS:fx2grok-cube
+LIBS:fx2grok-cube-cache
 EELAYER 25  0
 EELAYER END
 $Descr A4 11700 8267
 encoding utf-8
 Sheet 1 1
 Title "fx2grok"
-Date "4 jun 2012"
+Date "6 jun 2012"
 Rev "1"
 Comp "http://www.sigrok.org/Fx2grok"
 Comment1 "Open Hardware, CC-BY-SA 3.0"
@@ -44,27 +45,32 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-NoConn ~ 10300 3850
-Text Label 10300 3750 0    60   ~ 0
-PB7
-Text Label 10300 3650 0    60   ~ 0
-PB5
-Text Label 10300 3550 0    60   ~ 0
-PB3
-Text Label 9300 3850 2    60   ~ 0
-GND
-Text Label 9300 3750 2    60   ~ 0
-PB6
-Text Label 9300 3650 2    60   ~ 0
-PB4
-Text Label 10300 3450 0    60   ~ 0
-PB1
-Text Label 9300 3550 2    60   ~ 0
-PB2
-Text Label 9300 3450 2    60   ~ 0
-PB0
+$Comp
+L GND #PWR01
+U 1 1 4FCFCCF8
+P 9300 3950
+F 0 "#PWR01" H 9300 3950 30  0001 C CNN
+F 1 "GND" H 9300 3880 30  0001 C CNN
+	1    9300 3950
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR02
+U 1 1 4FCFCCF5
+P 10300 3950
+F 0 "#PWR02" H 10300 3950 30  0001 C CNN
+F 1 "GND" H 10300 3880 30  0001 C CNN
+	1    10300 3950
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10300 3950 10300 3850
+Wire Wire Line
+	7300 2500 7400 2500
 Wire Wire Line
-	10200 3850 10300 3850
+	2950 4400 3050 4400
+Wire Wire Line
+	10300 3850 10200 3850
 Wire Wire Line
 	10200 3650 10300 3650
 Wire Wire Line
@@ -90,24 +96,6 @@ Wire Wire Line
 	7800 3600 7900 3600
 Wire Wire Line
 	7800 3400 7900 3400
-Wire Wire Line
-	7400 4300 7300 4300
-Wire Wire Line
-	5450 7000 5550 7000
-Wire Wire Line
-	4350 7100 4350 7000
-Wire Wire Line
-	4350 7000 4450 7000
-Wire Wire Line
-	4850 7000 4950 7000
-Wire Wire Line
-	4850 6600 4950 6600
-Wire Wire Line
-	4450 6600 4350 6600
-Wire Wire Line
-	4350 6600 4350 6700
-Wire Wire Line
-	5450 6600 5550 6600
 Wire Wire Line
 	5450 6200 5550 6200
 Wire Wire Line
@@ -146,13 +134,8 @@ Wire Wire Line
 	1300 5650 1300 5550
 Wire Wire Line
 	1550 4000 1450 4000
-Connection ~ 2400 4250
 Wire Wire Line
-	2400 4250 2500 4250
-Wire Wire Line
-	2500 4500 2400 4500
-Wire Wire Line
-	3000 4500 3100 4500
+	3150 4500 3050 4500
 Wire Wire Line
 	4600 3800 4500 3800
 Wire Wire Line
@@ -184,18 +167,14 @@ Wire Wire Line
 Connection ~ 2150 1800
 Wire Wire Line
 	2150 1900 2150 1300
-Wire Wire Line
-	1550 1800 1150 1800
 Wire Wire Line
 	2150 1300 2050 1300
 Wire Wire Line
-	1150 1800 1150 1700
+	1150 1700 1150 1800
 Wire Wire Line
 	9550 5950 9550 6000
 Connection ~ 8800 5400
 Connection ~ 10550 5400
-Wire Wire Line
-	2150 1800 2050 1800
 Wire Wire Line
 	2250 1000 2050 1000
 Wire Wire Line
@@ -239,10 +218,6 @@ Wire Wire Line
 Connection ~ 5600 5400
 Wire Wire Line
 	4600 3700 4500 3700
-Wire Wire Line
-	3000 4250 3100 4250
-Wire Wire Line
-	2400 4500 2400 4150
 Wire Wire Line
 	4600 4800 4500 4800
 Wire Wire Line
@@ -322,10 +297,6 @@ Wire Wire Line
 	10550 5650 10550 5300
 Wire Wire Line
 	4850 6200 4950 6200
-Wire Wire Line
-	5550 7000 5550 6900
-Wire Wire Line
-	7300 4400 7400 4400
 Wire Wire Line
 	7800 3500 7900 3500
 Wire Wire Line
@@ -351,6 +322,41 @@ Wire Wire Line
 	10200 3550 10300 3550
 Wire Wire Line
 	10200 3750 10300 3750
+Wire Wire Line
+	1150 1800 2150 1800
+Wire Wire Line
+	3050 4500 3050 4300
+Wire Wire Line
+	3050 4300 3150 4300
+Connection ~ 3050 4400
+Wire Wire Line
+	2450 4400 2350 4400
+Wire Wire Line
+	2350 4400 2350 4300
+Wire Wire Line
+	9300 3850 9300 3950
+Text Label 5550 6200 0    60   ~ 0
+PA0
+Text Label 7400 2500 0    60   ~ 0
+PA0
+NoConn ~ 7300 4300
+NoConn ~ 7300 4400
+Text Label 10300 3750 0    60   ~ 0
+PB7
+Text Label 10300 3650 0    60   ~ 0
+PB5
+Text Label 10300 3550 0    60   ~ 0
+PB3
+Text Label 9300 3750 2    60   ~ 0
+PB6
+Text Label 9300 3650 2    60   ~ 0
+PB4
+Text Label 10300 3450 0    60   ~ 0
+PB1
+Text Label 9300 3550 2    60   ~ 0
+PB2
+Text Label 9300 3450 2    60   ~ 0
+PB0
 $Comp
 L CONN_5X2 P1
 U 1 1 4FCD30A0
@@ -372,19 +378,19 @@ F 2 "ABM11" H 1750 2600 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR01
+L GND #PWR03
 U 1 1 4FCBEBA5
 P 850 5350
-F 0 "#PWR01" H 850 5350 30  0001 C CNN
+F 0 "#PWR03" H 850 5350 30  0001 C CNN
 F 1 "GND" H 850 5280 30  0001 C CNN
 	1    850  5350
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C16
+L C C1
 U 1 1 4FCBEB98
 P 850 5050
-F 0 "C16" H 900 5150 50  0000 L CNN
+F 0 "C1" H 900 5150 50  0000 L CNN
 F 1 "1uF" H 900 4950 50  0000 L CNN
 F 2 "SM0402" H 850 5050 60  0001 C CNN
 	1    850  5050
@@ -398,19 +404,19 @@ NoConn ~ 4600 4200
 Text Notes 9450 1050 0    60   ~ 0
 Kicad-internal stuff, ignore
 $Comp
-L GND #PWR02
+L GND #PWR04
 U 1 1 4FCB8E25
 P 10100 1400
-F 0 "#PWR02" H 10100 1400 30  0001 C CNN
+F 0 "#PWR04" H 10100 1400 30  0001 C CNN
 F 1 "GND" H 10100 1330 30  0001 C CNN
 	1    10100 1400
 	1    0    0    -1  
 $EndComp
 $Comp
-L PWR_FLAG #FLG03
+L PWR_FLAG #FLG05
 U 1 1 4FCB8E1B
 P 10100 1300
-F 0 "#FLG03" H 10100 1395 30  0001 C CNN
+F 0 "#FLG05" H 10100 1395 30  0001 C CNN
 F 1 "PWR_FLAG" H 10100 1480 30  0000 C CNN
 	1    10100 1300
 	1    0    0    -1  
@@ -425,100 +431,23 @@ F 2 "RPACK-8-SMD-0402" H 7600 3750 60  0001 C CNN
 	1    7600 3750
 	1    0    0    -1  
 $EndComp
-Text Label 7400 4400 0    60   ~ 0
-PD1
-Text Label 7400 4300 0    60   ~ 0
-PD0
-Text Notes 5850 6600 0    60   ~ 0
-LED 2
-$Comp
-L +3.3V #PWR04
-U 1 1 4FCAAF7A
-P 5550 6900
-F 0 "#PWR04" H 5550 6860 30  0001 C CNN
-F 1 "+3.3V" H 5550 7010 30  0000 C CNN
-	1    5550 6900
-	1    0    0    -1  
-$EndComp
-$Comp
-L R R8
-U 1 1 4FCAAF6B
-P 5200 7000
-F 0 "R8" V 5280 7000 50  0000 C CNN
-F 1 "2K2" V 5200 7000 50  0000 C CNN
-F 2 "SM0402" H 5200 7000 60  0001 C CNN
-	1    5200 7000
-	0    -1   -1   0   
-$EndComp
-$Comp
-L GND #PWR05
-U 1 1 4FCAAF6A
-P 4350 7100
-F 0 "#PWR05" H 4350 7100 30  0001 C CNN
-F 1 "GND" H 4350 7030 30  0001 C CNN
-	1    4350 7100
-	1    0    0    -1  
-$EndComp
-$Comp
-L LED D3
-U 1 1 4FCAAF69
-P 4650 7000
-F 0 "D3" H 4650 7100 50  0000 C CNN
-F 1 "PWRLED" H 4650 6900 50  0000 C CNN
-F 2 "SM0402" H 4650 7000 60  0001 C CNN
-	1    4650 7000
-	-1   0    0    1   
-$EndComp
-$Comp
-L LED D2
-U 1 1 4FCAAF48
-P 4650 6600
-F 0 "D2" H 4650 6700 50  0000 C CNN
-F 1 "LED2" H 4650 6500 50  0000 C CNN
-F 2 "SM0402" H 4650 6600 60  0001 C CNN
-	1    4650 6600
-	-1   0    0    1   
-$EndComp
-$Comp
-L GND #PWR06
-U 1 1 4FCAAF47
-P 4350 6700
-F 0 "#PWR06" H 4350 6700 30  0001 C CNN
-F 1 "GND" H 4350 6630 30  0001 C CNN
-	1    4350 6700
-	1    0    0    -1  
-$EndComp
-$Comp
-L R R7
-U 1 1 4FCAAF46
-P 5200 6600
-F 0 "R7" V 5280 6600 50  0000 C CNN
-F 1 "2K2" V 5200 6600 50  0000 C CNN
-F 2 "SM0402" H 5200 6600 60  0001 C CNN
-	1    5200 6600
-	0    -1   -1   0   
-$EndComp
-Text Label 5550 6600 0    60   ~ 0
-PD1
-Text Label 5550 6200 0    60   ~ 0
-PD0
 Text Notes 5850 6200 0    60   ~ 0
-LED 1
+LED\n
 $Comp
-L R R6
+L R R4
 U 1 1 4FCAAEBE
 P 5200 6200
-F 0 "R6" V 5280 6200 50  0000 C CNN
-F 1 "2K2" V 5200 6200 50  0000 C CNN
+F 0 "R4" V 5280 6200 50  0000 C CNN
+F 1 "2K7" V 5200 6200 50  0000 C CNN
 F 2 "SM0402" H 5200 6200 60  0001 C CNN
 	1    5200 6200
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR07
+L GND #PWR06
 U 1 1 4FCAAEBD
 P 4350 6300
-F 0 "#PWR07" H 4350 6300 30  0001 C CNN
+F 0 "#PWR06" H 4350 6300 30  0001 C CNN
 F 1 "GND" H 4350 6230 30  0001 C CNN
 	1    4350 6300
 	1    0    0    -1  
@@ -533,42 +462,40 @@ F 2 "SM0402" H 4650 6200 60  0001 C CNN
 	1    4650 6200
 	-1   0    0    1   
 $EndComp
-Text Notes 5850 7000 0    60   ~ 0
-Power LED
 $Comp
-L GND #PWR08
+L GND #PWR07
 U 1 1 4FCAA874
 P 10250 6150
-F 0 "#PWR08" H 10250 6150 30  0001 C CNN
+F 0 "#PWR07" H 10250 6150 30  0001 C CNN
 F 1 "GND" H 10250 6080 30  0001 C CNN
 	1    10250 6150
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C14
+L C C15
 U 1 1 4FCAA86B
 P 10250 5850
-F 0 "C14" H 10300 5950 50  0000 L CNN
+F 0 "C15" H 10300 5950 50  0000 L CNN
 F 1 "100nF" H 10000 5750 50  0000 L CNN
 F 2 "SM0402" H 10250 5850 60  0001 C CNN
 	1    10250 5850
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C15
+L C C16
 U 1 1 4FCAA863
 P 10550 5850
-F 0 "C15" H 10600 5950 50  0000 L CNN
+F 0 "C16" H 10600 5950 50  0000 L CNN
 F 1 "2.2uF" H 10600 5750 50  0000 L CNN
 F 2 "SM0402" H 10550 5850 60  0001 C CNN
 	1    10550 5850
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C13
+L C C14
 U 1 1 4FCAA85F
 P 8800 5850
-F 0 "C13" H 8850 5950 50  0000 L CNN
+F 0 "C14" H 8850 5950 50  0000 L CNN
 F 1 "1uF" H 8850 5750 50  0000 L CNN
 F 2 "SM0402" H 8800 5850 60  0001 C CNN
 	1    8800 5850
@@ -609,10 +536,10 @@ F 2 "SM0402" H 1200 4750 60  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3.3V #PWR09
+L +3.3V #PWR08
 U 1 1 4FCAA3E5
 P 850 4650
-F 0 "#PWR09" H 850 4610 30  0001 C CNN
+F 0 "#PWR08" H 850 4610 30  0001 C CNN
 F 1 "+3.3V" H 850 4760 30  0000 C CNN
 	1    850  4650
 	1    0    0    -1  
@@ -662,112 +589,112 @@ NoConn ~ 4600 2500
 Text Notes 950  7550 0    60   ~ 0
 2.2uF/100nF bypass capacitors for all AVCC pins\n
 $Comp
-L C C10
+L C C11
 U 1 1 4FCA9C86
 P 2200 7050
-F 0 "C10" H 2250 7150 50  0000 L CNN
+F 0 "C11" H 2250 7150 50  0000 L CNN
 F 1 "100nF" V 2300 6750 50  0000 L CNN
 F 2 "SM0402" H 2200 7050 60  0001 C CNN
 	1    2200 7050
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR010
+L GND #PWR09
 U 1 1 4FCA9C85
 P 2200 7350
-F 0 "#PWR010" H 2200 7350 30  0001 C CNN
+F 0 "#PWR09" H 2200 7350 30  0001 C CNN
 F 1 "GND" H 2200 7280 30  0001 C CNN
 	1    2200 7350
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR011
+L +3.3V #PWR010
 U 1 1 4FCA9C84
 P 2200 6750
-F 0 "#PWR011" H 2200 6710 30  0001 C CNN
+F 0 "#PWR010" H 2200 6710 30  0001 C CNN
 F 1 "+3.3V" H 2200 6860 30  0000 C CNN
 	1    2200 6750
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR012
+L +3.3V #PWR011
 U 1 1 4FCA9C80
 P 1900 6750
-F 0 "#PWR012" H 1900 6710 30  0001 C CNN
+F 0 "#PWR011" H 1900 6710 30  0001 C CNN
 F 1 "+3.3V" H 1900 6860 30  0000 C CNN
 	1    1900 6750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR013
+L GND #PWR012
 U 1 1 4FCA9C7F
 P 1900 7350
-F 0 "#PWR013" H 1900 7350 30  0001 C CNN
+F 0 "#PWR012" H 1900 7350 30  0001 C CNN
 F 1 "GND" H 1900 7280 30  0001 C CNN
 	1    1900 7350
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C7
+L C C8
 U 1 1 4FCA9C7E
 P 1900 7050
-F 0 "C7" H 1950 7150 50  0000 L CNN
+F 0 "C8" H 1950 7150 50  0000 L CNN
 F 1 "100nF" V 2000 6750 50  0000 L CNN
 F 2 "SM0402" H 1900 7050 60  0001 C CNN
 	1    1900 7050
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C5
+L C C6
 U 1 1 4FCA9C79
 P 1600 7050
-F 0 "C5" H 1650 7150 50  0000 L CNN
+F 0 "C6" H 1650 7150 50  0000 L CNN
 F 1 "2.2uF" V 1700 6750 50  0000 L CNN
 F 2 "SM0402" H 1600 7050 60  0001 C CNN
 	1    1600 7050
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR014
+L GND #PWR013
 U 1 1 4FCA9C78
 P 1600 7350
-F 0 "#PWR014" H 1600 7350 30  0001 C CNN
+F 0 "#PWR013" H 1600 7350 30  0001 C CNN
 F 1 "GND" H 1600 7280 30  0001 C CNN
 	1    1600 7350
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR015
+L +3.3V #PWR014
 U 1 1 4FCA9C77
 P 1600 6750
-F 0 "#PWR015" H 1600 6710 30  0001 C CNN
+F 0 "#PWR014" H 1600 6710 30  0001 C CNN
 F 1 "+3.3V" H 1600 6860 30  0000 C CNN
 	1    1600 6750
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR016
+L +3.3V #PWR015
 U 1 1 4FCA9C5F
 P 1300 6750
-F 0 "#PWR016" H 1300 6710 30  0001 C CNN
+F 0 "#PWR015" H 1300 6710 30  0001 C CNN
 F 1 "+3.3V" H 1300 6860 30  0000 C CNN
 	1    1300 6750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR017
+L GND #PWR016
 U 1 1 4FCA9C5E
 P 1300 7350
-F 0 "#PWR017" H 1300 7350 30  0001 C CNN
+F 0 "#PWR016" H 1300 7350 30  0001 C CNN
 F 1 "GND" H 1300 7280 30  0001 C CNN
 	1    1300 7350
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C2
+L C C3
 U 1 1 4FCA9C5D
 P 1300 7050
-F 0 "C2" H 1350 7150 50  0000 L CNN
+F 0 "C3" H 1350 7150 50  0000 L CNN
 F 1 "2.2uF" V 1400 6750 50  0000 L CNN
 F 2 "SM0402" H 1300 7050 60  0001 C CNN
 	1    1300 7050
@@ -776,178 +703,178 @@ $EndComp
 Text Notes 1150 6350 0    60   ~ 0
 100nF bypass capacitors for all VCC pins\n
 $Comp
-L C C12
+L C C13
 U 1 1 4FCA97A0
 P 2800 5850
-F 0 "C12" H 2850 5950 50  0000 L CNN
+F 0 "C13" H 2850 5950 50  0000 L CNN
 F 1 "100nF" V 2900 5550 50  0000 L CNN
 F 2 "SM0402" H 2800 5850 60  0001 C CNN
 	1    2800 5850
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR018
+L GND #PWR017
 U 1 1 4FCA979F
 P 2800 6150
-F 0 "#PWR018" H 2800 6150 30  0001 C CNN
+F 0 "#PWR017" H 2800 6150 30  0001 C CNN
 F 1 "GND" H 2800 6080 30  0001 C CNN
 	1    2800 6150
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR019
+L +3.3V #PWR018
 U 1 1 4FCA979E
 P 2800 5550
-F 0 "#PWR019" H 2800 5510 30  0001 C CNN
+F 0 "#PWR018" H 2800 5510 30  0001 C CNN
 F 1 "+3.3V" H 2800 5660 30  0000 C CNN
 	1    2800 5550
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR020
+L +3.3V #PWR019
 U 1 1 4FCA979B
 P 2500 5550
-F 0 "#PWR020" H 2500 5510 30  0001 C CNN
+F 0 "#PWR019" H 2500 5510 30  0001 C CNN
 F 1 "+3.3V" H 2500 5660 30  0000 C CNN
 	1    2500 5550
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR021
+L GND #PWR020
 U 1 1 4FCA979A
 P 2500 6150
-F 0 "#PWR021" H 2500 6150 30  0001 C CNN
+F 0 "#PWR020" H 2500 6150 30  0001 C CNN
 F 1 "GND" H 2500 6080 30  0001 C CNN
 	1    2500 6150
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C11
+L C C12
 U 1 1 4FCA9799
 P 2500 5850
-F 0 "C11" H 2550 5950 50  0000 L CNN
+F 0 "C12" H 2550 5950 50  0000 L CNN
 F 1 "100nF" V 2600 5550 50  0000 L CNN
 F 2 "SM0402" H 2500 5850 60  0001 C CNN
 	1    2500 5850
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C6
+L C C7
 U 1 1 4FCA9793
 P 1900 5850
-F 0 "C6" H 1950 5950 50  0000 L CNN
+F 0 "C7" H 1950 5950 50  0000 L CNN
 F 1 "100nF" V 2000 5550 50  0000 L CNN
 F 2 "SM0402" H 1900 5850 60  0001 C CNN
 	1    1900 5850
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR022
+L GND #PWR021
 U 1 1 4FCA9792
 P 1900 6150
-F 0 "#PWR022" H 1900 6150 30  0001 C CNN
+F 0 "#PWR021" H 1900 6150 30  0001 C CNN
 F 1 "GND" H 1900 6080 30  0001 C CNN
 	1    1900 6150
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR023
+L +3.3V #PWR022
 U 1 1 4FCA9791
 P 1900 5550
-F 0 "#PWR023" H 1900 5510 30  0001 C CNN
+F 0 "#PWR022" H 1900 5510 30  0001 C CNN
 F 1 "+3.3V" H 1900 5660 30  0000 C CNN
 	1    1900 5550
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR024
+L +3.3V #PWR023
 U 1 1 4FCA9779
 P 1600 5550
-F 0 "#PWR024" H 1600 5510 30  0001 C CNN
+F 0 "#PWR023" H 1600 5510 30  0001 C CNN
 F 1 "+3.3V" H 1600 5660 30  0000 C CNN
 	1    1600 5550
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR025
+L GND #PWR024
 U 1 1 4FCA9778
 P 1600 6150
-F 0 "#PWR025" H 1600 6150 30  0001 C CNN
+F 0 "#PWR024" H 1600 6150 30  0001 C CNN
 F 1 "GND" H 1600 6080 30  0001 C CNN
 	1    1600 6150
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C4
+L C C5
 U 1 1 4FCA9777
 P 1600 5850
-F 0 "C4" H 1650 5950 50  0000 L CNN
+F 0 "C5" H 1650 5950 50  0000 L CNN
 F 1 "100nF" V 1700 5550 50  0000 L CNN
 F 2 "SM0402" H 1600 5850 60  0001 C CNN
 	1    1600 5850
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C9
+L C C10
 U 1 1 4FCA9724
 P 2200 5850
-F 0 "C9" H 2250 5950 50  0000 L CNN
+F 0 "C10" H 2250 5950 50  0000 L CNN
 F 1 "100nF" V 2300 5550 50  0000 L CNN
 F 2 "SM0402" H 2200 5850 60  0001 C CNN
 	1    2200 5850
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR026
+L GND #PWR025
 U 1 1 4FCA9723
 P 2200 6150
-F 0 "#PWR026" H 2200 6150 30  0001 C CNN
+F 0 "#PWR025" H 2200 6150 30  0001 C CNN
 F 1 "GND" H 2200 6080 30  0001 C CNN
 	1    2200 6150
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR027
+L +3.3V #PWR026
 U 1 1 4FCA9722
 P 2200 5550
-F 0 "#PWR027" H 2200 5510 30  0001 C CNN
+F 0 "#PWR026" H 2200 5510 30  0001 C CNN
 F 1 "+3.3V" H 2200 5660 30  0000 C CNN
 	1    2200 5550
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR028
+L +3.3V #PWR027
 U 1 1 4FCA9708
 P 1300 5550
-F 0 "#PWR028" H 1300 5510 30  0001 C CNN
+F 0 "#PWR027" H 1300 5510 30  0001 C CNN
 F 1 "+3.3V" H 1300 5660 30  0000 C CNN
 	1    1300 5550
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR029
+L GND #PWR028
 U 1 1 4FCA9706
 P 1300 6150
-F 0 "#PWR029" H 1300 6150 30  0001 C CNN
+F 0 "#PWR028" H 1300 6150 30  0001 C CNN
 F 1 "GND" H 1300 6080 30  0001 C CNN
 	1    1300 6150
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C1
+L C C2
 U 1 1 4FCA96AB
 P 1300 5850
-F 0 "C1" H 1350 5950 50  0000 L CNN
+F 0 "C2" H 1350 5950 50  0000 L CNN
 F 1 "100nF" V 1400 5550 50  0000 L CNN
 F 2 "SM0402" H 1300 5850 60  0001 C CNN
 	1    1300 5850
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR030
+L +3.3V #PWR029
 U 1 1 4FCA95BE
 P 850 3900
-F 0 "#PWR030" H 850 3860 30  0001 C CNN
+F 0 "#PWR029" H 850 3860 30  0001 C CNN
 F 1 "+3.3V" H 850 4010 30  0000 C CNN
 	1    850  3900
 	1    0    0    -1  
@@ -963,52 +890,42 @@ F 2 "SM0402" H 1200 4000 60  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR031
+L GND #PWR030
 U 1 1 4FCA94C1
 P 4500 4900
-F 0 "#PWR031" H 4500 4900 30  0001 C CNN
+F 0 "#PWR030" H 4500 4900 30  0001 C CNN
 F 1 "GND" H 4500 4830 30  0001 C CNN
 	1    4500 4900
 	1    0    0    -1  
 $EndComp
 Text Notes 2500 4700 0    60   ~ 0
 I2C pullups
-Text Label 3100 4500 0    60   ~ 0
+Text Label 3150 4500 0    60   ~ 0
 SDA
-Text Label 3100 4250 0    60   ~ 0
+Text Label 3150 4300 0    60   ~ 0
 SCL
 Text Label 4500 3800 2    60   ~ 0
 SDA
 Text Label 4500 3700 2    60   ~ 0
 SCL
 $Comp
-L +3.3V #PWR032
+L +3.3V #PWR031
 U 1 1 4FCA93DC
-P 2400 4150
-F 0 "#PWR032" H 2400 4110 30  0001 C CNN
-F 1 "+3.3V" H 2400 4260 30  0000 C CNN
-	1    2400 4150
+P 2350 4300
+F 0 "#PWR031" H 2350 4260 30  0001 C CNN
+F 1 "+3.3V" H 2350 4410 30  0000 C CNN
+	1    2350 4300
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R5
-U 1 1 4FCA93C6
-P 2750 4500
-F 0 "R5" V 2830 4500 50  0000 C CNN
-F 1 "2K2" V 2750 4500 50  0000 C CNN
-F 2 "SM0402" H 2750 4500 60  0001 C CNN
-	1    2750 4500
-	0    -1   -1   0   
-$EndComp
-$Comp
-L R R4
+L R R3
 U 1 1 4FCA93BD
-P 2750 4250
-F 0 "R4" V 2830 4250 50  0000 C CNN
-F 1 "2K2" V 2750 4250 50  0000 C CNN
-F 2 "SM0402" H 2750 4250 60  0001 C CNN
-	1    2750 4250
-	0    -1   -1   0   
+P 2700 4400
+F 0 "R3" V 2780 4400 50  0000 C CNN
+F 1 "2K7" V 2700 4400 50  0000 C CNN
+F 2 "SM0402" H 2700 4400 60  0001 C CNN
+	1    2700 4400
+	0    1    1    0   
 $EndComp
 Text Label 4500 3200 2    60   ~ 0
 DM
@@ -1021,7 +938,6 @@ NoConn ~ 7300 2900
 NoConn ~ 7300 2800
 NoConn ~ 7300 2700
 NoConn ~ 7300 2600
-NoConn ~ 7300 2500
 NoConn ~ 7300 4500
 NoConn ~ 7300 4600
 NoConn ~ 7300 4700
@@ -1029,75 +945,75 @@ NoConn ~ 7300 4800
 NoConn ~ 7300 4900
 NoConn ~ 7300 5000
 $Comp
-L GND #PWR033
+L GND #PWR032
 U 1 1 4FC8F816
 P 5900 5500
-F 0 "#PWR033" H 5900 5500 30  0001 C CNN
+F 0 "#PWR032" H 5900 5500 30  0001 C CNN
 F 1 "GND" H 5900 5430 30  0001 C CNN
 	1    5900 5500
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR034
+L +3.3V #PWR033
 U 1 1 4FC8F7FE
 P 5900 1900
-F 0 "#PWR034" H 5900 1860 30  0001 C CNN
+F 0 "#PWR033" H 5900 1860 30  0001 C CNN
 F 1 "+3.3V" H 5900 2010 30  0000 C CNN
 	1    5900 1900
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR035
+L GND #PWR034
 U 1 1 4FC8F70E
 P 1350 3200
-F 0 "#PWR035" H 1350 3200 30  0001 C CNN
+F 0 "#PWR034" H 1350 3200 30  0001 C CNN
 F 1 "GND" H 1350 3130 30  0001 C CNN
 	1    1350 3200
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR036
+L GND #PWR035
 U 1 1 4FC8F706
 P 2150 3200
-F 0 "#PWR036" H 2150 3200 30  0001 C CNN
+F 0 "#PWR035" H 2150 3200 30  0001 C CNN
 F 1 "GND" H 2150 3130 30  0001 C CNN
 	1    2150 3200
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C3
+L C C4
 U 1 1 4FC8F6F8
 P 1350 2900
-F 0 "C3" H 1400 3000 50  0000 L CNN
+F 0 "C4" H 1400 3000 50  0000 L CNN
 F 1 "12pF" H 1400 2800 50  0000 L CNN
 F 2 "SM0402" H 1350 2900 60  0001 C CNN
 	1    1350 2900
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C8
+L C C9
 U 1 1 4FC8F6F5
 P 2150 2900
-F 0 "C8" H 2200 3000 50  0000 L CNN
+F 0 "C9" H 2200 3000 50  0000 L CNN
 F 1 "12pF" H 2200 2800 50  0000 L CNN
 F 2 "SM0402" H 2150 2900 60  0001 C CNN
 	1    2150 2900
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR037
+L GND #PWR036
 U 1 1 4FC8F61F
 P 2150 1900
-F 0 "#PWR037" H 2150 1900 30  0001 C CNN
+F 0 "#PWR036" H 2150 1900 30  0001 C CNN
 F 1 "GND" H 2150 1830 30  0001 C CNN
 	1    2150 1900
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR038
+L +5V #PWR037
 U 1 1 4FC8F618
 P 2150 800
-F 0 "#PWR038" H 2150 890 20  0001 C CNN
+F 0 "#PWR037" H 2150 890 20  0001 C CNN
 F 1 "+5V" H 2150 890 30  0000 C CNN
 	1    2150 800 
 	1    0    0    -1  
@@ -1112,47 +1028,37 @@ NoConn ~ 2050 1200
 Text Label 1150 1800 2    60   ~ 0
 SHIELD
 $Comp
-L R R3
-U 1 1 4FC8F58A
-P 1800 1800
-F 0 "R3" V 1880 1800 50  0000 C CNN
-F 1 "0R" V 1800 1800 50  0000 C CNN
-F 2 "SM0402" H 1800 1800 60  0001 C CNN
-	1    1800 1800
-	0    -1   -1   0   
-$EndComp
-$Comp
-L GND #PWR039
+L GND #PWR038
 U 1 1 4FC8F4A1
 P 8800 6150
-F 0 "#PWR039" H 8800 6150 30  0001 C CNN
+F 0 "#PWR038" H 8800 6150 30  0001 C CNN
 F 1 "GND" H 8800 6080 30  0001 C CNN
 	1    8800 6150
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR040
+L GND #PWR039
 U 1 1 4FC8F49F
 P 10550 6150
-F 0 "#PWR040" H 10550 6150 30  0001 C CNN
+F 0 "#PWR039" H 10550 6150 30  0001 C CNN
 F 1 "GND" H 10550 6080 30  0001 C CNN
 	1    10550 6150
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR041
+L GND #PWR040
 U 1 1 4FC8F496
 P 9550 6000
-F 0 "#PWR041" H 9550 6000 30  0001 C CNN
+F 0 "#PWR040" H 9550 6000 30  0001 C CNN
 F 1 "GND" H 9550 5930 30  0001 C CNN
 	1    9550 6000
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3,3V #PWR042
+L +3,3V #PWR041
 U 1 1 4FC8F454
 P 10550 5300
-F 0 "#PWR042" H 10550 5260 30  0001 C CNN
+F 0 "#PWR041" H 10550 5260 30  0001 C CNN
 F 1 "+3,3V" H 10550 5410 30  0000 C CNN
 	1    10550 5300
 	1    0    0    -1