updated netlist and some cleanups

git-svn-id: https://svn.spreadspace.org/mur.sat@356 7de4ea59-55d0-425e-a1af-a3118ea81d4c

3 files changed, 215 insertions, 220 deletions

diff --git a/hardware/hhd70dongle/hhd70dongle.brd b/hardware/hhd70dongle/hhd70dongle.brd
index c4a1e46..d0d7538 100644
--- a/hardware/hhd70dongle/hhd70dongle.brd
+++ b/hardware/hhd70dongle/hhd70dongle.brd
@@ -1,14 +1,15 @@
-PCBNEW-BOARD Version 1 date Fre 30 Mär 2012 02:39:50 CEST
+PCBNEW-BOARD Version 1 date Mon 02 Apr 2012 02:03:22 CEST
 
-# Created by Pcbnew(2010-00-09 BZR 23xx)-stable
+# Created by Pcbnew(2011-05-25)-stable
 
 $GENERAL
+encoding utf-8
 LayerCount 2
 Ly 1FFF8001
 EnabledLayers 1FFF8001
 Links 148
 NoConn 148
-Di 26876 40015 69214 55662
+Di 26750 40015 69290 55723
 Ndraw 0
 Ntrack 0
 Nzone 0
@@ -20,7 +21,7 @@ $EndGENERAL
 $SHEETDESCR
 Sheet A4 11700 8267
 Title ""
-Date "30 mar 2012"
+Date "2 apr 2012"
 Rev ""
 Comp ""
 Comment1 ""
@@ -31,7 +32,6 @@ $EndSHEETDESCR
 
 $SETUP
 InternalUnit 0.000100 INCH
-ZoneGridSize 250
 Layers 2
 Layer[0] Rückseite signal
 Layer[15] Vorderseite signal
@@ -59,6 +59,7 @@ PadSize 787 669
 PadDrill 0
 Pad2MaskClearance 100
 AuxiliaryAxisOrg 0 0
+PcbPlotParams (pcbplotparams (layerselection 3178497) (usegerberextensions true) (excludeedgelayer true) (linewidth 60) (plotframeref false) (viasonmask false) (mode 1) (useauxorigin false) (hpglpennumber 1) (hpglpenspeed 20) (hpglpendiameter 15) (hpglpenoverlay 2) (pscolor true) (psnegative false) (psa4output false) (plotreference true) (plotvalue true) (plotothertext true) (plotinvisibletext false) (padsonsilk false) (subtractmaskfromsilk false) (outputformat 1) (mirror false) (drillshape 1) (scaleselection 1) (outputdirectory ""))
 $EndSETUP
 
 $EQUIPOT
@@ -360,8 +361,8 @@ Sc 4F72798E
 AR /4F7225D2
 Op 0 0 0
 At SMD 
-T0 0 -500 300 300 0 50 N V 21 N"D2"
-T1 0 500 300 300 0 50 N V 21 N"Pwr"
+T0 0 -500 300 300 0 50 N V 21 N "D2"
+T1 0 500 300 300 0 50 N V 21 N "Pwr"
 DS 196 118 196 246 26 21
 DS 196 246 393 246 26 21
 DS 393 118 393 246 26 21
@@ -439,8 +440,8 @@ Sc 4F727990
 AR /4F722601
 Op 0 0 0
 At SMD 
-T0 0 -500 300 300 1800 50 N V 21 N"D1"
-T1 0 500 300 300 1800 50 N V 21 N"LED"
+T0 0 -500 300 300 1800 50 N V 21 N "D1"
+T1 0 500 300 300 1800 50 N V 21 N "LED"
 DS 196 118 196 246 26 21
 DS 196 246 393 246 26 21
 DS 393 118 393 246 26 21
@@ -515,8 +516,8 @@ Li PVZ2A
 Sc 4F727991
 AR /4F5A8BD5
 Op 0 0 0
-T0 0 118 150 150 0 38 N V 21 N"RV1"
-T1 59 -98 150 150 0 38 N V 21 N"1M0"
+T0 0 118 150 150 0 38 N V 21 N "RV1"
+T1 59 -98 150 150 0 38 N V 21 N "1M0"
 DS 217 0 -197 0 50 21
 DS 0 -217 0 0 50 21
 DS 0 0 0 217 50 21
@@ -548,15 +549,15 @@ Po 0 -472
 $EndPAD
 $EndMODULE  PVZ2A
 $MODULE SIL-2
-Po 35600 42950 1800 15 00200000 4F727994 ~~
+Po 35500 42950 1800 15 00200000 4F727994 ~~
 Li SIL-2
 Cd Connecteurs 2 pins
 Kw CONN DEV
 Sc 4F727994
 AR /4F5A6642
 Op 0 0 0
-T0 0 -1000 681 428 1800 107 N V 21 N"F1"
-T1 0 -1000 600 400 1800 100 N I 21 N"FUSE"
+T0 0 -1000 681 428 1800 107 N V 21 N "F1"
+T1 0 -1000 600 400 1800 100 N I 21 N "FUSE"
 DS -1000 500 -1000 -500 120 21
 DS -1000 -500 1000 -500 120 21
 DS 1000 -500 1000 500 120 21
@@ -583,8 +584,8 @@ Sc 4F727999
 AR /4F7225D8
 Op 0 0 0
 At SMD 
-T0 0 0 250 250 1800 50 N V 21 N"R8"
-T1 0 0 250 250 1800 50 N I 21 N"1K0"
+T0 0 0 250 250 1800 50 N V 21 N "R8"
+T1 0 0 250 250 1800 50 N I 21 N "1K0"
 DC -650 300 -650 250 50 21
 DS -200 300 -600 300 50 21
 DS -600 300 -600 -300 50 21
@@ -620,8 +621,8 @@ Sc 4F72799B
 AR /4F723FDB
 Op 0 0 0
 At SMD 
-T0 0 0 250 250 1800 50 N V 21 N"R7"
-T1 0 0 250 250 1800 50 N I 21 N"20k"
+T0 0 0 250 250 1800 50 N V 21 N "R7"
+T1 0 0 250 250 1800 50 N I 21 N "20k"
 DC -650 300 -650 250 50 21
 DS -200 300 -600 300 50 21
 DS -600 300 -600 -300 50 21
@@ -657,8 +658,8 @@ Sc 4F72799D
 AR /4F724098
 Op 0 0 0
 At SMD 
-T0 0 0 250 250 1800 50 N V 21 N"R6"
-T1 0 0 250 250 1800 50 N I 21 N"20k"
+T0 0 0 250 250 1800 50 N V 21 N "R6"
+T1 0 0 250 250 1800 50 N I 21 N "20k"
 DC -650 300 -650 250 50 21
 DS -200 300 -600 300 50 21
 DS -600 300 -600 -300 50 21
@@ -694,8 +695,8 @@ Sc 4F72799F
 AR /4F723F18
 Op 0 0 0
 At SMD 
-T0 0 0 250 250 900 50 N V 21 N"R5"
-T1 0 0 250 250 900 50 N I 21 N"20k"
+T0 0 0 250 250 900 50 N V 21 N "R5"
+T1 0 0 250 250 900 50 N I 21 N "20k"
 DC -650 300 -650 250 50 21
 DS -200 300 -600 300 50 21
 DS -600 300 -600 -300 50 21
@@ -731,8 +732,8 @@ Sc 4F7279A1
 AR /4F722600
 Op 0 0 0
 At SMD 
-T0 0 0 250 250 1800 50 N V 21 N"R4"
-T1 0 0 250 250 1800 50 N I 21 N"1K0"
+T0 0 0 250 250 1800 50 N V 21 N "R4"
+T1 0 0 250 250 1800 50 N I 21 N "1K0"
 DC -650 300 -650 250 50 21
 DS -200 300 -600 300 50 21
 DS -600 300 -600 -300 50 21
@@ -768,8 +769,8 @@ Sc 4F7279A3
 AR /4F7224B3
 Op 0 0 0
 At SMD 
-T0 0 0 250 250 900 50 N V 21 N"R3"
-T1 0 0 250 250 900 50 N I 21 N"1K0"
+T0 0 0 250 250 900 50 N V 21 N "R3"
+T1 0 0 250 250 900 50 N I 21 N "1K0"
 DC -650 300 -650 250 50 21
 DS -200 300 -600 300 50 21
 DS -600 300 -600 -300 50 21
@@ -805,8 +806,8 @@ Sc 4F7279A5
 AR /4F722502
 Op 0 0 0
 At SMD 
-T0 0 0 250 250 1800 50 N V 21 N"R2"
-T1 0 0 250 250 1800 50 N I 21 N"22R"
+T0 0 0 250 250 1800 50 N V 21 N "R2"
+T1 0 0 250 250 1800 50 N I 21 N "22R"
 DC -650 300 -650 250 50 21
 DS -200 300 -600 300 50 21
 DS -600 300 -600 -300 50 21
@@ -842,8 +843,8 @@ Sc 4F7279A7
 AR /4F722636
 Op 0 0 0
 At SMD 
-T0 0 0 250 250 1800 50 N V 21 N"R1"
-T1 0 0 250 250 1800 50 N I 21 N"22R"
+T0 0 0 250 250 1800 50 N V 21 N "R1"
+T1 0 0 250 250 1800 50 N I 21 N "22R"
 DC -650 300 -650 250 50 21
 DS -200 300 -600 300 50 21
 DS -600 300 -600 -300 50 21
@@ -879,8 +880,8 @@ Sc 4F7279A9
 AR /4F5A8BD6
 Op 0 0 0
 At SMD 
-T0 0 0 250 250 900 50 N V 21 N"C14"
-T1 0 0 250 250 900 50 N I 21 N"10pF"
+T0 0 0 250 250 900 50 N V 21 N "C14"
+T1 0 0 250 250 900 50 N I 21 N "10pF"
 DC -650 300 -650 250 50 21
 DS -200 300 -600 300 50 21
 DS -600 300 -600 -300 50 21
@@ -916,8 +917,8 @@ Sc 4F7279AB
 AR /4F5A8BDA
 Op 0 0 0
 At SMD 
-T0 0 0 250 250 0 50 N V 21 N"C13"
-T1 0 0 250 250 0 50 N I 21 N"33pF"
+T0 0 0 250 250 0 50 N V 21 N "C13"
+T1 0 0 250 250 0 50 N I 21 N "33pF"
 DC -650 300 -650 250 50 21
 DS -200 300 -600 300 50 21
 DS -600 300 -600 -300 50 21
@@ -953,8 +954,8 @@ Sc 4F7279AD
 AR /4F72253B
 Op 0 0 0
 At SMD 
-T0 0 0 250 250 0 50 N V 21 N"C12"
-T1 0 0 250 250 0 50 N I 21 N"10pF"
+T0 0 0 250 250 0 50 N V 21 N "C12"
+T1 0 0 250 250 0 50 N I 21 N "10pF"
 DC -650 300 -650 250 50 21
 DS -200 300 -600 300 50 21
 DS -600 300 -600 -300 50 21
@@ -990,8 +991,8 @@ Sc 4F7279AF
 AR /4F722526
 Op 0 0 0
 At SMD 
-T0 0 0 250 250 900 50 N V 21 N"C8"
-T1 0 0 250 250 900 50 N I 21 N"10pF"
+T0 0 0 250 250 900 50 N V 21 N "C8"
+T1 0 0 250 250 900 50 N I 21 N "10pF"
 DC -650 300 -650 250 50 21
 DS -200 300 -600 300 50 21
 DS -600 300 -600 -300 50 21
@@ -1027,8 +1028,8 @@ Sc 4F7279B0
 AR /4F5A8BC0
 Op 0 0 0
 At SMD 
-T0 0 0 300 300 0 50 N V 21 N"C18"
-T1 0 0 300 300 0 50 N I 21 N"100nF"
+T0 0 0 300 300 0 50 N V 21 N "C18"
+T1 0 0 300 300 0 50 N I 21 N "100nF"
 DS -1000 -450 -1000 450 50 21
 DS -1000 450 -350 450 50 21
 DS 350 -450 1000 -450 50 21
@@ -1063,8 +1064,8 @@ Sc 4F7279B2
 AR /4F5A8BC1
 Op 0 0 0
 At SMD 
-T0 0 0 300 300 1800 50 N V 21 N"C17"
-T1 0 0 300 300 1800 50 N I 21 N"100nF"
+T0 0 0 300 300 1800 50 N V 21 N "C17"
+T1 0 0 300 300 1800 50 N I 21 N "100nF"
 DS -1000 -450 -1000 450 50 21
 DS -1000 450 -350 450 50 21
 DS 350 -450 1000 -450 50 21
@@ -1099,8 +1100,8 @@ Sc 4F7279B4
 AR /4F72364C
 Op 0 0 0
 At SMD 
-T0 0 0 300 300 0 50 N V 21 N"C16"
-T1 0 0 300 300 0 50 N I 21 N"100nF"
+T0 0 0 300 300 0 50 N V 21 N "C16"
+T1 0 0 300 300 0 50 N I 21 N "100nF"
 DS -1000 -450 -1000 450 50 21
 DS -1000 450 -350 450 50 21
 DS 350 -450 1000 -450 50 21
@@ -1135,8 +1136,8 @@ Sc 4F7279B6
 AR /4F7224FE
 Op 0 0 0
 At SMD 
-T0 0 0 300 300 0 50 M V 20 N"C9"
-T1 0 0 300 300 0 50 M I 20 N"100nF"
+T0 0 0 300 300 0 50 M V 20 N "C9"
+T1 0 0 300 300 0 50 M I 20 N "100nF"
 DS -1000 450 -1000 -450 50 20
 DS -1000 -450 -350 -450 50 20
 DS 350 450 1000 450 50 20
@@ -1165,14 +1166,14 @@ Ro 0.000000 0.000000 0.000000
 $EndSHAPE3D
 $EndMODULE  SM1206
 $MODULE SM1206
-Po 42000 43600 2700 15 42806E24 4F7279B8 ~~
+Po 41300 45200 0 15 42806E24 4F7279B8 ~~
 Li SM1206
 Sc 4F7279B8
 AR /4F5A8BBE
 Op 0 0 0
 At SMD 
-T0 0 0 300 300 2700 50 N V 21 N"C7"
-T1 0 0 300 300 2700 50 N I 21 N"100nF"
+T0 0 0 300 300 0 50 N V 21 N "C7"
+T1 0 0 300 300 0 50 N I 21 N "100nF"
 DS -1000 -450 -1000 450 50 21
 DS -1000 450 -350 450 50 21
 DS 350 -450 1000 -450 50 21
@@ -1180,14 +1181,14 @@ DS 1000 -450 1000 450 50 21
 DS 1000 450 350 450 50 21
 DS -350 -450 -1000 -450 50 21
 $PAD
-Sh "1" R 600 800 0 0 2700
+Sh "1" R 600 800 0 0 0
 Dr 0 0 0
 At SMD N 00888000
 Ne 36 "N-000018"
 Po -650 0
 $EndPAD
 $PAD
-Sh "2" R 600 800 0 0 2700
+Sh "2" R 600 800 0 0 0
 Dr 0 0 0
 At SMD N 00888000
 Ne 25 "/USB_GND"
@@ -1207,8 +1208,8 @@ Sc 4F7279BA
 AR /4F7224FF
 Op 0 0 0
 At SMD 
-T0 0 0 300 300 1800 50 M V 20 N"C6"
-T1 0 0 300 300 1800 50 M I 20 N"100nF"
+T0 0 0 300 300 1800 50 M V 20 N "C6"
+T1 0 0 300 300 1800 50 M I 20 N "100nF"
 DS -1000 450 -1000 -450 50 20
 DS -1000 -450 -350 -450 50 20
 DS 350 450 1000 450 50 20
@@ -1243,8 +1244,8 @@ Sc 4F7279BC
 AR /4F7224F8
 Op 0 0 0
 At SMD 
-T0 0 0 300 300 1800 50 M V 20 N"C5"
-T1 0 0 300 300 1800 50 M I 20 N"100nF"
+T0 0 0 300 300 1800 50 M V 20 N "C5"
+T1 0 0 300 300 1800 50 M I 20 N "100nF"
 DS -1000 450 -1000 -450 50 20
 DS -1000 -450 -350 -450 50 20
 DS 350 450 1000 450 50 20
@@ -1279,8 +1280,8 @@ Sc 4F7279BE
 AR /4F722923
 Op 0 0 0
 At SMD 
-T0 0 0 300 300 1800 50 M V 20 N"C4"
-T1 0 0 300 300 1800 50 M I 20 N"100nF"
+T0 0 0 300 300 1800 50 M V 20 N "C4"
+T1 0 0 300 300 1800 50 M I 20 N "100nF"
 DS -1000 450 -1000 -450 50 20
 DS -1000 -450 -350 -450 50 20
 DS 350 450 1000 450 50 20
@@ -1309,14 +1310,14 @@ Ro 0.000000 0.000000 0.000000
 $EndSHAPE3D
 $EndMODULE  SM1206
 $MODULE SM1206
-Po 38100 45200 1800 15 42806E24 4F7279C0 ~~
+Po 38150 45150 1800 15 42806E24 4F7279C0 ~~
 Li SM1206
 Sc 4F7279C0
 AR /4F5C1443
 Op 0 0 0
 At SMD 
-T0 0 0 300 300 1800 50 N V 21 N"C3"
-T1 0 0 300 300 1800 50 N I 21 N"100nF"
+T0 0 0 300 300 1800 50 N V 21 N "C3"
+T1 0 0 300 300 1800 50 N I 21 N "100nF"
 DS -1000 -450 -1000 450 50 21
 DS -1000 450 -350 450 50 21
 DS 350 -450 1000 -450 50 21
@@ -1345,14 +1346,14 @@ Ro 0.000000 0.000000 0.000000
 $EndSHAPE3D
 $EndMODULE  SM1206
 $MODULE SM1206
-Po 43850 43750 2700 15 42806E24 4F7279C2 ~~
+Po 43900 43750 900 15 42806E24 4F7279C2 ~~
 Li SM1206
 Sc 4F7279C2
 AR /4F7224B7
 Op 0 0 0
 At SMD 
-T0 0 0 300 300 2700 50 N V 21 N"C2"
-T1 0 0 300 300 2700 50 N I 21 N"100nF"
+T0 0 0 300 300 900 50 N V 21 N "C2"
+T1 0 0 300 300 900 50 N I 21 N "100nF"
 DS -1000 -450 -1000 450 50 21
 DS -1000 450 -350 450 50 21
 DS 350 -450 1000 -450 50 21
@@ -1360,14 +1361,14 @@ DS 1000 -450 1000 450 50 21
 DS 1000 450 350 450 50 21
 DS -350 -450 -1000 -450 50 21
 $PAD
-Sh "1" R 600 800 0 0 2700
+Sh "1" R 600 800 0 0 900
 Dr 0 0 0
 At SMD N 00888000
 Ne 43 "N-000028"
 Po -650 0
 $EndPAD
 $PAD
-Sh "2" R 600 800 0 0 2700
+Sh "2" R 600 800 0 0 900
 Dr 0 0 0
 At SMD N 00888000
 Ne 27 "GND"
@@ -1387,8 +1388,8 @@ Sc 4F7279C3
 AR /4F5A8BD3
 Op 0 0 0
 At SMD 
-T0 0 0 300 300 2700 50 N V 21 N"C19"
-T1 0 0 300 300 2700 50 N I 21 N"22µF"
+T0 0 0 300 300 2700 50 N V 21 N "C19"
+T1 0 0 300 300 2700 50 N I 21 N "22µF"
 DS -1000 -450 -1100 -450 50 21
 DS -1100 -450 -1100 450 50 21
 DS -1100 450 -1000 450 50 21
@@ -1426,8 +1427,8 @@ Sc 4F7279C5
 AR /4F5A8BD4
 Op 0 0 0
 At SMD 
-T0 0 0 300 300 2700 50 N V 21 N"C15"
-T1 0 0 300 300 2700 50 N I 21 N"22µF"
+T0 0 0 300 300 2700 50 N V 21 N "C15"
+T1 0 0 300 300 2700 50 N I 21 N "22µF"
 DS -1000 -450 -1100 -450 50 21
 DS -1100 -450 -1100 450 50 21
 DS -1100 450 -1000 450 50 21
@@ -1465,8 +1466,8 @@ Sc 4F7279C7
 AR /4F722A25
 Op 0 0 0
 At SMD 
-T0 0 0 300 300 900 50 N V 21 N"C11"
-T1 0 0 300 300 900 50 N I 21 N"1µF"
+T0 0 0 300 300 900 50 N V 21 N "C11"
+T1 0 0 300 300 900 50 N I 21 N "1µF"
 DS -1000 -450 -1100 -450 50 21
 DS -1100 -450 -1100 450 50 21
 DS -1100 450 -1000 450 50 21
@@ -1498,14 +1499,14 @@ Ro 0.000000 0.000000 0.000000
 $EndSHAPE3D
 $EndMODULE  SM1206POL
 $MODULE SM1206POL
-Po 41350 45200 0 15 42806E4C 4F7279C9 ~~
+Po 41950 43600 2700 15 42806E4C 4F7279C9 ~~
 Li SM1206POL
 Sc 4F7279C9
 AR /4F5A8BD9
 Op 0 0 0
 At SMD 
-T0 0 0 300 300 0 50 N V 21 N"C10"
-T1 0 0 300 300 0 50 N I 21 N"22µF"
+T0 0 0 300 300 2700 50 N V 21 N "C10"
+T1 0 0 300 300 2700 50 N I 21 N "22µF"
 DS -1000 -450 -1100 -450 50 21
 DS -1100 -450 -1100 450 50 21
 DS -1100 450 -1000 450 50 21
@@ -1516,14 +1517,14 @@ DS 1000 -450 1000 450 50 21
 DS 1000 450 350 450 50 21
 DS -350 -450 -1000 -450 50 21
 $PAD
-Sh "1" R 600 800 0 0 0
+Sh "1" R 600 800 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
 Ne 36 "N-000018"
 Po -650 0
 $EndPAD
 $PAD
-Sh "2" R 600 800 0 0 0
+Sh "2" R 600 800 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
 Ne 25 "/USB_GND"
@@ -1537,14 +1538,14 @@ Ro 0.000000 0.000000 0.000000
 $EndSHAPE3D
 $EndMODULE  SM1206POL
 $MODULE SM1206POL
-Po 37450 43600 2700 15 42806E4C 4F7279CB ~~
+Po 37500 43600 2700 15 42806E4C 4F7279CB ~~
 Li SM1206POL
 Sc 4F7279CB
 AR /4F5C1442
 Op 0 0 0
 At SMD 
-T0 0 0 300 300 2700 50 N V 21 N"C1"
-T1 0 0 300 300 2700 50 N I 21 N"22µF"
+T0 0 0 300 300 2700 50 N V 21 N "C1"
+T1 0 0 300 300 2700 50 N I 21 N "22µF"
 DS -1000 -450 -1100 -450 50 21
 DS -1100 -450 -1100 450 50 21
 DS -1100 450 -1000 450 50 21
@@ -1581,8 +1582,8 @@ Li SW_PUSH_SMALL
 Sc 4F7279D2
 AR /4F72270C
 Op 0 0 0
-T0 0 -300 400 400 2700 80 N V 21 N"SW1"
-T1 0 400 400 400 2700 80 N V 21 N"SW_PUSH"
+T0 0 -300 400 400 2700 80 N V 21 N "SW1"
+T1 0 400 400 400 2700 80 N V 21 N "SW_PUSH"
 DC 0 0 0 -1000 50 21
 DS -1500 -1500 1500 -1500 50 21
 DS 1500 -1500 1500 1500 50 21
@@ -1624,8 +1625,8 @@ Sc 4F7500AC
 AR /4F72240E
 Op 0 0 0
 At SMD 
-T0 0 -750 600 400 0 80 N V 21 N"U2"
-T1 0 750 600 400 0 80 N V 21 N"ATMEGA32U4"
+T0 0 -750 600 400 0 80 N V 21 N "U2"
+T1 0 750 600 400 0 80 N V 21 N "ATMEGA32U4"
 DS 1970 -1970 1970 1970 120 21
 DS 1970 1970 -1970 1970 120 21
 DS -1970 -1780 -1970 1970 120 21
@@ -1947,8 +1948,8 @@ Li QFN16
 Sc 4F739F62
 AR /4F5A8BDB
 Op 0 0 0
-T0 0 -1500 394 394 1800 99 N V 21 N"U1"
-T1 0 1500 394 394 1800 99 N V 21 N"TPS62110"
+T0 0 -1500 394 394 1800 99 N V 21 N "U1"
+T1 0 1500 394 394 1800 99 N V 21 N "TPS62110"
 DS -784 -980 980 -980 59 21
 DS -980 -784 -980 980 59 21
 DS -980 -784 -784 -980 59 21
@@ -2183,8 +2184,8 @@ Li hhd70
 Sc 4F73A082
 AR /4F72363B
 Op 0 0 0
-T0 0 -400 600 600 0 120 N V 21 N"U3"
-T1 0 500 600 600 0 120 N V 21 N"HHD70"
+T0 0 -400 600 600 0 120 N V 21 N "U3"
+T1 0 500 600 600 0 120 N V 21 N "HHD70"
 DS -4527 -2952 4527 -2952 150 21
 DS 4527 -2952 4527 2953 150 21
 DS 4527 2953 -4528 2953 150 21
@@ -2287,8 +2288,8 @@ Li TEST
 Sc 4F73A083
 AR /4F723129
 Op 0 0 0
-T0 0 -850 600 600 0 120 N V 21 N"P4"
-T1 0 900 600 600 0 120 N V 21 N"3,3V"
+T0 0 -850 600 600 0 120 N V 21 N "P4"
+T1 0 900 600 600 0 120 N V 21 N "3,3V"
 $PAD
 Sh "1" R 591 591 0 0 2700
 Dr 0 0 0
@@ -2303,8 +2304,8 @@ Li TEST
 Sc 4F73A085
 AR /4F5A8BD1
 Op 0 0 0
-T0 0 -850 600 600 0 120 N V 21 N"P1"
-T1 0 900 600 600 0 120 N V 21 N"PG"
+T0 0 -850 600 600 0 120 N V 21 N "P1"
+T1 0 900 600 600 0 120 N V 21 N "PG"
 $PAD
 Sh "1" R 591 591 0 0 2700
 Dr 0 0 0
@@ -2319,8 +2320,8 @@ Li quartz5x3
 Sc 4F73A775
 AR /4F73A73B
 Op 0 0 0
-T0 0 -1250 600 600 1800 120 N V 21 N"X1"
-T1 0 1300 600 600 1800 120 N V 21 N"16MHz"
+T0 0 -1250 600 600 1800 120 N V 21 N "X1"
+T1 0 1300 600 600 1800 120 N V 21 N "16MHz"
 DS -990 -630 990 -630 150 21
 DS 990 -630 990 630 150 21
 DS 990 630 -990 630 150 21
@@ -2360,8 +2361,8 @@ Li TE_SMA_RE
 Sc 4F7500AF
 AR /4F7236B2
 Op 0 0 0
-T0 0 -2050 600 600 0 120 N V 21 N"RF1"
-T1 50 2300 600 600 0 120 N V 21 N"RF_CON"
+T0 0 -2050 600 600 0 120 N V 21 N "RF1"
+T1 50 2300 600 600 0 120 N V 21 N "RF_CON"
 DS 1260 -1080 4350 -1080 150 21
 DS 4350 -1080 4350 1070 150 21
 DS 4350 1070 1250 1070 150 21
@@ -2406,13 +2407,13 @@ Po 0 0
 $EndPAD
 $EndMODULE  TE_SMA_RE
 $MODULE USB_A_SMD
-Po 32900 47100 2700 15 4F73B0C8 4F7279D4 ~~
+Po 32850 47100 2700 15 4F73B0C8 4F7279D4 ~~
 Li USB_A_SMD
 Sc 4F7279D4
 AR /4F722418
 Op 0 0 0
-T0 10 880 600 600 2700 120 N V 21 N"J1"
-T1 30 1870 600 600 2700 120 N V 21 N"USB"
+T0 10 880 600 600 2700 120 N V 21 N "J1"
+T1 30 1870 600 600 2700 120 N V 21 N "USB"
 DS -3550 0 3550 0 150 21
 DS -2250 -1460 2250 -1460 150 21
 DS 2250 -1460 2250 5910 150 21
@@ -2482,8 +2483,8 @@ Li we_coil_m
 Sc 4F7279D0
 AR /4F5C144B
 Op 0 0 0
-T0 20 410 600 600 0 120 N V 21 N"L1"
-T1 20 -650 600 600 0 120 N V 21 N"6,8µH"
+T0 20 410 600 600 0 120 N V 21 N "L1"
+T1 20 -650 600 600 0 120 N V 21 N "6,8µH"
 DC 0 0 700 960 150 21
 DS -1440 -1440 1440 -1440 150 21
 DS 1440 -1440 1440 1440 150 21
@@ -2510,8 +2511,8 @@ Li we_coil_m
 Sc 4F7279CE
 AR /4F5A8BD7
 Op 0 0 0
-T0 20 410 600 600 2700 120 N V 21 N"L2"
-T1 20 -650 600 600 2700 120 N V 21 N"6,8µH"
+T0 20 410 600 600 2700 120 N V 21 N "L2"
+T1 20 -650 600 600 2700 120 N V 21 N "6,8µH"
 DC 0 0 700 960 150 21
 DS -1440 -1440 1440 -1440 150 21
 DS 1440 -1440 1440 1440 150 21
@@ -2538,8 +2539,8 @@ Li we_coil_m
 Sc 4F7279CC
 AR /4F5A8BBF
 Op 0 0 0
-T0 20 410 600 600 0 120 N V 21 N"L3"
-T1 20 -650 600 600 0 120 N V 21 N"6,8µH"
+T0 20 410 600 600 0 120 N V 21 N "L3"
+T1 20 -650 600 600 0 120 N V 21 N "6,8µH"
 DC 0 0 700 960 150 21
 DS -1440 -1440 1440 -1440 150 21
 DS 1440 -1440 1440 1440 150 21
@@ -2568,8 +2569,8 @@ Kw CONN DEV
 Sc 4F74FC61
 AR /4F74F727
 Op 0 0 0
-T0 0 -1000 681 428 0 107 N V 21 N"P5"
-T1 0 -1000 600 400 0 100 N I 21 N"EXT_PWR"
+T0 0 -1000 681 428 0 107 N V 21 N "P5"
+T1 0 -1000 600 400 0 100 N I 21 N "EXT_PWR"
 DS -1000 500 -1000 -500 120 21
 DS -1000 -500 1000 -500 120 21
 DS 1000 -500 1000 500 120 21
@@ -2596,8 +2597,8 @@ Sc 4F74FC62
 AR /4F74BA76
 Op 0 0 0
 At SMD 
-T0 0 0 250 250 0 50 N V 21 N"FB1"
-T1 0 0 250 250 0 50 N I 21 N"Ferrite_Bead"
+T0 0 0 250 250 0 50 N V 21 N "FB1"
+T1 0 0 250 250 0 50 N I 21 N "Ferrite_Bead"
 DC -650 300 -650 250 50 21
 DS -200 300 -600 300 50 21
 DS -600 300 -600 -300 50 21
@@ -2633,8 +2634,8 @@ Sc 4F74FC63
 AR /4F74B8DC
 Op 0 0 0
 At SMD 
-T0 0 0 300 300 2700 50 N V 21 N"C20"
-T1 0 0 300 300 2700 50 N I 21 N"22nF/100V"
+T0 0 0 300 300 2700 50 N V 21 N "C20"
+T1 0 0 300 300 2700 50 N I 21 N "22nF/100V"
 DS -1000 -450 -1000 450 50 21
 DS -1000 450 -350 450 50 21
 DS 350 -450 1000 -450 50 21
@@ -2662,43 +2663,6 @@ Of 0.000000 0.000000 0.000000
 Ro 0.000000 0.000000 0.000000
 $EndSHAPE3D
 $EndMODULE  SM1206
-$MODULE SIL-3
-Po 36097 51208 900 15 00200000 4F727995 ~~
-Li SIL-3
-Cd Connecteur 3 pins
-Kw CONN DEV
-Sc 4F727995
-AR /4F5A8BD8
-Op 0 0 0
-T0 0 -1000 705 424 900 106 N V 21 N"K1"
-T1 0 -1000 600 400 900 100 N I 21 N"SYNC"
-DS -1500 500 -1500 -500 120 21
-DS -1500 -500 1500 -500 120 21
-DS 1500 -500 1500 500 120 21
-DS 1500 500 -1500 500 120 21
-DS -500 -500 -500 500 120 21
-$PAD
-Sh "1" R 550 550 0 0 900
-Dr 320 0 0
-At STD N 00E0FFFF
-Ne 51 "VCC"
-Po -1000 0
-$EndPAD
-$PAD
-Sh "2" C 550 550 0 0 900
-Dr 320 0 0
-At STD N 00E0FFFF
-Ne 35 "N-000010"
-Po 0 0
-$EndPAD
-$PAD
-Sh "3" C 550 550 0 0 900
-Dr 320 0 0
-At STD N 00E0FFFF
-Ne 25 "/USB_GND"
-Po 1000 0
-$EndPAD
-$EndMODULE  SIL-3
 $MODULE SIL-10
 Po 50877 41448 0 15 00200000 4F7500A6 ~~
 Li SIL-10
@@ -2707,8 +2671,8 @@ Kw CONN DEV
 Sc 4F7500A6
 AR /4F74FDFB
 Op 0 0 0
-T0 -2500 -1000 681 428 0 107 N V 21 N"P7"
-T1 2500 -1000 600 400 0 100 N V 21 N"PC/PF"
+T0 -2500 -1000 681 428 0 107 N V 21 N "P7"
+T1 2500 -1000 600 400 0 100 N V 21 N "PC/PF"
 DS -5000 500 -5000 -500 120 21
 DS -5000 -500 5000 -500 120 21
 DS 5000 -500 5000 500 120 21
@@ -2793,8 +2757,8 @@ Kw CONN DEV
 Sc 4F7500A9
 AR /4F74FDE2
 Op 0 0 0
-T0 -2500 -1000 681 428 0 107 N V 21 N"P6"
-T1 2500 -1000 600 400 0 100 N V 21 N"PD"
+T0 -2500 -1000 681 428 0 107 N V 21 N "P6"
+T1 2500 -1000 600 400 0 100 N V 21 N "PD"
 DS -5000 500 -5000 -500 120 21
 DS -5000 -500 5000 -500 120 21
 DS 5000 -500 5000 500 120 21
@@ -2871,6 +2835,36 @@ Ne 27 "GND"
 Po 4500 0
 $EndPAD
 $EndMODULE  SIL-10
+$MODULE TEST3
+Po 36097 51208 900 15 4F73CAA4 4F727995 ~~
+Li TEST3
+Sc 4F727995
+AR /4F5A8BD8
+Op 0 0 0
+T0 0 -850 600 600 900 120 N V 21 N "K1"
+T1 0 900 600 600 900 120 N V 21 N "SYNC"
+$PAD
+Sh "1" R 591 591 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 51 "VCC"
+Po -866 0
+$EndPAD
+$PAD
+Sh "2" R 591 591 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 35 "N-000010"
+Po 0 0
+$EndPAD
+$PAD
+Sh "3" R 591 591 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 25 "/USB_GND"
+Po 866 0
+$EndPAD
+$EndMODULE  TEST3
 $TRACK
 $EndTRACK
 $ZONE
diff --git a/hardware/hhd70dongle/hhd70dongle.net b/hardware/hhd70dongle/hhd70dongle.net
index bbdebe9..8ea1661 100644
--- a/hardware/hhd70dongle/hhd70dongle.net
+++ b/hardware/hhd70dongle/hhd70dongle.net
@@ -1,4 +1,4 @@
-# EESchema Netlist Version 1.1 created  Fre 30 Mär 2012 02:34:34 CEST
+# EESchema Netlist Version 1.1 created  Mon 02 Apr 2012 02:00:26 CEST
 (
  ( /4F5C1442 SM1206POL C1 22µF
   ( 1 N-000051 )
@@ -104,7 +104,7 @@
   ( 5 N-000045 )
   ( 6 N-000045 )
  )
- ( /4F5A8BD8 SIL-3 K1 SYNC
+ ( /4F5A8BD8 TEST3 K1 SYNC
   ( 1 VCC )
   ( 2 N-000010 )
   ( 3 /USB_GND )
diff --git a/hardware/hhd70dongle/hhd70dongle.sch b/hardware/hhd70dongle/hhd70dongle.sch
index a617585..4f188e5 100644
--- a/hardware/hhd70dongle/hhd70dongle.sch
+++ b/hardware/hhd70dongle/hhd70dongle.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Fre 30 Mär 2012 02:34:02 CEST
+EESchema Schematic File Version 2  date Mon 02 Apr 2012 01:55:12 CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -31,12 +31,13 @@ LIBS:contrib
 LIBS:valves
 LIBS:mur-sat
 LIBS:hhd70dongle-cache
-EELAYER 24  0
+EELAYER 25  0
 EELAYER END
 $Descr A4 11700 8267
+encoding utf-8
 Sheet 1 1
 Title "HHD70 Dongle"
-Date "30 mar 2012"
+Date "1 apr 2012"
 Rev "1"
 Comp "mur.sat - A Space Art Project"
 Comment1 ""
@@ -431,37 +432,37 @@ Wire Wire Line
 Wire Wire Line
 	6400 5950 7800 5950
 $Comp
-L GND #PWR01
+L GND #PWR20
 U 1 1 4F74FE36
 P 7750 6250
-F 0 "#PWR01" H 7750 6250 30  0001 C CNN
+F 0 "#PWR20" H 7750 6250 30  0001 C CNN
 F 1 "GND" H 7750 6180 30  0001 C CNN
 	1    7750 6250
 	0    1    1    0   
 $EndComp
 $Comp
-L VCC #PWR02
+L VCC #PWR19
 U 1 1 4F74FE2F
 P 7750 5350
-F 0 "#PWR02" H 7750 5450 30  0001 C CNN
+F 0 "#PWR19" H 7750 5450 30  0001 C CNN
 F 1 "VCC" H 7750 5450 30  0000 C CNN
 	1    7750 5350
 	0    -1   -1   0   
 $EndComp
 $Comp
-L VCC #PWR03
+L VCC #PWR17
 U 1 1 4F74FE25
 P 7100 4400
-F 0 "#PWR03" H 7100 4500 30  0001 C CNN
+F 0 "#PWR17" H 7100 4500 30  0001 C CNN
 F 1 "VCC" H 7100 4500 30  0000 C CNN
 	1    7100 4400
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR04
+L GND #PWR18
 U 1 1 4F74FE1A
 P 7100 5300
-F 0 "#PWR04" H 7100 5300 30  0001 C CNN
+F 0 "#PWR18" H 7100 5300 30  0001 C CNN
 F 1 "GND" H 7100 5230 30  0001 C CNN
 	1    7100 5300
 	0    1    1    0   
@@ -542,10 +543,10 @@ SCLK
 Text Label 6700 3600 0    60   ~ 0
 CS
 $Comp
-L GND #PWR05
+L GND #PWR28
 U 1 1 4F74BACF
 P 9400 2050
-F 0 "#PWR05" H 9400 2050 30  0001 C CNN
+F 0 "#PWR28" H 9400 2050 30  0001 C CNN
 F 1 "GND" H 9400 1980 30  0001 C CNN
 	1    9400 2050
 	1    0    0    -1  
@@ -615,10 +616,10 @@ F 1 "20k" V 7300 2250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR06
+L VCC #PWR16
 U 1 1 4F723F1D
 P 6500 3000
-F 0 "#PWR06" H 6500 3100 30  0001 C CNN
+F 0 "#PWR16" H 6500 3100 30  0001 C CNN
 F 1 "VCC" H 6500 3100 30  0000 C CNN
 	1    6500 3000
 	1    0    0    -1  
@@ -633,37 +634,37 @@ F 1 "20k" V 6500 3300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR07
+L GND #PWR29
 U 1 1 4F7236CF
 P 9900 3850
-F 0 "#PWR07" H 9900 3850 30  0001 C CNN
+F 0 "#PWR29" H 9900 3850 30  0001 C CNN
 F 1 "GND" H 9900 3780 30  0001 C CNN
 	1    9900 3850
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR08
+L GND #PWR30
 U 1 1 4F7236CC
 P 9900 4150
-F 0 "#PWR08" H 9900 4150 30  0001 C CNN
+F 0 "#PWR30" H 9900 4150 30  0001 C CNN
 F 1 "GND" H 9900 4080 30  0001 C CNN
 	1    9900 4150
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR09
+L GND #PWR27
 U 1 1 4F7236CB
 P 9200 4150
-F 0 "#PWR09" H 9200 4150 30  0001 C CNN
+F 0 "#PWR27" H 9200 4150 30  0001 C CNN
 F 1 "GND" H 9200 4080 30  0001 C CNN
 	1    9200 4150
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR010
+L GND #PWR26
 U 1 1 4F7236C6
 P 9200 3850
-F 0 "#PWR010" H 9200 3850 30  0001 C CNN
+F 0 "#PWR26" H 9200 3850 30  0001 C CNN
 F 1 "GND" H 9200 3780 30  0001 C CNN
 	1    9200 3850
 	1    0    0    -1  
@@ -678,46 +679,46 @@ F 1 "RF_CON" H 9550 3850 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR011
+L GND #PWR24
 U 1 1 4F723689
 P 8950 3850
-F 0 "#PWR011" H 8950 3850 30  0001 C CNN
+F 0 "#PWR24" H 8950 3850 30  0001 C CNN
 F 1 "GND" H 8950 3780 30  0001 C CNN
 	1    8950 3850
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR012
+L GND #PWR25
 U 1 1 4F723684
 P 8950 4050
-F 0 "#PWR012" H 8950 4050 30  0001 C CNN
+F 0 "#PWR25" H 8950 4050 30  0001 C CNN
 F 1 "GND" H 8950 3980 30  0001 C CNN
 	1    8950 4050
 	0    -1   -1   0   
 $EndComp
 $Comp
-L VCC #PWR013
+L VCC #PWR21
 U 1 1 4F723677
 P 8150 3150
-F 0 "#PWR013" H 8150 3250 30  0001 C CNN
+F 0 "#PWR21" H 8150 3250 30  0001 C CNN
 F 1 "VCC" H 8150 3250 30  0000 C CNN
 	1    8150 3150
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR014
+L GND #PWR22
 U 1 1 4F72366E
 P 8150 4700
-F 0 "#PWR014" H 8150 4700 30  0001 C CNN
+F 0 "#PWR22" H 8150 4700 30  0001 C CNN
 F 1 "GND" H 8150 4630 30  0001 C CNN
 	1    8150 4700
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR015
+L GND #PWR23
 U 1 1 4F723669
 P 8700 3200
-F 0 "#PWR015" H 8700 3200 30  0001 C CNN
+F 0 "#PWR23" H 8700 3200 30  0001 C CNN
 F 1 "GND" H 8700 3130 30  0001 C CNN
 	1    8700 3200
 	0    -1   -1   0   
@@ -750,10 +751,10 @@ F 1 "3,3V" H 9400 1550 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR016
+L GND #PWR13
 U 1 1 4F722A5B
 P 4150 4450
-F 0 "#PWR016" H 4150 4450 30  0001 C CNN
+F 0 "#PWR13" H 4150 4450 30  0001 C CNN
 F 1 "GND" H 4150 4380 30  0001 C CNN
 	1    4150 4450
 	1    0    0    -1  
@@ -768,10 +769,10 @@ F 1 "1µF" V 4200 4050 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR017
+L GND #PWR1
 U 1 1 4F722983
 P 1350 5500
-F 0 "#PWR017" H 1350 5500 30  0001 C CNN
+F 0 "#PWR1" H 1350 5500 30  0001 C CNN
 F 1 "GND" H 1350 5430 30  0001 C CNN
 	1    1350 5500
 	1    0    0    -1  
@@ -786,10 +787,10 @@ F 1 "100nF" V 3050 3900 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR018
+L GND #PWR5
 U 1 1 4F722922
 P 2950 4350
-F 0 "#PWR018" H 2950 4350 30  0001 C CNN
+F 0 "#PWR5" H 2950 4350 30  0001 C CNN
 F 1 "GND" H 2950 4280 30  0001 C CNN
 	1    2950 4350
 	1    0    0    -1  
@@ -797,10 +798,10 @@ $EndComp
 Text Label 1350 3100 3    60   ~ 0
 USB_PWR
 $Comp
-L GND #PWR019
+L GND #PWR2
 U 1 1 4F722730
 P 2400 6350
-F 0 "#PWR019" H 2400 6350 30  0001 C CNN
+F 0 "#PWR2" H 2400 6350 30  0001 C CNN
 F 1 "GND" H 2400 6280 30  0001 C CNN
 	1    2400 6350
 	1    0    0    -1  
@@ -815,64 +816,64 @@ F 1 "SW_PUSH" H 2400 5470 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR020
+L GND #PWR9
 U 1 1 4F7226EB
 P 3450 4350
-F 0 "#PWR020" H 3450 4350 30  0001 C CNN
+F 0 "#PWR9" H 3450 4350 30  0001 C CNN
 F 1 "GND" H 3450 4280 30  0001 C CNN
 	1    3450 4350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR021
+L GND #PWR11
 U 1 1 4F7226EA
 P 3700 4350
-F 0 "#PWR021" H 3700 4350 30  0001 C CNN
+F 0 "#PWR11" H 3700 4350 30  0001 C CNN
 F 1 "GND" H 3700 4280 30  0001 C CNN
 	1    3700 4350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR022
+L GND #PWR7
 U 1 1 4F7226E4
 P 3200 4350
-F 0 "#PWR022" H 3200 4350 30  0001 C CNN
+F 0 "#PWR7" H 3200 4350 30  0001 C CNN
 F 1 "GND" H 3200 4280 30  0001 C CNN
 	1    3200 4350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR023
+L GND #PWR3
 U 1 1 4F7226E0
 P 2700 6350
-F 0 "#PWR023" H 2700 6350 30  0001 C CNN
+F 0 "#PWR3" H 2700 6350 30  0001 C CNN
 F 1 "GND" H 2700 6280 30  0001 C CNN
 	1    2700 6350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR024
+L GND #PWR6
 U 1 1 4F7226AA
 P 3050 6350
-F 0 "#PWR024" H 3050 6350 30  0001 C CNN
+F 0 "#PWR6" H 3050 6350 30  0001 C CNN
 F 1 "GND" H 3050 6280 30  0001 C CNN
 	1    3050 6350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR025
+L GND #PWR10
 U 1 1 4F72269C
 P 3600 6350
-F 0 "#PWR025" H 3600 6350 30  0001 C CNN
+F 0 "#PWR10" H 3600 6350 30  0001 C CNN
 F 1 "GND" H 3600 6280 30  0001 C CNN
 	1    3600 6350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR026
+L GND #PWR14
 U 1 1 4F722696
 P 4300 6350
-F 0 "#PWR026" H 4300 6350 30  0001 C CNN
+F 0 "#PWR14" H 4300 6350 30  0001 C CNN
 F 1 "GND" H 4300 6280 30  0001 C CNN
 	1    4300 6350
 	1    0    0    -1  
@@ -905,19 +906,19 @@ F 1 "1K0" V 3250 5600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR027
+L GND #PWR8
 U 1 1 4F7225FF
 P 3250 6350
-F 0 "#PWR027" H 3250 6350 30  0001 C CNN
+F 0 "#PWR8" H 3250 6350 30  0001 C CNN
 F 1 "GND" H 3250 6280 30  0001 C CNN
 	1    3250 6350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR028
+L GND #PWR32
 U 1 1 4F7225E5
 P 10150 2550
-F 0 "#PWR028" H 10150 2550 30  0001 C CNN
+F 0 "#PWR32" H 10150 2550 30  0001 C CNN
 F 1 "GND" H 10150 2480 30  0001 C CNN
 	1    10150 2550
 	1    0    0    -1  
@@ -941,19 +942,19 @@ F 1 "Pwr" H 10150 2150 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR029
+L GND #PWR15
 U 1 1 4F72258F
 P 4500 6350
-F 0 "#PWR029" H 4500 6350 30  0001 C CNN
+F 0 "#PWR15" H 4500 6350 30  0001 C CNN
 F 1 "GND" H 4500 6280 30  0001 C CNN
 	1    4500 6350
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR030
+L VCC #PWR4
 U 1 1 4F72258B
 P 2950 3800
-F 0 "#PWR030" H 2950 3900 30  0001 C CNN
+F 0 "#PWR4" H 2950 3900 30  0001 C CNN
 F 1 "VCC" H 2950 3900 30  0000 C CNN
 	1    2950 3800
 	1    0    0    -1  
@@ -1050,10 +1051,10 @@ F 1 "ATMEGA32U4" H 5450 4900 60  0000 C CNN
 $EndComp
 NoConn ~ 6200 2200
 $Comp
-L VCC #PWR031
+L VCC #PWR31
 U 1 1 4F721C59
 P 10150 1300
-F 0 "#PWR031" H 10150 1400 30  0001 C CNN
+F 0 "#PWR31" H 10150 1400 30  0001 C CNN
 F 1 "VCC" H 10150 1400 30  0000 C CNN
 	1    10150 1300
 	1    0    0    -1  
@@ -1167,10 +1168,10 @@ F 1 "PG" H 6400 2500 30  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L VCC #PWR032
+L VCC #PWR12
 U 1 1 4F5A8BC9
 P 4150 2400
-F 0 "#PWR032" H 4150 2500 30  0001 C CNN
+F 0 "#PWR12" H 4150 2500 30  0001 C CNN
 F 1 "VCC" H 4150 2500 30  0000 C CNN
 	1    4150 2400
 	0    1    1    0