See the <layout_note_revised2.txt> file.

2024-11-21 22:23:09 +02:00 · 2009-11-30 09:28:06 -05:00 · 2009-11-30 09:28:06 -05:00 · a71ccea08b
commit a71ccea08b
parent 5a7f9b6bd4
38 changed files with 88721 additions and 268915 deletions
--- a/components/switch.bak
+++ b/components/switch.bak
@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: 25/9/2009-00:52:08
+EESchema-LIBRARY Version 2.3  Date: 30/11/2009-02:36:06
 #
 # SWITCH
 #
@ -11,9 +11,9 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S 150 -200 -150 200 0 1 0 N
-X 1 1 -450 -100 300 R 50 50 1 1 B
+X 1 1 -450 -100 300 R 50 50 1 1 I
-X 3 3 -450 0 300 R 50 50 1 1 B
+X 2 2 -450 0 300 R 50 50 1 1 I
-X 2 2 -450 100 300 R 50 50 1 1 B
+X 3 3 -450 100 300 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
--- a/components/switch.bck
+++ b/components/switch.bck
@ -1,3 +1,3 @@
-EESchema-DOCLIB  Version 2.0  Date: 25/9/2009-00:52:08
+EESchema-DOCLIB  Version 2.0  Date: 30/11/2009-02:36:06
 #
 #End Doc Library
--- a/components/switch.dcm
+++ b/components/switch.dcm
@ -1,3 +1,3 @@
-EESchema-DOCLIB  Version 2.0  Date: 25/9/2009-00:52:21
+EESchema-DOCLIB  Version 2.0  Date: 30/11/2009-02:37:37
 #
 #End Doc Library
--- a/components/switch.lib
+++ b/components/switch.lib
@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: 25/9/2009-00:52:21
+EESchema-LIBRARY Version 2.3  Date: 30/11/2009-02:37:37
 #
 # SWITCH
 #
@ -11,9 +11,9 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S 150 -200 -150 200 0 1 0 N
-X 1 1 -450 -100 300 R 50 50 1 1 B
+X 1 1 -450 -100 300 R 50 50 1 1 I
-X 3 3 -450 0 300 R 50 50 1 1 B
+X 2 2 -450 0 300 R 50 50 1 1 I
-X 2 2 -450 100 300 R 50 50 1 1 B
+X 3 3 -450 100 300 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
--- a/layout_note_revised2.txt
+++ b/layout_note_revised2.txt
@ -0,0 +1,83 @@
 1, CON3 , I saw the pcb file , it has total 8 pins, must be only 3 pins and ground. do you want to use MS24011P3R(1.0mm pitch right angle smaller one) or MS24013R(1.25mm pitch right angle)
   if we need use MS24011P3R, please see the http://downloads.qi-hardware.com/hardware/qi_avt2/v1.0/datasheet/CON3~MS24011P3R~~FINAL_PART~~.pdf
   please ignore I sent you the sample MS24011P3RA, it's wrong sample(180 degree). I'll request for the real one (MS24011P3R).
 [OK]{2}, I found that good you use always thermal pad (we called for cross solder paste), it's good for solder manually (MP stage), but you need be 
   careful, Like U2 pin4 has thick trace but pin3 (L1.1)doesn't have the same width, it's not good. Current in needed be equal to keep current out based on width common ground.
   same story on U3.3 <-> L2.1, please see http://downloads.qi-hardware.com/hardware/qi_avt2/v1.0/datasheet/U2_3~EUP3406.pdf
   page 10.
 [OK]{3}, N-000077 & N-000065 should be the same width as N-000065 & N-00068, others are not mentioned here i think should be modified like this.
   Main audio signal path should all keep the same width; but control signal like any MOSFET's Gate doesn't need. [1]
 4, J3 on avt2_RC1 I made a mistake on placement, did you find? It should be shift to left a little bit to meet mechanical as well.
   please see [2].
 [OK]{5}, I very agree and like you out U1.187 pin to be the bigger ground area, I should do like yours to expand copper; but one thing 
   please must be changed back a little bit, becuase I ask Ingenic and cob vendor, the ground copper under cpu die should be
   add a little bit width than itself, for example , the jz4720 the die size is 4560um * 4960um, so they normally make a baseplate expandly
   to 5160um * 4760um by added plus 200um for each. Surrounding this area i think you still can use thermal copper pad.
 6, I found you used 0.099mm(~3.89mil) width for each expanding bonding wire, it's differ from my 0.125mm(~4.92mil), I know now 
   have many pcb maker they have accurate process can do above 3 mil trace butthey just officially anouncement they can do it on some sample or small run,
 but for MP, their quality will hardly to maintain the same width with constant variance in every lot; maybe I produced some Moto phone in china before
 , but we still meet a lot of defective rate or WIP in MP due to pcba maker's process; I am not sure how many lot of pcb your company made; if running a small quantity,
 they just picked the best one lot and send to you. But I have met many kind of this huge for MOTO project before, even the pcb maker they 
 anoucement they can control the quality.
  so I used to choose a safe width around 5 mil for trace, also I arranged a 0.15mm(5.9mil)/0.12mm(4.7mil)/0.15mm(5.9mil) for sectorial shape in:
  pcb layout plan:
  --> approximately -->   6 mil width pad / 5 mil width gap / 6 mil width pad and so on...  
  after pcb maker's etching process, they will become variably as:
  --> approximately -->   5               / 6               / 5
  so this 5mil pad will be coonected to all thin control signal trace ( smaller than 4.9 mil )
  now yours is :
  --> approximately -->   4.92 mil width pad / 3.38 mil width gap / 4.92 mil width pad   
  after pcb maker's etching process, they will become variably as:
  --> approximately -->   3.9                / 4.3                / 3.9
  so this 3.9mil pad will be connected to all thin control signal trace ( smaller than 3.89 mil )
  why I designed like this:
  a) the width of golden wire is 0.7mil here in Taiwan cob vendor but China has 0.8mil aluminum capability.
     so the most safe space is more bigger than 2 times of 0.8mil = 1.6 mil (40.65um) which is a bit smaller than die pad only.
     see the smallest pad on cpu die is 50*50um only[3], so chose 0.7 mil is more safe and aslo i can only find here Taipei they
     have; but for design a reference board , maybe in the future, some one will use our design and make A LOT quantity hopefully
     but China's COB we're now still hard to find a suitable for our few scale.
  b) the example small distance between CPU pad 73 and 74 is 76um only, so the explosion sectorially from cpu die to bonding outside pad, should be
     carefull.
  c) the Ben- NanoNote our OEM they don't use all 186 pins of jz4720, so they only layout for 165 pins bonding wires for the cob pad as a square shape.
  d) at SilkS_Cmp layer for cpu die, please mark two cross which needed to position for cob vendor they write program to make position.
     [4]  ??
 7, you cancelled XP/XN, YP/YN? touch screen? I left them becuase of someone is crazy he wants to study touch screen future.
   I think you have good reason, right?
 [OK]{8}, R39= 2.2K/5%, sorry the schematic is 22k, please change schematic to 2.2K/5%, avt2_RC1 is 2.2K/5%.
 ¿9?, R40 & R41 is 100/5% in schematic but I found I make mistakes again, in avt2_RC1 I used 1k/5%, but it still works well due
   to volatage divided, so bom I changed it correct into 100/5% now. 
 [OK]{10}, R60 100K/5% R0603 must move to somewhere, otherwise the batttery case will interfere it. If you agree, we can change this package 0603 into 0402.
 [OK]{11}, SW1 not changed to P/N: MK-12C02-PB, see [5]
    [5] http://downloads.qi-hardware.com/hardware/qi_avt2/v1.0/datasheet/SW1~MK-12C02-PB.pdf
 [OK]{12}, C59, C62 is 100uF/4V in qi_lb60 (Ben-Nanonote) they used A-case in huge quantity, here I can not get, so I changed to
    100uF/6.3V B-case.
 13, C72, C73 are C0805, I am requesting the parts. ¿?
 14, I cann't figure out the footprint of key [6], 
 15, shift uSD a little bit 
 [OK]{16}, add 0.1uF/16V /C0402 between U6 pin1 and pin2 ¿?
--- a/main/$savepcb.000
+++ b/main/$savepcb.000
--- a/main/$savepcb.brd
+++ b/main/$savepcb.brd
--- a/main/Qi_AVT2-Adhes_Cmp.pho
+++ b/main/Qi_AVT2-Adhes_Cmp.pho
@ -1,4 +1,4 @@
-G04 (Genere par PCBnew (20080825c)) le 14/10/2009-03:17:02*
+G04 (Genere par PCBnew (20080825c)) le 30/11/2009-02:48:59*
 G01*
 G70*
 G90*
@ -26,51 +26,51 @@ G04 APERTURE LIST*
 %ADD27R,0.078700X0.007800*%
 %ADD28C,0.137800*%
 %ADD29C,0.048000*%
-%ADD30C,0.011800*%
+%ADD30C,0.035400*%
-%ADD31C,0.019700*%
+%ADD31C,0.011800*%
 %ADD32C,0.019700*%
-%ADD33C,0.003900*%
+%ADD33C,0.019700*%
-%ADD34C,0.007900*%
+%ADD34C,0.003900*%
-%ADD35C,0.059100*%
+%ADD35C,0.007900*%
-%ADD36C,0.011800*%
+%ADD36C,0.059100*%
-%ADD37C,0.002500*%
+%ADD37C,0.011800*%
-%ADD38C,0.001600*%
+%ADD38C,0.002500*%
-%ADD39C,0.003200*%
+%ADD39C,0.001600*%
-%ADD40C,0.015300*%
+%ADD40C,0.003200*%
-%ADD41C,0.021000*%
+%ADD41C,0.015300*%
-%ADD42R,0.049200X0.039400*%
+%ADD42C,0.021000*%
-%ADD43R,0.055100X0.047200*%
+%ADD43R,0.049200X0.039400*%
-%ADD44R,0.039400X0.035400*%
+%ADD44R,0.055100X0.047200*%
-%ADD45R,0.063000X0.027600*%
+%ADD45R,0.039400X0.035400*%
-%ADD46R,0.055100X0.063000*%
+%ADD46R,0.063000X0.027600*%
-%ADD47R,0.086600X0.047200*%
+%ADD47R,0.055100X0.063000*%
-%ADD48R,0.063000X0.031500*%
+%ADD48R,0.086600X0.047200*%
-%ADD49R,0.118100X0.082700*%
+%ADD49R,0.059000X0.015700*%
-%ADD50R,0.059000X0.015700*%
+%ADD50R,0.070900X0.074800*%
-%ADD51R,0.070900X0.074800*%
+%ADD51R,0.074800X0.074800*%
-%ADD52R,0.074800X0.074800*%
+%ADD52R,0.063000X0.021700*%
-%ADD53R,0.063000X0.021700*%
+%ADD53R,0.086600X0.090600*%
-%ADD54R,0.086600X0.090600*%
+%ADD54R,0.059100X0.027600*%
-%ADD55R,0.059100X0.027600*%
+%ADD55R,0.098400X0.078700*%
-%ADD56R,0.098400X0.078700*%
+%ADD56R,0.039400X0.059000*%
-%ADD57R,0.009800X0.027600*%
+%ADD57R,0.187400X0.203100*%
-%ADD58R,0.053100X0.065000*%
+%ADD58R,0.005100X0.027500*%
-%ADD59R,0.039400X0.059000*%
+%ADD59R,0.027500X0.005100*%
-%ADD60R,0.181100X0.181100*%
+%ADD60R,0.118100X0.055100*%
-%ADD61R,0.005100X0.027500*%
+%ADD61R,0.055100X0.118100*%
-%ADD62R,0.027500X0.005100*%
+%ADD62R,0.031500X0.023600*%
-%ADD63R,0.118100X0.055100*%
+%ADD63R,0.023600X0.086600*%
-%ADD64R,0.055100X0.118100*%
+%ADD64R,0.086600X0.023600*%
-%ADD65R,0.031500X0.023600*%
+%ADD65R,0.098400X0.068900*%
-%ADD66R,0.023600X0.086600*%
+%ADD66R,0.068900X0.098400*%
-%ADD67R,0.086600X0.023600*%
+%ADD67C,0.067000*%
-%ADD68R,0.098400X0.068900*%
+%ADD68R,0.039400X0.039400*%
-%ADD69R,0.068900X0.098400*%
+%ADD69R,0.078700X0.015700*%
-%ADD70C,0.067000*%
+%ADD70R,0.055100X0.098400*%
-%ADD71R,0.039400X0.039400*%
+%ADD71R,0.061000X0.023600*%
-%ADD72R,0.078700X0.015700*%
+%ADD72R,0.078700X0.047200*%
-%ADD73R,0.039400X0.118100*%
+%ADD73R,0.039400X0.023600*%
-%ADD74R,0.055100X0.098400*%
+%ADD74R,0.019700X0.027600*%
 %ADD75C,0.039300*%
 %ADD76C,0.039400*%
 %ADD77C,0.005900*%
@ -84,10 +84,10 @@ G04 APERTURE LIST*
 %ADD85C,0.008000*%
 %ADD86C,0.003500*%
 %ADD87C,0.005000*%
-%ADD88C,0.007500*%
+%ADD88C,0.040000*%
-%ADD89C,0.040000*%
+%ADD89C,0.000000*%
-%ADD90C,0.000000*%
+%ADD90C,0.002000*%
-%ADD91C,0.002000*%
+%ADD91C,0.004100*%
 %ADD92C,0.065300*%
 %ADD93R,0.039700X0.039700*%
 %ADD94R,0.051500X0.051500*%
@ -103,40 +103,40 @@ G04 APERTURE LIST*
 %ADD104R,0.098700X0.027800*%
 %ADD105C,0.157800*%
 %ADD106C,0.068000*%
-%ADD107C,0.002300*%
+%ADD107C,0.055400*%
-%ADD108R,0.069200X0.059400*%
+%ADD108C,0.002300*%
-%ADD109R,0.075100X0.067200*%
+%ADD109R,0.069200X0.059400*%
-%ADD110R,0.059400X0.055400*%
+%ADD110R,0.075100X0.067200*%
-%ADD111R,0.083000X0.047600*%
+%ADD111R,0.059400X0.055400*%
-%ADD112R,0.075100X0.083000*%
+%ADD112R,0.083000X0.047600*%
-%ADD113R,0.106600X0.067200*%
+%ADD113R,0.075100X0.083000*%
-%ADD114R,0.083000X0.051500*%
+%ADD114R,0.106600X0.067200*%
-%ADD115R,0.138100X0.102700*%
+%ADD115R,0.079000X0.035700*%
-%ADD116R,0.079000X0.035700*%
+%ADD116R,0.090900X0.094800*%
-%ADD117R,0.090900X0.094800*%
+%ADD117R,0.094800X0.094800*%
-%ADD118R,0.094800X0.094800*%
+%ADD118R,0.083000X0.041700*%
-%ADD119R,0.083000X0.041700*%
+%ADD119R,0.106600X0.110600*%
-%ADD120R,0.106600X0.110600*%
+%ADD120R,0.079100X0.047600*%
-%ADD121R,0.079100X0.047600*%
+%ADD121R,0.118400X0.098700*%
-%ADD122R,0.118400X0.098700*%
+%ADD122R,0.059400X0.079000*%
-%ADD123R,0.029800X0.047600*%
+%ADD123R,0.207400X0.223100*%
-%ADD124R,0.073100X0.085000*%
+%ADD124R,0.025100X0.047500*%
-%ADD125R,0.059400X0.079000*%
+%ADD125R,0.047500X0.025100*%
-%ADD126R,0.201100X0.201100*%
+%ADD126R,0.138100X0.075100*%
-%ADD127R,0.025100X0.047500*%
+%ADD127R,0.075100X0.138100*%
-%ADD128R,0.047500X0.025100*%
+%ADD128R,0.051500X0.043600*%
-%ADD129R,0.138100X0.075100*%
+%ADD129R,0.043600X0.106600*%
-%ADD130R,0.075100X0.138100*%
+%ADD130R,0.106600X0.043600*%
-%ADD131R,0.051500X0.043600*%
+%ADD131R,0.118400X0.088900*%
-%ADD132R,0.043600X0.106600*%
+%ADD132R,0.088900X0.118400*%
-%ADD133R,0.106600X0.043600*%
+%ADD133C,0.087000*%
-%ADD134R,0.118400X0.088900*%
+%ADD134R,0.059400X0.059400*%
-%ADD135R,0.088900X0.118400*%
+%ADD135R,0.098700X0.035700*%
-%ADD136C,0.087000*%
+%ADD136R,0.075100X0.118400*%
-%ADD137R,0.059400X0.059400*%
+%ADD137R,0.081000X0.043600*%
-%ADD138R,0.098700X0.035700*%
+%ADD138R,0.098700X0.067200*%
-%ADD139R,0.059400X0.138100*%
+%ADD139R,0.059400X0.043600*%
-%ADD140R,0.075100X0.118400*%
+%ADD140R,0.039700X0.047600*%
 G04 APERTURE END LIST*
 G54D10*
 X59197Y-39582D02*
--- a/main/Qi_AVT2-Adhes_Cop.pho
+++ b/main/Qi_AVT2-Adhes_Cop.pho
@ -1,4 +1,4 @@
-G04 (Genere par PCBnew (20080825c)) le 14/10/2009-03:17:02*
+G04 (Genere par PCBnew (20080825c)) le 30/11/2009-02:48:59*
 G01*
 G70*
 G90*
@ -26,51 +26,51 @@ G04 APERTURE LIST*
 %ADD27R,0.078700X0.007800*%
 %ADD28C,0.137800*%
 %ADD29C,0.048000*%
-%ADD30C,0.011800*%
+%ADD30C,0.035400*%
-%ADD31C,0.019700*%
+%ADD31C,0.011800*%
 %ADD32C,0.019700*%
-%ADD33C,0.003900*%
+%ADD33C,0.019700*%
-%ADD34C,0.007900*%
+%ADD34C,0.003900*%
-%ADD35C,0.059100*%
+%ADD35C,0.007900*%
-%ADD36C,0.011800*%
+%ADD36C,0.059100*%
-%ADD37C,0.002500*%
+%ADD37C,0.011800*%
-%ADD38C,0.001600*%
+%ADD38C,0.002500*%
-%ADD39C,0.003200*%
+%ADD39C,0.001600*%
-%ADD40C,0.015300*%
+%ADD40C,0.003200*%
-%ADD41C,0.021000*%
+%ADD41C,0.015300*%
-%ADD42R,0.049200X0.039400*%
+%ADD42C,0.021000*%
-%ADD43R,0.055100X0.047200*%
+%ADD43R,0.049200X0.039400*%
-%ADD44R,0.039400X0.035400*%
+%ADD44R,0.055100X0.047200*%
-%ADD45R,0.063000X0.027600*%
+%ADD45R,0.039400X0.035400*%
-%ADD46R,0.055100X0.063000*%
+%ADD46R,0.063000X0.027600*%
-%ADD47R,0.086600X0.047200*%
+%ADD47R,0.055100X0.063000*%
-%ADD48R,0.063000X0.031500*%
+%ADD48R,0.086600X0.047200*%
-%ADD49R,0.118100X0.082700*%
+%ADD49R,0.059000X0.015700*%
-%ADD50R,0.059000X0.015700*%
+%ADD50R,0.070900X0.074800*%
-%ADD51R,0.070900X0.074800*%
+%ADD51R,0.074800X0.074800*%
-%ADD52R,0.074800X0.074800*%
+%ADD52R,0.063000X0.021700*%
-%ADD53R,0.063000X0.021700*%
+%ADD53R,0.086600X0.090600*%
-%ADD54R,0.086600X0.090600*%
+%ADD54R,0.059100X0.027600*%
-%ADD55R,0.059100X0.027600*%
+%ADD55R,0.098400X0.078700*%
-%ADD56R,0.098400X0.078700*%
+%ADD56R,0.039400X0.059000*%
-%ADD57R,0.009800X0.027600*%
+%ADD57R,0.187400X0.203100*%
-%ADD58R,0.053100X0.065000*%
+%ADD58R,0.005100X0.027500*%
-%ADD59R,0.039400X0.059000*%
+%ADD59R,0.027500X0.005100*%
-%ADD60R,0.181100X0.181100*%
+%ADD60R,0.118100X0.055100*%
-%ADD61R,0.005100X0.027500*%
+%ADD61R,0.055100X0.118100*%
-%ADD62R,0.027500X0.005100*%
+%ADD62R,0.031500X0.023600*%
-%ADD63R,0.118100X0.055100*%
+%ADD63R,0.023600X0.086600*%
-%ADD64R,0.055100X0.118100*%
+%ADD64R,0.086600X0.023600*%
-%ADD65R,0.031500X0.023600*%
+%ADD65R,0.098400X0.068900*%
-%ADD66R,0.023600X0.086600*%
+%ADD66R,0.068900X0.098400*%
-%ADD67R,0.086600X0.023600*%
+%ADD67C,0.067000*%
-%ADD68R,0.098400X0.068900*%
+%ADD68R,0.039400X0.039400*%
-%ADD69R,0.068900X0.098400*%
+%ADD69R,0.078700X0.015700*%
-%ADD70C,0.067000*%
+%ADD70R,0.055100X0.098400*%
-%ADD71R,0.039400X0.039400*%
+%ADD71R,0.061000X0.023600*%
-%ADD72R,0.078700X0.015700*%
+%ADD72R,0.078700X0.047200*%
-%ADD73R,0.039400X0.118100*%
+%ADD73R,0.039400X0.023600*%
-%ADD74R,0.055100X0.098400*%
+%ADD74R,0.019700X0.027600*%
 %ADD75C,0.039300*%
 %ADD76C,0.039400*%
 %ADD77C,0.005900*%
@ -84,10 +84,10 @@ G04 APERTURE LIST*
 %ADD85C,0.008000*%
 %ADD86C,0.003500*%
 %ADD87C,0.005000*%
-%ADD88C,0.007500*%
+%ADD88C,0.040000*%
-%ADD89C,0.040000*%
+%ADD89C,0.000000*%
-%ADD90C,0.000000*%
+%ADD90C,0.002000*%
-%ADD91C,0.002000*%
+%ADD91C,0.004100*%
 %ADD92C,0.065300*%
 %ADD93R,0.039700X0.039700*%
 %ADD94R,0.051500X0.051500*%
@ -103,40 +103,40 @@ G04 APERTURE LIST*
 %ADD104R,0.098700X0.027800*%
 %ADD105C,0.157800*%
 %ADD106C,0.068000*%
-%ADD107C,0.002300*%
+%ADD107C,0.055400*%
-%ADD108R,0.069200X0.059400*%
+%ADD108C,0.002300*%
-%ADD109R,0.075100X0.067200*%
+%ADD109R,0.069200X0.059400*%
-%ADD110R,0.059400X0.055400*%
+%ADD110R,0.075100X0.067200*%
-%ADD111R,0.083000X0.047600*%
+%ADD111R,0.059400X0.055400*%
-%ADD112R,0.075100X0.083000*%
+%ADD112R,0.083000X0.047600*%
-%ADD113R,0.106600X0.067200*%
+%ADD113R,0.075100X0.083000*%
-%ADD114R,0.083000X0.051500*%
+%ADD114R,0.106600X0.067200*%
-%ADD115R,0.138100X0.102700*%
+%ADD115R,0.079000X0.035700*%
-%ADD116R,0.079000X0.035700*%
+%ADD116R,0.090900X0.094800*%
-%ADD117R,0.090900X0.094800*%
+%ADD117R,0.094800X0.094800*%
-%ADD118R,0.094800X0.094800*%
+%ADD118R,0.083000X0.041700*%
-%ADD119R,0.083000X0.041700*%
+%ADD119R,0.106600X0.110600*%
-%ADD120R,0.106600X0.110600*%
+%ADD120R,0.079100X0.047600*%
-%ADD121R,0.079100X0.047600*%
+%ADD121R,0.118400X0.098700*%
-%ADD122R,0.118400X0.098700*%
+%ADD122R,0.059400X0.079000*%
-%ADD123R,0.029800X0.047600*%
+%ADD123R,0.207400X0.223100*%
-%ADD124R,0.073100X0.085000*%
+%ADD124R,0.025100X0.047500*%
-%ADD125R,0.059400X0.079000*%
+%ADD125R,0.047500X0.025100*%
-%ADD126R,0.201100X0.201100*%
+%ADD126R,0.138100X0.075100*%
-%ADD127R,0.025100X0.047500*%
+%ADD127R,0.075100X0.138100*%
-%ADD128R,0.047500X0.025100*%
+%ADD128R,0.051500X0.043600*%
-%ADD129R,0.138100X0.075100*%
+%ADD129R,0.043600X0.106600*%
-%ADD130R,0.075100X0.138100*%
+%ADD130R,0.106600X0.043600*%
-%ADD131R,0.051500X0.043600*%
+%ADD131R,0.118400X0.088900*%
-%ADD132R,0.043600X0.106600*%
+%ADD132R,0.088900X0.118400*%
-%ADD133R,0.106600X0.043600*%
+%ADD133C,0.087000*%
-%ADD134R,0.118400X0.088900*%
+%ADD134R,0.059400X0.059400*%
-%ADD135R,0.088900X0.118400*%
+%ADD135R,0.098700X0.035700*%
-%ADD136C,0.087000*%
+%ADD136R,0.075100X0.118400*%
-%ADD137R,0.059400X0.059400*%
+%ADD137R,0.081000X0.043600*%
-%ADD138R,0.098700X0.035700*%
+%ADD138R,0.098700X0.067200*%
-%ADD139R,0.059400X0.138100*%
+%ADD139R,0.059400X0.043600*%
-%ADD140R,0.075100X0.118400*%
+%ADD140R,0.039700X0.047600*%
 G04 APERTURE END LIST*
 G54D10*
 X59197Y-39582D02*
--- a/main/Qi_AVT2-Component.pho
+++ b/main/Qi_AVT2-Component.pho
--- a/main/Qi_AVT2-Copper.pho
+++ b/main/Qi_AVT2-Copper.pho
--- a/main/Qi_AVT2-Edges_Pcb.pho
+++ b/main/Qi_AVT2-Edges_Pcb.pho
@ -1,4 +1,4 @@
-G04 (Genere par PCBnew (20080825c)) le 14/10/2009-03:17:02*
+G04 (Genere par PCBnew (20080825c)) le 30/11/2009-02:48:59*
 G01*
 G70*
 G90*
@ -26,51 +26,51 @@ G04 APERTURE LIST*
 %ADD27R,0.078700X0.007800*%
 %ADD28C,0.137800*%
 %ADD29C,0.048000*%
-%ADD30C,0.011800*%
+%ADD30C,0.035400*%
-%ADD31C,0.019700*%
+%ADD31C,0.011800*%
 %ADD32C,0.019700*%
-%ADD33C,0.003900*%
+%ADD33C,0.019700*%
-%ADD34C,0.007900*%
+%ADD34C,0.003900*%
-%ADD35C,0.059100*%
+%ADD35C,0.007900*%
-%ADD36C,0.011800*%
+%ADD36C,0.059100*%
-%ADD37C,0.002500*%
+%ADD37C,0.011800*%
-%ADD38C,0.001600*%
+%ADD38C,0.002500*%
-%ADD39C,0.003200*%
+%ADD39C,0.001600*%
-%ADD40C,0.015300*%
+%ADD40C,0.003200*%
-%ADD41C,0.021000*%
+%ADD41C,0.015300*%
-%ADD42R,0.049200X0.039400*%
+%ADD42C,0.021000*%
-%ADD43R,0.055100X0.047200*%
+%ADD43R,0.049200X0.039400*%
-%ADD44R,0.039400X0.035400*%
+%ADD44R,0.055100X0.047200*%
-%ADD45R,0.063000X0.027600*%
+%ADD45R,0.039400X0.035400*%
-%ADD46R,0.055100X0.063000*%
+%ADD46R,0.063000X0.027600*%
-%ADD47R,0.086600X0.047200*%
+%ADD47R,0.055100X0.063000*%
-%ADD48R,0.063000X0.031500*%
+%ADD48R,0.086600X0.047200*%
-%ADD49R,0.118100X0.082700*%
+%ADD49R,0.059000X0.015700*%
-%ADD50R,0.059000X0.015700*%
+%ADD50R,0.070900X0.074800*%
-%ADD51R,0.070900X0.074800*%
+%ADD51R,0.074800X0.074800*%
-%ADD52R,0.074800X0.074800*%
+%ADD52R,0.063000X0.021700*%
-%ADD53R,0.063000X0.021700*%
+%ADD53R,0.086600X0.090600*%
-%ADD54R,0.086600X0.090600*%
+%ADD54R,0.059100X0.027600*%
-%ADD55R,0.059100X0.027600*%
+%ADD55R,0.098400X0.078700*%
-%ADD56R,0.098400X0.078700*%
+%ADD56R,0.039400X0.059000*%
-%ADD57R,0.009800X0.027600*%
+%ADD57R,0.187400X0.203100*%
-%ADD58R,0.053100X0.065000*%
+%ADD58R,0.005100X0.027500*%
-%ADD59R,0.039400X0.059000*%
+%ADD59R,0.027500X0.005100*%
-%ADD60R,0.181100X0.181100*%
+%ADD60R,0.118100X0.055100*%
-%ADD61R,0.005100X0.027500*%
+%ADD61R,0.055100X0.118100*%
-%ADD62R,0.027500X0.005100*%
+%ADD62R,0.031500X0.023600*%
-%ADD63R,0.118100X0.055100*%
+%ADD63R,0.023600X0.086600*%
-%ADD64R,0.055100X0.118100*%
+%ADD64R,0.086600X0.023600*%
-%ADD65R,0.031500X0.023600*%
+%ADD65R,0.098400X0.068900*%
-%ADD66R,0.023600X0.086600*%
+%ADD66R,0.068900X0.098400*%
-%ADD67R,0.086600X0.023600*%
+%ADD67C,0.067000*%
-%ADD68R,0.098400X0.068900*%
+%ADD68R,0.039400X0.039400*%
-%ADD69R,0.068900X0.098400*%
+%ADD69R,0.078700X0.015700*%
-%ADD70C,0.067000*%
+%ADD70R,0.055100X0.098400*%
-%ADD71R,0.039400X0.039400*%
+%ADD71R,0.061000X0.023600*%
-%ADD72R,0.078700X0.015700*%
+%ADD72R,0.078700X0.047200*%
-%ADD73R,0.039400X0.118100*%
+%ADD73R,0.039400X0.023600*%
-%ADD74R,0.055100X0.098400*%
+%ADD74R,0.019700X0.027600*%
 %ADD75C,0.039300*%
 %ADD76C,0.039400*%
 %ADD77C,0.005900*%
@ -84,10 +84,10 @@ G04 APERTURE LIST*
 %ADD85C,0.008000*%
 %ADD86C,0.003500*%
 %ADD87C,0.005000*%
-%ADD88C,0.007500*%
+%ADD88C,0.040000*%
-%ADD89C,0.040000*%
+%ADD89C,0.000000*%
-%ADD90C,0.000000*%
+%ADD90C,0.002000*%
-%ADD91C,0.002000*%
+%ADD91C,0.004100*%
 %ADD92C,0.065300*%
 %ADD93R,0.039700X0.039700*%
 %ADD94R,0.051500X0.051500*%
@ -103,40 +103,40 @@ G04 APERTURE LIST*
 %ADD104R,0.098700X0.027800*%
 %ADD105C,0.157800*%
 %ADD106C,0.068000*%
-%ADD107C,0.002300*%
+%ADD107C,0.055400*%
-%ADD108R,0.069200X0.059400*%
+%ADD108C,0.002300*%
-%ADD109R,0.075100X0.067200*%
+%ADD109R,0.069200X0.059400*%
-%ADD110R,0.059400X0.055400*%
+%ADD110R,0.075100X0.067200*%
-%ADD111R,0.083000X0.047600*%
+%ADD111R,0.059400X0.055400*%
-%ADD112R,0.075100X0.083000*%
+%ADD112R,0.083000X0.047600*%
-%ADD113R,0.106600X0.067200*%
+%ADD113R,0.075100X0.083000*%
-%ADD114R,0.083000X0.051500*%
+%ADD114R,0.106600X0.067200*%
-%ADD115R,0.138100X0.102700*%
+%ADD115R,0.079000X0.035700*%
-%ADD116R,0.079000X0.035700*%
+%ADD116R,0.090900X0.094800*%
-%ADD117R,0.090900X0.094800*%
+%ADD117R,0.094800X0.094800*%
-%ADD118R,0.094800X0.094800*%
+%ADD118R,0.083000X0.041700*%
-%ADD119R,0.083000X0.041700*%
+%ADD119R,0.106600X0.110600*%
-%ADD120R,0.106600X0.110600*%
+%ADD120R,0.079100X0.047600*%
-%ADD121R,0.079100X0.047600*%
+%ADD121R,0.118400X0.098700*%
-%ADD122R,0.118400X0.098700*%
+%ADD122R,0.059400X0.079000*%
-%ADD123R,0.029800X0.047600*%
+%ADD123R,0.207400X0.223100*%
-%ADD124R,0.073100X0.085000*%
+%ADD124R,0.025100X0.047500*%
-%ADD125R,0.059400X0.079000*%
+%ADD125R,0.047500X0.025100*%
-%ADD126R,0.201100X0.201100*%
+%ADD126R,0.138100X0.075100*%
-%ADD127R,0.025100X0.047500*%
+%ADD127R,0.075100X0.138100*%
-%ADD128R,0.047500X0.025100*%
+%ADD128R,0.051500X0.043600*%
-%ADD129R,0.138100X0.075100*%
+%ADD129R,0.043600X0.106600*%
-%ADD130R,0.075100X0.138100*%
+%ADD130R,0.106600X0.043600*%
-%ADD131R,0.051500X0.043600*%
+%ADD131R,0.118400X0.088900*%
-%ADD132R,0.043600X0.106600*%
+%ADD132R,0.088900X0.118400*%
-%ADD133R,0.106600X0.043600*%
+%ADD133C,0.087000*%
-%ADD134R,0.118400X0.088900*%
+%ADD134R,0.059400X0.059400*%
-%ADD135R,0.088900X0.118400*%
+%ADD135R,0.098700X0.035700*%
-%ADD136C,0.087000*%
+%ADD136R,0.075100X0.118400*%
-%ADD137R,0.059400X0.059400*%
+%ADD137R,0.081000X0.043600*%
-%ADD138R,0.098700X0.035700*%
+%ADD138R,0.098700X0.067200*%
-%ADD139R,0.059400X0.138100*%
+%ADD139R,0.059400X0.043600*%
-%ADD140R,0.075100X0.118400*%
+%ADD140R,0.039700X0.047600*%
 G04 APERTURE END LIST*
 G54D10*
 X59197Y-39582D02*
--- a/main/Qi_AVT2-Inner_L1.pho
+++ b/main/Qi_AVT2-Inner_L1.pho
--- a/main/Qi_AVT2-Inner_L2.pho
+++ b/main/Qi_AVT2-Inner_L2.pho
--- a/main/Qi_AVT2-Mask_Cmp.pho
+++ b/main/Qi_AVT2-Mask_Cmp.pho
@ -1,4 +1,4 @@
-G04 (Genere par PCBnew (20080825c)) le 14/10/2009-03:17:02*
+G04 (Genere par PCBnew (20080825c)) le 30/11/2009-02:48:59*
 G01*
 G70*
 G90*
@ -26,51 +26,51 @@ G04 APERTURE LIST*
 %ADD27R,0.078700X0.007800*%
 %ADD28C,0.137800*%
 %ADD29C,0.048000*%
-%ADD30C,0.011800*%
+%ADD30C,0.035400*%
-%ADD31C,0.019700*%
+%ADD31C,0.011800*%
 %ADD32C,0.019700*%
-%ADD33C,0.003900*%
+%ADD33C,0.019700*%
-%ADD34C,0.007900*%
+%ADD34C,0.003900*%
-%ADD35C,0.059100*%
+%ADD35C,0.007900*%
-%ADD36C,0.011800*%
+%ADD36C,0.059100*%
-%ADD37C,0.002500*%
+%ADD37C,0.011800*%
-%ADD38C,0.001600*%
+%ADD38C,0.002500*%
-%ADD39C,0.003200*%
+%ADD39C,0.001600*%
-%ADD40C,0.015300*%
+%ADD40C,0.003200*%
-%ADD41C,0.021000*%
+%ADD41C,0.015300*%
-%ADD42R,0.049200X0.039400*%
+%ADD42C,0.021000*%
-%ADD43R,0.055100X0.047200*%
+%ADD43R,0.049200X0.039400*%
-%ADD44R,0.039400X0.035400*%
+%ADD44R,0.055100X0.047200*%
-%ADD45R,0.063000X0.027600*%
+%ADD45R,0.039400X0.035400*%
-%ADD46R,0.055100X0.063000*%
+%ADD46R,0.063000X0.027600*%
-%ADD47R,0.086600X0.047200*%
+%ADD47R,0.055100X0.063000*%
-%ADD48R,0.063000X0.031500*%
+%ADD48R,0.086600X0.047200*%
-%ADD49R,0.118100X0.082700*%
+%ADD49R,0.059000X0.015700*%
-%ADD50R,0.059000X0.015700*%
+%ADD50R,0.070900X0.074800*%
-%ADD51R,0.070900X0.074800*%
+%ADD51R,0.074800X0.074800*%
-%ADD52R,0.074800X0.074800*%
+%ADD52R,0.063000X0.021700*%
-%ADD53R,0.063000X0.021700*%
+%ADD53R,0.086600X0.090600*%
-%ADD54R,0.086600X0.090600*%
+%ADD54R,0.059100X0.027600*%
-%ADD55R,0.059100X0.027600*%
+%ADD55R,0.098400X0.078700*%
-%ADD56R,0.098400X0.078700*%
+%ADD56R,0.039400X0.059000*%
-%ADD57R,0.009800X0.027600*%
+%ADD57R,0.187400X0.203100*%
-%ADD58R,0.053100X0.065000*%
+%ADD58R,0.005100X0.027500*%
-%ADD59R,0.039400X0.059000*%
+%ADD59R,0.027500X0.005100*%
-%ADD60R,0.181100X0.181100*%
+%ADD60R,0.118100X0.055100*%
-%ADD61R,0.005100X0.027500*%
+%ADD61R,0.055100X0.118100*%
-%ADD62R,0.027500X0.005100*%
+%ADD62R,0.031500X0.023600*%
-%ADD63R,0.118100X0.055100*%
+%ADD63R,0.023600X0.086600*%
-%ADD64R,0.055100X0.118100*%
+%ADD64R,0.086600X0.023600*%
-%ADD65R,0.031500X0.023600*%
+%ADD65R,0.098400X0.068900*%
-%ADD66R,0.023600X0.086600*%
+%ADD66R,0.068900X0.098400*%
-%ADD67R,0.086600X0.023600*%
+%ADD67C,0.067000*%
-%ADD68R,0.098400X0.068900*%
+%ADD68R,0.039400X0.039400*%
-%ADD69R,0.068900X0.098400*%
+%ADD69R,0.078700X0.015700*%
-%ADD70C,0.067000*%
+%ADD70R,0.055100X0.098400*%
-%ADD71R,0.039400X0.039400*%
+%ADD71R,0.061000X0.023600*%
-%ADD72R,0.078700X0.015700*%
+%ADD72R,0.078700X0.047200*%
-%ADD73R,0.039400X0.118100*%
+%ADD73R,0.039400X0.023600*%
-%ADD74R,0.055100X0.098400*%
+%ADD74R,0.019700X0.027600*%
 %ADD75C,0.039300*%
 %ADD76C,0.039400*%
 %ADD77C,0.005900*%
@ -84,10 +84,10 @@ G04 APERTURE LIST*
 %ADD85C,0.008000*%
 %ADD86C,0.003500*%
 %ADD87C,0.005000*%
-%ADD88C,0.007500*%
+%ADD88C,0.040000*%
-%ADD89C,0.040000*%
+%ADD89C,0.000000*%
-%ADD90C,0.000000*%
+%ADD90C,0.002000*%
-%ADD91C,0.002000*%
+%ADD91C,0.004100*%
 %ADD92C,0.065300*%
 %ADD93R,0.039700X0.039700*%
 %ADD94R,0.051500X0.051500*%
@ -103,40 +103,40 @@ G04 APERTURE LIST*
 %ADD104R,0.098700X0.027800*%
 %ADD105C,0.157800*%
 %ADD106C,0.068000*%
-%ADD107C,0.002300*%
+%ADD107C,0.055400*%
-%ADD108R,0.069200X0.059400*%
+%ADD108C,0.002300*%
-%ADD109R,0.075100X0.067200*%
+%ADD109R,0.069200X0.059400*%
-%ADD110R,0.059400X0.055400*%
+%ADD110R,0.075100X0.067200*%
-%ADD111R,0.083000X0.047600*%
+%ADD111R,0.059400X0.055400*%
-%ADD112R,0.075100X0.083000*%
+%ADD112R,0.083000X0.047600*%
-%ADD113R,0.106600X0.067200*%
+%ADD113R,0.075100X0.083000*%
-%ADD114R,0.083000X0.051500*%
+%ADD114R,0.106600X0.067200*%
-%ADD115R,0.138100X0.102700*%
+%ADD115R,0.079000X0.035700*%
-%ADD116R,0.079000X0.035700*%
+%ADD116R,0.090900X0.094800*%
-%ADD117R,0.090900X0.094800*%
+%ADD117R,0.094800X0.094800*%
-%ADD118R,0.094800X0.094800*%
+%ADD118R,0.083000X0.041700*%
-%ADD119R,0.083000X0.041700*%
+%ADD119R,0.106600X0.110600*%
-%ADD120R,0.106600X0.110600*%
+%ADD120R,0.079100X0.047600*%
-%ADD121R,0.079100X0.047600*%
+%ADD121R,0.118400X0.098700*%
-%ADD122R,0.118400X0.098700*%
+%ADD122R,0.059400X0.079000*%
-%ADD123R,0.029800X0.047600*%
+%ADD123R,0.207400X0.223100*%
-%ADD124R,0.073100X0.085000*%
+%ADD124R,0.025100X0.047500*%
-%ADD125R,0.059400X0.079000*%
+%ADD125R,0.047500X0.025100*%
-%ADD126R,0.201100X0.201100*%
+%ADD126R,0.138100X0.075100*%
-%ADD127R,0.025100X0.047500*%
+%ADD127R,0.075100X0.138100*%
-%ADD128R,0.047500X0.025100*%
+%ADD128R,0.051500X0.043600*%
-%ADD129R,0.138100X0.075100*%
+%ADD129R,0.043600X0.106600*%
-%ADD130R,0.075100X0.138100*%
+%ADD130R,0.106600X0.043600*%
-%ADD131R,0.051500X0.043600*%
+%ADD131R,0.118400X0.088900*%
-%ADD132R,0.043600X0.106600*%
+%ADD132R,0.088900X0.118400*%
-%ADD133R,0.106600X0.043600*%
+%ADD133C,0.087000*%
-%ADD134R,0.118400X0.088900*%
+%ADD134R,0.059400X0.059400*%
-%ADD135R,0.088900X0.118400*%
+%ADD135R,0.098700X0.035700*%
-%ADD136C,0.087000*%
+%ADD136R,0.075100X0.118400*%
-%ADD137R,0.059400X0.059400*%
+%ADD137R,0.081000X0.043600*%
-%ADD138R,0.098700X0.035700*%
+%ADD138R,0.098700X0.067200*%
-%ADD139R,0.059400X0.138100*%
+%ADD139R,0.059400X0.043600*%
-%ADD140R,0.075100X0.118400*%
+%ADD140R,0.039700X0.047600*%
 G04 APERTURE END LIST*
 G54D10*
 X59197Y-39582D02*
@ -821,7 +821,7 @@ X77217Y-33850D02*
 X77212Y-33890D01*
 X77212Y-33890D02*
 X77212Y-33892D01*
-G54D38*
+G54D39*
 X69696Y-45571D02*
 X69697Y-45571D01*
 X69685Y-45607D02*
@ -846,7 +846,7 @@ X70078Y-45380D02*
 X70105Y-45469D01*
 X70105Y-45469D02*
 X69895Y-45467D01*
-G54D39*
+G54D40*
 X69558Y-45116D02*
 X69571Y-45115D01*
 X69939Y-45185D02*
@ -909,7 +909,7 @@ X70086Y-45965D02*
 X70086Y-45902D01*
 X70086Y-45902D02*
 X70113Y-45929D01*
-G54D38*
+G54D39*
 X70142Y-45700D02*
 X70331Y-45795D01*
 X70331Y-45795D02*
@ -925,7 +925,7 @@ X70303Y-45767D01*
 G54D10*
 X70272Y-45729D02*
 X70146Y-45673D01*
-G54D107*
+G54D108*
 X70266Y-45755D02*
 X70070Y-45673D01*
 X70222Y-45585D02*
@ -937,7 +937,7 @@ X70074Y-45683D01*
 G54D10*
 X70276Y-45739D02*
 X70150Y-45683D01*
-G54D38*
+G54D39*
 X70316Y-45786D02*
 X70307Y-45777D01*
 X70330Y-45773D02*
@ -1002,7 +1002,7 @@ X69442Y-45269D02*
 X69456Y-45256D01*
 X69456Y-45256D02*
 X69465Y-45265D01*
-G54D107*
+G54D108*
 X69755Y-45590D02*
 X70225Y-45590D01*
 X69755Y-45680D02*
@ -1011,7 +1011,7 @@ X70073Y-45678D02*
 X69755Y-45680D01*
 X70269Y-45760D02*
 X70073Y-45678D01*
-G54D40*
+G54D41*
 X69757Y-45638D02*
 X70243Y-45640D01*
 G54D10*
@ -1019,10 +1019,10 @@ X70275Y-45734D02*
 X70149Y-45678D01*
 X69496Y-45303D02*
 X69622Y-45359D01*
-G54D40*
+G54D41*
 X70014Y-45399D02*
 X69528Y-45397D01*
-G54D107*
+G54D108*
 X69502Y-45277D02*
 X69698Y-45359D01*
 X69698Y-45359D02*
@ -1033,7 +1033,7 @@ X70016Y-45447D02*
 X69546Y-45447D01*
 X69546Y-45447D02*
 X69500Y-45277D01*
-G54D41*
+G54D42*
 X69481Y-45369D02*
 X69459Y-45457D01*
 X69459Y-45457D02*
@ -1080,8 +1080,8 @@ X76768Y-47275D03*
 G54D93*
 X61486Y-47516D03*
 X61486Y-47918D03*
-X75695Y-38533D03*
+X74239Y-39136D03*
-X75695Y-38131D03*
+X74641Y-39136D03*
 X46463Y-41722D03*
 X46463Y-41320D03*
 X45261Y-32637D03*
@ -1152,10 +1152,10 @@ X71384Y-38002D03*
 X71384Y-37600D03*
 X74455Y-36821D03*
 X74455Y-36419D03*
-X75030Y-35612D03*
+X74968Y-35713D03*
-X75030Y-35210D03*
+X74968Y-35311D03*
-X75789Y-34966D03*
+X74976Y-34833D03*
-X76191Y-34966D03*
+X74976Y-34431D03*
 G54D94*
 X51126Y-48712D03*
 X51126Y-48122D03*
@ -1182,7 +1182,7 @@ X49809Y-47811D03*
 X49021Y-47811D03*
 X75065Y-47309D03*
 X75853Y-47309D03*
-G54D108*
+G54D109*
 X68845Y-43982D03*
 X68845Y-43194D03*
 G54D95*
@ -1192,7 +1192,7 @@ X60262Y-43805D03*
 X61050Y-43805D03*
 X49809Y-47072D03*
 X49021Y-47072D03*
-G54D108*
+G54D109*
 X58648Y-47318D03*
 X58648Y-48106D03*
 X72093Y-38431D03*
@ -1202,18 +1202,18 @@ X72289Y-35084D03*
 X73077Y-35084D03*
 X72428Y-34139D03*
 X71640Y-34139D03*
-X75714Y-35557D03*
+X75718Y-34992D03*
-X76502Y-35557D03*
+X76506Y-34992D03*
-G54D109*
+G54D110*
 X46510Y-34897D03*
 X46510Y-33913D03*
 X46510Y-35881D03*
-G54D110*
+G54D111*
 X48418Y-34897D03*
 G54D96*
 X47534Y-36153D03*
 X47534Y-33641D03*
-G54D111*
+G54D112*
 X71740Y-41403D03*
 X71740Y-41836D03*
 X71740Y-42269D03*
@ -1223,35 +1223,28 @@ X71740Y-43569D03*
 X71740Y-44001D03*
 X71740Y-44433D03*
 X71740Y-44865D03*
 G54D112*
 X71936Y-39593D03*
 G54D113*
 X71936Y-39593D03*
 G54D114*
 X75716Y-39237D03*
 X75716Y-45341D03*
-G54D109*
+G54D110*
 X71936Y-45341D03*
 G54D99*
 X75872Y-44237D03*
 X75876Y-41089D03*
 G54D114*
 X69102Y-37781D03*
 X69102Y-37289D03*
 X69102Y-38273D03*
 G54D115*
 X70244Y-36127D03*
 X70244Y-39435D03*
 G54D116*
 X42363Y-37092D03*
 X42363Y-37348D03*
 X42363Y-37604D03*
 X42363Y-36836D03*
 X42363Y-36580D03*
-G54D117*
+G54D116*
 X41241Y-38668D03*
-G54D118*
+G54D117*
 X41241Y-35516D03*
 X41241Y-37564D03*
-G54D117*
+G54D116*
 X41241Y-36620D03*
 G54D100*
 X41871Y-36384D03*
@ -1259,31 +1252,31 @@ X41871Y-37800D03*
 G54D101*
 X41930Y-27744D03*
 X41930Y-26012D03*
-G54D119*
+G54D118*
 X43092Y-26878D03*
 X43092Y-27193D03*
 X43092Y-27510D03*
 X43092Y-26563D03*
 X43090Y-26248D03*
-G54D120*
+G54D119*
 X42954Y-28570D03*
 X42954Y-25186D03*
 X40789Y-25186D03*
 X40789Y-28570D03*
-G54D121*
+G54D120*
 X51764Y-39028D03*
 X51764Y-38516D03*
 G54D122*
 X49441Y-38772D03*
 G54D121*
 X49441Y-38772D03*
 G54D120*
 X49189Y-44553D03*
 X49189Y-44041D03*
-G54D122*
+G54D121*
 X46866Y-44297D03*
 G54D95*
 X44297Y-42171D03*
 X45085Y-42171D03*
-G54D108*
+G54D109*
 X43456Y-40562D03*
 X43456Y-39774D03*
 X41148Y-46462D03*
@ -1293,21 +1286,10 @@ X45898Y-39748D03*
 X46686Y-39748D03*
 X43943Y-45832D03*
 X44731Y-45832D03*
-G54D123*
+G54D122*
 X43067Y-42351D03*
 X43245Y-42351D03*
 X42889Y-42351D03*
 X43423Y-42351D03*
 X43067Y-41247D03*
 X42889Y-41247D03*
 X43245Y-41247D03*
 X43423Y-41247D03*
 G54D124*
 X43156Y-41799D03*
 G54D125*
 X41148Y-44750D03*
 X41148Y-43372D03*
-G54D126*
+G54D123*
 X55557Y-43529D03*
 G36*
 X56604Y-45848D02*
@ -1897,7 +1879,7 @@ X53209Y-42511D01*
 X53032Y-42688D01*
 X52697Y-42353D01*
 G37*
-G54D127*
+G54D124*
 X56441Y-40852D03*
 X56357Y-40852D03*
 X56273Y-40852D03*
@ -1920,7 +1902,7 @@ X54926Y-40852D03*
 X54841Y-40852D03*
 X54757Y-40852D03*
 X54673Y-40852D03*
-G54D128*
+G54D125*
 X52880Y-42643D03*
 X52880Y-42727D03*
 X52880Y-42812D03*
@ -1943,7 +1925,7 @@ X52880Y-44162D03*
 X52880Y-44246D03*
 X52880Y-44331D03*
 X52880Y-44415D03*
-G54D127*
+G54D124*
 X54673Y-46206D03*
 X54757Y-46206D03*
 X54841Y-46206D03*
@ -1966,7 +1948,7 @@ X56188Y-46206D03*
 X56273Y-46206D03*
 X56357Y-46206D03*
 X56441Y-46206D03*
-G54D128*
+G54D125*
 X58234Y-44415D03*
 X58234Y-44331D03*
 X58234Y-44246D03*
@ -2004,15 +1986,15 @@ X48224Y-47884D03*
 X47634Y-47884D03*
 X49238Y-40104D03*
 X48648Y-40104D03*
-G54D129*
+G54D126*
 X44396Y-44178D03*
 X44396Y-43234D03*
-G54D130*
+G54D127*
-X73864Y-38214D03*
+X73880Y-38000D03*
-X72920Y-38214D03*
+X72936Y-38000D03*
-X75046Y-33962D03*
+X75056Y-33528D03*
-X75990Y-33962D03*
+X76000Y-33528D03*
-G54D131*
+G54D128*
 X43983Y-28864D03*
 X44691Y-28864D03*
 X44691Y-28548D03*
@ -2047,8 +2029,8 @@ X47113Y-40458D03*
 X47703Y-40458D03*
 X61463Y-46364D03*
 X61463Y-46954D03*
-X76285Y-38627D03*
+X74848Y-37809D03*
-X76285Y-38037D03*
+X74848Y-38399D03*
 X45695Y-41285D03*
 X45695Y-41875D03*
 X45783Y-33337D03*
@ -2111,8 +2093,6 @@ X75045Y-36325D03*
 X75045Y-36915D03*
 X73864Y-36915D03*
 X73864Y-36325D03*
 X64435Y-30517D03*
 X63845Y-30517D03*
 X57211Y-47663D03*
 X57211Y-47073D03*
 X73746Y-35144D03*
@ -2125,7 +2105,7 @@ X74328Y-35739D03*
 X74328Y-35149D03*
 X49770Y-43884D03*
 X49770Y-44474D03*
-G54D132*
+G54D129*
 X60930Y-46540D03*
 X60430Y-46540D03*
 X59930Y-46540D03*
@ -2134,7 +2114,7 @@ X59430Y-48586D03*
 X59930Y-48586D03*
 X60430Y-48586D03*
 X60930Y-48586D03*
-G54D133*
+G54D130*
 X50537Y-42991D03*
 X50537Y-42491D03*
 X50537Y-41991D03*
@ -2194,15 +2174,15 @@ X73175Y-33593D03*
 X74175Y-33593D03*
 X74175Y-33968D03*
 X74175Y-34343D03*
-G54D134*
+G54D131*
 X47289Y-43086D03*
 X47289Y-41826D03*
 X44927Y-37437D03*
 X44927Y-36177D03*
-G54D135*
+G54D132*
 X48804Y-48846D03*
 X47544Y-48846D03*
-G54D134*
+G54D131*
 X43687Y-37437D03*
 X43687Y-36177D03*
 X45685Y-45872D03*
@ -2219,18 +2199,18 @@ X54671Y-47722D03*
 X58864Y-48785D03*
 X58392Y-48549D03*
 X54671Y-47250D03*
-G54D136*
+G54D133*
 X71974Y-33194D03*
 X71030Y-32840D03*
 X40971Y-33608D03*
 X40971Y-34612D03*
 X68608Y-41462D03*
 X68608Y-40635D03*
-G54D137*
+G54D134*
 X53077Y-48726D03*
 X47201Y-25281D03*
 X56443Y-29061D03*
-X75045Y-37978D03*
+X73408Y-39064D03*
 X47880Y-32604D03*
 X57272Y-36216D03*
 X71384Y-38509D03*
@ -2241,7 +2221,7 @@ X69849Y-46364D03*
 G54D93*
 X69888Y-45084D03*
 X69888Y-45950D03*
-G54D138*
+G54D135*
 X67368Y-47486D03*
 X67368Y-47171D03*
 X67368Y-46856D03*
@ -2300,16 +2280,12 @@ G54D94*
 X69052Y-42590D03*
 X70052Y-42215D03*
 X70052Y-42965D03*
 G54D139*
 X73092Y-46987D03*
 X72092Y-46987D03*
 X71092Y-46987D03*
 G54D105*
 X46463Y-30065D03*
 X69671Y-32289D03*
 G54D92*
 X41118Y-47275D03*
-G54D140*
+G54D136*
 X41422Y-32589D03*
 X42603Y-32589D03*
 X43745Y-32589D03*
@ -2327,6 +2303,41 @@ X43435Y-38076D03*
 X43435Y-39076D03*
 X43060Y-39076D03*
 X42685Y-39076D03*
-X67155Y-37480D03*
+X70584Y-39089D03*
-X66565Y-37480D03*
+X70584Y-39679D03*
 X42729Y-43532D03*
 X43319Y-43532D03*
 X42871Y-41164D03*
 X43246Y-41164D03*
 X43621Y-41164D03*
 X43621Y-42164D03*
 X43246Y-42164D03*
 X42871Y-42164D03*
 G54D137*
 X70510Y-35418D03*
 X70510Y-35798D03*
 X70510Y-36198D03*
 X70510Y-36598D03*
 X70510Y-36998D03*
 X70510Y-37378D03*
 X70510Y-37778D03*
 X70510Y-38158D03*
 G54D138*
 X69138Y-34938D03*
 X69140Y-38628D03*
 G54D139*
 X75856Y-38174D03*
 X75856Y-36993D03*
 X75856Y-36402D03*
 G54D140*
 X76131Y-38725D03*
 X76131Y-35851D03*
 X77037Y-38725D03*
 X77037Y-35851D03*
 G54D107*
 X76584Y-36697D03*
 X76584Y-37879D03*
 G54D93*
 X46713Y-45344D03*
 X47115Y-45344D03*
 M02*
--- a/main/Qi_AVT2-Mask_Cop.pho
+++ b/main/Qi_AVT2-Mask_Cop.pho
@ -1,4 +1,4 @@
-G04 (Genere par PCBnew (20080825c)) le 14/10/2009-03:17:02*
+G04 (Genere par PCBnew (20080825c)) le 30/11/2009-02:48:59*
 G01*
 G70*
 G90*
@ -26,51 +26,51 @@ G04 APERTURE LIST*
 %ADD27R,0.078700X0.007800*%
 %ADD28C,0.137800*%
 %ADD29C,0.048000*%
-%ADD30C,0.011800*%
+%ADD30C,0.035400*%
-%ADD31C,0.019700*%
+%ADD31C,0.011800*%
 %ADD32C,0.019700*%
-%ADD33C,0.003900*%
+%ADD33C,0.019700*%
-%ADD34C,0.007900*%
+%ADD34C,0.003900*%
-%ADD35C,0.059100*%
+%ADD35C,0.007900*%
-%ADD36C,0.011800*%
+%ADD36C,0.059100*%
-%ADD37C,0.002500*%
+%ADD37C,0.011800*%
-%ADD38C,0.001600*%
+%ADD38C,0.002500*%
-%ADD39C,0.003200*%
+%ADD39C,0.001600*%
-%ADD40C,0.015300*%
+%ADD40C,0.003200*%
-%ADD41C,0.021000*%
+%ADD41C,0.015300*%
-%ADD42R,0.049200X0.039400*%
+%ADD42C,0.021000*%
-%ADD43R,0.055100X0.047200*%
+%ADD43R,0.049200X0.039400*%
-%ADD44R,0.039400X0.035400*%
+%ADD44R,0.055100X0.047200*%
-%ADD45R,0.063000X0.027600*%
+%ADD45R,0.039400X0.035400*%
-%ADD46R,0.055100X0.063000*%
+%ADD46R,0.063000X0.027600*%
-%ADD47R,0.086600X0.047200*%
+%ADD47R,0.055100X0.063000*%
-%ADD48R,0.063000X0.031500*%
+%ADD48R,0.086600X0.047200*%
-%ADD49R,0.118100X0.082700*%
+%ADD49R,0.059000X0.015700*%
-%ADD50R,0.059000X0.015700*%
+%ADD50R,0.070900X0.074800*%
-%ADD51R,0.070900X0.074800*%
+%ADD51R,0.074800X0.074800*%
-%ADD52R,0.074800X0.074800*%
+%ADD52R,0.063000X0.021700*%
-%ADD53R,0.063000X0.021700*%
+%ADD53R,0.086600X0.090600*%
-%ADD54R,0.086600X0.090600*%
+%ADD54R,0.059100X0.027600*%
-%ADD55R,0.059100X0.027600*%
+%ADD55R,0.098400X0.078700*%
-%ADD56R,0.098400X0.078700*%
+%ADD56R,0.039400X0.059000*%
-%ADD57R,0.009800X0.027600*%
+%ADD57R,0.187400X0.203100*%
-%ADD58R,0.053100X0.065000*%
+%ADD58R,0.005100X0.027500*%
-%ADD59R,0.039400X0.059000*%
+%ADD59R,0.027500X0.005100*%
-%ADD60R,0.181100X0.181100*%
+%ADD60R,0.118100X0.055100*%
-%ADD61R,0.005100X0.027500*%
+%ADD61R,0.055100X0.118100*%
-%ADD62R,0.027500X0.005100*%
+%ADD62R,0.031500X0.023600*%
-%ADD63R,0.118100X0.055100*%
+%ADD63R,0.023600X0.086600*%
-%ADD64R,0.055100X0.118100*%
+%ADD64R,0.086600X0.023600*%
-%ADD65R,0.031500X0.023600*%
+%ADD65R,0.098400X0.068900*%
-%ADD66R,0.023600X0.086600*%
+%ADD66R,0.068900X0.098400*%
-%ADD67R,0.086600X0.023600*%
+%ADD67C,0.067000*%
-%ADD68R,0.098400X0.068900*%
+%ADD68R,0.039400X0.039400*%
-%ADD69R,0.068900X0.098400*%
+%ADD69R,0.078700X0.015700*%
-%ADD70C,0.067000*%
+%ADD70R,0.055100X0.098400*%
-%ADD71R,0.039400X0.039400*%
+%ADD71R,0.061000X0.023600*%
-%ADD72R,0.078700X0.015700*%
+%ADD72R,0.078700X0.047200*%
-%ADD73R,0.039400X0.118100*%
+%ADD73R,0.039400X0.023600*%
-%ADD74R,0.055100X0.098400*%
+%ADD74R,0.019700X0.027600*%
 %ADD75C,0.039300*%
 %ADD76C,0.039400*%
 %ADD77C,0.005900*%
@ -84,10 +84,10 @@ G04 APERTURE LIST*
 %ADD85C,0.008000*%
 %ADD86C,0.003500*%
 %ADD87C,0.005000*%
-%ADD88C,0.007500*%
+%ADD88C,0.040000*%
-%ADD89C,0.040000*%
+%ADD89C,0.000000*%
-%ADD90C,0.000000*%
+%ADD90C,0.002000*%
-%ADD91C,0.002000*%
+%ADD91C,0.004100*%
 %ADD92C,0.065300*%
 %ADD93R,0.039700X0.039700*%
 %ADD94R,0.051500X0.051500*%
@ -103,40 +103,40 @@ G04 APERTURE LIST*
 %ADD104R,0.098700X0.027800*%
 %ADD105C,0.157800*%
 %ADD106C,0.068000*%
-%ADD107C,0.002300*%
+%ADD107C,0.055400*%
-%ADD108R,0.069200X0.059400*%
+%ADD108C,0.002300*%
-%ADD109R,0.075100X0.067200*%
+%ADD109R,0.069200X0.059400*%
-%ADD110R,0.059400X0.055400*%
+%ADD110R,0.075100X0.067200*%
-%ADD111R,0.083000X0.047600*%
+%ADD111R,0.059400X0.055400*%
-%ADD112R,0.075100X0.083000*%
+%ADD112R,0.083000X0.047600*%
-%ADD113R,0.106600X0.067200*%
+%ADD113R,0.075100X0.083000*%
-%ADD114R,0.083000X0.051500*%
+%ADD114R,0.106600X0.067200*%
-%ADD115R,0.138100X0.102700*%
+%ADD115R,0.079000X0.035700*%
-%ADD116R,0.079000X0.035700*%
+%ADD116R,0.090900X0.094800*%
-%ADD117R,0.090900X0.094800*%
+%ADD117R,0.094800X0.094800*%
-%ADD118R,0.094800X0.094800*%
+%ADD118R,0.083000X0.041700*%
-%ADD119R,0.083000X0.041700*%
+%ADD119R,0.106600X0.110600*%
-%ADD120R,0.106600X0.110600*%
+%ADD120R,0.079100X0.047600*%
-%ADD121R,0.079100X0.047600*%
+%ADD121R,0.118400X0.098700*%
-%ADD122R,0.118400X0.098700*%
+%ADD122R,0.059400X0.079000*%
-%ADD123R,0.029800X0.047600*%
+%ADD123R,0.207400X0.223100*%
-%ADD124R,0.073100X0.085000*%
+%ADD124R,0.025100X0.047500*%
-%ADD125R,0.059400X0.079000*%
+%ADD125R,0.047500X0.025100*%
-%ADD126R,0.201100X0.201100*%
+%ADD126R,0.138100X0.075100*%
-%ADD127R,0.025100X0.047500*%
+%ADD127R,0.075100X0.138100*%
-%ADD128R,0.047500X0.025100*%
+%ADD128R,0.051500X0.043600*%
-%ADD129R,0.138100X0.075100*%
+%ADD129R,0.043600X0.106600*%
-%ADD130R,0.075100X0.138100*%
+%ADD130R,0.106600X0.043600*%
-%ADD131R,0.051500X0.043600*%
+%ADD131R,0.118400X0.088900*%
-%ADD132R,0.043600X0.106600*%
+%ADD132R,0.088900X0.118400*%
-%ADD133R,0.106600X0.043600*%
+%ADD133C,0.087000*%
-%ADD134R,0.118400X0.088900*%
+%ADD134R,0.059400X0.059400*%
-%ADD135R,0.088900X0.118400*%
+%ADD135R,0.098700X0.035700*%
-%ADD136C,0.087000*%
+%ADD136R,0.075100X0.118400*%
-%ADD137R,0.059400X0.059400*%
+%ADD137R,0.081000X0.043600*%
-%ADD138R,0.098700X0.035700*%
+%ADD138R,0.098700X0.067200*%
-%ADD139R,0.059400X0.138100*%
+%ADD139R,0.059400X0.043600*%
-%ADD140R,0.075100X0.118400*%
+%ADD140R,0.039700X0.047600*%
 G04 APERTURE END LIST*
 G54D10*
 X59197Y-39582D02*
@ -1192,4 +1192,7 @@ G54D103*
 X42486Y-26974D03*
 G54D93*
 X42486Y-27761D03*
 G54D107*
 X76584Y-36697D03*
 X76584Y-37879D03*
 M02*
--- a/main/Qi_AVT2-SilkS_Cmp.pho
+++ b/main/Qi_AVT2-SilkS_Cmp.pho
--- a/main/Qi_AVT2-SilkS_Cop.pho
+++ b/main/Qi_AVT2-SilkS_Cop.pho
@ -1,4 +1,4 @@
-G04 (Genere par PCBnew (20080825c)) le 14/10/2009-03:17:02*
+G04 (Genere par PCBnew (20080825c)) le 30/11/2009-02:48:59*
 G01*
 G70*
 G90*
@ -26,51 +26,51 @@ G04 APERTURE LIST*
 %ADD27R,0.078700X0.007800*%
 %ADD28C,0.137800*%
 %ADD29C,0.048000*%
-%ADD30C,0.011800*%
+%ADD30C,0.035400*%
-%ADD31C,0.019700*%
+%ADD31C,0.011800*%
 %ADD32C,0.019700*%
-%ADD33C,0.003900*%
+%ADD33C,0.019700*%
-%ADD34C,0.007900*%
+%ADD34C,0.003900*%
-%ADD35C,0.059100*%
+%ADD35C,0.007900*%
-%ADD36C,0.011800*%
+%ADD36C,0.059100*%
-%ADD37C,0.002500*%
+%ADD37C,0.011800*%
-%ADD38C,0.001600*%
+%ADD38C,0.002500*%
-%ADD39C,0.003200*%
+%ADD39C,0.001600*%
-%ADD40C,0.015300*%
+%ADD40C,0.003200*%
-%ADD41C,0.021000*%
+%ADD41C,0.015300*%
-%ADD42R,0.049200X0.039400*%
+%ADD42C,0.021000*%
-%ADD43R,0.055100X0.047200*%
+%ADD43R,0.049200X0.039400*%
-%ADD44R,0.039400X0.035400*%
+%ADD44R,0.055100X0.047200*%
-%ADD45R,0.063000X0.027600*%
+%ADD45R,0.039400X0.035400*%
-%ADD46R,0.055100X0.063000*%
+%ADD46R,0.063000X0.027600*%
-%ADD47R,0.086600X0.047200*%
+%ADD47R,0.055100X0.063000*%
-%ADD48R,0.063000X0.031500*%
+%ADD48R,0.086600X0.047200*%
-%ADD49R,0.118100X0.082700*%
+%ADD49R,0.059000X0.015700*%
-%ADD50R,0.059000X0.015700*%
+%ADD50R,0.070900X0.074800*%
-%ADD51R,0.070900X0.074800*%
+%ADD51R,0.074800X0.074800*%
-%ADD52R,0.074800X0.074800*%
+%ADD52R,0.063000X0.021700*%
-%ADD53R,0.063000X0.021700*%
+%ADD53R,0.086600X0.090600*%
-%ADD54R,0.086600X0.090600*%
+%ADD54R,0.059100X0.027600*%
-%ADD55R,0.059100X0.027600*%
+%ADD55R,0.098400X0.078700*%
-%ADD56R,0.098400X0.078700*%
+%ADD56R,0.039400X0.059000*%
-%ADD57R,0.009800X0.027600*%
+%ADD57R,0.187400X0.203100*%
-%ADD58R,0.053100X0.065000*%
+%ADD58R,0.005100X0.027500*%
-%ADD59R,0.039400X0.059000*%
+%ADD59R,0.027500X0.005100*%
-%ADD60R,0.181100X0.181100*%
+%ADD60R,0.118100X0.055100*%
-%ADD61R,0.005100X0.027500*%
+%ADD61R,0.055100X0.118100*%
-%ADD62R,0.027500X0.005100*%
+%ADD62R,0.031500X0.023600*%
-%ADD63R,0.118100X0.055100*%
+%ADD63R,0.023600X0.086600*%
-%ADD64R,0.055100X0.118100*%
+%ADD64R,0.086600X0.023600*%
-%ADD65R,0.031500X0.023600*%
+%ADD65R,0.098400X0.068900*%
-%ADD66R,0.023600X0.086600*%
+%ADD66R,0.068900X0.098400*%
-%ADD67R,0.086600X0.023600*%
+%ADD67C,0.067000*%
-%ADD68R,0.098400X0.068900*%
+%ADD68R,0.039400X0.039400*%
-%ADD69R,0.068900X0.098400*%
+%ADD69R,0.078700X0.015700*%
-%ADD70C,0.067000*%
+%ADD70R,0.055100X0.098400*%
-%ADD71R,0.039400X0.039400*%
+%ADD71R,0.061000X0.023600*%
-%ADD72R,0.078700X0.015700*%
+%ADD72R,0.078700X0.047200*%
-%ADD73R,0.039400X0.118100*%
+%ADD73R,0.039400X0.023600*%
-%ADD74R,0.055100X0.098400*%
+%ADD74R,0.019700X0.027600*%
 %ADD75C,0.039300*%
 %ADD76C,0.039400*%
 %ADD77C,0.005900*%
@ -84,10 +84,10 @@ G04 APERTURE LIST*
 %ADD85C,0.008000*%
 %ADD86C,0.003500*%
 %ADD87C,0.005000*%
-%ADD88C,0.007500*%
+%ADD88C,0.040000*%
-%ADD89C,0.040000*%
+%ADD89C,0.000000*%
-%ADD90C,0.000000*%
+%ADD90C,0.002000*%
-%ADD91C,0.002000*%
+%ADD91C,0.004100*%
 %ADD92C,0.065300*%
 %ADD93R,0.039700X0.039700*%
 %ADD94R,0.051500X0.051500*%
@ -103,40 +103,40 @@ G04 APERTURE LIST*
 %ADD104R,0.098700X0.027800*%
 %ADD105C,0.157800*%
 %ADD106C,0.068000*%
-%ADD107C,0.002300*%
+%ADD107C,0.055400*%
-%ADD108R,0.069200X0.059400*%
+%ADD108C,0.002300*%
-%ADD109R,0.075100X0.067200*%
+%ADD109R,0.069200X0.059400*%
-%ADD110R,0.059400X0.055400*%
+%ADD110R,0.075100X0.067200*%
-%ADD111R,0.083000X0.047600*%
+%ADD111R,0.059400X0.055400*%
-%ADD112R,0.075100X0.083000*%
+%ADD112R,0.083000X0.047600*%
-%ADD113R,0.106600X0.067200*%
+%ADD113R,0.075100X0.083000*%
-%ADD114R,0.083000X0.051500*%
+%ADD114R,0.106600X0.067200*%
-%ADD115R,0.138100X0.102700*%
+%ADD115R,0.079000X0.035700*%
-%ADD116R,0.079000X0.035700*%
+%ADD116R,0.090900X0.094800*%
-%ADD117R,0.090900X0.094800*%
+%ADD117R,0.094800X0.094800*%
-%ADD118R,0.094800X0.094800*%
+%ADD118R,0.083000X0.041700*%
-%ADD119R,0.083000X0.041700*%
+%ADD119R,0.106600X0.110600*%
-%ADD120R,0.106600X0.110600*%
+%ADD120R,0.079100X0.047600*%
-%ADD121R,0.079100X0.047600*%
+%ADD121R,0.118400X0.098700*%
-%ADD122R,0.118400X0.098700*%
+%ADD122R,0.059400X0.079000*%
-%ADD123R,0.029800X0.047600*%
+%ADD123R,0.207400X0.223100*%
-%ADD124R,0.073100X0.085000*%
+%ADD124R,0.025100X0.047500*%
-%ADD125R,0.059400X0.079000*%
+%ADD125R,0.047500X0.025100*%
-%ADD126R,0.201100X0.201100*%
+%ADD126R,0.138100X0.075100*%
-%ADD127R,0.025100X0.047500*%
+%ADD127R,0.075100X0.138100*%
-%ADD128R,0.047500X0.025100*%
+%ADD128R,0.051500X0.043600*%
-%ADD129R,0.138100X0.075100*%
+%ADD129R,0.043600X0.106600*%
-%ADD130R,0.075100X0.138100*%
+%ADD130R,0.106600X0.043600*%
-%ADD131R,0.051500X0.043600*%
+%ADD131R,0.118400X0.088900*%
-%ADD132R,0.043600X0.106600*%
+%ADD132R,0.088900X0.118400*%
-%ADD133R,0.106600X0.043600*%
+%ADD133C,0.087000*%
-%ADD134R,0.118400X0.088900*%
+%ADD134R,0.059400X0.059400*%
-%ADD135R,0.088900X0.118400*%
+%ADD135R,0.098700X0.035700*%
-%ADD136C,0.087000*%
+%ADD136R,0.075100X0.118400*%
-%ADD137R,0.059400X0.059400*%
+%ADD137R,0.081000X0.043600*%
-%ADD138R,0.098700X0.035700*%
+%ADD138R,0.098700X0.067200*%
-%ADD139R,0.059400X0.138100*%
+%ADD139R,0.059400X0.043600*%
-%ADD140R,0.075100X0.118400*%
+%ADD140R,0.039700X0.047600*%
 G04 APERTURE END LIST*
 G54D10*
 X59197Y-39582D02*
--- a/main/Qi_AVT2-SoldP_Cmp.pho
+++ b/main/Qi_AVT2-SoldP_Cmp.pho
@ -1,4 +1,4 @@
-G04 (Genere par PCBnew (20080825c)) le 14/10/2009-03:17:02*
+G04 (Genere par PCBnew (20080825c)) le 30/11/2009-02:48:59*
 G01*
 G70*
 G90*
@ -26,51 +26,51 @@ G04 APERTURE LIST*
 %ADD27R,0.078700X0.007800*%
 %ADD28C,0.137800*%
 %ADD29C,0.048000*%
-%ADD30C,0.011800*%
+%ADD30C,0.035400*%
-%ADD31C,0.019700*%
+%ADD31C,0.011800*%
 %ADD32C,0.019700*%
-%ADD33C,0.003900*%
+%ADD33C,0.019700*%
-%ADD34C,0.007900*%
+%ADD34C,0.003900*%
-%ADD35C,0.059100*%
+%ADD35C,0.007900*%
-%ADD36C,0.011800*%
+%ADD36C,0.059100*%
-%ADD37C,0.002500*%
+%ADD37C,0.011800*%
-%ADD38C,0.001600*%
+%ADD38C,0.002500*%
-%ADD39C,0.003200*%
+%ADD39C,0.001600*%
-%ADD40C,0.015300*%
+%ADD40C,0.003200*%
-%ADD41C,0.021000*%
+%ADD41C,0.015300*%
-%ADD42R,0.049200X0.039400*%
+%ADD42C,0.021000*%
-%ADD43R,0.055100X0.047200*%
+%ADD43R,0.049200X0.039400*%
-%ADD44R,0.039400X0.035400*%
+%ADD44R,0.055100X0.047200*%
-%ADD45R,0.063000X0.027600*%
+%ADD45R,0.039400X0.035400*%
-%ADD46R,0.055100X0.063000*%
+%ADD46R,0.063000X0.027600*%
-%ADD47R,0.086600X0.047200*%
+%ADD47R,0.055100X0.063000*%
-%ADD48R,0.063000X0.031500*%
+%ADD48R,0.086600X0.047200*%
-%ADD49R,0.118100X0.082700*%
+%ADD49R,0.059000X0.015700*%
-%ADD50R,0.059000X0.015700*%
+%ADD50R,0.070900X0.074800*%
-%ADD51R,0.070900X0.074800*%
+%ADD51R,0.074800X0.074800*%
-%ADD52R,0.074800X0.074800*%
+%ADD52R,0.063000X0.021700*%
-%ADD53R,0.063000X0.021700*%
+%ADD53R,0.086600X0.090600*%
-%ADD54R,0.086600X0.090600*%
+%ADD54R,0.059100X0.027600*%
-%ADD55R,0.059100X0.027600*%
+%ADD55R,0.098400X0.078700*%
-%ADD56R,0.098400X0.078700*%
+%ADD56R,0.039400X0.059000*%
-%ADD57R,0.009800X0.027600*%
+%ADD57R,0.187400X0.203100*%
-%ADD58R,0.053100X0.065000*%
+%ADD58R,0.005100X0.027500*%
-%ADD59R,0.039400X0.059000*%
+%ADD59R,0.027500X0.005100*%
-%ADD60R,0.181100X0.181100*%
+%ADD60R,0.118100X0.055100*%
-%ADD61R,0.005100X0.027500*%
+%ADD61R,0.055100X0.118100*%
-%ADD62R,0.027500X0.005100*%
+%ADD62R,0.031500X0.023600*%
-%ADD63R,0.118100X0.055100*%
+%ADD63R,0.023600X0.086600*%
-%ADD64R,0.055100X0.118100*%
+%ADD64R,0.086600X0.023600*%
-%ADD65R,0.031500X0.023600*%
+%ADD65R,0.098400X0.068900*%
-%ADD66R,0.023600X0.086600*%
+%ADD66R,0.068900X0.098400*%
-%ADD67R,0.086600X0.023600*%
+%ADD67C,0.067000*%
-%ADD68R,0.098400X0.068900*%
+%ADD68R,0.039400X0.039400*%
-%ADD69R,0.068900X0.098400*%
+%ADD69R,0.078700X0.015700*%
-%ADD70C,0.067000*%
+%ADD70R,0.055100X0.098400*%
-%ADD71R,0.039400X0.039400*%
+%ADD71R,0.061000X0.023600*%
-%ADD72R,0.078700X0.015700*%
+%ADD72R,0.078700X0.047200*%
-%ADD73R,0.039400X0.118100*%
+%ADD73R,0.039400X0.023600*%
-%ADD74R,0.055100X0.098400*%
+%ADD74R,0.019700X0.027600*%
 %ADD75C,0.039300*%
 %ADD76C,0.039400*%
 %ADD77C,0.005900*%
@ -84,10 +84,10 @@ G04 APERTURE LIST*
 %ADD85C,0.008000*%
 %ADD86C,0.003500*%
 %ADD87C,0.005000*%
-%ADD88C,0.007500*%
+%ADD88C,0.040000*%
-%ADD89C,0.040000*%
+%ADD89C,0.000000*%
-%ADD90C,0.000000*%
+%ADD90C,0.002000*%
-%ADD91C,0.002000*%
+%ADD91C,0.004100*%
 %ADD92C,0.065300*%
 %ADD93R,0.039700X0.039700*%
 %ADD94R,0.051500X0.051500*%
@ -103,40 +103,40 @@ G04 APERTURE LIST*
 %ADD104R,0.098700X0.027800*%
 %ADD105C,0.157800*%
 %ADD106C,0.068000*%
-%ADD107C,0.002300*%
+%ADD107C,0.055400*%
-%ADD108R,0.069200X0.059400*%
+%ADD108C,0.002300*%
-%ADD109R,0.075100X0.067200*%
+%ADD109R,0.069200X0.059400*%
-%ADD110R,0.059400X0.055400*%
+%ADD110R,0.075100X0.067200*%
-%ADD111R,0.083000X0.047600*%
+%ADD111R,0.059400X0.055400*%
-%ADD112R,0.075100X0.083000*%
+%ADD112R,0.083000X0.047600*%
-%ADD113R,0.106600X0.067200*%
+%ADD113R,0.075100X0.083000*%
-%ADD114R,0.083000X0.051500*%
+%ADD114R,0.106600X0.067200*%
-%ADD115R,0.138100X0.102700*%
+%ADD115R,0.079000X0.035700*%
-%ADD116R,0.079000X0.035700*%
+%ADD116R,0.090900X0.094800*%
-%ADD117R,0.090900X0.094800*%
+%ADD117R,0.094800X0.094800*%
-%ADD118R,0.094800X0.094800*%
+%ADD118R,0.083000X0.041700*%
-%ADD119R,0.083000X0.041700*%
+%ADD119R,0.106600X0.110600*%
-%ADD120R,0.106600X0.110600*%
+%ADD120R,0.079100X0.047600*%
-%ADD121R,0.079100X0.047600*%
+%ADD121R,0.118400X0.098700*%
-%ADD122R,0.118400X0.098700*%
+%ADD122R,0.059400X0.079000*%
-%ADD123R,0.029800X0.047600*%
+%ADD123R,0.207400X0.223100*%
-%ADD124R,0.073100X0.085000*%
+%ADD124R,0.025100X0.047500*%
-%ADD125R,0.059400X0.079000*%
+%ADD125R,0.047500X0.025100*%
-%ADD126R,0.201100X0.201100*%
+%ADD126R,0.138100X0.075100*%
-%ADD127R,0.025100X0.047500*%
+%ADD127R,0.075100X0.138100*%
-%ADD128R,0.047500X0.025100*%
+%ADD128R,0.051500X0.043600*%
-%ADD129R,0.138100X0.075100*%
+%ADD129R,0.043600X0.106600*%
-%ADD130R,0.075100X0.138100*%
+%ADD130R,0.106600X0.043600*%
-%ADD131R,0.051500X0.043600*%
+%ADD131R,0.118400X0.088900*%
-%ADD132R,0.043600X0.106600*%
+%ADD132R,0.088900X0.118400*%
-%ADD133R,0.106600X0.043600*%
+%ADD133C,0.087000*%
-%ADD134R,0.118400X0.088900*%
+%ADD134R,0.059400X0.059400*%
-%ADD135R,0.088900X0.118400*%
+%ADD135R,0.098700X0.035700*%
-%ADD136C,0.087000*%
+%ADD136R,0.075100X0.118400*%
-%ADD137R,0.059400X0.059400*%
+%ADD137R,0.081000X0.043600*%
-%ADD138R,0.098700X0.035700*%
+%ADD138R,0.098700X0.067200*%
-%ADD139R,0.059400X0.138100*%
+%ADD139R,0.059400X0.043600*%
-%ADD140R,0.075100X0.118400*%
+%ADD140R,0.039700X0.047600*%
 G04 APERTURE END LIST*
 G54D10*
 X59197Y-39582D02*
@ -821,7 +821,7 @@ X77217Y-33850D02*
 X77212Y-33890D01*
 X77212Y-33890D02*
 X77212Y-33892D01*
-G54D38*
+G54D39*
 X69696Y-45571D02*
 X69697Y-45571D01*
 X69685Y-45607D02*
@ -846,7 +846,7 @@ X70078Y-45380D02*
 X70105Y-45469D01*
 X70105Y-45469D02*
 X69895Y-45467D01*
-G54D39*
+G54D40*
 X69558Y-45116D02*
 X69571Y-45115D01*
 X69939Y-45185D02*
@ -909,7 +909,7 @@ X70086Y-45965D02*
 X70086Y-45902D01*
 X70086Y-45902D02*
 X70113Y-45929D01*
-G54D38*
+G54D39*
 X70142Y-45700D02*
 X70331Y-45795D01*
 X70331Y-45795D02*
@ -937,7 +937,7 @@ X70074Y-45683D01*
 G54D10*
 X70276Y-45739D02*
 X70150Y-45683D01*
-G54D38*
+G54D39*
 X70316Y-45786D02*
 X70307Y-45777D01*
 X70330Y-45773D02*
@ -1011,7 +1011,7 @@ X70073Y-45678D02*
 X69755Y-45680D01*
 X70269Y-45760D02*
 X70073Y-45678D01*
-G54D40*
+G54D41*
 X69757Y-45638D02*
 X70243Y-45640D01*
 G54D10*
@ -1019,7 +1019,7 @@ X70275Y-45734D02*
 X70149Y-45678D01*
 X69496Y-45303D02*
 X69622Y-45359D01*
-G54D40*
+G54D41*
 X70014Y-45399D02*
 X69528Y-45397D01*
 G54D81*
@ -1033,7 +1033,7 @@ X70016Y-45447D02*
 X69546Y-45447D01*
 X69546Y-45447D02*
 X69500Y-45277D01*
-G54D41*
+G54D42*
 X69481Y-45369D02*
 X69459Y-45457D01*
 X69459Y-45457D02*
@ -1077,8 +1077,8 @@ X69888Y-45084D01*
 G54D16*
 X61486Y-47516D03*
 X61486Y-47918D03*
-X75695Y-38533D03*
+X74239Y-39136D03*
-X75695Y-38131D03*
+X74641Y-39136D03*
 X46463Y-41722D03*
 X46463Y-41320D03*
 X45261Y-32637D03*
@ -1149,10 +1149,10 @@ X71384Y-38002D03*
 X71384Y-37600D03*
 X74455Y-36821D03*
 X74455Y-36419D03*
-X75030Y-35612D03*
+X74968Y-35713D03*
-X75030Y-35210D03*
+X74968Y-35311D03*
-X75789Y-34966D03*
+X74976Y-34833D03*
-X76191Y-34966D03*
+X74976Y-34431D03*
 G54D17*
 X51126Y-48712D03*
 X51126Y-48122D03*
@ -1179,7 +1179,7 @@ X49809Y-47811D03*
 X49021Y-47811D03*
 X75065Y-47309D03*
 X75853Y-47309D03*
-G54D42*
+G54D43*
 X68845Y-43982D03*
 X68845Y-43194D03*
 G54D18*
@ -1189,7 +1189,7 @@ X60262Y-43805D03*
 X61050Y-43805D03*
 X49809Y-47072D03*
 X49021Y-47072D03*
-G54D42*
+G54D43*
 X58648Y-47318D03*
 X58648Y-48106D03*
 X72093Y-38431D03*
@ -1199,15 +1199,15 @@ X72289Y-35084D03*
 X73077Y-35084D03*
 X72428Y-34139D03*
 X71640Y-34139D03*
-X75714Y-35557D03*
+X75718Y-34992D03*
-X76502Y-35557D03*
+X76506Y-34992D03*
-G54D43*
+G54D44*
 X46510Y-34897D03*
 X46510Y-33913D03*
 X46510Y-35881D03*
 G54D44*
 X48418Y-34897D03*
 G54D45*
 X48418Y-34897D03*
 G54D46*
 X71740Y-41403D03*
 X71740Y-41836D03*
 X71740Y-42269D03*
@ -1217,58 +1217,51 @@ X71740Y-43569D03*
 X71740Y-44001D03*
 X71740Y-44433D03*
 X71740Y-44865D03*
 G54D46*
 X71936Y-39593D03*
 G54D47*
 X71936Y-39593D03*
 G54D48*
 X75716Y-39237D03*
 X75716Y-45341D03*
-G54D43*
+G54D44*
 X71936Y-45341D03*
 G54D48*
 X69102Y-37781D03*
 X69102Y-37289D03*
 X69102Y-38273D03*
 G54D49*
 X70244Y-36127D03*
 X70244Y-39435D03*
 G54D50*
 X42363Y-37092D03*
 X42363Y-37348D03*
 X42363Y-37604D03*
 X42363Y-36836D03*
 X42363Y-36580D03*
-G54D51*
+G54D50*
 X41241Y-38668D03*
-G54D52*
+G54D51*
 X41241Y-35516D03*
 X41241Y-37564D03*
-G54D51*
+G54D50*
 X41241Y-36620D03*
-G54D53*
+G54D52*
 X43092Y-26878D03*
 X43092Y-27193D03*
 X43092Y-27510D03*
 X43092Y-26563D03*
 X43090Y-26248D03*
-G54D54*
+G54D53*
 X42954Y-28570D03*
 X42954Y-25186D03*
 X40789Y-25186D03*
 X40789Y-28570D03*
-G54D55*
+G54D54*
 X51764Y-39028D03*
 X51764Y-38516D03*
 G54D56*
 X49441Y-38772D03*
 G54D55*
 X49441Y-38772D03*
 G54D54*
 X49189Y-44553D03*
 X49189Y-44041D03*
-G54D56*
+G54D55*
 X46866Y-44297D03*
 G54D18*
 X44297Y-42171D03*
 X45085Y-42171D03*
-G54D42*
+G54D43*
 X43456Y-40562D03*
 X43456Y-39774D03*
 X41148Y-46462D03*
@ -1278,21 +1271,10 @@ X45898Y-39748D03*
 X46686Y-39748D03*
 X43943Y-45832D03*
 X44731Y-45832D03*
-G54D57*
+G54D56*
 X43067Y-42351D03*
 X43245Y-42351D03*
 X42889Y-42351D03*
 X43423Y-42351D03*
 X43067Y-41247D03*
 X42889Y-41247D03*
 X43245Y-41247D03*
 X43423Y-41247D03*
 G54D58*
 X43156Y-41799D03*
 G54D59*
 X41148Y-44750D03*
 X41148Y-43372D03*
-G54D60*
+G54D57*
 X55557Y-43529D03*
 G36*
 X56604Y-45989D02*
@ -1882,7 +1864,7 @@ X53068Y-42511D01*
 X53032Y-42547D01*
 X52838Y-42353D01*
 G37*
-G54D61*
+G54D58*
 X56441Y-40852D03*
 X56357Y-40852D03*
 X56273Y-40852D03*
@ -1905,7 +1887,7 @@ X54926Y-40852D03*
 X54841Y-40852D03*
 X54757Y-40852D03*
 X54673Y-40852D03*
-G54D62*
+G54D59*
 X52880Y-42643D03*
 X52880Y-42727D03*
 X52880Y-42812D03*
@ -1928,7 +1910,7 @@ X52880Y-44162D03*
 X52880Y-44246D03*
 X52880Y-44331D03*
 X52880Y-44415D03*
-G54D61*
+G54D58*
 X54673Y-46206D03*
 X54757Y-46206D03*
 X54841Y-46206D03*
@ -1951,7 +1933,7 @@ X56188Y-46206D03*
 X56273Y-46206D03*
 X56357Y-46206D03*
 X56441Y-46206D03*
-G54D62*
+G54D59*
 X58234Y-44415D03*
 X58234Y-44331D03*
 X58234Y-44246D03*
@ -1989,15 +1971,15 @@ X48224Y-47884D03*
 X47634Y-47884D03*
 X49238Y-40104D03*
 X48648Y-40104D03*
-G54D63*
+G54D60*
 X44396Y-44178D03*
 X44396Y-43234D03*
-G54D64*
+G54D61*
-X73864Y-38214D03*
+X73880Y-38000D03*
-X72920Y-38214D03*
+X72936Y-38000D03*
-X75046Y-33962D03*
+X75056Y-33528D03*
-X75990Y-33962D03*
+X76000Y-33528D03*
-G54D65*
+G54D62*
 X43983Y-28864D03*
 X44691Y-28864D03*
 X44691Y-28548D03*
@ -2032,8 +2014,8 @@ X47113Y-40458D03*
 X47703Y-40458D03*
 X61463Y-46364D03*
 X61463Y-46954D03*
-X76285Y-38627D03*
+X74848Y-37809D03*
-X76285Y-38037D03*
+X74848Y-38399D03*
 X45695Y-41285D03*
 X45695Y-41875D03*
 X45783Y-33337D03*
@ -2096,8 +2078,6 @@ X75045Y-36325D03*
 X75045Y-36915D03*
 X73864Y-36915D03*
 X73864Y-36325D03*
 X64435Y-30517D03*
 X63845Y-30517D03*
 X57211Y-47663D03*
 X57211Y-47073D03*
 X73746Y-35144D03*
@ -2110,7 +2090,7 @@ X74328Y-35739D03*
 X74328Y-35149D03*
 X49770Y-43884D03*
 X49770Y-44474D03*
-G54D66*
+G54D63*
 X60930Y-46540D03*
 X60430Y-46540D03*
 X59930Y-46540D03*
@ -2119,7 +2099,7 @@ X59430Y-48586D03*
 X59930Y-48586D03*
 X60430Y-48586D03*
 X60930Y-48586D03*
-G54D67*
+G54D64*
 X50537Y-42991D03*
 X50537Y-42491D03*
 X50537Y-41991D03*
@ -2179,15 +2159,15 @@ X73175Y-33593D03*
 X74175Y-33593D03*
 X74175Y-33968D03*
 X74175Y-34343D03*
-G54D68*
+G54D65*
 X47289Y-43086D03*
 X47289Y-41826D03*
 X44927Y-37437D03*
 X44927Y-36177D03*
-G54D69*
+G54D66*
 X48804Y-48846D03*
 X47544Y-48846D03*
-G54D68*
+G54D65*
 X43687Y-37437D03*
 X43687Y-36177D03*
 X45685Y-45872D03*
@ -2204,18 +2184,18 @@ X54671Y-47722D03*
 X58864Y-48785D03*
 X58392Y-48549D03*
 X54671Y-47250D03*
-G54D70*
+G54D67*
 X71974Y-33194D03*
 X71030Y-32840D03*
 X40971Y-33608D03*
 X40971Y-34612D03*
 X68608Y-41462D03*
 X68608Y-40635D03*
-G54D71*
+G54D68*
 X53077Y-48726D03*
 X47201Y-25281D03*
 X56443Y-29061D03*
-X75045Y-37978D03*
+X73408Y-39064D03*
 X47880Y-32604D03*
 X57272Y-36216D03*
 X71384Y-38509D03*
@ -2226,7 +2206,7 @@ X69849Y-46364D03*
 G54D16*
 X69888Y-45084D03*
 X69888Y-45950D03*
-G54D72*
+G54D69*
 X67368Y-47486D03*
 X67368Y-47171D03*
 X67368Y-46856D03*
@ -2285,11 +2265,7 @@ G54D17*
 X69052Y-42590D03*
 X70052Y-42215D03*
 X70052Y-42965D03*
-G54D73*
+G54D70*
 X73092Y-46987D03*
 X72092Y-46987D03*
 X71092Y-46987D03*
 G54D74*
 X41422Y-32589D03*
 X42603Y-32589D03*
 X43745Y-32589D03*
@ -2304,6 +2280,38 @@ X43435Y-38076D03*
 X43435Y-39076D03*
 X43060Y-39076D03*
 X42685Y-39076D03*
-X67155Y-37480D03*
+X70584Y-39089D03*
-X66565Y-37480D03*
+X70584Y-39679D03*
 X42729Y-43532D03*
 X43319Y-43532D03*
 X42871Y-41164D03*
 X43246Y-41164D03*
 X43621Y-41164D03*
 X43621Y-42164D03*
 X43246Y-42164D03*
 X42871Y-42164D03*
 G54D71*
 X70510Y-35418D03*
 X70510Y-35798D03*
 X70510Y-36198D03*
 X70510Y-36598D03*
 X70510Y-36998D03*
 X70510Y-37378D03*
 X70510Y-37778D03*
 X70510Y-38158D03*
 G54D72*
 X69138Y-34938D03*
 X69140Y-38628D03*
 G54D73*
 X75856Y-38174D03*
 X75856Y-36993D03*
 X75856Y-36402D03*
 G54D74*
 X76131Y-38725D03*
 X76131Y-35851D03*
 X77037Y-38725D03*
 X77037Y-35851D03*
 G54D16*
 X46713Y-45344D03*
 X47115Y-45344D03*
 M02*
--- a/main/Qi_AVT2-SoldP_Cop.pho
+++ b/main/Qi_AVT2-SoldP_Cop.pho
@ -1,4 +1,4 @@
-G04 (Genere par PCBnew (20080825c)) le 14/10/2009-03:17:02*
+G04 (Genere par PCBnew (20080825c)) le 30/11/2009-02:48:59*
 G01*
 G70*
 G90*
@ -26,51 +26,51 @@ G04 APERTURE LIST*
 %ADD27R,0.078700X0.007800*%
 %ADD28C,0.137800*%
 %ADD29C,0.048000*%
-%ADD30C,0.011800*%
+%ADD30C,0.035400*%
-%ADD31C,0.019700*%
+%ADD31C,0.011800*%
 %ADD32C,0.019700*%
-%ADD33C,0.003900*%
+%ADD33C,0.019700*%
-%ADD34C,0.007900*%
+%ADD34C,0.003900*%
-%ADD35C,0.059100*%
+%ADD35C,0.007900*%
-%ADD36C,0.011800*%
+%ADD36C,0.059100*%
-%ADD37C,0.002500*%
+%ADD37C,0.011800*%
-%ADD38C,0.001600*%
+%ADD38C,0.002500*%
-%ADD39C,0.003200*%
+%ADD39C,0.001600*%
-%ADD40C,0.015300*%
+%ADD40C,0.003200*%
-%ADD41C,0.021000*%
+%ADD41C,0.015300*%
-%ADD42R,0.049200X0.039400*%
+%ADD42C,0.021000*%
-%ADD43R,0.055100X0.047200*%
+%ADD43R,0.049200X0.039400*%
-%ADD44R,0.039400X0.035400*%
+%ADD44R,0.055100X0.047200*%
-%ADD45R,0.063000X0.027600*%
+%ADD45R,0.039400X0.035400*%
-%ADD46R,0.055100X0.063000*%
+%ADD46R,0.063000X0.027600*%
-%ADD47R,0.086600X0.047200*%
+%ADD47R,0.055100X0.063000*%
-%ADD48R,0.063000X0.031500*%
+%ADD48R,0.086600X0.047200*%
-%ADD49R,0.118100X0.082700*%
+%ADD49R,0.059000X0.015700*%
-%ADD50R,0.059000X0.015700*%
+%ADD50R,0.070900X0.074800*%
-%ADD51R,0.070900X0.074800*%
+%ADD51R,0.074800X0.074800*%
-%ADD52R,0.074800X0.074800*%
+%ADD52R,0.063000X0.021700*%
-%ADD53R,0.063000X0.021700*%
+%ADD53R,0.086600X0.090600*%
-%ADD54R,0.086600X0.090600*%
+%ADD54R,0.059100X0.027600*%
-%ADD55R,0.059100X0.027600*%
+%ADD55R,0.098400X0.078700*%
-%ADD56R,0.098400X0.078700*%
+%ADD56R,0.039400X0.059000*%
-%ADD57R,0.009800X0.027600*%
+%ADD57R,0.187400X0.203100*%
-%ADD58R,0.053100X0.065000*%
+%ADD58R,0.005100X0.027500*%
-%ADD59R,0.039400X0.059000*%
+%ADD59R,0.027500X0.005100*%
-%ADD60R,0.181100X0.181100*%
+%ADD60R,0.118100X0.055100*%
-%ADD61R,0.005100X0.027500*%
+%ADD61R,0.055100X0.118100*%
-%ADD62R,0.027500X0.005100*%
+%ADD62R,0.031500X0.023600*%
-%ADD63R,0.118100X0.055100*%
+%ADD63R,0.023600X0.086600*%
-%ADD64R,0.055100X0.118100*%
+%ADD64R,0.086600X0.023600*%
-%ADD65R,0.031500X0.023600*%
+%ADD65R,0.098400X0.068900*%
-%ADD66R,0.023600X0.086600*%
+%ADD66R,0.068900X0.098400*%
-%ADD67R,0.086600X0.023600*%
+%ADD67C,0.067000*%
-%ADD68R,0.098400X0.068900*%
+%ADD68R,0.039400X0.039400*%
-%ADD69R,0.068900X0.098400*%
+%ADD69R,0.078700X0.015700*%
-%ADD70C,0.067000*%
+%ADD70R,0.055100X0.098400*%
-%ADD71R,0.039400X0.039400*%
+%ADD71R,0.061000X0.023600*%
-%ADD72R,0.078700X0.015700*%
+%ADD72R,0.078700X0.047200*%
-%ADD73R,0.039400X0.118100*%
+%ADD73R,0.039400X0.023600*%
-%ADD74R,0.055100X0.098400*%
+%ADD74R,0.019700X0.027600*%
 %ADD75C,0.039300*%
 %ADD76C,0.039400*%
 %ADD77C,0.005900*%
@ -84,10 +84,10 @@ G04 APERTURE LIST*
 %ADD85C,0.008000*%
 %ADD86C,0.003500*%
 %ADD87C,0.005000*%
-%ADD88C,0.007500*%
+%ADD88C,0.040000*%
-%ADD89C,0.040000*%
+%ADD89C,0.000000*%
-%ADD90C,0.000000*%
+%ADD90C,0.002000*%
-%ADD91C,0.002000*%
+%ADD91C,0.004100*%
 %ADD92C,0.065300*%
 %ADD93R,0.039700X0.039700*%
 %ADD94R,0.051500X0.051500*%
@ -103,40 +103,40 @@ G04 APERTURE LIST*
 %ADD104R,0.098700X0.027800*%
 %ADD105C,0.157800*%
 %ADD106C,0.068000*%
-%ADD107C,0.002300*%
+%ADD107C,0.055400*%
-%ADD108R,0.069200X0.059400*%
+%ADD108C,0.002300*%
-%ADD109R,0.075100X0.067200*%
+%ADD109R,0.069200X0.059400*%
-%ADD110R,0.059400X0.055400*%
+%ADD110R,0.075100X0.067200*%
-%ADD111R,0.083000X0.047600*%
+%ADD111R,0.059400X0.055400*%
-%ADD112R,0.075100X0.083000*%
+%ADD112R,0.083000X0.047600*%
-%ADD113R,0.106600X0.067200*%
+%ADD113R,0.075100X0.083000*%
-%ADD114R,0.083000X0.051500*%
+%ADD114R,0.106600X0.067200*%
-%ADD115R,0.138100X0.102700*%
+%ADD115R,0.079000X0.035700*%
-%ADD116R,0.079000X0.035700*%
+%ADD116R,0.090900X0.094800*%
-%ADD117R,0.090900X0.094800*%
+%ADD117R,0.094800X0.094800*%
-%ADD118R,0.094800X0.094800*%
+%ADD118R,0.083000X0.041700*%
-%ADD119R,0.083000X0.041700*%
+%ADD119R,0.106600X0.110600*%
-%ADD120R,0.106600X0.110600*%
+%ADD120R,0.079100X0.047600*%
-%ADD121R,0.079100X0.047600*%
+%ADD121R,0.118400X0.098700*%
-%ADD122R,0.118400X0.098700*%
+%ADD122R,0.059400X0.079000*%
-%ADD123R,0.029800X0.047600*%
+%ADD123R,0.207400X0.223100*%
-%ADD124R,0.073100X0.085000*%
+%ADD124R,0.025100X0.047500*%
-%ADD125R,0.059400X0.079000*%
+%ADD125R,0.047500X0.025100*%
-%ADD126R,0.201100X0.201100*%
+%ADD126R,0.138100X0.075100*%
-%ADD127R,0.025100X0.047500*%
+%ADD127R,0.075100X0.138100*%
-%ADD128R,0.047500X0.025100*%
+%ADD128R,0.051500X0.043600*%
-%ADD129R,0.138100X0.075100*%
+%ADD129R,0.043600X0.106600*%
-%ADD130R,0.075100X0.138100*%
+%ADD130R,0.106600X0.043600*%
-%ADD131R,0.051500X0.043600*%
+%ADD131R,0.118400X0.088900*%
-%ADD132R,0.043600X0.106600*%
+%ADD132R,0.088900X0.118400*%
-%ADD133R,0.106600X0.043600*%
+%ADD133C,0.087000*%
-%ADD134R,0.118400X0.088900*%
+%ADD134R,0.059400X0.059400*%
-%ADD135R,0.088900X0.118400*%
+%ADD135R,0.098700X0.035700*%
-%ADD136C,0.087000*%
+%ADD136R,0.075100X0.118400*%
-%ADD137R,0.059400X0.059400*%
+%ADD137R,0.081000X0.043600*%
-%ADD138R,0.098700X0.035700*%
+%ADD138R,0.098700X0.067200*%
-%ADD139R,0.059400X0.138100*%
+%ADD139R,0.059400X0.043600*%
-%ADD140R,0.075100X0.118400*%
+%ADD140R,0.039700X0.047600*%
 G04 APERTURE END LIST*
 G54D10*
 X59197Y-39582D02*
--- a/main/Qi_AVT2.000
+++ b/main/Qi_AVT2.000
--- a/main/Qi_AVT2.bak
+++ b/main/Qi_AVT2.bak
@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,/home/juan64bits/Qi/board-qi-avt2/components/kb3436,./Qi_AVT2.cache
+LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A3 16535 11700
@ -14,7 +14,18 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 Wire Wire Line
-	14650 7500 14650 7350
+	13450 6300 13450 6400
 Wire Wire Line
 	13450 6400 13600 6400
 Connection ~ 8500 2850
 Wire Wire Line
 	7900 2850 8900 2850
 Wire Wire Line
 	8900 2850 8900 2650
 Wire Wire Line
 	14650 7550 14650 7350
 Wire Wire Line
 	14650 7350 14950 7350
 Connection ~ 14500 5900
 Wire Wire Line
 	14500 5900 14500 5500
@ -80,8 +91,6 @@ Wire Notes Line
 	15850 9100 15850 8100
 Wire Notes Line
 	15850 8100 14200 8100
 Wire Wire Line
 	13450 6450 13450 6300
 Wire Wire Line
 	12450 6500 12450 6450
 Wire Wire Line
@ -187,8 +196,6 @@ Wire Wire Line
 	5300 2250 5350 2250
 Wire Wire Line
 	4900 2750 4900 2650
 Wire Wire Line
 	13450 6950 13450 7000
 Connection ~ 12450 7800
 Wire Wire Line
 	12450 7850 12250 7850
@ -312,8 +319,6 @@ Connection ~ 6700 5800
 Connection ~ 6700 4800
 Wire Wire Line
 	8150 4670 8150 4720
 Wire Wire Line
 	7900 2850 8500 2850
 Connection ~ 8500 2000
 Connection ~ 7250 1550
 Wire Wire Line
@ -697,8 +702,6 @@ Wire Wire Line
 	14450 6300 14450 6750
 Wire Wire Line
 	12350 6400 12250 6400
 Wire Wire Line
 	14650 7350 14950 7350
 Wire Wire Line
 	2500 2250 2500 2200
 Wire Wire Line
@ -733,7 +736,29 @@ Wire Wire Line
 	4900 2250 4900 1900
 Wire Wire Line
 	13950 5500 13900 5500
-Kmarq B 14650 7500 "Warning Pin power_in not driven (Net 4)" F=1
+Wire Wire Line
 	8900 2250 8900 2100
 Wire Wire Line
 	8900 2100 8500 2100
 Connection ~ 8500 2100
 $Comp
 L C C74
 U 1 1 4B132AB9
 P 8900 2450
 F 0 "C74" V 8700 2450 50  0000 L C
 F 1 "0.1uF/16V" V 9050 2400 50  0000 L C
 	1    8900 2450
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR01
 U 1 1 4AE9EF7D
 P 14650 7550
 F 0 "#PWR01" H 14650 7550 30  0001 C C
 F 1 "GND" H 14650 7480 30  0001 C C
 	1    14650 7550
 	1    0    0    -1  
 $EndComp
 Text GLabel 13900 5500 0    30   BiDi
 +V3.3
 $Comp
@ -866,15 +891,6 @@ F 1 "HD" H 14600 8600 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR01
 U 1 1 4AABC832
 P 14650 7500
 F 0 "#PWR01" H 14650 7500 30  0001 C C
 F 1 "GND" H 14650 7430 30  0001 C C
 	1    14650 7500
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR02
 U 1 1 4A6D2253
 P 14450 6750
@ -894,7 +910,7 @@ F 1 "BOOT_SWITCH" H 15400 7500 60  0000 C C
 	1    15400 7250
 	1    0    0    -1  
 $EndComp
-Text Label 13450 6400 0    30   ~
+Text Label 13600 6400 0    30   ~
 BOOT_SEL1_HIGH
 Text Label 12350 6400 0    30   ~
 BOOT_SEL1
@ -1102,24 +1118,15 @@ U 4A4779DA
 F0 "MEMORY" 100
 F1 "memory.sch" 60
 $EndSheet
 $Comp
 L GND #PWR07
 U 1 1 4A4778EB
 P 13450 7000
 F 0 "#PWR07" H 13450 7000 30  0001 C C
 F 1 "GND" H 13450 6930 30  0001 C C
 	1    13450 7000
 	1    0    0    -1  
 $EndComp
 Text Label 12650 7200 0    30   ~
 VDDADC
 Text Label 12500 7800 0    30   ~
 +VDDHP
 $Comp
-L GND #PWR08
+L GND #PWR07
 U 1 1 4A477817
 P 12350 8150
-F 0 "#PWR08" H 12350 8150 30  0001 C C
+F 0 "#PWR07" H 12350 8150 30  0001 C C
 F 1 "GND" H 12350 8080 30  0001 C C
 	1    12350 8150
 	1    0    0    -1  
@ -1134,10 +1141,10 @@ F 1 "0.1uF/16V" V 12650 8000 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR09
+L GND #PWR08
 U 1 1 4A47773D
 P 13100 8350
-F 0 "#PWR09" H 13100 8350 30  0001 C C
+F 0 "#PWR08" H 13100 8350 30  0001 C C
 F 1 "GND" H 13100 8280 30  0001 C C
 	1    13100 8350
 	1    0    0    -1  
@ -1161,10 +1168,10 @@ F 1 "10uF/10V" H 13150 7950 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR010
+L GND #PWR09
 U 1 1 4A4776B3
 P 13100 7700
-F 0 "#PWR010" H 13100 7700 30  0001 C C
+F 0 "#PWR09" H 13100 7700 30  0001 C C
 F 1 "GND" H 13100 7630 30  0001 C C
 	1    13100 7700
 	1    0    0    -1  
@ -1188,10 +1195,10 @@ F 1 "0.1uF/16V" H 13150 7350 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR011
+L GND #PWR010
 U 1 1 4A47760D
 P 12400 6900
-F 0 "#PWR011" H 12400 6900 30  0001 C C
+F 0 "#PWR010" H 12400 6900 30  0001 C C
 F 1 "GND" H 12400 6830 30  0001 C C
 	1    12400 6900
 	0    -1   -1   0   
@ -1208,15 +1215,6 @@ F 1 "10K/5%" V 12800 6550 50  0000 C C
 	0    1    1    0   
 $EndComp
 $Comp
 L R R9
 U 1 1 4A4774D7
 P 13450 6700
 F 0 "R9" V 13530 6700 50  0000 C C
 F 1 "0" V 13350 6650 50  0000 C C
 	1    13450 6700
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R5
 U 1 1 4A4774D0
 P 13450 6050
@ -1298,10 +1296,10 @@ RCLKO
 Text Label 10100 5950 0    30   ~
 RCLK
 $Comp
-L GND #PWR012
+L GND #PWR011
 U 1 1 4A4772F5
 P 10000 8600
-F 0 "#PWR012" H 10000 8600 30  0001 C C
+F 0 "#PWR011" H 10000 8600 30  0001 C C
 F 1 "GND" H 10000 8530 30  0001 C C
 	1    10000 8600
 	1    0    0    -1  
@ -1316,19 +1314,19 @@ F 1 "0.1uF/16V" V 10150 8300 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR013
+L GND #PWR012
 U 1 1 4A47729E
 P 10300 8300
-F 0 "#PWR013" H 10300 8300 30  0001 C C
+F 0 "#PWR012" H 10300 8300 30  0001 C C
 F 1 "GND" H 10300 8230 30  0001 C C
 	1    10300 8300
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR014
+L GND #PWR013
 U 1 1 4A477251
 P 9250 8100
-F 0 "#PWR014" H 9250 8100 30  0001 C C
+F 0 "#PWR013" H 9250 8100 30  0001 C C
 F 1 "GND" H 9250 8030 30  0001 C C
 	1    9250 8100
 	1    0    0    -1  
@ -1367,19 +1365,19 @@ PW_ON_N
 Text Label 10000 6400 0    30   ~
 RESETP_N
 $Comp
-L GND #PWR015
+L GND #PWR014
 U 1 1 4A47702C
 P 8500 5300
-F 0 "#PWR015" H 8500 5300 30  0001 C C
+F 0 "#PWR014" H 8500 5300 30  0001 C C
 F 1 "GND" H 8500 5230 30  0001 C C
 	1    8500 5300
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR016
+L GND #PWR015
 U 1 1 4A47702B
 P 8500 6000
-F 0 "#PWR016" H 8500 6000 30  0001 C C
+F 0 "#PWR015" H 8500 6000 30  0001 C C
 F 1 "GND" H 8500 5930 30  0001 C C
 	1    8500 6000
 	0    1    1    0   
@ -1412,19 +1410,19 @@ F 1 "32768Hz" H 9250 5500 60  0000 C C
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR017
+L GND #PWR016
 U 1 1 4A476F85
 P 8000 6150
-F 0 "#PWR017" H 8000 6150 30  0001 C C
+F 0 "#PWR016" H 8000 6150 30  0001 C C
 F 1 "GND" H 8000 6080 30  0001 C C
 	1    8000 6150
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR018
+L GND #PWR017
 U 1 1 4A476F71
 P 8000 6850
-F 0 "#PWR018" H 8000 6850 30  0001 C C
+F 0 "#PWR017" H 8000 6850 30  0001 C C
 F 1 "GND" H 8000 6780 30  0001 C C
 	1    8000 6850
 	0    1    1    0   
@ -1500,19 +1498,19 @@ PWEN
 Text Label 5700 5450 0    60   ~
 PW_ON_N
 $Comp
-L GND #PWR019
+L GND #PWR018
 U 1 1 4A449B4B
 P 6700 6400
-F 0 "#PWR019" H 6700 6400 30  0001 C C
+F 0 "#PWR018" H 6700 6400 30  0001 C C
 F 1 "GND" H 6700 6330 30  0001 C C
 	1    6700 6400
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR020
+L GND #PWR019
 U 1 1 4A449463
 P 6700 8400
-F 0 "#PWR020" H 6700 8400 30  0001 C C
+F 0 "#PWR019" H 6700 8400 30  0001 C C
 F 1 "GND" H 6700 8330 30  0001 C C
 	1    6700 8400
 	1    0    0    -1  
@ -1574,19 +1572,19 @@ F 1 "100K/5%" V 6450 5100 50  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR021
+L GND #PWR020
 U 1 1 4A4491DE
 P 8150 4720
-F 0 "#PWR021" H 8150 4720 30  0001 C C
+F 0 "#PWR020" H 8150 4720 30  0001 C C
 F 1 "GND" H 8150 4650 30  0001 C C
 	1    8150 4720
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR022
+L GND #PWR021
 U 1 1 4A449180
 P 7900 2900
-F 0 "#PWR022" H 7900 2900 30  0001 C C
+F 0 "#PWR021" H 7900 2900 30  0001 C C
 F 1 "GND" H 7900 2830 30  0001 C C
 	1    7900 2900
 	1    0    0    -1  
@ -1727,10 +1725,10 @@ F 1 "TESTPOINT" V 6100 9500 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR023
+L GND #PWR022
 U 1 1 4A4240BA
 P 2900 7400
-F 0 "#PWR023" H 2900 7400 30  0001 C C
+F 0 "#PWR022" H 2900 7400 30  0001 C C
 F 1 "GND" H 2900 7330 30  0001 C C
 	1    2900 7400
 	1    0    0    -1  
@ -1738,19 +1736,19 @@ $EndComp
 Text Label 2050 7050 0    60   ~
 PWEN
 $Comp
-L GND #PWR024
+L GND #PWR023
 U 1 1 4A41ABF9
 P 5050 7300
-F 0 "#PWR024" H 5050 7300 30  0001 C C
+F 0 "#PWR023" H 5050 7300 30  0001 C C
 F 1 "GND" H 5050 7230 30  0001 C C
 	1    5050 7300
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR025
+L GND #PWR024
 U 1 1 4A41ABF7
 P 4250 8100
-F 0 "#PWR025" H 4250 8100 30  0001 C C
+F 0 "#PWR024" H 4250 8100 30  0001 C C
 F 1 "GND" H 4250 8030 30  0001 C C
 	1    4250 8100
 	1    0    0    -1  
@ -1819,10 +1817,10 @@ F 1 "10uF/10V" V 1600 6950 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR026
+L GND #PWR025
 U 1 1 4A41ABEB
 P 1800 7200
-F 0 "#PWR026" H 1800 7200 30  0001 C C
+F 0 "#PWR025" H 1800 7200 30  0001 C C
 F 1 "GND" H 1800 7130 30  0001 C C
 	1    1800 7200
 	1    0    0    -1  
@ -1837,19 +1835,19 @@ F 1 "EUP3406" H 2900 7350 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR027
+L GND #PWR026
 U 1 1 4A41AB82
 P 5050 9200
-F 0 "#PWR027" H 5050 9200 30  0001 C C
+F 0 "#PWR026" H 5050 9200 30  0001 C C
 F 1 "GND" H 5050 9130 30  0001 C C
 	1    5050 9200
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR028
+L GND #PWR027
 U 1 1 4A41A954
 P 4250 10000
-F 0 "#PWR028" H 4250 10000 30  0001 C C
+F 0 "#PWR027" H 4250 10000 30  0001 C C
 F 1 "GND" H 4250 9930 30  0001 C C
 	1    4250 10000
 	1    0    0    -1  
@ -1911,10 +1909,10 @@ $EndComp
 Text Label 1250 9400 0    60   ~
 PWEN
 $Comp
-L GND #PWR029
+L GND #PWR028
 U 1 1 4A41A40E
 P 2300 9900
-F 0 "#PWR029" H 2300 9900 30  0001 C C
+F 0 "#PWR028" H 2300 9900 30  0001 C C
 F 1 "GND" H 2300 9830 30  0001 C C
 	1    2300 9900
 	1    0    0    -1  
@ -1947,10 +1945,10 @@ F 1 "10uF/10V" H 1850 8750 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR030
+L GND #PWR029
 U 1 1 4A41A1FA
 P 1800 9100
-F 0 "#PWR030" H 1800 9100 30  0001 C C
+F 0 "#PWR029" H 1800 9100 30  0001 C C
 F 1 "GND" H 1800 9030 30  0001 C C
 	1    1800 9100
 	1    0    0    -1  
@ -1965,10 +1963,10 @@ F 1 "EUP3406" H 2900 9250 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR031
+L GND #PWR030
 U 1 1 4A4185EC
 P 4300 5650
-F 0 "#PWR031" H 4300 5650 30  0001 C C
+F 0 "#PWR030" H 4300 5650 30  0001 C C
 F 1 "GND" H 4300 5580 30  0001 C C
 	1    4300 5650
 	1    0    0    -1  
@ -1983,10 +1981,10 @@ F 1 "47uF/6.3V" H 4600 5200 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR032
+L GND #PWR031
 U 1 1 4A4180C5
 P 3150 5750
-F 0 "#PWR032" H 3150 5750 30  0001 C C
+F 0 "#PWR031" H 3150 5750 30  0001 C C
 F 1 "GND" H 3150 5680 30  0001 C C
 	1    3150 5750
 	1    0    0    -1  
@ -2001,10 +1999,10 @@ F 1 "1uF/16V" H 2100 5200 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR033
+L GND #PWR032
 U 1 1 4A417FAE
 P 2050 5650
-F 0 "#PWR033" H 2050 5650 30  0001 C C
+F 0 "#PWR032" H 2050 5650 30  0001 C C
 F 1 "GND" H 2050 5580 30  0001 C C
 	1    2050 5650
 	1    0    0    -1  
@ -2097,10 +2095,10 @@ F 1 "2.5K/5%" H 2400 2950 50  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR034
+L GND #PWR033
 U 1 1 4A4042AB
 P 2650 3950
-F 0 "#PWR034" H 2650 3950 30  0001 C C
+F 0 "#PWR033" H 2650 3950 30  0001 C C
 F 1 "GND" H 2650 3880 30  0001 C C
 	1    2650 3950
 	1    0    0    -1  
@ -2142,10 +2140,10 @@ F 1 "SE9016" H 3800 2850 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR035
+L GND #PWR034
 U 1 1 4A3F40C0
 P 4900 2750
-F 0 "#PWR035" H 4900 2750 30  0001 C C
+F 0 "#PWR034" H 4900 2750 30  0001 C C
 F 1 "GND" H 4900 2680 30  0001 C C
 	1    4900 2750
 	1    0    0    -1  
--- a/main/Qi_AVT2.brd
+++ b/main/Qi_AVT2.brd
--- a/main/Qi_AVT2.cache.bck
+++ b/main/Qi_AVT2.cache.bck
@ -1,3 +1,3 @@
-EESchema-DOCLIB  Version 2.0  29/10/2009-19:39:49
+EESchema-DOCLIB  Version 2.0  30/11/2009-02:49:13
 #
 #End Doc Library
--- a/main/Qi_AVT2.cache.lib
+++ b/main/Qi_AVT2.cache.lib
@ -1,4 +1,4 @@
-EESchema-LIBRARY Version  29/10/2009-19:39:49
+EESchema-LIBRARY Version  30/11/2009-02:49:13
 #
 #
 # BAT_CON
@ -811,9 +811,9 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S 150 -200 -150 200 0 1 0 N
-X 1 1 -450 -100 300 R 50 50 1 1 B
+X 1 1 -450 -100 300 R 50 50 1 1 I
-X 3 3 -450 0 300 R 50 50 1 1 B
+X 2 2 -450 0 300 R 50 50 1 1 I
-X 2 2 -450 100 300 R 50 50 1 1 B
+X 3 3 -450 100 300 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
--- a/main/Qi_AVT2.cmp
+++ b/main/Qi_AVT2.cmp
@ -1,4 +1,4 @@
-Cmp-Mod V01 Created by CVpcb (20080825c) date = 4/11/2009-14:32:11
+Cmp-Mod V01 Created by CVpcb (20080825c) date = 30/11/2009-02:29:40
 BeginCmp
 TimeStamp = /4A477662;
@ -479,7 +479,7 @@ EndCmp
 BeginCmp
 TimeStamp = /4A46EDD2/4A46E9CC;
 Reference = C59;
-ValeurCmp = 100uF/4V;
+ValeurCmp = 100uF/6.3V;
 IdModule  = TCB3528;
 EndCmp
@ -500,7 +500,7 @@ EndCmp
 BeginCmp
 TimeStamp = /4A46EDD2/4A46EA0A;
 Reference = C62;
-ValeurCmp = 100uF/4V;
+ValeurCmp = 100uF/6.3V;
 IdModule  = TCB3528;
 EndCmp
@ -574,6 +574,13 @@ ValeurCmp = 4.7uF/16V;
 IdModule  = C0805;
 EndCmp
 BeginCmp
 TimeStamp = /4B132AB9;
 Reference = C74;
 ValeurCmp = 0.1uF/16V;
 IdModule  = C0402;
 EndCmp
 BeginCmp
 TimeStamp = /4A403157;
 Reference = CON1;
@ -861,13 +868,6 @@ ValeurCmp = 330/5%;
 IdModule  = R0402;
 EndCmp
 BeginCmp
 TimeStamp = /4A4774D7;
 Reference = R9;
 ValeurCmp = 0;
 IdModule  = R0603;
 EndCmp
 BeginCmp
 TimeStamp = /4A41A896;
 Reference = R10;
@ -1067,7 +1067,7 @@ EndCmp
 BeginCmp
 TimeStamp = /4A46EDD2/4A46E16E;
 Reference = R39;
-ValeurCmp = 22K/5%;
+ValeurCmp = 2.2K/5%;
 IdModule  = R0603;
 EndCmp
@ -1600,7 +1600,7 @@ BeginCmp
 TimeStamp = /4AABC76A;
 Reference = SW1;
 ValeurCmp = BOOT_SWITCH;
-IdModule  = ESP_3P;
+IdModule  = SW1;
 EndCmp
 BeginCmp
--- a/main/Qi_AVT2.net
+++ b/main/Qi_AVT2.net
--- a/main/Qi_AVT2.sch
+++ b/main/Qi_AVT2.sch
@ -13,6 +13,15 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
 Wire Wire Line
 	13450 6300 13450 6400
 Wire Wire Line
 	13450 6400 13600 6400
 Connection ~ 8500 2850
 Wire Wire Line
 	7900 2850 8900 2850
 Wire Wire Line
 	8900 2850 8900 2650
 Wire Wire Line
 	14650 7550 14650 7350
 Wire Wire Line
@ -82,8 +91,6 @@ Wire Notes Line
 	15850 9100 15850 8100
 Wire Notes Line
 	15850 8100 14200 8100
 Wire Wire Line
 	13450 6450 13450 6300
 Wire Wire Line
 	12450 6500 12450 6450
 Wire Wire Line
@ -189,8 +196,6 @@ Wire Wire Line
 	5300 2250 5350 2250
 Wire Wire Line
 	4900 2750 4900 2650
 Wire Wire Line
 	13450 6950 13450 7000
 Connection ~ 12450 7800
 Wire Wire Line
 	12450 7850 12250 7850
@ -314,8 +319,6 @@ Connection ~ 6700 5800
 Connection ~ 6700 4800
 Wire Wire Line
 	8150 4670 8150 4720
 Wire Wire Line
 	7900 2850 8500 2850
 Connection ~ 8500 2000
 Connection ~ 7250 1550
 Wire Wire Line
@ -733,11 +736,25 @@ Wire Wire Line
 	4900 2250 4900 1900
 Wire Wire Line
 	13950 5500 13900 5500
 Wire Wire Line
 	8900 2250 8900 2100
 Wire Wire Line
 	8900 2100 8500 2100
 Connection ~ 8500 2100
 $Comp
-L GND #PWR?
+L C C74
 U 1 1 4B132AB9
 P 8900 2450
 F 0 "C74" V 8700 2450 50  0000 L C
 F 1 "0.1uF/16V" V 9050 2400 50  0000 L C
 	1    8900 2450
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR01
 U 1 1 4AE9EF7D
 P 14650 7550
-F 0 "#PWR?" H 14650 7550 30  0001 C C
+F 0 "#PWR01" H 14650 7550 30  0001 C C
 F 1 "GND" H 14650 7480 30  0001 C C
 	1    14650 7550
 	1    0    0    -1  
@ -893,7 +910,7 @@ F 1 "BOOT_SWITCH" H 15400 7500 60  0000 C C
 	1    15400 7250
 	1    0    0    -1  
 $EndComp
-Text Label 13450 6400 0    30   ~
+Text Label 13600 6400 0    30   ~
 BOOT_SEL1_HIGH
 Text Label 12350 6400 0    30   ~
 BOOT_SEL1
@ -1101,24 +1118,15 @@ U 4A4779DA
 F0 "MEMORY" 100
 F1 "memory.sch" 60
 $EndSheet
 $Comp
 L GND #PWR07
 U 1 1 4A4778EB
 P 13450 7000
 F 0 "#PWR07" H 13450 7000 30  0001 C C
 F 1 "GND" H 13450 6930 30  0001 C C
 	1    13450 7000
 	1    0    0    -1  
 $EndComp
 Text Label 12650 7200 0    30   ~
 VDDADC
 Text Label 12500 7800 0    30   ~
 +VDDHP
 $Comp
-L GND #PWR08
+L GND #PWR07
 U 1 1 4A477817
 P 12350 8150
-F 0 "#PWR08" H 12350 8150 30  0001 C C
+F 0 "#PWR07" H 12350 8150 30  0001 C C
 F 1 "GND" H 12350 8080 30  0001 C C
 	1    12350 8150
 	1    0    0    -1  
@ -1133,10 +1141,10 @@ F 1 "0.1uF/16V" V 12650 8000 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR09
+L GND #PWR08
 U 1 1 4A47773D
 P 13100 8350
-F 0 "#PWR09" H 13100 8350 30  0001 C C
+F 0 "#PWR08" H 13100 8350 30  0001 C C
 F 1 "GND" H 13100 8280 30  0001 C C
 	1    13100 8350
 	1    0    0    -1  
@ -1160,10 +1168,10 @@ F 1 "10uF/10V" H 13150 7950 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR010
+L GND #PWR09
 U 1 1 4A4776B3
 P 13100 7700
-F 0 "#PWR010" H 13100 7700 30  0001 C C
+F 0 "#PWR09" H 13100 7700 30  0001 C C
 F 1 "GND" H 13100 7630 30  0001 C C
 	1    13100 7700
 	1    0    0    -1  
@ -1187,10 +1195,10 @@ F 1 "0.1uF/16V" H 13150 7350 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR011
+L GND #PWR010
 U 1 1 4A47760D
 P 12400 6900
-F 0 "#PWR011" H 12400 6900 30  0001 C C
+F 0 "#PWR010" H 12400 6900 30  0001 C C
 F 1 "GND" H 12400 6830 30  0001 C C
 	1    12400 6900
 	0    -1   -1   0   
@ -1207,15 +1215,6 @@ F 1 "10K/5%" V 12800 6550 50  0000 C C
 	0    1    1    0   
 $EndComp
 $Comp
 L R R9
 U 1 1 4A4774D7
 P 13450 6700
 F 0 "R9" V 13530 6700 50  0000 C C
 F 1 "0" V 13350 6650 50  0000 C C
 	1    13450 6700
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R5
 U 1 1 4A4774D0
 P 13450 6050
@ -1297,10 +1296,10 @@ RCLKO
 Text Label 10100 5950 0    30   ~
 RCLK
 $Comp
-L GND #PWR012
+L GND #PWR011
 U 1 1 4A4772F5
 P 10000 8600
-F 0 "#PWR012" H 10000 8600 30  0001 C C
+F 0 "#PWR011" H 10000 8600 30  0001 C C
 F 1 "GND" H 10000 8530 30  0001 C C
 	1    10000 8600
 	1    0    0    -1  
@ -1315,19 +1314,19 @@ F 1 "0.1uF/16V" V 10150 8300 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR013
+L GND #PWR012
 U 1 1 4A47729E
 P 10300 8300
-F 0 "#PWR013" H 10300 8300 30  0001 C C
+F 0 "#PWR012" H 10300 8300 30  0001 C C
 F 1 "GND" H 10300 8230 30  0001 C C
 	1    10300 8300
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR014
+L GND #PWR013
 U 1 1 4A477251
 P 9250 8100
-F 0 "#PWR014" H 9250 8100 30  0001 C C
+F 0 "#PWR013" H 9250 8100 30  0001 C C
 F 1 "GND" H 9250 8030 30  0001 C C
 	1    9250 8100
 	1    0    0    -1  
@ -1366,19 +1365,19 @@ PW_ON_N
 Text Label 10000 6400 0    30   ~
 RESETP_N
 $Comp
-L GND #PWR015
+L GND #PWR014
 U 1 1 4A47702C
 P 8500 5300
-F 0 "#PWR015" H 8500 5300 30  0001 C C
+F 0 "#PWR014" H 8500 5300 30  0001 C C
 F 1 "GND" H 8500 5230 30  0001 C C
 	1    8500 5300
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR016
+L GND #PWR015
 U 1 1 4A47702B
 P 8500 6000
-F 0 "#PWR016" H 8500 6000 30  0001 C C
+F 0 "#PWR015" H 8500 6000 30  0001 C C
 F 1 "GND" H 8500 5930 30  0001 C C
 	1    8500 6000
 	0    1    1    0   
@ -1411,19 +1410,19 @@ F 1 "32768Hz" H 9250 5500 60  0000 C C
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR017
+L GND #PWR016
 U 1 1 4A476F85
 P 8000 6150
-F 0 "#PWR017" H 8000 6150 30  0001 C C
+F 0 "#PWR016" H 8000 6150 30  0001 C C
 F 1 "GND" H 8000 6080 30  0001 C C
 	1    8000 6150
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR018
+L GND #PWR017
 U 1 1 4A476F71
 P 8000 6850
-F 0 "#PWR018" H 8000 6850 30  0001 C C
+F 0 "#PWR017" H 8000 6850 30  0001 C C
 F 1 "GND" H 8000 6780 30  0001 C C
 	1    8000 6850
 	0    1    1    0   
@ -1499,19 +1498,19 @@ PWEN
 Text Label 5700 5450 0    60   ~
 PW_ON_N
 $Comp
-L GND #PWR019
+L GND #PWR018
 U 1 1 4A449B4B
 P 6700 6400
-F 0 "#PWR019" H 6700 6400 30  0001 C C
+F 0 "#PWR018" H 6700 6400 30  0001 C C
 F 1 "GND" H 6700 6330 30  0001 C C
 	1    6700 6400
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR020
+L GND #PWR019
 U 1 1 4A449463
 P 6700 8400
-F 0 "#PWR020" H 6700 8400 30  0001 C C
+F 0 "#PWR019" H 6700 8400 30  0001 C C
 F 1 "GND" H 6700 8330 30  0001 C C
 	1    6700 8400
 	1    0    0    -1  
@ -1573,19 +1572,19 @@ F 1 "100K/5%" V 6450 5100 50  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR021
+L GND #PWR020
 U 1 1 4A4491DE
 P 8150 4720
-F 0 "#PWR021" H 8150 4720 30  0001 C C
+F 0 "#PWR020" H 8150 4720 30  0001 C C
 F 1 "GND" H 8150 4650 30  0001 C C
 	1    8150 4720
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR022
+L GND #PWR021
 U 1 1 4A449180
 P 7900 2900
-F 0 "#PWR022" H 7900 2900 30  0001 C C
+F 0 "#PWR021" H 7900 2900 30  0001 C C
 F 1 "GND" H 7900 2830 30  0001 C C
 	1    7900 2900
 	1    0    0    -1  
@ -1726,10 +1725,10 @@ F 1 "TESTPOINT" V 6100 9500 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR023
+L GND #PWR022
 U 1 1 4A4240BA
 P 2900 7400
-F 0 "#PWR023" H 2900 7400 30  0001 C C
+F 0 "#PWR022" H 2900 7400 30  0001 C C
 F 1 "GND" H 2900 7330 30  0001 C C
 	1    2900 7400
 	1    0    0    -1  
@ -1737,19 +1736,19 @@ $EndComp
 Text Label 2050 7050 0    60   ~
 PWEN
 $Comp
-L GND #PWR024
+L GND #PWR023
 U 1 1 4A41ABF9
 P 5050 7300
-F 0 "#PWR024" H 5050 7300 30  0001 C C
+F 0 "#PWR023" H 5050 7300 30  0001 C C
 F 1 "GND" H 5050 7230 30  0001 C C
 	1    5050 7300
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR025
+L GND #PWR024
 U 1 1 4A41ABF7
 P 4250 8100
-F 0 "#PWR025" H 4250 8100 30  0001 C C
+F 0 "#PWR024" H 4250 8100 30  0001 C C
 F 1 "GND" H 4250 8030 30  0001 C C
 	1    4250 8100
 	1    0    0    -1  
@ -1818,10 +1817,10 @@ F 1 "10uF/10V" V 1600 6950 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR026
+L GND #PWR025
 U 1 1 4A41ABEB
 P 1800 7200
-F 0 "#PWR026" H 1800 7200 30  0001 C C
+F 0 "#PWR025" H 1800 7200 30  0001 C C
 F 1 "GND" H 1800 7130 30  0001 C C
 	1    1800 7200
 	1    0    0    -1  
@ -1836,19 +1835,19 @@ F 1 "EUP3406" H 2900 7350 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR027
+L GND #PWR026
 U 1 1 4A41AB82
 P 5050 9200
-F 0 "#PWR027" H 5050 9200 30  0001 C C
+F 0 "#PWR026" H 5050 9200 30  0001 C C
 F 1 "GND" H 5050 9130 30  0001 C C
 	1    5050 9200
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR028
+L GND #PWR027
 U 1 1 4A41A954
 P 4250 10000
-F 0 "#PWR028" H 4250 10000 30  0001 C C
+F 0 "#PWR027" H 4250 10000 30  0001 C C
 F 1 "GND" H 4250 9930 30  0001 C C
 	1    4250 10000
 	1    0    0    -1  
@ -1910,10 +1909,10 @@ $EndComp
 Text Label 1250 9400 0    60   ~
 PWEN
 $Comp
-L GND #PWR029
+L GND #PWR028
 U 1 1 4A41A40E
 P 2300 9900
-F 0 "#PWR029" H 2300 9900 30  0001 C C
+F 0 "#PWR028" H 2300 9900 30  0001 C C
 F 1 "GND" H 2300 9830 30  0001 C C
 	1    2300 9900
 	1    0    0    -1  
@ -1946,10 +1945,10 @@ F 1 "10uF/10V" H 1850 8750 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR030
+L GND #PWR029
 U 1 1 4A41A1FA
 P 1800 9100
-F 0 "#PWR030" H 1800 9100 30  0001 C C
+F 0 "#PWR029" H 1800 9100 30  0001 C C
 F 1 "GND" H 1800 9030 30  0001 C C
 	1    1800 9100
 	1    0    0    -1  
@ -1964,10 +1963,10 @@ F 1 "EUP3406" H 2900 9250 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR031
+L GND #PWR030
 U 1 1 4A4185EC
 P 4300 5650
-F 0 "#PWR031" H 4300 5650 30  0001 C C
+F 0 "#PWR030" H 4300 5650 30  0001 C C
 F 1 "GND" H 4300 5580 30  0001 C C
 	1    4300 5650
 	1    0    0    -1  
@ -1982,10 +1981,10 @@ F 1 "47uF/6.3V" H 4600 5200 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR032
+L GND #PWR031
 U 1 1 4A4180C5
 P 3150 5750
-F 0 "#PWR032" H 3150 5750 30  0001 C C
+F 0 "#PWR031" H 3150 5750 30  0001 C C
 F 1 "GND" H 3150 5680 30  0001 C C
 	1    3150 5750
 	1    0    0    -1  
@ -2000,10 +1999,10 @@ F 1 "1uF/16V" H 2100 5200 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR033
+L GND #PWR032
 U 1 1 4A417FAE
 P 2050 5650
-F 0 "#PWR033" H 2050 5650 30  0001 C C
+F 0 "#PWR032" H 2050 5650 30  0001 C C
 F 1 "GND" H 2050 5580 30  0001 C C
 	1    2050 5650
 	1    0    0    -1  
@ -2096,10 +2095,10 @@ F 1 "2.5K/5%" H 2400 2950 50  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR034
+L GND #PWR033
 U 1 1 4A4042AB
 P 2650 3950
-F 0 "#PWR034" H 2650 3950 30  0001 C C
+F 0 "#PWR033" H 2650 3950 30  0001 C C
 F 1 "GND" H 2650 3880 30  0001 C C
 	1    2650 3950
 	1    0    0    -1  
@ -2141,10 +2140,10 @@ F 1 "SE9016" H 3800 2850 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR035
+L GND #PWR034
 U 1 1 4A3F40C0
 P 4900 2750
-F 0 "#PWR035" H 4900 2750 30  0001 C C
+F 0 "#PWR034" H 4900 2750 30  0001 C C
 F 1 "GND" H 4900 2680 30  0001 C C
 	1    4900 2750
 	1    0    0    -1  
--- a/main/audio.bak
+++ b/main/audio.bak
@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,/home/juan64bits/Qi/board-qi-avt2/components/kb3436,./Qi_AVT2.cache
+LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
@ -200,7 +200,7 @@ L CPOLARIZED C62
 U 1 1 4A46EA0A
 P 2450 2800
 F 0 "C62" V 2600 2950 60  0000 C C
-F 1 "100uF/4V" V 2600 2450 60  0000 C C
+F 1 "100uF/6.3V" V 2600 2450 60  0000 C C
 	1    2450 2800
 	0    -1   -1   0   
 $EndComp
@ -209,15 +209,15 @@ L CPOLARIZED C59
 U 1 1 4A46E9CC
 P 2450 2450
 F 0 "C59" V 2600 2600 60  0000 C C
-F 1 "100uF/4V" V 2600 2100 60  0000 C C
+F 1 "100uF/6.3V" V 2600 2100 60  0000 C C
 	1    2450 2450
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR068
+L GND #PWR067
 U 1 1 4A46E97D
 P 3200 3550
-F 0 "#PWR068" H 3200 3550 30  0001 C C
+F 0 "#PWR067" H 3200 3550 30  0001 C C
 F 1 "GND" H 3200 3480 30  0001 C C
 	1    3200 3550
 	1    0    0    -1  
@ -283,10 +283,10 @@ $EndComp
 Text Label 5900 2500 0    30   ~
 AMPIN
 $Comp
-L GND #PWR069
+L GND #PWR068
 U 1 1 4A46E629
 P 6300 3400
-F 0 "#PWR069" H 6300 3400 30  0001 C C
+F 0 "#PWR068" H 6300 3400 30  0001 C C
 F 1 "GND" H 6300 3330 30  0001 C C
 	1    6300 3400
 	1    0    0    -1  
@ -329,10 +329,10 @@ MICIN
 Text Label 8550 3000 0    60   ~
 MICIN
 $Comp
-L GND #PWR070
+L GND #PWR069
 U 1 1 4A46E225
 P 9150 2700
-F 0 "#PWR070" H 9150 2700 30  0001 C C
+F 0 "#PWR069" H 9150 2700 30  0001 C C
 F 1 "GND" H 9150 2630 30  0001 C C
 	1    9150 2700
 	1    0    0    -1  
@ -347,10 +347,10 @@ F 1 "0.1uF/16V" V 9550 2200 50  0000 L C
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR071
+L GND #PWR070
 U 1 1 4A46E19D
 P 10150 3300
-F 0 "#PWR071" H 10150 3300 30  0001 C C
+F 0 "#PWR070" H 10150 3300 30  0001 C C
 F 1 "GND" H 10150 3230 30  0001 C C
 	1    10150 3300
 	1    0    0    -1  
@ -378,7 +378,7 @@ L R R39
 U 1 1 4A46E16E
 P 9950 2600
 F 0 "R39" V 10030 2600 50  0000 C C
-F 1 "22K/5%" V 9850 2600 50  0000 C C
+F 1 "2.2K/5%" V 9850 2600 50  0000 C C
 	1    9950 2600
 	1    0    0    -1  
 $EndComp
@ -413,10 +413,10 @@ AMPEN
 Text Label 1950 5700 0    60   ~
 AMPIN
 $Comp
-L GND #PWR072
+L GND #PWR071
 U 1 1 4A46DFA2
 P 3050 5400
-F 0 "#PWR072" H 3050 5400 30  0001 C C
+F 0 "#PWR071" H 3050 5400 30  0001 C C
 F 1 "GND" H 3050 5330 30  0001 C C
 	1    3050 5400
 	1    0    0    -1  
@ -449,10 +449,10 @@ F 1 "PZ1608D221" V 4100 4700 40  0000 C C
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR073
+L GND #PWR072
 U 1 1 4A46DD3A
 P 4700 5350
-F 0 "#PWR073" H 4700 5350 30  0001 C C
+F 0 "#PWR072" H 4700 5350 30  0001 C C
 F 1 "GND" H 4700 5280 30  0001 C C
 	1    4700 5350
 	1    0    0    -1  
@ -476,10 +476,10 @@ F 1 "0.1uF/16V" V 4400 5700 50  0000 L C
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR074
+L GND #PWR073
 U 1 1 4A46DBD2
 P 6850 6550
-F 0 "#PWR074" H 6850 6550 30  0001 C C
+F 0 "#PWR073" H 6850 6550 30  0001 C C
 F 1 "GND" H 6850 6480 30  0001 C C
 	1    6850 6550
 	1    0    0    -1  
--- a/main/audio.sch
+++ b/main/audio.sch
@ -200,7 +200,7 @@ L CPOLARIZED C62
 U 1 1 4A46EA0A
 P 2450 2800
 F 0 "C62" V 2600 2950 60  0000 C C
-F 1 "100uF/4V" V 2600 2450 60  0000 C C
+F 1 "100uF/6.3V" V 2600 2450 60  0000 C C
 	1    2450 2800
 	0    -1   -1   0   
 $EndComp
@ -209,15 +209,15 @@ L CPOLARIZED C59
 U 1 1 4A46E9CC
 P 2450 2450
 F 0 "C59" V 2600 2600 60  0000 C C
-F 1 "100uF/4V" V 2600 2100 60  0000 C C
+F 1 "100uF/6.3V" V 2600 2100 60  0000 C C
 	1    2450 2450
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR068
+L GND #PWR067
 U 1 1 4A46E97D
 P 3200 3550
-F 0 "#PWR068" H 3200 3550 30  0001 C C
+F 0 "#PWR067" H 3200 3550 30  0001 C C
 F 1 "GND" H 3200 3480 30  0001 C C
 	1    3200 3550
 	1    0    0    -1  
@ -283,10 +283,10 @@ $EndComp
 Text Label 5900 2500 0    30   ~
 AMPIN
 $Comp
-L GND #PWR069
+L GND #PWR068
 U 1 1 4A46E629
 P 6300 3400
-F 0 "#PWR069" H 6300 3400 30  0001 C C
+F 0 "#PWR068" H 6300 3400 30  0001 C C
 F 1 "GND" H 6300 3330 30  0001 C C
 	1    6300 3400
 	1    0    0    -1  
@ -329,10 +329,10 @@ MICIN
 Text Label 8550 3000 0    60   ~
 MICIN
 $Comp
-L GND #PWR070
+L GND #PWR069
 U 1 1 4A46E225
 P 9150 2700
-F 0 "#PWR070" H 9150 2700 30  0001 C C
+F 0 "#PWR069" H 9150 2700 30  0001 C C
 F 1 "GND" H 9150 2630 30  0001 C C
 	1    9150 2700
 	1    0    0    -1  
@ -347,10 +347,10 @@ F 1 "0.1uF/16V" V 9550 2200 50  0000 L C
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR071
+L GND #PWR070
 U 1 1 4A46E19D
 P 10150 3300
-F 0 "#PWR071" H 10150 3300 30  0001 C C
+F 0 "#PWR070" H 10150 3300 30  0001 C C
 F 1 "GND" H 10150 3230 30  0001 C C
 	1    10150 3300
 	1    0    0    -1  
@ -378,7 +378,7 @@ L R R39
 U 1 1 4A46E16E
 P 9950 2600
 F 0 "R39" V 10030 2600 50  0000 C C
-F 1 "22K/5%" V 9850 2600 50  0000 C C
+F 1 "2.2K/5%" V 9850 2600 50  0000 C C
 	1    9950 2600
 	1    0    0    -1  
 $EndComp
@ -413,10 +413,10 @@ AMPEN
 Text Label 1950 5700 0    60   ~
 AMPIN
 $Comp
-L GND #PWR072
+L GND #PWR071
 U 1 1 4A46DFA2
 P 3050 5400
-F 0 "#PWR072" H 3050 5400 30  0001 C C
+F 0 "#PWR071" H 3050 5400 30  0001 C C
 F 1 "GND" H 3050 5330 30  0001 C C
 	1    3050 5400
 	1    0    0    -1  
@ -449,10 +449,10 @@ F 1 "PZ1608D221" V 4100 4700 40  0000 C C
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR073
+L GND #PWR072
 U 1 1 4A46DD3A
 P 4700 5350
-F 0 "#PWR073" H 4700 5350 30  0001 C C
+F 0 "#PWR072" H 4700 5350 30  0001 C C
 F 1 "GND" H 4700 5280 30  0001 C C
 	1    4700 5350
 	1    0    0    -1  
@ -476,10 +476,10 @@ F 1 "0.1uF/16V" V 4400 5700 50  0000 L C
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR074
+L GND #PWR073
 U 1 1 4A46DBD2
 P 6850 6550
-F 0 "#PWR074" H 6850 6550 30  0001 C C
+F 0 "#PWR073" H 6850 6550 30  0001 C C
 F 1 "GND" H 6850 6480 30  0001 C C
 	1    6850 6550
 	1    0    0    -1  
--- a/main/function_block.bak
+++ b/main/function_block.bak
@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,/home/juan64bits/Qi/board-qi-avt2/components/kb3436,./Qi_AVT2.cache
+LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
--- a/main/key_matrix.bak
+++ b/main/key_matrix.bak
@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,/home/juan64bits/Qi/board-qi-avt2/components/kb3436,./Qi_AVT2.cache
+LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
--- a/main/lcd_usb.bak
+++ b/main/lcd_usb.bak
@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,/home/juan64bits/Qi/board-qi-avt2/components/kb3436,./Qi_AVT2.cache
+LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
@ -595,19 +595,19 @@ Wire Wire Line
 	6950 5000 6950 5100
 Connection ~ 6950 5100
 $Comp
-L GND #PWR036
+L GND #PWR035
 U 1 1 4AE9A45F
 P 6750 6250
-F 0 "#PWR036" H 6750 6250 30  0001 C C
+F 0 "#PWR035" H 6750 6250 30  0001 C C
 F 1 "GND" H 6750 6180 30  0001 C C
 	1    6750 6250
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR037
+L GND #PWR036
 U 1 1 4AE9A455
 P 6150 6000
-F 0 "#PWR037" H 6150 6000 30  0001 C C
+F 0 "#PWR036" H 6150 6000 30  0001 C C
 F 1 "GND" H 6150 5930 30  0001 C C
 	1    6150 6000
 	1    0    0    -1  
@ -631,10 +631,10 @@ F 1 "KB3436" H 5800 4800 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR038
+L GND #PWR037
 U 1 1 4ACE4888
 P 7800 6650
-F 0 "#PWR038" H 7800 6650 30  0001 C C
+F 0 "#PWR037" H 7800 6650 30  0001 C C
 F 1 "GND" H 7800 6580 30  0001 C C
 	1    7800 6650
 	0    1    1    0   
@ -699,10 +699,10 @@ F 1 "1M/5%" V 5450 2100 50  0000 C C
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR039
+L GND #PWR038
 U 1 1 4A7C23A5
 P 5200 2200
-F 0 "#PWR039" H 5200 2200 30  0001 C C
+F 0 "#PWR038" H 5200 2200 30  0001 C C
 F 1 "GND" H 5200 2130 30  0001 C C
 	1    5200 2200
 	0    -1   -1   0   
@ -730,10 +730,10 @@ F 1 "980K/5%" V 6650 5300 50  0000 C C
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR040
+L GND #PWR039
 U 1 1 4A7C12A3
 P 5050 5350
-F 0 "#PWR040" H 5050 5350 30  0001 C C
+F 0 "#PWR039" H 5050 5350 30  0001 C C
 F 1 "GND" H 5050 5280 30  0001 C C
 	1    5050 5350
 	1    0    0    -1  
@ -748,10 +748,10 @@ F 1 "4.7uF/16V" V 4850 5000 50  0000 L C
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR041
+L GND #PWR040
 U 1 1 4A7C10ED
 P 7150 6250
-F 0 "#PWR041" H 7150 6250 30  0001 C C
+F 0 "#PWR040" H 7150 6250 30  0001 C C
 F 1 "GND" H 7150 6180 30  0001 C C
 	1    7150 6250
 	1    0    0    -1  
@ -806,19 +806,19 @@ F 1 "MSCD104" H 9650 5500 40  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR042
+L GND #PWR041
 U 1 1 4A7BDE77
 P 9650 6750
-F 0 "#PWR042" H 9650 6750 30  0001 C C
+F 0 "#PWR041" H 9650 6750 30  0001 C C
 F 1 "GND" H 9650 6680 30  0001 C C
 	1    9650 6750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR043
+L GND #PWR042
 U 1 1 4A7BDDC0
 P 10000 6750
-F 0 "#PWR043" H 10000 6750 30  0001 C C
+F 0 "#PWR042" H 10000 6750 30  0001 C C
 F 1 "GND" H 10000 6680 30  0001 C C
 	1    10000 6750
 	1    0    0    -1  
@ -833,10 +833,10 @@ F 1 "100K/5%" V 9900 6400 50  0000 C C
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR044
+L GND #PWR043
 U 1 1 4A7BDCBC
 P 10300 6750
-F 0 "#PWR044" H 10300 6750 30  0001 C C
+F 0 "#PWR043" H 10300 6750 30  0001 C C
 F 1 "GND" H 10300 6680 30  0001 C C
 	1    10300 6750
 	1    0    0    -1  
@ -885,10 +885,10 @@ GPC8
 NoConn ~ 7050 1650
 NoConn ~ 7500 1700
 $Comp
-L GND #PWR045
+L GND #PWR044
 U 1 1 4A48314F
 P 8000 1800
-F 0 "#PWR045" H 8000 1800 30  0001 C C
+F 0 "#PWR044" H 8000 1800 30  0001 C C
 F 1 "GND" H 8000 1730 30  0001 C C
 	1    8000 1800
 	1    0    0    -1  
@ -988,10 +988,10 @@ F 1 "33/5%" H 8650 3800 40  0000 C C
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR046
+L GND #PWR045
 U 1 1 4A482D97
 P 9850 2700
-F 0 "#PWR046" H 9850 2700 30  0001 C C
+F 0 "#PWR045" H 9850 2700 30  0001 C C
 F 1 "GND" H 9850 2630 30  0001 C C
 	1    9850 2700
 	1    0    0    -1  
@ -1012,19 +1012,19 @@ LCDSCL
 Text GLabel 9650 3800 0    30   Input
 LCDSDA
 $Comp
-L GND #PWR047
+L GND #PWR046
 U 1 1 4A482D03
 P 9700 4050
-F 0 "#PWR047" H 9700 4050 30  0001 C C
+F 0 "#PWR046" H 9700 4050 30  0001 C C
 F 1 "GND" H 9700 3980 30  0001 C C
 	1    9700 4050
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR048
+L GND #PWR047
 U 1 1 4A482CF0
 P 10800 4050
-F 0 "#PWR048" H 10800 4050 30  0001 C C
+F 0 "#PWR047" H 10800 4050 30  0001 C C
 F 1 "GND" H 10800 3980 30  0001 C C
 	1    10800 4050
 	1    0    0    -1  
@ -1039,10 +1039,10 @@ F 1 "FPCCON24" H 10400 2600 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR049
+L GND #PWR048
 U 1 1 4A482A50
 P 4050 6800
-F 0 "#PWR049" H 4050 6800 30  0001 C C
+F 0 "#PWR048" H 4050 6800 30  0001 C C
 F 1 "GND" H 4050 6730 30  0001 C C
 	1    4050 6800
 	1    0    0    -1  
@ -1084,19 +1084,19 @@ F 1 "1K/5%" H 3650 5550 50  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR050
+L GND #PWR049
 U 1 1 4A482926
 P 1050 7050
-F 0 "#PWR050" H 1050 7050 30  0001 C C
+F 0 "#PWR049" H 1050 7050 30  0001 C C
 F 1 "GND" H 1050 6980 30  0001 C C
 	1    1050 7050
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR051
+L GND #PWR050
 U 1 1 4A4828A1
 P 2450 5950
-F 0 "#PWR051" H 2450 5950 30  0001 C C
+F 0 "#PWR050" H 2450 5950 30  0001 C C
 F 1 "GND" H 2450 5880 30  0001 C C
 	1    2450 5950
 	1    0    0    -1  
@ -1120,10 +1120,10 @@ F 1 "PZ1608D221" V 2150 5400 40  0000 C C
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR052
+L GND #PWR051
 U 1 1 4A482821
 P 2450 6650
-F 0 "#PWR052" H 2450 6650 30  0001 C C
+F 0 "#PWR051" H 2450 6650 30  0001 C C
 F 1 "GND" H 2450 6580 30  0001 C C
 	1    2450 6650
 	1    0    0    -1  
@ -1169,10 +1169,10 @@ F 1 "USB_MINIB" H 1250 6350 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR053
+L GND #PWR052
 U 1 1 4A4825EB
 P 4150 3500
-F 0 "#PWR053" H 4150 3500 30  0001 C C
+F 0 "#PWR052" H 4150 3500 30  0001 C C
 F 1 "GND" H 4150 3430 30  0001 C C
 	1    4150 3500
 	1    0    0    -1  
@ -1187,10 +1187,10 @@ F 1 "0.1uF/16V" H 4200 3150 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR054
+L GND #PWR053
 U 1 1 4A4825D2
 P 4850 3400
-F 0 "#PWR054" H 4850 3400 30  0001 C C
+F 0 "#PWR053" H 4850 3400 30  0001 C C
 F 1 "GND" H 4850 3330 30  0001 C C
 	1    4850 3400
 	1    0    0    -1  
@ -1205,10 +1205,10 @@ F 1 "0.1uF/16V" H 4900 3050 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR055
+L GND #PWR054
 U 1 1 4A48258F
 P 5650 2600
-F 0 "#PWR055" H 5650 2600 30  0001 C C
+F 0 "#PWR054" H 5650 2600 30  0001 C C
 F 1 "GND" H 5650 2530 30  0001 C C
 	1    5650 2600
 	0    -1   -1   0   
@ -1300,10 +1300,10 @@ LCDD1
 Text Label 4500 850  2    30   ~
 LCDD0
 $Comp
-L GND #PWR056
+L GND #PWR055
 U 1 1 4A482291
 P 1150 1850
-F 0 "#PWR056" H 1150 1850 30  0001 C C
+F 0 "#PWR055" H 1150 1850 30  0001 C C
 F 1 "GND" H 1150 1780 30  0001 C C
 	1    1150 1850
 	1    0    0    -1  
@ -1318,19 +1318,19 @@ F 1 "0.1uF/16V" V 1000 1600 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR057
+L GND #PWR056
 U 1 1 4A4821E0
 P 2000 1550
-F 0 "#PWR057" H 2000 1550 30  0001 C C
+F 0 "#PWR056" H 2000 1550 30  0001 C C
 F 1 "GND" H 2000 1480 30  0001 C C
 	1    2000 1550
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR058
+L GND #PWR057
 U 1 1 4A4821C5
 P 2000 1800
-F 0 "#PWR058" H 2000 1800 30  0001 C C
+F 0 "#PWR057" H 2000 1800 30  0001 C C
 F 1 "GND" H 2000 1730 30  0001 C C
 	1    2000 1800
 	1    0    0    -1  
@ -1338,10 +1338,10 @@ $EndComp
 Text Label 1500 2500 0    30   ~
 VREF
 $Comp
-L GND #PWR059
+L GND #PWR058
 U 1 1 4A482190
 P 1050 3100
-F 0 "#PWR059" H 1050 3100 30  0001 C C
+F 0 "#PWR058" H 1050 3100 30  0001 C C
 F 1 "GND" H 1050 3030 30  0001 C C
 	1    1050 3100
 	1    0    0    -1  
@ -1365,10 +1365,10 @@ F 1 "10uF/10V" V 750 2750 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR060
+L GND #PWR059
 U 1 1 4A48210D
 P 2000 2750
-F 0 "#PWR060" H 2000 2750 30  0001 C C
+F 0 "#PWR059" H 2000 2750 30  0001 C C
 F 1 "GND" H 2000 2680 30  0001 C C
 	1    2000 2750
 	1    0    0    -1  
--- a/main/lcd_usb.sch
+++ b/main/lcd_usb.sch
@ -595,19 +595,19 @@ Wire Wire Line
 	6950 5000 6950 5100
 Connection ~ 6950 5100
 $Comp
-L GND #PWR036
+L GND #PWR035
 U 1 1 4AE9A45F
 P 6750 6250
-F 0 "#PWR036" H 6750 6250 30  0001 C C
+F 0 "#PWR035" H 6750 6250 30  0001 C C
 F 1 "GND" H 6750 6180 30  0001 C C
 	1    6750 6250
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR037
+L GND #PWR036
 U 1 1 4AE9A455
 P 6150 6000
-F 0 "#PWR037" H 6150 6000 30  0001 C C
+F 0 "#PWR036" H 6150 6000 30  0001 C C
 F 1 "GND" H 6150 5930 30  0001 C C
 	1    6150 6000
 	1    0    0    -1  
@ -631,10 +631,10 @@ F 1 "KB3436" H 5800 4800 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR038
+L GND #PWR037
 U 1 1 4ACE4888
 P 7800 6650
-F 0 "#PWR038" H 7800 6650 30  0001 C C
+F 0 "#PWR037" H 7800 6650 30  0001 C C
 F 1 "GND" H 7800 6580 30  0001 C C
 	1    7800 6650
 	0    1    1    0   
@ -699,10 +699,10 @@ F 1 "1M/5%" V 5450 2100 50  0000 C C
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR039
+L GND #PWR038
 U 1 1 4A7C23A5
 P 5200 2200
-F 0 "#PWR039" H 5200 2200 30  0001 C C
+F 0 "#PWR038" H 5200 2200 30  0001 C C
 F 1 "GND" H 5200 2130 30  0001 C C
 	1    5200 2200
 	0    -1   -1   0   
@ -730,10 +730,10 @@ F 1 "980K/5%" V 6650 5300 50  0000 C C
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR040
+L GND #PWR039
 U 1 1 4A7C12A3
 P 5050 5350
-F 0 "#PWR040" H 5050 5350 30  0001 C C
+F 0 "#PWR039" H 5050 5350 30  0001 C C
 F 1 "GND" H 5050 5280 30  0001 C C
 	1    5050 5350
 	1    0    0    -1  
@ -748,10 +748,10 @@ F 1 "4.7uF/16V" V 4850 5000 50  0000 L C
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR041
+L GND #PWR040
 U 1 1 4A7C10ED
 P 7150 6250
-F 0 "#PWR041" H 7150 6250 30  0001 C C
+F 0 "#PWR040" H 7150 6250 30  0001 C C
 F 1 "GND" H 7150 6180 30  0001 C C
 	1    7150 6250
 	1    0    0    -1  
@ -806,19 +806,19 @@ F 1 "MSCD104" H 9650 5500 40  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR042
+L GND #PWR041
 U 1 1 4A7BDE77
 P 9650 6750
-F 0 "#PWR042" H 9650 6750 30  0001 C C
+F 0 "#PWR041" H 9650 6750 30  0001 C C
 F 1 "GND" H 9650 6680 30  0001 C C
 	1    9650 6750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR043
+L GND #PWR042
 U 1 1 4A7BDDC0
 P 10000 6750
-F 0 "#PWR043" H 10000 6750 30  0001 C C
+F 0 "#PWR042" H 10000 6750 30  0001 C C
 F 1 "GND" H 10000 6680 30  0001 C C
 	1    10000 6750
 	1    0    0    -1  
@ -833,10 +833,10 @@ F 1 "100K/5%" V 9900 6400 50  0000 C C
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR044
+L GND #PWR043
 U 1 1 4A7BDCBC
 P 10300 6750
-F 0 "#PWR044" H 10300 6750 30  0001 C C
+F 0 "#PWR043" H 10300 6750 30  0001 C C
 F 1 "GND" H 10300 6680 30  0001 C C
 	1    10300 6750
 	1    0    0    -1  
@ -885,10 +885,10 @@ GPC8
 NoConn ~ 7050 1650
 NoConn ~ 7500 1700
 $Comp
-L GND #PWR045
+L GND #PWR044
 U 1 1 4A48314F
 P 8000 1800
-F 0 "#PWR045" H 8000 1800 30  0001 C C
+F 0 "#PWR044" H 8000 1800 30  0001 C C
 F 1 "GND" H 8000 1730 30  0001 C C
 	1    8000 1800
 	1    0    0    -1  
@ -988,10 +988,10 @@ F 1 "33/5%" H 8650 3800 40  0000 C C
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR046
+L GND #PWR045
 U 1 1 4A482D97
 P 9850 2700
-F 0 "#PWR046" H 9850 2700 30  0001 C C
+F 0 "#PWR045" H 9850 2700 30  0001 C C
 F 1 "GND" H 9850 2630 30  0001 C C
 	1    9850 2700
 	1    0    0    -1  
@ -1012,19 +1012,19 @@ LCDSCL
 Text GLabel 9650 3800 0    30   Input
 LCDSDA
 $Comp
-L GND #PWR047
+L GND #PWR046
 U 1 1 4A482D03
 P 9700 4050
-F 0 "#PWR047" H 9700 4050 30  0001 C C
+F 0 "#PWR046" H 9700 4050 30  0001 C C
 F 1 "GND" H 9700 3980 30  0001 C C
 	1    9700 4050
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR048
+L GND #PWR047
 U 1 1 4A482CF0
 P 10800 4050
-F 0 "#PWR048" H 10800 4050 30  0001 C C
+F 0 "#PWR047" H 10800 4050 30  0001 C C
 F 1 "GND" H 10800 3980 30  0001 C C
 	1    10800 4050
 	1    0    0    -1  
@ -1039,10 +1039,10 @@ F 1 "FPCCON24" H 10400 2600 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR049
+L GND #PWR048
 U 1 1 4A482A50
 P 4050 6800
-F 0 "#PWR049" H 4050 6800 30  0001 C C
+F 0 "#PWR048" H 4050 6800 30  0001 C C
 F 1 "GND" H 4050 6730 30  0001 C C
 	1    4050 6800
 	1    0    0    -1  
@ -1084,19 +1084,19 @@ F 1 "1K/5%" H 3650 5550 50  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR050
+L GND #PWR049
 U 1 1 4A482926
 P 1050 7050
-F 0 "#PWR050" H 1050 7050 30  0001 C C
+F 0 "#PWR049" H 1050 7050 30  0001 C C
 F 1 "GND" H 1050 6980 30  0001 C C
 	1    1050 7050
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR051
+L GND #PWR050
 U 1 1 4A4828A1
 P 2450 5950
-F 0 "#PWR051" H 2450 5950 30  0001 C C
+F 0 "#PWR050" H 2450 5950 30  0001 C C
 F 1 "GND" H 2450 5880 30  0001 C C
 	1    2450 5950
 	1    0    0    -1  
@ -1120,10 +1120,10 @@ F 1 "PZ1608D221" V 2150 5400 40  0000 C C
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR052
+L GND #PWR051
 U 1 1 4A482821
 P 2450 6650
-F 0 "#PWR052" H 2450 6650 30  0001 C C
+F 0 "#PWR051" H 2450 6650 30  0001 C C
 F 1 "GND" H 2450 6580 30  0001 C C
 	1    2450 6650
 	1    0    0    -1  
@ -1169,10 +1169,10 @@ F 1 "USB_MINIB" H 1250 6350 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR053
+L GND #PWR052
 U 1 1 4A4825EB
 P 4150 3500
-F 0 "#PWR053" H 4150 3500 30  0001 C C
+F 0 "#PWR052" H 4150 3500 30  0001 C C
 F 1 "GND" H 4150 3430 30  0001 C C
 	1    4150 3500
 	1    0    0    -1  
@ -1187,10 +1187,10 @@ F 1 "0.1uF/16V" H 4200 3150 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR054
+L GND #PWR053
 U 1 1 4A4825D2
 P 4850 3400
-F 0 "#PWR054" H 4850 3400 30  0001 C C
+F 0 "#PWR053" H 4850 3400 30  0001 C C
 F 1 "GND" H 4850 3330 30  0001 C C
 	1    4850 3400
 	1    0    0    -1  
@ -1205,10 +1205,10 @@ F 1 "0.1uF/16V" H 4900 3050 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR055
+L GND #PWR054
 U 1 1 4A48258F
 P 5650 2600
-F 0 "#PWR055" H 5650 2600 30  0001 C C
+F 0 "#PWR054" H 5650 2600 30  0001 C C
 F 1 "GND" H 5650 2530 30  0001 C C
 	1    5650 2600
 	0    -1   -1   0   
@ -1300,10 +1300,10 @@ LCDD1
 Text Label 4500 850  2    30   ~
 LCDD0
 $Comp
-L GND #PWR056
+L GND #PWR055
 U 1 1 4A482291
 P 1150 1850
-F 0 "#PWR056" H 1150 1850 30  0001 C C
+F 0 "#PWR055" H 1150 1850 30  0001 C C
 F 1 "GND" H 1150 1780 30  0001 C C
 	1    1150 1850
 	1    0    0    -1  
@ -1318,19 +1318,19 @@ F 1 "0.1uF/16V" V 1000 1600 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR057
+L GND #PWR056
 U 1 1 4A4821E0
 P 2000 1550
-F 0 "#PWR057" H 2000 1550 30  0001 C C
+F 0 "#PWR056" H 2000 1550 30  0001 C C
 F 1 "GND" H 2000 1480 30  0001 C C
 	1    2000 1550
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR058
+L GND #PWR057
 U 1 1 4A4821C5
 P 2000 1800
-F 0 "#PWR058" H 2000 1800 30  0001 C C
+F 0 "#PWR057" H 2000 1800 30  0001 C C
 F 1 "GND" H 2000 1730 30  0001 C C
 	1    2000 1800
 	1    0    0    -1  
@ -1338,10 +1338,10 @@ $EndComp
 Text Label 1500 2500 0    30   ~
 VREF
 $Comp
-L GND #PWR059
+L GND #PWR058
 U 1 1 4A482190
 P 1050 3100
-F 0 "#PWR059" H 1050 3100 30  0001 C C
+F 0 "#PWR058" H 1050 3100 30  0001 C C
 F 1 "GND" H 1050 3030 30  0001 C C
 	1    1050 3100
 	1    0    0    -1  
@ -1365,10 +1365,10 @@ F 1 "10uF/10V" V 750 2750 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR060
+L GND #PWR059
 U 1 1 4A48210D
 P 2000 2750
-F 0 "#PWR060" H 2000 2750 30  0001 C C
+F 0 "#PWR059" H 2000 2750 30  0001 C C
 F 1 "GND" H 2000 2680 30  0001 C C
 	1    2000 2750
 	1    0    0    -1  
--- a/main/memory.bak
+++ b/main/memory.bak
@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,/home/juan64bits/Qi/board-qi-avt2/components/kb3436,./Qi_AVT2.cache
+LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
@ -543,10 +543,10 @@ Text Notes 6750 6350 0    50   ~
 NoConn ~ 6650 5700
 NoConn ~ 6650 5650
 $Comp
-L GND #PWR061
+L GND #PWR060
 U 1 1 4A481C6B
 P 8750 6150
-F 0 "#PWR061" H 8750 6150 30  0001 C C
+F 0 "#PWR060" H 8750 6150 30  0001 C C
 F 1 "GND" H 8750 6080 30  0001 C C
 	1    8750 6150
 	1    0    0    -1  
@ -577,10 +577,10 @@ FALE/GPB16
 Text Label 6100 5750 0    30   ~
 FCLE/GPB15
 $Comp
-L GND #PWR062
+L GND #PWR061
 U 1 1 4A481A8B
 P 6500 5650
-F 0 "#PWR062" H 6500 5650 30  0001 C C
+F 0 "#PWR061" H 6500 5650 30  0001 C C
 F 1 "GND" H 6500 5580 30  0001 C C
 	1    6500 5650
 	1    0    0    -1  
@ -687,10 +687,10 @@ SDD1
 Text GLabel 1300 6200 0    30   Input
 SDDET
 $Comp
-L GND #PWR063
+L GND #PWR062
 U 1 1 4A4801C9
 P 3550 7150
-F 0 "#PWR063" H 3550 7150 30  0001 C C
+F 0 "#PWR062" H 3550 7150 30  0001 C C
 F 1 "GND" H 3550 7080 30  0001 C C
 	1    3550 7150
 	1    0    0    -1  
@ -761,10 +761,10 @@ $EndComp
 Text GLabel 2150 4650 0    30   Input
 SDPWEN
 $Comp
-L GND #PWR064
+L GND #PWR063
 U 1 1 4A47FFBE
 P 3700 4850
-F 0 "#PWR064" H 3700 4850 30  0001 C C
+F 0 "#PWR063" H 3700 4850 30  0001 C C
 F 1 "GND" H 3700 4780 30  0001 C C
 	1    3700 4850
 	1    0    0    -1  
@ -797,10 +797,10 @@ F 1 "10uF/10V" V 3400 4500 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR065
+L GND #PWR064
 U 1 1 4A47FEBC
 P 5650 4300
-F 0 "#PWR065" H 5650 4300 30  0001 C C
+F 0 "#PWR064" H 5650 4300 30  0001 C C
 F 1 "GND" H 5650 4230 30  0001 C C
 	1    5650 4300
 	1    0    0    -1  
@ -878,10 +878,10 @@ F 1 "10uF/10V" V 5800 3950 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR066
+L GND #PWR065
 U 1 1 4A47F94A
 P 7500 3050
-F 0 "#PWR066" H 7500 3050 30  0001 C C
+F 0 "#PWR065" H 7500 3050 30  0001 C C
 F 1 "GND" H 7500 2980 30  0001 C C
 	1    7500 3050
 	1    0    0    -1  
@ -1005,10 +1005,10 @@ A11
 Text Label 4800 2100 2    30   ~
 BUZPWM
 $Comp
-L GND #PWR067
+L GND #PWR066
 U 1 1 4A47F42B
 P 4750 2300
-F 0 "#PWR067" H 4750 2300 30  0001 C C
+F 0 "#PWR066" H 4750 2300 30  0001 C C
 F 1 "GND" H 4750 2230 30  0001 C C
 	1    4750 2300
 	1    0    0    -1  
--- a/main/memory.sch
+++ b/main/memory.sch
@ -543,10 +543,10 @@ Text Notes 6750 6350 0    50   ~
 NoConn ~ 6650 5700
 NoConn ~ 6650 5650
 $Comp
-L GND #PWR061
+L GND #PWR060
 U 1 1 4A481C6B
 P 8750 6150
-F 0 "#PWR061" H 8750 6150 30  0001 C C
+F 0 "#PWR060" H 8750 6150 30  0001 C C
 F 1 "GND" H 8750 6080 30  0001 C C
 	1    8750 6150
 	1    0    0    -1  
@ -577,10 +577,10 @@ FALE/GPB16
 Text Label 6100 5750 0    30   ~
 FCLE/GPB15
 $Comp
-L GND #PWR062
+L GND #PWR061
 U 1 1 4A481A8B
 P 6500 5650
-F 0 "#PWR062" H 6500 5650 30  0001 C C
+F 0 "#PWR061" H 6500 5650 30  0001 C C
 F 1 "GND" H 6500 5580 30  0001 C C
 	1    6500 5650
 	1    0    0    -1  
@ -687,10 +687,10 @@ SDD1
 Text GLabel 1300 6200 0    30   Input
 SDDET
 $Comp
-L GND #PWR063
+L GND #PWR062
 U 1 1 4A4801C9
 P 3550 7150
-F 0 "#PWR063" H 3550 7150 30  0001 C C
+F 0 "#PWR062" H 3550 7150 30  0001 C C
 F 1 "GND" H 3550 7080 30  0001 C C
 	1    3550 7150
 	1    0    0    -1  
@ -761,10 +761,10 @@ $EndComp
 Text GLabel 2150 4650 0    30   Input
 SDPWEN
 $Comp
-L GND #PWR064
+L GND #PWR063
 U 1 1 4A47FFBE
 P 3700 4850
-F 0 "#PWR064" H 3700 4850 30  0001 C C
+F 0 "#PWR063" H 3700 4850 30  0001 C C
 F 1 "GND" H 3700 4780 30  0001 C C
 	1    3700 4850
 	1    0    0    -1  
@ -797,10 +797,10 @@ F 1 "10uF/10V" V 3400 4500 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR065
+L GND #PWR064
 U 1 1 4A47FEBC
 P 5650 4300
-F 0 "#PWR065" H 5650 4300 30  0001 C C
+F 0 "#PWR064" H 5650 4300 30  0001 C C
 F 1 "GND" H 5650 4230 30  0001 C C
 	1    5650 4300
 	1    0    0    -1  
@ -878,10 +878,10 @@ F 1 "10uF/10V" V 5800 3950 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR066
+L GND #PWR065
 U 1 1 4A47F94A
 P 7500 3050
-F 0 "#PWR066" H 7500 3050 30  0001 C C
+F 0 "#PWR065" H 7500 3050 30  0001 C C
 F 1 "GND" H 7500 2980 30  0001 C C
 	1    7500 3050
 	1    0    0    -1  
@ -1005,10 +1005,10 @@ A11
 Text Label 4800 2100 2    30   ~
 BUZPWM
 $Comp
-L GND #PWR067
+L GND #PWR066
 U 1 1 4A47F42B
 P 4750 2300
-F 0 "#PWR067" H 4750 2300 30  0001 C C
+F 0 "#PWR066" H 4750 2300 30  0001 C C
 F 1 "GND" H 4750 2230 30  0001 C C
 	1    4750 2300
 	1    0    0    -1  
--- a/main/power_tree.bak
+++ b/main/power_tree.bak
@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,/home/juan64bits/Qi/board-qi-avt2/components/kb3436,./Qi_AVT2.cache
+LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
--- a/models/JZ4720.mod
+++ b/models/JZ4720.mod
@ -18,7 +18,7 @@ DS 1181 -3070 3070 -1181 400 21
 DS 3070 -1181 3070 1181 400 21
 DS -3070 -1181 -3070 1181 400 21
 $PAD
-Sh "187" R 1811 1811 0 0 1800
+Sh "187" R 1874 2031 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
 Po 0 0