Merge branch 'master' of https://github.com/pyr0ball/pyr0piezo

pyr0ball · Jan 31, 2019 · 95230a3 · 95230a3
2 parents 60b4da7 + 13c3632
commit 95230a3
Show file tree

Hide file tree

Showing 6 changed files with 12,882 additions and 10,327 deletions.
diff --git a/Eagle_Files/AVR_Board_programmer.brd b/Eagle_Files/AVR_Board_programmer.brd
diff --git a/Eagle_Files/AVR_Board_programmer.sch b/Eagle_Files/AVR_Board_programmer.sch
diff --git a/Eagle_Files/PiezoStandalone1.1.brd b/Eagle_Files/PiezoStandalone1.1.brd
diff --git a/Eagle_Files/PiezoStandalone1.1.sch b/Eagle_Files/PiezoStandalone1.1.sch
diff --git a/Eagle_Files/eagle.epf b/Eagle_Files/eagle.epf
@@ -412,10 +412,17 @@ PadsSameType=0
 Layer=16
 
 [Win_2]
+<<<<<<< HEAD
+Type="Board Editor"
+Number=1
+File="Direct-Extruder-FFC-Breakout_0.1.brd"
+View="-1.21162 1.07814 61.8613 93.6926"
+=======
 Type="Schematic Editor"
 Number=2
 File="PiezoStandalone1.0.1brd.sch"
 View="25.7635 52.0077 187.995 161.159"
+>>>>>>> 79da9c6468af9ee90bc09aca5c1727b394169f21
 WireWidths=" 0.0762 0.1016 0.127 0.15 0.2 0.2032 0.254 0.3048 0.4064 0.508 0.6096 0.8128 1.016 1.27 2.54 0.1524"
 PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
 PadDrills=" 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.65 0.7 0.75 0.8 0.85 0.9 1 0.6"
@@ -453,6 +460,16 @@ SwapLevel=0
 ArcDirection=0
 AddLevel=2
 PadsSameType=0
+<<<<<<< HEAD
+Layer=1
+
+[Win_3]
+Type="Schematic Editor"
+Number=2
+File="Direct-Extruder-FFC-Breakout_0.1.sch"
+View="53.0439 42.1635 165.705 117.963"
+WireWidths=" 0.0762 0.1016 0.127 0.15 0.2 0.2032 0.254 0.3048 0.4064 0.508 0.6096 0.8128 1.016 1.27 2.54 0.1524"
+=======
 Layer=91
 Views=" 1: 25.7635 52.0077 187.995 161.159"
 Sheet="1"
@@ -463,6 +480,7 @@ Number=3
 File="C:/Users/alan weinstock/AppData/Roaming/Eagle/lbr/adsk.eagle_library_6897166/PiezoFFC.lbr"
 View="-0.508 -0.508 25.908 25.908"
 WireWidths=" 0.0762 0.1016 0.15 0.2 0.2032 0.3048 0.4064 0.508 0.6096 0.8128 1.016 1.27 2.54 0.1524 0.127 0.254"
+>>>>>>> 79da9c6468af9ee90bc09aca5c1727b394169f21
 PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
 PadDrills=" 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.65 0.7 0.75 0.8 0.85 0.9 1 0.6"
 ViaDiameters=" 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 0.95 1 1.05 1.1 1.15 1.2 1.3 0"
@@ -499,7 +517,13 @@ SwapLevel=0
 ArcDirection=0
 AddLevel=2
 PadsSameType=0
+<<<<<<< HEAD
+Layer=91
+Views=" 1: 53.0439 42.1635 165.705 117.963"
+Sheet="1"
+=======
 Layer=16
+>>>>>>> 79da9c6468af9ee90bc09aca5c1727b394169f21
 
 [Win_4]
 Type="Control Panel"

diff --git a/README.md b/README.md
@@ -19,10 +19,6 @@ Credit must be given to precisionpiezo.co.uk for getting me started on this proj
 
 I've since started from scratch using my own BOM and designs, while including an onboard microcontroller to handle auto-calibration. Given that every 3D printer is different, I wanted this sensor to be as easy and stable as other sensors available on the market, but with the increased performance of a piezo sensor.
 
-This page may be updated less frequently than the github project, so for the latest information, files, and models, make sure to check there first:
-
-https://github.com/pyr0ball/pyr0piezo
-
 Legacy links:
 
 [Original Mount (Doesn't work as well as I'd like)](https://www.thingiverse.com/thing:2712439)