# HG changeset patch
# User matthewreed
# Date 2021-01-17 22:15:07
# Node ID 6d3585afc018e0cd9b907bb4239db3b19ed509e1
# Parent  f932211609fc34de879d6b3b407527da7fadcfba

Fixed merge mistake

diff --git a/lbr/Protofusion.lbr b/lbr/Protofusion.lbr
--- a/lbr/Protofusion.lbr
+++ b/lbr/Protofusion.lbr
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<eagle version="9.6.2">
+<eagle version="9.5.2">
 <drawing>
 <settings>
 <setting alwaysvectorfont="no"/>
@@ -3645,16 +3645,16 @@ 0603, surface mount.
 <smd name="4" x="-2.5" y="-1.4" dx="1.2" dy="1.6" layer="1"/>
 <text x="-4.81" y="0" size="0.6096" layer="25" font="vector" ratio="20" rot="R90" align="bottom-center">&gt;Name</text>
 <text x="4.81" y="0" size="0.6096" layer="27" font="vector" ratio="20" rot="R90" align="top-center">&gt;Value</text>
-<wire x1="0" y1="1.8" x2="0" y2="3.8" width="0.127" layer="21"/>
-<wire x1="0" y1="3.8" x2="1.548" y2="3.8" width="0.127" layer="21"/>
-<wire x1="1.548" y1="3.8" x2="1.548" y2="1.8" width="0.127" layer="21"/>
-<wire x1="-0.562" y1="3.8" x2="-0.362" y2="3.8" width="0.127" layer="21"/>
-<wire x1="-1.005" y1="3.8" x2="-0.805" y2="3.8" width="0.127" layer="21"/>
-<wire x1="-1.521" y1="3.8" x2="-1.321" y2="3.8" width="0.127" layer="21"/>
-<wire x1="-1.548" y1="3.3" x2="-1.548" y2="3.5" width="0.127" layer="21"/>
-<wire x1="-1.548" y1="2.8" x2="-1.548" y2="3" width="0.127" layer="21"/>
-<wire x1="-1.548" y1="2.3" x2="-1.548" y2="2.5" width="0.127" layer="21"/>
-<wire x1="-1.548" y1="1.8" x2="-1.548" y2="2" width="0.127" layer="21"/>
+<wire x1="0" y1="1.8" x2="0" y2="3.8" width="0.127" layer="51"/>
+<wire x1="0" y1="3.8" x2="1.548" y2="3.8" width="0.127" layer="51"/>
+<wire x1="1.548" y1="3.8" x2="1.548" y2="1.8" width="0.127" layer="51"/>
+<wire x1="-0.562" y1="3.8" x2="-0.362" y2="3.8" width="0.127" layer="51"/>
+<wire x1="-1.005" y1="3.8" x2="-0.805" y2="3.8" width="0.127" layer="51"/>
+<wire x1="-1.521" y1="3.8" x2="-1.321" y2="3.8" width="0.127" layer="51"/>
+<wire x1="-1.548" y1="3.3" x2="-1.548" y2="3.5" width="0.127" layer="51"/>
+<wire x1="-1.548" y1="2.8" x2="-1.548" y2="3" width="0.127" layer="51"/>
+<wire x1="-1.548" y1="2.3" x2="-1.548" y2="2.5" width="0.127" layer="51"/>
+<wire x1="-1.548" y1="1.8" x2="-1.548" y2="2" width="0.127" layer="51"/>
 </package>
 <package name="LTST-S321">
 <smd name="C" x="0" y="1.55" dx="1.5" dy="1.2" layer="1"/>
@@ -4176,6 +4176,10 @@ will be further integrated into the Spar
 <pad name="3" x="5.08" y="0" drill="1.016" diameter="1.8796" rot="R90"/>
 <text x="-1.3462" y="1.8288" size="1.27" layer="25" ratio="10">&gt;NAME</text>
 <text x="-1.27" y="-3.175" size="1.27" layer="27">&gt;VALUE</text>
+<rectangle x1="4.826" y1="-0.254" x2="5.334" y2="0.254" layer="51"/>
+<rectangle x1="2.286" y1="-0.254" x2="2.794" y2="0.254" layer="51"/>
+<rectangle x1="-0.254" y1="-0.254" x2="0.254" y2="0.254" layer="51"/>
+</package>
 <package name="TQFP32-5X5">
 <smd name="25" x="-3.1" y="1.75" dx="1.55" dy="0.25" layer="1"/>
 <smd name="26" x="-3.1" y="1.25" dx="1.55" dy="0.25" layer="1"/>
@@ -4370,10 +4374,6 @@ will be further integrated into the Spar
 <vertex x="3.556" y="1.143" curve="-90"/>
 </polygon>
 </package>
-<rectangle x1="4.826" y1="-0.254" x2="5.334" y2="0.254" layer="51"/>
-<rectangle x1="2.286" y1="-0.254" x2="2.794" y2="0.254" layer="51"/>
-<rectangle x1="-0.254" y1="-0.254" x2="0.254" y2="0.254" layer="51"/>
-</package>
 <package name="1X03_LONGPADS">
 <wire x1="-1.27" y1="0.635" x2="-1.27" y2="-0.635" width="0.2032" layer="21"/>
 <wire x1="6.35" y1="0.635" x2="6.35" y2="-0.635" width="0.2032" layer="21"/>
@@ -7422,61 +7422,6 @@ http://www.st.com/content/ccc/resource/t
 <wire x1="-8.255" y1="0" x2="-8.255" y2="-0.635" width="0.254" layer="94"/>
 <wire x1="-8.255" y1="-0.635" x2="-8.255" y2="-1.27" width="0.254" layer="94"/>
 <wire x1="-8.255" y1="-1.905" x2="-8.255" y2="-2.54" width="0.254" layer="94"/>
-<symbol name="ADS114S0XB">
-<pin name="AINCOM" x="-22.86" y="25.4" length="middle"/>
-<pin name="AIN0" x="-22.86" y="22.86" length="middle"/>
-<pin name="AIN1" x="-22.86" y="20.32" length="middle"/>
-<pin name="AIN2" x="-22.86" y="17.78" length="middle"/>
-<pin name="AIN3" x="-22.86" y="15.24" length="middle"/>
-<pin name="AIN4" x="-22.86" y="12.7" length="middle"/>
-<pin name="AIN5" x="-22.86" y="10.16" length="middle"/>
-<pin name="AIN6/REFP1" x="-22.86" y="7.62" length="middle"/>
-<pin name="AIN7/REFN1" x="-22.86" y="5.08" length="middle"/>
-<pin name="AIN8/GPIO0" x="-22.86" y="2.54" length="middle"/>
-<pin name="AIN9/GPIO1" x="-22.86" y="0" length="middle"/>
-<pin name="AIN10/GPIO2" x="-22.86" y="-2.54" length="middle"/>
-<pin name="AIN11/GPIO3" x="-22.86" y="-5.08" length="middle"/>
-<pin name="AVDD" x="-22.86" y="-20.32" length="middle"/>
-<pin name="AVSS" x="-22.86" y="-33.02" length="middle"/>
-<pin name="REFN0" x="22.86" y="27.94" length="middle" rot="R180"/>
-<pin name="REFP0" x="22.86" y="25.4" length="middle" rot="R180"/>
-<pin name="REFCOM" x="22.86" y="15.24" length="middle" rot="R180"/>
-<pin name="REFOUT" x="22.86" y="20.32" length="middle" rot="R180"/>
-<pin name="DVDD" x="22.86" y="10.16" length="middle" rot="R180"/>
-<pin name="IOVDD" x="22.86" y="7.62" length="middle" rot="R180"/>
-<pin name="!RESET" x="22.86" y="-2.54" length="middle" rot="R180"/>
-<pin name="START/SYNC" x="22.86" y="0" length="middle" rot="R180"/>
-<pin name="!CS" x="22.86" y="-5.08" length="middle" rot="R180"/>
-<pin name="SCLK" x="22.86" y="-7.62" length="middle" rot="R180"/>
-<pin name="DIN" x="22.86" y="-10.16" length="middle" rot="R180"/>
-<pin name="DOUT/!DRDY" x="22.86" y="-12.7" length="middle" rot="R180"/>
-<pin name="!DRDY" x="22.86" y="-15.24" length="middle" rot="R180"/>
-<pin name="CLK" x="22.86" y="-20.32" length="middle" rot="R180"/>
-<wire x1="-17.78" y1="30.48" x2="-17.78" y2="-38.1" width="0.254" layer="94"/>
-<wire x1="-17.78" y1="-38.1" x2="17.78" y2="-38.1" width="0.254" layer="94"/>
-<wire x1="17.78" y1="-38.1" x2="17.78" y2="30.48" width="0.254" layer="94"/>
-<wire x1="17.78" y1="30.48" x2="-17.78" y2="30.48" width="0.254" layer="94"/>
-<text x="-17.526" y="30.988" size="1.6764" layer="95" ratio="12">&gt;NAME</text>
-<text x="-17.78" y="-40.64" size="1.6764" layer="96" ratio="12">&gt;VALUE</text>
-<pin name="DGND" x="22.86" y="-33.02" length="middle" rot="R180"/>
-</symbol>
-<symbol name="DX07S016JA1R1500">
-<wire x1="-10.16" y1="-10.16" x2="-10.16" y2="12.7" width="0.254" layer="94"/>
-<wire x1="-10.16" y1="12.7" x2="10.16" y2="12.7" width="0.254" layer="94"/>
-<wire x1="10.16" y1="12.7" x2="10.16" y2="-10.16" width="0.254" layer="94"/>
-<wire x1="10.16" y1="-10.16" x2="-10.16" y2="-10.16" width="0.254" layer="94"/>
-<text x="-10.16" y="13.97" size="2.54" layer="95">&gt;NAME</text>
-<text x="-10.16" y="-11.43" size="2.54" layer="96" align="top-left">&gt;VALUE</text>
-<pin name="GND" x="15.24" y="-7.62" length="middle" direction="pwr" rot="R180"/>
-<pin name="VBUS" x="15.24" y="10.16" length="middle" direction="pwr" rot="R180"/>
-<pin name="CC1" x="-15.24" y="7.62" length="middle" direction="pas"/>
-<pin name="SBU2" x="-15.24" y="5.08" length="middle" direction="pas"/>
-<pin name="D-" x="-15.24" y="2.54" length="middle" direction="pas"/>
-<pin name="D+" x="-15.24" y="0" length="middle" direction="pas"/>
-<pin name="CC2" x="-15.24" y="-5.08" length="middle" direction="pas"/>
-<pin name="SBU1" x="-15.24" y="-2.54" length="middle" direction="pas"/>
-<pin name="SHIELD" x="15.24" y="-5.08" length="middle" direction="pas" rot="R180"/>
-</symbol>
 <wire x1="-8.255" y1="-2.54" x2="-8.255" y2="-3.175" width="0.254" layer="94"/>
 <wire x1="-8.255" y1="-2.54" x2="-5.08" y2="-2.54" width="0.254" layer="94"/>
 <wire x1="-8.255" y1="-0.635" x2="-5.08" y2="-0.635" width="0.254" layer="94"/>
@@ -7710,6 +7655,61 @@ http://www.st.com/content/ccc/resource/t
 <text x="-24.13" y="9.525" size="1.27" layer="95">&gt;Name</text>
 <text x="-24.13" y="-15.875" size="1.27" layer="95">&gt;Value</text>
 </symbol>
+<symbol name="ADS114S0XB">
+<pin name="AINCOM" x="-22.86" y="25.4" length="middle"/>
+<pin name="AIN0" x="-22.86" y="22.86" length="middle"/>
+<pin name="AIN1" x="-22.86" y="20.32" length="middle"/>
+<pin name="AIN2" x="-22.86" y="17.78" length="middle"/>
+<pin name="AIN3" x="-22.86" y="15.24" length="middle"/>
+<pin name="AIN4" x="-22.86" y="12.7" length="middle"/>
+<pin name="AIN5" x="-22.86" y="10.16" length="middle"/>
+<pin name="AIN6/REFP1" x="-22.86" y="7.62" length="middle"/>
+<pin name="AIN7/REFN1" x="-22.86" y="5.08" length="middle"/>
+<pin name="AIN8/GPIO0" x="-22.86" y="2.54" length="middle"/>
+<pin name="AIN9/GPIO1" x="-22.86" y="0" length="middle"/>
+<pin name="AIN10/GPIO2" x="-22.86" y="-2.54" length="middle"/>
+<pin name="AIN11/GPIO3" x="-22.86" y="-5.08" length="middle"/>
+<pin name="AVDD" x="-22.86" y="-20.32" length="middle"/>
+<pin name="AVSS" x="-22.86" y="-33.02" length="middle"/>
+<pin name="REFN0" x="22.86" y="27.94" length="middle" rot="R180"/>
+<pin name="REFP0" x="22.86" y="25.4" length="middle" rot="R180"/>
+<pin name="REFCOM" x="22.86" y="15.24" length="middle" rot="R180"/>
+<pin name="REFOUT" x="22.86" y="20.32" length="middle" rot="R180"/>
+<pin name="DVDD" x="22.86" y="10.16" length="middle" rot="R180"/>
+<pin name="IOVDD" x="22.86" y="7.62" length="middle" rot="R180"/>
+<pin name="!RESET" x="22.86" y="-2.54" length="middle" rot="R180"/>
+<pin name="START/SYNC" x="22.86" y="0" length="middle" rot="R180"/>
+<pin name="!CS" x="22.86" y="-5.08" length="middle" rot="R180"/>
+<pin name="SCLK" x="22.86" y="-7.62" length="middle" rot="R180"/>
+<pin name="DIN" x="22.86" y="-10.16" length="middle" rot="R180"/>
+<pin name="DOUT/!DRDY" x="22.86" y="-12.7" length="middle" rot="R180"/>
+<pin name="!DRDY" x="22.86" y="-15.24" length="middle" rot="R180"/>
+<pin name="CLK" x="22.86" y="-20.32" length="middle" rot="R180"/>
+<wire x1="-17.78" y1="30.48" x2="-17.78" y2="-38.1" width="0.254" layer="94"/>
+<wire x1="-17.78" y1="-38.1" x2="17.78" y2="-38.1" width="0.254" layer="94"/>
+<wire x1="17.78" y1="-38.1" x2="17.78" y2="30.48" width="0.254" layer="94"/>
+<wire x1="17.78" y1="30.48" x2="-17.78" y2="30.48" width="0.254" layer="94"/>
+<text x="-17.526" y="30.988" size="1.6764" layer="95" ratio="12">&gt;NAME</text>
+<text x="-17.78" y="-40.64" size="1.6764" layer="96" ratio="12">&gt;VALUE</text>
+<pin name="DGND" x="22.86" y="-33.02" length="middle" rot="R180"/>
+</symbol>
+<symbol name="DX07S016JA1R1500">
+<wire x1="-10.16" y1="-10.16" x2="-10.16" y2="12.7" width="0.254" layer="94"/>
+<wire x1="-10.16" y1="12.7" x2="10.16" y2="12.7" width="0.254" layer="94"/>
+<wire x1="10.16" y1="12.7" x2="10.16" y2="-10.16" width="0.254" layer="94"/>
+<wire x1="10.16" y1="-10.16" x2="-10.16" y2="-10.16" width="0.254" layer="94"/>
+<text x="-10.16" y="13.97" size="2.54" layer="95">&gt;NAME</text>
+<text x="-10.16" y="-11.43" size="2.54" layer="96" align="top-left">&gt;VALUE</text>
+<pin name="GND" x="15.24" y="-7.62" length="middle" direction="pwr" rot="R180"/>
+<pin name="VBUS" x="15.24" y="10.16" length="middle" direction="pwr" rot="R180"/>
+<pin name="CC1" x="-15.24" y="7.62" length="middle" direction="pas"/>
+<pin name="SBU2" x="-15.24" y="5.08" length="middle" direction="pas"/>
+<pin name="D-" x="-15.24" y="2.54" length="middle" direction="pas"/>
+<pin name="D+" x="-15.24" y="0" length="middle" direction="pas"/>
+<pin name="CC2" x="-15.24" y="-5.08" length="middle" direction="pas"/>
+<pin name="SBU1" x="-15.24" y="-2.54" length="middle" direction="pas"/>
+<pin name="SHIELD" x="15.24" y="-5.08" length="middle" direction="pas" rot="R180"/>
+</symbol>
 <symbol name="ATA6561">
 <wire x1="-10.16" y1="15.24" x2="-10.16" y2="-15.24" width="0.254" layer="94"/>
 <wire x1="-10.16" y1="-15.24" x2="10.16" y2="-15.24" width="0.254" layer="94"/>
@@ -10002,7 +10002,7 @@ Source: http://www.nxp.com/documents/dat
 <technologies>
 <technology name="">
 <attribute name="DIGIKEY_PART_NUMBER" value="" constant="no"/>
-<attribute name="MANUFACTURER" value="" constant="no"/>
+<attribute name="MANUFSYMBOLACTURER" value="" constant="no"/>
 <attribute name="PART_NUMBER" value="" constant="no"/>
 </technology>
 </technologies>
@@ -11462,12 +11462,12 @@ Zero-cross&lt;br&gt;</description>
 <devices>
 <device name="RIGHTANGLE" package="CL-SB-22A-11T">
 <connects>
-<connect gate="G$1" pin="1" pad="1"/>
-<connect gate="G$1" pin="2" pad="2"/>
-<connect gate="G$1" pin="3" pad="3"/>
-<connect gate="G$1" pin="4" pad="4"/>
-<connect gate="G$1" pin="5" pad="5"/>
-<connect gate="G$1" pin="6" pad="6"/>
+<connect gate="SW1" pin="1" pad="1"/>
+<connect gate="SW1" pin="2" pad="2"/>
+<connect gate="SW1" pin="3" pad="3"/>
+<connect gate="SW1" pin="4" pad="4"/>
+<connect gate="SW1" pin="5" pad="5"/>
+<connect gate="SW1" pin="6" pad="6"/>
 </connects>
 <technologies>
 <technology name=""/>