Changeset 7abcbaf in avrstuff for aktoserial/circuit/ps2toserial.cmp


Ignore:
Timestamp:
Jul 30, 2010, 8:17:03 PM (14 years ago)
Author:
Adrien Destugues <pulkomandy@…>
Branches:
main
Children:
bc76eec
Parents:
f0f7eb0
Message:

Version finale finale du PCB pour commercialisation!

git-svn-id: ​svn://pulkomandy.tk/avrstuff@3 c6672c3c-f6b6-47f9-9001-1fd6b12fecbe

File:
1 edited

Legend:

Unmodified
Added
Removed

  • aktoserial/circuit/ps2toserial.cmp

    rf0f7eb0 r7abcbaf  
     1<<<<<<< .mine
     2Cmp-Mod V01 Created by CvPCB (2010-05-05 BZR 2356)-stable date = 30/07/2010 19:16:19
     3=======
    14Cmp-Mod V01 Created by CvPCB (2010-05-05 BZR 2356)-stable date = 23/06/2010 13:36:17
     5>>>>>>> .r2
    26
    37BeginCmp
    … …  
    1620
    1721BeginCmp
    18 TimeStamp = /4C20B25A;
    19 Reference = C3;
    20 ValeurCmp = 100nF;
    21 IdModule  = SM0805;
    22 EndCmp
    23 
    24 BeginCmp
    2522TimeStamp = /4C20B56F;
    2623Reference = C4;
    … …  
    3027
    3128BeginCmp
    32 TimeStamp = /4C209C03;
    33 Reference = CON_PROG1;
    34 ValeurCmp = HE10;
    35 IdModule  = HE10-10d;
    36 EndCmp
    37 
    38 BeginCmp
    39 TimeStamp = /4C20B276;
    40 Reference = D1;
    41 ValeurCmp = DIODE;
    42 IdModule  = SM0805;
     29TimeStamp = /4C52C709;
     30Reference = C5;
     31ValeurCmp = 10µF;
     32IdModule  = C1V7;
    4333EndCmp
    4434
    … …  
    5141
    5242BeginCmp
     43<<<<<<< .mine
     44TimeStamp = /4C21F044;
     45Reference = D3;
     46ValeurCmp = 3.6V;
     47IdModule  = D3;
     48EndCmp
     49
     50BeginCmp
     51TimeStamp = /4C21F047;
     52Reference = D4;
     53ValeurCmp = 3.6V;
     54IdModule  = SM0805;
     55EndCmp
     56
     57BeginCmp
     58=======
    5359TimeStamp = /4C21F044;
    5460Reference = D3;
    … …  
    6571
    6672BeginCmp
     73>>>>>>> .r2
    6774TimeStamp = /4C209A59;
    6875Reference = IC1;
    … …  
    7279
    7380BeginCmp
    74 TimeStamp = /4C20B6CD;
    75 Reference = P1;
    76 ValeurCmp = CONN_4;
    77 IdModule  = CONN_UART;
     81TimeStamp = /4C5307D0;
     82Reference = JP1;
     83ValeurCmp = FWUP;
     84IdModule  = R1;
    7885EndCmp
    7986
    … …  
    100107
    101108BeginCmp
     109<<<<<<< .mine
     110TimeStamp = /4C21F015;
     111Reference = R4;
     112ValeurCmp = 2.2KR;
     113IdModule  = SM0805;
     114=======
    102115TimeStamp = /4C21ED9A;
    103116Reference = R3;
    … …  
    139152ValeurCmp = SW_PUSH;
    140153IdModule  = PUSH_BUTT_SHAPE1;
     154>>>>>>> .r2
     155EndCmp
     156
     157BeginCmp
     158<<<<<<< .mine
     159TimeStamp = /4C21EEDC;
     160Reference = R5;
     161ValeurCmp = 480R;
     162IdModule  = SM0805;
     163EndCmp
     164
     165BeginCmp
     166TimeStamp = /4C21EFE5;
     167Reference = R6;
     168ValeurCmp = 68R;
     169IdModule  = SM0805;
     170EndCmp
     171
     172BeginCmp
     173TimeStamp = /4C21EFE9;
     174Reference = R7;
     175ValeurCmp = 68R;
     176IdModule  = R4;
     177EndCmp
     178
     179BeginCmp
     180TimeStamp = /4C5307BB;
     181Reference = R8;
     182ValeurCmp = 10K;
     183IdModule  = SM0805;
    141184EndCmp
    142185
    … …  
    149192
    150193BeginCmp
     194=======
     195TimeStamp = /4C21EF7A;
     196Reference = USB1;
     197ValeurCmp = CONN_4;
     198IdModule  = USB_B;
     199EndCmp
     200
     201BeginCmp
     202>>>>>>> .r2
    151203TimeStamp = /4C20AD34;
    152204Reference = X1;
Note: See TracChangeset for help on using the changeset viewer.