fixed spacing for NPTH drills for USB Micro AB footprint

2 files changed, 617 insertions, 617 deletions

diff --git a/uart-1wire.brd b/uart-1wire.brd
index b7c07a5..963c001 100644
--- a/uart-1wire.brd
+++ b/uart-1wire.brd
@@ -1,4 +1,4 @@
-PCBNEW-BOARD Version 1 date Do 15 Aug 2013 19:39:03 CEST
+PCBNEW-BOARD Version 1 date Do 15 Aug 2013 20:00:40 CEST
 
 # Created by Pcbnew(2012-apr-16-27)-stable
 
@@ -9,7 +9,7 @@ Ly 1FFF8001
 EnabledLayers 1FFF8001
 Links 67
 NoConn 0
-Di 59597 42951 80409 56340
+Di 59597 42951 80409 57512
 Ndraw 12
 Ntrack 441
 Nzone 0
@@ -53,7 +53,7 @@ ViaMinDrill 119
 ViaSizeList 256 119
 ViaSizeList 295 157
 ViaSizeList 374 157
-ViaSizeList 472 197
+ViaSizeList 472 177
 ViaSizeList 787 197
 MicroViaSize 200
 MicroViaDrill 50
@@ -65,8 +65,8 @@ TextPcbSize 600 800
 EdgeModWidth 150
 TextModSize 600 600
 TextModWidth 120
-PadSize 1181 1181
-PadDrill 787
+PadSize 315 315
+PadDrill 315
 Pad2MaskClearance 100
 GridOrigin 75610 45830
 AuxiliaryAxisOrg 0 0
@@ -1377,14 +1377,78 @@ Of 0.000000 0.000000 0.000000
 Ro 0.000000 0.000000 0.000000
 $EndSHAPE3D
 $EndMODULE  SM1206POL
+$MODULE HOLE
+Po 74610 46830 0 15 520C0912 520C0851 ~~
+Li HOLE
+Sc 520C0851
+AR /520C06C4
+Op 0 0 0
+T0 0 760 600 600 0 120 N V 21 N "P1"
+T1 -60 -460 600 600 0 120 N V 21 N "HOLE"
+$PAD
+Sh "1" C 1181 1181 0 0 0
+Dr 787 0 0
+At STD N 00E0FFFF
+Ne 15 "GND"
+Po 0 0
+$EndPAD
+$EndMODULE  HOLE
+$MODULE HOLE
+Po 74610 54330 0 15 520C0912 520C0855 ~~
+Li HOLE
+Sc 520C0855
+AR /520C06D6
+Op 0 0 0
+T0 0 760 600 600 0 120 N V 21 N "P8"
+T1 -60 -460 600 600 0 120 N V 21 N "HOLE"
+$PAD
+Sh "1" C 1181 1181 0 0 0
+Dr 787 0 0
+At STD N 00E0FFFF
+Ne 15 "GND"
+Po 0 0
+$EndPAD
+$EndMODULE  HOLE
+$MODULE HOLE
+Po 61110 46830 0 15 520C0912 520C095C ~~
+Li HOLE
+Sc 520C095C
+AR /520C06CA
+Op 0 0 0
+T0 0 760 600 600 0 120 N V 21 N "P7"
+T1 -60 -460 600 600 0 120 N V 21 N "HOLE"
+$PAD
+Sh "1" C 1181 1181 0 0 0
+Dr 787 0 0
+At STD N 00E0FFFF
+Ne 15 "GND"
+Po 0 0
+$EndPAD
+$EndMODULE  HOLE
+$MODULE HOLE
+Po 61110 54330 0 15 520C0912 520C095E ~~
+Li HOLE
+Sc 520C095E
+AR /520C06D5
+Op 0 0 0
+T0 0 760 600 600 0 120 N V 21 N "P9"
+T1 -60 -460 600 600 0 120 N V 21 N "HOLE"
+$PAD
+Sh "1" C 1181 1181 0 0 0
+Dr 787 0 0
+At STD N 00E0FFFF
+Ne 15 "GND"
+Po 0 0
+$EndPAD
+$EndMODULE  HOLE
 $MODULE USB_MICRO_AB
-Po 63740 55320 900 15 520C07A1 520BFA84 ~~
+Po 63740 55320 900 15 520D16E3 520BFA84 ~~
 Li USB_MICRO_AB
 Sc 520BFA84
 AR /520BF9C7
 Op 0 0 0
-T0 -550 -690 600 600 1800 120 N V 21 N "J1"
-T1 -600 960 600 600 1800 120 N V 21 N "USB"
+T0 -709 79 600 600 1800 120 N V 21 N "J1"
+T1 -1772 0 600 600 1800 120 N V 21 N "USB"
 DS 315 1457 315 1693 150 21
 DS 315 1693 709 1693 150 21
 DS 709 1693 709 1496 150 21
@@ -1442,20 +1506,20 @@ Ne 15 "GND"
 Po 504 1575
 $EndPAD
 $PAD
-Sh "" C 335 335 0 0 900
-Dr 335 0 0
+Sh "" C 315 315 0 0 900
+Dr 315 0 0
 At HOLE N 0000FFFF
 Ne 0 ""
 Po 1756 -876
-.LocalClearance 39
+.LocalClearance 119
 $EndPAD
 $PAD
-Sh "" C 335 335 0 0 900
-Dr 335 0 0
+Sh "" C 315 315 0 0 900
+Dr 315 0 0
 At HOLE N 0000FFFF
 Ne 0 ""
 Po 1756 876
-.LocalClearance 39
+.LocalClearance 119
 $EndPAD
 $PAD
 Sh "3" R 531 157 0 0 900
@@ -1498,70 +1562,6 @@ Po 1697 512
 .LocalClearance 39
 $EndPAD
 $EndMODULE  USB_MICRO_AB
-$MODULE HOLE
-Po 74610 46830 0 15 520C0912 520C0851 ~~
-Li HOLE
-Sc 520C0851
-AR /520C06C4
-Op 0 0 0
-T0 0 760 600 600 0 120 N V 21 N "P1"
-T1 -60 -460 600 600 0 120 N V 21 N "HOLE"
-$PAD
-Sh "1" C 1181 1181 0 0 0
-Dr 787 0 0
-At STD N 00E0FFFF
-Ne 15 "GND"
-Po 0 0
-$EndPAD
-$EndMODULE  HOLE
-$MODULE HOLE
-Po 74610 54330 0 15 520C0912 520C0855 ~~
-Li HOLE
-Sc 520C0855
-AR /520C06D6
-Op 0 0 0
-T0 0 760 600 600 0 120 N V 21 N "P8"
-T1 -60 -460 600 600 0 120 N V 21 N "HOLE"
-$PAD
-Sh "1" C 1181 1181 0 0 0
-Dr 787 0 0
-At STD N 00E0FFFF
-Ne 15 "GND"
-Po 0 0
-$EndPAD
-$EndMODULE  HOLE
-$MODULE HOLE
-Po 61110 46830 0 15 520C0912 520C095C ~~
-Li HOLE
-Sc 520C095C
-AR /520C06CA
-Op 0 0 0
-T0 0 760 600 600 0 120 N V 21 N "P7"
-T1 -60 -460 600 600 0 120 N V 21 N "HOLE"
-$PAD
-Sh "1" C 1181 1181 0 0 0
-Dr 787 0 0
-At STD N 00E0FFFF
-Ne 15 "GND"
-Po 0 0
-$EndPAD
-$EndMODULE  HOLE
-$MODULE HOLE
-Po 61110 54330 0 15 520C0912 520C095E ~~
-Li HOLE
-Sc 520C095E
-AR /520C06D5
-Op 0 0 0
-T0 0 760 600 600 0 120 N V 21 N "P9"
-T1 -60 -460 600 600 0 120 N V 21 N "HOLE"
-$PAD
-Sh "1" C 1181 1181 0 0 0
-Dr 787 0 0
-At STD N 00E0FFFF
-Ne 15 "GND"
-Po 0 0
-$EndPAD
-$EndMODULE  HOLE
 $COTATION
 Ge 0 25 0
 Va 15700
@@ -1606,7 +1606,7 @@ De 28 0 900 0 0
 $EndDRAWSEGMENT
 $TEXTPCB
 Te "https://svn.spreadspace.org/uart-1wire"
-Po 69970 55080 264 264 66 0
+Po 69980 55000 264 264 66 0
 De 15 1 0 Normal C
 $EndTEXTPCB
 $TEXTPCB
@@ -1616,7 +1616,7 @@ De 15 1 0 Normal C
 $EndTEXTPCB
 $TEXTPCB
 Te "5V"
-Po 68980 53830 433 315 79 2700
+Po 68980 53780 433 315 79 2700
 De 15 1 0 Normal C
 $EndTEXTPCB
 $TEXTPCB
@@ -1631,10 +1631,14 @@ De 15 1 0 Normal C
 $EndTEXTPCB
 $TEXTPCB
 Te "3,3V"
-Po 67160 54080 394 315 79 2700
+Po 67160 54020 394 315 79 2700
 De 15 1 0 Normal C
 $EndTEXTPCB
 $TRACK
+Po 0 65510 49920 62800 49920 80 -1
+De 15 0 1 0 0
+Po 0 61730 50670 61730 51450 80 -1
+De 15 0 1 0 0
 Po 0 62280 50440 61960 50440 80 -1
 De 15 0 1 0 0
 Po 0 62800 49920 62280 50440 80 -1
@@ -1647,10 +1651,6 @@ Po 0 61730 51450 62110 51830 80 -1
 De 15 0 1 0 800000
 Po 0 61960 50440 61730 50670 80 -1
 De 15 0 1 0 0
-Po 0 65510 49920 62800 49920 80 -1
-De 15 0 1 0 0
-Po 0 61730 50670 61730 51450 80 -1
-De 15 0 1 0 0
 Po 0 65445 50065 62855 50065 80 -1
 De 15 0 2 0 0
 Po 0 65720 50340 65445 50065 80 -1
@@ -1661,36 +1661,36 @@ Po 0 62855 50065 62110 50810 80 -1
 De 15 0 2 0 0
 Po 0 65720 50730 65720 50340 80 -1
 De 15 0 2 0 400000
-Po 0 64190 48240 63450 48980 80 -1
-De 15 0 3 0 0
 Po 0 63450 48980 62540 48980 80 -1
 De 15 0 3 0 0
+Po 0 64190 48240 63450 48980 80 -1
+De 15 0 3 0 0
 Po 0 64190 47930 64190 48240 80 -1
 De 15 0 3 0 400000
-Po 0 62540 48980 62110 49410 80 -1
-De 15 0 3 0 0
 Po 0 62110 49410 62110 49830 80 -1
 De 15 0 3 0 800000
+Po 0 62540 48980 62110 49410 80 -1
+De 15 0 3 0 0
 Po 0 63380 48830 63930 48280 80 -1
 De 15 0 4 0 0
 Po 0 62110 48830 63380 48830 80 -1
 De 15 0 4 0 400000
 Po 0 63930 48280 63930 47930 80 -1
 De 15 0 4 0 800000
-Po 0 64440 48210 63520 49130 80 -1
-De 15 0 5 0 0
 Po 0 63520 49130 62730 49130 80 -1
 De 15 0 5 0 0
+Po 0 64440 48210 63520 49130 80 -1
+De 15 0 5 0 0
 Po 0 64440 47930 64440 48210 80 -1
 De 15 0 5 0 400000
 Po 0 62650 49210 62650 48370 80 -1
 De 0 0 5 0 0
 Po 3 62650 49210 62650 49210 256 -1
 De 15 1 5 0 0
-Po 0 62650 48370 62110 47830 80 -1
-De 0 0 5 0 800000
 Po 0 62730 49130 62650 49210 80 -1
 De 15 0 5 0 0
+Po 0 62650 48370 62110 47830 80 -1
+De 0 0 5 0 800000
 Po 0 64700 47480 64720 47460 80 -1
 De 15 0 6 0 0
 Po 0 66530 47410 67110 46830 80 -1
@@ -1755,27 +1755,39 @@ Po 0 67780 48830 67260 48310 80 -1
 De 15 0 13 0 0
 Po 0 67260 48310 67260 47930 80 -1
 De 15 0 13 0 800000
+Po 0 68110 49590 68110 49310 157 -1
+De 0 0 14 0 0
+Po 0 68110 52830 68110 49590 157 -1
+De 0 0 14 0 400000
+Po 0 68110 48830 69110 47830 157 -1
+De 0 0 14 0 800000
 Po 0 68110 49310 68110 48830 157 -1
 De 0 0 14 0 0
 Po 0 66490 47930 66490 48360 157 -1
 De 15 0 14 0 400000
-Po 0 68110 49580 68110 49590 157 -1
-De 0 0 14 0 0
-Po 0 67710 49580 68110 49580 157 -1
-De 15 0 14 0 0
+Po 3 68110 49580 68110 49580 295 157
+De 15 1 14 0 0
 Po 0 66490 48360 67710 49580 157 -1
 De 15 0 14 0 0
-Po 0 68110 48830 69110 47830 157 -1
-De 0 0 14 0 800000
-Po 0 68110 52830 68110 49590 157 -1
-De 0 0 14 0 400000
-Po 0 68110 49590 68110 49310 157 -1
+Po 0 67710 49580 68110 49580 157 -1
+De 15 0 14 0 0
+Po 0 68110 49580 68110 49590 157 -1
 De 0 0 14 0 0
-Po 3 68110 49580 68110 49580 295 157
-De 15 1 14 0 0
-Po 3 72040 53770 72040 53770 256 -1
+Po 3 67450 51640 67450 51640 256 -1
 De 15 1 15 0 0
-Po 0 72380 51140 72380 51310 80 -1
+Po 3 65550 49330 65550 49330 256 -1
+De 15 1 15 0 0
+Po 0 72090 49280 71450 49920 80 -1
+De 15 0 15 0 0
+Po 3 66130 50040 66130 50040 256 -1
+De 15 1 15 0 0
+Po 0 66510 49220 66510 49330 80 -1
+De 15 0 15 0 0
+Po 0 62980 48360 63200 48140 80 -1
+De 15 0 15 0 0
+Po 0 66260 49540 66590 49870 157 -1
+De 15 0 15 0 0
+Po 0 62310 46880 62310 46350 80 -1
 De 0 0 15 0 0
 Po 3 67700 50760 67700 50760 256 -1
 De 15 1 15 0 0
@@ -1783,102 +1795,102 @@ Po 0 67700 51390 67700 50760 80 -1
 De 0 0 15 0 0
 Po 0 73410 53690 72120 53690 80 -1
 De 0 0 15 0 0
+Po 0 73050 49330 72860 49520 80 -1
+De 15 0 15 0 0
 Po 0 72120 53690 72040 53770 80 -1
 De 0 0 15 0 0
 Po 0 65315 54816 65731 54400 80 -1
 De 0 0 15 0 400000
-Po 0 62980 48360 63200 48140 80 -1
-De 15 0 15 0 0
-Po 3 67450 51640 67450 51640 256 -1
-De 15 1 15 0 0
-Po 0 66260 49540 66590 49870 157 -1
-De 15 0 15 0 0
-Po 0 66510 49220 66510 49330 80 -1
-De 15 0 15 0 0
-Po 0 72090 49280 71450 49920 80 -1
-De 15 0 15 0 0
-Po 3 65550 49330 65550 49330 256 -1
-De 15 1 15 0 0
-Po 0 63200 47590 63020 47590 80 -1
+Po 0 72380 51140 72380 51310 80 -1
 De 0 0 15 0 0
+Po 0 65720 48560 64610 48560 80 -1
+De 15 0 15 0 0
 Po 0 64590 48540 63160 48540 80 -1
 De 0 0 15 0 0
-Po 0 73050 49330 72860 49520 80 -1
-De 15 0 15 0 0
-Po 0 65731 54400 68120 54400 80 -1
+Po 0 63160 48540 62980 48360 80 -1
 De 0 0 15 0 0
-Po 0 62310 46880 62310 46350 80 -1
+Po 0 64120 49010 64120 49280 80 -1
 De 0 0 15 0 0
-Po 0 72950 50740 72380 51310 80 -1
+Po 0 74610 46830 74610 48030 157 -1
+De 15 0 15 0 400000
+Po 0 71450 50210 72380 51140 80 -1
 De 0 0 15 0 0
-Po 0 71855 46485 71680 46310 80 -1
+Po 0 66130 50040 66130 50050 80 -1
 De 15 0 15 0 0
-Po 0 74320 47120 74610 46830 157 -1
-De 15 0 15 0 800000
-Po 0 72980 50740 72950 50740 80 -1
-De 0 0 15 0 0
-Po 3 72350 48170 72350 48170 256 -1
-De 15 1 15 0 0
-Po 3 71450 50210 71450 50210 256 -1
+Po 3 72040 53770 72040 53770 256 -1
 De 15 1 15 0 0
 Po 0 66590 50730 66750 50730 157 -1
 De 15 0 15 0 800000
-Po 3 64590 48540 64590 48540 256 -1
+Po 3 71450 50210 71450 50210 256 -1
 De 15 1 15 0 0
-Po 0 66130 50040 66130 50050 80 -1
+Po 0 63200 47590 63020 47590 80 -1
+De 0 0 15 0 0
+Po 0 72980 50740 72950 50740 80 -1
+De 0 0 15 0 0
+Po 0 74320 47120 74610 46830 157 -1
+De 15 0 15 0 800000
+Po 0 71855 46485 71680 46310 80 -1
 De 15 0 15 0 0
-Po 0 71450 50210 72380 51140 80 -1
+Po 0 72950 50740 72380 51310 80 -1
 De 0 0 15 0 0
-Po 0 74610 46830 74610 48030 157 -1
-De 15 0 15 0 400000
-Po 0 64120 49010 64120 49280 80 -1
+Po 0 72090 49180 72350 48920 80 -1
 De 0 0 15 0 0
-Po 3 66130 50040 66130 50040 256 -1
+Po 3 64590 48540 64590 48540 256 -1
 De 15 1 15 0 0
-Po 0 66510 49330 66280 49560 80 -1
-De 15 0 15 0 0
-Po 0 67450 51640 66695 51640 80 -1
-De 15 0 15 0 800000
+Po 0 69590 49310 69570 49330 80 -1
+De 0 0 15 0 0
 Po 0 68120 47990 67380 48730 80 -1
 De 0 0 15 0 0
+Po 0 69050 46350 69040 46340 80 -1
+De 0 0 15 0 0
+Po 3 70770 49700 70770 49700 256 -1
+De 15 1 15 0 0
+Po 0 67450 51640 67700 51390 80 -1
+De 0 0 15 0 0
+Po 0 69950 47720 69950 47830 80 -1
+De 0 0 15 0 0
+Po 3 68600 49330 68600 49330 256 -1
+De 15 1 15 0 0
 Po 0 72090 49280 71450 49920 80 -1
 De 15 0 15 0 0
-Po 3 69040 46340 69040 46340 256 -1
+Po 3 72090 49180 72090 49180 256 -1
 De 15 1 15 0 0
-Po 0 67670 50730 67670 50120 80 -1
+Po 0 66550 51140 65520 51140 157 -1
 De 15 0 15 0 0
-Po 0 69040 46340 69590 46890 80 -1
+Po 0 66590 51140 66550 51140 157 -1
 De 15 0 15 0 0
-Po 3 68810 47120 68810 47120 256 -1
-De 15 1 15 0 0
 Po 0 69040 46340 69040 46890 80 -1
 De 15 0 15 0 0
-Po 0 66590 51140 66550 51140 157 -1
+Po 3 68810 47120 68810 47120 256 -1
+De 15 1 15 0 0
+Po 0 69040 46340 69590 46890 80 -1
 De 15 0 15 0 0
-Po 0 66550 51140 65520 51140 157 -1
+Po 0 67670 50730 67670 50120 80 -1
 De 15 0 15 0 0
-Po 3 72090 49180 72090 49180 256 -1
+Po 3 69040 46340 69040 46340 256 -1
 De 15 1 15 0 0
 Po 0 71640 47120 71640 47460 80 -1
 De 15 0 15 0 0
-Po 3 68600 49330 68600 49330 256 -1
+Po 0 67670 50120 66590 50120 157 -1
+De 15 0 15 0 0
+Po 0 68800 51640 67450 51640 80 -1
+De 15 0 15 0 0
+Po 3 72350 48170 72350 48170 256 -1
 De 15 1 15 0 0
-Po 0 69950 47720 69950 47830 80 -1
-De 0 0 15 0 0
-Po 0 67450 51640 67700 51390 80 -1
-De 0 0 15 0 0
-Po 3 70770 49700 70770 49700 256 -1
+Po 3 71640 47120 71640 47120 256 -1
 De 15 1 15 0 0
-Po 0 69050 46350 69040 46340 80 -1
+Po 0 72350 48920 72350 48170 80 -1
 De 0 0 15 0 0
-Po 0 63160 48540 62980 48360 80 -1
+Po 0 65731 54400 68120 54400 80 -1
 De 0 0 15 0 0
+Po 0 67450 51640 66695 51640 80 -1
+De 15 0 15 0 800000
+Po 0 66510 49330 66280 49560 80 -1
+De 15 0 15 0 0
 Po 3 68120 54400 68120 54400 256 -1
 De 15 1 15 0 0
 Po 3 72860 49520 72860 49520 256 -1
 De 15 1 15 0 0
-Po 0 72090 49180 72350 48920 80 -1
-De 0 0 15 0 0
 Po 3 64120 49280 64120 49280 256 -1
 De 15 1 15 0 0
 Po 0 66130 50040 66510 50040 80 -1
@@ -1891,19 +1903,7 @@ Po 0 68400 50120 69110 50830 157 -1
 De 15 0 15 0 800000
 Po 0 68860 51700 68800 51640 80 -1
 De 15 0 15 0 0
-Po 0 67670 50120 66590 50120 157 -1
-De 15 0 15 0 0
-Po 0 73910 47120 74320 47120 157 -1
-De 15 0 15 0 0
-Po 3 71640 47120 71640 47120 256 -1
-De 15 1 15 0 0
-Po 0 73910 47120 73405 47120 157 -1
-De 15 0 15 0 800000
-Po 0 66890 49220 66510 49220 80 -1
-De 0 0 15 0 0
-Po 0 63020 47590 62310 46880 80 -1
-De 0 0 15 0 0
-Po 0 71450 50210 71280 50210 80 -1
+Po 0 64610 48560 64590 48540 80 -1
 De 15 0 15 0 0
 Po 0 64700 50430 64880 50250 157 -1
 De 15 0 15 0 0
@@ -1917,11 +1917,11 @@ Po 0 74260 49330 73450 49330 157 -1
 De 15 0 15 0 800000
 Po 0 69950 47720 69320 48350 80 -1
 De 15 0 15 0 0
-Po 0 68810 47120 68810 47150 80 -1
-De 0 0 15 0 0
-Po 0 66510 50040 66590 50120 80 -1
-De 15 0 15 0 0
-Po 0 64610 48560 64590 48540 80 -1
+Po 0 65470 51090 65470 50730 157 -1
+De 15 0 15 0 800000
+Po 0 73450 49330 73050 49330 80 -1
+De 15 0 15 0 400000
+Po 0 71450 50210 71280 50210 80 -1
 De 15 0 15 0 0
 Po 0 66130 49910 66130 50040 80 -1
 De 0 0 15 0 0
@@ -1933,76 +1933,82 @@ Po 3 72980 50740 72980 50740 256 -1
 De 15 1 15 0 0
 Po 0 71640 47460 72350 48170 80 -1
 De 15 0 15 0 0
-Po 0 65720 48560 64610 48560 80 -1
-De 15 0 15 0 0
-Po 0 73340 49690 73340 50110 157 -1
-De 15 0 15 0 800000
-Po 0 69950 47830 70690 48570 80 -1
+Po 0 66890 49220 66510 49220 80 -1
 De 0 0 15 0 0
-Po 0 71280 50210 70770 49700 80 -1
+Po 0 69320 48350 68480 48350 80 -1
 De 15 0 15 0 0
-Po 0 70350 49280 69930 49280 80 -1
-De 0 0 15 0 0
-Po 0 73450 49580 73340 49690 157 -1
+Po 0 73910 47120 74320 47120 157 -1
 De 15 0 15 0 0
-Po 0 65720 48560 65720 49000 157 -1
+Po 0 66510 50040 66590 50120 80 -1
 De 15 0 15 0 0
-Po 0 65470 51090 65470 50730 157 -1
-De 15 0 15 0 800000
-Po 0 64170 49330 65550 49330 80 -1
+Po 0 67700 50760 67670 50730 80 -1
 De 15 0 15 0 0
-Po 3 68860 51700 68860 51700 256 -1
+Po 0 73340 50380 72980 50740 80 -1
+De 15 0 15 0 0
+Po 0 73340 49690 73340 50110 157 -1
+De 15 0 15 0 800000
+Po 0 63020 47590 62310 46880 80 -1
+De 0 0 15 0 0
+Po 3 68120 47990 68120 47990 256 -1
 De 15 1 15 0 0
 Po 0 73450 49330 73450 49580 157 -1
 De 15 0 15 0 400000
-Po 3 68120 47990 68120 47990 256 -1
+Po 3 68860 51700 68860 51700 256 -1
 De 15 1 15 0 0
-Po 0 73450 49330 73050 49330 80 -1
-De 15 0 15 0 400000
-Po 0 67700 50760 67670 50730 80 -1
+Po 0 64170 49330 65550 49330 80 -1
 De 15 0 15 0 0
-Po 0 68120 47840 68120 47990 80 -1
+Po 0 73910 47120 73405 47120 157 -1
+De 15 0 15 0 800000
+Po 0 68810 47120 68810 47150 80 -1
 De 0 0 15 0 0
-Po 0 73340 50380 72980 50740 80 -1
+Po 0 65720 48560 65720 49000 157 -1
 De 15 0 15 0 0
-Po 0 69320 48350 68480 48350 80 -1
+Po 0 71280 50210 70770 49700 80 -1
 De 15 0 15 0 0
+Po 0 69950 47830 70690 48570 80 -1
+De 0 0 15 0 0
+Po 0 70350 49280 69930 49280 80 -1
+De 0 0 15 0 0
+Po 0 68120 47840 68120 47990 80 -1
+De 0 0 15 0 0
 Po 0 65320 50250 65470 50400 157 -1
 De 15 0 15 0 0
-Po 0 64700 50730 64700 50430 157 -1
-De 15 0 15 0 400000
-Po 0 72090 49180 72090 49280 80 -1
-De 15 0 15 0 0
-Po 0 65520 51140 65470 51090 157 -1
-De 15 0 15 0 0
-Po 0 63170 49595 66315 49595 157 -1
-De 15 0 15 0 400000
-Po 0 66040 49320 66260 49540 157 -1
+Po 0 66280 49560 66260 49560 157 -1
 De 15 0 15 0 0
-Po 0 71910 46430 74210 46430 157 -1
+Po 0 74610 48980 74260 49330 157 -1
 De 15 0 15 0 0
-Po 0 68600 49330 68590 49330 80 -1
+Po 3 69950 47720 69950 47720 256 -1
+De 15 1 15 0 0
+Po 0 65720 49000 66040 49320 157 -1
 De 15 0 15 0 0
+Po 0 71140 46350 69050 46350 80 -1
+De 0 0 15 0 0
 Po 0 69950 47720 69950 47960 80 -1
 De 0 0 15 0 0
 Po 0 64880 50250 65320 50250 157 -1
 De 15 0 15 0 0
 Po 0 71450 49920 71450 50210 80 -1
 De 15 0 15 0 0
-Po 3 66510 49220 66510 49220 256 -1
-De 15 1 15 0 0
-Po 0 71140 46350 69050 46350 80 -1
-De 0 0 15 0 0
-Po 0 65720 49000 66040 49320 157 -1
+Po 0 66040 49320 66260 49540 157 -1
 De 15 0 15 0 0
-Po 3 69950 47720 69950 47720 256 -1
-De 15 1 15 0 0
-Po 0 74610 48980 74260 49330 157 -1
+Po 0 63170 49595 66315 49595 157 -1
+De 15 0 15 0 400000
+Po 0 65520 51140 65470 51090 157 -1
 De 15 0 15 0 0
-Po 0 66280 49560 66260 49560 157 -1
+Po 0 72090 49180 72090 49280 80 -1
+De 15 0 15 0 0
+Po 0 64700 50730 64700 50430 157 -1
+De 15 0 15 0 400000
+Po 0 73450 49580 73340 49690 157 -1
 De 15 0 15 0 0
 Po 0 69570 49330 68600 49330 80 -1
 De 0 0 15 0 0
+Po 0 71910 46430 74210 46430 157 -1
+De 15 0 15 0 0
+Po 3 66510 49220 66510 49220 256 -1
+De 15 1 15 0 0
+Po 0 68600 49330 68590 49330 80 -1
+De 15 0 15 0 0
 Po 0 64120 49280 64170 49330 80 -1
 De 15 0 15 0 0
 Po 0 69110 51450 68860 51700 80 -1
@@ -2027,56 +2033,62 @@ Po 0 66315 49595 66280 49560 157 -1
 De 15 0 15 0 0
 Po 0 69950 47960 69590 48320 80 -1
 De 0 0 15 0 0
-Po 0 69590 49310 69570 49330 80 -1
+Po 0 61610 52330 60390 52330 80 -1
 De 0 0 15 0 0
-Po 0 68800 51640 67450 51640 80 -1
-De 15 0 15 0 0
-Po 0 72350 48920 72350 48170 80 -1
+Po 3 72670 52220 72670 52220 256 -1
+De 15 1 15 0 0
+Po 0 60390 52330 60330 52270 80 -1
 De 0 0 15 0 0
+Po 0 68600 49330 68400 49130 80 -1
+De 15 0 15 0 0
+Po 3 60330 52270 60330 52270 256 -1
+De 15 1 15 0 0
 Po 3 61610 52330 61610 52330 256 -1
 De 15 1 15 0 0
-Po 0 70560 46890 69950 47500 80 -1
+Po 0 73690 52220 73870 52040 80 -1
 De 0 0 15 0 0
-Po 0 66260 49560 66260 49540 157 -1
+Po 3 60530 48890 60530 48890 256 -1
+De 15 1 15 0 0
+Po 0 63200 48140 63200 47590 80 -1
 De 15 0 15 0 0
-Po 0 71140 46350 71640 46850 80 -1
-De 0 0 15 0 0
-Po 0 71640 46850 71640 47120 80 -1
-De 0 0 15 0 0
 Po 0 60680 50060 60530 49910 80 -1
 De 15 0 15 0 0
-Po 0 63200 48140 63200 47590 80 -1
+Po 0 71640 46850 71640 47120 80 -1
+De 0 0 15 0 0
+Po 0 71140 46350 71640 46850 80 -1
+De 0 0 15 0 0
+Po 0 66260 49560 66260 49540 157 -1
 De 15 0 15 0 0
-Po 3 60530 48890 60530 48890 256 -1
-De 15 1 15 0 0
-Po 0 73690 52220 73870 52040 80 -1
+Po 0 70560 46890 69950 47500 80 -1
 De 0 0 15 0 0
 Po 0 71640 47120 71265 47120 157 -1
 De 15 0 15 0 800000
-Po 3 60330 52270 60330 52270 256 -1
+Po 3 67760 49130 67760 49130 256 -1
 De 15 1 15 0 0
-Po 0 68600 49330 68400 49130 80 -1
+Po 0 66620 46220 68920 46220 80 -1
 De 15 0 15 0 0
-Po 0 60390 52330 60330 52270 80 -1
+Po 0 60530 48890 60530 47410 80 -1
 De 0 0 15 0 0
-Po 3 72670 52220 72670 52220 256 -1
+Po 0 75000 53040 75000 53940 80 -1
+De 15 0 15 0 0
+Po 0 62660 46250 64540 46250 80 -1
+De 15 0 15 0 0
+Po 3 66550 46290 66550 46290 256 -1
 De 15 1 15 0 0
-Po 0 61610 52330 60390 52330 80 -1
+Po 0 67380 48730 66890 49220 80 -1
+De 0 0 15 0 0
+Po 0 68920 46220 69040 46340 80 -1
+De 15 0 15 0 0
+Po 0 72670 52220 73690 52220 80 -1
 De 0 0 15 0 0
-Po 3 67760 49130 67760 49130 256 -1
-De 15 1 15 0 0
 Po 0 65315 54816 65095 54816 157 -1
 De 15 0 15 0 C00000
 Po 0 65950 54181 65315 54816 157 -1
 De 15 0 15 0 800000
-Po 0 66490 50730 66590 50730 157 -1
-De 15 0 15 0 400000
 Po 3 75140 48170 75140 48170 256 -1
 De 15 1 15 0 0
 Po 0 68480 48350 68120 47990 80 -1
 De 15 0 15 0 0
-Po 0 68810 47150 68120 47840 80 -1
-De 0 0 15 0 0
 Po 0 69590 48320 69590 49310 80 -1
 De 0 0 15 0 0
 Po 0 64590 48540 64120 49010 80 -1
@@ -2087,116 +2099,110 @@ Po 0 67670 50120 68400 50120 157 -1
 De 15 0 15 0 0
 Po 0 65470 50400 65470 50730 157 -1
 De 15 0 15 0 800000
-Po 3 70690 48570 70690 48570 256 -1
-De 15 1 15 0 0
-Po 0 75000 53040 75000 53940 80 -1
-De 15 0 15 0 0
-Po 0 65720 47930 65720 48560 157 -1
+Po 0 65095 54816 64264 54816 157 -1
 De 15 0 15 0 400000
-Po 0 67380 48730 66890 49220 80 -1
-De 0 0 15 0 0
-Po 3 73030 46260 73030 46260 256 -1
-De 15 1 15 0 0
-Po 0 75140 48170 74770 48170 80 -1
-De 0 0 15 0 0
-Po 0 74610 54330 73970 53690 80 -1
+Po 0 68250 54530 70500 54530 80 -1
+De 15 0 15 0 0
+Po 0 73970 53690 73410 53690 80 -1
+De 15 0 15 0 0
+Po 0 74610 46830 74040 46260 80 -1
+De 0 0 15 0 400000
+Po 0 65950 53890 65950 54181 157 -1
 De 15 0 15 0 400000
-Po 3 70660 54380 70660 54380 256 -1
-De 15 1 15 0 0
-Po 0 73410 53690 73410 53880 80 -1
-De 0 0 15 0 0
+Po 0 74750 48170 75140 48170 80 -1
+De 15 0 15 0 0
+Po 0 68120 54400 68250 54530 80 -1
+De 15 0 15 0 0
+Po 0 70500 54530 70650 54380 80 -1
+De 15 0 15 0 0
+Po 0 60965 54185 61110 54330 157 -1
+De 15 0 15 0 800000
 Po 0 72910 54380 70660 54380 80 -1
 De 15 0 15 0 0
 Po 0 70660 54380 70650 54380 80 -1
 De 15 0 15 0 0
 Po 0 73000 54290 72910 54380 80 -1
 De 15 0 15 0 0
+Po 0 74610 54330 73970 53690 80 -1
+De 15 0 15 0 400000
 Po 3 73000 54290 73000 54290 256 -1
 De 15 1 15 0 0
 Po 0 73410 53880 73000 54290 80 -1
 De 0 0 15 0 0
-Po 0 68120 54400 68250 54530 80 -1
-De 15 0 15 0 0
-Po 0 68250 54530 70500 54530 80 -1
-De 15 0 15 0 0
-Po 0 70500 54530 70650 54380 80 -1
-De 15 0 15 0 0
-Po 0 74750 48170 75140 48170 80 -1
-De 15 0 15 0 0
-Po 0 74610 46830 74040 46260 80 -1
-De 0 0 15 0 400000
-Po 0 73970 53690 73410 53690 80 -1
-De 15 0 15 0 0
-Po 3 71580 46310 71580 46310 256 -1
-De 15 1 15 0 0
-Po 3 73410 53690 73410 53690 256 -1
-De 15 1 15 0 0
-Po 0 68920 46220 69040 46340 80 -1
-De 15 0 15 0 0
-Po 0 72670 52220 73690 52220 80 -1
+Po 0 73410 53690 73410 53880 80 -1
 De 0 0 15 0 0
-Po 0 60965 54185 61110 54330 157 -1
-De 15 0 15 0 800000
-Po 0 74770 48170 74120 48820 80 -1
+Po 0 64120 49280 64120 50260 80 -1
 De 0 0 15 0 0
-Po 3 74120 48820 74120 48820 256 -1
+Po 3 73410 53690 73410 53690 256 -1
 De 15 1 15 0 0
-Po 0 74370 48820 75070 49520 80 -1
+Po 0 66490 50730 66590 50730 157 -1
+De 15 0 15 0 400000
+Po 0 68400 49130 67760 49130 80 -1
 De 15 0 15 0 0
-Po 0 75030 53010 75000 53040 80 -1
-De 0 0 15 0 0
-Po 3 66550 46290 66550 46290 256 -1
+Po 3 72380 51310 72380 51310 256 -1
 De 15 1 15 0 0
-Po 3 75030 51080 75030 51080 256 -1
+Po 0 60965 53010 60965 52905 80 -1
+De 15 0 15 0 400000
+Po 0 60965 52905 60330 52270 80 -1
+De 15 0 15 0 0
+Po 3 70660 54380 70660 54380 256 -1
 De 15 1 15 0 0
 Po 0 63216 54816 63287 54745 157 -1
 De 15 0 15 0 800000
-Po 0 60530 48890 60530 47410 80 -1
+Po 3 75030 51080 75030 51080 256 -1
+De 15 1 15 0 0
+Po 3 71580 46310 71580 46310 256 -1
+De 15 1 15 0 0
+Po 0 75030 53010 75000 53040 80 -1
 De 0 0 15 0 0
-Po 0 60965 52905 60330 52270 80 -1
+Po 0 74370 48820 75070 49520 80 -1
 De 15 0 15 0 0
-Po 0 60965 53010 60965 52905 80 -1
-De 15 0 15 0 400000
-Po 3 72380 51310 72380 51310 256 -1
+Po 3 74120 48820 74120 48820 256 -1
 De 15 1 15 0 0
-Po 0 68400 49130 67760 49130 80 -1
-De 15 0 15 0 0
-Po 0 65950 53890 65950 54181 157 -1
-De 15 0 15 0 400000
+Po 0 74770 48170 74120 48820 80 -1
+De 0 0 15 0 0
+Po 0 68810 47150 68120 47840 80 -1
+De 0 0 15 0 0
 Po 0 61110 54330 61679 54330 157 -1
 De 15 0 15 0 400000
-Po 0 60780 49960 60680 50060 80 -1
-De 15 0 15 0 0
-Po 0 60510 50230 60510 51300 80 -1
+Po 0 75030 51080 75030 53010 80 -1
 De 0 0 15 0 0
-Po 0 62560 46350 62660 46250 80 -1
+Po 0 64252 54218 64252 53623 157 -1
+De 15 0 15 0 800000
+Po 0 61400 49960 60780 49960 80 -1
 De 15 0 15 0 0
-Po 3 63200 47590 63200 47590 256 -1
+Po 3 60510 51300 60510 51300 256 -1
 De 15 1 15 0 0
-Po 0 60510 51300 60330 51480 80 -1
-De 15 0 15 0 0
-Po 0 66550 46290 66620 46220 80 -1
-De 15 0 15 0 0
+Po 3 60680 50060 60680 50060 256 -1
+De 15 1 15 0 0
+Po 0 64193 54745 64193 54277 157 -1
+De 15 0 15 0 400000
 Po 0 61679 54330 62165 54816 157 -1
 De 15 0 15 0 800000
 Po 0 64193 54277 64252 54218 157 -1
 De 15 0 15 0 0
 Po 0 62230 50320 61760 50320 80 -1
 De 0 0 15 0 0
-Po 0 60530 47410 61110 46830 80 -1
-De 0 0 15 0 800000
-Po 0 64193 54745 64193 54277 157 -1
-De 15 0 15 0 400000
-Po 3 60680 50060 60680 50060 256 -1
-De 15 1 15 0 0
-Po 3 60510 51300 60510 51300 256 -1
+Po 3 63200 47590 63200 47590 256 -1
 De 15 1 15 0 0
-Po 0 61400 49960 60780 49960 80 -1
+Po 0 62560 46350 62660 46250 80 -1
+De 15 0 15 0 0
+Po 0 60510 50230 60510 51300 80 -1
+De 0 0 15 0 0
+Po 0 60780 49960 60680 50060 80 -1
 De 15 0 15 0 0
-Po 0 64252 54218 64252 53623 157 -1
-De 15 0 15 0 800000
 Po 0 63500 50880 63480 50860 80 -1
 De 15 0 15 0 0
+Po 0 60965 53010 60965 54185 157 -1
+De 15 0 15 0 400000
+Po 3 62770 50860 62770 50860 256 -1
+De 15 1 15 0 0
+Po 0 60510 51300 60330 51480 80 -1
+De 15 0 15 0 0
+Po 0 60530 47410 61110 46830 80 -1
+De 0 0 15 0 800000
+Po 0 66550 46290 66620 46220 80 -1
+De 15 0 15 0 0
 Po 0 61110 46830 61590 46350 80 -1
 De 0 0 15 0 400000
 Po 0 60330 51480 60330 52270 80 -1
@@ -2221,18 +2227,12 @@ Po 0 62770 50860 62230 50320 80 -1
 De 0 0 15 0 0
 Po 0 62310 46350 62560 46350 80 -1
 De 15 0 15 0 0
-Po 0 64120 49280 64120 50260 80 -1
-De 0 0 15 0 0
-Po 0 66620 46220 68920 46220 80 -1
-De 15 0 15 0 0
-Po 0 62660 46250 64540 46250 80 -1
-De 15 0 15 0 0
-Po 0 61590 46350 62310 46350 80 -1
-De 0 0 15 0 0
-Po 0 75070 50030 74420 50680 80 -1
+Po 3 70690 48570 70690 48570 256 -1
+De 15 1 15 0 0
+Po 3 73870 52040 73870 52040 256 -1
+De 15 1 15 0 0
+Po 0 75140 48170 74770 48170 80 -1
 De 0 0 15 0 0
-Po 0 65095 54816 64264 54816 157 -1
-De 15 0 15 0 400000
 Po 0 69040 46890 68810 47120 80 -1
 De 15 0 15 0 0
 Po 3 69930 49280 69930 49280 256 -1
@@ -2243,12 +2243,12 @@ Po 0 62165 54816 62385 54816 157 -1
 De 15 0 15 0 C00000
 Po 3 75070 49520 75070 49520 256 -1
 De 15 1 15 0 0
-Po 0 72410 51340 72410 51960 80 -1
+Po 0 66695 51285 66550 51140 157 -1
+De 15 0 15 0 0
+Po 0 64264 54816 64193 54745 157 -1
+De 15 0 15 0 800000
+Po 0 74120 48820 74370 48820 80 -1
 De 15 0 15 0 0
-Po 0 64120 50260 63500 50880 80 -1
-De 0 0 15 0 0
-Po 0 75070 49520 75070 50030 80 -1
-De 0 0 15 0 0
 Po 3 74420 50680 74420 50680 256 -1
 De 15 1 15 0 0
 Po 0 74420 50680 73040 50680 80 -1
@@ -2261,38 +2261,38 @@ Po 0 74040 46260 73030 46260 80 -1
 De 0 0 15 0 0
 Po 0 72410 51960 72670 52220 80 -1
 De 15 0 15 0 0
-Po 0 66695 51285 66550 51140 157 -1
-De 15 0 15 0 0
-Po 0 71680 46310 71580 46310 80 -1
+Po 0 72410 51340 72410 51960 80 -1
 De 15 0 15 0 0
-Po 3 63500 50880 63500 50880 256 -1
-De 15 1 15 0 0
-Po 0 60965 53010 60965 54185 157 -1
-De 15 0 15 0 400000
-Po 0 62385 54816 63216 54816 157 -1
+Po 0 64120 50260 63500 50880 80 -1
+De 0 0 15 0 0
+Po 0 60680 50060 60510 50230 80 -1
+De 0 0 15 0 0
+Po 0 66695 51640 66695 51285 157 -1
 De 15 0 15 0 400000
-Po 0 74120 48820 74370 48820 80 -1
-De 15 0 15 0 0
-Po 0 61760 50320 61400 49960 80 -1
+Po 0 75070 50030 74420 50680 80 -1
 De 0 0 15 0 0
-Po 0 74070 52040 75030 51080 80 -1
+Po 3 73030 46260 73030 46260 256 -1
+De 15 1 15 0 0
+Po 0 73870 52040 74070 52040 80 -1
 De 15 0 15 0 0
 Po 0 60530 49910 60530 48890 80 -1
 De 15 0 15 0 0
-Po 0 73870 52040 74070 52040 80 -1
+Po 0 74070 52040 75030 51080 80 -1
 De 15 0 15 0 0
-Po 0 64264 54816 64193 54745 157 -1
-De 15 0 15 0 800000
-Po 0 60680 50060 60510 50230 80 -1
+Po 0 61760 50320 61400 49960 80 -1
 De 0 0 15 0 0
-Po 3 62770 50860 62770 50860 256 -1
-De 15 1 15 0 0
-Po 0 66695 51640 66695 51285 157 -1
+Po 0 65720 47930 65720 48560 157 -1
 De 15 0 15 0 400000
-Po 3 73870 52040 73870 52040 256 -1
-De 15 1 15 0 0
-Po 0 75030 51080 75030 53010 80 -1
+Po 0 75070 49520 75070 50030 80 -1
+De 0 0 15 0 0
+Po 0 62385 54816 63216 54816 157 -1
+De 15 0 15 0 400000
+Po 0 71680 46310 71580 46310 80 -1
+De 15 0 15 0 0
+Po 0 61590 46350 62310 46350 80 -1
 De 0 0 15 0 0
+Po 3 63500 50880 63500 50880 256 -1
+De 15 1 15 0 0
 Po 0 63890 51260 63890 52910 80 -1
 De 15 0 16 0 0
 Po 0 64190 50960 63890 51260 80 -1
@@ -2323,24 +2323,24 @@ Po 0 73110 51790 73110 52830 80 -1
 De 15 0 18 0 800000
 Po 0 72840 51310 72840 51520 80 -1
 De 15 0 18 0 400000
-Po 0 72160 49690 72780 49070 80 -1
+Po 0 72015 47435 72015 47120 80 -1
+De 15 0 19 0 800000
+Po 0 72780 49070 72780 48830 80 -1
 De 15 0 19 0 0
 Po 0 72780 48200 72015 47435 80 -1
 De 15 0 19 0 0
-Po 0 72780 49070 72780 48830 80 -1
-De 15 0 19 0 0
+Po 0 73450 48830 72780 48830 80 -1
+De 15 0 19 0 400000
 Po 0 72780 48830 72780 48200 80 -1
 De 15 0 19 0 0
-Po 0 72160 50055 72160 49690 80 -1
-De 15 0 19 0 400000
+Po 0 72780 48830 72800 48830 80 -1
+De 15 0 19 0 0
 Po 0 72800 48830 72780 48830 80 -1
 De 15 0 19 0 0
-Po 0 72780 48830 72800 48830 80 -1
+Po 0 72160 49690 72780 49070 80 -1
 De 15 0 19 0 0
-Po 0 73450 48830 72780 48830 80 -1
+Po 0 72160 50055 72160 49690 80 -1
 De 15 0 19 0 400000
-Po 0 72015 47435 72015 47120 80 -1
-De 15 0 19 0 800000
 Po 0 72760 50480 72840 50400 80 -1
 De 15 0 20 0 0
 Po 0 72840 50400 72840 50110 80 -1
@@ -2385,10 +2385,10 @@ Po 0 70338 49058 70110 48830 80 -1
 De 15 0 23 0 800000
 Po 0 70338 49058 71002 49058 80 -1
 De 15 0 23 0 0
-Po 0 63900 51220 66240 53560 80 -1
-De 0 0 24 0 0
 Po 0 61110 50830 61430 50830 80 -1
 De 0 0 24 0 400000
+Po 0 63900 51220 66240 53560 80 -1
+De 0 0 24 0 0
 Po 0 71070 53710 71070 53935 80 -1
 De 15 0 24 0 800000
 Po 3 70920 53560 70920 53560 256 -1
@@ -2397,10 +2397,10 @@ Po 0 66240 53560 70920 53560 80 -1
 De 0 0 24 0 0
 Po 0 61820 51220 63900 51220 80 -1
 De 0 0 24 0 0
-Po 0 61430 50830 61820 51220 80 -1
-De 0 0 24 0 0
 Po 0 70920 53560 71070 53710 80 -1
 De 15 0 24 0 0
+Po 0 61430 50830 61820 51220 80 -1
+De 0 0 24 0 0
 Po 0 70210 53185 70210 52509 80 -1
 De 15 0 25 0 C00000
 Po 0 71070 53185 71070 52509 80 -1
@@ -2417,22 +2417,22 @@ Po 0 63228 53010 63228 52122 157 -1
 De 15 0 27 0 0
 Po 0 63228 52122 63260 52090 157 -1
 De 15 0 27 0 800000
-Po 0 61110 51830 61380 51830 80 -1
-De 0 0 28 0 400000
+Po 0 69705 53935 70210 53935 80 -1
+De 15 0 28 0 800000
+Po 3 69700 53930 69700 53930 256 -1
+De 15 1 28 0 0
+Po 0 66170 53710 69480 53710 80 -1
+De 0 0 28 0 0
 Po 0 61380 51830 61840 51370 80 -1
 De 0 0 28 0 0
+Po 0 69480 53710 69700 53930 80 -1
+De 0 0 28 0 0
+Po 0 61110 51830 61380 51830 80 -1
+De 0 0 28 0 400000
 Po 0 63830 51370 66170 53710 80 -1
 De 0 0 28 0 0
 Po 0 61840 51370 63830 51370 80 -1
 De 0 0 28 0 0
-Po 0 69480 53710 69700 53930 80 -1
-De 0 0 28 0 0
-Po 0 66170 53710 69480 53710 80 -1
-De 0 0 28 0 0
-Po 3 69700 53930 69700 53930 256 -1
-De 15 1 28 0 0
-Po 0 69705 53935 70210 53935 80 -1
-De 15 0 28 0 800000
 Po 0 69700 53930 69705 53935 80 -1
 De 15 0 28 0 0
 Po 0 73340 51751 73291 51800 157 -1
@@ -2445,78 +2445,78 @@ Po 0 73291 51800 73291 52371 157 -1
 De 15 0 29 0 0
 Po 0 73750 52830 74110 52830 157 -1
 De 15 0 29 0 800000
-Po 0 71760 48080 72190 47650 157 -1
-De 0 0 30 0 0
-Po 3 71760 48080 71760 48080 295 157
-De 15 1 30 0 0
-Po 0 72110 51800 72110 52830 157 -1
-De 15 0 30 0 800000
-Po 0 69620 48500 70040 48080 157 -1
+Po 0 65940 52100 64670 52100 157 -1
+De 15 0 30 0 0
+Po 0 71350 48080 71760 48080 157 -1
 De 15 0 30 0 0
-Po 0 71070 51391 70210 51391 157 -1
-De 15 0 30 0 C00000
 Po 0 71350 48330 71350 48080 157 -1
 De 15 0 30 0 400000
-Po 0 64670 52100 64660 52090 157 -1
-De 15 0 30 0 800000
-Po 0 69620 51380 69620 48500 157 -1
+Po 0 71070 51391 70210 51391 157 -1
+De 15 0 30 0 C00000
+Po 0 69620 48500 70040 48080 157 -1
 De 15 0 30 0 0
-Po 0 73450 47830 73010 47830 157 -1
-De 15 0 30 0 400000
-Po 0 72655 47475 72655 47120 157 -1
+Po 0 72110 51800 72110 52830 157 -1
 De 15 0 30 0 800000
 Po 0 69620 51391 69631 51380 157 -1
 De 15 0 30 0 0
-Po 0 69110 52100 69110 52830 157 -1
+Po 3 71760 48080 71760 48080 295 157
+De 15 1 30 0 0
+Po 0 73450 47830 73010 47830 157 -1
+De 15 0 30 0 400000
+Po 0 64670 52100 64660 52090 157 -1
 De 15 0 30 0 800000
-Po 0 65940 52100 64670 52100 157 -1
-De 15 0 30 0 0
 Po 0 73010 47830 72830 47650 157 -1
 De 15 0 30 0 0
-Po 0 71701 51391 72110 51800 157 -1
-De 15 0 30 0 0
+Po 0 71760 48080 72190 47650 157 -1
+De 0 0 30 0 0
 Po 0 70210 51391 69620 51391 157 -1
 De 15 0 30 0 400000
+Po 0 69620 51380 69620 48500 157 -1
+De 15 0 30 0 0
 Po 0 71350 48080 71350 47830 157 -1
 De 15 0 30 0 800000
-Po 0 71350 48080 71760 48080 157 -1
+Po 0 72655 47475 72655 47120 157 -1
+De 15 0 30 0 800000
+Po 0 71701 51391 72110 51800 157 -1
 De 15 0 30 0 0
+Po 0 69110 52100 69110 52830 157 -1
+De 15 0 30 0 800000
 Po 0 65945 52095 65940 52100 157 -1
 De 15 0 30 0 0
-Po 0 69631 51380 69660 51380 157 -1
-De 15 0 30 0 0
-Po 0 69110 52100 69620 51590 157 -1
-De 15 0 30 0 0
-Po 0 65700 51640 65210 51150 157 -1
-De 15 0 30 0 0
-Po 0 65210 51150 65210 50730 157 -1
-De 15 0 30 0 800000
-Po 0 69620 51590 69620 51380 157 -1
+Po 0 65945 52090 65945 52095 157 -1
 De 15 0 30 0 0
+Po 0 65945 51640 65945 52090 157 -1
+De 15 0 30 0 400000
 Po 0 65945 51640 65700 51640 157 -1
 De 15 0 30 0 400000
-Po 0 72830 47650 72655 47475 157 -1
+Po 0 69620 51590 69620 51380 157 -1
 De 15 0 30 0 0
-Po 0 70040 48080 71350 48080 157 -1
+Po 0 65210 51150 65210 50730 157 -1
+De 15 0 30 0 800000
+Po 0 65700 51640 65210 51150 157 -1
 De 15 0 30 0 0
-Po 0 65945 51640 65945 52090 157 -1
-De 15 0 30 0 400000
-Po 0 72190 47650 72830 47650 157 -1
-De 0 0 30 0 0
 Po 0 65945 52090 65945 52585 157 -1
 De 15 0 30 0 0
+Po 0 69110 52100 69620 51590 157 -1
+De 15 0 30 0 0
 Po 0 69110 52100 65940 52100 157 -1
 De 15 0 30 0 0
-Po 0 65945 52090 65945 52095 157 -1
+Po 0 72830 47650 72655 47475 157 -1
 De 15 0 30 0 0
 Po 0 71070 51391 71701 51391 157 -1
 De 15 0 30 0 400000
-Po 3 72830 47650 72830 47650 295 157
-De 15 1 30 0 0
+Po 0 69631 51380 69660 51380 157 -1
+De 15 0 30 0 0
 Po 0 65945 52585 65950 52590 157 -1
 De 15 0 30 0 800000
+Po 0 70040 48080 71350 48080 157 -1
+De 15 0 30 0 0
 Po 0 69660 51380 69620 51380 157 -1
 De 15 0 30 0 0
+Po 0 72190 47650 72830 47650 157 -1
+De 0 0 30 0 0
+Po 3 72830 47650 72830 47650 295 157
+De 15 1 30 0 0
 $EndTRACK
 $ZONE
 $EndZONE
@@ -2907,9 +2907,9 @@ $POLYSCORNERS
 74427 53043 0 0
 74485 52905 0 0
 74485 55255 0 0
-74165 55255 0 0
-74165 54697 0 0
-72484 54697 0 0
+74175 55255 0 0
+74175 54617 0 0
+72484 54617 0 0
 72484 53124 0 0
 72484 53085 0 0
 72484 52535 0 0
@@ -3554,20 +3554,20 @@ $POLYSCORNERS
 61989 53265 0 0
 61989 53188 0 0
 63050 53188 0 0
-63050 53373 0 0
-63015 53338 0 0
-62917 53297 0 0
-62811 53297 0 0
-62713 53338 0 0
-62638 53413 0 0
-62597 53511 0 0
-62597 53617 0 0
-62638 53715 0 0
-62713 53790 0 0
-62811 53831 0 0
-62917 53831 0 0
-63015 53790 0 0
-63051 53754 0 0
+63050 53303 0 0
+63043 53296 0 0
+62927 53248 0 0
+62801 53248 0 0
+62685 53296 0 0
+62596 53385 0 0
+62548 53501 0 0
+62548 53627 0 0
+62596 53743 0 0
+62685 53832 0 0
+62801 53880 0 0
+62927 53880 0 0
+63043 53832 0 0
+63051 53824 0 0
 63051 53908 0 0
 63066 53944 0 0
 63094 53972 0 0
@@ -3795,8 +3795,8 @@ $POLYSCORNERS
 72441 53189 0 0
 72469 53161 0 0
 72484 53124 0 0
-72484 54697 0 0
-71523 54697 0 0
+72484 54617 0 0
+71523 54617 0 0
 71523 52842 0 0
 71523 52803 0 0
 71523 52175 0 0
@@ -3894,8 +3894,8 @@ $POLYSCORNERS
 71480 52907 0 0
 71508 52879 0 0
 71523 52842 0 0
-71523 54697 0 0
-70584 54697 0 0
+71523 54617 0 0
+70584 54617 0 0
 70584 54129 0 0
 70584 54090 0 0
 70584 53740 0 0
@@ -3930,15 +3930,15 @@ $POLYSCORNERS
 70541 54194 0 0
 70569 54166 0 0
 70584 54129 0 0
-70584 54697 0 0
-69418 54697 0 0
-69418 54361 0 0
-69418 53300 0 0
-68620 53300 0 0
-68620 54361 0 0
-69418 54361 0 0
-69418 54697 0 0
-68485 54697 0 0
+70584 54617 0 0
+69418 54617 0 0
+69418 54311 0 0
+69418 53250 0 0
+68620 53250 0 0
+68620 54311 0 0
+69418 54311 0 0
+69418 54617 0 0
+68485 54617 0 0
 68485 52905 0 0
 68485 52756 0 0
 68428 52618 0 0
@@ -3956,10 +3956,10 @@ $POLYSCORNERS
 68322 53148 0 0
 68427 53043 0 0
 68485 52905 0 0
-68485 54697 0 0
-67598 54697 0 0
-67598 53303 0 0
-67485 53303 0 0
+68485 54617 0 0
+67598 54617 0 0
+67598 53243 0 0
+67485 53243 0 0
 67485 52905 0 0
 67485 52756 0 0
 67428 52618 0 0
@@ -3977,30 +3977,30 @@ $POLYSCORNERS
 67322 53148 0 0
 67427 53043 0 0
 67485 52905 0 0
-67485 53303 0 0
-66800 53303 0 0
-66800 54697 0 0
-65775 54697 0 0
-65775 55255 0 0
-64883 55255 0 0
-64883 53617 0 0
-64883 53511 0 0
-64842 53413 0 0
-64767 53338 0 0
-64669 53297 0 0
-64563 53297 0 0
-64465 53338 0 0
-64390 53413 0 0
-64349 53511 0 0
-64349 53617 0 0
-64390 53715 0 0
-64465 53790 0 0
-64563 53831 0 0
-64669 53831 0 0
-64767 53790 0 0
-64842 53715 0 0
-64883 53617 0 0
-64883 55255 0 0
+67485 53243 0 0
+66800 53243 0 0
+66800 54617 0 0
+65785 54617 0 0
+65785 55255 0 0
+64932 55255 0 0
+64932 53627 0 0
+64932 53501 0 0
+64884 53385 0 0
+64795 53296 0 0
+64679 53248 0 0
+64553 53248 0 0
+64437 53296 0 0
+64348 53385 0 0
+64300 53501 0 0
+64300 53627 0 0
+64348 53743 0 0
+64437 53832 0 0
+64553 53880 0 0
+64679 53880 0 0
+64795 53832 0 0
+64884 53743 0 0
+64932 53627 0 0
+64932 55255 0 0
 60185 55255 0 0
 60185 45905 0 0
 75535 45905 0 0
@@ -4674,25 +4674,25 @@ $POLYSCORNERS
 71113 53689 0 0
 71148 53606 0 0
 71148 55255 0 0
-64883 55255 0 0
-64883 53617 0 0
-64883 53511 0 0
-64842 53413 0 0
-64767 53338 0 0
-64669 53297 0 0
-64563 53297 0 0
-64465 53338 0 0
-64390 53413 0 0
-64349 53511 0 0
-64349 53617 0 0
-64390 53715 0 0
-64465 53790 0 0
-64563 53831 0 0
-64669 53831 0 0
-64767 53790 0 0
-64842 53715 0 0
-64883 53617 0 0
-64883 55255 0 0
+64932 55255 0 0
+64932 53627 0 0
+64932 53501 0 0
+64884 53385 0 0
+64795 53296 0 0
+64679 53248 0 0
+64553 53248 0 0
+64437 53296 0 0
+64348 53385 0 0
+64300 53501 0 0
+64300 53627 0 0
+64348 53743 0 0
+64437 53832 0 0
+64553 53880 0 0
+64679 53880 0 0
+64795 53832 0 0
+64884 53743 0 0
+64932 53627 0 0
+64932 55255 0 0
 64208 55255 0 0
 64208 53046 0 0
 64208 52955 0 0
@@ -4724,25 +4724,25 @@ $POLYSCORNERS
 64173 53129 0 0
 64208 53046 0 0
 64208 55255 0 0
-63131 55255 0 0
-63131 53617 0 0
-63131 53511 0 0
-63090 53413 0 0
-63015 53338 0 0
-62917 53297 0 0
-62811 53297 0 0
-62713 53338 0 0
-62638 53413 0 0
-62597 53511 0 0
-62597 53617 0 0
-62638 53715 0 0
-62713 53790 0 0
-62811 53831 0 0
-62917 53831 0 0
-63015 53790 0 0
-63090 53715 0 0
-63131 53617 0 0
-63131 55255 0 0
+63180 55255 0 0
+63180 53627 0 0
+63180 53501 0 0
+63132 53385 0 0
+63043 53296 0 0
+62927 53248 0 0
+62801 53248 0 0
+62685 53296 0 0
+62596 53385 0 0
+62548 53501 0 0
+62548 53627 0 0
+62596 53743 0 0
+62685 53832 0 0
+62801 53880 0 0
+62927 53880 0 0
+63043 53832 0 0
+63132 53743 0 0
+63180 53627 0 0
+63180 55255 0 0
 60185 55255 0 0
 60185 45905 0 0
 75535 45905 0 0
diff --git a/uart-1wire.mod b/uart-1wire.mod
index 8125727..5207f4f 100644
--- a/uart-1wire.mod
+++ b/uart-1wire.mod
@@ -1,4 +1,4 @@
-PCBNEW-LibModule-V1  Do 15 Aug 2013 00:47:49 CEST
+PCBNEW-LibModule-V1  Do 15 Aug 2013 19:59:02 CEST
 # encoding utf-8
 $INDEX
 HOLE
@@ -6,8 +6,104 @@ SMD_Solderbridge
 TSOC-6
 USB_MICRO_AB
 $EndINDEX
+$MODULE SMD_Solderbridge
+Po 0 0 0 15 51FE63EC 00000000 ~~
+Li SMD_Solderbridge
+Cd Pontet Goute de soudure
+Sc 00000000
+AR /51FE61C4
+Op 0 0 0
+At VIRTUAL
+T0 700 0 400 300 900 50 N V 21 N "P3"
+T1 600 0 300 300 900 50 N I 21 N "USBVcc"
+DS -350 -500 -350 500 50 21
+DS 350 500 350 -500 50 21
+DS 350 500 -350 500 50 21
+DS -350 -500 350 -500 50 21
+$PAD
+Sh "1" R 500 380 0 0 0
+Dr 0 0 0
+At SMD N 00808000
+Ne 0 ""
+Po 0 -250
+$EndPAD
+$PAD
+Sh "2" R 500 380 0 0 0
+Dr 0 0 0
+At SMD N 00808000
+Ne 0 ""
+Po 0 250
+$EndPAD
+$EndMODULE  SMD_Solderbridge
+$MODULE TSOC-6
+Po 0 0 0 15 520BF97B 00000000 ~~
+Li TSOC-6
+Sc 00000000
+AR
+Op 0 0 0
+T0 0 -200 276 276 0 69 N V 21 N "TSOC-6"
+T1 0 250 276 276 0 69 N V 21 N "VAL**"
+$PAD
+Sh "1" R 524 209 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -600 -500
+$EndPAD
+$PAD
+Sh "2" R 524 209 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -600 0
+$EndPAD
+$PAD
+Sh "3" R 524 209 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -600 500
+$EndPAD
+$PAD
+Sh "4" R 524 209 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 600 500
+$EndPAD
+$PAD
+Sh "5" R 524 209 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 600 0
+$EndPAD
+$PAD
+Sh "6" R 524 209 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 600 -500
+$EndPAD
+$EndMODULE  TSOC-6
+$MODULE HOLE
+Po 0 0 0 15 520C0912 00000000 ~~
+Li HOLE
+Sc 00000000
+AR HOLE
+Op 0 0 0
+T0 0 760 600 600 0 120 N V 21 N "HOLE"
+T1 -60 -460 600 600 0 120 N V 21 N "VAL**"
+$PAD
+Sh "1" C 1181 1181 0 0 0
+Dr 787 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 0 0
+$EndPAD
+$EndMODULE  HOLE
 $MODULE USB_MICRO_AB
-Po 0 0 0 15 5144B6ED 00000000 ~~
+Po 0 0 0 15 520D16E3 00000000 ~~
 Li USB_MICRO_AB
 Sc 00000000
 AR /4F722418
@@ -71,20 +167,20 @@ Ne 5 "N-000071"
 Po 504 1575
 $EndPAD
 $PAD
-Sh "" C 335 335 0 0 0
-Dr 335 0 0
+Sh "" C 315 315 0 0 0
+Dr 315 0 0
 At HOLE N 0000FFFF
 Ne 0 ""
 Po 1756 -876
-.LocalClearance 39
+.LocalClearance 119
 $EndPAD
 $PAD
-Sh "" C 335 335 0 0 0
-Dr 335 0 0
+Sh "" C 315 315 0 0 0
+Dr 315 0 0
 At HOLE N 0000FFFF
 Ne 0 ""
 Po 1756 876
-.LocalClearance 39
+.LocalClearance 119
 $EndPAD
 $PAD
 Sh "3" R 531 157 0 0 0
@@ -127,100 +223,4 @@ Po 1697 512
 .LocalClearance 39
 $EndPAD
 $EndMODULE  USB_MICRO_AB
-$MODULE SMD_Solderbridge
-Po 0 0 0 15 51FE63EC 00000000 ~~
-Li SMD_Solderbridge
-Cd Pontet Goute de soudure
-Sc 00000000
-AR /51FE61C4
-Op 0 0 0
-At VIRTUAL
-T0 700 0 400 300 900 50 N V 21 N "P3"
-T1 600 0 300 300 900 50 N I 21 N "USBVcc"
-DS -350 -500 -350 500 50 21
-DS 350 500 350 -500 50 21
-DS 350 500 -350 500 50 21
-DS -350 -500 350 -500 50 21
-$PAD
-Sh "1" R 500 380 0 0 0
-Dr 0 0 0
-At SMD N 00808000
-Ne 0 ""
-Po 0 -250
-$EndPAD
-$PAD
-Sh "2" R 500 380 0 0 0
-Dr 0 0 0
-At SMD N 00808000
-Ne 0 ""
-Po 0 250
-$EndPAD
-$EndMODULE  SMD_Solderbridge
-$MODULE TSOC-6
-Po 0 0 0 15 520BF97B 00000000 ~~
-Li TSOC-6
-Sc 00000000
-AR
-Op 0 0 0
-T0 0 -200 276 276 0 69 N V 21 N "TSOC-6"
-T1 0 250 276 276 0 69 N V 21 N "VAL**"
-$PAD
-Sh "1" R 524 209 0 0 0
-Dr 0 0 0
-At SMD N 00888000
-Ne 0 ""
-Po -600 -500
-$EndPAD
-$PAD
-Sh "2" R 524 209 0 0 0
-Dr 0 0 0
-At SMD N 00888000
-Ne 0 ""
-Po -600 0
-$EndPAD
-$PAD
-Sh "3" R 524 209 0 0 0
-Dr 0 0 0
-At SMD N 00888000
-Ne 0 ""
-Po -600 500
-$EndPAD
-$PAD
-Sh "4" R 524 209 0 0 0
-Dr 0 0 0
-At SMD N 00888000
-Ne 0 ""
-Po 600 500
-$EndPAD
-$PAD
-Sh "5" R 524 209 0 0 0
-Dr 0 0 0
-At SMD N 00888000
-Ne 0 ""
-Po 600 0
-$EndPAD
-$PAD
-Sh "6" R 524 209 0 0 0
-Dr 0 0 0
-At SMD N 00888000
-Ne 0 ""
-Po 600 -500
-$EndPAD
-$EndMODULE  TSOC-6
-$MODULE HOLE
-Po 0 0 0 15 520C0912 00000000 ~~
-Li HOLE
-Sc 00000000
-AR HOLE
-Op 0 0 0
-T0 0 760 600 600 0 120 N V 21 N "HOLE"
-T1 -60 -460 600 600 0 120 N V 21 N "VAL**"
-$PAD
-Sh "1" C 1181 1181 0 0 0
-Dr 787 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 0 0
-$EndPAD
-$EndMODULE  HOLE
 $EndLIBRARY