Skip to content

Commit f814da9

Browse files
author
Toni Klopfenstein
committed
Fixing file merge conflicts
2 parents dc6830c + d1794a7 commit f814da9

File tree

60 files changed

+6098
-15873
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+6098
-15873
lines changed

‎Hardware/Tiny_Programmer.brd

Lines changed: 50 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!DOCTYPE eagle SYSTEM "eagle.dtd">
3-
<eagle version="6.4">
3+
<eagle version="6.5.0">
44
<drawing>
55
<settings>
66
<setting alwaysvectorfont="no"/>
@@ -79,6 +79,8 @@
7979
<layer number="105" name="tPlate" color="7" fill="1" visible="no" active="yes"/>
8080
<layer number="106" name="bPlate" color="7" fill="1" visible="no" active="yes"/>
8181
<layer number="107" name="Crop" color="7" fill="1" visible="no" active="yes"/>
82+
<layer number="108" name="tplace-old" color="10" fill="1" visible="yes" active="yes"/>
83+
<layer number="109" name="ref-old" color="11" fill="1" visible="yes" active="yes"/>
8284
<layer number="116" name="Patch_BOT" color="9" fill="4" visible="no" active="yes"/>
8385
<layer number="121" name="_tsilk" color="7" fill="1" visible="no" active="yes"/>
8486
<layer number="122" name="_bsilk" color="7" fill="1" visible="no" active="yes"/>
@@ -131,7 +133,7 @@
131133
<wire x1="40.64" y1="1.27" x2="40.64" y2="13.97" width="0.254" layer="21"/>
132134
<wire x1="43.18" y1="13.97" x2="45.72" y2="13.97" width="0.254" layer="21" curve="180"/>
133135
<text x="38.1" y="1.27" size="1.778" layer="22" font="vector" ratio="15" rot="MR0">Tiny Programmer</text>
134-
<text x="45.72" y="1.905" size="1.016" layer="16" font="vector" ratio="20" rot="MR0">v12</text>
136+
<text x="46.101" y="1.27" size="1.27" layer="16" font="vector" ratio="20" rot="MR0">v13</text>
135137
<text x="1.27" y="-12.7" size="1.778" layer="27" font="vector" ratio="15">David A. Mellis, Jordan McConnell</text>
136138
<text x="23.241" y="13.97" size="0.8128" layer="21" font="vector" ratio="15" rot="SR0">RST</text>
137139
<text x="28.194" y="13.97" size="0.8128" layer="21" font="vector" ratio="15" rot="SR0">VCC</text>
@@ -149,7 +151,7 @@
149151
<wire x1="-14.859" y1="2.159" x2="0.889" y2="2.159" width="0.254" layer="49"/>
150152
<wire x1="0.889" y1="2.159" x2="1.016" y2="2.286" width="0.254" layer="49"/>
151153
<text x="55.499" y="6.731" size="0.8128" layer="22" font="vector" ratio="15" rot="SMR90">ISP</text>
152-
<text x="55.88" y="0.254" size="0.8128" layer="22" font="vector" ratio="15" rot="SMR90">VCC</text>
154+
<text x="55.88" y="0.254" size="0.8128" layer="22" font="vector" ratio="15" rot="SMR90">GND</text>
153155
<text x="55.88" y="12.954" size="0.8128" layer="22" font="vector" ratio="15" rot="SMR90">RST</text>
154156
<wire x1="55.88" y1="8.89" x2="55.88" y2="12.192" width="0.254" layer="22"/>
155157
<wire x1="55.88" y1="12.192" x2="56.388" y2="12.7" width="0.254" layer="22"/>
@@ -1205,8 +1207,8 @@ design rules under a new name.</description>
12051207
<element name="LED1" library="SparkFun-LED" package="LED-0603" value="Yellow" x="52.07" y="1.27" rot="R90"/>
12061208
<element name="JP7" library="SparkFun" package="MICRO-FIDUCIAL" value="FIDUCIALUFIDUCIAL" x="6.35" y="1.27"/>
12071209
<element name="JP8" library="SparkFun" package="MICRO-FIDUCIAL" value="FIDUCIALUFIDUCIAL" x="55.88" y="13.97"/>
1208-
<element name="JP10" library="SparkFun-Connectors" package="1X06" value="" x="58.42" y="13.97" rot="MR270"/>
12091210
<element name="JP11" library="SparkFun-Aesthetics" package="SFE-LOGO-FLAME" value="LOGO-SFESK" x="9.906" y="8.636" rot="MR90"/>
1211+
<element name="JP12" library="SparkFun-Connectors" package="1X06" value="" x="58.42" y="13.97" rot="R270"/>
12101212
</elements>
12111213
<signals>
12121214
<signal name="N$1">
@@ -1259,17 +1261,17 @@ design rules under a new name.</description>
12591261
<wire x1="6.025" y1="4.12" x2="6.365" y2="4.46" width="0.254" layer="1"/>
12601262
<wire x1="7.62" y1="4.46" x2="6.365" y2="4.46" width="0.254" layer="1"/>
12611263
<wire x1="28.7981" y1="13.8121" x2="28.956" y2="13.97" width="0.254" layer="1"/>
1262-
<contactref element="JP10" pad="6"/>
1263-
<wire x1="58.42" y1="1.27" x2="53.34" y2="1.27" width="0.254" layer="16"/>
1264-
<wire x1="53.34" y1="1.27" x2="52.07" y2="2.54" width="0.254" layer="16"/>
1265-
<wire x1="52.07" y1="2.54" x2="52.07" y2="10.16" width="0.254" layer="16"/>
1266-
<wire x1="52.07" y1="10.16" x2="50.8" y2="11.43" width="0.254" layer="16"/>
1267-
<wire x1="50.8" y1="11.43" x2="48.26" y2="11.43" width="0.254" layer="16"/>
12681264
<wire x1="18.04" y1="3.81" x2="19.05" y2="3.81" width="0.254" layer="1"/>
12691265
<wire x1="19.05" y1="3.81" x2="20.32" y2="2.54" width="0.254" layer="1"/>
12701266
<wire x1="20.32" y1="2.54" x2="29.21" y2="2.54" width="0.254" layer="1"/>
12711267
<wire x1="29.21" y1="2.54" x2="30.48" y2="3.81" width="0.254" layer="1"/>
12721268
<wire x1="30.48" y1="3.81" x2="30.48" y2="13.97" width="0.254" layer="1"/>
1269+
<contactref element="JP12" pad="4"/>
1270+
<wire x1="58.42" y1="6.35" x2="55.88" y2="6.35" width="0.254" layer="16"/>
1271+
<wire x1="55.88" y1="6.35" x2="54.61" y2="7.62" width="0.254" layer="16"/>
1272+
<wire x1="54.61" y1="7.62" x2="54.61" y2="10.16" width="0.254" layer="16"/>
1273+
<wire x1="54.61" y1="10.16" x2="53.34" y2="11.43" width="0.254" layer="16"/>
1274+
<wire x1="53.34" y1="11.43" x2="48.26" y2="11.43" width="0.254" layer="16"/>
12731275
</signal>
12741276
<signal name="GND">
12751277
<polygon width="0.254" layer="16" isolate="0.3048">
@@ -1296,9 +1298,8 @@ design rules under a new name.</description>
12961298
<contactref element="C4" pad="2"/>
12971299
<contactref element="C2" pad="2"/>
12981300
<contactref element="JP9" pad="6"/>
1299-
<contactref element="JP10" pad="5"/>
1300-
<via x="45.72" y="10.16" extent="1-16" drill="0.508"/>
13011301
<via x="21.59" y="12.7" extent="1-16" drill="0.508"/>
1302+
<contactref element="JP12" pad="6"/>
13021303
</signal>
13031304
<signal name="MOSI">
13041305
<contactref element="JP9" pad="4"/>
@@ -1321,13 +1322,18 @@ design rules under a new name.</description>
13211322
<wire x1="25.4" y1="2.54" x2="26.67" y2="3.81" width="0.254" layer="16"/>
13221323
<wire x1="26.67" y1="3.81" x2="26.67" y2="6.35" width="0.254" layer="16"/>
13231324
<wire x1="26.67" y1="6.35" x2="27.94" y2="7.62" width="0.254" layer="16"/>
1324-
<contactref element="JP10" pad="4"/>
13251325
<wire x1="56.26" y1="3.81" x2="56.26" y2="4.19" width="0.254" layer="1"/>
1326-
<wire x1="56.26" y1="4.19" x2="58.42" y2="6.35" width="0.254" layer="1"/>
13271326
<wire x1="48.26" y1="3.81" x2="44.45" y2="3.81" width="0.254" layer="16"/>
13281327
<wire x1="44.45" y1="3.81" x2="43.18" y2="5.08" width="0.254" layer="16"/>
13291328
<wire x1="43.18" y1="5.08" x2="30.48" y2="5.08" width="0.254" layer="16"/>
13301329
<wire x1="30.48" y1="5.08" x2="27.94" y2="7.62" width="0.254" layer="16"/>
1330+
<contactref element="JP12" pad="2"/>
1331+
<wire x1="58.42" y1="11.43" x2="57.15" y2="10.16" width="0.254" layer="1"/>
1332+
<wire x1="57.15" y1="10.16" x2="46.99" y2="10.16" width="0.254" layer="1"/>
1333+
<wire x1="46.99" y1="10.16" x2="45.72" y2="8.89" width="0.254" layer="1"/>
1334+
<wire x1="45.72" y1="8.89" x2="45.72" y2="5.08" width="0.254" layer="1"/>
1335+
<wire x1="45.72" y1="5.08" x2="46.99" y2="3.81" width="0.254" layer="1"/>
1336+
<wire x1="46.99" y1="3.81" x2="48.26" y2="3.81" width="0.254" layer="1"/>
13311337
</signal>
13321338
<signal name="MISO">
13331339
<contactref element="JP9" pad="1"/>
@@ -1342,13 +1348,13 @@ design rules under a new name.</description>
13421348
<wire x1="25.4" y1="10.16" x2="25.4" y2="11.43" width="0.254" layer="16"/>
13431349
<wire x1="29.21" y1="11.43" x2="30.48" y2="10.16" width="0.254" layer="16"/>
13441350
<wire x1="30.48" y1="10.16" x2="43.18" y2="10.16" width="0.254" layer="16"/>
1345-
<contactref element="JP10" pad="3"/>
13461351
<wire x1="43.18" y1="10.16" x2="46.99" y2="6.35" width="0.254" layer="16"/>
13471352
<wire x1="46.99" y1="6.35" x2="48.26" y2="6.35" width="0.254" layer="16"/>
1348-
<wire x1="52.96" y1="6.35" x2="52.96" y2="7.24" width="0.254" layer="1"/>
1349-
<wire x1="52.96" y1="7.24" x2="53.34" y2="7.62" width="0.254" layer="1"/>
1350-
<wire x1="53.34" y1="7.62" x2="57.15" y2="7.62" width="0.254" layer="1"/>
1351-
<wire x1="57.15" y1="7.62" x2="58.42" y2="8.89" width="0.254" layer="1"/>
1353+
<contactref element="JP12" pad="3"/>
1354+
<wire x1="58.42" y1="8.89" x2="57.15" y2="7.62" width="0.254" layer="1"/>
1355+
<wire x1="52.96" y1="6.35" x2="52.96" y2="6.732" width="0.254" layer="1"/>
1356+
<wire x1="52.96" y1="6.732" x2="53.848" y2="7.62" width="0.254" layer="1"/>
1357+
<wire x1="53.848" y1="7.62" x2="57.15" y2="7.62" width="0.254" layer="1"/>
13521358
</signal>
13531359
<signal name="SCK">
13541360
<contactref element="JP9" pad="3"/>
@@ -1364,16 +1370,18 @@ design rules under a new name.</description>
13641370
<wire x1="25.4" y1="7.62" x2="25.4" y2="8.89" width="0.254" layer="16"/>
13651371
<wire x1="43.18" y1="7.62" x2="30.48" y2="7.62" width="0.254" layer="16"/>
13661372
<wire x1="30.48" y1="7.62" x2="29.21" y2="8.89" width="0.254" layer="16"/>
1367-
<contactref element="JP10" pad="2"/>
13681373
<wire x1="43.18" y1="7.62" x2="45.72" y2="5.08" width="0.254" layer="16"/>
13691374
<wire x1="45.72" y1="5.08" x2="49.53" y2="5.08" width="0.254" layer="16"/>
13701375
<wire x1="49.53" y1="5.08" x2="50.8" y2="6.35" width="0.254" layer="16"/>
1371-
<wire x1="50.8" y1="6.35" x2="50.8" y2="7.62" width="0.254" layer="16"/>
1372-
<wire x1="50.8" y1="7.62" x2="49.53" y2="8.89" width="0.254" layer="16"/>
1373-
<wire x1="56.26" y1="8.89" x2="56.26" y2="9.27" width="0.254" layer="1"/>
1374-
<wire x1="56.26" y1="9.27" x2="58.42" y2="11.43" width="0.254" layer="1"/>
1375-
<wire x1="48.26" y1="8.89" x2="49.53" y2="8.89" width="0.254" layer="16"/>
13761376
<wire x1="56.26" y1="8.89" x2="48.26" y2="8.89" width="0.254" layer="1"/>
1377+
<contactref element="JP12" pad="5"/>
1378+
<wire x1="58.42" y1="3.81" x2="55.88" y2="3.81" width="0.254" layer="16"/>
1379+
<wire x1="55.88" y1="3.81" x2="53.34" y2="6.35" width="0.254" layer="16"/>
1380+
<wire x1="53.34" y1="6.35" x2="53.34" y2="7.62" width="0.254" layer="16"/>
1381+
<wire x1="53.34" y1="7.62" x2="52.07" y2="8.89" width="0.254" layer="16"/>
1382+
<wire x1="52.07" y1="8.89" x2="50.8" y2="8.89" width="0.254" layer="16"/>
1383+
<wire x1="50.8" y1="8.89" x2="48.26" y2="8.89" width="0.254" layer="16"/>
1384+
<wire x1="50.8" y1="6.35" x2="50.8" y2="8.89" width="0.254" layer="16"/>
13771385
</signal>
13781386
<signal name="RST">
13791387
<contactref element="JP9" pad="5"/>
@@ -1395,10 +1403,10 @@ design rules under a new name.</description>
13951403
<wire x1="29.21" y1="12.7" x2="26.67" y2="12.7" width="0.254" layer="16"/>
13961404
<via x="26.67" y="12.7" extent="1-16" drill="0.508"/>
13971405
<wire x1="26.67" y1="12.7" x2="24.58" y2="12.7" width="0.254" layer="1"/>
1398-
<contactref element="JP10" pad="1"/>
1399-
<wire x1="58.42" y1="13.97" x2="45.72" y2="13.97" width="0.254" layer="16"/>
1400-
<wire x1="45.72" y1="13.97" x2="43.18" y2="11.43" width="0.254" layer="16"/>
1401-
<wire x1="43.18" y1="11.43" x2="40.64" y2="11.43" width="0.254" layer="16"/>
1406+
<contactref element="JP12" pad="1"/>
1407+
<wire x1="40.64" y1="11.43" x2="43.18" y2="11.43" width="0.254" layer="16"/>
1408+
<wire x1="43.18" y1="11.43" x2="45.72" y2="13.97" width="0.254" layer="16"/>
1409+
<wire x1="45.72" y1="13.97" x2="58.42" y2="13.97" width="0.254" layer="16"/>
14021410
</signal>
14031411
<signal name="D-">
14041412
<contactref element="R1" pad="2"/>
@@ -1486,42 +1494,42 @@ design rules under a new name.</description>
14861494
</signal>
14871495
</signals>
14881496
<errors>
1497+
<approved hash="5,1,763e6ad1d68e8a92"/>
14891498
<approved hash="4,1,2d1053d98b3ef80c"/>
14901499
<approved hash="4,1,2e6de7deb6e672ae"/>
1491-
<approved hash="5,1,43ecfa9a32bff00f"/>
14921500
<approved hash="5,1,a473552c66c8ec51"/>
1501+
<approved hash="5,1,43ecfa9a32bff00f"/>
14931502
<approved hash="5,1,70dbcf09de99e4be"/>
1494-
<approved hash="19,1,400d9982cc65fbb0"/>
14951503
<approved hash="19,1,5ea09522c0a5e72d"/>
1496-
<approved hash="19,1,64f690c2c50dd97f"/>
1504+
<approved hash="19,1,400d9982cc65fbb0"/>
14971505
<approved hash="19,1,545b976ac345efba"/>
1498-
<approved hash="19,1,b2fc191c25138ef3"/>
1499-
<approved hash="19,1,beb54149c1573eab"/>
1506+
<approved hash="19,1,64f690c2c50dd97f"/>
15001507
<approved hash="19,1,81502ab025338ed3"/>
15011508
<approved hash="19,1,a6476a1bea052659"/>
1509+
<approved hash="19,1,b2fc191c25138ef3"/>
1510+
<approved hash="19,1,beb54149c1573eab"/>
15021511
<approved hash="19,1,34d119dae4592708"/>
1512+
<approved hash="19,1,10481f34ed530a69"/>
15031513
<approved hash="19,1,2b761ba0e993354f"/>
15041514
<approved hash="5,1,4b5187a3a8588938"/>
15051515
<approved hash="19,1,236b265ae895026a"/>
1506-
<approved hash="19,1,10481f34ed530a69"/>
1507-
<approved hash="5,1,343eca01192a0aeb"/>
15081516
<approved hash="19,1,957b5db7dc4d1481"/>
15091517
<approved hash="19,1,d83db3ddb4bfdf5f"/>
15101518
<approved hash="5,1,1cc4ca0d172e2275"/>
1519+
<approved hash="5,1,343eca01192a0aeb"/>
15111520
<approved hash="19,1,aa456681e77b2bbf"/>
15121521
<approved hash="19,1,dc41b7a1b4b7df57"/>
1522+
<approved hash="19,1,3705fd25a0a28688"/>
15131523
<approved hash="19,1,29a8f185ac629a15"/>
15141524
<approved hash="19,1,3dfeff6da3428e1f"/>
15151525
<approved hash="19,1,0d53f8c5a50ab8da"/>
1516-
<approved hash="19,1,3705fd25a0a28688"/>
15171526
<approved hash="5,1,83ce3b4c51f791c4"/>
1518-
<approved hash="19,1,32d003a10992d4e9"/>
1519-
<approved hash="5,1,763e6ad1d68e8a92"/>
1520-
<approved hash="19,1,2d7701db0458c6ae"/>
1521-
<approved hash="19,1,3acd3e5b0894e3cc"/>
15221527
<approved hash="19,1,09ee07350d52ebcf"/>
1523-
<approved hash="5,1,4f60635a1396becd"/>
15241528
<approved hash="5,1,4b48579fec108f26"/>
1529+
<approved hash="5,1,4f60635a1396becd"/>
1530+
<approved hash="19,1,3acd3e5b0894e3cc"/>
1531+
<approved hash="19,1,32d003a10992d4e9"/>
1532+
<approved hash="19,1,2d7701db0458c6ae"/>
15251533
<approved hash="4,16,2d1053d98b3ef80c"/>
15261534
<approved hash="4,16,2e6de7deb6e672ae"/>
15271535
</errors>

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy