Browse Source

Change MAX regulator package

- Change MAX package to drill-pin
- Move button to bottom layout
- Move elements for better work on regulator and ECU
Alexey Edelev 4 years ago
parent
commit
f1f1beffc7
49 changed files with 3929 additions and 4490 deletions
  1. 183 184
      schematic/ECU.b#1
  2. 160 161
      schematic/ECU.b#2
  3. 171 175
      schematic/ECU.b#3
  4. 171 201
      schematic/ECU.b#4
  5. 156 182
      schematic/ECU.b#5
  6. 169 193
      schematic/ECU.b#6
  7. 193 226
      schematic/ECU.b#7
  8. 190 223
      schematic/ECU.b#8
  9. 174 207
      schematic/ECU.b#9
  10. 192 193
      schematic/ECU.brd
  11. 296 290
      schematic/ECU.s#1
  12. 340 346
      schematic/ECU.s#2
  13. 313 319
      schematic/ECU.s#3
  14. 0 275
      schematic/ECU.s#4
  15. 0 275
      schematic/ECU.s#5
  16. 9 9
      schematic/ECU.s#6
  17. 12 14
      schematic/ECU.s#7
  18. 12 14
      schematic/ECU.s#8
  19. 9 11
      schematic/ECU.s#9
  20. 282 288
      schematic/ECU.sch
  21. 73 1
      schematic/eScooter.l#1
  22. 34 2
      schematic/eScooter.l#2
  23. 2 2
      schematic/eScooter.l#3
  24. 2 34
      schematic/eScooter.l#4
  25. 0 32
      schematic/eScooter.l#5
  26. 3 3
      schematic/eScooter.l#6
  27. 3 3
      schematic/eScooter.l#8
  28. 5 1
      schematic/eScooter.l#9
  29. 50 0
      schematic/eScooter.lbr
  30. 101 77
      schematic/regulator.b#1
  31. 120 95
      schematic/regulator.b#2
  32. 141 117
      schematic/regulator.b#3
  33. 52 52
      schematic/regulator.b#4
  34. 53 52
      schematic/regulator.b#5
  35. 31 31
      schematic/regulator.b#6
  36. 5 5
      schematic/regulator.b#7
  37. 3 3
      schematic/regulator.b#8
  38. 4 4
      schematic/regulator.b#9
  39. 58 73
      schematic/regulator.brd
  40. 1 1
      schematic/regulator.s#1
  41. 1 1
      schematic/regulator.s#2
  42. 1 1
      schematic/regulator.s#3
  43. 1 1
      schematic/regulator.s#4
  44. 1 1
      schematic/regulator.s#5
  45. 1 1
      schematic/regulator.s#6
  46. 1 1
      schematic/regulator.s#7
  47. 1 1
      schematic/regulator.s#8
  48. 1 1
      schematic/regulator.s#9
  49. 148 108
      schematic/regulator.sch

+ 183 - 184
schematic/ECU.b#1

@@ -539,64 +539,6 @@ CONN_03
 </package3d>
 </packages3d>
 </library>
-<library name="SparkFun-Switches" urn="urn:adsk.eagle:library:535">
-<description>&lt;h3&gt;SparkFun Switches, Buttons, Encoders&lt;/h3&gt;
-In this library you'll find switches, buttons, joysticks, and anything that moves to create or disrupt an electrical connection.
-&lt;br&gt;
-&lt;br&gt;
-We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
-&lt;br&gt;
-&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
-&lt;br&gt;
-&lt;br&gt;
-&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
-&lt;br&gt;
-&lt;br&gt;
-You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
-<packages>
-<package name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:footprint:40103/1" library_version="1">
-<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square&lt;/h3&gt;
-&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
-&lt;p&gt;&lt;a href="https://www.omron.com/ecb/products/pdf/en-b3f.pdf"&gt;Datasheet&lt;/a&gt; (B3F-1000)&lt;/p&gt;</description>
-<wire x1="3.048" y1="1.016" x2="3.048" y2="2.54" width="0.2032" layer="51"/>
-<wire x1="3.048" y1="2.54" x2="2.54" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="-3.048" x2="3.048" y2="-2.54" width="0.2032" layer="51"/>
-<wire x1="3.048" y1="-2.54" x2="3.048" y2="-1.016" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="3.048" x2="-3.048" y2="2.54" width="0.2032" layer="51"/>
-<wire x1="-3.048" y1="2.54" x2="-3.048" y2="1.016" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-3.048" x2="-3.048" y2="-2.54" width="0.2032" layer="51"/>
-<wire x1="-3.048" y1="-2.54" x2="-3.048" y2="-1.016" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-3.048" x2="-2.159" y2="-3.048" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="3.048" x2="2.159" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.159" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="21"/>
-<wire x1="-2.159" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="21"/>
-<wire x1="3.048" y1="0.998" x2="3.048" y2="-1.016" width="0.2032" layer="21"/>
-<wire x1="-3.048" y1="1.028" x2="-3.048" y2="-1.016" width="0.2032" layer="21"/>
-<wire x1="-2.54" y1="1.27" x2="-2.54" y2="0.508" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-0.508" x2="-2.54" y2="-1.27" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="0.508" x2="-2.159" y2="-0.381" width="0.2032" layer="51"/>
-<circle x="0" y="0" radius="1.778" width="0.2032" layer="21"/>
-<pad name="1" x="-3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="2" x="3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="3" x="-3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="4" x="3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
-<text x="0" y="3.302" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
-<text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
-</package>
-</packages>
-<packages3d>
-<package3d name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:package:40163/1" type="box" library_version="1">
-<description>Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square
-Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
-Datasheet (B3F-1000)</description>
-<packageinstances>
-<packageinstance name="TACTILE_SWITCH_PTH_6.0MM"/>
-</packageinstances>
-</package3d>
-</packages3d>
-</library>
 <library name="eScooter">
 <packages>
 <package name="DIOM5027X220N" urn="urn:adsk.eagle:footprint:21928331/1">
@@ -679,7 +621,65 @@ Datasheet (B3F-1000)</description>
 </package3d>
 </packages3d>
 </library>
-<library name="buzzer" urn="urn:adsk.eagle:library:113">
+<library name="SparkFun-Switches">
+<description>&lt;h3&gt;SparkFun Switches, Buttons, Encoders&lt;/h3&gt;
+In this library you'll find switches, buttons, joysticks, and anything that moves to create or disrupt an electrical connection.
+&lt;br&gt;
+&lt;br&gt;
+We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
+&lt;br&gt;
+&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
+&lt;br&gt;
+&lt;br&gt;
+&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
+&lt;br&gt;
+&lt;br&gt;
+You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
+<packages>
+<package name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:footprint:40103/1">
+<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square&lt;/h3&gt;
+&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
+&lt;p&gt;&lt;a href="https://www.omron.com/ecb/products/pdf/en-b3f.pdf"&gt;Datasheet&lt;/a&gt; (B3F-1000)&lt;/p&gt;</description>
+<wire x1="3.048" y1="1.016" x2="3.048" y2="2.54" width="0.2032" layer="51"/>
+<wire x1="3.048" y1="2.54" x2="2.54" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="-3.048" x2="3.048" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="3.048" y1="-2.54" x2="3.048" y2="-1.016" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="3.048" x2="-3.048" y2="2.54" width="0.2032" layer="51"/>
+<wire x1="-3.048" y1="2.54" x2="-3.048" y2="1.016" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-3.048" x2="-3.048" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="-3.048" y1="-2.54" x2="-3.048" y2="-1.016" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-3.048" x2="-2.159" y2="-3.048" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="3.048" x2="2.159" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.159" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="21"/>
+<wire x1="-2.159" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="21"/>
+<wire x1="3.048" y1="0.998" x2="3.048" y2="-1.016" width="0.2032" layer="21"/>
+<wire x1="-3.048" y1="1.028" x2="-3.048" y2="-1.016" width="0.2032" layer="21"/>
+<wire x1="-2.54" y1="1.27" x2="-2.54" y2="0.508" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-0.508" x2="-2.54" y2="-1.27" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="0.508" x2="-2.159" y2="-0.381" width="0.2032" layer="51"/>
+<circle x="0" y="0" radius="1.778" width="0.2032" layer="21"/>
+<pad name="1" x="-3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="2" x="3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="3" x="-3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="4" x="3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
+<text x="0" y="3.302" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
+<text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
+</package>
+</packages>
+<packages3d>
+<package3d name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:package:40163/1" type="box">
+<description>Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square
+Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
+Datasheet (B3F-1000)</description>
+<packageinstances>
+<packageinstance name="TACTILE_SWITCH_PTH_6.0MM"/>
+</packageinstances>
+</package3d>
+</packages3d>
+</library>
+<library name="buzzer">
 <description>&lt;b&gt;Speakers and Buzzers&lt;/b&gt;&lt;p&gt;
 &lt;ul&gt;Distributors:
 &lt;li&gt;Buerklin
@@ -688,21 +688,17 @@ Datasheet (B3F-1000)</description>
 &lt;/ul&gt;
 &lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
 <packages>
-<package name="F/HGP" urn="urn:adsk.eagle:footprint:5238/1" library_version="2">
+<package name="F/HGP" urn="urn:adsk.eagle:footprint:5238/1" locally_modified="yes">
 <description>&lt;b&gt;BUZZER&lt;/b&gt;</description>
-<wire x1="-7.8361" y1="-1.6158" x2="-7.8361" y2="1.6158" width="0.1524" layer="21" curve="336.697868"/>
-<wire x1="-5.882" y1="-2.032" x2="-5.882" y2="2.032" width="0.1524" layer="21" curve="321.883357"/>
-<wire x1="-6.604" y1="2.032" x2="-6.604" y2="-2.032" width="0.1524" layer="21" curve="180"/>
-<wire x1="-6.604" y1="-2.032" x2="-5.882" y2="-2.032" width="0.1524" layer="21"/>
-<wire x1="-6.604" y1="2.032" x2="-5.882" y2="2.032" width="0.1524" layer="21"/>
 <pad name="1" x="-3.81" y="0" drill="1.016" diameter="2.159" shape="octagon"/>
 <pad name="2" x="3.81" y="0" drill="1.016" diameter="2.159" shape="octagon"/>
 <text x="4.445" y="6.985" size="1.27" layer="25" ratio="10">&gt;NAME</text>
 <text x="-3.683" y="-3.81" size="1.27" layer="27" ratio="10">&gt;VALUE</text>
+<circle x="0" y="0" radius="6.0827625" width="0.127" layer="21"/>
 </package>
 </packages>
 <packages3d>
-<package3d name="F/HGP" urn="urn:adsk.eagle:package:5287/1" type="box" library_version="2">
+<package3d name="F/HGP" urn="urn:adsk.eagle:package:5287/1" type="box">
 <description>BUZZER</description>
 <packageinstances>
 <packageinstance name="F/HGP"/>
@@ -903,73 +899,73 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="9.43" y="58.23" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Capacitor" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="11.2867" y="58.23" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="7.5733" y="58.23" size="1.27" layer="28" rot="MR90" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<element name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="8.43" y="58.23" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Capacitor" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="10.2867" y="58.23" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="6.5733" y="58.23" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
 </element>
-<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="17.62" y="13.95" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Capacitor" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="19.4767" y="13.95" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="15.7633" y="13.95" size="1.27" layer="28" rot="MR90" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="19.12" y="11.95" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Capacitor" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="20.9767" y="11.95" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="17.2633" y="11.95" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
 </element>
-<element name="D2" library="Diode" library_urn="urn:adsk.eagle:library:16378169" package="SOD6126X290" package3d_urn="urn:adsk.eagle:package:9427057/2" value="" x="7.62" y="25.82" smashed="yes" rot="MR0">
-<attribute name="CATEGORY" value="Diode" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="DESCRIPTION" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="FORWARD_CURRENT" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="MPN" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="NAME" x="7.62" y="27.93" size="1.27" layer="26" rot="MR0" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="PART_STATUS" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="REVERSE_VOLTAGE" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="SERIES" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="SUB-CATEGORY" value="Rectifier" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="TYPE" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="VALUE" x="7.62" y="23.71" size="1.27" layer="28" rot="MR0" align="top-center"/>
+<element name="D2" library="Diode" library_urn="urn:adsk.eagle:library:16378169" package="SOD6126X290" package3d_urn="urn:adsk.eagle:package:9427057/2" value="" x="7.62" y="24.32" smashed="yes" rot="MR0">
+<attribute name="CATEGORY" value="Diode" x="-24.13" y="-34.1" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="DESCRIPTION" value="" x="-24.13" y="-34.1" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="FORWARD_CURRENT" value="" x="-24.13" y="-34.1" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-24.13" y="-34.1" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="MPN" value="" x="-24.13" y="-34.1" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="NAME" x="7.62" y="26.43" size="1.27" layer="26" rot="MR0" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-24.13" y="-34.1" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="PART_STATUS" value="" x="-24.13" y="-34.1" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="REVERSE_VOLTAGE" value="" x="-24.13" y="-34.1" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-24.13" y="-34.1" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="SERIES" value="" x="-24.13" y="-34.1" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="SUB-CATEGORY" value="Rectifier" x="-24.13" y="-34.1" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-24.13" y="-34.1" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="TYPE" value="" x="-24.13" y="-34.1" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="VALUE" x="7.62" y="22.21" size="1.27" layer="28" rot="MR0" align="top-center"/>
 </element>
-<element name="D3" library="Diode" library_urn="urn:adsk.eagle:library:16378169" package="SOD6126X290" package3d_urn="urn:adsk.eagle:package:9427057/2" value="" x="13.97" y="29.13" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Diode" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="DESCRIPTION" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="FORWARD_CURRENT" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="10.58" y="29.63" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="REVERSE_VOLTAGE" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="Rectifier" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="11.86" y="29.13" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D3" library="Diode" library_urn="urn:adsk.eagle:library:16378169" package="SOD6126X290" package3d_urn="urn:adsk.eagle:package:9427057/2" value="" x="13.47" y="30.13" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Diode" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="DESCRIPTION" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="FORWARD_CURRENT" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="10.08" y="30.63" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="REVERSE_VOLTAGE" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="Rectifier" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="11.36" y="30.13" size="1.27" layer="28" rot="MR90" align="top-center"/>
 </element>
-<element name="J1" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="Break" x="21.86" y="26.86" smashed="yes" rot="R180">
-<attribute name="NAME" x="23.13" y="25.463" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
-<attribute name="VALUE" x="23.13" y="28.892" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
+<element name="J1" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="Break" x="21.86" y="27.36" smashed="yes" rot="R180">
+<attribute name="NAME" x="23.13" y="25.963" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
+<attribute name="VALUE" x="23.13" y="29.392" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
 </element>
 <element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X06" package3d_urn="urn:adsk.eagle:package:38009/1" value="COMM" x="21.86" y="9.08" smashed="yes" rot="R90">
 <attribute name="NAME" x="20.463" y="7.81" size="0.6096" layer="25" font="vector" ratio="20" rot="R90"/>
@@ -1073,25 +1069,19 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="-48.26" y="-40.45" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="VALUE" x="6.35" y="9.08" size="1.27" layer="28" rot="MR0"/>
 </element>
-<element name="S1" library="SparkFun-Switches" library_urn="urn:adsk.eagle:library:535" package="TACTILE_SWITCH_PTH_6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value="" x="12.7" y="17.97" smashed="yes" rot="R270">
-<attribute name="NAME" x="16.002" y="17.97" size="0.6096" layer="25" font="vector" ratio="20" rot="R270" align="bottom-center"/>
-<attribute name="PROD_ID" value=" SWCH-08441" x="8.89" y="-23.94" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="SF_SKU" value="COM-00097" x="8.89" y="-23.94" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="VALUE" x="9.525" y="17.97" size="0.6096" layer="27" font="vector" ratio="20" rot="R270" align="top-center"/>
-</element>
-<element name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="17" y="24" smashed="yes" rot="MR0">
-<attribute name="NAME" x="18.27" y="25.27" size="1.27" layer="26" rot="MR0"/>
-<attribute name="SPICEMODEL" value="NONE" x="17" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="SPICEPREFIX" value="R" x="17" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="VALUE" x="18.27" y="21.46" size="1.27" layer="28" rot="MR0"/>
+<element name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="18" y="17.5" smashed="yes" rot="MR0">
+<attribute name="NAME" x="19.27" y="18.77" size="1.27" layer="26" rot="MR0"/>
+<attribute name="SPICEMODEL" value="NONE" x="18" y="17.5" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="SPICEPREFIX" value="R" x="18" y="17.5" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="VALUE" x="19.27" y="14.96" size="1.27" layer="28" rot="MR0"/>
 </element>
-<element name="D4" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="6.5" y="57" smashed="yes" rot="MR90">
-<attribute name="NAME" x="8.485" y="57" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="VALUE" x="4.515" y="57" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D4" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="5.5" y="58" smashed="yes" rot="MR90">
+<attribute name="NAME" x="7.485" y="58" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="VALUE" x="3.515" y="58" size="1.27" layer="28" rot="MR90" align="top-center"/>
 </element>
-<element name="D5" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="17.5" y="19.5" smashed="yes" rot="MR90">
-<attribute name="NAME" x="19.485" y="19.5" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="VALUE" x="15.515" y="19.5" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D5" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="18" y="24.5" smashed="yes" rot="MR180">
+<attribute name="NAME" x="18" y="22.515" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
+<attribute name="VALUE" x="18" y="26.485" size="1.27" layer="28" rot="MR180" align="top-center"/>
 </element>
 <element name="D6" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="19" y="31" smashed="yes" rot="MR180">
 <attribute name="NAME" x="19" y="34.015" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
@@ -1136,7 +1126,13 @@ design rules under a new name.</description>
 <attribute name="NAME" x="14.5" y="74.135" size="1.27" layer="25" align="bottom-center"/>
 <attribute name="VALUE" x="14.5" y="29.865" size="1.27" layer="27" align="top-center"/>
 </element>
-<element name="SG1" library="buzzer" library_urn="urn:adsk.eagle:library:113" package="F/HGP" package3d_urn="urn:adsk.eagle:package:5287/1" value="F/HGP" x="13" y="8" smashed="yes" rot="R180">
+<element name="S1" library="SparkFun-Switches" package="TACTILE_SWITCH_PTH_6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value="MOMENTARY-SWITCH-SPST-PTH-6.0MM" x="12.5" y="18.5" smashed="yes" rot="MR90">
+<attribute name="NAME" x="15.802" y="18.5" size="0.6096" layer="26" font="vector" ratio="20" rot="MR90" align="bottom-center"/>
+<attribute name="PROD_ID" value=" SWCH-08441" x="12.5" y="18.5" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SF_SKU" value="COM-00097" x="12.5" y="18.5" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="9.325" y="18.5" size="0.6096" layer="28" font="vector" ratio="20" rot="MR90" align="top-center"/>
+</element>
+<element name="SG1" library="buzzer" package="F/HGP" package3d_urn="urn:adsk.eagle:package:5287/1" value="F/HGP" x="13" y="8" smashed="yes" rot="R180">
 <attribute name="MF" value="" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MPN" value="" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="NAME" x="8.555" y="1.015" size="1.27" layer="25" ratio="10" rot="R180"/>
@@ -1151,7 +1147,6 @@ design rules under a new name.</description>
 <contactref element="Q5" pad="2"/>
 <contactref element="R1" pad="1"/>
 <contactref element="Q2" pad="2"/>
-<contactref element="S1" pad="1"/>
 <contactref element="J3" pad="2"/>
 <contactref element="Q1" pad="2"/>
 <contactref element="J5" pad="3"/>
@@ -1191,6 +1186,8 @@ design rules under a new name.</description>
 <contactref element="R5" pad="1"/>
 <contactref element="C2" pad="2"/>
 <contactref element="U1" pad="14"/>
+<contactref element="S1" pad="2"/>
+<contactref element="S1" pad="1"/>
 <contactref element="SG1" pad="1"/>
 </signal>
 <signal name="VIN">
@@ -1246,10 +1243,10 @@ design rules under a new name.</description>
 <wire x1="10.4571" y1="51.5" x2="14" y2="51.5" width="0.8128" layer="1"/>
 <via x="14" y="51.5" extent="1-16" drill="0.35"/>
 <wire x1="14" y1="51.5" x2="17" y2="48.5" width="0.8128" layer="16"/>
-<wire x1="17" y1="29.18" x2="19.32" y2="26.86" width="0.8128" layer="16"/>
+<wire x1="17" y1="29.68" x2="19.32" y2="27.36" width="0.8128" layer="16"/>
 <wire x1="17" y1="48.5" x2="17" y2="31" width="0.8128" layer="16"/>
 <contactref element="D6" pad="1"/>
-<wire x1="17" y1="31" x2="17" y2="29.18" width="0.8128" layer="16"/>
+<wire x1="17" y1="31" x2="17" y2="29.68" width="0.8128" layer="16"/>
 <wire x1="16.9" y1="31" x2="17" y2="31" width="0.8128" layer="16"/>
 <contactref element="J5" pad="2"/>
 <wire x1="2.54" y1="63.23" x2="3.31" y2="63.23" width="0.8128" layer="16"/>
@@ -1266,13 +1263,13 @@ design rules under a new name.</description>
 <via x="9.66" y="61.92" extent="1-16" drill="0.35"/>
 <contactref element="D4" pad="2"/>
 <contactref element="J5" pad="1"/>
-<wire x1="2.54" y1="60.69" x2="6.5" y2="60.69" width="0.8128" layer="16"/>
-<wire x1="6.5" y1="60.69" x2="8" y2="60.69" width="0.8128" layer="16"/>
+<wire x1="2.54" y1="60.69" x2="5.5" y2="60.69" width="0.8128" layer="16"/>
+<wire x1="5.5" y1="60.69" x2="8" y2="60.69" width="0.8128" layer="16"/>
 <wire x1="8" y1="60.69" x2="8.43" y2="60.69" width="0.8128" layer="16"/>
 <wire x1="8.43" y1="60.69" x2="9.66" y2="61.92" width="0.8128" layer="16"/>
-<wire x1="6.5" y1="59.1" x2="6.5" y2="60.69" width="0.8128" layer="16"/>
-<wire x1="8" y1="60.69" x2="8.9846" y2="59.7054" width="0.8128" layer="16"/>
-<wire x1="8.9846" y1="59.7054" x2="9.43" y2="59.7054" width="0.8128" layer="16"/>
+<wire x1="5.5" y1="60.1" x2="5.5" y2="60.69" width="0.8128" layer="16"/>
+<wire x1="8" y1="60.69" x2="8.43" y2="60.26" width="0.8128" layer="16"/>
+<wire x1="8.43" y1="60.26" x2="8.43" y2="59.7054" width="0.8128" layer="16"/>
 <contactref element="U1" pad="4"/>
 <wire x1="6.55" y1="62.16" x2="9.42" y2="62.16" width="0.8128" layer="1"/>
 <wire x1="9.42" y1="62.16" x2="9.66" y2="61.92" width="0.8128" layer="1"/>
@@ -1303,28 +1300,28 @@ design rules under a new name.</description>
 </signal>
 <signal name="ST">
 <contactref element="J1" pad="1"/>
-<wire x1="21.86" y1="26.86" x2="21.86" y2="27.86" width="0.8128" layer="1"/>
+<wire x1="21.86" y1="27.36" x2="21.86" y2="27.86" width="0.8128" layer="1"/>
 <wire x1="21.86" y1="27.86" x2="20.05" y2="29.67" width="0.8128" layer="1"/>
 <wire x1="20.05" y1="29.67" x2="20.05" y2="43.6" width="0.8128" layer="1"/>
 <contactref element="J2" pad="4"/>
 <contactref element="D5" pad="2"/>
 <wire x1="21.86" y1="16.7" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="20.5" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="21.6" x2="17.5" y2="20.5" width="0.8128" layer="16"/>
 <contactref element="R3" pad="1"/>
 <contactref element="U1" pad="20"/>
 <wire x1="20.83" y1="44.38" x2="20.05" y2="43.6" width="0.8128" layer="1"/>
 <wire x1="22.45" y1="44.38" x2="20.83" y2="44.38" width="0.8128" layer="1"/>
-<wire x1="18.422" y1="24" x2="17.5" y2="23.078" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="23.078" x2="17.5" y2="21.6" width="0.8128" layer="16"/>
-<wire x1="18.422" y1="24" x2="20" y2="24" width="0.8128" layer="16"/>
-<wire x1="20" y1="24" x2="21.86" y2="25.86" width="0.8128" layer="16"/>
-<wire x1="21.86" y1="25.86" x2="21.86" y2="26.86" width="0.8128" layer="16"/>
+<wire x1="20.1" y1="24.5" x2="21" y2="24.5" width="0.8128" layer="16"/>
+<wire x1="21" y1="24.5" x2="21.86" y2="25.36" width="0.8128" layer="16"/>
+<wire x1="21.86" y1="25.36" x2="21.86" y2="27.36" width="0.8128" layer="16"/>
+<wire x1="20.1" y1="24.5" x2="19.422" y2="23.822" width="0.8128" layer="16"/>
+<wire x1="19.422" y1="23.822" x2="19.422" y2="17.5" width="0.8128" layer="16"/>
+<wire x1="21.86" y1="16.7" x2="20.222" y2="16.7" width="0.8128" layer="16"/>
+<wire x1="20.222" y1="16.7" x2="19.422" y2="17.5" width="0.8128" layer="16"/>
 </signal>
 <signal name="BTN">
 <contactref element="D3" pad="2"/>
-<wire x1="12.7" y1="33.1048" x2="12.7" y2="53.6948" width="0.8128" layer="16"/>
-<wire x1="12.7" y1="33.1048" x2="13.97" y2="31.8348" width="0.8128" layer="16"/>
+<wire x1="12.7" y1="33.6048" x2="12.7" y2="53.6948" width="0.8128" layer="16"/>
+<wire x1="12.7" y1="33.6048" x2="13.47" y2="32.8348" width="0.8128" layer="16"/>
 <contactref element="U1" pad="25"/>
 <wire x1="22.45" y1="57.08" x2="20.58" y2="57.08" width="0.8128" layer="1"/>
 <wire x1="16.0852" y1="57.08" x2="20.58" y2="57.08" width="0.8128" layer="16"/>
@@ -1399,9 +1396,9 @@ design rules under a new name.</description>
 <contactref element="Q2" pad="1"/>
 <contactref element="R1" pad="2"/>
 <wire x1="11.43" y1="35" x2="11.43" y2="54.43" width="0.8128" layer="16"/>
-<wire x1="11.43" y1="35" x2="11.43" y2="29.9" width="0.8128" layer="16"/>
-<wire x1="11.43" y1="29.9" x2="7.45" y2="25.92" width="0.8128" layer="16"/>
-<wire x1="7.45" y1="25.92" x2="7.45" y2="16.38" width="0.8128" layer="16"/>
+<wire x1="11.43" y1="35" x2="11.43" y2="28.4" width="0.8128" layer="16"/>
+<wire x1="11.43" y1="28.4" x2="7.45" y2="24.42" width="0.8128" layer="16"/>
+<wire x1="7.45" y1="24.42" x2="7.45" y2="16.38" width="0.8128" layer="16"/>
 <wire x1="16.51" y1="48.76053125" x2="15.3924" y2="47.64293125" width="0.8128" layer="1"/>
 <wire x1="15.3924" y1="25.2476" x2="19.05" y2="21.59" width="0.8128" layer="1"/>
 <wire x1="15.3924" y1="47.64293125" x2="15.3924" y2="25.2476" width="0.8128" layer="1"/>
@@ -1438,27 +1435,30 @@ design rules under a new name.</description>
 <contactref element="Q2" pad="3"/>
 <contactref element="D2" pad="2"/>
 <wire x1="3.49" y1="14.33" x2="3.66" y2="14.16" width="0.8128" layer="16"/>
-<wire x1="3.98" y1="14.16" x2="5.25" y2="15.43" width="0.8128" layer="16"/>
-<wire x1="3.66" y1="14.16" x2="3.98" y2="14.16" width="0.8128" layer="16"/>
+<wire x1="5.25" y1="14.16" x2="5.25" y2="15.43" width="0.8128" layer="16"/>
+<wire x1="3.66" y1="14.16" x2="5.25" y2="14.16" width="0.8128" layer="16"/>
 <wire x1="5.25" y1="15.43" x2="5.25" y2="13.99" width="0.8128" layer="16"/>
 <wire x1="6.502" y1="12.738" x2="6.502" y2="11.62" width="0.8128" layer="16"/>
 <wire x1="5.25" y1="13.99" x2="6.502" y2="12.738" width="0.8128" layer="16"/>
-<wire x1="4.9152" y1="25.82" x2="5.25" y2="25.4852" width="0.8128" layer="16"/>
-<wire x1="5.25" y1="25.4852" x2="5.25" y2="15.43" width="0.8128" layer="16"/>
+<wire x1="4.9152" y1="24.32" x2="5.25" y2="23.9852" width="0.8128" layer="16"/>
+<wire x1="5.25" y1="23.9852" x2="5.25" y2="15.43" width="0.8128" layer="16"/>
 </signal>
 <signal name="N$5">
 <contactref element="D3" pad="1"/>
 <contactref element="D2" pad="1"/>
-<contactref element="S1" pad="3"/>
-<wire x1="10.3248" y1="25.82" x2="10.3248" y2="21.3358" width="0.8128" layer="16"/>
-<wire x1="10.3248" y1="21.3358" x2="10.4394" y2="21.2212" width="0.8128" layer="16"/>
-<wire x1="13.97" y1="26.4252" x2="10.93" y2="26.4252" width="0.8128" layer="16"/>
-<wire x1="10.93" y1="26.4252" x2="10.3248" y2="25.82" width="0.8128" layer="16"/>
+<wire x1="13.47" y1="27.4252" x2="13.43" y2="27.4252" width="0.8128" layer="16"/>
+<wire x1="13.43" y1="27.4252" x2="10.3248" y2="24.32" width="0.8128" layer="16"/>
 <contactref element="D8" pad="2"/>
-<wire x1="10.4394" y1="21.2212" x2="12.5" y2="19.1606" width="0.8128" layer="16"/>
-<wire x1="12.5" y1="19.1606" x2="12.5" y2="12" width="0.8128" layer="16"/>
 <wire x1="12.5" y1="12" x2="13" y2="11.5" width="0.8128" layer="16"/>
 <wire x1="13" y1="11.5" x2="14.1" y2="11.5" width="0.8128" layer="16"/>
+<contactref element="S1" pad="3"/>
+<contactref element="S1" pad="4"/>
+<wire x1="10.3248" y1="24.32" x2="10.3248" y2="21.8366" width="0.8128" layer="16"/>
+<wire x1="10.3248" y1="21.8366" x2="10.2394" y2="21.7512" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="21.7512" x2="10.2394" y2="15.2488" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="15.2488" x2="10.4882" y2="15" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="15.2488" x2="12.5" y2="12.9882" width="0.8128" layer="16"/>
+<wire x1="12.5" y1="12.9882" x2="12.5" y2="12" width="0.8128" layer="16"/>
 </signal>
 <signal name="SPOUT">
 <contactref element="J7" pad="6"/>
@@ -1473,22 +1473,21 @@ design rules under a new name.</description>
 <contactref element="J2" pad="1"/>
 <wire x1="12.3016" y1="14.1984" x2="14" y2="12.5" width="0.8128" layer="1"/>
 <wire x1="18.46946875" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="1"/>
-<wire x1="21.0146" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="16"/>
-<wire x1="17.62" y1="12.4746" x2="21.0146" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="20.5146" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="19.12" y1="10.4746" x2="20.5146" y2="9.08" width="0.8128" layer="16"/>
 <wire x1="15.04946875" y1="12.5" x2="18.46946875" y2="9.08" width="0.8128" layer="1"/>
 <wire x1="14" y1="12.5" x2="15.04946875" y2="12.5" width="0.8128" layer="1"/>
 </signal>
 <signal name="SPK">
 <wire x1="2.54" y1="37.02" x2="2.54" y2="16.7" width="0.8128" layer="1"/>
-<wire x1="2.54" y1="16.7" x2="9.12" y2="10.12" width="0.8128" layer="1"/>
+<wire x1="2.54" y1="16.7" x2="9.19" y2="10.05" width="0.8128" layer="1"/>
 <wire x1="2.54" y1="37.02" x2="4.191" y2="38.671" width="0.8128" layer="1"/>
 <wire x1="4.191" y1="46.291" x2="4.191" y2="38.671" width="0.8128" layer="1"/>
 <contactref element="U1" pad="10"/>
 <wire x1="6.55" y1="46.92" x2="4.82" y2="46.92" width="0.8128" layer="1"/>
 <wire x1="4.82" y1="46.92" x2="4.191" y2="46.291" width="0.8128" layer="1"/>
 <contactref element="SG1" pad="2"/>
-<wire x1="9.19" y1="8" x2="9.19" y2="10.05" width="0.8128" layer="1"/>
-<wire x1="9.19" y1="10.05" x2="9.12" y2="10.12" width="0.8128" layer="1"/>
+<wire x1="9.19" y1="10.05" x2="9.19" y2="8" width="0.8128" layer="1"/>
 </signal>
 <signal name="3V3">
 <contactref element="U1" pad="2"/>

+ 160 - 161
schematic/ECU.b#2

@@ -539,64 +539,6 @@ CONN_03
 </package3d>
 </packages3d>
 </library>
-<library name="SparkFun-Switches" urn="urn:adsk.eagle:library:535">
-<description>&lt;h3&gt;SparkFun Switches, Buttons, Encoders&lt;/h3&gt;
-In this library you'll find switches, buttons, joysticks, and anything that moves to create or disrupt an electrical connection.
-&lt;br&gt;
-&lt;br&gt;
-We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
-&lt;br&gt;
-&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
-&lt;br&gt;
-&lt;br&gt;
-&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
-&lt;br&gt;
-&lt;br&gt;
-You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
-<packages>
-<package name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:footprint:40103/1" library_version="1">
-<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square&lt;/h3&gt;
-&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
-&lt;p&gt;&lt;a href="https://www.omron.com/ecb/products/pdf/en-b3f.pdf"&gt;Datasheet&lt;/a&gt; (B3F-1000)&lt;/p&gt;</description>
-<wire x1="3.048" y1="1.016" x2="3.048" y2="2.54" width="0.2032" layer="51"/>
-<wire x1="3.048" y1="2.54" x2="2.54" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="-3.048" x2="3.048" y2="-2.54" width="0.2032" layer="51"/>
-<wire x1="3.048" y1="-2.54" x2="3.048" y2="-1.016" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="3.048" x2="-3.048" y2="2.54" width="0.2032" layer="51"/>
-<wire x1="-3.048" y1="2.54" x2="-3.048" y2="1.016" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-3.048" x2="-3.048" y2="-2.54" width="0.2032" layer="51"/>
-<wire x1="-3.048" y1="-2.54" x2="-3.048" y2="-1.016" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-3.048" x2="-2.159" y2="-3.048" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="3.048" x2="2.159" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.159" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="21"/>
-<wire x1="-2.159" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="21"/>
-<wire x1="3.048" y1="0.998" x2="3.048" y2="-1.016" width="0.2032" layer="21"/>
-<wire x1="-3.048" y1="1.028" x2="-3.048" y2="-1.016" width="0.2032" layer="21"/>
-<wire x1="-2.54" y1="1.27" x2="-2.54" y2="0.508" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-0.508" x2="-2.54" y2="-1.27" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="0.508" x2="-2.159" y2="-0.381" width="0.2032" layer="51"/>
-<circle x="0" y="0" radius="1.778" width="0.2032" layer="21"/>
-<pad name="1" x="-3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="2" x="3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="3" x="-3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="4" x="3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
-<text x="0" y="3.302" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
-<text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
-</package>
-</packages>
-<packages3d>
-<package3d name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:package:40163/1" type="box" library_version="1">
-<description>Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square
-Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
-Datasheet (B3F-1000)</description>
-<packageinstances>
-<packageinstance name="TACTILE_SWITCH_PTH_6.0MM"/>
-</packageinstances>
-</package3d>
-</packages3d>
-</library>
 <library name="eScooter">
 <packages>
 <package name="DIOM5027X220N" urn="urn:adsk.eagle:footprint:21928331/1">
@@ -679,7 +621,65 @@ Datasheet (B3F-1000)</description>
 </package3d>
 </packages3d>
 </library>
-<library name="buzzer" urn="urn:adsk.eagle:library:113">
+<library name="SparkFun-Switches">
+<description>&lt;h3&gt;SparkFun Switches, Buttons, Encoders&lt;/h3&gt;
+In this library you'll find switches, buttons, joysticks, and anything that moves to create or disrupt an electrical connection.
+&lt;br&gt;
+&lt;br&gt;
+We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
+&lt;br&gt;
+&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
+&lt;br&gt;
+&lt;br&gt;
+&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
+&lt;br&gt;
+&lt;br&gt;
+You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
+<packages>
+<package name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:footprint:40103/1">
+<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square&lt;/h3&gt;
+&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
+&lt;p&gt;&lt;a href="https://www.omron.com/ecb/products/pdf/en-b3f.pdf"&gt;Datasheet&lt;/a&gt; (B3F-1000)&lt;/p&gt;</description>
+<wire x1="3.048" y1="1.016" x2="3.048" y2="2.54" width="0.2032" layer="51"/>
+<wire x1="3.048" y1="2.54" x2="2.54" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="-3.048" x2="3.048" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="3.048" y1="-2.54" x2="3.048" y2="-1.016" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="3.048" x2="-3.048" y2="2.54" width="0.2032" layer="51"/>
+<wire x1="-3.048" y1="2.54" x2="-3.048" y2="1.016" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-3.048" x2="-3.048" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="-3.048" y1="-2.54" x2="-3.048" y2="-1.016" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-3.048" x2="-2.159" y2="-3.048" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="3.048" x2="2.159" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.159" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="21"/>
+<wire x1="-2.159" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="21"/>
+<wire x1="3.048" y1="0.998" x2="3.048" y2="-1.016" width="0.2032" layer="21"/>
+<wire x1="-3.048" y1="1.028" x2="-3.048" y2="-1.016" width="0.2032" layer="21"/>
+<wire x1="-2.54" y1="1.27" x2="-2.54" y2="0.508" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-0.508" x2="-2.54" y2="-1.27" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="0.508" x2="-2.159" y2="-0.381" width="0.2032" layer="51"/>
+<circle x="0" y="0" radius="1.778" width="0.2032" layer="21"/>
+<pad name="1" x="-3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="2" x="3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="3" x="-3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="4" x="3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
+<text x="0" y="3.302" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
+<text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
+</package>
+</packages>
+<packages3d>
+<package3d name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:package:40163/1" type="box">
+<description>Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square
+Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
+Datasheet (B3F-1000)</description>
+<packageinstances>
+<packageinstance name="TACTILE_SWITCH_PTH_6.0MM"/>
+</packageinstances>
+</package3d>
+</packages3d>
+</library>
+<library name="buzzer">
 <description>&lt;b&gt;Speakers and Buzzers&lt;/b&gt;&lt;p&gt;
 &lt;ul&gt;Distributors:
 &lt;li&gt;Buerklin
@@ -688,21 +688,17 @@ Datasheet (B3F-1000)</description>
 &lt;/ul&gt;
 &lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
 <packages>
-<package name="F/HGP" urn="urn:adsk.eagle:footprint:5238/1" library_version="2">
+<package name="F/HGP" urn="urn:adsk.eagle:footprint:5238/1" locally_modified="yes">
 <description>&lt;b&gt;BUZZER&lt;/b&gt;</description>
-<wire x1="-7.8361" y1="-1.6158" x2="-7.8361" y2="1.6158" width="0.1524" layer="21" curve="336.697868"/>
-<wire x1="-5.882" y1="-2.032" x2="-5.882" y2="2.032" width="0.1524" layer="21" curve="321.883357"/>
-<wire x1="-6.604" y1="2.032" x2="-6.604" y2="-2.032" width="0.1524" layer="21" curve="180"/>
-<wire x1="-6.604" y1="-2.032" x2="-5.882" y2="-2.032" width="0.1524" layer="21"/>
-<wire x1="-6.604" y1="2.032" x2="-5.882" y2="2.032" width="0.1524" layer="21"/>
 <pad name="1" x="-3.81" y="0" drill="1.016" diameter="2.159" shape="octagon"/>
 <pad name="2" x="3.81" y="0" drill="1.016" diameter="2.159" shape="octagon"/>
 <text x="4.445" y="6.985" size="1.27" layer="25" ratio="10">&gt;NAME</text>
 <text x="-3.683" y="-3.81" size="1.27" layer="27" ratio="10">&gt;VALUE</text>
+<circle x="0" y="0" radius="6.0827625" width="0.127" layer="21"/>
 </package>
 </packages>
 <packages3d>
-<package3d name="F/HGP" urn="urn:adsk.eagle:package:5287/1" type="box" library_version="2">
+<package3d name="F/HGP" urn="urn:adsk.eagle:package:5287/1" type="box">
 <description>BUZZER</description>
 <packageinstances>
 <packageinstance name="F/HGP"/>
@@ -903,35 +899,35 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="9.43" y="58.23" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Capacitor" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="11.2867" y="58.23" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="7.5733" y="58.23" size="1.27" layer="28" rot="MR90" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<element name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="8.43" y="58.23" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Capacitor" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="10.2867" y="58.23" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="6.5733" y="58.23" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
 </element>
-<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="17.62" y="13.95" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Capacitor" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="19.4767" y="13.95" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="15.7633" y="13.95" size="1.27" layer="28" rot="MR90" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="19.12" y="11.95" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Capacitor" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="20.9767" y="11.95" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="17.2633" y="11.95" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
 </element>
 <element name="D2" library="Diode" library_urn="urn:adsk.eagle:library:16378169" package="SOD6126X290" package3d_urn="urn:adsk.eagle:package:9427057/2" value="" x="7.62" y="25.82" smashed="yes" rot="MR0">
 <attribute name="CATEGORY" value="Diode" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
@@ -950,26 +946,26 @@ design rules under a new name.</description>
 <attribute name="TYPE" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="VALUE" x="7.62" y="23.71" size="1.27" layer="28" rot="MR0" align="top-center"/>
 </element>
-<element name="D3" library="Diode" library_urn="urn:adsk.eagle:library:16378169" package="SOD6126X290" package3d_urn="urn:adsk.eagle:package:9427057/2" value="" x="13.97" y="29.13" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Diode" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="DESCRIPTION" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="FORWARD_CURRENT" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="10.58" y="29.63" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="REVERSE_VOLTAGE" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="Rectifier" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="11.86" y="29.13" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D3" library="Diode" library_urn="urn:adsk.eagle:library:16378169" package="SOD6126X290" package3d_urn="urn:adsk.eagle:package:9427057/2" value="" x="13.47" y="30.13" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Diode" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="DESCRIPTION" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="FORWARD_CURRENT" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="10.08" y="30.63" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="REVERSE_VOLTAGE" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="Rectifier" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="11.36" y="30.13" size="1.27" layer="28" rot="MR90" align="top-center"/>
 </element>
-<element name="J1" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="Break" x="21.86" y="26.86" smashed="yes" rot="R180">
-<attribute name="NAME" x="23.13" y="25.463" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
-<attribute name="VALUE" x="23.13" y="28.892" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
+<element name="J1" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="Break" x="21.86" y="27.36" smashed="yes" rot="R180">
+<attribute name="NAME" x="23.13" y="25.963" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
+<attribute name="VALUE" x="23.13" y="29.392" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
 </element>
 <element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X06" package3d_urn="urn:adsk.eagle:package:38009/1" value="COMM" x="21.86" y="9.08" smashed="yes" rot="R90">
 <attribute name="NAME" x="20.463" y="7.81" size="0.6096" layer="25" font="vector" ratio="20" rot="R90"/>
@@ -1073,25 +1069,19 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="-48.26" y="-40.45" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="VALUE" x="6.35" y="9.08" size="1.27" layer="28" rot="MR0"/>
 </element>
-<element name="S1" library="SparkFun-Switches" library_urn="urn:adsk.eagle:library:535" package="TACTILE_SWITCH_PTH_6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value="" x="12.7" y="17.97" smashed="yes" rot="R270">
-<attribute name="NAME" x="16.002" y="17.97" size="0.6096" layer="25" font="vector" ratio="20" rot="R270" align="bottom-center"/>
-<attribute name="PROD_ID" value=" SWCH-08441" x="8.89" y="-23.94" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="SF_SKU" value="COM-00097" x="8.89" y="-23.94" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="VALUE" x="9.525" y="17.97" size="0.6096" layer="27" font="vector" ratio="20" rot="R270" align="top-center"/>
-</element>
-<element name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="17" y="24" smashed="yes" rot="MR0">
-<attribute name="NAME" x="18.27" y="25.27" size="1.27" layer="26" rot="MR0"/>
-<attribute name="SPICEMODEL" value="NONE" x="17" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="SPICEPREFIX" value="R" x="17" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="VALUE" x="18.27" y="21.46" size="1.27" layer="28" rot="MR0"/>
+<element name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="18" y="17.5" smashed="yes" rot="MR0">
+<attribute name="NAME" x="19.27" y="18.77" size="1.27" layer="26" rot="MR0"/>
+<attribute name="SPICEMODEL" value="NONE" x="18" y="17.5" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="SPICEPREFIX" value="R" x="18" y="17.5" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="VALUE" x="19.27" y="14.96" size="1.27" layer="28" rot="MR0"/>
 </element>
-<element name="D4" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="6.5" y="57" smashed="yes" rot="MR90">
-<attribute name="NAME" x="8.485" y="57" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="VALUE" x="4.515" y="57" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D4" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="5.5" y="58" smashed="yes" rot="MR90">
+<attribute name="NAME" x="7.485" y="58" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="VALUE" x="3.515" y="58" size="1.27" layer="28" rot="MR90" align="top-center"/>
 </element>
-<element name="D5" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="17.5" y="19.5" smashed="yes" rot="MR90">
-<attribute name="NAME" x="19.485" y="19.5" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="VALUE" x="15.515" y="19.5" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D5" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="18" y="24.5" smashed="yes" rot="MR180">
+<attribute name="NAME" x="18" y="22.515" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
+<attribute name="VALUE" x="18" y="26.485" size="1.27" layer="28" rot="MR180" align="top-center"/>
 </element>
 <element name="D6" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="19" y="31" smashed="yes" rot="MR180">
 <attribute name="NAME" x="19" y="34.015" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
@@ -1136,7 +1126,13 @@ design rules under a new name.</description>
 <attribute name="NAME" x="14.5" y="74.135" size="1.27" layer="25" align="bottom-center"/>
 <attribute name="VALUE" x="14.5" y="29.865" size="1.27" layer="27" align="top-center"/>
 </element>
-<element name="SG1" library="buzzer" library_urn="urn:adsk.eagle:library:113" package="F/HGP" package3d_urn="urn:adsk.eagle:package:5287/1" value="F/HGP" x="13" y="8" smashed="yes" rot="R180">
+<element name="S1" library="SparkFun-Switches" package="TACTILE_SWITCH_PTH_6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value="MOMENTARY-SWITCH-SPST-PTH-6.0MM" x="12.5" y="18.5" smashed="yes" rot="MR90">
+<attribute name="NAME" x="15.802" y="18.5" size="0.6096" layer="26" font="vector" ratio="20" rot="MR90" align="bottom-center"/>
+<attribute name="PROD_ID" value=" SWCH-08441" x="12.5" y="18.5" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SF_SKU" value="COM-00097" x="12.5" y="18.5" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="9.325" y="18.5" size="0.6096" layer="28" font="vector" ratio="20" rot="MR90" align="top-center"/>
+</element>
+<element name="SG1" library="buzzer" package="F/HGP" package3d_urn="urn:adsk.eagle:package:5287/1" value="F/HGP" x="13" y="8" smashed="yes" rot="R180">
 <attribute name="MF" value="" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MPN" value="" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="NAME" x="8.555" y="1.015" size="1.27" layer="25" ratio="10" rot="R180"/>
@@ -1151,7 +1147,6 @@ design rules under a new name.</description>
 <contactref element="Q5" pad="2"/>
 <contactref element="R1" pad="1"/>
 <contactref element="Q2" pad="2"/>
-<contactref element="S1" pad="1"/>
 <contactref element="J3" pad="2"/>
 <contactref element="Q1" pad="2"/>
 <contactref element="J5" pad="3"/>
@@ -1191,6 +1186,8 @@ design rules under a new name.</description>
 <contactref element="R5" pad="1"/>
 <contactref element="C2" pad="2"/>
 <contactref element="U1" pad="14"/>
+<contactref element="S1" pad="2"/>
+<contactref element="S1" pad="1"/>
 <contactref element="SG1" pad="1"/>
 </signal>
 <signal name="VIN">
@@ -1246,10 +1243,10 @@ design rules under a new name.</description>
 <wire x1="10.4571" y1="51.5" x2="14" y2="51.5" width="0.8128" layer="1"/>
 <via x="14" y="51.5" extent="1-16" drill="0.35"/>
 <wire x1="14" y1="51.5" x2="17" y2="48.5" width="0.8128" layer="16"/>
-<wire x1="17" y1="29.18" x2="19.32" y2="26.86" width="0.8128" layer="16"/>
+<wire x1="17" y1="29.68" x2="19.32" y2="27.36" width="0.8128" layer="16"/>
 <wire x1="17" y1="48.5" x2="17" y2="31" width="0.8128" layer="16"/>
 <contactref element="D6" pad="1"/>
-<wire x1="17" y1="31" x2="17" y2="29.18" width="0.8128" layer="16"/>
+<wire x1="17" y1="31" x2="17" y2="29.68" width="0.8128" layer="16"/>
 <wire x1="16.9" y1="31" x2="17" y2="31" width="0.8128" layer="16"/>
 <contactref element="J5" pad="2"/>
 <wire x1="2.54" y1="63.23" x2="3.31" y2="63.23" width="0.8128" layer="16"/>
@@ -1266,13 +1263,13 @@ design rules under a new name.</description>
 <via x="9.66" y="61.92" extent="1-16" drill="0.35"/>
 <contactref element="D4" pad="2"/>
 <contactref element="J5" pad="1"/>
-<wire x1="2.54" y1="60.69" x2="6.5" y2="60.69" width="0.8128" layer="16"/>
-<wire x1="6.5" y1="60.69" x2="8" y2="60.69" width="0.8128" layer="16"/>
+<wire x1="2.54" y1="60.69" x2="5.5" y2="60.69" width="0.8128" layer="16"/>
+<wire x1="5.5" y1="60.69" x2="8" y2="60.69" width="0.8128" layer="16"/>
 <wire x1="8" y1="60.69" x2="8.43" y2="60.69" width="0.8128" layer="16"/>
 <wire x1="8.43" y1="60.69" x2="9.66" y2="61.92" width="0.8128" layer="16"/>
-<wire x1="6.5" y1="59.1" x2="6.5" y2="60.69" width="0.8128" layer="16"/>
-<wire x1="8" y1="60.69" x2="8.9846" y2="59.7054" width="0.8128" layer="16"/>
-<wire x1="8.9846" y1="59.7054" x2="9.43" y2="59.7054" width="0.8128" layer="16"/>
+<wire x1="5.5" y1="60.1" x2="5.5" y2="60.69" width="0.8128" layer="16"/>
+<wire x1="8" y1="60.69" x2="8.43" y2="60.26" width="0.8128" layer="16"/>
+<wire x1="8.43" y1="60.26" x2="8.43" y2="59.7054" width="0.8128" layer="16"/>
 <contactref element="U1" pad="4"/>
 <wire x1="6.55" y1="62.16" x2="9.42" y2="62.16" width="0.8128" layer="1"/>
 <wire x1="9.42" y1="62.16" x2="9.66" y2="61.92" width="0.8128" layer="1"/>
@@ -1303,28 +1300,28 @@ design rules under a new name.</description>
 </signal>
 <signal name="ST">
 <contactref element="J1" pad="1"/>
-<wire x1="21.86" y1="26.86" x2="21.86" y2="27.86" width="0.8128" layer="1"/>
+<wire x1="21.86" y1="27.36" x2="21.86" y2="27.86" width="0.8128" layer="1"/>
 <wire x1="21.86" y1="27.86" x2="20.05" y2="29.67" width="0.8128" layer="1"/>
 <wire x1="20.05" y1="29.67" x2="20.05" y2="43.6" width="0.8128" layer="1"/>
 <contactref element="J2" pad="4"/>
 <contactref element="D5" pad="2"/>
 <wire x1="21.86" y1="16.7" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="20.5" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="21.6" x2="17.5" y2="20.5" width="0.8128" layer="16"/>
 <contactref element="R3" pad="1"/>
 <contactref element="U1" pad="20"/>
 <wire x1="20.83" y1="44.38" x2="20.05" y2="43.6" width="0.8128" layer="1"/>
 <wire x1="22.45" y1="44.38" x2="20.83" y2="44.38" width="0.8128" layer="1"/>
-<wire x1="18.422" y1="24" x2="17.5" y2="23.078" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="23.078" x2="17.5" y2="21.6" width="0.8128" layer="16"/>
-<wire x1="18.422" y1="24" x2="20" y2="24" width="0.8128" layer="16"/>
-<wire x1="20" y1="24" x2="21.86" y2="25.86" width="0.8128" layer="16"/>
-<wire x1="21.86" y1="25.86" x2="21.86" y2="26.86" width="0.8128" layer="16"/>
+<wire x1="20.1" y1="24.5" x2="21" y2="24.5" width="0.8128" layer="16"/>
+<wire x1="21" y1="24.5" x2="21.86" y2="25.36" width="0.8128" layer="16"/>
+<wire x1="21.86" y1="25.36" x2="21.86" y2="27.36" width="0.8128" layer="16"/>
+<wire x1="20.1" y1="24.5" x2="19.422" y2="23.822" width="0.8128" layer="16"/>
+<wire x1="19.422" y1="23.822" x2="19.422" y2="17.5" width="0.8128" layer="16"/>
+<wire x1="21.86" y1="16.7" x2="20.222" y2="16.7" width="0.8128" layer="16"/>
+<wire x1="20.222" y1="16.7" x2="19.422" y2="17.5" width="0.8128" layer="16"/>
 </signal>
 <signal name="BTN">
 <contactref element="D3" pad="2"/>
-<wire x1="12.7" y1="33.1048" x2="12.7" y2="53.6948" width="0.8128" layer="16"/>
-<wire x1="12.7" y1="33.1048" x2="13.97" y2="31.8348" width="0.8128" layer="16"/>
+<wire x1="12.7" y1="33.6048" x2="12.7" y2="53.6948" width="0.8128" layer="16"/>
+<wire x1="12.7" y1="33.6048" x2="13.47" y2="32.8348" width="0.8128" layer="16"/>
 <contactref element="U1" pad="25"/>
 <wire x1="22.45" y1="57.08" x2="20.58" y2="57.08" width="0.8128" layer="1"/>
 <wire x1="16.0852" y1="57.08" x2="20.58" y2="57.08" width="0.8128" layer="16"/>
@@ -1449,16 +1446,19 @@ design rules under a new name.</description>
 <signal name="N$5">
 <contactref element="D3" pad="1"/>
 <contactref element="D2" pad="1"/>
-<contactref element="S1" pad="3"/>
-<wire x1="10.3248" y1="25.82" x2="10.3248" y2="21.3358" width="0.8128" layer="16"/>
-<wire x1="10.3248" y1="21.3358" x2="10.4394" y2="21.2212" width="0.8128" layer="16"/>
-<wire x1="13.97" y1="26.4252" x2="10.93" y2="26.4252" width="0.8128" layer="16"/>
-<wire x1="10.93" y1="26.4252" x2="10.3248" y2="25.82" width="0.8128" layer="16"/>
+<wire x1="13.47" y1="27.4252" x2="11.93" y2="27.4252" width="0.8128" layer="16"/>
+<wire x1="11.93" y1="27.4252" x2="10.3248" y2="25.82" width="0.8128" layer="16"/>
 <contactref element="D8" pad="2"/>
-<wire x1="10.4394" y1="21.2212" x2="12.5" y2="19.1606" width="0.8128" layer="16"/>
-<wire x1="12.5" y1="19.1606" x2="12.5" y2="12" width="0.8128" layer="16"/>
 <wire x1="12.5" y1="12" x2="13" y2="11.5" width="0.8128" layer="16"/>
 <wire x1="13" y1="11.5" x2="14.1" y2="11.5" width="0.8128" layer="16"/>
+<contactref element="S1" pad="3"/>
+<contactref element="S1" pad="4"/>
+<wire x1="10.3248" y1="25.82" x2="10.3248" y2="21.8366" width="0.8128" layer="16"/>
+<wire x1="10.3248" y1="21.8366" x2="10.2394" y2="21.7512" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="21.7512" x2="10.2394" y2="15.2488" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="15.2488" x2="10.4882" y2="15" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="15.2488" x2="12.5" y2="12.9882" width="0.8128" layer="16"/>
+<wire x1="12.5" y1="12.9882" x2="12.5" y2="12" width="0.8128" layer="16"/>
 </signal>
 <signal name="SPOUT">
 <contactref element="J7" pad="6"/>
@@ -1473,22 +1473,21 @@ design rules under a new name.</description>
 <contactref element="J2" pad="1"/>
 <wire x1="12.3016" y1="14.1984" x2="14" y2="12.5" width="0.8128" layer="1"/>
 <wire x1="18.46946875" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="1"/>
-<wire x1="21.0146" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="16"/>
-<wire x1="17.62" y1="12.4746" x2="21.0146" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="20.5146" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="19.12" y1="10.4746" x2="20.5146" y2="9.08" width="0.8128" layer="16"/>
 <wire x1="15.04946875" y1="12.5" x2="18.46946875" y2="9.08" width="0.8128" layer="1"/>
 <wire x1="14" y1="12.5" x2="15.04946875" y2="12.5" width="0.8128" layer="1"/>
 </signal>
 <signal name="SPK">
 <wire x1="2.54" y1="37.02" x2="2.54" y2="16.7" width="0.8128" layer="1"/>
-<wire x1="2.54" y1="16.7" x2="9.12" y2="10.12" width="0.8128" layer="1"/>
+<wire x1="2.54" y1="16.7" x2="9.19" y2="10.05" width="0.8128" layer="1"/>
 <wire x1="2.54" y1="37.02" x2="4.191" y2="38.671" width="0.8128" layer="1"/>
 <wire x1="4.191" y1="46.291" x2="4.191" y2="38.671" width="0.8128" layer="1"/>
 <contactref element="U1" pad="10"/>
 <wire x1="6.55" y1="46.92" x2="4.82" y2="46.92" width="0.8128" layer="1"/>
 <wire x1="4.82" y1="46.92" x2="4.191" y2="46.291" width="0.8128" layer="1"/>
 <contactref element="SG1" pad="2"/>
-<wire x1="9.19" y1="8" x2="9.19" y2="10.05" width="0.8128" layer="1"/>
-<wire x1="9.19" y1="10.05" x2="9.12" y2="10.12" width="0.8128" layer="1"/>
+<wire x1="9.19" y1="10.05" x2="9.19" y2="8" width="0.8128" layer="1"/>
 </signal>
 <signal name="3V3">
 <contactref element="U1" pad="2"/>

+ 171 - 175
schematic/ECU.b#3

@@ -539,64 +539,6 @@ CONN_03
 </package3d>
 </packages3d>
 </library>
-<library name="SparkFun-Switches" urn="urn:adsk.eagle:library:535">
-<description>&lt;h3&gt;SparkFun Switches, Buttons, Encoders&lt;/h3&gt;
-In this library you'll find switches, buttons, joysticks, and anything that moves to create or disrupt an electrical connection.
-&lt;br&gt;
-&lt;br&gt;
-We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
-&lt;br&gt;
-&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
-&lt;br&gt;
-&lt;br&gt;
-&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
-&lt;br&gt;
-&lt;br&gt;
-You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
-<packages>
-<package name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:footprint:40103/1" library_version="1">
-<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square&lt;/h3&gt;
-&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
-&lt;p&gt;&lt;a href="https://www.omron.com/ecb/products/pdf/en-b3f.pdf"&gt;Datasheet&lt;/a&gt; (B3F-1000)&lt;/p&gt;</description>
-<wire x1="3.048" y1="1.016" x2="3.048" y2="2.54" width="0.2032" layer="51"/>
-<wire x1="3.048" y1="2.54" x2="2.54" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="-3.048" x2="3.048" y2="-2.54" width="0.2032" layer="51"/>
-<wire x1="3.048" y1="-2.54" x2="3.048" y2="-1.016" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="3.048" x2="-3.048" y2="2.54" width="0.2032" layer="51"/>
-<wire x1="-3.048" y1="2.54" x2="-3.048" y2="1.016" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-3.048" x2="-3.048" y2="-2.54" width="0.2032" layer="51"/>
-<wire x1="-3.048" y1="-2.54" x2="-3.048" y2="-1.016" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-3.048" x2="-2.159" y2="-3.048" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="3.048" x2="2.159" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.159" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="21"/>
-<wire x1="-2.159" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="21"/>
-<wire x1="3.048" y1="0.998" x2="3.048" y2="-1.016" width="0.2032" layer="21"/>
-<wire x1="-3.048" y1="1.028" x2="-3.048" y2="-1.016" width="0.2032" layer="21"/>
-<wire x1="-2.54" y1="1.27" x2="-2.54" y2="0.508" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-0.508" x2="-2.54" y2="-1.27" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="0.508" x2="-2.159" y2="-0.381" width="0.2032" layer="51"/>
-<circle x="0" y="0" radius="1.778" width="0.2032" layer="21"/>
-<pad name="1" x="-3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="2" x="3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="3" x="-3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="4" x="3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
-<text x="0" y="3.302" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
-<text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
-</package>
-</packages>
-<packages3d>
-<package3d name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:package:40163/1" type="box" library_version="1">
-<description>Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square
-Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
-Datasheet (B3F-1000)</description>
-<packageinstances>
-<packageinstance name="TACTILE_SWITCH_PTH_6.0MM"/>
-</packageinstances>
-</package3d>
-</packages3d>
-</library>
 <library name="eScooter">
 <packages>
 <package name="DIOM5027X220N" urn="urn:adsk.eagle:footprint:21928331/1">
@@ -679,7 +621,65 @@ Datasheet (B3F-1000)</description>
 </package3d>
 </packages3d>
 </library>
-<library name="buzzer" urn="urn:adsk.eagle:library:113">
+<library name="SparkFun-Switches">
+<description>&lt;h3&gt;SparkFun Switches, Buttons, Encoders&lt;/h3&gt;
+In this library you'll find switches, buttons, joysticks, and anything that moves to create or disrupt an electrical connection.
+&lt;br&gt;
+&lt;br&gt;
+We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
+&lt;br&gt;
+&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
+&lt;br&gt;
+&lt;br&gt;
+&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
+&lt;br&gt;
+&lt;br&gt;
+You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
+<packages>
+<package name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:footprint:40103/1">
+<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square&lt;/h3&gt;
+&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
+&lt;p&gt;&lt;a href="https://www.omron.com/ecb/products/pdf/en-b3f.pdf"&gt;Datasheet&lt;/a&gt; (B3F-1000)&lt;/p&gt;</description>
+<wire x1="3.048" y1="1.016" x2="3.048" y2="2.54" width="0.2032" layer="51"/>
+<wire x1="3.048" y1="2.54" x2="2.54" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="-3.048" x2="3.048" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="3.048" y1="-2.54" x2="3.048" y2="-1.016" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="3.048" x2="-3.048" y2="2.54" width="0.2032" layer="51"/>
+<wire x1="-3.048" y1="2.54" x2="-3.048" y2="1.016" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-3.048" x2="-3.048" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="-3.048" y1="-2.54" x2="-3.048" y2="-1.016" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-3.048" x2="-2.159" y2="-3.048" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="3.048" x2="2.159" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.159" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="21"/>
+<wire x1="-2.159" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="21"/>
+<wire x1="3.048" y1="0.998" x2="3.048" y2="-1.016" width="0.2032" layer="21"/>
+<wire x1="-3.048" y1="1.028" x2="-3.048" y2="-1.016" width="0.2032" layer="21"/>
+<wire x1="-2.54" y1="1.27" x2="-2.54" y2="0.508" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-0.508" x2="-2.54" y2="-1.27" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="0.508" x2="-2.159" y2="-0.381" width="0.2032" layer="51"/>
+<circle x="0" y="0" radius="1.778" width="0.2032" layer="21"/>
+<pad name="1" x="-3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="2" x="3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="3" x="-3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="4" x="3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
+<text x="0" y="3.302" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
+<text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
+</package>
+</packages>
+<packages3d>
+<package3d name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:package:40163/1" type="box">
+<description>Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square
+Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
+Datasheet (B3F-1000)</description>
+<packageinstances>
+<packageinstance name="TACTILE_SWITCH_PTH_6.0MM"/>
+</packageinstances>
+</package3d>
+</packages3d>
+</library>
+<library name="buzzer">
 <description>&lt;b&gt;Speakers and Buzzers&lt;/b&gt;&lt;p&gt;
 &lt;ul&gt;Distributors:
 &lt;li&gt;Buerklin
@@ -688,21 +688,17 @@ Datasheet (B3F-1000)</description>
 &lt;/ul&gt;
 &lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
 <packages>
-<package name="F/HGP" urn="urn:adsk.eagle:footprint:5238/1" library_version="2">
+<package name="F/HGP" urn="urn:adsk.eagle:footprint:5238/1" locally_modified="yes">
 <description>&lt;b&gt;BUZZER&lt;/b&gt;</description>
-<wire x1="-7.8361" y1="-1.6158" x2="-7.8361" y2="1.6158" width="0.1524" layer="21" curve="336.697868"/>
-<wire x1="-5.882" y1="-2.032" x2="-5.882" y2="2.032" width="0.1524" layer="21" curve="321.883357"/>
-<wire x1="-6.604" y1="2.032" x2="-6.604" y2="-2.032" width="0.1524" layer="21" curve="180"/>
-<wire x1="-6.604" y1="-2.032" x2="-5.882" y2="-2.032" width="0.1524" layer="21"/>
-<wire x1="-6.604" y1="2.032" x2="-5.882" y2="2.032" width="0.1524" layer="21"/>
 <pad name="1" x="-3.81" y="0" drill="1.016" diameter="2.159" shape="octagon"/>
 <pad name="2" x="3.81" y="0" drill="1.016" diameter="2.159" shape="octagon"/>
 <text x="4.445" y="6.985" size="1.27" layer="25" ratio="10">&gt;NAME</text>
 <text x="-3.683" y="-3.81" size="1.27" layer="27" ratio="10">&gt;VALUE</text>
+<circle x="0" y="0" radius="6.0827625" width="0.127" layer="21"/>
 </package>
 </packages>
 <packages3d>
-<package3d name="F/HGP" urn="urn:adsk.eagle:package:5287/1" type="box" library_version="2">
+<package3d name="F/HGP" urn="urn:adsk.eagle:package:5287/1" type="box">
 <description>BUZZER</description>
 <packageinstances>
 <packageinstance name="F/HGP"/>
@@ -903,35 +899,35 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="9.43" y="58.23" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Capacitor" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="11.2867" y="58.23" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="7.5733" y="58.23" size="1.27" layer="28" rot="MR90" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<element name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="8.43" y="58.23" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Capacitor" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="10.2867" y="58.23" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="6.5733" y="58.23" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
 </element>
-<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="17.62" y="13.95" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Capacitor" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="19.4767" y="13.95" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="15.7633" y="13.95" size="1.27" layer="28" rot="MR90" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="19.12" y="11.95" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Capacitor" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="20.9767" y="11.95" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="17.2633" y="11.95" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
 </element>
 <element name="D2" library="Diode" library_urn="urn:adsk.eagle:library:16378169" package="SOD6126X290" package3d_urn="urn:adsk.eagle:package:9427057/2" value="" x="7.62" y="25.82" smashed="yes" rot="MR0">
 <attribute name="CATEGORY" value="Diode" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
@@ -950,26 +946,26 @@ design rules under a new name.</description>
 <attribute name="TYPE" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="VALUE" x="7.62" y="23.71" size="1.27" layer="28" rot="MR0" align="top-center"/>
 </element>
-<element name="D3" library="Diode" library_urn="urn:adsk.eagle:library:16378169" package="SOD6126X290" package3d_urn="urn:adsk.eagle:package:9427057/2" value="" x="13.97" y="29.13" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Diode" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="DESCRIPTION" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="FORWARD_CURRENT" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="16.08" y="29.13" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="REVERSE_VOLTAGE" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="Rectifier" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="11.86" y="29.13" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D3" library="Diode" library_urn="urn:adsk.eagle:library:16378169" package="SOD6126X290" package3d_urn="urn:adsk.eagle:package:9427057/2" value="" x="13.47" y="30.13" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Diode" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="DESCRIPTION" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="FORWARD_CURRENT" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="10.08" y="30.63" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="REVERSE_VOLTAGE" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="Rectifier" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="11.36" y="30.13" size="1.27" layer="28" rot="MR90" align="top-center"/>
 </element>
-<element name="J1" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="Break" x="21.86" y="26.86" smashed="yes" rot="R180">
-<attribute name="NAME" x="23.13" y="25.463" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
-<attribute name="VALUE" x="23.13" y="28.892" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
+<element name="J1" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="Break" x="21.86" y="27.36" smashed="yes" rot="R180">
+<attribute name="NAME" x="23.13" y="25.963" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
+<attribute name="VALUE" x="23.13" y="29.392" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
 </element>
 <element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X06" package3d_urn="urn:adsk.eagle:package:38009/1" value="COMM" x="21.86" y="9.08" smashed="yes" rot="R90">
 <attribute name="NAME" x="20.463" y="7.81" size="0.6096" layer="25" font="vector" ratio="20" rot="R90"/>
@@ -1019,7 +1015,7 @@ design rules under a new name.</description>
 <attribute name="DRAIN_CURRENT" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="MANUFACTURER" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="MPN" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
-<attribute name="NAME" x="4.445" y="17.335" size="1.27" layer="26" rot="MR270"/>
+<attribute name="NAME" x="5.445" y="18.835" size="1.27" layer="26" rot="MR180"/>
 <attribute name="OPERATING_TEMP" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="PART_STATUS" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="ROHS_COMPLIANT" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
@@ -1035,7 +1031,7 @@ design rules under a new name.</description>
 <attribute name="DRAIN_CURRENT" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="MANUFACTURER" value="ON Semiconductor" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="MPN" value="BSS84" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="NAME" x="4.445" y="17.335" size="1.27" layer="26" rot="MR0"/>
+<attribute name="NAME" x="3.445" y="17.335" size="1.27" layer="26" rot="MR0"/>
 <attribute name="OPERATING_TEMP" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="PART_STATUS" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="ROHS_COMPLIANT" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
@@ -1062,7 +1058,7 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="23.765" y="40.195" size="1.27" layer="28" rot="MR0"/>
 </element>
 <element name="R1" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="8.35" y="34.78" smashed="yes" rot="MR180">
-<attribute name="NAME" x="7.08" y="33.51" size="1.27" layer="26" rot="MR180"/>
+<attribute name="NAME" x="7.08" y="37.01" size="1.27" layer="26" rot="MR180"/>
 <attribute name="SPICEMODEL" value="NONE" x="56.61" y="86.85" size="1.778" layer="28" rot="MR180" display="off"/>
 <attribute name="SPICEPREFIX" value="R" x="56.61" y="86.85" size="1.778" layer="28" rot="MR180" display="off"/>
 <attribute name="VALUE" x="7.08" y="37.32" size="1.27" layer="28" rot="MR180"/>
@@ -1073,28 +1069,22 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="-48.26" y="-40.45" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="VALUE" x="6.35" y="9.08" size="1.27" layer="28" rot="MR0"/>
 </element>
-<element name="S1" library="SparkFun-Switches" library_urn="urn:adsk.eagle:library:535" package="TACTILE_SWITCH_PTH_6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value="" x="12.7" y="17.97" smashed="yes" rot="R270">
-<attribute name="NAME" x="16.002" y="17.97" size="0.6096" layer="25" font="vector" ratio="20" rot="R270" align="bottom-center"/>
-<attribute name="PROD_ID" value=" SWCH-08441" x="8.89" y="-23.94" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="SF_SKU" value="COM-00097" x="8.89" y="-23.94" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="VALUE" x="9.525" y="17.97" size="0.6096" layer="27" font="vector" ratio="20" rot="R270" align="top-center"/>
-</element>
-<element name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="17" y="24" smashed="yes" rot="MR0">
-<attribute name="NAME" x="18.27" y="25.27" size="1.27" layer="26" rot="MR0"/>
-<attribute name="SPICEMODEL" value="NONE" x="17" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="SPICEPREFIX" value="R" x="17" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="VALUE" x="18.27" y="21.46" size="1.27" layer="28" rot="MR0"/>
+<element name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="17" y="18" smashed="yes" rot="MR270">
+<attribute name="NAME" x="15.73" y="19.27" size="1.27" layer="26" rot="MR270"/>
+<attribute name="SPICEMODEL" value="NONE" x="17" y="18" size="1.778" layer="28" rot="MR270" display="off"/>
+<attribute name="SPICEPREFIX" value="R" x="17" y="18" size="1.778" layer="28" rot="MR270" display="off"/>
+<attribute name="VALUE" x="19.54" y="19.27" size="1.27" layer="28" rot="MR270"/>
 </element>
-<element name="D4" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="6.5" y="57" smashed="yes" rot="MR90">
-<attribute name="NAME" x="8.485" y="57" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="VALUE" x="4.515" y="57" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D4" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="5.5" y="58" smashed="yes" rot="MR90">
+<attribute name="NAME" x="7.485" y="58" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="VALUE" x="3.515" y="58" size="1.27" layer="28" rot="MR90" align="top-center"/>
 </element>
-<element name="D5" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="17.5" y="19.5" smashed="yes" rot="MR90">
-<attribute name="NAME" x="19.485" y="19.5" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="VALUE" x="15.515" y="19.5" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D5" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="18" y="24.5" smashed="yes" rot="MR180">
+<attribute name="NAME" x="18" y="22.515" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
+<attribute name="VALUE" x="18" y="26.485" size="1.27" layer="28" rot="MR180" align="top-center"/>
 </element>
 <element name="D6" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="19" y="31" smashed="yes" rot="MR180">
-<attribute name="NAME" x="19" y="29.015" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
+<attribute name="NAME" x="19" y="34.015" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
 <attribute name="VALUE" x="19" y="32.985" size="1.27" layer="28" rot="MR180" align="top-center"/>
 </element>
 <element name="D7" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="20.5" y="60" smashed="yes" rot="MR180">
@@ -1105,11 +1095,11 @@ design rules under a new name.</description>
 <attribute name="NAME" x="12" y="9.515" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
 <attribute name="VALUE" x="12" y="13.485" size="1.27" layer="28" rot="MR180" align="top-center"/>
 </element>
-<element name="R4" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="21" y="39.5" smashed="yes" rot="MR180">
-<attribute name="NAME" x="19.73" y="38.23" size="1.27" layer="26" rot="MR180"/>
-<attribute name="SPICEMODEL" value="NONE" x="21" y="39.5" size="1.778" layer="28" rot="MR180" display="off"/>
-<attribute name="SPICEPREFIX" value="R" x="21" y="39.5" size="1.778" layer="28" rot="MR180" display="off"/>
-<attribute name="VALUE" x="19.73" y="42.04" size="1.27" layer="28" rot="MR180"/>
+<element name="R4" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="21" y="39" smashed="yes" rot="MR180">
+<attribute name="NAME" x="19.73" y="37.73" size="1.27" layer="26" rot="MR180"/>
+<attribute name="SPICEMODEL" value="NONE" x="21" y="39" size="1.778" layer="28" rot="MR180" display="off"/>
+<attribute name="SPICEPREFIX" value="R" x="21" y="39" size="1.778" layer="28" rot="MR180" display="off"/>
+<attribute name="VALUE" x="19.73" y="41.54" size="1.27" layer="28" rot="MR180"/>
 </element>
 <element name="R5" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="21" y="63" smashed="yes" rot="MR0">
 <attribute name="NAME" x="22.27" y="64.27" size="1.27" layer="26" rot="MR0"/>
@@ -1136,7 +1126,13 @@ design rules under a new name.</description>
 <attribute name="NAME" x="14.5" y="74.135" size="1.27" layer="25" align="bottom-center"/>
 <attribute name="VALUE" x="14.5" y="29.865" size="1.27" layer="27" align="top-center"/>
 </element>
-<element name="SG1" library="buzzer" library_urn="urn:adsk.eagle:library:113" package="F/HGP" package3d_urn="urn:adsk.eagle:package:5287/1" value="F/HGP" x="13" y="8" smashed="yes" rot="R180">
+<element name="S1" library="SparkFun-Switches" package="TACTILE_SWITCH_PTH_6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value="MOMENTARY-SWITCH-SPST-PTH-6.0MM" x="12.5" y="18.5" smashed="yes" rot="MR90">
+<attribute name="NAME" x="15.802" y="18.5" size="0.6096" layer="26" font="vector" ratio="20" rot="MR90" align="bottom-center"/>
+<attribute name="PROD_ID" value=" SWCH-08441" x="12.5" y="18.5" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SF_SKU" value="COM-00097" x="12.5" y="18.5" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="9.325" y="18.5" size="0.6096" layer="28" font="vector" ratio="20" rot="MR90" align="top-center"/>
+</element>
+<element name="SG1" library="buzzer" package="F/HGP" package3d_urn="urn:adsk.eagle:package:5287/1" value="F/HGP" x="13" y="8" smashed="yes" rot="R180">
 <attribute name="MF" value="" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MPN" value="" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="NAME" x="8.555" y="1.015" size="1.27" layer="25" ratio="10" rot="R180"/>
@@ -1151,7 +1147,6 @@ design rules under a new name.</description>
 <contactref element="Q5" pad="2"/>
 <contactref element="R1" pad="1"/>
 <contactref element="Q2" pad="2"/>
-<contactref element="S1" pad="1"/>
 <contactref element="J3" pad="2"/>
 <contactref element="Q1" pad="2"/>
 <contactref element="J5" pad="3"/>
@@ -1191,6 +1186,8 @@ design rules under a new name.</description>
 <contactref element="R5" pad="1"/>
 <contactref element="C2" pad="2"/>
 <contactref element="U1" pad="14"/>
+<contactref element="S1" pad="2"/>
+<contactref element="S1" pad="1"/>
 <contactref element="SG1" pad="1"/>
 </signal>
 <signal name="VIN">
@@ -1246,10 +1243,10 @@ design rules under a new name.</description>
 <wire x1="10.4571" y1="51.5" x2="14" y2="51.5" width="0.8128" layer="1"/>
 <via x="14" y="51.5" extent="1-16" drill="0.35"/>
 <wire x1="14" y1="51.5" x2="17" y2="48.5" width="0.8128" layer="16"/>
-<wire x1="17" y1="29.18" x2="19.32" y2="26.86" width="0.8128" layer="16"/>
+<wire x1="17" y1="29.68" x2="19.32" y2="27.36" width="0.8128" layer="16"/>
 <wire x1="17" y1="48.5" x2="17" y2="31" width="0.8128" layer="16"/>
 <contactref element="D6" pad="1"/>
-<wire x1="17" y1="31" x2="17" y2="29.18" width="0.8128" layer="16"/>
+<wire x1="17" y1="31" x2="17" y2="29.68" width="0.8128" layer="16"/>
 <wire x1="16.9" y1="31" x2="17" y2="31" width="0.8128" layer="16"/>
 <contactref element="J5" pad="2"/>
 <wire x1="2.54" y1="63.23" x2="3.31" y2="63.23" width="0.8128" layer="16"/>
@@ -1266,13 +1263,13 @@ design rules under a new name.</description>
 <via x="9.66" y="61.92" extent="1-16" drill="0.35"/>
 <contactref element="D4" pad="2"/>
 <contactref element="J5" pad="1"/>
-<wire x1="2.54" y1="60.69" x2="6.5" y2="60.69" width="0.8128" layer="16"/>
-<wire x1="6.5" y1="60.69" x2="8" y2="60.69" width="0.8128" layer="16"/>
+<wire x1="2.54" y1="60.69" x2="5.5" y2="60.69" width="0.8128" layer="16"/>
+<wire x1="5.5" y1="60.69" x2="8" y2="60.69" width="0.8128" layer="16"/>
 <wire x1="8" y1="60.69" x2="8.43" y2="60.69" width="0.8128" layer="16"/>
 <wire x1="8.43" y1="60.69" x2="9.66" y2="61.92" width="0.8128" layer="16"/>
-<wire x1="6.5" y1="59.1" x2="6.5" y2="60.69" width="0.8128" layer="16"/>
-<wire x1="8" y1="60.69" x2="8.9846" y2="59.7054" width="0.8128" layer="16"/>
-<wire x1="8.9846" y1="59.7054" x2="9.43" y2="59.7054" width="0.8128" layer="16"/>
+<wire x1="5.5" y1="60.1" x2="5.5" y2="60.69" width="0.8128" layer="16"/>
+<wire x1="8" y1="60.69" x2="8.43" y2="60.26" width="0.8128" layer="16"/>
+<wire x1="8.43" y1="60.26" x2="8.43" y2="59.7054" width="0.8128" layer="16"/>
 <contactref element="U1" pad="4"/>
 <wire x1="6.55" y1="62.16" x2="9.42" y2="62.16" width="0.8128" layer="1"/>
 <wire x1="9.42" y1="62.16" x2="9.66" y2="61.92" width="0.8128" layer="1"/>
@@ -1303,28 +1300,25 @@ design rules under a new name.</description>
 </signal>
 <signal name="ST">
 <contactref element="J1" pad="1"/>
-<wire x1="21.86" y1="26.86" x2="21.86" y2="27.86" width="0.8128" layer="1"/>
+<wire x1="21.86" y1="27.36" x2="21.86" y2="27.86" width="0.8128" layer="1"/>
 <wire x1="21.86" y1="27.86" x2="20.05" y2="29.67" width="0.8128" layer="1"/>
 <wire x1="20.05" y1="29.67" x2="20.05" y2="43.6" width="0.8128" layer="1"/>
 <contactref element="J2" pad="4"/>
 <contactref element="D5" pad="2"/>
 <wire x1="21.86" y1="16.7" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="20.5" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="21.6" x2="17.5" y2="20.5" width="0.8128" layer="16"/>
 <contactref element="R3" pad="1"/>
 <contactref element="U1" pad="20"/>
 <wire x1="20.83" y1="44.38" x2="20.05" y2="43.6" width="0.8128" layer="1"/>
 <wire x1="22.45" y1="44.38" x2="20.83" y2="44.38" width="0.8128" layer="1"/>
-<wire x1="18.422" y1="24" x2="17.5" y2="23.078" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="23.078" x2="17.5" y2="21.6" width="0.8128" layer="16"/>
-<wire x1="18.422" y1="24" x2="20" y2="24" width="0.8128" layer="16"/>
-<wire x1="20" y1="24" x2="21.86" y2="25.86" width="0.8128" layer="16"/>
-<wire x1="21.86" y1="25.86" x2="21.86" y2="26.86" width="0.8128" layer="16"/>
+<wire x1="21.86" y1="26.86" x2="21.86" y2="27.36" width="0.8128" layer="16"/>
+<wire x1="20.1" y1="24.5" x2="21.86" y2="26.86" width="0" layer="19" extent="16-16"/>
+<wire x1="17" y1="19.422" x2="20.1" y2="24.5" width="0" layer="19" extent="16-16"/>
+<wire x1="21.3" y1="16.7" x2="17" y2="19.422" width="0" layer="19" extent="16-16"/>
 </signal>
 <signal name="BTN">
 <contactref element="D3" pad="2"/>
-<wire x1="12.7" y1="33.1048" x2="12.7" y2="53.6948" width="0.8128" layer="16"/>
-<wire x1="12.7" y1="33.1048" x2="13.97" y2="31.8348" width="0.8128" layer="16"/>
+<wire x1="12.7" y1="33.6048" x2="12.7" y2="53.6948" width="0.8128" layer="16"/>
+<wire x1="12.7" y1="33.6048" x2="13.47" y2="32.8348" width="0.8128" layer="16"/>
 <contactref element="U1" pad="25"/>
 <wire x1="22.45" y1="57.08" x2="20.58" y2="57.08" width="0.8128" layer="1"/>
 <wire x1="16.0852" y1="57.08" x2="20.58" y2="57.08" width="0.8128" layer="16"/>
@@ -1354,11 +1348,11 @@ design rules under a new name.</description>
 <wire x1="23.5776" y1="23.05" x2="22.3076" y2="21.78" width="0.8128" layer="16"/>
 <wire x1="22.3076" y1="21.78" x2="21.86" y2="21.78" width="0.8128" layer="16"/>
 <wire x1="22.81" y1="38.19" x2="23.5776" y2="37.4224" width="0.8128" layer="16"/>
-<wire x1="22.81" y1="42.27" x2="22.81" y2="39.5" width="0.8128" layer="16"/>
-<wire x1="22.81" y1="39.5" x2="22.81" y2="38.19" width="0.8128" layer="16"/>
+<wire x1="22.81" y1="42.27" x2="22.81" y2="39" width="0.8128" layer="16"/>
+<wire x1="22.81" y1="39" x2="22.81" y2="38.19" width="0.8128" layer="16"/>
 <wire x1="23.5776" y1="37.4224" x2="23.5776" y2="23.05" width="0.8128" layer="16"/>
 <contactref element="R4" pad="2"/>
-<wire x1="22.422" y1="39.5" x2="22.81" y2="39.5" width="0.8128" layer="16"/>
+<wire x1="22.422" y1="39" x2="22.81" y2="39" width="0.8128" layer="16"/>
 </signal>
 <signal name="LEDCTL">
 <contactref element="Q1" pad="1"/>
@@ -1438,8 +1432,8 @@ design rules under a new name.</description>
 <contactref element="Q2" pad="3"/>
 <contactref element="D2" pad="2"/>
 <wire x1="3.49" y1="14.33" x2="3.66" y2="14.16" width="0.8128" layer="16"/>
-<wire x1="3.98" y1="14.16" x2="5.25" y2="15.43" width="0.8128" layer="16"/>
-<wire x1="3.66" y1="14.16" x2="3.98" y2="14.16" width="0.8128" layer="16"/>
+<wire x1="5.25" y1="14.16" x2="5.25" y2="15.43" width="0.8128" layer="16"/>
+<wire x1="3.66" y1="14.16" x2="5.25" y2="14.16" width="0.8128" layer="16"/>
 <wire x1="5.25" y1="15.43" x2="5.25" y2="13.99" width="0.8128" layer="16"/>
 <wire x1="6.502" y1="12.738" x2="6.502" y2="11.62" width="0.8128" layer="16"/>
 <wire x1="5.25" y1="13.99" x2="6.502" y2="12.738" width="0.8128" layer="16"/>
@@ -1449,16 +1443,19 @@ design rules under a new name.</description>
 <signal name="N$5">
 <contactref element="D3" pad="1"/>
 <contactref element="D2" pad="1"/>
-<contactref element="S1" pad="3"/>
-<wire x1="10.3248" y1="25.82" x2="10.3248" y2="21.3358" width="0.8128" layer="16"/>
-<wire x1="10.3248" y1="21.3358" x2="10.4394" y2="21.2212" width="0.8128" layer="16"/>
-<wire x1="13.97" y1="26.4252" x2="10.93" y2="26.4252" width="0.8128" layer="16"/>
-<wire x1="10.93" y1="26.4252" x2="10.3248" y2="25.82" width="0.8128" layer="16"/>
+<wire x1="13.47" y1="27.4252" x2="11.93" y2="27.4252" width="0.8128" layer="16"/>
+<wire x1="11.93" y1="27.4252" x2="10.3248" y2="25.82" width="0.8128" layer="16"/>
 <contactref element="D8" pad="2"/>
-<wire x1="10.4394" y1="21.2212" x2="12.5" y2="19.1606" width="0.8128" layer="16"/>
-<wire x1="12.5" y1="19.1606" x2="12.5" y2="12" width="0.8128" layer="16"/>
 <wire x1="12.5" y1="12" x2="13" y2="11.5" width="0.8128" layer="16"/>
 <wire x1="13" y1="11.5" x2="14.1" y2="11.5" width="0.8128" layer="16"/>
+<contactref element="S1" pad="3"/>
+<contactref element="S1" pad="4"/>
+<wire x1="10.3248" y1="25.82" x2="10.3248" y2="21.8366" width="0.8128" layer="16"/>
+<wire x1="10.3248" y1="21.8366" x2="10.2394" y2="21.7512" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="21.7512" x2="10.2394" y2="15.2488" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="15.2488" x2="10.4882" y2="15" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="15.2488" x2="12.5" y2="12.9882" width="0.8128" layer="16"/>
+<wire x1="12.5" y1="12.9882" x2="12.5" y2="12" width="0.8128" layer="16"/>
 </signal>
 <signal name="SPOUT">
 <contactref element="J7" pad="6"/>
@@ -1473,22 +1470,21 @@ design rules under a new name.</description>
 <contactref element="J2" pad="1"/>
 <wire x1="12.3016" y1="14.1984" x2="14" y2="12.5" width="0.8128" layer="1"/>
 <wire x1="18.46946875" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="1"/>
-<wire x1="21.0146" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="16"/>
-<wire x1="17.62" y1="12.4746" x2="21.0146" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="20.5146" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="19.12" y1="10.4746" x2="20.5146" y2="9.08" width="0.8128" layer="16"/>
 <wire x1="15.04946875" y1="12.5" x2="18.46946875" y2="9.08" width="0.8128" layer="1"/>
 <wire x1="14" y1="12.5" x2="15.04946875" y2="12.5" width="0.8128" layer="1"/>
 </signal>
 <signal name="SPK">
 <wire x1="2.54" y1="37.02" x2="2.54" y2="16.7" width="0.8128" layer="1"/>
-<wire x1="2.54" y1="16.7" x2="9.12" y2="10.12" width="0.8128" layer="1"/>
+<wire x1="2.54" y1="16.7" x2="9.19" y2="10.05" width="0.8128" layer="1"/>
 <wire x1="2.54" y1="37.02" x2="4.191" y2="38.671" width="0.8128" layer="1"/>
 <wire x1="4.191" y1="46.291" x2="4.191" y2="38.671" width="0.8128" layer="1"/>
 <contactref element="U1" pad="10"/>
 <wire x1="6.55" y1="46.92" x2="4.82" y2="46.92" width="0.8128" layer="1"/>
 <wire x1="4.82" y1="46.92" x2="4.191" y2="46.291" width="0.8128" layer="1"/>
 <contactref element="SG1" pad="2"/>
-<wire x1="9.19" y1="8" x2="9.19" y2="10.05" width="0.8128" layer="1"/>
-<wire x1="9.19" y1="10.05" x2="9.12" y2="10.12" width="0.8128" layer="1"/>
+<wire x1="9.19" y1="10.05" x2="9.19" y2="8" width="0.8128" layer="1"/>
 </signal>
 <signal name="3V3">
 <contactref element="U1" pad="2"/>

+ 171 - 201
schematic/ECU.b#4

@@ -539,64 +539,6 @@ CONN_03
 </package3d>
 </packages3d>
 </library>
-<library name="SparkFun-Switches" urn="urn:adsk.eagle:library:535">
-<description>&lt;h3&gt;SparkFun Switches, Buttons, Encoders&lt;/h3&gt;
-In this library you'll find switches, buttons, joysticks, and anything that moves to create or disrupt an electrical connection.
-&lt;br&gt;
-&lt;br&gt;
-We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
-&lt;br&gt;
-&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
-&lt;br&gt;
-&lt;br&gt;
-&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
-&lt;br&gt;
-&lt;br&gt;
-You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
-<packages>
-<package name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:footprint:40103/1" library_version="1">
-<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square&lt;/h3&gt;
-&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
-&lt;p&gt;&lt;a href="https://www.omron.com/ecb/products/pdf/en-b3f.pdf"&gt;Datasheet&lt;/a&gt; (B3F-1000)&lt;/p&gt;</description>
-<wire x1="3.048" y1="1.016" x2="3.048" y2="2.54" width="0.2032" layer="51"/>
-<wire x1="3.048" y1="2.54" x2="2.54" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="-3.048" x2="3.048" y2="-2.54" width="0.2032" layer="51"/>
-<wire x1="3.048" y1="-2.54" x2="3.048" y2="-1.016" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="3.048" x2="-3.048" y2="2.54" width="0.2032" layer="51"/>
-<wire x1="-3.048" y1="2.54" x2="-3.048" y2="1.016" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-3.048" x2="-3.048" y2="-2.54" width="0.2032" layer="51"/>
-<wire x1="-3.048" y1="-2.54" x2="-3.048" y2="-1.016" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-3.048" x2="-2.159" y2="-3.048" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="3.048" x2="2.159" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.159" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="21"/>
-<wire x1="-2.159" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="21"/>
-<wire x1="3.048" y1="0.998" x2="3.048" y2="-1.016" width="0.2032" layer="21"/>
-<wire x1="-3.048" y1="1.028" x2="-3.048" y2="-1.016" width="0.2032" layer="21"/>
-<wire x1="-2.54" y1="1.27" x2="-2.54" y2="0.508" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-0.508" x2="-2.54" y2="-1.27" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="0.508" x2="-2.159" y2="-0.381" width="0.2032" layer="51"/>
-<circle x="0" y="0" radius="1.778" width="0.2032" layer="21"/>
-<pad name="1" x="-3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="2" x="3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="3" x="-3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="4" x="3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
-<text x="0" y="3.302" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
-<text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
-</package>
-</packages>
-<packages3d>
-<package3d name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:package:40163/1" type="box" library_version="1">
-<description>Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square
-Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
-Datasheet (B3F-1000)</description>
-<packageinstances>
-<packageinstance name="TACTILE_SWITCH_PTH_6.0MM"/>
-</packageinstances>
-</package3d>
-</packages3d>
-</library>
 <library name="eScooter">
 <packages>
 <package name="DIOM5027X220N" urn="urn:adsk.eagle:footprint:21928331/1">
@@ -679,7 +621,65 @@ Datasheet (B3F-1000)</description>
 </package3d>
 </packages3d>
 </library>
-<library name="buzzer" urn="urn:adsk.eagle:library:113">
+<library name="SparkFun-Switches">
+<description>&lt;h3&gt;SparkFun Switches, Buttons, Encoders&lt;/h3&gt;
+In this library you'll find switches, buttons, joysticks, and anything that moves to create or disrupt an electrical connection.
+&lt;br&gt;
+&lt;br&gt;
+We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
+&lt;br&gt;
+&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
+&lt;br&gt;
+&lt;br&gt;
+&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
+&lt;br&gt;
+&lt;br&gt;
+You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
+<packages>
+<package name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:footprint:40103/1">
+<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square&lt;/h3&gt;
+&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
+&lt;p&gt;&lt;a href="https://www.omron.com/ecb/products/pdf/en-b3f.pdf"&gt;Datasheet&lt;/a&gt; (B3F-1000)&lt;/p&gt;</description>
+<wire x1="3.048" y1="1.016" x2="3.048" y2="2.54" width="0.2032" layer="51"/>
+<wire x1="3.048" y1="2.54" x2="2.54" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="-3.048" x2="3.048" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="3.048" y1="-2.54" x2="3.048" y2="-1.016" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="3.048" x2="-3.048" y2="2.54" width="0.2032" layer="51"/>
+<wire x1="-3.048" y1="2.54" x2="-3.048" y2="1.016" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-3.048" x2="-3.048" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="-3.048" y1="-2.54" x2="-3.048" y2="-1.016" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-3.048" x2="-2.159" y2="-3.048" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="3.048" x2="2.159" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.159" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="21"/>
+<wire x1="-2.159" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="21"/>
+<wire x1="3.048" y1="0.998" x2="3.048" y2="-1.016" width="0.2032" layer="21"/>
+<wire x1="-3.048" y1="1.028" x2="-3.048" y2="-1.016" width="0.2032" layer="21"/>
+<wire x1="-2.54" y1="1.27" x2="-2.54" y2="0.508" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-0.508" x2="-2.54" y2="-1.27" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="0.508" x2="-2.159" y2="-0.381" width="0.2032" layer="51"/>
+<circle x="0" y="0" radius="1.778" width="0.2032" layer="21"/>
+<pad name="1" x="-3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="2" x="3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="3" x="-3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="4" x="3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
+<text x="0" y="3.302" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
+<text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
+</package>
+</packages>
+<packages3d>
+<package3d name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:package:40163/1" type="box">
+<description>Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square
+Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
+Datasheet (B3F-1000)</description>
+<packageinstances>
+<packageinstance name="TACTILE_SWITCH_PTH_6.0MM"/>
+</packageinstances>
+</package3d>
+</packages3d>
+</library>
+<library name="buzzer">
 <description>&lt;b&gt;Speakers and Buzzers&lt;/b&gt;&lt;p&gt;
 &lt;ul&gt;Distributors:
 &lt;li&gt;Buerklin
@@ -688,21 +688,17 @@ Datasheet (B3F-1000)</description>
 &lt;/ul&gt;
 &lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
 <packages>
-<package name="F/HGP" urn="urn:adsk.eagle:footprint:5238/1" library_version="2">
+<package name="F/HGP" urn="urn:adsk.eagle:footprint:5238/1" locally_modified="yes">
 <description>&lt;b&gt;BUZZER&lt;/b&gt;</description>
-<wire x1="-7.8361" y1="-1.6158" x2="-7.8361" y2="1.6158" width="0.1524" layer="21" curve="336.697868"/>
-<wire x1="-5.882" y1="-2.032" x2="-5.882" y2="2.032" width="0.1524" layer="21" curve="321.883357"/>
-<wire x1="-6.604" y1="2.032" x2="-6.604" y2="-2.032" width="0.1524" layer="21" curve="180"/>
-<wire x1="-6.604" y1="-2.032" x2="-5.882" y2="-2.032" width="0.1524" layer="21"/>
-<wire x1="-6.604" y1="2.032" x2="-5.882" y2="2.032" width="0.1524" layer="21"/>
 <pad name="1" x="-3.81" y="0" drill="1.016" diameter="2.159" shape="octagon"/>
 <pad name="2" x="3.81" y="0" drill="1.016" diameter="2.159" shape="octagon"/>
 <text x="4.445" y="6.985" size="1.27" layer="25" ratio="10">&gt;NAME</text>
 <text x="-3.683" y="-3.81" size="1.27" layer="27" ratio="10">&gt;VALUE</text>
+<circle x="0" y="0" radius="6.0827625" width="0.127" layer="21"/>
 </package>
 </packages>
 <packages3d>
-<package3d name="F/HGP" urn="urn:adsk.eagle:package:5287/1" type="box" library_version="2">
+<package3d name="F/HGP" urn="urn:adsk.eagle:package:5287/1" type="box">
 <description>BUZZER</description>
 <packageinstances>
 <packageinstance name="F/HGP"/>
@@ -903,35 +899,35 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="9.43" y="58.23" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Capacitor" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="11.2867" y="58.23" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="7.5733" y="58.23" size="1.27" layer="28" rot="MR90" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<element name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="8.43" y="58.23" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Capacitor" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="10.2867" y="58.23" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="6.5733" y="58.23" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
 </element>
-<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="17.62" y="13.95" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Capacitor" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="19.4767" y="13.95" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="15.7633" y="13.95" size="1.27" layer="28" rot="MR90" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="19.12" y="11.95" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Capacitor" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="20.9767" y="11.95" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="17.2633" y="11.95" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
 </element>
 <element name="D2" library="Diode" library_urn="urn:adsk.eagle:library:16378169" package="SOD6126X290" package3d_urn="urn:adsk.eagle:package:9427057/2" value="" x="7.62" y="25.82" smashed="yes" rot="MR0">
 <attribute name="CATEGORY" value="Diode" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
@@ -950,26 +946,26 @@ design rules under a new name.</description>
 <attribute name="TYPE" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="VALUE" x="7.62" y="23.71" size="1.27" layer="28" rot="MR0" align="top-center"/>
 </element>
-<element name="D3" library="Diode" library_urn="urn:adsk.eagle:library:16378169" package="SOD6126X290" package3d_urn="urn:adsk.eagle:package:9427057/2" value="" x="13.97" y="29.13" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Diode" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="DESCRIPTION" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="FORWARD_CURRENT" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="16.08" y="29.13" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="REVERSE_VOLTAGE" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="Rectifier" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="11.86" y="29.13" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D3" library="Diode" library_urn="urn:adsk.eagle:library:16378169" package="SOD6126X290" package3d_urn="urn:adsk.eagle:package:9427057/2" value="" x="13.47" y="30.13" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Diode" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="DESCRIPTION" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="FORWARD_CURRENT" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="10.08" y="30.63" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="REVERSE_VOLTAGE" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="Rectifier" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="11.36" y="30.13" size="1.27" layer="28" rot="MR90" align="top-center"/>
 </element>
-<element name="J1" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="Break" x="21.86" y="26.86" smashed="yes" rot="R180">
-<attribute name="NAME" x="23.13" y="25.463" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
-<attribute name="VALUE" x="23.13" y="28.892" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
+<element name="J1" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="Break" x="21.86" y="27.36" smashed="yes" rot="R180">
+<attribute name="NAME" x="23.13" y="25.963" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
+<attribute name="VALUE" x="23.13" y="29.392" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
 </element>
 <element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X06" package3d_urn="urn:adsk.eagle:package:38009/1" value="COMM" x="21.86" y="9.08" smashed="yes" rot="R90">
 <attribute name="NAME" x="20.463" y="7.81" size="0.6096" layer="25" font="vector" ratio="20" rot="R90"/>
@@ -1019,7 +1015,7 @@ design rules under a new name.</description>
 <attribute name="DRAIN_CURRENT" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="MANUFACTURER" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="MPN" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
-<attribute name="NAME" x="4.445" y="17.335" size="1.27" layer="26" rot="MR270"/>
+<attribute name="NAME" x="5.445" y="18.835" size="1.27" layer="26" rot="MR180"/>
 <attribute name="OPERATING_TEMP" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="PART_STATUS" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="ROHS_COMPLIANT" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
@@ -1035,7 +1031,7 @@ design rules under a new name.</description>
 <attribute name="DRAIN_CURRENT" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="MANUFACTURER" value="ON Semiconductor" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="MPN" value="BSS84" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="NAME" x="4.445" y="17.335" size="1.27" layer="26" rot="MR0"/>
+<attribute name="NAME" x="3.445" y="17.335" size="1.27" layer="26" rot="MR0"/>
 <attribute name="OPERATING_TEMP" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="PART_STATUS" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="ROHS_COMPLIANT" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
@@ -1062,7 +1058,7 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="23.765" y="40.195" size="1.27" layer="28" rot="MR0"/>
 </element>
 <element name="R1" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="8.35" y="34.78" smashed="yes" rot="MR180">
-<attribute name="NAME" x="7.08" y="33.51" size="1.27" layer="26" rot="MR180"/>
+<attribute name="NAME" x="7.08" y="37.01" size="1.27" layer="26" rot="MR180"/>
 <attribute name="SPICEMODEL" value="NONE" x="56.61" y="86.85" size="1.778" layer="28" rot="MR180" display="off"/>
 <attribute name="SPICEPREFIX" value="R" x="56.61" y="86.85" size="1.778" layer="28" rot="MR180" display="off"/>
 <attribute name="VALUE" x="7.08" y="37.32" size="1.27" layer="28" rot="MR180"/>
@@ -1073,28 +1069,22 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="-48.26" y="-40.45" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="VALUE" x="6.35" y="9.08" size="1.27" layer="28" rot="MR0"/>
 </element>
-<element name="S1" library="SparkFun-Switches" library_urn="urn:adsk.eagle:library:535" package="TACTILE_SWITCH_PTH_6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value="" x="12.7" y="17.97" smashed="yes" rot="R270">
-<attribute name="NAME" x="16.002" y="17.97" size="0.6096" layer="25" font="vector" ratio="20" rot="R270" align="bottom-center"/>
-<attribute name="PROD_ID" value=" SWCH-08441" x="8.89" y="-23.94" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="SF_SKU" value="COM-00097" x="8.89" y="-23.94" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="VALUE" x="9.525" y="17.97" size="0.6096" layer="27" font="vector" ratio="20" rot="R270" align="top-center"/>
-</element>
-<element name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="17" y="24" smashed="yes" rot="MR0">
-<attribute name="NAME" x="18.27" y="25.27" size="1.27" layer="26" rot="MR0"/>
-<attribute name="SPICEMODEL" value="NONE" x="17" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="SPICEPREFIX" value="R" x="17" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="VALUE" x="18.27" y="21.46" size="1.27" layer="28" rot="MR0"/>
+<element name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="17" y="18" smashed="yes" rot="MR270">
+<attribute name="NAME" x="15.73" y="19.27" size="1.27" layer="26" rot="MR270"/>
+<attribute name="SPICEMODEL" value="NONE" x="17" y="18" size="1.778" layer="28" rot="MR270" display="off"/>
+<attribute name="SPICEPREFIX" value="R" x="17" y="18" size="1.778" layer="28" rot="MR270" display="off"/>
+<attribute name="VALUE" x="19.54" y="19.27" size="1.27" layer="28" rot="MR270"/>
 </element>
-<element name="D4" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="6.5" y="57" smashed="yes" rot="MR90">
-<attribute name="NAME" x="8.485" y="57" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="VALUE" x="4.515" y="57" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D4" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="5.5" y="58" smashed="yes" rot="MR90">
+<attribute name="NAME" x="7.485" y="58" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="VALUE" x="3.515" y="58" size="1.27" layer="28" rot="MR90" align="top-center"/>
 </element>
-<element name="D5" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="17.5" y="19.5" smashed="yes" rot="MR90">
-<attribute name="NAME" x="19.485" y="19.5" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="VALUE" x="15.515" y="19.5" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D5" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="18" y="24.5" smashed="yes" rot="MR180">
+<attribute name="NAME" x="18" y="22.515" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
+<attribute name="VALUE" x="18" y="26.485" size="1.27" layer="28" rot="MR180" align="top-center"/>
 </element>
 <element name="D6" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="19" y="31" smashed="yes" rot="MR180">
-<attribute name="NAME" x="19" y="29.015" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
+<attribute name="NAME" x="19" y="34.015" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
 <attribute name="VALUE" x="19" y="32.985" size="1.27" layer="28" rot="MR180" align="top-center"/>
 </element>
 <element name="D7" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="20.5" y="60" smashed="yes" rot="MR180">
@@ -1105,11 +1095,11 @@ design rules under a new name.</description>
 <attribute name="NAME" x="12" y="9.515" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
 <attribute name="VALUE" x="12" y="13.485" size="1.27" layer="28" rot="MR180" align="top-center"/>
 </element>
-<element name="R4" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="21" y="39.5" smashed="yes" rot="MR180">
-<attribute name="NAME" x="19.73" y="38.23" size="1.27" layer="26" rot="MR180"/>
-<attribute name="SPICEMODEL" value="NONE" x="21" y="39.5" size="1.778" layer="28" rot="MR180" display="off"/>
-<attribute name="SPICEPREFIX" value="R" x="21" y="39.5" size="1.778" layer="28" rot="MR180" display="off"/>
-<attribute name="VALUE" x="19.73" y="42.04" size="1.27" layer="28" rot="MR180"/>
+<element name="R4" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="21" y="39" smashed="yes" rot="MR180">
+<attribute name="NAME" x="19.73" y="37.73" size="1.27" layer="26" rot="MR180"/>
+<attribute name="SPICEMODEL" value="NONE" x="21" y="39" size="1.778" layer="28" rot="MR180" display="off"/>
+<attribute name="SPICEPREFIX" value="R" x="21" y="39" size="1.778" layer="28" rot="MR180" display="off"/>
+<attribute name="VALUE" x="19.73" y="41.54" size="1.27" layer="28" rot="MR180"/>
 </element>
 <element name="R5" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="21" y="63" smashed="yes" rot="MR0">
 <attribute name="NAME" x="22.27" y="64.27" size="1.27" layer="26" rot="MR0"/>
@@ -1136,7 +1126,13 @@ design rules under a new name.</description>
 <attribute name="NAME" x="14.5" y="74.135" size="1.27" layer="25" align="bottom-center"/>
 <attribute name="VALUE" x="14.5" y="29.865" size="1.27" layer="27" align="top-center"/>
 </element>
-<element name="SG1" library="buzzer" library_urn="urn:adsk.eagle:library:113" package="F/HGP" package3d_urn="urn:adsk.eagle:package:5287/1" value="F/HGP" x="13" y="8" smashed="yes" rot="R180">
+<element name="S1" library="SparkFun-Switches" package="TACTILE_SWITCH_PTH_6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value="MOMENTARY-SWITCH-SPST-PTH-6.0MM" x="12.5" y="18.5" smashed="yes" rot="MR90">
+<attribute name="NAME" x="15.802" y="18.5" size="0.6096" layer="26" font="vector" ratio="20" rot="MR90" align="bottom-center"/>
+<attribute name="PROD_ID" value=" SWCH-08441" x="12.5" y="18.5" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SF_SKU" value="COM-00097" x="12.5" y="18.5" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="9.325" y="18.5" size="0.6096" layer="28" font="vector" ratio="20" rot="MR90" align="top-center"/>
+</element>
+<element name="SG1" library="buzzer" package="F/HGP" package3d_urn="urn:adsk.eagle:package:5287/1" value="F/HGP" x="13" y="8" smashed="yes" rot="R180">
 <attribute name="MF" value="" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MPN" value="" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="NAME" x="8.555" y="1.015" size="1.27" layer="25" ratio="10" rot="R180"/>
@@ -1151,7 +1147,6 @@ design rules under a new name.</description>
 <contactref element="Q5" pad="2"/>
 <contactref element="R1" pad="1"/>
 <contactref element="Q2" pad="2"/>
-<contactref element="S1" pad="1"/>
 <contactref element="J3" pad="2"/>
 <contactref element="Q1" pad="2"/>
 <contactref element="J5" pad="3"/>
@@ -1191,33 +1186,9 @@ design rules under a new name.</description>
 <contactref element="R5" pad="1"/>
 <contactref element="C2" pad="2"/>
 <contactref element="U1" pad="14"/>
+<contactref element="S1" pad="2"/>
+<contactref element="S1" pad="1"/>
 <contactref element="SG1" pad="1"/>
-<wire x1="7.34" y1="74.28" x2="11.51" y2="76.39" width="0" layer="19" extent="1-1"/>
-<wire x1="10.43" y1="69.04" x2="7.34" y2="74.28" width="0" layer="19" extent="1-1"/>
-<wire x1="13.97" y1="63.42" x2="10.43" y2="69.04" width="0" layer="19" extent="1-1"/>
-<wire x1="9.43" y1="56.7546" x2="13.97" y2="63.42" width="0" layer="19" extent="16-16"/>
-<wire x1="6.5" y1="54.9" x2="9.43" y2="56.7546" width="0" layer="19" extent="16-16"/>
-<wire x1="2.54" y1="55.34" x2="6.5" y2="54.9" width="0" layer="19" extent="16-16"/>
-<wire x1="22.422" y1="63" x2="13.97" y2="63.42" width="0" layer="19" extent="16-16"/>
-<wire x1="22.6" y1="60" x2="22.422" y2="63" width="0" layer="19" extent="16-16"/>
-<wire x1="2.54" y1="65.77" x2="10.43" y2="69.04" width="0" layer="19" extent="1-1"/>
-<wire x1="2.54" y1="45.18" x2="2.54" y2="55.34" width="0" layer="19" extent="1-1"/>
-<wire x1="6.55" y1="36.76" x2="2.54" y2="45.18" width="0" layer="19" extent="1-1"/>
-<wire x1="6.928" y1="34.78" x2="6.55" y2="36.76" width="0" layer="19" extent="1-16"/>
-<wire x1="7.39" y1="31.94" x2="6.928" y2="34.78" width="0" layer="19" extent="16-16"/>
-<wire x1="11.0246" y1="29" x2="7.39" y2="31.94" width="0" layer="19" extent="1-1"/>
-<wire x1="15.578" y1="24" x2="11.0246" y2="29" width="0" layer="19" extent="1-16"/>
-<wire x1="14.9606" y1="21.2212" x2="15.578" y2="24" width="0" layer="19" extent="16-16"/>
-<wire x1="13.97" y1="17.97" x2="14.9606" y2="21.2212" width="0" layer="19" extent="1-1"/>
-<wire x1="17.5" y1="17.4" x2="13.97" y2="17.97" width="0" layer="19" extent="16-16"/>
-<wire x1="17.62" y1="15.4254" x2="17.5" y2="17.4" width="0" layer="19" extent="16-16"/>
-<wire x1="7.45" y1="14.48" x2="13.97" y2="17.97" width="0" layer="19" extent="16-16"/>
-<wire x1="16.81" y1="8" x2="5.08" y2="6.54" width="0" layer="19" extent="1-1"/>
-<wire x1="9.9" y1="11.5" x2="7.45" y2="14.48" width="0" layer="19" extent="16-16"/>
-<wire x1="12.7" y1="7.81" x2="16.81" y2="8" width="0" layer="19" extent="1-1"/>
-<wire x1="21.1" y1="31" x2="15.578" y2="24" width="0" layer="19" extent="16-16"/>
-<wire x1="19.578" y1="39.5" x2="21.1" y2="31" width="0" layer="19" extent="16-16"/>
-<wire x1="20.91" y1="42.27" x2="19.578" y2="39.5" width="0" layer="19" extent="16-16"/>
 </signal>
 <signal name="VIN">
 <contactref element="Q4" pad="3"/>
@@ -1272,10 +1243,10 @@ design rules under a new name.</description>
 <wire x1="10.4571" y1="51.5" x2="14" y2="51.5" width="0.8128" layer="1"/>
 <via x="14" y="51.5" extent="1-16" drill="0.35"/>
 <wire x1="14" y1="51.5" x2="17" y2="48.5" width="0.8128" layer="16"/>
-<wire x1="17" y1="29.18" x2="19.32" y2="26.86" width="0.8128" layer="16"/>
+<wire x1="17" y1="29.68" x2="19.32" y2="27.36" width="0.8128" layer="16"/>
 <wire x1="17" y1="48.5" x2="17" y2="31" width="0.8128" layer="16"/>
 <contactref element="D6" pad="1"/>
-<wire x1="17" y1="31" x2="17" y2="29.18" width="0.8128" layer="16"/>
+<wire x1="17" y1="31" x2="17" y2="29.68" width="0.8128" layer="16"/>
 <wire x1="16.9" y1="31" x2="17" y2="31" width="0.8128" layer="16"/>
 <contactref element="J5" pad="2"/>
 <wire x1="2.54" y1="63.23" x2="3.31" y2="63.23" width="0.8128" layer="16"/>
@@ -1292,13 +1263,13 @@ design rules under a new name.</description>
 <via x="9.66" y="61.92" extent="1-16" drill="0.35"/>
 <contactref element="D4" pad="2"/>
 <contactref element="J5" pad="1"/>
-<wire x1="2.54" y1="60.69" x2="6.5" y2="60.69" width="0.8128" layer="16"/>
-<wire x1="6.5" y1="60.69" x2="8" y2="60.69" width="0.8128" layer="16"/>
+<wire x1="2.54" y1="60.69" x2="5.5" y2="60.69" width="0.8128" layer="16"/>
+<wire x1="5.5" y1="60.69" x2="8" y2="60.69" width="0.8128" layer="16"/>
 <wire x1="8" y1="60.69" x2="8.43" y2="60.69" width="0.8128" layer="16"/>
 <wire x1="8.43" y1="60.69" x2="9.66" y2="61.92" width="0.8128" layer="16"/>
-<wire x1="6.5" y1="59.1" x2="6.5" y2="60.69" width="0.8128" layer="16"/>
-<wire x1="8" y1="60.69" x2="8.9846" y2="59.7054" width="0.8128" layer="16"/>
-<wire x1="8.9846" y1="59.7054" x2="9.43" y2="59.7054" width="0.8128" layer="16"/>
+<wire x1="5.5" y1="60.1" x2="5.5" y2="60.69" width="0.8128" layer="16"/>
+<wire x1="8" y1="60.69" x2="8.43" y2="60.26" width="0.8128" layer="16"/>
+<wire x1="8.43" y1="60.26" x2="8.43" y2="59.7054" width="0.8128" layer="16"/>
 <contactref element="U1" pad="4"/>
 <wire x1="6.55" y1="62.16" x2="9.42" y2="62.16" width="0.8128" layer="1"/>
 <wire x1="9.42" y1="62.16" x2="9.66" y2="61.92" width="0.8128" layer="1"/>
@@ -1329,28 +1300,25 @@ design rules under a new name.</description>
 </signal>
 <signal name="ST">
 <contactref element="J1" pad="1"/>
-<wire x1="21.86" y1="26.86" x2="21.86" y2="27.86" width="0.8128" layer="1"/>
+<wire x1="21.86" y1="27.36" x2="21.86" y2="27.86" width="0.8128" layer="1"/>
 <wire x1="21.86" y1="27.86" x2="20.05" y2="29.67" width="0.8128" layer="1"/>
 <wire x1="20.05" y1="29.67" x2="20.05" y2="43.6" width="0.8128" layer="1"/>
 <contactref element="J2" pad="4"/>
 <contactref element="D5" pad="2"/>
 <wire x1="21.86" y1="16.7" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="20.5" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="21.6" x2="17.5" y2="20.5" width="0.8128" layer="16"/>
 <contactref element="R3" pad="1"/>
 <contactref element="U1" pad="20"/>
 <wire x1="20.83" y1="44.38" x2="20.05" y2="43.6" width="0.8128" layer="1"/>
 <wire x1="22.45" y1="44.38" x2="20.83" y2="44.38" width="0.8128" layer="1"/>
-<wire x1="18.422" y1="24" x2="17.5" y2="23.078" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="23.078" x2="17.5" y2="21.6" width="0.8128" layer="16"/>
-<wire x1="18.422" y1="24" x2="20" y2="24" width="0.8128" layer="16"/>
-<wire x1="20" y1="24" x2="21.86" y2="25.86" width="0.8128" layer="16"/>
-<wire x1="21.86" y1="25.86" x2="21.86" y2="26.86" width="0.8128" layer="16"/>
+<wire x1="21.86" y1="26.86" x2="21.86" y2="27.36" width="0.8128" layer="16"/>
+<wire x1="20.1" y1="24.5" x2="21.86" y2="26.86" width="0" layer="19" extent="16-16"/>
+<wire x1="17" y1="19.422" x2="20.1" y2="24.5" width="0" layer="19" extent="16-16"/>
+<wire x1="21.3" y1="16.7" x2="17" y2="19.422" width="0" layer="19" extent="16-16"/>
 </signal>
 <signal name="BTN">
 <contactref element="D3" pad="2"/>
-<wire x1="12.7" y1="33.1048" x2="12.7" y2="53.6948" width="0.8128" layer="16"/>
-<wire x1="12.7" y1="33.1048" x2="13.97" y2="31.8348" width="0.8128" layer="16"/>
+<wire x1="12.7" y1="33.6048" x2="12.7" y2="53.6948" width="0.8128" layer="16"/>
+<wire x1="12.7" y1="33.6048" x2="13.47" y2="32.8348" width="0.8128" layer="16"/>
 <contactref element="U1" pad="25"/>
 <wire x1="22.45" y1="57.08" x2="20.58" y2="57.08" width="0.8128" layer="1"/>
 <wire x1="16.0852" y1="57.08" x2="20.58" y2="57.08" width="0.8128" layer="16"/>
@@ -1380,11 +1348,11 @@ design rules under a new name.</description>
 <wire x1="23.5776" y1="23.05" x2="22.3076" y2="21.78" width="0.8128" layer="16"/>
 <wire x1="22.3076" y1="21.78" x2="21.86" y2="21.78" width="0.8128" layer="16"/>
 <wire x1="22.81" y1="38.19" x2="23.5776" y2="37.4224" width="0.8128" layer="16"/>
-<wire x1="22.81" y1="42.27" x2="22.81" y2="39.5" width="0.8128" layer="16"/>
-<wire x1="22.81" y1="39.5" x2="22.81" y2="38.19" width="0.8128" layer="16"/>
+<wire x1="22.81" y1="42.27" x2="22.81" y2="39" width="0.8128" layer="16"/>
+<wire x1="22.81" y1="39" x2="22.81" y2="38.19" width="0.8128" layer="16"/>
 <wire x1="23.5776" y1="37.4224" x2="23.5776" y2="23.05" width="0.8128" layer="16"/>
 <contactref element="R4" pad="2"/>
-<wire x1="22.422" y1="39.5" x2="22.81" y2="39.5" width="0.8128" layer="16"/>
+<wire x1="22.422" y1="39" x2="22.81" y2="39" width="0.8128" layer="16"/>
 </signal>
 <signal name="LEDCTL">
 <contactref element="Q1" pad="1"/>
@@ -1464,8 +1432,8 @@ design rules under a new name.</description>
 <contactref element="Q2" pad="3"/>
 <contactref element="D2" pad="2"/>
 <wire x1="3.49" y1="14.33" x2="3.66" y2="14.16" width="0.8128" layer="16"/>
-<wire x1="3.98" y1="14.16" x2="5.25" y2="15.43" width="0.8128" layer="16"/>
-<wire x1="3.66" y1="14.16" x2="3.98" y2="14.16" width="0.8128" layer="16"/>
+<wire x1="5.25" y1="14.16" x2="5.25" y2="15.43" width="0.8128" layer="16"/>
+<wire x1="3.66" y1="14.16" x2="5.25" y2="14.16" width="0.8128" layer="16"/>
 <wire x1="5.25" y1="15.43" x2="5.25" y2="13.99" width="0.8128" layer="16"/>
 <wire x1="6.502" y1="12.738" x2="6.502" y2="11.62" width="0.8128" layer="16"/>
 <wire x1="5.25" y1="13.99" x2="6.502" y2="12.738" width="0.8128" layer="16"/>
@@ -1475,16 +1443,19 @@ design rules under a new name.</description>
 <signal name="N$5">
 <contactref element="D3" pad="1"/>
 <contactref element="D2" pad="1"/>
-<contactref element="S1" pad="3"/>
-<wire x1="10.3248" y1="25.82" x2="10.3248" y2="21.3358" width="0.8128" layer="16"/>
-<wire x1="10.3248" y1="21.3358" x2="10.4394" y2="21.2212" width="0.8128" layer="16"/>
-<wire x1="13.97" y1="26.4252" x2="10.93" y2="26.4252" width="0.8128" layer="16"/>
-<wire x1="10.93" y1="26.4252" x2="10.3248" y2="25.82" width="0.8128" layer="16"/>
+<wire x1="13.47" y1="27.4252" x2="11.93" y2="27.4252" width="0.8128" layer="16"/>
+<wire x1="11.93" y1="27.4252" x2="10.3248" y2="25.82" width="0.8128" layer="16"/>
 <contactref element="D8" pad="2"/>
-<wire x1="10.4394" y1="21.2212" x2="12.5" y2="19.1606" width="0.8128" layer="16"/>
-<wire x1="12.5" y1="19.1606" x2="12.5" y2="12" width="0.8128" layer="16"/>
 <wire x1="12.5" y1="12" x2="13" y2="11.5" width="0.8128" layer="16"/>
 <wire x1="13" y1="11.5" x2="14.1" y2="11.5" width="0.8128" layer="16"/>
+<contactref element="S1" pad="3"/>
+<contactref element="S1" pad="4"/>
+<wire x1="10.3248" y1="25.82" x2="10.3248" y2="21.8366" width="0.8128" layer="16"/>
+<wire x1="10.3248" y1="21.8366" x2="10.2394" y2="21.7512" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="21.7512" x2="10.2394" y2="15.2488" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="15.2488" x2="10.4882" y2="15" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="15.2488" x2="12.5" y2="12.9882" width="0.8128" layer="16"/>
+<wire x1="12.5" y1="12.9882" x2="12.5" y2="12" width="0.8128" layer="16"/>
 </signal>
 <signal name="SPOUT">
 <contactref element="J7" pad="6"/>
@@ -1499,22 +1470,21 @@ design rules under a new name.</description>
 <contactref element="J2" pad="1"/>
 <wire x1="12.3016" y1="14.1984" x2="14" y2="12.5" width="0.8128" layer="1"/>
 <wire x1="18.46946875" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="1"/>
-<wire x1="21.0146" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="16"/>
-<wire x1="17.62" y1="12.4746" x2="21.0146" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="20.5146" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="19.12" y1="10.4746" x2="20.5146" y2="9.08" width="0.8128" layer="16"/>
 <wire x1="15.04946875" y1="12.5" x2="18.46946875" y2="9.08" width="0.8128" layer="1"/>
 <wire x1="14" y1="12.5" x2="15.04946875" y2="12.5" width="0.8128" layer="1"/>
 </signal>
 <signal name="SPK">
 <wire x1="2.54" y1="37.02" x2="2.54" y2="16.7" width="0.8128" layer="1"/>
-<wire x1="2.54" y1="16.7" x2="9.12" y2="10.12" width="0.8128" layer="1"/>
+<wire x1="2.54" y1="16.7" x2="9.19" y2="10.05" width="0.8128" layer="1"/>
 <wire x1="2.54" y1="37.02" x2="4.191" y2="38.671" width="0.8128" layer="1"/>
 <wire x1="4.191" y1="46.291" x2="4.191" y2="38.671" width="0.8128" layer="1"/>
 <contactref element="U1" pad="10"/>
 <wire x1="6.55" y1="46.92" x2="4.82" y2="46.92" width="0.8128" layer="1"/>
 <wire x1="4.82" y1="46.92" x2="4.191" y2="46.291" width="0.8128" layer="1"/>
 <contactref element="SG1" pad="2"/>
-<wire x1="9.19" y1="8" x2="9.19" y2="10.05" width="0.8128" layer="1"/>
-<wire x1="9.19" y1="10.05" x2="9.12" y2="10.12" width="0.8128" layer="1"/>
+<wire x1="9.19" y1="10.05" x2="9.19" y2="8" width="0.8128" layer="1"/>
 </signal>
 <signal name="3V3">
 <contactref element="U1" pad="2"/>

+ 156 - 182
schematic/ECU.b#5

@@ -8,17 +8,17 @@
 </settings>
 <grid distance="0.5" unitdist="mm" unit="mm" style="lines" multiple="1" display="no" altdistance="5" altunitdist="mil" altunit="mm"/>
 <layers>
-<layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
+<layer number="1" name="Top" color="4" fill="1" visible="no" active="yes"/>
 <layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
 <layer number="20" name="Dimension" color="24" fill="1" visible="yes" active="yes"/>
-<layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="21" name="tPlace" color="7" fill="1" visible="no" active="yes"/>
 <layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="yes"/>
 <layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="25" name="tNames" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="26" name="bNames" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
@@ -32,9 +32,9 @@
 <layer number="36" name="bGlue" color="7" fill="5" visible="no" active="yes"/>
 <layer number="37" name="tTest" color="7" fill="1" visible="no" active="yes"/>
 <layer number="38" name="bTest" color="7" fill="1" visible="no" active="yes"/>
-<layer number="39" name="tKeepout" color="4" fill="11" visible="yes" active="yes"/>
+<layer number="39" name="tKeepout" color="4" fill="11" visible="no" active="yes"/>
 <layer number="40" name="bKeepout" color="1" fill="11" visible="yes" active="yes"/>
-<layer number="41" name="tRestrict" color="4" fill="10" visible="yes" active="yes"/>
+<layer number="41" name="tRestrict" color="4" fill="10" visible="no" active="yes"/>
 <layer number="42" name="bRestrict" color="1" fill="10" visible="yes" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
@@ -44,7 +44,7 @@
 <layer number="48" name="Document" color="7" fill="1" visible="no" active="yes"/>
 <layer number="49" name="Reference" color="7" fill="1" visible="no" active="yes"/>
 <layer number="50" name="dxf" color="7" fill="1" visible="no" active="no"/>
-<layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="51" name="tDocu" color="7" fill="1" visible="no" active="yes"/>
 <layer number="52" name="bDocu" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="53" name="tGND_GNDA" color="7" fill="9" visible="no" active="no"/>
 <layer number="54" name="bGND_GNDA" color="1" fill="9" visible="no" active="no"/>
@@ -539,64 +539,6 @@ CONN_03
 </package3d>
 </packages3d>
 </library>
-<library name="SparkFun-Switches" urn="urn:adsk.eagle:library:535">
-<description>&lt;h3&gt;SparkFun Switches, Buttons, Encoders&lt;/h3&gt;
-In this library you'll find switches, buttons, joysticks, and anything that moves to create or disrupt an electrical connection.
-&lt;br&gt;
-&lt;br&gt;
-We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
-&lt;br&gt;
-&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
-&lt;br&gt;
-&lt;br&gt;
-&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
-&lt;br&gt;
-&lt;br&gt;
-You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
-<packages>
-<package name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:footprint:40103/1" library_version="1">
-<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square&lt;/h3&gt;
-&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
-&lt;p&gt;&lt;a href="https://www.omron.com/ecb/products/pdf/en-b3f.pdf"&gt;Datasheet&lt;/a&gt; (B3F-1000)&lt;/p&gt;</description>
-<wire x1="3.048" y1="1.016" x2="3.048" y2="2.54" width="0.2032" layer="51"/>
-<wire x1="3.048" y1="2.54" x2="2.54" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="-3.048" x2="3.048" y2="-2.54" width="0.2032" layer="51"/>
-<wire x1="3.048" y1="-2.54" x2="3.048" y2="-1.016" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="3.048" x2="-3.048" y2="2.54" width="0.2032" layer="51"/>
-<wire x1="-3.048" y1="2.54" x2="-3.048" y2="1.016" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-3.048" x2="-3.048" y2="-2.54" width="0.2032" layer="51"/>
-<wire x1="-3.048" y1="-2.54" x2="-3.048" y2="-1.016" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-3.048" x2="-2.159" y2="-3.048" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="3.048" x2="2.159" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.159" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="21"/>
-<wire x1="-2.159" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="21"/>
-<wire x1="3.048" y1="0.998" x2="3.048" y2="-1.016" width="0.2032" layer="21"/>
-<wire x1="-3.048" y1="1.028" x2="-3.048" y2="-1.016" width="0.2032" layer="21"/>
-<wire x1="-2.54" y1="1.27" x2="-2.54" y2="0.508" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-0.508" x2="-2.54" y2="-1.27" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="0.508" x2="-2.159" y2="-0.381" width="0.2032" layer="51"/>
-<circle x="0" y="0" radius="1.778" width="0.2032" layer="21"/>
-<pad name="1" x="-3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="2" x="3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="3" x="-3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="4" x="3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
-<text x="0" y="3.302" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
-<text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
-</package>
-</packages>
-<packages3d>
-<package3d name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:package:40163/1" type="box" library_version="1">
-<description>Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square
-Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
-Datasheet (B3F-1000)</description>
-<packageinstances>
-<packageinstance name="TACTILE_SWITCH_PTH_6.0MM"/>
-</packageinstances>
-</package3d>
-</packages3d>
-</library>
 <library name="eScooter">
 <packages>
 <package name="DIOM5027X220N" urn="urn:adsk.eagle:footprint:21928331/1">
@@ -679,7 +621,65 @@ Datasheet (B3F-1000)</description>
 </package3d>
 </packages3d>
 </library>
-<library name="buzzer" urn="urn:adsk.eagle:library:113">
+<library name="SparkFun-Switches">
+<description>&lt;h3&gt;SparkFun Switches, Buttons, Encoders&lt;/h3&gt;
+In this library you'll find switches, buttons, joysticks, and anything that moves to create or disrupt an electrical connection.
+&lt;br&gt;
+&lt;br&gt;
+We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
+&lt;br&gt;
+&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
+&lt;br&gt;
+&lt;br&gt;
+&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
+&lt;br&gt;
+&lt;br&gt;
+You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
+<packages>
+<package name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:footprint:40103/1">
+<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square&lt;/h3&gt;
+&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
+&lt;p&gt;&lt;a href="https://www.omron.com/ecb/products/pdf/en-b3f.pdf"&gt;Datasheet&lt;/a&gt; (B3F-1000)&lt;/p&gt;</description>
+<wire x1="3.048" y1="1.016" x2="3.048" y2="2.54" width="0.2032" layer="51"/>
+<wire x1="3.048" y1="2.54" x2="2.54" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="-3.048" x2="3.048" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="3.048" y1="-2.54" x2="3.048" y2="-1.016" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="3.048" x2="-3.048" y2="2.54" width="0.2032" layer="51"/>
+<wire x1="-3.048" y1="2.54" x2="-3.048" y2="1.016" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-3.048" x2="-3.048" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="-3.048" y1="-2.54" x2="-3.048" y2="-1.016" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-3.048" x2="-2.159" y2="-3.048" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="3.048" x2="2.159" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.159" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="21"/>
+<wire x1="-2.159" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="21"/>
+<wire x1="3.048" y1="0.998" x2="3.048" y2="-1.016" width="0.2032" layer="21"/>
+<wire x1="-3.048" y1="1.028" x2="-3.048" y2="-1.016" width="0.2032" layer="21"/>
+<wire x1="-2.54" y1="1.27" x2="-2.54" y2="0.508" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-0.508" x2="-2.54" y2="-1.27" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="0.508" x2="-2.159" y2="-0.381" width="0.2032" layer="51"/>
+<circle x="0" y="0" radius="1.778" width="0.2032" layer="21"/>
+<pad name="1" x="-3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="2" x="3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="3" x="-3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="4" x="3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
+<text x="0" y="3.302" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
+<text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
+</package>
+</packages>
+<packages3d>
+<package3d name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:package:40163/1" type="box">
+<description>Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square
+Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
+Datasheet (B3F-1000)</description>
+<packageinstances>
+<packageinstance name="TACTILE_SWITCH_PTH_6.0MM"/>
+</packageinstances>
+</package3d>
+</packages3d>
+</library>
+<library name="buzzer">
 <description>&lt;b&gt;Speakers and Buzzers&lt;/b&gt;&lt;p&gt;
 &lt;ul&gt;Distributors:
 &lt;li&gt;Buerklin
@@ -688,21 +688,17 @@ Datasheet (B3F-1000)</description>
 &lt;/ul&gt;
 &lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
 <packages>
-<package name="F/HGP" urn="urn:adsk.eagle:footprint:5238/1" library_version="2">
+<package name="F/HGP" urn="urn:adsk.eagle:footprint:5238/1" locally_modified="yes">
 <description>&lt;b&gt;BUZZER&lt;/b&gt;</description>
-<wire x1="-7.8361" y1="-1.6158" x2="-7.8361" y2="1.6158" width="0.1524" layer="21" curve="336.697868"/>
-<wire x1="-5.882" y1="-2.032" x2="-5.882" y2="2.032" width="0.1524" layer="21" curve="321.883357"/>
-<wire x1="-6.604" y1="2.032" x2="-6.604" y2="-2.032" width="0.1524" layer="21" curve="180"/>
-<wire x1="-6.604" y1="-2.032" x2="-5.882" y2="-2.032" width="0.1524" layer="21"/>
-<wire x1="-6.604" y1="2.032" x2="-5.882" y2="2.032" width="0.1524" layer="21"/>
 <pad name="1" x="-3.81" y="0" drill="1.016" diameter="2.159" shape="octagon"/>
 <pad name="2" x="3.81" y="0" drill="1.016" diameter="2.159" shape="octagon"/>
 <text x="4.445" y="6.985" size="1.27" layer="25" ratio="10">&gt;NAME</text>
 <text x="-3.683" y="-3.81" size="1.27" layer="27" ratio="10">&gt;VALUE</text>
+<circle x="0" y="0" radius="6.0827625" width="0.127" layer="21"/>
 </package>
 </packages>
 <packages3d>
-<package3d name="F/HGP" urn="urn:adsk.eagle:package:5287/1" type="box" library_version="2">
+<package3d name="F/HGP" urn="urn:adsk.eagle:package:5287/1" type="box">
 <description>BUZZER</description>
 <packageinstances>
 <packageinstance name="F/HGP"/>
@@ -903,35 +899,35 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="9.43" y="58.23" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Capacitor" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="11.2867" y="58.23" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="7.5733" y="58.23" size="1.27" layer="28" rot="MR90" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<element name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="8.43" y="58.23" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Capacitor" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="10.2867" y="58.23" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="6.5733" y="58.23" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
 </element>
-<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="17.62" y="13.95" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Capacitor" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="19.4767" y="13.95" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="15.7633" y="13.95" size="1.27" layer="28" rot="MR90" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="19.12" y="11.95" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Capacitor" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="20.9767" y="11.95" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="17.2633" y="11.95" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
 </element>
 <element name="D2" library="Diode" library_urn="urn:adsk.eagle:library:16378169" package="SOD6126X290" package3d_urn="urn:adsk.eagle:package:9427057/2" value="" x="7.62" y="25.82" smashed="yes" rot="MR0">
 <attribute name="CATEGORY" value="Diode" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
@@ -956,7 +952,7 @@ design rules under a new name.</description>
 <attribute name="FORWARD_CURRENT" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
 <attribute name="MANUFACTURER" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
 <attribute name="MPN" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="16.08" y="29.13" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="NAME" x="10.58" y="29.63" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
 <attribute name="OPERATING_TEMP" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
 <attribute name="PART_STATUS" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
 <attribute name="REVERSE_VOLTAGE" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
@@ -1019,7 +1015,7 @@ design rules under a new name.</description>
 <attribute name="DRAIN_CURRENT" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="MANUFACTURER" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="MPN" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
-<attribute name="NAME" x="4.445" y="17.335" size="1.27" layer="26" rot="MR270"/>
+<attribute name="NAME" x="5.445" y="18.835" size="1.27" layer="26" rot="MR180"/>
 <attribute name="OPERATING_TEMP" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="PART_STATUS" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="ROHS_COMPLIANT" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
@@ -1035,7 +1031,7 @@ design rules under a new name.</description>
 <attribute name="DRAIN_CURRENT" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="MANUFACTURER" value="ON Semiconductor" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="MPN" value="BSS84" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="NAME" x="4.445" y="17.335" size="1.27" layer="26" rot="MR0"/>
+<attribute name="NAME" x="3.445" y="17.335" size="1.27" layer="26" rot="MR0"/>
 <attribute name="OPERATING_TEMP" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="PART_STATUS" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="ROHS_COMPLIANT" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
@@ -1062,7 +1058,7 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="23.765" y="40.195" size="1.27" layer="28" rot="MR0"/>
 </element>
 <element name="R1" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="8.35" y="34.78" smashed="yes" rot="MR180">
-<attribute name="NAME" x="7.08" y="33.51" size="1.27" layer="26" rot="MR180"/>
+<attribute name="NAME" x="7.08" y="37.01" size="1.27" layer="26" rot="MR180"/>
 <attribute name="SPICEMODEL" value="NONE" x="56.61" y="86.85" size="1.778" layer="28" rot="MR180" display="off"/>
 <attribute name="SPICEPREFIX" value="R" x="56.61" y="86.85" size="1.778" layer="28" rot="MR180" display="off"/>
 <attribute name="VALUE" x="7.08" y="37.32" size="1.27" layer="28" rot="MR180"/>
@@ -1073,28 +1069,22 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="-48.26" y="-40.45" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="VALUE" x="6.35" y="9.08" size="1.27" layer="28" rot="MR0"/>
 </element>
-<element name="S1" library="SparkFun-Switches" library_urn="urn:adsk.eagle:library:535" package="TACTILE_SWITCH_PTH_6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value="" x="12.7" y="17.97" smashed="yes" rot="R270">
-<attribute name="NAME" x="16.002" y="17.97" size="0.6096" layer="25" font="vector" ratio="20" rot="R270" align="bottom-center"/>
-<attribute name="PROD_ID" value=" SWCH-08441" x="8.89" y="-23.94" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="SF_SKU" value="COM-00097" x="8.89" y="-23.94" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="VALUE" x="9.525" y="17.97" size="0.6096" layer="27" font="vector" ratio="20" rot="R270" align="top-center"/>
-</element>
-<element name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="17" y="24" smashed="yes" rot="MR0">
-<attribute name="NAME" x="18.27" y="25.27" size="1.27" layer="26" rot="MR0"/>
-<attribute name="SPICEMODEL" value="NONE" x="17" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="SPICEPREFIX" value="R" x="17" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="VALUE" x="18.27" y="21.46" size="1.27" layer="28" rot="MR0"/>
+<element name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="17.5" y="24" smashed="yes" rot="MR0">
+<attribute name="NAME" x="18.77" y="25.27" size="1.27" layer="26" rot="MR0"/>
+<attribute name="SPICEMODEL" value="NONE" x="17.5" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="SPICEPREFIX" value="R" x="17.5" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="VALUE" x="18.77" y="21.46" size="1.27" layer="28" rot="MR0"/>
 </element>
-<element name="D4" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="6.5" y="57" smashed="yes" rot="MR90">
-<attribute name="NAME" x="8.485" y="57" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="VALUE" x="4.515" y="57" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D4" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="5.5" y="58" smashed="yes" rot="MR90">
+<attribute name="NAME" x="7.485" y="58" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="VALUE" x="3.515" y="58" size="1.27" layer="28" rot="MR90" align="top-center"/>
 </element>
-<element name="D5" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="17.5" y="19.5" smashed="yes" rot="MR90">
-<attribute name="NAME" x="19.485" y="19.5" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="VALUE" x="15.515" y="19.5" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D5" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="19" y="18" smashed="yes" rot="MR90">
+<attribute name="NAME" x="20.985" y="18" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="VALUE" x="17.015" y="18" size="1.27" layer="28" rot="MR90" align="top-center"/>
 </element>
 <element name="D6" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="19" y="31" smashed="yes" rot="MR180">
-<attribute name="NAME" x="19" y="29.015" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
+<attribute name="NAME" x="19" y="34.015" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
 <attribute name="VALUE" x="19" y="32.985" size="1.27" layer="28" rot="MR180" align="top-center"/>
 </element>
 <element name="D7" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="20.5" y="60" smashed="yes" rot="MR180">
@@ -1105,11 +1095,11 @@ design rules under a new name.</description>
 <attribute name="NAME" x="12" y="9.515" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
 <attribute name="VALUE" x="12" y="13.485" size="1.27" layer="28" rot="MR180" align="top-center"/>
 </element>
-<element name="R4" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="21" y="39.5" smashed="yes" rot="MR180">
-<attribute name="NAME" x="19.73" y="38.23" size="1.27" layer="26" rot="MR180"/>
-<attribute name="SPICEMODEL" value="NONE" x="21" y="39.5" size="1.778" layer="28" rot="MR180" display="off"/>
-<attribute name="SPICEPREFIX" value="R" x="21" y="39.5" size="1.778" layer="28" rot="MR180" display="off"/>
-<attribute name="VALUE" x="19.73" y="42.04" size="1.27" layer="28" rot="MR180"/>
+<element name="R4" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="21" y="39" smashed="yes" rot="MR180">
+<attribute name="NAME" x="19.73" y="37.73" size="1.27" layer="26" rot="MR180"/>
+<attribute name="SPICEMODEL" value="NONE" x="21" y="39" size="1.778" layer="28" rot="MR180" display="off"/>
+<attribute name="SPICEPREFIX" value="R" x="21" y="39" size="1.778" layer="28" rot="MR180" display="off"/>
+<attribute name="VALUE" x="19.73" y="41.54" size="1.27" layer="28" rot="MR180"/>
 </element>
 <element name="R5" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="21" y="63" smashed="yes" rot="MR0">
 <attribute name="NAME" x="22.27" y="64.27" size="1.27" layer="26" rot="MR0"/>
@@ -1136,7 +1126,13 @@ design rules under a new name.</description>
 <attribute name="NAME" x="14.5" y="74.135" size="1.27" layer="25" align="bottom-center"/>
 <attribute name="VALUE" x="14.5" y="29.865" size="1.27" layer="27" align="top-center"/>
 </element>
-<element name="SG1" library="buzzer" library_urn="urn:adsk.eagle:library:113" package="F/HGP" package3d_urn="urn:adsk.eagle:package:5287/1" value="F/HGP" x="13" y="8" smashed="yes" rot="R180">
+<element name="S1" library="SparkFun-Switches" package="TACTILE_SWITCH_PTH_6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value="MOMENTARY-SWITCH-SPST-PTH-6.0MM" x="12.5" y="18.5" smashed="yes" rot="MR90">
+<attribute name="NAME" x="15.802" y="18.5" size="0.6096" layer="26" font="vector" ratio="20" rot="MR90" align="bottom-center"/>
+<attribute name="PROD_ID" value=" SWCH-08441" x="12.5" y="18.5" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SF_SKU" value="COM-00097" x="12.5" y="18.5" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="9.325" y="18.5" size="0.6096" layer="28" font="vector" ratio="20" rot="MR90" align="top-center"/>
+</element>
+<element name="SG1" library="buzzer" package="F/HGP" package3d_urn="urn:adsk.eagle:package:5287/1" value="F/HGP" x="13" y="8" smashed="yes" rot="R180">
 <attribute name="MF" value="" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MPN" value="" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="NAME" x="8.555" y="1.015" size="1.27" layer="25" ratio="10" rot="R180"/>
@@ -1151,7 +1147,6 @@ design rules under a new name.</description>
 <contactref element="Q5" pad="2"/>
 <contactref element="R1" pad="1"/>
 <contactref element="Q2" pad="2"/>
-<contactref element="S1" pad="1"/>
 <contactref element="J3" pad="2"/>
 <contactref element="Q1" pad="2"/>
 <contactref element="J5" pad="3"/>
@@ -1191,33 +1186,9 @@ design rules under a new name.</description>
 <contactref element="R5" pad="1"/>
 <contactref element="C2" pad="2"/>
 <contactref element="U1" pad="14"/>
+<contactref element="S1" pad="2"/>
+<contactref element="S1" pad="1"/>
 <contactref element="SG1" pad="1"/>
-<wire x1="7.34" y1="74.28" x2="11.51" y2="76.39" width="0" layer="19" extent="1-1"/>
-<wire x1="10.43" y1="69.04" x2="7.34" y2="74.28" width="0" layer="19" extent="1-1"/>
-<wire x1="13.97" y1="63.42" x2="10.43" y2="69.04" width="0" layer="19" extent="1-1"/>
-<wire x1="9.43" y1="56.7546" x2="13.97" y2="63.42" width="0" layer="19" extent="16-16"/>
-<wire x1="6.5" y1="54.9" x2="9.43" y2="56.7546" width="0" layer="19" extent="16-16"/>
-<wire x1="2.54" y1="55.34" x2="6.5" y2="54.9" width="0" layer="19" extent="16-16"/>
-<wire x1="22.422" y1="63" x2="13.97" y2="63.42" width="0" layer="19" extent="16-16"/>
-<wire x1="22.6" y1="60" x2="22.422" y2="63" width="0" layer="19" extent="16-16"/>
-<wire x1="2.54" y1="65.77" x2="10.43" y2="69.04" width="0" layer="19" extent="1-1"/>
-<wire x1="2.54" y1="45.18" x2="2.54" y2="55.34" width="0" layer="19" extent="1-1"/>
-<wire x1="6.55" y1="36.76" x2="2.54" y2="45.18" width="0" layer="19" extent="1-1"/>
-<wire x1="6.928" y1="34.78" x2="6.55" y2="36.76" width="0" layer="19" extent="1-16"/>
-<wire x1="7.39" y1="31.94" x2="6.928" y2="34.78" width="0" layer="19" extent="16-16"/>
-<wire x1="11.0246" y1="29" x2="7.39" y2="31.94" width="0" layer="19" extent="1-1"/>
-<wire x1="15.578" y1="24" x2="11.0246" y2="29" width="0" layer="19" extent="1-16"/>
-<wire x1="14.9606" y1="21.2212" x2="15.578" y2="24" width="0" layer="19" extent="16-16"/>
-<wire x1="13.97" y1="17.97" x2="14.9606" y2="21.2212" width="0" layer="19" extent="1-1"/>
-<wire x1="17.5" y1="17.4" x2="13.97" y2="17.97" width="0" layer="19" extent="16-16"/>
-<wire x1="17.62" y1="15.4254" x2="17.5" y2="17.4" width="0" layer="19" extent="16-16"/>
-<wire x1="7.45" y1="14.48" x2="13.97" y2="17.97" width="0" layer="19" extent="16-16"/>
-<wire x1="16.81" y1="8" x2="5.08" y2="6.54" width="0" layer="19" extent="1-1"/>
-<wire x1="9.9" y1="11.5" x2="7.45" y2="14.48" width="0" layer="19" extent="16-16"/>
-<wire x1="12.7" y1="7.81" x2="16.81" y2="8" width="0" layer="19" extent="1-1"/>
-<wire x1="21.1" y1="31" x2="15.578" y2="24" width="0" layer="19" extent="16-16"/>
-<wire x1="19.578" y1="39.5" x2="21.1" y2="31" width="0" layer="19" extent="16-16"/>
-<wire x1="20.91" y1="42.27" x2="19.578" y2="39.5" width="0" layer="19" extent="16-16"/>
 </signal>
 <signal name="VIN">
 <contactref element="Q4" pad="3"/>
@@ -1292,13 +1263,13 @@ design rules under a new name.</description>
 <via x="9.66" y="61.92" extent="1-16" drill="0.35"/>
 <contactref element="D4" pad="2"/>
 <contactref element="J5" pad="1"/>
-<wire x1="2.54" y1="60.69" x2="6.5" y2="60.69" width="0.8128" layer="16"/>
-<wire x1="6.5" y1="60.69" x2="8" y2="60.69" width="0.8128" layer="16"/>
+<wire x1="2.54" y1="60.69" x2="5.5" y2="60.69" width="0.8128" layer="16"/>
+<wire x1="5.5" y1="60.69" x2="8" y2="60.69" width="0.8128" layer="16"/>
 <wire x1="8" y1="60.69" x2="8.43" y2="60.69" width="0.8128" layer="16"/>
 <wire x1="8.43" y1="60.69" x2="9.66" y2="61.92" width="0.8128" layer="16"/>
-<wire x1="6.5" y1="59.1" x2="6.5" y2="60.69" width="0.8128" layer="16"/>
-<wire x1="8" y1="60.69" x2="8.9846" y2="59.7054" width="0.8128" layer="16"/>
-<wire x1="8.9846" y1="59.7054" x2="9.43" y2="59.7054" width="0.8128" layer="16"/>
+<wire x1="5.5" y1="60.1" x2="5.5" y2="60.69" width="0.8128" layer="16"/>
+<wire x1="8" y1="60.69" x2="8.43" y2="60.26" width="0.8128" layer="16"/>
+<wire x1="8.43" y1="60.26" x2="8.43" y2="59.7054" width="0.8128" layer="16"/>
 <contactref element="U1" pad="4"/>
 <wire x1="6.55" y1="62.16" x2="9.42" y2="62.16" width="0.8128" layer="1"/>
 <wire x1="9.42" y1="62.16" x2="9.66" y2="61.92" width="0.8128" layer="1"/>
@@ -1335,17 +1306,17 @@ design rules under a new name.</description>
 <contactref element="J2" pad="4"/>
 <contactref element="D5" pad="2"/>
 <wire x1="21.86" y1="16.7" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="20.5" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="21.6" x2="17.5" y2="20.5" width="0.8128" layer="16"/>
+<wire x1="19" y1="19" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
+<wire x1="19" y1="20.1" x2="19" y2="19" width="0.8128" layer="16"/>
 <contactref element="R3" pad="1"/>
 <contactref element="U1" pad="20"/>
 <wire x1="20.83" y1="44.38" x2="20.05" y2="43.6" width="0.8128" layer="1"/>
 <wire x1="22.45" y1="44.38" x2="20.83" y2="44.38" width="0.8128" layer="1"/>
-<wire x1="18.422" y1="24" x2="17.5" y2="23.078" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="23.078" x2="17.5" y2="21.6" width="0.8128" layer="16"/>
-<wire x1="18.422" y1="24" x2="20" y2="24" width="0.8128" layer="16"/>
-<wire x1="20" y1="24" x2="21.86" y2="25.86" width="0.8128" layer="16"/>
-<wire x1="21.86" y1="25.86" x2="21.86" y2="26.86" width="0.8128" layer="16"/>
+<wire x1="18.922" y1="24" x2="19" y2="23.922" width="0.8128" layer="16"/>
+<wire x1="19" y1="23.922" x2="19" y2="20.1" width="0.8128" layer="16"/>
+<wire x1="18.922" y1="24" x2="19.5" y2="24" width="0.8128" layer="16"/>
+<wire x1="19.5" y1="24" x2="21.86" y2="26.36" width="0.8128" layer="16"/>
+<wire x1="21.86" y1="26.36" x2="21.86" y2="26.86" width="0.8128" layer="16"/>
 </signal>
 <signal name="BTN">
 <contactref element="D3" pad="2"/>
@@ -1380,11 +1351,11 @@ design rules under a new name.</description>
 <wire x1="23.5776" y1="23.05" x2="22.3076" y2="21.78" width="0.8128" layer="16"/>
 <wire x1="22.3076" y1="21.78" x2="21.86" y2="21.78" width="0.8128" layer="16"/>
 <wire x1="22.81" y1="38.19" x2="23.5776" y2="37.4224" width="0.8128" layer="16"/>
-<wire x1="22.81" y1="42.27" x2="22.81" y2="39.5" width="0.8128" layer="16"/>
-<wire x1="22.81" y1="39.5" x2="22.81" y2="38.19" width="0.8128" layer="16"/>
+<wire x1="22.81" y1="42.27" x2="22.81" y2="39" width="0.8128" layer="16"/>
+<wire x1="22.81" y1="39" x2="22.81" y2="38.19" width="0.8128" layer="16"/>
 <wire x1="23.5776" y1="37.4224" x2="23.5776" y2="23.05" width="0.8128" layer="16"/>
 <contactref element="R4" pad="2"/>
-<wire x1="22.422" y1="39.5" x2="22.81" y2="39.5" width="0.8128" layer="16"/>
+<wire x1="22.422" y1="39" x2="22.81" y2="39" width="0.8128" layer="16"/>
 </signal>
 <signal name="LEDCTL">
 <contactref element="Q1" pad="1"/>
@@ -1464,8 +1435,8 @@ design rules under a new name.</description>
 <contactref element="Q2" pad="3"/>
 <contactref element="D2" pad="2"/>
 <wire x1="3.49" y1="14.33" x2="3.66" y2="14.16" width="0.8128" layer="16"/>
-<wire x1="3.98" y1="14.16" x2="5.25" y2="15.43" width="0.8128" layer="16"/>
-<wire x1="3.66" y1="14.16" x2="3.98" y2="14.16" width="0.8128" layer="16"/>
+<wire x1="5.25" y1="14.16" x2="5.25" y2="15.43" width="0.8128" layer="16"/>
+<wire x1="3.66" y1="14.16" x2="5.25" y2="14.16" width="0.8128" layer="16"/>
 <wire x1="5.25" y1="15.43" x2="5.25" y2="13.99" width="0.8128" layer="16"/>
 <wire x1="6.502" y1="12.738" x2="6.502" y2="11.62" width="0.8128" layer="16"/>
 <wire x1="5.25" y1="13.99" x2="6.502" y2="12.738" width="0.8128" layer="16"/>
@@ -1475,16 +1446,19 @@ design rules under a new name.</description>
 <signal name="N$5">
 <contactref element="D3" pad="1"/>
 <contactref element="D2" pad="1"/>
-<contactref element="S1" pad="3"/>
-<wire x1="10.3248" y1="25.82" x2="10.3248" y2="21.3358" width="0.8128" layer="16"/>
-<wire x1="10.3248" y1="21.3358" x2="10.4394" y2="21.2212" width="0.8128" layer="16"/>
 <wire x1="13.97" y1="26.4252" x2="10.93" y2="26.4252" width="0.8128" layer="16"/>
 <wire x1="10.93" y1="26.4252" x2="10.3248" y2="25.82" width="0.8128" layer="16"/>
 <contactref element="D8" pad="2"/>
-<wire x1="10.4394" y1="21.2212" x2="12.5" y2="19.1606" width="0.8128" layer="16"/>
-<wire x1="12.5" y1="19.1606" x2="12.5" y2="12" width="0.8128" layer="16"/>
 <wire x1="12.5" y1="12" x2="13" y2="11.5" width="0.8128" layer="16"/>
 <wire x1="13" y1="11.5" x2="14.1" y2="11.5" width="0.8128" layer="16"/>
+<contactref element="S1" pad="3"/>
+<contactref element="S1" pad="4"/>
+<wire x1="10.3248" y1="25.82" x2="10.3248" y2="21.8366" width="0.8128" layer="16"/>
+<wire x1="10.3248" y1="21.8366" x2="10.2394" y2="21.7512" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="21.7512" x2="10.2394" y2="15.2488" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="15.2488" x2="10.4882" y2="15" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="15.2488" x2="12.5" y2="12.9882" width="0.8128" layer="16"/>
+<wire x1="12.5" y1="12.9882" x2="12.5" y2="12" width="0.8128" layer="16"/>
 </signal>
 <signal name="SPOUT">
 <contactref element="J7" pad="6"/>
@@ -1499,21 +1473,21 @@ design rules under a new name.</description>
 <contactref element="J2" pad="1"/>
 <wire x1="12.3016" y1="14.1984" x2="14" y2="12.5" width="0.8128" layer="1"/>
 <wire x1="18.46946875" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="1"/>
-<wire x1="21.0146" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="16"/>
-<wire x1="17.62" y1="12.4746" x2="21.0146" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="20.5146" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="19.12" y1="10.4746" x2="20.5146" y2="9.08" width="0.8128" layer="16"/>
 <wire x1="15.04946875" y1="12.5" x2="18.46946875" y2="9.08" width="0.8128" layer="1"/>
 <wire x1="14" y1="12.5" x2="15.04946875" y2="12.5" width="0.8128" layer="1"/>
 </signal>
 <signal name="SPK">
 <wire x1="2.54" y1="37.02" x2="2.54" y2="16.7" width="0.8128" layer="1"/>
-<wire x1="2.54" y1="16.7" x2="9.45" y2="9.79" width="0.8128" layer="1"/>
+<wire x1="2.54" y1="16.7" x2="9.19" y2="10.05" width="0.8128" layer="1"/>
 <wire x1="2.54" y1="37.02" x2="4.191" y2="38.671" width="0.8128" layer="1"/>
 <wire x1="4.191" y1="46.291" x2="4.191" y2="38.671" width="0.8128" layer="1"/>
 <contactref element="U1" pad="10"/>
 <wire x1="6.55" y1="46.92" x2="4.82" y2="46.92" width="0.8128" layer="1"/>
 <wire x1="4.82" y1="46.92" x2="4.191" y2="46.291" width="0.8128" layer="1"/>
 <contactref element="SG1" pad="2"/>
-<wire x1="9.45" y1="9.79" x2="9.19" y2="8" width="0" layer="19" extent="1-1"/>
+<wire x1="9.19" y1="10.05" x2="9.19" y2="8" width="0.8128" layer="1"/>
 </signal>
 <signal name="3V3">
 <contactref element="U1" pad="2"/>

+ 169 - 193
schematic/ECU.b#6

@@ -8,17 +8,17 @@
 </settings>
 <grid distance="0.5" unitdist="mm" unit="mm" style="lines" multiple="1" display="no" altdistance="5" altunitdist="mil" altunit="mm"/>
 <layers>
-<layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
+<layer number="1" name="Top" color="4" fill="1" visible="no" active="yes"/>
 <layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
 <layer number="20" name="Dimension" color="24" fill="1" visible="yes" active="yes"/>
-<layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="21" name="tPlace" color="7" fill="1" visible="no" active="yes"/>
 <layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="yes"/>
 <layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="25" name="tNames" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="26" name="bNames" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
@@ -32,9 +32,9 @@
 <layer number="36" name="bGlue" color="7" fill="5" visible="no" active="yes"/>
 <layer number="37" name="tTest" color="7" fill="1" visible="no" active="yes"/>
 <layer number="38" name="bTest" color="7" fill="1" visible="no" active="yes"/>
-<layer number="39" name="tKeepout" color="4" fill="11" visible="yes" active="yes"/>
+<layer number="39" name="tKeepout" color="4" fill="11" visible="no" active="yes"/>
 <layer number="40" name="bKeepout" color="1" fill="11" visible="yes" active="yes"/>
-<layer number="41" name="tRestrict" color="4" fill="10" visible="yes" active="yes"/>
+<layer number="41" name="tRestrict" color="4" fill="10" visible="no" active="yes"/>
 <layer number="42" name="bRestrict" color="1" fill="10" visible="yes" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
@@ -44,7 +44,7 @@
 <layer number="48" name="Document" color="7" fill="1" visible="no" active="yes"/>
 <layer number="49" name="Reference" color="7" fill="1" visible="no" active="yes"/>
 <layer number="50" name="dxf" color="7" fill="1" visible="no" active="no"/>
-<layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="51" name="tDocu" color="7" fill="1" visible="no" active="yes"/>
 <layer number="52" name="bDocu" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="53" name="tGND_GNDA" color="7" fill="9" visible="no" active="no"/>
 <layer number="54" name="bGND_GNDA" color="1" fill="9" visible="no" active="no"/>
@@ -539,64 +539,6 @@ CONN_03
 </package3d>
 </packages3d>
 </library>
-<library name="SparkFun-Switches" urn="urn:adsk.eagle:library:535">
-<description>&lt;h3&gt;SparkFun Switches, Buttons, Encoders&lt;/h3&gt;
-In this library you'll find switches, buttons, joysticks, and anything that moves to create or disrupt an electrical connection.
-&lt;br&gt;
-&lt;br&gt;
-We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
-&lt;br&gt;
-&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
-&lt;br&gt;
-&lt;br&gt;
-&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
-&lt;br&gt;
-&lt;br&gt;
-You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
-<packages>
-<package name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:footprint:40103/1" library_version="1">
-<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square&lt;/h3&gt;
-&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
-&lt;p&gt;&lt;a href="https://www.omron.com/ecb/products/pdf/en-b3f.pdf"&gt;Datasheet&lt;/a&gt; (B3F-1000)&lt;/p&gt;</description>
-<wire x1="3.048" y1="1.016" x2="3.048" y2="2.54" width="0.2032" layer="51"/>
-<wire x1="3.048" y1="2.54" x2="2.54" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="-3.048" x2="3.048" y2="-2.54" width="0.2032" layer="51"/>
-<wire x1="3.048" y1="-2.54" x2="3.048" y2="-1.016" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="3.048" x2="-3.048" y2="2.54" width="0.2032" layer="51"/>
-<wire x1="-3.048" y1="2.54" x2="-3.048" y2="1.016" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-3.048" x2="-3.048" y2="-2.54" width="0.2032" layer="51"/>
-<wire x1="-3.048" y1="-2.54" x2="-3.048" y2="-1.016" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-3.048" x2="-2.159" y2="-3.048" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="3.048" x2="2.159" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.159" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="21"/>
-<wire x1="-2.159" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="21"/>
-<wire x1="3.048" y1="0.998" x2="3.048" y2="-1.016" width="0.2032" layer="21"/>
-<wire x1="-3.048" y1="1.028" x2="-3.048" y2="-1.016" width="0.2032" layer="21"/>
-<wire x1="-2.54" y1="1.27" x2="-2.54" y2="0.508" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-0.508" x2="-2.54" y2="-1.27" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="0.508" x2="-2.159" y2="-0.381" width="0.2032" layer="51"/>
-<circle x="0" y="0" radius="1.778" width="0.2032" layer="21"/>
-<pad name="1" x="-3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="2" x="3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="3" x="-3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="4" x="3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
-<text x="0" y="3.302" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
-<text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
-</package>
-</packages>
-<packages3d>
-<package3d name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:package:40163/1" type="box" library_version="1">
-<description>Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square
-Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
-Datasheet (B3F-1000)</description>
-<packageinstances>
-<packageinstance name="TACTILE_SWITCH_PTH_6.0MM"/>
-</packageinstances>
-</package3d>
-</packages3d>
-</library>
 <library name="eScooter">
 <packages>
 <package name="DIOM5027X220N" urn="urn:adsk.eagle:footprint:21928331/1">
@@ -679,7 +621,65 @@ Datasheet (B3F-1000)</description>
 </package3d>
 </packages3d>
 </library>
-<library name="buzzer" urn="urn:adsk.eagle:library:113">
+<library name="SparkFun-Switches">
+<description>&lt;h3&gt;SparkFun Switches, Buttons, Encoders&lt;/h3&gt;
+In this library you'll find switches, buttons, joysticks, and anything that moves to create or disrupt an electrical connection.
+&lt;br&gt;
+&lt;br&gt;
+We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
+&lt;br&gt;
+&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
+&lt;br&gt;
+&lt;br&gt;
+&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
+&lt;br&gt;
+&lt;br&gt;
+You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
+<packages>
+<package name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:footprint:40103/1">
+<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square&lt;/h3&gt;
+&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
+&lt;p&gt;&lt;a href="https://www.omron.com/ecb/products/pdf/en-b3f.pdf"&gt;Datasheet&lt;/a&gt; (B3F-1000)&lt;/p&gt;</description>
+<wire x1="3.048" y1="1.016" x2="3.048" y2="2.54" width="0.2032" layer="51"/>
+<wire x1="3.048" y1="2.54" x2="2.54" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="-3.048" x2="3.048" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="3.048" y1="-2.54" x2="3.048" y2="-1.016" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="3.048" x2="-3.048" y2="2.54" width="0.2032" layer="51"/>
+<wire x1="-3.048" y1="2.54" x2="-3.048" y2="1.016" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-3.048" x2="-3.048" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="-3.048" y1="-2.54" x2="-3.048" y2="-1.016" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-3.048" x2="-2.159" y2="-3.048" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="3.048" x2="2.159" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.159" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="21"/>
+<wire x1="-2.159" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="21"/>
+<wire x1="3.048" y1="0.998" x2="3.048" y2="-1.016" width="0.2032" layer="21"/>
+<wire x1="-3.048" y1="1.028" x2="-3.048" y2="-1.016" width="0.2032" layer="21"/>
+<wire x1="-2.54" y1="1.27" x2="-2.54" y2="0.508" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-0.508" x2="-2.54" y2="-1.27" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="0.508" x2="-2.159" y2="-0.381" width="0.2032" layer="51"/>
+<circle x="0" y="0" radius="1.778" width="0.2032" layer="21"/>
+<pad name="1" x="-3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="2" x="3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="3" x="-3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="4" x="3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
+<text x="0" y="3.302" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
+<text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
+</package>
+</packages>
+<packages3d>
+<package3d name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:package:40163/1" type="box">
+<description>Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square
+Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
+Datasheet (B3F-1000)</description>
+<packageinstances>
+<packageinstance name="TACTILE_SWITCH_PTH_6.0MM"/>
+</packageinstances>
+</package3d>
+</packages3d>
+</library>
+<library name="buzzer">
 <description>&lt;b&gt;Speakers and Buzzers&lt;/b&gt;&lt;p&gt;
 &lt;ul&gt;Distributors:
 &lt;li&gt;Buerklin
@@ -688,21 +688,17 @@ Datasheet (B3F-1000)</description>
 &lt;/ul&gt;
 &lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
 <packages>
-<package name="F/HGP" urn="urn:adsk.eagle:footprint:5238/1" library_version="2">
+<package name="F/HGP" urn="urn:adsk.eagle:footprint:5238/1" locally_modified="yes">
 <description>&lt;b&gt;BUZZER&lt;/b&gt;</description>
-<wire x1="-7.8361" y1="-1.6158" x2="-7.8361" y2="1.6158" width="0.1524" layer="21" curve="336.697868"/>
-<wire x1="-5.882" y1="-2.032" x2="-5.882" y2="2.032" width="0.1524" layer="21" curve="321.883357"/>
-<wire x1="-6.604" y1="2.032" x2="-6.604" y2="-2.032" width="0.1524" layer="21" curve="180"/>
-<wire x1="-6.604" y1="-2.032" x2="-5.882" y2="-2.032" width="0.1524" layer="21"/>
-<wire x1="-6.604" y1="2.032" x2="-5.882" y2="2.032" width="0.1524" layer="21"/>
 <pad name="1" x="-3.81" y="0" drill="1.016" diameter="2.159" shape="octagon"/>
 <pad name="2" x="3.81" y="0" drill="1.016" diameter="2.159" shape="octagon"/>
 <text x="4.445" y="6.985" size="1.27" layer="25" ratio="10">&gt;NAME</text>
 <text x="-3.683" y="-3.81" size="1.27" layer="27" ratio="10">&gt;VALUE</text>
+<circle x="0" y="0" radius="6.0827625" width="0.127" layer="21"/>
 </package>
 </packages>
 <packages3d>
-<package3d name="F/HGP" urn="urn:adsk.eagle:package:5287/1" type="box" library_version="2">
+<package3d name="F/HGP" urn="urn:adsk.eagle:package:5287/1" type="box">
 <description>BUZZER</description>
 <packageinstances>
 <packageinstance name="F/HGP"/>
@@ -903,35 +899,35 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="9.43" y="58.23" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Capacitor" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="11.2867" y="58.23" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="7.5733" y="58.23" size="1.27" layer="28" rot="MR90" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<element name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="9.43" y="57.73" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Capacitor" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="11.2867" y="57.73" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="7.5733" y="57.73" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
 </element>
-<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="17.62" y="13.95" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Capacitor" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="19.4767" y="13.95" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="15.7633" y="13.95" size="1.27" layer="28" rot="MR90" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="19.12" y="11.95" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Capacitor" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="20.9767" y="11.95" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="17.2633" y="11.95" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
 </element>
 <element name="D2" library="Diode" library_urn="urn:adsk.eagle:library:16378169" package="SOD6126X290" package3d_urn="urn:adsk.eagle:package:9427057/2" value="" x="7.62" y="25.82" smashed="yes" rot="MR0">
 <attribute name="CATEGORY" value="Diode" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
@@ -956,7 +952,7 @@ design rules under a new name.</description>
 <attribute name="FORWARD_CURRENT" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
 <attribute name="MANUFACTURER" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
 <attribute name="MPN" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="16.08" y="29.13" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="NAME" x="10.58" y="29.63" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
 <attribute name="OPERATING_TEMP" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
 <attribute name="PART_STATUS" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
 <attribute name="REVERSE_VOLTAGE" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
@@ -1019,7 +1015,7 @@ design rules under a new name.</description>
 <attribute name="DRAIN_CURRENT" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="MANUFACTURER" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="MPN" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
-<attribute name="NAME" x="4.445" y="17.335" size="1.27" layer="26" rot="MR270"/>
+<attribute name="NAME" x="5.445" y="18.835" size="1.27" layer="26" rot="MR180"/>
 <attribute name="OPERATING_TEMP" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="PART_STATUS" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="ROHS_COMPLIANT" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
@@ -1035,7 +1031,7 @@ design rules under a new name.</description>
 <attribute name="DRAIN_CURRENT" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="MANUFACTURER" value="ON Semiconductor" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="MPN" value="BSS84" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="NAME" x="4.445" y="17.335" size="1.27" layer="26" rot="MR0"/>
+<attribute name="NAME" x="3.445" y="17.335" size="1.27" layer="26" rot="MR0"/>
 <attribute name="OPERATING_TEMP" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="PART_STATUS" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="ROHS_COMPLIANT" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
@@ -1062,7 +1058,7 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="23.765" y="40.195" size="1.27" layer="28" rot="MR0"/>
 </element>
 <element name="R1" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="8.35" y="34.78" smashed="yes" rot="MR180">
-<attribute name="NAME" x="7.08" y="33.51" size="1.27" layer="26" rot="MR180"/>
+<attribute name="NAME" x="7.08" y="37.01" size="1.27" layer="26" rot="MR180"/>
 <attribute name="SPICEMODEL" value="NONE" x="56.61" y="86.85" size="1.778" layer="28" rot="MR180" display="off"/>
 <attribute name="SPICEPREFIX" value="R" x="56.61" y="86.85" size="1.778" layer="28" rot="MR180" display="off"/>
 <attribute name="VALUE" x="7.08" y="37.32" size="1.27" layer="28" rot="MR180"/>
@@ -1073,28 +1069,22 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="-48.26" y="-40.45" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="VALUE" x="6.35" y="9.08" size="1.27" layer="28" rot="MR0"/>
 </element>
-<element name="S1" library="SparkFun-Switches" library_urn="urn:adsk.eagle:library:535" package="TACTILE_SWITCH_PTH_6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value="" x="12.7" y="17.97" smashed="yes" rot="R270">
-<attribute name="NAME" x="16.002" y="17.97" size="0.6096" layer="25" font="vector" ratio="20" rot="R270" align="bottom-center"/>
-<attribute name="PROD_ID" value=" SWCH-08441" x="8.89" y="-23.94" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="SF_SKU" value="COM-00097" x="8.89" y="-23.94" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="VALUE" x="9.525" y="17.97" size="0.6096" layer="27" font="vector" ratio="20" rot="R270" align="top-center"/>
-</element>
-<element name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="17" y="24" smashed="yes" rot="MR0">
-<attribute name="NAME" x="18.27" y="25.27" size="1.27" layer="26" rot="MR0"/>
-<attribute name="SPICEMODEL" value="NONE" x="17" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="SPICEPREFIX" value="R" x="17" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="VALUE" x="18.27" y="21.46" size="1.27" layer="28" rot="MR0"/>
+<element name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="17.5" y="24" smashed="yes" rot="MR0">
+<attribute name="NAME" x="18.77" y="25.27" size="1.27" layer="26" rot="MR0"/>
+<attribute name="SPICEMODEL" value="NONE" x="17.5" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="SPICEPREFIX" value="R" x="17.5" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="VALUE" x="18.77" y="21.46" size="1.27" layer="28" rot="MR0"/>
 </element>
-<element name="D4" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="6.5" y="57" smashed="yes" rot="MR90">
-<attribute name="NAME" x="8.485" y="57" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="VALUE" x="4.515" y="57" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D4" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="5.5" y="58" smashed="yes" rot="MR90">
+<attribute name="NAME" x="7.485" y="58" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="VALUE" x="3.515" y="58" size="1.27" layer="28" rot="MR90" align="top-center"/>
 </element>
-<element name="D5" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="17.5" y="19.5" smashed="yes" rot="MR90">
-<attribute name="NAME" x="19.485" y="19.5" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="VALUE" x="15.515" y="19.5" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D5" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="19" y="18" smashed="yes" rot="MR90">
+<attribute name="NAME" x="20.985" y="18" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="VALUE" x="17.015" y="18" size="1.27" layer="28" rot="MR90" align="top-center"/>
 </element>
 <element name="D6" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="19" y="31" smashed="yes" rot="MR180">
-<attribute name="NAME" x="19" y="29.015" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
+<attribute name="NAME" x="19" y="34.015" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
 <attribute name="VALUE" x="19" y="32.985" size="1.27" layer="28" rot="MR180" align="top-center"/>
 </element>
 <element name="D7" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="20.5" y="60" smashed="yes" rot="MR180">
@@ -1105,11 +1095,11 @@ design rules under a new name.</description>
 <attribute name="NAME" x="12" y="9.515" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
 <attribute name="VALUE" x="12" y="13.485" size="1.27" layer="28" rot="MR180" align="top-center"/>
 </element>
-<element name="R4" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="21" y="39.5" smashed="yes" rot="MR180">
-<attribute name="NAME" x="19.73" y="38.23" size="1.27" layer="26" rot="MR180"/>
-<attribute name="SPICEMODEL" value="NONE" x="21" y="39.5" size="1.778" layer="28" rot="MR180" display="off"/>
-<attribute name="SPICEPREFIX" value="R" x="21" y="39.5" size="1.778" layer="28" rot="MR180" display="off"/>
-<attribute name="VALUE" x="19.73" y="42.04" size="1.27" layer="28" rot="MR180"/>
+<element name="R4" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="21" y="39" smashed="yes" rot="MR180">
+<attribute name="NAME" x="19.73" y="37.73" size="1.27" layer="26" rot="MR180"/>
+<attribute name="SPICEMODEL" value="NONE" x="21" y="39" size="1.778" layer="28" rot="MR180" display="off"/>
+<attribute name="SPICEPREFIX" value="R" x="21" y="39" size="1.778" layer="28" rot="MR180" display="off"/>
+<attribute name="VALUE" x="19.73" y="41.54" size="1.27" layer="28" rot="MR180"/>
 </element>
 <element name="R5" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="21" y="63" smashed="yes" rot="MR0">
 <attribute name="NAME" x="22.27" y="64.27" size="1.27" layer="26" rot="MR0"/>
@@ -1136,14 +1126,20 @@ design rules under a new name.</description>
 <attribute name="NAME" x="14.5" y="74.135" size="1.27" layer="25" align="bottom-center"/>
 <attribute name="VALUE" x="14.5" y="29.865" size="1.27" layer="27" align="top-center"/>
 </element>
-<element name="SG1" library="buzzer" library_urn="urn:adsk.eagle:library:113" package="F/HGP" package3d_urn="urn:adsk.eagle:package:5287/1" value="F/HGP" x="12.5" y="7.5" smashed="yes">
-<attribute name="MF" value="" x="12.5" y="7.5" size="1.778" layer="27" display="off"/>
-<attribute name="MPN" value="" x="12.5" y="7.5" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="16.945" y="14.485" size="1.27" layer="25" ratio="10"/>
-<attribute name="OC_FARNELL" value="unknown" x="12.5" y="7.5" size="1.778" layer="27" display="off"/>
-<attribute name="OC_NEWARK" value="unknown" x="12.5" y="7.5" size="1.778" layer="27" display="off"/>
-<attribute name="POPULARITY" value="0" x="12.5" y="7.5" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="8.817" y="3.69" size="1.27" layer="27" ratio="10"/>
+<element name="S1" library="SparkFun-Switches" package="TACTILE_SWITCH_PTH_6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value="MOMENTARY-SWITCH-SPST-PTH-6.0MM" x="12.5" y="18.5" smashed="yes" rot="MR90">
+<attribute name="NAME" x="15.802" y="18.5" size="0.6096" layer="26" font="vector" ratio="20" rot="MR90" align="bottom-center"/>
+<attribute name="PROD_ID" value=" SWCH-08441" x="12.5" y="18.5" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SF_SKU" value="COM-00097" x="12.5" y="18.5" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="9.325" y="18.5" size="0.6096" layer="28" font="vector" ratio="20" rot="MR90" align="top-center"/>
+</element>
+<element name="SG1" library="buzzer" package="F/HGP" package3d_urn="urn:adsk.eagle:package:5287/1" value="F/HGP" x="13" y="8" smashed="yes" rot="R180">
+<attribute name="MF" value="" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="MPN" value="" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="NAME" x="8.555" y="1.015" size="1.27" layer="25" ratio="10" rot="R180"/>
+<attribute name="OC_FARNELL" value="unknown" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="OC_NEWARK" value="unknown" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="POPULARITY" value="0" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="VALUE" x="16.683" y="11.81" size="1.27" layer="27" ratio="10" rot="R180"/>
 </element>
 </elements>
 <signals>
@@ -1151,7 +1147,6 @@ design rules under a new name.</description>
 <contactref element="Q5" pad="2"/>
 <contactref element="R1" pad="1"/>
 <contactref element="Q2" pad="2"/>
-<contactref element="S1" pad="1"/>
 <contactref element="J3" pad="2"/>
 <contactref element="Q1" pad="2"/>
 <contactref element="J5" pad="3"/>
@@ -1191,33 +1186,9 @@ design rules under a new name.</description>
 <contactref element="R5" pad="1"/>
 <contactref element="C2" pad="2"/>
 <contactref element="U1" pad="14"/>
+<contactref element="S1" pad="2"/>
+<contactref element="S1" pad="1"/>
 <contactref element="SG1" pad="1"/>
-<wire x1="7.34" y1="74.28" x2="11.51" y2="76.39" width="0" layer="19" extent="1-1"/>
-<wire x1="10.43" y1="69.04" x2="7.34" y2="74.28" width="0" layer="19" extent="1-1"/>
-<wire x1="13.97" y1="63.42" x2="10.43" y2="69.04" width="0" layer="19" extent="1-1"/>
-<wire x1="9.43" y1="56.7546" x2="13.97" y2="63.42" width="0" layer="19" extent="16-16"/>
-<wire x1="6.5" y1="54.9" x2="9.43" y2="56.7546" width="0" layer="19" extent="16-16"/>
-<wire x1="2.54" y1="55.34" x2="6.5" y2="54.9" width="0" layer="19" extent="16-16"/>
-<wire x1="22.422" y1="63" x2="13.97" y2="63.42" width="0" layer="19" extent="16-16"/>
-<wire x1="22.6" y1="60" x2="22.422" y2="63" width="0" layer="19" extent="16-16"/>
-<wire x1="2.54" y1="65.77" x2="10.43" y2="69.04" width="0" layer="19" extent="1-1"/>
-<wire x1="2.54" y1="45.18" x2="2.54" y2="55.34" width="0" layer="19" extent="1-1"/>
-<wire x1="6.55" y1="36.76" x2="2.54" y2="45.18" width="0" layer="19" extent="1-1"/>
-<wire x1="6.928" y1="34.78" x2="6.55" y2="36.76" width="0" layer="19" extent="1-16"/>
-<wire x1="7.39" y1="31.94" x2="6.928" y2="34.78" width="0" layer="19" extent="16-16"/>
-<wire x1="11.0246" y1="29" x2="7.39" y2="31.94" width="0" layer="19" extent="1-1"/>
-<wire x1="15.578" y1="24" x2="11.0246" y2="29" width="0" layer="19" extent="1-16"/>
-<wire x1="14.9606" y1="21.2212" x2="15.578" y2="24" width="0" layer="19" extent="16-16"/>
-<wire x1="13.97" y1="17.97" x2="14.9606" y2="21.2212" width="0" layer="19" extent="1-1"/>
-<wire x1="17.5" y1="17.4" x2="13.97" y2="17.97" width="0" layer="19" extent="16-16"/>
-<wire x1="17.62" y1="15.4254" x2="17.5" y2="17.4" width="0" layer="19" extent="16-16"/>
-<wire x1="7.45" y1="14.48" x2="13.97" y2="17.97" width="0" layer="19" extent="16-16"/>
-<wire x1="8.69" y1="7.5" x2="5.08" y2="6.54" width="0" layer="19" extent="1-1"/>
-<wire x1="9.9" y1="11.5" x2="7.45" y2="14.48" width="0" layer="19" extent="16-16"/>
-<wire x1="12.7" y1="7.81" x2="8.69" y2="7.5" width="0" layer="19" extent="1-1"/>
-<wire x1="21.1" y1="31" x2="15.578" y2="24" width="0" layer="19" extent="16-16"/>
-<wire x1="19.578" y1="39.5" x2="21.1" y2="31" width="0" layer="19" extent="16-16"/>
-<wire x1="20.91" y1="42.27" x2="19.578" y2="39.5" width="0" layer="19" extent="16-16"/>
 </signal>
 <signal name="VIN">
 <contactref element="Q4" pad="3"/>
@@ -1292,13 +1263,13 @@ design rules under a new name.</description>
 <via x="9.66" y="61.92" extent="1-16" drill="0.35"/>
 <contactref element="D4" pad="2"/>
 <contactref element="J5" pad="1"/>
-<wire x1="2.54" y1="60.69" x2="6.5" y2="60.69" width="0.8128" layer="16"/>
-<wire x1="6.5" y1="60.69" x2="8" y2="60.69" width="0.8128" layer="16"/>
+<wire x1="2.54" y1="60.69" x2="5.5" y2="60.69" width="0.8128" layer="16"/>
+<wire x1="5.5" y1="60.69" x2="8" y2="60.69" width="0.8128" layer="16"/>
 <wire x1="8" y1="60.69" x2="8.43" y2="60.69" width="0.8128" layer="16"/>
 <wire x1="8.43" y1="60.69" x2="9.66" y2="61.92" width="0.8128" layer="16"/>
-<wire x1="6.5" y1="59.1" x2="6.5" y2="60.69" width="0.8128" layer="16"/>
-<wire x1="8" y1="60.69" x2="8.9846" y2="59.7054" width="0.8128" layer="16"/>
-<wire x1="8.9846" y1="59.7054" x2="9.43" y2="59.7054" width="0.8128" layer="16"/>
+<wire x1="5.5" y1="60.1" x2="5.5" y2="60.69" width="0.8128" layer="16"/>
+<wire x1="8" y1="60.69" x2="9.43" y2="59.26" width="0.8128" layer="16"/>
+<wire x1="9.43" y1="59.26" x2="9.43" y2="59.2054" width="0.8128" layer="16"/>
 <contactref element="U1" pad="4"/>
 <wire x1="6.55" y1="62.16" x2="9.42" y2="62.16" width="0.8128" layer="1"/>
 <wire x1="9.42" y1="62.16" x2="9.66" y2="61.92" width="0.8128" layer="1"/>
@@ -1335,17 +1306,17 @@ design rules under a new name.</description>
 <contactref element="J2" pad="4"/>
 <contactref element="D5" pad="2"/>
 <wire x1="21.86" y1="16.7" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="20.5" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="21.6" x2="17.5" y2="20.5" width="0.8128" layer="16"/>
+<wire x1="19" y1="19" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
+<wire x1="19" y1="20.1" x2="19" y2="19" width="0.8128" layer="16"/>
 <contactref element="R3" pad="1"/>
 <contactref element="U1" pad="20"/>
 <wire x1="20.83" y1="44.38" x2="20.05" y2="43.6" width="0.8128" layer="1"/>
 <wire x1="22.45" y1="44.38" x2="20.83" y2="44.38" width="0.8128" layer="1"/>
-<wire x1="18.422" y1="24" x2="17.5" y2="23.078" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="23.078" x2="17.5" y2="21.6" width="0.8128" layer="16"/>
-<wire x1="18.422" y1="24" x2="20" y2="24" width="0.8128" layer="16"/>
-<wire x1="20" y1="24" x2="21.86" y2="25.86" width="0.8128" layer="16"/>
-<wire x1="21.86" y1="25.86" x2="21.86" y2="26.86" width="0.8128" layer="16"/>
+<wire x1="18.922" y1="24" x2="19" y2="23.922" width="0.8128" layer="16"/>
+<wire x1="19" y1="23.922" x2="19" y2="20.1" width="0.8128" layer="16"/>
+<wire x1="18.922" y1="24" x2="19.5" y2="24" width="0.8128" layer="16"/>
+<wire x1="19.5" y1="24" x2="21.86" y2="26.36" width="0.8128" layer="16"/>
+<wire x1="21.86" y1="26.36" x2="21.86" y2="26.86" width="0.8128" layer="16"/>
 </signal>
 <signal name="BTN">
 <contactref element="D3" pad="2"/>
@@ -1380,11 +1351,11 @@ design rules under a new name.</description>
 <wire x1="23.5776" y1="23.05" x2="22.3076" y2="21.78" width="0.8128" layer="16"/>
 <wire x1="22.3076" y1="21.78" x2="21.86" y2="21.78" width="0.8128" layer="16"/>
 <wire x1="22.81" y1="38.19" x2="23.5776" y2="37.4224" width="0.8128" layer="16"/>
-<wire x1="22.81" y1="42.27" x2="22.81" y2="39.5" width="0.8128" layer="16"/>
-<wire x1="22.81" y1="39.5" x2="22.81" y2="38.19" width="0.8128" layer="16"/>
+<wire x1="22.81" y1="42.27" x2="22.81" y2="39" width="0.8128" layer="16"/>
+<wire x1="22.81" y1="39" x2="22.81" y2="38.19" width="0.8128" layer="16"/>
 <wire x1="23.5776" y1="37.4224" x2="23.5776" y2="23.05" width="0.8128" layer="16"/>
 <contactref element="R4" pad="2"/>
-<wire x1="22.422" y1="39.5" x2="22.81" y2="39.5" width="0.8128" layer="16"/>
+<wire x1="22.422" y1="39" x2="22.81" y2="39" width="0.8128" layer="16"/>
 </signal>
 <signal name="LEDCTL">
 <contactref element="Q1" pad="1"/>
@@ -1464,8 +1435,8 @@ design rules under a new name.</description>
 <contactref element="Q2" pad="3"/>
 <contactref element="D2" pad="2"/>
 <wire x1="3.49" y1="14.33" x2="3.66" y2="14.16" width="0.8128" layer="16"/>
-<wire x1="3.98" y1="14.16" x2="5.25" y2="15.43" width="0.8128" layer="16"/>
-<wire x1="3.66" y1="14.16" x2="3.98" y2="14.16" width="0.8128" layer="16"/>
+<wire x1="5.25" y1="14.16" x2="5.25" y2="15.43" width="0.8128" layer="16"/>
+<wire x1="3.66" y1="14.16" x2="5.25" y2="14.16" width="0.8128" layer="16"/>
 <wire x1="5.25" y1="15.43" x2="5.25" y2="13.99" width="0.8128" layer="16"/>
 <wire x1="6.502" y1="12.738" x2="6.502" y2="11.62" width="0.8128" layer="16"/>
 <wire x1="5.25" y1="13.99" x2="6.502" y2="12.738" width="0.8128" layer="16"/>
@@ -1475,43 +1446,48 @@ design rules under a new name.</description>
 <signal name="N$5">
 <contactref element="D3" pad="1"/>
 <contactref element="D2" pad="1"/>
-<contactref element="S1" pad="3"/>
-<wire x1="10.3248" y1="25.82" x2="10.3248" y2="21.3358" width="0.8128" layer="16"/>
-<wire x1="10.3248" y1="21.3358" x2="10.4394" y2="21.2212" width="0.8128" layer="16"/>
 <wire x1="13.97" y1="26.4252" x2="10.93" y2="26.4252" width="0.8128" layer="16"/>
 <wire x1="10.93" y1="26.4252" x2="10.3248" y2="25.82" width="0.8128" layer="16"/>
 <contactref element="D8" pad="2"/>
-<wire x1="10.4394" y1="21.2212" x2="12.5" y2="19.1606" width="0.8128" layer="16"/>
-<wire x1="12.5" y1="19.1606" x2="12.5" y2="12" width="0.8128" layer="16"/>
 <wire x1="12.5" y1="12" x2="13" y2="11.5" width="0.8128" layer="16"/>
 <wire x1="13" y1="11.5" x2="14.1" y2="11.5" width="0.8128" layer="16"/>
+<contactref element="S1" pad="3"/>
+<contactref element="S1" pad="4"/>
+<wire x1="10.3248" y1="25.82" x2="10.3248" y2="21.8366" width="0.8128" layer="16"/>
+<wire x1="10.3248" y1="21.8366" x2="10.2394" y2="21.7512" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="21.7512" x2="10.2394" y2="15.2488" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="15.2488" x2="10.4882" y2="15" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="15.2488" x2="12.5" y2="12.9882" width="0.8128" layer="16"/>
+<wire x1="12.5" y1="12.9882" x2="12.5" y2="12" width="0.8128" layer="16"/>
 </signal>
 <signal name="SPOUT">
 <contactref element="J7" pad="6"/>
 <contactref element="C3" pad="1"/>
-<wire x1="12.8016" y1="23.90786875" x2="12.8016" y2="13.74786875" width="0.8128" layer="1"/>
+<wire x1="12.3016" y1="24.40786875" x2="12.3016" y2="14.1984" width="0.8128" layer="1"/>
 <wire x1="2.54" y1="31.67" x2="6.08" y2="28.13" width="0.8128" layer="16"/>
 <wire x1="7.62" y1="28.13" x2="8.57946875" y2="28.13" width="0.8128" layer="1"/>
-<wire x1="8.57946875" y1="28.13" x2="12.8016" y2="23.90786875" width="0.8128" layer="1"/>
+<wire x1="8.57946875" y1="28.13" x2="12.3016" y2="24.40786875" width="0.8128" layer="1"/>
 <wire x1="2.54" y1="42.64" x2="2.54" y2="31.67" width="0.8128" layer="16"/>
 <via x="7.62" y="28.13" extent="1-16" drill="0.35"/>
 <wire x1="6.08" y1="28.13" x2="7.62" y2="28.13" width="0.8128" layer="16"/>
 <contactref element="J2" pad="1"/>
-<wire x1="12.8016" y1="13.74786875" x2="17.46946875" y2="9.08" width="0.8128" layer="1"/>
-<wire x1="17.46946875" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="1"/>
-<wire x1="21.0146" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="16"/>
-<wire x1="17.62" y1="12.4746" x2="21.0146" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="12.3016" y1="14.1984" x2="14" y2="12.5" width="0.8128" layer="1"/>
+<wire x1="18.46946875" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="1"/>
+<wire x1="20.5146" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="19.12" y1="10.4746" x2="20.5146" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="15.04946875" y1="12.5" x2="18.46946875" y2="9.08" width="0.8128" layer="1"/>
+<wire x1="14" y1="12.5" x2="15.04946875" y2="12.5" width="0.8128" layer="1"/>
 </signal>
 <signal name="SPK">
 <wire x1="2.54" y1="37.02" x2="2.54" y2="16.7" width="0.8128" layer="1"/>
-<wire x1="2.54" y1="16.7" x2="9.45" y2="9.79" width="0.8128" layer="1"/>
+<wire x1="2.54" y1="16.7" x2="9.19" y2="10.05" width="0.8128" layer="1"/>
 <wire x1="2.54" y1="37.02" x2="4.191" y2="38.671" width="0.8128" layer="1"/>
 <wire x1="4.191" y1="46.291" x2="4.191" y2="38.671" width="0.8128" layer="1"/>
 <contactref element="U1" pad="10"/>
 <wire x1="6.55" y1="46.92" x2="4.82" y2="46.92" width="0.8128" layer="1"/>
 <wire x1="4.82" y1="46.92" x2="4.191" y2="46.291" width="0.8128" layer="1"/>
 <contactref element="SG1" pad="2"/>
-<wire x1="9.45" y1="9.79" x2="16.31" y2="7.5" width="0" layer="19" extent="1-1"/>
+<wire x1="9.19" y1="10.05" x2="9.19" y2="8" width="0.8128" layer="1"/>
 </signal>
 <signal name="3V3">
 <contactref element="U1" pad="2"/>

+ 193 - 226
schematic/ECU.b#7

@@ -8,17 +8,17 @@
 </settings>
 <grid distance="0.5" unitdist="mm" unit="mm" style="lines" multiple="1" display="no" altdistance="5" altunitdist="mil" altunit="mm"/>
 <layers>
-<layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
+<layer number="1" name="Top" color="4" fill="1" visible="no" active="yes"/>
 <layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
 <layer number="20" name="Dimension" color="24" fill="1" visible="yes" active="yes"/>
-<layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="21" name="tPlace" color="7" fill="1" visible="no" active="yes"/>
 <layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="yes"/>
 <layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="25" name="tNames" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="26" name="bNames" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
@@ -32,9 +32,9 @@
 <layer number="36" name="bGlue" color="7" fill="5" visible="no" active="yes"/>
 <layer number="37" name="tTest" color="7" fill="1" visible="no" active="yes"/>
 <layer number="38" name="bTest" color="7" fill="1" visible="no" active="yes"/>
-<layer number="39" name="tKeepout" color="4" fill="11" visible="yes" active="yes"/>
+<layer number="39" name="tKeepout" color="4" fill="11" visible="no" active="yes"/>
 <layer number="40" name="bKeepout" color="1" fill="11" visible="yes" active="yes"/>
-<layer number="41" name="tRestrict" color="4" fill="10" visible="yes" active="yes"/>
+<layer number="41" name="tRestrict" color="4" fill="10" visible="no" active="yes"/>
 <layer number="42" name="bRestrict" color="1" fill="10" visible="yes" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
@@ -44,7 +44,7 @@
 <layer number="48" name="Document" color="7" fill="1" visible="no" active="yes"/>
 <layer number="49" name="Reference" color="7" fill="1" visible="no" active="yes"/>
 <layer number="50" name="dxf" color="7" fill="1" visible="no" active="no"/>
-<layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="51" name="tDocu" color="7" fill="1" visible="no" active="yes"/>
 <layer number="52" name="bDocu" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="53" name="tGND_GNDA" color="7" fill="9" visible="no" active="no"/>
 <layer number="54" name="bGND_GNDA" color="1" fill="9" visible="no" active="no"/>
@@ -539,133 +539,6 @@ CONN_03
 </package3d>
 </packages3d>
 </library>
-<library name="SparkFun-Switches" urn="urn:adsk.eagle:library:535">
-<description>&lt;h3&gt;SparkFun Switches, Buttons, Encoders&lt;/h3&gt;
-In this library you'll find switches, buttons, joysticks, and anything that moves to create or disrupt an electrical connection.
-&lt;br&gt;
-&lt;br&gt;
-We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
-&lt;br&gt;
-&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
-&lt;br&gt;
-&lt;br&gt;
-&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
-&lt;br&gt;
-&lt;br&gt;
-You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
-<packages>
-<package name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:footprint:40103/1" library_version="1">
-<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square&lt;/h3&gt;
-&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
-&lt;p&gt;&lt;a href="https://www.omron.com/ecb/products/pdf/en-b3f.pdf"&gt;Datasheet&lt;/a&gt; (B3F-1000)&lt;/p&gt;</description>
-<wire x1="3.048" y1="1.016" x2="3.048" y2="2.54" width="0.2032" layer="51"/>
-<wire x1="3.048" y1="2.54" x2="2.54" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="-3.048" x2="3.048" y2="-2.54" width="0.2032" layer="51"/>
-<wire x1="3.048" y1="-2.54" x2="3.048" y2="-1.016" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="3.048" x2="-3.048" y2="2.54" width="0.2032" layer="51"/>
-<wire x1="-3.048" y1="2.54" x2="-3.048" y2="1.016" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-3.048" x2="-3.048" y2="-2.54" width="0.2032" layer="51"/>
-<wire x1="-3.048" y1="-2.54" x2="-3.048" y2="-1.016" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-3.048" x2="-2.159" y2="-3.048" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="3.048" x2="2.159" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.159" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="21"/>
-<wire x1="-2.159" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="21"/>
-<wire x1="3.048" y1="0.998" x2="3.048" y2="-1.016" width="0.2032" layer="21"/>
-<wire x1="-3.048" y1="1.028" x2="-3.048" y2="-1.016" width="0.2032" layer="21"/>
-<wire x1="-2.54" y1="1.27" x2="-2.54" y2="0.508" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-0.508" x2="-2.54" y2="-1.27" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="0.508" x2="-2.159" y2="-0.381" width="0.2032" layer="51"/>
-<circle x="0" y="0" radius="1.778" width="0.2032" layer="21"/>
-<pad name="1" x="-3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="2" x="3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="3" x="-3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="4" x="3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
-<text x="0" y="3.302" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
-<text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
-</package>
-</packages>
-<packages3d>
-<package3d name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:package:40163/1" type="box" library_version="1">
-<description>Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square
-Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
-Datasheet (B3F-1000)</description>
-<packageinstances>
-<packageinstance name="TACTILE_SWITCH_PTH_6.0MM"/>
-</packageinstances>
-</package3d>
-</packages3d>
-</library>
-<library name="SparkFun-Electromechanical" urn="urn:adsk.eagle:library:516">
-<description>&lt;h3&gt;SparkFun Electromechanical Parts&lt;/h3&gt;
-This library contains electromechanical devices, like motors, speakers,servos, and relays.
-&lt;br&gt;
-&lt;br&gt;
-We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
-&lt;br&gt;
-&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
-&lt;br&gt;
-&lt;br&gt;
-&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
-&lt;br&gt;
-&lt;br&gt;
-You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
-<packages>
-<package name="BUZZER-12MM-KIT" urn="urn:adsk.eagle:footprint:38540/1" library_version="1">
-<description>&lt;h3&gt;12mm Buzzer - PTH (KIT VARIANT)&lt;/h3&gt;
-&lt;p&gt;This is a small 12mm round speaker that operates around the audible 2kHz range. You can use these speakers to create simple music or user interfaces.&lt;/p&gt;
-&lt;p&gt;&lt;b&gt;Warning:&lt;/b&gt; This is the KIT version of this package. This package has a smaller diameter top stop mask, which doesn't cover the diameter of the pad. This means only the bottom side of the pads' copper will be exposed. You'll only be able to solder to the bottom side.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://cdn.sparkfun.com/datasheets/Components/General/cem-1203-42-.pdf"&gt;Datasheet&lt;/a&gt;&lt;/p&gt;
-&lt;h4&gt;Devices Using&lt;/h4&gt;
-&lt;ul&gt;&lt;li&gt;BUZZER&lt;/li&gt;&lt;/ul&gt;</description>
-<circle x="0" y="0" radius="5.9" width="0.2032" layer="21"/>
-<circle x="0" y="0" radius="1.27" width="0.2032" layer="51"/>
-<pad name="-" x="-3.25" y="0" drill="0.9" diameter="1.8796" stop="no"/>
-<pad name="+" x="3.25" y="0" drill="0.9" diameter="1.8796" stop="no"/>
-<text x="2.667" y="1.143" size="1.778" layer="51">+</text>
-<text x="0" y="6.096" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;NAME</text>
-<text x="0" y="5.588" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;VALUE</text>
-<polygon width="0.127" layer="30">
-<vertex x="3.2537" y="-0.9525" curve="-90"/>
-<vertex x="2.2988" y="-0.0228" curve="-90.011749"/>
-<vertex x="3.2512" y="0.9526" curve="-90"/>
-<vertex x="4.2012" y="-0.0254" curve="-90.024193"/>
-</polygon>
-<polygon width="0.127" layer="29">
-<vertex x="3.2512" y="-0.4445" curve="-90.012891"/>
-<vertex x="2.8067" y="-0.0203" curve="-90"/>
-<vertex x="3.2512" y="0.447" curve="-90"/>
-<vertex x="3.6931" y="-0.0101" curve="-90.012967"/>
-</polygon>
-<polygon width="0.127" layer="30">
-<vertex x="-3.2487" y="-0.9525" curve="-90"/>
-<vertex x="-4.2036" y="-0.0228" curve="-90.011749"/>
-<vertex x="-3.2512" y="0.9526" curve="-90"/>
-<vertex x="-2.3012" y="-0.0254" curve="-90.024193"/>
-</polygon>
-<polygon width="0.127" layer="29">
-<vertex x="-3.2512" y="-0.4445" curve="-90.012891"/>
-<vertex x="-3.6957" y="-0.0203" curve="-90"/>
-<vertex x="-3.2512" y="0.447" curve="-90"/>
-<vertex x="-2.8093" y="-0.0101" curve="-90.012967"/>
-</polygon>
-</package>
-</packages>
-<packages3d>
-<package3d name="BUZZER-12MM-KIT" urn="urn:adsk.eagle:package:38556/1" type="box" library_version="1">
-<description>12mm Buzzer - PTH (KIT VARIANT)
-This is a small 12mm round speaker that operates around the audible 2kHz range. You can use these speakers to create simple music or user interfaces.
-Warning: This is the KIT version of this package. This package has a smaller diameter top stop mask, which doesn't cover the diameter of the pad. This means only the bottom side of the pads' copper will be exposed. You'll only be able to solder to the bottom side.
-Datasheet
-Devices Using
-BUZZER</description>
-<packageinstances>
-<packageinstance name="BUZZER-12MM-KIT"/>
-</packageinstances>
-</package3d>
-</packages3d>
-</library>
 <library name="eScooter">
 <packages>
 <package name="DIOM5027X220N" urn="urn:adsk.eagle:footprint:21928331/1">
@@ -748,6 +621,91 @@ BUZZER</description>
 </package3d>
 </packages3d>
 </library>
+<library name="SparkFun-Switches">
+<description>&lt;h3&gt;SparkFun Switches, Buttons, Encoders&lt;/h3&gt;
+In this library you'll find switches, buttons, joysticks, and anything that moves to create or disrupt an electrical connection.
+&lt;br&gt;
+&lt;br&gt;
+We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
+&lt;br&gt;
+&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
+&lt;br&gt;
+&lt;br&gt;
+&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
+&lt;br&gt;
+&lt;br&gt;
+You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
+<packages>
+<package name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:footprint:40103/1">
+<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square&lt;/h3&gt;
+&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
+&lt;p&gt;&lt;a href="https://www.omron.com/ecb/products/pdf/en-b3f.pdf"&gt;Datasheet&lt;/a&gt; (B3F-1000)&lt;/p&gt;</description>
+<wire x1="3.048" y1="1.016" x2="3.048" y2="2.54" width="0.2032" layer="51"/>
+<wire x1="3.048" y1="2.54" x2="2.54" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="-3.048" x2="3.048" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="3.048" y1="-2.54" x2="3.048" y2="-1.016" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="3.048" x2="-3.048" y2="2.54" width="0.2032" layer="51"/>
+<wire x1="-3.048" y1="2.54" x2="-3.048" y2="1.016" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-3.048" x2="-3.048" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="-3.048" y1="-2.54" x2="-3.048" y2="-1.016" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-3.048" x2="-2.159" y2="-3.048" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="3.048" x2="2.159" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.159" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="21"/>
+<wire x1="-2.159" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="21"/>
+<wire x1="3.048" y1="0.998" x2="3.048" y2="-1.016" width="0.2032" layer="21"/>
+<wire x1="-3.048" y1="1.028" x2="-3.048" y2="-1.016" width="0.2032" layer="21"/>
+<wire x1="-2.54" y1="1.27" x2="-2.54" y2="0.508" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-0.508" x2="-2.54" y2="-1.27" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="0.508" x2="-2.159" y2="-0.381" width="0.2032" layer="51"/>
+<circle x="0" y="0" radius="1.778" width="0.2032" layer="21"/>
+<pad name="1" x="-3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="2" x="3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="3" x="-3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="4" x="3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
+<text x="0" y="3.302" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
+<text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
+</package>
+</packages>
+<packages3d>
+<package3d name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:package:40163/1" type="box">
+<description>Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square
+Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
+Datasheet (B3F-1000)</description>
+<packageinstances>
+<packageinstance name="TACTILE_SWITCH_PTH_6.0MM"/>
+</packageinstances>
+</package3d>
+</packages3d>
+</library>
+<library name="buzzer">
+<description>&lt;b&gt;Speakers and Buzzers&lt;/b&gt;&lt;p&gt;
+&lt;ul&gt;Distributors:
+&lt;li&gt;Buerklin
+&lt;li&gt;Spoerle
+&lt;li&gt;Schukat
+&lt;/ul&gt;
+&lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
+<packages>
+<package name="F/HGP" urn="urn:adsk.eagle:footprint:5238/1" locally_modified="yes">
+<description>&lt;b&gt;BUZZER&lt;/b&gt;</description>
+<pad name="1" x="-3.81" y="0" drill="1.016" diameter="2.159" shape="octagon"/>
+<pad name="2" x="3.81" y="0" drill="1.016" diameter="2.159" shape="octagon"/>
+<text x="4.445" y="6.985" size="1.27" layer="25" ratio="10">&gt;NAME</text>
+<text x="-3.683" y="-3.81" size="1.27" layer="27" ratio="10">&gt;VALUE</text>
+<circle x="0" y="0" radius="6.0827625" width="0.127" layer="21"/>
+</package>
+</packages>
+<packages3d>
+<package3d name="F/HGP" urn="urn:adsk.eagle:package:5287/1" type="box">
+<description>BUZZER</description>
+<packageinstances>
+<packageinstance name="F/HGP"/>
+</packageinstances>
+</package3d>
+</packages3d>
+</library>
 </libraries>
 <attributes>
 </attributes>
@@ -941,35 +899,35 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="9.43" y="58.23" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Capacitor" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="11.2867" y="58.23" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="7.5733" y="58.23" size="1.27" layer="28" rot="MR90" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<element name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="9.43" y="57.73" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Capacitor" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="11.2867" y="57.73" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="7.5733" y="57.73" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
 </element>
-<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="17.62" y="13.95" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Capacitor" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="19.4767" y="13.95" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="15.7633" y="13.95" size="1.27" layer="28" rot="MR90" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="19.12" y="11.95" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Capacitor" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="20.9767" y="11.95" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="17.2633" y="11.95" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
 </element>
 <element name="D2" library="Diode" library_urn="urn:adsk.eagle:library:16378169" package="SOD6126X290" package3d_urn="urn:adsk.eagle:package:9427057/2" value="" x="7.62" y="25.82" smashed="yes" rot="MR0">
 <attribute name="CATEGORY" value="Diode" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
@@ -994,7 +952,7 @@ design rules under a new name.</description>
 <attribute name="FORWARD_CURRENT" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
 <attribute name="MANUFACTURER" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
 <attribute name="MPN" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="16.08" y="29.13" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="NAME" x="10.58" y="29.63" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
 <attribute name="OPERATING_TEMP" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
 <attribute name="PART_STATUS" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
 <attribute name="REVERSE_VOLTAGE" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
@@ -1057,7 +1015,7 @@ design rules under a new name.</description>
 <attribute name="DRAIN_CURRENT" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="MANUFACTURER" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="MPN" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
-<attribute name="NAME" x="4.445" y="17.335" size="1.27" layer="26" rot="MR270"/>
+<attribute name="NAME" x="5.445" y="18.835" size="1.27" layer="26" rot="MR180"/>
 <attribute name="OPERATING_TEMP" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="PART_STATUS" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="ROHS_COMPLIANT" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
@@ -1073,7 +1031,7 @@ design rules under a new name.</description>
 <attribute name="DRAIN_CURRENT" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="MANUFACTURER" value="ON Semiconductor" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="MPN" value="BSS84" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="NAME" x="4.445" y="17.335" size="1.27" layer="26" rot="MR0"/>
+<attribute name="NAME" x="3.445" y="17.335" size="1.27" layer="26" rot="MR0"/>
 <attribute name="OPERATING_TEMP" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="PART_STATUS" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="ROHS_COMPLIANT" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
@@ -1100,7 +1058,7 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="23.765" y="40.195" size="1.27" layer="28" rot="MR0"/>
 </element>
 <element name="R1" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="8.35" y="34.78" smashed="yes" rot="MR180">
-<attribute name="NAME" x="7.08" y="33.51" size="1.27" layer="26" rot="MR180"/>
+<attribute name="NAME" x="7.08" y="37.01" size="1.27" layer="26" rot="MR180"/>
 <attribute name="SPICEMODEL" value="NONE" x="56.61" y="86.85" size="1.778" layer="28" rot="MR180" display="off"/>
 <attribute name="SPICEPREFIX" value="R" x="56.61" y="86.85" size="1.778" layer="28" rot="MR180" display="off"/>
 <attribute name="VALUE" x="7.08" y="37.32" size="1.27" layer="28" rot="MR180"/>
@@ -1111,34 +1069,22 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="-48.26" y="-40.45" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="VALUE" x="6.35" y="9.08" size="1.27" layer="28" rot="MR0"/>
 </element>
-<element name="S1" library="SparkFun-Switches" library_urn="urn:adsk.eagle:library:535" package="TACTILE_SWITCH_PTH_6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value="" x="12.7" y="17.97" smashed="yes" rot="R270">
-<attribute name="NAME" x="16.002" y="17.97" size="0.6096" layer="25" font="vector" ratio="20" rot="R270" align="bottom-center"/>
-<attribute name="PROD_ID" value=" SWCH-08441" x="8.89" y="-23.94" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="SF_SKU" value="COM-00097" x="8.89" y="-23.94" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="VALUE" x="9.525" y="17.97" size="0.6096" layer="27" font="vector" ratio="20" rot="R270" align="top-center"/>
-</element>
-<element name="LS1" library="SparkFun-Electromechanical" library_urn="urn:adsk.eagle:library:516" package="BUZZER-12MM-KIT" package3d_urn="urn:adsk.eagle:package:38556/1" value="BUZZER-PTH_KIT" x="12.7" y="7.81" smashed="yes" rot="R180">
-<attribute name="NAME" x="12.7" y="1.714" size="0.6096" layer="25" font="vector" ratio="20" rot="R180" align="bottom-center"/>
-<attribute name="PROD_ID" value="COMP-08253" x="12.7" y="7.81" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="SF_SKU" value="COM-07950" x="12.7" y="7.81" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="VALUE" x="12.7" y="2.222" size="0.6096" layer="27" font="vector" ratio="20" rot="R180" align="top-center"/>
-</element>
-<element name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="17" y="24" smashed="yes" rot="MR0">
-<attribute name="NAME" x="18.27" y="25.27" size="1.27" layer="26" rot="MR0"/>
-<attribute name="SPICEMODEL" value="NONE" x="17" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="SPICEPREFIX" value="R" x="17" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="VALUE" x="18.27" y="21.46" size="1.27" layer="28" rot="MR0"/>
+<element name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="17.5" y="24" smashed="yes" rot="MR0">
+<attribute name="NAME" x="18.77" y="25.27" size="1.27" layer="26" rot="MR0"/>
+<attribute name="SPICEMODEL" value="NONE" x="17.5" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="SPICEPREFIX" value="R" x="17.5" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="VALUE" x="18.77" y="21.46" size="1.27" layer="28" rot="MR0"/>
 </element>
-<element name="D4" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="6.5" y="57" smashed="yes" rot="MR90">
-<attribute name="NAME" x="8.485" y="57" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="VALUE" x="4.515" y="57" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D4" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="6.5" y="58" smashed="yes" rot="MR90">
+<attribute name="NAME" x="8.485" y="58" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="VALUE" x="4.515" y="58" size="1.27" layer="28" rot="MR90" align="top-center"/>
 </element>
-<element name="D5" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="17.5" y="19.5" smashed="yes" rot="MR90">
-<attribute name="NAME" x="19.485" y="19.5" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="VALUE" x="15.515" y="19.5" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D5" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="19" y="18" smashed="yes" rot="MR90">
+<attribute name="NAME" x="20.985" y="18" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="VALUE" x="17.015" y="18" size="1.27" layer="28" rot="MR90" align="top-center"/>
 </element>
 <element name="D6" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="19" y="31" smashed="yes" rot="MR180">
-<attribute name="NAME" x="19" y="29.015" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
+<attribute name="NAME" x="19" y="34.015" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
 <attribute name="VALUE" x="19" y="32.985" size="1.27" layer="28" rot="MR180" align="top-center"/>
 </element>
 <element name="D7" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="20.5" y="60" smashed="yes" rot="MR180">
@@ -1149,11 +1095,11 @@ design rules under a new name.</description>
 <attribute name="NAME" x="12" y="9.515" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
 <attribute name="VALUE" x="12" y="13.485" size="1.27" layer="28" rot="MR180" align="top-center"/>
 </element>
-<element name="R4" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="21" y="39.5" smashed="yes" rot="MR180">
-<attribute name="NAME" x="19.73" y="38.23" size="1.27" layer="26" rot="MR180"/>
-<attribute name="SPICEMODEL" value="NONE" x="21" y="39.5" size="1.778" layer="28" rot="MR180" display="off"/>
-<attribute name="SPICEPREFIX" value="R" x="21" y="39.5" size="1.778" layer="28" rot="MR180" display="off"/>
-<attribute name="VALUE" x="19.73" y="42.04" size="1.27" layer="28" rot="MR180"/>
+<element name="R4" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="21" y="39" smashed="yes" rot="MR180">
+<attribute name="NAME" x="19.73" y="37.73" size="1.27" layer="26" rot="MR180"/>
+<attribute name="SPICEMODEL" value="NONE" x="21" y="39" size="1.778" layer="28" rot="MR180" display="off"/>
+<attribute name="SPICEPREFIX" value="R" x="21" y="39" size="1.778" layer="28" rot="MR180" display="off"/>
+<attribute name="VALUE" x="19.73" y="41.54" size="1.27" layer="28" rot="MR180"/>
 </element>
 <element name="R5" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="21" y="63" smashed="yes" rot="MR0">
 <attribute name="NAME" x="22.27" y="64.27" size="1.27" layer="26" rot="MR0"/>
@@ -1180,13 +1126,27 @@ design rules under a new name.</description>
 <attribute name="NAME" x="14.5" y="74.135" size="1.27" layer="25" align="bottom-center"/>
 <attribute name="VALUE" x="14.5" y="29.865" size="1.27" layer="27" align="top-center"/>
 </element>
+<element name="S1" library="SparkFun-Switches" package="TACTILE_SWITCH_PTH_6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value="MOMENTARY-SWITCH-SPST-PTH-6.0MM" x="12.5" y="18.5" smashed="yes" rot="MR90">
+<attribute name="NAME" x="15.802" y="18.5" size="0.6096" layer="26" font="vector" ratio="20" rot="MR90" align="bottom-center"/>
+<attribute name="PROD_ID" value=" SWCH-08441" x="12.5" y="18.5" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SF_SKU" value="COM-00097" x="12.5" y="18.5" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="9.325" y="18.5" size="0.6096" layer="28" font="vector" ratio="20" rot="MR90" align="top-center"/>
+</element>
+<element name="SG1" library="buzzer" package="F/HGP" package3d_urn="urn:adsk.eagle:package:5287/1" value="F/HGP" x="13" y="8" smashed="yes" rot="R180">
+<attribute name="MF" value="" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="MPN" value="" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="NAME" x="8.555" y="1.015" size="1.27" layer="25" ratio="10" rot="R180"/>
+<attribute name="OC_FARNELL" value="unknown" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="OC_NEWARK" value="unknown" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="POPULARITY" value="0" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="VALUE" x="16.683" y="11.81" size="1.27" layer="27" ratio="10" rot="R180"/>
+</element>
 </elements>
 <signals>
 <signal name="GND">
 <contactref element="Q5" pad="2"/>
 <contactref element="R1" pad="1"/>
 <contactref element="Q2" pad="2"/>
-<contactref element="S1" pad="1"/>
 <contactref element="J3" pad="2"/>
 <contactref element="Q1" pad="2"/>
 <contactref element="J5" pad="3"/>
@@ -1212,7 +1172,6 @@ design rules under a new name.</description>
 <via x="7.39" y="31.94" extent="1-16" drill="0.35"/>
 <via x="13.97" y="17.97" extent="1-16" drill="0.35"/>
 <via x="12.7" y="7.81" extent="1-16" drill="0.35"/>
-<contactref element="LS1" pad="-"/>
 <wire x1="7.45" y1="14.48" x2="7.45" y2="13.3792875" width="0.8128" layer="16"/>
 <wire x1="7.45" y1="13.3792875" x2="8.0132" y2="12.8160875" width="0.8128" layer="16"/>
 <wire x1="8.0132" y1="12.8160875" x2="8.0132" y2="9.4732" width="0.8128" layer="16"/>
@@ -1227,6 +1186,9 @@ design rules under a new name.</description>
 <contactref element="R5" pad="1"/>
 <contactref element="C2" pad="2"/>
 <contactref element="U1" pad="14"/>
+<contactref element="S1" pad="2"/>
+<contactref element="S1" pad="1"/>
+<contactref element="SG1" pad="1"/>
 </signal>
 <signal name="VIN">
 <contactref element="Q4" pad="3"/>
@@ -1305,9 +1267,9 @@ design rules under a new name.</description>
 <wire x1="6.5" y1="60.69" x2="8" y2="60.69" width="0.8128" layer="16"/>
 <wire x1="8" y1="60.69" x2="8.43" y2="60.69" width="0.8128" layer="16"/>
 <wire x1="8.43" y1="60.69" x2="9.66" y2="61.92" width="0.8128" layer="16"/>
-<wire x1="6.5" y1="59.1" x2="6.5" y2="60.69" width="0.8128" layer="16"/>
-<wire x1="8" y1="60.69" x2="8.9846" y2="59.7054" width="0.8128" layer="16"/>
-<wire x1="8.9846" y1="59.7054" x2="9.43" y2="59.7054" width="0.8128" layer="16"/>
+<wire x1="6.5" y1="60.1" x2="6.5" y2="60.69" width="0.8128" layer="16"/>
+<wire x1="8" y1="60.69" x2="9.43" y2="59.26" width="0.8128" layer="16"/>
+<wire x1="9.43" y1="59.26" x2="9.43" y2="59.2054" width="0.8128" layer="16"/>
 <contactref element="U1" pad="4"/>
 <wire x1="6.55" y1="62.16" x2="9.42" y2="62.16" width="0.8128" layer="1"/>
 <wire x1="9.42" y1="62.16" x2="9.66" y2="61.92" width="0.8128" layer="1"/>
@@ -1344,17 +1306,17 @@ design rules under a new name.</description>
 <contactref element="J2" pad="4"/>
 <contactref element="D5" pad="2"/>
 <wire x1="21.86" y1="16.7" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="20.5" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="21.6" x2="17.5" y2="20.5" width="0.8128" layer="16"/>
+<wire x1="19" y1="19" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
+<wire x1="19" y1="20.1" x2="19" y2="19" width="0.8128" layer="16"/>
 <contactref element="R3" pad="1"/>
 <contactref element="U1" pad="20"/>
 <wire x1="20.83" y1="44.38" x2="20.05" y2="43.6" width="0.8128" layer="1"/>
 <wire x1="22.45" y1="44.38" x2="20.83" y2="44.38" width="0.8128" layer="1"/>
-<wire x1="18.422" y1="24" x2="17.5" y2="23.078" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="23.078" x2="17.5" y2="21.6" width="0.8128" layer="16"/>
-<wire x1="18.422" y1="24" x2="20" y2="24" width="0.8128" layer="16"/>
-<wire x1="20" y1="24" x2="21.86" y2="25.86" width="0.8128" layer="16"/>
-<wire x1="21.86" y1="25.86" x2="21.86" y2="26.86" width="0.8128" layer="16"/>
+<wire x1="18.922" y1="24" x2="19" y2="23.922" width="0.8128" layer="16"/>
+<wire x1="19" y1="23.922" x2="19" y2="20.1" width="0.8128" layer="16"/>
+<wire x1="18.922" y1="24" x2="19.5" y2="24" width="0.8128" layer="16"/>
+<wire x1="19.5" y1="24" x2="21.86" y2="26.36" width="0.8128" layer="16"/>
+<wire x1="21.86" y1="26.36" x2="21.86" y2="26.86" width="0.8128" layer="16"/>
 </signal>
 <signal name="BTN">
 <contactref element="D3" pad="2"/>
@@ -1389,11 +1351,11 @@ design rules under a new name.</description>
 <wire x1="23.5776" y1="23.05" x2="22.3076" y2="21.78" width="0.8128" layer="16"/>
 <wire x1="22.3076" y1="21.78" x2="21.86" y2="21.78" width="0.8128" layer="16"/>
 <wire x1="22.81" y1="38.19" x2="23.5776" y2="37.4224" width="0.8128" layer="16"/>
-<wire x1="22.81" y1="42.27" x2="22.81" y2="39.5" width="0.8128" layer="16"/>
-<wire x1="22.81" y1="39.5" x2="22.81" y2="38.19" width="0.8128" layer="16"/>
+<wire x1="22.81" y1="42.27" x2="22.81" y2="39" width="0.8128" layer="16"/>
+<wire x1="22.81" y1="39" x2="22.81" y2="38.19" width="0.8128" layer="16"/>
 <wire x1="23.5776" y1="37.4224" x2="23.5776" y2="23.05" width="0.8128" layer="16"/>
 <contactref element="R4" pad="2"/>
-<wire x1="22.422" y1="39.5" x2="22.81" y2="39.5" width="0.8128" layer="16"/>
+<wire x1="22.422" y1="39" x2="22.81" y2="39" width="0.8128" layer="16"/>
 </signal>
 <signal name="LEDCTL">
 <contactref element="Q1" pad="1"/>
@@ -1473,8 +1435,8 @@ design rules under a new name.</description>
 <contactref element="Q2" pad="3"/>
 <contactref element="D2" pad="2"/>
 <wire x1="3.49" y1="14.33" x2="3.66" y2="14.16" width="0.8128" layer="16"/>
-<wire x1="3.98" y1="14.16" x2="5.25" y2="15.43" width="0.8128" layer="16"/>
-<wire x1="3.66" y1="14.16" x2="3.98" y2="14.16" width="0.8128" layer="16"/>
+<wire x1="5.25" y1="14.16" x2="5.25" y2="15.43" width="0.8128" layer="16"/>
+<wire x1="3.66" y1="14.16" x2="5.25" y2="14.16" width="0.8128" layer="16"/>
 <wire x1="5.25" y1="15.43" x2="5.25" y2="13.99" width="0.8128" layer="16"/>
 <wire x1="6.502" y1="12.738" x2="6.502" y2="11.62" width="0.8128" layer="16"/>
 <wire x1="5.25" y1="13.99" x2="6.502" y2="12.738" width="0.8128" layer="16"/>
@@ -1484,43 +1446,48 @@ design rules under a new name.</description>
 <signal name="N$5">
 <contactref element="D3" pad="1"/>
 <contactref element="D2" pad="1"/>
-<contactref element="S1" pad="3"/>
-<wire x1="10.3248" y1="25.82" x2="10.3248" y2="21.3358" width="0.8128" layer="16"/>
-<wire x1="10.3248" y1="21.3358" x2="10.4394" y2="21.2212" width="0.8128" layer="16"/>
 <wire x1="13.97" y1="26.4252" x2="10.93" y2="26.4252" width="0.8128" layer="16"/>
 <wire x1="10.93" y1="26.4252" x2="10.3248" y2="25.82" width="0.8128" layer="16"/>
 <contactref element="D8" pad="2"/>
-<wire x1="10.4394" y1="21.2212" x2="12.5" y2="19.1606" width="0.8128" layer="16"/>
-<wire x1="12.5" y1="19.1606" x2="12.5" y2="12" width="0.8128" layer="16"/>
 <wire x1="12.5" y1="12" x2="13" y2="11.5" width="0.8128" layer="16"/>
 <wire x1="13" y1="11.5" x2="14.1" y2="11.5" width="0.8128" layer="16"/>
+<contactref element="S1" pad="3"/>
+<contactref element="S1" pad="4"/>
+<wire x1="10.3248" y1="25.82" x2="10.3248" y2="21.8366" width="0.8128" layer="16"/>
+<wire x1="10.3248" y1="21.8366" x2="10.2394" y2="21.7512" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="21.7512" x2="10.2394" y2="15.2488" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="15.2488" x2="10.4882" y2="15" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="15.2488" x2="12.5" y2="12.9882" width="0.8128" layer="16"/>
+<wire x1="12.5" y1="12.9882" x2="12.5" y2="12" width="0.8128" layer="16"/>
 </signal>
 <signal name="SPOUT">
 <contactref element="J7" pad="6"/>
 <contactref element="C3" pad="1"/>
-<wire x1="12.8016" y1="23.90786875" x2="12.8016" y2="13.74786875" width="0.8128" layer="1"/>
+<wire x1="12.3016" y1="24.40786875" x2="12.3016" y2="14.1984" width="0.8128" layer="1"/>
 <wire x1="2.54" y1="31.67" x2="6.08" y2="28.13" width="0.8128" layer="16"/>
 <wire x1="7.62" y1="28.13" x2="8.57946875" y2="28.13" width="0.8128" layer="1"/>
-<wire x1="8.57946875" y1="28.13" x2="12.8016" y2="23.90786875" width="0.8128" layer="1"/>
+<wire x1="8.57946875" y1="28.13" x2="12.3016" y2="24.40786875" width="0.8128" layer="1"/>
 <wire x1="2.54" y1="42.64" x2="2.54" y2="31.67" width="0.8128" layer="16"/>
 <via x="7.62" y="28.13" extent="1-16" drill="0.35"/>
 <wire x1="6.08" y1="28.13" x2="7.62" y2="28.13" width="0.8128" layer="16"/>
 <contactref element="J2" pad="1"/>
-<wire x1="12.8016" y1="13.74786875" x2="17.46946875" y2="9.08" width="0.8128" layer="1"/>
-<wire x1="17.46946875" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="1"/>
-<wire x1="21.0146" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="16"/>
-<wire x1="17.62" y1="12.4746" x2="21.0146" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="12.3016" y1="14.1984" x2="14" y2="12.5" width="0.8128" layer="1"/>
+<wire x1="18.46946875" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="1"/>
+<wire x1="20.5146" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="19.12" y1="10.4746" x2="20.5146" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="15.04946875" y1="12.5" x2="18.46946875" y2="9.08" width="0.8128" layer="1"/>
+<wire x1="14" y1="12.5" x2="15.04946875" y2="12.5" width="0.8128" layer="1"/>
 </signal>
 <signal name="SPK">
-<contactref element="LS1" pad="+"/>
 <wire x1="2.54" y1="37.02" x2="2.54" y2="16.7" width="0.8128" layer="1"/>
-<wire x1="9.45" y1="9.79" x2="9.45" y2="7.81" width="0.8128" layer="1"/>
-<wire x1="2.54" y1="16.7" x2="9.45" y2="9.79" width="0.8128" layer="1"/>
+<wire x1="2.54" y1="16.7" x2="9.19" y2="10.05" width="0.8128" layer="1"/>
 <wire x1="2.54" y1="37.02" x2="4.191" y2="38.671" width="0.8128" layer="1"/>
 <wire x1="4.191" y1="46.291" x2="4.191" y2="38.671" width="0.8128" layer="1"/>
 <contactref element="U1" pad="10"/>
 <wire x1="6.55" y1="46.92" x2="4.82" y2="46.92" width="0.8128" layer="1"/>
 <wire x1="4.82" y1="46.92" x2="4.191" y2="46.291" width="0.8128" layer="1"/>
+<contactref element="SG1" pad="2"/>
+<wire x1="9.19" y1="10.05" x2="9.19" y2="8" width="0.8128" layer="1"/>
 </signal>
 <signal name="3V3">
 <contactref element="U1" pad="2"/>

+ 190 - 223
schematic/ECU.b#8

@@ -8,17 +8,17 @@
 </settings>
 <grid distance="0.5" unitdist="mm" unit="mm" style="lines" multiple="1" display="no" altdistance="5" altunitdist="mil" altunit="mm"/>
 <layers>
-<layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
+<layer number="1" name="Top" color="4" fill="1" visible="no" active="yes"/>
 <layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
 <layer number="20" name="Dimension" color="24" fill="1" visible="yes" active="yes"/>
-<layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="21" name="tPlace" color="7" fill="1" visible="no" active="yes"/>
 <layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="yes"/>
 <layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="25" name="tNames" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="26" name="bNames" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
@@ -32,9 +32,9 @@
 <layer number="36" name="bGlue" color="7" fill="5" visible="no" active="yes"/>
 <layer number="37" name="tTest" color="7" fill="1" visible="no" active="yes"/>
 <layer number="38" name="bTest" color="7" fill="1" visible="no" active="yes"/>
-<layer number="39" name="tKeepout" color="4" fill="11" visible="yes" active="yes"/>
+<layer number="39" name="tKeepout" color="4" fill="11" visible="no" active="yes"/>
 <layer number="40" name="bKeepout" color="1" fill="11" visible="yes" active="yes"/>
-<layer number="41" name="tRestrict" color="4" fill="10" visible="yes" active="yes"/>
+<layer number="41" name="tRestrict" color="4" fill="10" visible="no" active="yes"/>
 <layer number="42" name="bRestrict" color="1" fill="10" visible="yes" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
@@ -44,7 +44,7 @@
 <layer number="48" name="Document" color="7" fill="1" visible="no" active="yes"/>
 <layer number="49" name="Reference" color="7" fill="1" visible="no" active="yes"/>
 <layer number="50" name="dxf" color="7" fill="1" visible="no" active="no"/>
-<layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="51" name="tDocu" color="7" fill="1" visible="no" active="yes"/>
 <layer number="52" name="bDocu" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="53" name="tGND_GNDA" color="7" fill="9" visible="no" active="no"/>
 <layer number="54" name="bGND_GNDA" color="1" fill="9" visible="no" active="no"/>
@@ -539,133 +539,6 @@ CONN_03
 </package3d>
 </packages3d>
 </library>
-<library name="SparkFun-Switches" urn="urn:adsk.eagle:library:535">
-<description>&lt;h3&gt;SparkFun Switches, Buttons, Encoders&lt;/h3&gt;
-In this library you'll find switches, buttons, joysticks, and anything that moves to create or disrupt an electrical connection.
-&lt;br&gt;
-&lt;br&gt;
-We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
-&lt;br&gt;
-&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
-&lt;br&gt;
-&lt;br&gt;
-&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
-&lt;br&gt;
-&lt;br&gt;
-You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
-<packages>
-<package name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:footprint:40103/1" library_version="1">
-<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square&lt;/h3&gt;
-&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
-&lt;p&gt;&lt;a href="https://www.omron.com/ecb/products/pdf/en-b3f.pdf"&gt;Datasheet&lt;/a&gt; (B3F-1000)&lt;/p&gt;</description>
-<wire x1="3.048" y1="1.016" x2="3.048" y2="2.54" width="0.2032" layer="51"/>
-<wire x1="3.048" y1="2.54" x2="2.54" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="-3.048" x2="3.048" y2="-2.54" width="0.2032" layer="51"/>
-<wire x1="3.048" y1="-2.54" x2="3.048" y2="-1.016" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="3.048" x2="-3.048" y2="2.54" width="0.2032" layer="51"/>
-<wire x1="-3.048" y1="2.54" x2="-3.048" y2="1.016" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-3.048" x2="-3.048" y2="-2.54" width="0.2032" layer="51"/>
-<wire x1="-3.048" y1="-2.54" x2="-3.048" y2="-1.016" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-3.048" x2="-2.159" y2="-3.048" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="3.048" x2="2.159" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.159" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="21"/>
-<wire x1="-2.159" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="21"/>
-<wire x1="3.048" y1="0.998" x2="3.048" y2="-1.016" width="0.2032" layer="21"/>
-<wire x1="-3.048" y1="1.028" x2="-3.048" y2="-1.016" width="0.2032" layer="21"/>
-<wire x1="-2.54" y1="1.27" x2="-2.54" y2="0.508" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-0.508" x2="-2.54" y2="-1.27" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="0.508" x2="-2.159" y2="-0.381" width="0.2032" layer="51"/>
-<circle x="0" y="0" radius="1.778" width="0.2032" layer="21"/>
-<pad name="1" x="-3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="2" x="3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="3" x="-3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="4" x="3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
-<text x="0" y="3.302" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
-<text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
-</package>
-</packages>
-<packages3d>
-<package3d name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:package:40163/1" type="box" library_version="1">
-<description>Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square
-Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
-Datasheet (B3F-1000)</description>
-<packageinstances>
-<packageinstance name="TACTILE_SWITCH_PTH_6.0MM"/>
-</packageinstances>
-</package3d>
-</packages3d>
-</library>
-<library name="SparkFun-Electromechanical" urn="urn:adsk.eagle:library:516">
-<description>&lt;h3&gt;SparkFun Electromechanical Parts&lt;/h3&gt;
-This library contains electromechanical devices, like motors, speakers,servos, and relays.
-&lt;br&gt;
-&lt;br&gt;
-We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
-&lt;br&gt;
-&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
-&lt;br&gt;
-&lt;br&gt;
-&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
-&lt;br&gt;
-&lt;br&gt;
-You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
-<packages>
-<package name="BUZZER-12MM-KIT" urn="urn:adsk.eagle:footprint:38540/1" library_version="1">
-<description>&lt;h3&gt;12mm Buzzer - PTH (KIT VARIANT)&lt;/h3&gt;
-&lt;p&gt;This is a small 12mm round speaker that operates around the audible 2kHz range. You can use these speakers to create simple music or user interfaces.&lt;/p&gt;
-&lt;p&gt;&lt;b&gt;Warning:&lt;/b&gt; This is the KIT version of this package. This package has a smaller diameter top stop mask, which doesn't cover the diameter of the pad. This means only the bottom side of the pads' copper will be exposed. You'll only be able to solder to the bottom side.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://cdn.sparkfun.com/datasheets/Components/General/cem-1203-42-.pdf"&gt;Datasheet&lt;/a&gt;&lt;/p&gt;
-&lt;h4&gt;Devices Using&lt;/h4&gt;
-&lt;ul&gt;&lt;li&gt;BUZZER&lt;/li&gt;&lt;/ul&gt;</description>
-<circle x="0" y="0" radius="5.9" width="0.2032" layer="21"/>
-<circle x="0" y="0" radius="1.27" width="0.2032" layer="51"/>
-<pad name="-" x="-3.25" y="0" drill="0.9" diameter="1.8796" stop="no"/>
-<pad name="+" x="3.25" y="0" drill="0.9" diameter="1.8796" stop="no"/>
-<text x="2.667" y="1.143" size="1.778" layer="51">+</text>
-<text x="0" y="6.096" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;NAME</text>
-<text x="0" y="5.588" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;VALUE</text>
-<polygon width="0.127" layer="30">
-<vertex x="3.2537" y="-0.9525" curve="-90"/>
-<vertex x="2.2988" y="-0.0228" curve="-90.011749"/>
-<vertex x="3.2512" y="0.9526" curve="-90"/>
-<vertex x="4.2012" y="-0.0254" curve="-90.024193"/>
-</polygon>
-<polygon width="0.127" layer="29">
-<vertex x="3.2512" y="-0.4445" curve="-90.012891"/>
-<vertex x="2.8067" y="-0.0203" curve="-90"/>
-<vertex x="3.2512" y="0.447" curve="-90"/>
-<vertex x="3.6931" y="-0.0101" curve="-90.012967"/>
-</polygon>
-<polygon width="0.127" layer="30">
-<vertex x="-3.2487" y="-0.9525" curve="-90"/>
-<vertex x="-4.2036" y="-0.0228" curve="-90.011749"/>
-<vertex x="-3.2512" y="0.9526" curve="-90"/>
-<vertex x="-2.3012" y="-0.0254" curve="-90.024193"/>
-</polygon>
-<polygon width="0.127" layer="29">
-<vertex x="-3.2512" y="-0.4445" curve="-90.012891"/>
-<vertex x="-3.6957" y="-0.0203" curve="-90"/>
-<vertex x="-3.2512" y="0.447" curve="-90"/>
-<vertex x="-2.8093" y="-0.0101" curve="-90.012967"/>
-</polygon>
-</package>
-</packages>
-<packages3d>
-<package3d name="BUZZER-12MM-KIT" urn="urn:adsk.eagle:package:38556/1" type="box" library_version="1">
-<description>12mm Buzzer - PTH (KIT VARIANT)
-This is a small 12mm round speaker that operates around the audible 2kHz range. You can use these speakers to create simple music or user interfaces.
-Warning: This is the KIT version of this package. This package has a smaller diameter top stop mask, which doesn't cover the diameter of the pad. This means only the bottom side of the pads' copper will be exposed. You'll only be able to solder to the bottom side.
-Datasheet
-Devices Using
-BUZZER</description>
-<packageinstances>
-<packageinstance name="BUZZER-12MM-KIT"/>
-</packageinstances>
-</package3d>
-</packages3d>
-</library>
 <library name="eScooter">
 <packages>
 <package name="DIOM5027X220N" urn="urn:adsk.eagle:footprint:21928331/1">
@@ -748,6 +621,91 @@ BUZZER</description>
 </package3d>
 </packages3d>
 </library>
+<library name="SparkFun-Switches">
+<description>&lt;h3&gt;SparkFun Switches, Buttons, Encoders&lt;/h3&gt;
+In this library you'll find switches, buttons, joysticks, and anything that moves to create or disrupt an electrical connection.
+&lt;br&gt;
+&lt;br&gt;
+We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
+&lt;br&gt;
+&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
+&lt;br&gt;
+&lt;br&gt;
+&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
+&lt;br&gt;
+&lt;br&gt;
+You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
+<packages>
+<package name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:footprint:40103/1">
+<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square&lt;/h3&gt;
+&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
+&lt;p&gt;&lt;a href="https://www.omron.com/ecb/products/pdf/en-b3f.pdf"&gt;Datasheet&lt;/a&gt; (B3F-1000)&lt;/p&gt;</description>
+<wire x1="3.048" y1="1.016" x2="3.048" y2="2.54" width="0.2032" layer="51"/>
+<wire x1="3.048" y1="2.54" x2="2.54" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="-3.048" x2="3.048" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="3.048" y1="-2.54" x2="3.048" y2="-1.016" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="3.048" x2="-3.048" y2="2.54" width="0.2032" layer="51"/>
+<wire x1="-3.048" y1="2.54" x2="-3.048" y2="1.016" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-3.048" x2="-3.048" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="-3.048" y1="-2.54" x2="-3.048" y2="-1.016" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-3.048" x2="-2.159" y2="-3.048" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="3.048" x2="2.159" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.159" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="21"/>
+<wire x1="-2.159" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="21"/>
+<wire x1="3.048" y1="0.998" x2="3.048" y2="-1.016" width="0.2032" layer="21"/>
+<wire x1="-3.048" y1="1.028" x2="-3.048" y2="-1.016" width="0.2032" layer="21"/>
+<wire x1="-2.54" y1="1.27" x2="-2.54" y2="0.508" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-0.508" x2="-2.54" y2="-1.27" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="0.508" x2="-2.159" y2="-0.381" width="0.2032" layer="51"/>
+<circle x="0" y="0" radius="1.778" width="0.2032" layer="21"/>
+<pad name="1" x="-3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="2" x="3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="3" x="-3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="4" x="3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
+<text x="0" y="3.302" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
+<text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
+</package>
+</packages>
+<packages3d>
+<package3d name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:package:40163/1" type="box">
+<description>Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square
+Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
+Datasheet (B3F-1000)</description>
+<packageinstances>
+<packageinstance name="TACTILE_SWITCH_PTH_6.0MM"/>
+</packageinstances>
+</package3d>
+</packages3d>
+</library>
+<library name="buzzer">
+<description>&lt;b&gt;Speakers and Buzzers&lt;/b&gt;&lt;p&gt;
+&lt;ul&gt;Distributors:
+&lt;li&gt;Buerklin
+&lt;li&gt;Spoerle
+&lt;li&gt;Schukat
+&lt;/ul&gt;
+&lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
+<packages>
+<package name="F/HGP" urn="urn:adsk.eagle:footprint:5238/1" locally_modified="yes">
+<description>&lt;b&gt;BUZZER&lt;/b&gt;</description>
+<pad name="1" x="-3.81" y="0" drill="1.016" diameter="2.159" shape="octagon"/>
+<pad name="2" x="3.81" y="0" drill="1.016" diameter="2.159" shape="octagon"/>
+<text x="4.445" y="6.985" size="1.27" layer="25" ratio="10">&gt;NAME</text>
+<text x="-3.683" y="-3.81" size="1.27" layer="27" ratio="10">&gt;VALUE</text>
+<circle x="0" y="0" radius="6.0827625" width="0.127" layer="21"/>
+</package>
+</packages>
+<packages3d>
+<package3d name="F/HGP" urn="urn:adsk.eagle:package:5287/1" type="box">
+<description>BUZZER</description>
+<packageinstances>
+<packageinstance name="F/HGP"/>
+</packageinstances>
+</package3d>
+</packages3d>
+</library>
 </libraries>
 <attributes>
 </attributes>
@@ -941,35 +899,35 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="9.43" y="58.23" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Capacitor" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="11.2867" y="58.23" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="7.5733" y="58.23" size="1.27" layer="28" rot="MR90" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<element name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="9.43" y="57.73" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Capacitor" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="11.2867" y="57.73" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="7.5733" y="57.73" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="-47.72" y="104.72" size="1.778" layer="28" rot="MR90" display="off"/>
 </element>
-<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="17.62" y="13.95" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Capacitor" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="19.4767" y="13.95" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="15.7633" y="13.95" size="1.27" layer="28" rot="MR90" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="19.12" y="11.95" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Capacitor" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="20.9767" y="11.95" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="17.2633" y="11.95" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
 </element>
 <element name="D2" library="Diode" library_urn="urn:adsk.eagle:library:16378169" package="SOD6126X290" package3d_urn="urn:adsk.eagle:package:9427057/2" value="" x="7.62" y="25.82" smashed="yes" rot="MR0">
 <attribute name="CATEGORY" value="Diode" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
@@ -994,7 +952,7 @@ design rules under a new name.</description>
 <attribute name="FORWARD_CURRENT" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
 <attribute name="MANUFACTURER" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
 <attribute name="MPN" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="16.08" y="29.13" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="NAME" x="10.58" y="29.63" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
 <attribute name="OPERATING_TEMP" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
 <attribute name="PART_STATUS" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
 <attribute name="REVERSE_VOLTAGE" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
@@ -1057,7 +1015,7 @@ design rules under a new name.</description>
 <attribute name="DRAIN_CURRENT" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="MANUFACTURER" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="MPN" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
-<attribute name="NAME" x="4.445" y="17.335" size="1.27" layer="26" rot="MR270"/>
+<attribute name="NAME" x="5.445" y="18.835" size="1.27" layer="26" rot="MR180"/>
 <attribute name="OPERATING_TEMP" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="PART_STATUS" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="ROHS_COMPLIANT" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
@@ -1073,7 +1031,7 @@ design rules under a new name.</description>
 <attribute name="DRAIN_CURRENT" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="MANUFACTURER" value="ON Semiconductor" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="MPN" value="BSS84" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="NAME" x="4.445" y="17.335" size="1.27" layer="26" rot="MR0"/>
+<attribute name="NAME" x="3.445" y="17.335" size="1.27" layer="26" rot="MR0"/>
 <attribute name="OPERATING_TEMP" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="PART_STATUS" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="ROHS_COMPLIANT" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
@@ -1100,7 +1058,7 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="23.765" y="40.195" size="1.27" layer="28" rot="MR0"/>
 </element>
 <element name="R1" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="8.35" y="34.78" smashed="yes" rot="MR180">
-<attribute name="NAME" x="7.08" y="33.51" size="1.27" layer="26" rot="MR180"/>
+<attribute name="NAME" x="7.08" y="37.01" size="1.27" layer="26" rot="MR180"/>
 <attribute name="SPICEMODEL" value="NONE" x="56.61" y="86.85" size="1.778" layer="28" rot="MR180" display="off"/>
 <attribute name="SPICEPREFIX" value="R" x="56.61" y="86.85" size="1.778" layer="28" rot="MR180" display="off"/>
 <attribute name="VALUE" x="7.08" y="37.32" size="1.27" layer="28" rot="MR180"/>
@@ -1111,34 +1069,22 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="-48.26" y="-40.45" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="VALUE" x="6.35" y="9.08" size="1.27" layer="28" rot="MR0"/>
 </element>
-<element name="S1" library="SparkFun-Switches" library_urn="urn:adsk.eagle:library:535" package="TACTILE_SWITCH_PTH_6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value="" x="12.7" y="17.97" smashed="yes" rot="R270">
-<attribute name="NAME" x="16.002" y="17.97" size="0.6096" layer="25" font="vector" ratio="20" rot="R270" align="bottom-center"/>
-<attribute name="PROD_ID" value=" SWCH-08441" x="8.89" y="-23.94" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="SF_SKU" value="COM-00097" x="8.89" y="-23.94" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="VALUE" x="9.525" y="17.97" size="0.6096" layer="27" font="vector" ratio="20" rot="R270" align="top-center"/>
-</element>
-<element name="LS1" library="SparkFun-Electromechanical" library_urn="urn:adsk.eagle:library:516" package="BUZZER-12MM-KIT" package3d_urn="urn:adsk.eagle:package:38556/1" value="BUZZER-PTH_KIT" x="12.7" y="7.81" smashed="yes" rot="R180">
-<attribute name="NAME" x="12.7" y="1.714" size="0.6096" layer="25" font="vector" ratio="20" rot="R180" align="bottom-center"/>
-<attribute name="PROD_ID" value="COMP-08253" x="12.7" y="7.81" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="SF_SKU" value="COM-07950" x="12.7" y="7.81" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="VALUE" x="12.7" y="2.222" size="0.6096" layer="27" font="vector" ratio="20" rot="R180" align="top-center"/>
-</element>
-<element name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="17" y="24" smashed="yes" rot="MR0">
-<attribute name="NAME" x="18.27" y="25.27" size="1.27" layer="26" rot="MR0"/>
-<attribute name="SPICEMODEL" value="NONE" x="17" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="SPICEPREFIX" value="R" x="17" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="VALUE" x="18.27" y="21.46" size="1.27" layer="28" rot="MR0"/>
+<element name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="17.5" y="24" smashed="yes" rot="MR0">
+<attribute name="NAME" x="18.77" y="25.27" size="1.27" layer="26" rot="MR0"/>
+<attribute name="SPICEMODEL" value="NONE" x="17.5" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="SPICEPREFIX" value="R" x="17.5" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="VALUE" x="18.77" y="21.46" size="1.27" layer="28" rot="MR0"/>
 </element>
 <element name="D4" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="6.5" y="57" smashed="yes" rot="MR90">
 <attribute name="NAME" x="8.485" y="57" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
 <attribute name="VALUE" x="4.515" y="57" size="1.27" layer="28" rot="MR90" align="top-center"/>
 </element>
-<element name="D5" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="17.5" y="19.5" smashed="yes" rot="MR90">
-<attribute name="NAME" x="19.485" y="19.5" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="VALUE" x="15.515" y="19.5" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D5" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="19" y="18" smashed="yes" rot="MR90">
+<attribute name="NAME" x="20.985" y="18" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="VALUE" x="17.015" y="18" size="1.27" layer="28" rot="MR90" align="top-center"/>
 </element>
 <element name="D6" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="19" y="31" smashed="yes" rot="MR180">
-<attribute name="NAME" x="19" y="29.015" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
+<attribute name="NAME" x="19" y="34.015" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
 <attribute name="VALUE" x="19" y="32.985" size="1.27" layer="28" rot="MR180" align="top-center"/>
 </element>
 <element name="D7" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="20.5" y="60" smashed="yes" rot="MR180">
@@ -1149,11 +1095,11 @@ design rules under a new name.</description>
 <attribute name="NAME" x="12" y="9.515" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
 <attribute name="VALUE" x="12" y="13.485" size="1.27" layer="28" rot="MR180" align="top-center"/>
 </element>
-<element name="R4" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="21" y="39.5" smashed="yes" rot="MR180">
-<attribute name="NAME" x="19.73" y="38.23" size="1.27" layer="26" rot="MR180"/>
-<attribute name="SPICEMODEL" value="NONE" x="21" y="39.5" size="1.778" layer="28" rot="MR180" display="off"/>
-<attribute name="SPICEPREFIX" value="R" x="21" y="39.5" size="1.778" layer="28" rot="MR180" display="off"/>
-<attribute name="VALUE" x="19.73" y="42.04" size="1.27" layer="28" rot="MR180"/>
+<element name="R4" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="21" y="39" smashed="yes" rot="MR180">
+<attribute name="NAME" x="19.73" y="37.73" size="1.27" layer="26" rot="MR180"/>
+<attribute name="SPICEMODEL" value="NONE" x="21" y="39" size="1.778" layer="28" rot="MR180" display="off"/>
+<attribute name="SPICEPREFIX" value="R" x="21" y="39" size="1.778" layer="28" rot="MR180" display="off"/>
+<attribute name="VALUE" x="19.73" y="41.54" size="1.27" layer="28" rot="MR180"/>
 </element>
 <element name="R5" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="21" y="63" smashed="yes" rot="MR0">
 <attribute name="NAME" x="22.27" y="64.27" size="1.27" layer="26" rot="MR0"/>
@@ -1161,7 +1107,7 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="21" y="63" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="VALUE" x="22.27" y="60.46" size="1.27" layer="28" rot="MR0"/>
 </element>
-<element name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="1uF" x="12.5" y="29" smashed="yes" rot="R180">
+<element name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="12.5" y="29" smashed="yes" rot="R180">
 <attribute name="CATEGORY" value="Capacitor" x="12.5" y="29" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MANUFACTURER" value="" x="12.5" y="29" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MPN" value="" x="12.5" y="29" size="1.778" layer="27" rot="R180" display="off"/>
@@ -1180,13 +1126,27 @@ design rules under a new name.</description>
 <attribute name="NAME" x="14.5" y="74.135" size="1.27" layer="25" align="bottom-center"/>
 <attribute name="VALUE" x="14.5" y="29.865" size="1.27" layer="27" align="top-center"/>
 </element>
+<element name="S1" library="SparkFun-Switches" package="TACTILE_SWITCH_PTH_6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value="MOMENTARY-SWITCH-SPST-PTH-6.0MM" x="12.5" y="18.5" smashed="yes" rot="MR90">
+<attribute name="NAME" x="15.802" y="18.5" size="0.6096" layer="26" font="vector" ratio="20" rot="MR90" align="bottom-center"/>
+<attribute name="PROD_ID" value=" SWCH-08441" x="12.5" y="18.5" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SF_SKU" value="COM-00097" x="12.5" y="18.5" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="9.325" y="18.5" size="0.6096" layer="28" font="vector" ratio="20" rot="MR90" align="top-center"/>
+</element>
+<element name="SG1" library="buzzer" package="F/HGP" package3d_urn="urn:adsk.eagle:package:5287/1" value="F/HGP" x="13" y="8" smashed="yes" rot="R180">
+<attribute name="MF" value="" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="MPN" value="" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="NAME" x="8.555" y="1.015" size="1.27" layer="25" ratio="10" rot="R180"/>
+<attribute name="OC_FARNELL" value="unknown" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="OC_NEWARK" value="unknown" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="POPULARITY" value="0" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="VALUE" x="16.683" y="11.81" size="1.27" layer="27" ratio="10" rot="R180"/>
+</element>
 </elements>
 <signals>
 <signal name="GND">
 <contactref element="Q5" pad="2"/>
 <contactref element="R1" pad="1"/>
 <contactref element="Q2" pad="2"/>
-<contactref element="S1" pad="1"/>
 <contactref element="J3" pad="2"/>
 <contactref element="Q1" pad="2"/>
 <contactref element="J5" pad="3"/>
@@ -1212,7 +1172,6 @@ design rules under a new name.</description>
 <via x="7.39" y="31.94" extent="1-16" drill="0.35"/>
 <via x="13.97" y="17.97" extent="1-16" drill="0.35"/>
 <via x="12.7" y="7.81" extent="1-16" drill="0.35"/>
-<contactref element="LS1" pad="-"/>
 <wire x1="7.45" y1="14.48" x2="7.45" y2="13.3792875" width="0.8128" layer="16"/>
 <wire x1="7.45" y1="13.3792875" x2="8.0132" y2="12.8160875" width="0.8128" layer="16"/>
 <wire x1="8.0132" y1="12.8160875" x2="8.0132" y2="9.4732" width="0.8128" layer="16"/>
@@ -1227,6 +1186,9 @@ design rules under a new name.</description>
 <contactref element="R5" pad="1"/>
 <contactref element="C2" pad="2"/>
 <contactref element="U1" pad="14"/>
+<contactref element="S1" pad="2"/>
+<contactref element="S1" pad="1"/>
+<contactref element="SG1" pad="1"/>
 </signal>
 <signal name="VIN">
 <contactref element="Q4" pad="3"/>
@@ -1306,8 +1268,8 @@ design rules under a new name.</description>
 <wire x1="8" y1="60.69" x2="8.43" y2="60.69" width="0.8128" layer="16"/>
 <wire x1="8.43" y1="60.69" x2="9.66" y2="61.92" width="0.8128" layer="16"/>
 <wire x1="6.5" y1="59.1" x2="6.5" y2="60.69" width="0.8128" layer="16"/>
-<wire x1="8" y1="60.69" x2="8.9846" y2="59.7054" width="0.8128" layer="16"/>
-<wire x1="8.9846" y1="59.7054" x2="9.43" y2="59.7054" width="0.8128" layer="16"/>
+<wire x1="8" y1="60.69" x2="9.43" y2="59.26" width="0.8128" layer="16"/>
+<wire x1="9.43" y1="59.26" x2="9.43" y2="59.2054" width="0.8128" layer="16"/>
 <contactref element="U1" pad="4"/>
 <wire x1="6.55" y1="62.16" x2="9.42" y2="62.16" width="0.8128" layer="1"/>
 <wire x1="9.42" y1="62.16" x2="9.66" y2="61.92" width="0.8128" layer="1"/>
@@ -1344,17 +1306,17 @@ design rules under a new name.</description>
 <contactref element="J2" pad="4"/>
 <contactref element="D5" pad="2"/>
 <wire x1="21.86" y1="16.7" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="20.5" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="21.6" x2="17.5" y2="20.5" width="0.8128" layer="16"/>
+<wire x1="19" y1="19" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
+<wire x1="19" y1="20.1" x2="19" y2="19" width="0.8128" layer="16"/>
 <contactref element="R3" pad="1"/>
 <contactref element="U1" pad="20"/>
 <wire x1="20.83" y1="44.38" x2="20.05" y2="43.6" width="0.8128" layer="1"/>
 <wire x1="22.45" y1="44.38" x2="20.83" y2="44.38" width="0.8128" layer="1"/>
-<wire x1="18.422" y1="24" x2="17.5" y2="23.078" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="23.078" x2="17.5" y2="21.6" width="0.8128" layer="16"/>
-<wire x1="18.422" y1="24" x2="20" y2="24" width="0.8128" layer="16"/>
-<wire x1="20" y1="24" x2="21.86" y2="25.86" width="0.8128" layer="16"/>
-<wire x1="21.86" y1="25.86" x2="21.86" y2="26.86" width="0.8128" layer="16"/>
+<wire x1="18.922" y1="24" x2="19" y2="23.922" width="0.8128" layer="16"/>
+<wire x1="19" y1="23.922" x2="19" y2="20.1" width="0.8128" layer="16"/>
+<wire x1="18.922" y1="24" x2="19.5" y2="24" width="0.8128" layer="16"/>
+<wire x1="19.5" y1="24" x2="21.86" y2="26.36" width="0.8128" layer="16"/>
+<wire x1="21.86" y1="26.36" x2="21.86" y2="26.86" width="0.8128" layer="16"/>
 </signal>
 <signal name="BTN">
 <contactref element="D3" pad="2"/>
@@ -1389,11 +1351,11 @@ design rules under a new name.</description>
 <wire x1="23.5776" y1="23.05" x2="22.3076" y2="21.78" width="0.8128" layer="16"/>
 <wire x1="22.3076" y1="21.78" x2="21.86" y2="21.78" width="0.8128" layer="16"/>
 <wire x1="22.81" y1="38.19" x2="23.5776" y2="37.4224" width="0.8128" layer="16"/>
-<wire x1="22.81" y1="42.27" x2="22.81" y2="39.5" width="0.8128" layer="16"/>
-<wire x1="22.81" y1="39.5" x2="22.81" y2="38.19" width="0.8128" layer="16"/>
+<wire x1="22.81" y1="42.27" x2="22.81" y2="39" width="0.8128" layer="16"/>
+<wire x1="22.81" y1="39" x2="22.81" y2="38.19" width="0.8128" layer="16"/>
 <wire x1="23.5776" y1="37.4224" x2="23.5776" y2="23.05" width="0.8128" layer="16"/>
 <contactref element="R4" pad="2"/>
-<wire x1="22.422" y1="39.5" x2="22.81" y2="39.5" width="0.8128" layer="16"/>
+<wire x1="22.422" y1="39" x2="22.81" y2="39" width="0.8128" layer="16"/>
 </signal>
 <signal name="LEDCTL">
 <contactref element="Q1" pad="1"/>
@@ -1473,8 +1435,8 @@ design rules under a new name.</description>
 <contactref element="Q2" pad="3"/>
 <contactref element="D2" pad="2"/>
 <wire x1="3.49" y1="14.33" x2="3.66" y2="14.16" width="0.8128" layer="16"/>
-<wire x1="3.98" y1="14.16" x2="5.25" y2="15.43" width="0.8128" layer="16"/>
-<wire x1="3.66" y1="14.16" x2="3.98" y2="14.16" width="0.8128" layer="16"/>
+<wire x1="5.25" y1="14.16" x2="5.25" y2="15.43" width="0.8128" layer="16"/>
+<wire x1="3.66" y1="14.16" x2="5.25" y2="14.16" width="0.8128" layer="16"/>
 <wire x1="5.25" y1="15.43" x2="5.25" y2="13.99" width="0.8128" layer="16"/>
 <wire x1="6.502" y1="12.738" x2="6.502" y2="11.62" width="0.8128" layer="16"/>
 <wire x1="5.25" y1="13.99" x2="6.502" y2="12.738" width="0.8128" layer="16"/>
@@ -1484,43 +1446,48 @@ design rules under a new name.</description>
 <signal name="N$5">
 <contactref element="D3" pad="1"/>
 <contactref element="D2" pad="1"/>
-<contactref element="S1" pad="3"/>
-<wire x1="10.3248" y1="25.82" x2="10.3248" y2="21.3358" width="0.8128" layer="16"/>
-<wire x1="10.3248" y1="21.3358" x2="10.4394" y2="21.2212" width="0.8128" layer="16"/>
 <wire x1="13.97" y1="26.4252" x2="10.93" y2="26.4252" width="0.8128" layer="16"/>
 <wire x1="10.93" y1="26.4252" x2="10.3248" y2="25.82" width="0.8128" layer="16"/>
 <contactref element="D8" pad="2"/>
-<wire x1="10.4394" y1="21.2212" x2="12.5" y2="19.1606" width="0.8128" layer="16"/>
-<wire x1="12.5" y1="19.1606" x2="12.5" y2="12" width="0.8128" layer="16"/>
 <wire x1="12.5" y1="12" x2="13" y2="11.5" width="0.8128" layer="16"/>
 <wire x1="13" y1="11.5" x2="14.1" y2="11.5" width="0.8128" layer="16"/>
+<contactref element="S1" pad="3"/>
+<contactref element="S1" pad="4"/>
+<wire x1="10.3248" y1="25.82" x2="10.3248" y2="21.8366" width="0.8128" layer="16"/>
+<wire x1="10.3248" y1="21.8366" x2="10.2394" y2="21.7512" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="21.7512" x2="10.2394" y2="15.2488" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="15.2488" x2="10.4882" y2="15" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="15.2488" x2="12.5" y2="12.9882" width="0.8128" layer="16"/>
+<wire x1="12.5" y1="12.9882" x2="12.5" y2="12" width="0.8128" layer="16"/>
 </signal>
 <signal name="SPOUT">
 <contactref element="J7" pad="6"/>
 <contactref element="C3" pad="1"/>
-<wire x1="12.8016" y1="23.90786875" x2="12.8016" y2="13.74786875" width="0.8128" layer="1"/>
+<wire x1="12.3016" y1="24.40786875" x2="12.3016" y2="14.1984" width="0.8128" layer="1"/>
 <wire x1="2.54" y1="31.67" x2="6.08" y2="28.13" width="0.8128" layer="16"/>
 <wire x1="7.62" y1="28.13" x2="8.57946875" y2="28.13" width="0.8128" layer="1"/>
-<wire x1="8.57946875" y1="28.13" x2="12.8016" y2="23.90786875" width="0.8128" layer="1"/>
+<wire x1="8.57946875" y1="28.13" x2="12.3016" y2="24.40786875" width="0.8128" layer="1"/>
 <wire x1="2.54" y1="42.64" x2="2.54" y2="31.67" width="0.8128" layer="16"/>
 <via x="7.62" y="28.13" extent="1-16" drill="0.35"/>
 <wire x1="6.08" y1="28.13" x2="7.62" y2="28.13" width="0.8128" layer="16"/>
 <contactref element="J2" pad="1"/>
-<wire x1="12.8016" y1="13.74786875" x2="17.46946875" y2="9.08" width="0.8128" layer="1"/>
-<wire x1="17.46946875" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="1"/>
-<wire x1="21.0146" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="16"/>
-<wire x1="17.62" y1="12.4746" x2="21.0146" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="12.3016" y1="14.1984" x2="14" y2="12.5" width="0.8128" layer="1"/>
+<wire x1="18.46946875" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="1"/>
+<wire x1="20.5146" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="19.12" y1="10.4746" x2="20.5146" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="15.04946875" y1="12.5" x2="18.46946875" y2="9.08" width="0.8128" layer="1"/>
+<wire x1="14" y1="12.5" x2="15.04946875" y2="12.5" width="0.8128" layer="1"/>
 </signal>
 <signal name="SPK">
-<contactref element="LS1" pad="+"/>
 <wire x1="2.54" y1="37.02" x2="2.54" y2="16.7" width="0.8128" layer="1"/>
-<wire x1="9.45" y1="9.79" x2="9.45" y2="7.81" width="0.8128" layer="1"/>
-<wire x1="2.54" y1="16.7" x2="9.45" y2="9.79" width="0.8128" layer="1"/>
+<wire x1="2.54" y1="16.7" x2="9.19" y2="10.05" width="0.8128" layer="1"/>
 <wire x1="2.54" y1="37.02" x2="4.191" y2="38.671" width="0.8128" layer="1"/>
 <wire x1="4.191" y1="46.291" x2="4.191" y2="38.671" width="0.8128" layer="1"/>
 <contactref element="U1" pad="10"/>
 <wire x1="6.55" y1="46.92" x2="4.82" y2="46.92" width="0.8128" layer="1"/>
 <wire x1="4.82" y1="46.92" x2="4.191" y2="46.291" width="0.8128" layer="1"/>
+<contactref element="SG1" pad="2"/>
+<wire x1="9.19" y1="10.05" x2="9.19" y2="8" width="0.8128" layer="1"/>
 </signal>
 <signal name="3V3">
 <contactref element="U1" pad="2"/>

+ 174 - 207
schematic/ECU.b#9

@@ -8,17 +8,17 @@
 </settings>
 <grid distance="0.5" unitdist="mm" unit="mm" style="lines" multiple="1" display="no" altdistance="5" altunitdist="mil" altunit="mm"/>
 <layers>
-<layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
+<layer number="1" name="Top" color="4" fill="1" visible="no" active="yes"/>
 <layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
 <layer number="20" name="Dimension" color="24" fill="1" visible="yes" active="yes"/>
-<layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="21" name="tPlace" color="7" fill="1" visible="no" active="yes"/>
 <layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="yes"/>
 <layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="25" name="tNames" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="26" name="bNames" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
@@ -32,9 +32,9 @@
 <layer number="36" name="bGlue" color="7" fill="5" visible="no" active="yes"/>
 <layer number="37" name="tTest" color="7" fill="1" visible="no" active="yes"/>
 <layer number="38" name="bTest" color="7" fill="1" visible="no" active="yes"/>
-<layer number="39" name="tKeepout" color="4" fill="11" visible="yes" active="yes"/>
+<layer number="39" name="tKeepout" color="4" fill="11" visible="no" active="yes"/>
 <layer number="40" name="bKeepout" color="1" fill="11" visible="yes" active="yes"/>
-<layer number="41" name="tRestrict" color="4" fill="10" visible="yes" active="yes"/>
+<layer number="41" name="tRestrict" color="4" fill="10" visible="no" active="yes"/>
 <layer number="42" name="bRestrict" color="1" fill="10" visible="yes" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
@@ -44,7 +44,7 @@
 <layer number="48" name="Document" color="7" fill="1" visible="no" active="yes"/>
 <layer number="49" name="Reference" color="7" fill="1" visible="no" active="yes"/>
 <layer number="50" name="dxf" color="7" fill="1" visible="no" active="no"/>
-<layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="51" name="tDocu" color="7" fill="1" visible="no" active="yes"/>
 <layer number="52" name="bDocu" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="53" name="tGND_GNDA" color="7" fill="9" visible="no" active="no"/>
 <layer number="54" name="bGND_GNDA" color="1" fill="9" visible="no" active="no"/>
@@ -539,133 +539,6 @@ CONN_03
 </package3d>
 </packages3d>
 </library>
-<library name="SparkFun-Switches" urn="urn:adsk.eagle:library:535">
-<description>&lt;h3&gt;SparkFun Switches, Buttons, Encoders&lt;/h3&gt;
-In this library you'll find switches, buttons, joysticks, and anything that moves to create or disrupt an electrical connection.
-&lt;br&gt;
-&lt;br&gt;
-We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
-&lt;br&gt;
-&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
-&lt;br&gt;
-&lt;br&gt;
-&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
-&lt;br&gt;
-&lt;br&gt;
-You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
-<packages>
-<package name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:footprint:40103/1" library_version="1">
-<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square&lt;/h3&gt;
-&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
-&lt;p&gt;&lt;a href="https://www.omron.com/ecb/products/pdf/en-b3f.pdf"&gt;Datasheet&lt;/a&gt; (B3F-1000)&lt;/p&gt;</description>
-<wire x1="3.048" y1="1.016" x2="3.048" y2="2.54" width="0.2032" layer="51"/>
-<wire x1="3.048" y1="2.54" x2="2.54" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="-3.048" x2="3.048" y2="-2.54" width="0.2032" layer="51"/>
-<wire x1="3.048" y1="-2.54" x2="3.048" y2="-1.016" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="3.048" x2="-3.048" y2="2.54" width="0.2032" layer="51"/>
-<wire x1="-3.048" y1="2.54" x2="-3.048" y2="1.016" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-3.048" x2="-3.048" y2="-2.54" width="0.2032" layer="51"/>
-<wire x1="-3.048" y1="-2.54" x2="-3.048" y2="-1.016" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-3.048" x2="-2.159" y2="-3.048" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="3.048" x2="2.159" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.159" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="21"/>
-<wire x1="-2.159" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="21"/>
-<wire x1="3.048" y1="0.998" x2="3.048" y2="-1.016" width="0.2032" layer="21"/>
-<wire x1="-3.048" y1="1.028" x2="-3.048" y2="-1.016" width="0.2032" layer="21"/>
-<wire x1="-2.54" y1="1.27" x2="-2.54" y2="0.508" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-0.508" x2="-2.54" y2="-1.27" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="0.508" x2="-2.159" y2="-0.381" width="0.2032" layer="51"/>
-<circle x="0" y="0" radius="1.778" width="0.2032" layer="21"/>
-<pad name="1" x="-3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="2" x="3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="3" x="-3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="4" x="3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
-<text x="0" y="3.302" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
-<text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
-</package>
-</packages>
-<packages3d>
-<package3d name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:package:40163/1" type="box" library_version="1">
-<description>Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square
-Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
-Datasheet (B3F-1000)</description>
-<packageinstances>
-<packageinstance name="TACTILE_SWITCH_PTH_6.0MM"/>
-</packageinstances>
-</package3d>
-</packages3d>
-</library>
-<library name="SparkFun-Electromechanical" urn="urn:adsk.eagle:library:516">
-<description>&lt;h3&gt;SparkFun Electromechanical Parts&lt;/h3&gt;
-This library contains electromechanical devices, like motors, speakers,servos, and relays.
-&lt;br&gt;
-&lt;br&gt;
-We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
-&lt;br&gt;
-&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
-&lt;br&gt;
-&lt;br&gt;
-&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
-&lt;br&gt;
-&lt;br&gt;
-You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
-<packages>
-<package name="BUZZER-12MM-KIT" urn="urn:adsk.eagle:footprint:38540/1" library_version="1">
-<description>&lt;h3&gt;12mm Buzzer - PTH (KIT VARIANT)&lt;/h3&gt;
-&lt;p&gt;This is a small 12mm round speaker that operates around the audible 2kHz range. You can use these speakers to create simple music or user interfaces.&lt;/p&gt;
-&lt;p&gt;&lt;b&gt;Warning:&lt;/b&gt; This is the KIT version of this package. This package has a smaller diameter top stop mask, which doesn't cover the diameter of the pad. This means only the bottom side of the pads' copper will be exposed. You'll only be able to solder to the bottom side.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://cdn.sparkfun.com/datasheets/Components/General/cem-1203-42-.pdf"&gt;Datasheet&lt;/a&gt;&lt;/p&gt;
-&lt;h4&gt;Devices Using&lt;/h4&gt;
-&lt;ul&gt;&lt;li&gt;BUZZER&lt;/li&gt;&lt;/ul&gt;</description>
-<circle x="0" y="0" radius="5.9" width="0.2032" layer="21"/>
-<circle x="0" y="0" radius="1.27" width="0.2032" layer="51"/>
-<pad name="-" x="-3.25" y="0" drill="0.9" diameter="1.8796" stop="no"/>
-<pad name="+" x="3.25" y="0" drill="0.9" diameter="1.8796" stop="no"/>
-<text x="2.667" y="1.143" size="1.778" layer="51">+</text>
-<text x="0" y="6.096" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;NAME</text>
-<text x="0" y="5.588" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;VALUE</text>
-<polygon width="0.127" layer="30">
-<vertex x="3.2537" y="-0.9525" curve="-90"/>
-<vertex x="2.2988" y="-0.0228" curve="-90.011749"/>
-<vertex x="3.2512" y="0.9526" curve="-90"/>
-<vertex x="4.2012" y="-0.0254" curve="-90.024193"/>
-</polygon>
-<polygon width="0.127" layer="29">
-<vertex x="3.2512" y="-0.4445" curve="-90.012891"/>
-<vertex x="2.8067" y="-0.0203" curve="-90"/>
-<vertex x="3.2512" y="0.447" curve="-90"/>
-<vertex x="3.6931" y="-0.0101" curve="-90.012967"/>
-</polygon>
-<polygon width="0.127" layer="30">
-<vertex x="-3.2487" y="-0.9525" curve="-90"/>
-<vertex x="-4.2036" y="-0.0228" curve="-90.011749"/>
-<vertex x="-3.2512" y="0.9526" curve="-90"/>
-<vertex x="-2.3012" y="-0.0254" curve="-90.024193"/>
-</polygon>
-<polygon width="0.127" layer="29">
-<vertex x="-3.2512" y="-0.4445" curve="-90.012891"/>
-<vertex x="-3.6957" y="-0.0203" curve="-90"/>
-<vertex x="-3.2512" y="0.447" curve="-90"/>
-<vertex x="-2.8093" y="-0.0101" curve="-90.012967"/>
-</polygon>
-</package>
-</packages>
-<packages3d>
-<package3d name="BUZZER-12MM-KIT" urn="urn:adsk.eagle:package:38556/1" type="box" library_version="1">
-<description>12mm Buzzer - PTH (KIT VARIANT)
-This is a small 12mm round speaker that operates around the audible 2kHz range. You can use these speakers to create simple music or user interfaces.
-Warning: This is the KIT version of this package. This package has a smaller diameter top stop mask, which doesn't cover the diameter of the pad. This means only the bottom side of the pads' copper will be exposed. You'll only be able to solder to the bottom side.
-Datasheet
-Devices Using
-BUZZER</description>
-<packageinstances>
-<packageinstance name="BUZZER-12MM-KIT"/>
-</packageinstances>
-</package3d>
-</packages3d>
-</library>
 <library name="eScooter">
 <packages>
 <package name="DIOM5027X220N" urn="urn:adsk.eagle:footprint:21928331/1">
@@ -748,6 +621,91 @@ BUZZER</description>
 </package3d>
 </packages3d>
 </library>
+<library name="SparkFun-Switches">
+<description>&lt;h3&gt;SparkFun Switches, Buttons, Encoders&lt;/h3&gt;
+In this library you'll find switches, buttons, joysticks, and anything that moves to create or disrupt an electrical connection.
+&lt;br&gt;
+&lt;br&gt;
+We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
+&lt;br&gt;
+&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
+&lt;br&gt;
+&lt;br&gt;
+&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
+&lt;br&gt;
+&lt;br&gt;
+You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
+<packages>
+<package name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:footprint:40103/1">
+<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square&lt;/h3&gt;
+&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
+&lt;p&gt;&lt;a href="https://www.omron.com/ecb/products/pdf/en-b3f.pdf"&gt;Datasheet&lt;/a&gt; (B3F-1000)&lt;/p&gt;</description>
+<wire x1="3.048" y1="1.016" x2="3.048" y2="2.54" width="0.2032" layer="51"/>
+<wire x1="3.048" y1="2.54" x2="2.54" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="-3.048" x2="3.048" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="3.048" y1="-2.54" x2="3.048" y2="-1.016" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="3.048" x2="-3.048" y2="2.54" width="0.2032" layer="51"/>
+<wire x1="-3.048" y1="2.54" x2="-3.048" y2="1.016" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-3.048" x2="-3.048" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="-3.048" y1="-2.54" x2="-3.048" y2="-1.016" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-3.048" x2="-2.159" y2="-3.048" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="3.048" x2="2.159" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.159" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="21"/>
+<wire x1="-2.159" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="21"/>
+<wire x1="3.048" y1="0.998" x2="3.048" y2="-1.016" width="0.2032" layer="21"/>
+<wire x1="-3.048" y1="1.028" x2="-3.048" y2="-1.016" width="0.2032" layer="21"/>
+<wire x1="-2.54" y1="1.27" x2="-2.54" y2="0.508" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-0.508" x2="-2.54" y2="-1.27" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="0.508" x2="-2.159" y2="-0.381" width="0.2032" layer="51"/>
+<circle x="0" y="0" radius="1.778" width="0.2032" layer="21"/>
+<pad name="1" x="-3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="2" x="3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="3" x="-3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="4" x="3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
+<text x="0" y="3.302" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
+<text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
+</package>
+</packages>
+<packages3d>
+<package3d name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:package:40163/1" type="box">
+<description>Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square
+Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
+Datasheet (B3F-1000)</description>
+<packageinstances>
+<packageinstance name="TACTILE_SWITCH_PTH_6.0MM"/>
+</packageinstances>
+</package3d>
+</packages3d>
+</library>
+<library name="buzzer">
+<description>&lt;b&gt;Speakers and Buzzers&lt;/b&gt;&lt;p&gt;
+&lt;ul&gt;Distributors:
+&lt;li&gt;Buerklin
+&lt;li&gt;Spoerle
+&lt;li&gt;Schukat
+&lt;/ul&gt;
+&lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
+<packages>
+<package name="F/HGP" urn="urn:adsk.eagle:footprint:5238/1" locally_modified="yes">
+<description>&lt;b&gt;BUZZER&lt;/b&gt;</description>
+<pad name="1" x="-3.81" y="0" drill="1.016" diameter="2.159" shape="octagon"/>
+<pad name="2" x="3.81" y="0" drill="1.016" diameter="2.159" shape="octagon"/>
+<text x="4.445" y="6.985" size="1.27" layer="25" ratio="10">&gt;NAME</text>
+<text x="-3.683" y="-3.81" size="1.27" layer="27" ratio="10">&gt;VALUE</text>
+<circle x="0" y="0" radius="6.0827625" width="0.127" layer="21"/>
+</package>
+</packages>
+<packages3d>
+<package3d name="F/HGP" urn="urn:adsk.eagle:package:5287/1" type="box">
+<description>BUZZER</description>
+<packageinstances>
+<packageinstance name="F/HGP"/>
+</packageinstances>
+</package3d>
+</packages3d>
+</library>
 </libraries>
 <attributes>
 </attributes>
@@ -956,20 +914,20 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="7.5733" y="58.23" size="1.27" layer="28" rot="MR90" align="top-center"/>
 <attribute name="VOLTAGE_RATING" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
 </element>
-<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="1uF" x="17.62" y="13.95" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Capacitor" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="19.4767" y="13.95" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="15.7633" y="13.95" size="1.27" layer="28" rot="MR90" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="19.12" y="11.95" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Capacitor" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="20.9767" y="11.95" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="17.2633" y="11.95" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
 </element>
 <element name="D2" library="Diode" library_urn="urn:adsk.eagle:library:16378169" package="SOD6126X290" package3d_urn="urn:adsk.eagle:package:9427057/2" value="" x="7.62" y="25.82" smashed="yes" rot="MR0">
 <attribute name="CATEGORY" value="Diode" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
@@ -994,7 +952,7 @@ design rules under a new name.</description>
 <attribute name="FORWARD_CURRENT" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
 <attribute name="MANUFACTURER" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
 <attribute name="MPN" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="16.08" y="29.13" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="NAME" x="10.58" y="29.63" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
 <attribute name="OPERATING_TEMP" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
 <attribute name="PART_STATUS" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
 <attribute name="REVERSE_VOLTAGE" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
@@ -1057,7 +1015,7 @@ design rules under a new name.</description>
 <attribute name="DRAIN_CURRENT" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="MANUFACTURER" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="MPN" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
-<attribute name="NAME" x="4.445" y="17.335" size="1.27" layer="26" rot="MR270"/>
+<attribute name="NAME" x="5.445" y="18.835" size="1.27" layer="26" rot="MR180"/>
 <attribute name="OPERATING_TEMP" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="PART_STATUS" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="ROHS_COMPLIANT" value="" x="64.77" y="-4.89" size="1.778" layer="28" rot="MR270" display="off"/>
@@ -1073,7 +1031,7 @@ design rules under a new name.</description>
 <attribute name="DRAIN_CURRENT" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="MANUFACTURER" value="ON Semiconductor" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="MPN" value="BSS84" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="NAME" x="4.445" y="17.335" size="1.27" layer="26" rot="MR0"/>
+<attribute name="NAME" x="3.445" y="17.335" size="1.27" layer="26" rot="MR0"/>
 <attribute name="OPERATING_TEMP" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="PART_STATUS" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="ROHS_COMPLIANT" value="" x="-22.86" y="-42.99" size="1.778" layer="28" rot="MR0" display="off"/>
@@ -1100,7 +1058,7 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="23.765" y="40.195" size="1.27" layer="28" rot="MR0"/>
 </element>
 <element name="R1" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="8.35" y="34.78" smashed="yes" rot="MR180">
-<attribute name="NAME" x="7.08" y="33.51" size="1.27" layer="26" rot="MR180"/>
+<attribute name="NAME" x="7.08" y="37.01" size="1.27" layer="26" rot="MR180"/>
 <attribute name="SPICEMODEL" value="NONE" x="56.61" y="86.85" size="1.778" layer="28" rot="MR180" display="off"/>
 <attribute name="SPICEPREFIX" value="R" x="56.61" y="86.85" size="1.778" layer="28" rot="MR180" display="off"/>
 <attribute name="VALUE" x="7.08" y="37.32" size="1.27" layer="28" rot="MR180"/>
@@ -1111,34 +1069,22 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="-48.26" y="-40.45" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="VALUE" x="6.35" y="9.08" size="1.27" layer="28" rot="MR0"/>
 </element>
-<element name="S1" library="SparkFun-Switches" library_urn="urn:adsk.eagle:library:535" package="TACTILE_SWITCH_PTH_6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value="" x="12.7" y="17.97" smashed="yes" rot="R270">
-<attribute name="NAME" x="16.002" y="17.97" size="0.6096" layer="25" font="vector" ratio="20" rot="R270" align="bottom-center"/>
-<attribute name="PROD_ID" value=" SWCH-08441" x="8.89" y="-23.94" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="SF_SKU" value="COM-00097" x="8.89" y="-23.94" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="VALUE" x="9.525" y="17.97" size="0.6096" layer="27" font="vector" ratio="20" rot="R270" align="top-center"/>
-</element>
-<element name="LS1" library="SparkFun-Electromechanical" library_urn="urn:adsk.eagle:library:516" package="BUZZER-12MM-KIT" package3d_urn="urn:adsk.eagle:package:38556/1" value="BUZZER-PTH_KIT" x="12.7" y="7.81" smashed="yes" rot="R180">
-<attribute name="NAME" x="12.7" y="1.714" size="0.6096" layer="25" font="vector" ratio="20" rot="R180" align="bottom-center"/>
-<attribute name="PROD_ID" value="COMP-08253" x="12.7" y="7.81" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="SF_SKU" value="COM-07950" x="12.7" y="7.81" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="VALUE" x="12.7" y="2.222" size="0.6096" layer="27" font="vector" ratio="20" rot="R180" align="top-center"/>
-</element>
-<element name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="17" y="24" smashed="yes" rot="MR0">
-<attribute name="NAME" x="18.27" y="25.27" size="1.27" layer="26" rot="MR0"/>
-<attribute name="SPICEMODEL" value="NONE" x="17" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="SPICEPREFIX" value="R" x="17" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="VALUE" x="18.27" y="21.46" size="1.27" layer="28" rot="MR0"/>
+<element name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="17.5" y="24" smashed="yes" rot="MR0">
+<attribute name="NAME" x="18.77" y="25.27" size="1.27" layer="26" rot="MR0"/>
+<attribute name="SPICEMODEL" value="NONE" x="17.5" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="SPICEPREFIX" value="R" x="17.5" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="VALUE" x="18.77" y="21.46" size="1.27" layer="28" rot="MR0"/>
 </element>
 <element name="D4" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="6.5" y="57" smashed="yes" rot="MR90">
 <attribute name="NAME" x="8.485" y="57" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
 <attribute name="VALUE" x="4.515" y="57" size="1.27" layer="28" rot="MR90" align="top-center"/>
 </element>
-<element name="D5" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="17.5" y="19.5" smashed="yes" rot="MR90">
-<attribute name="NAME" x="19.485" y="19.5" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="VALUE" x="15.515" y="19.5" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D5" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="19" y="18" smashed="yes" rot="MR90">
+<attribute name="NAME" x="20.985" y="18" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="VALUE" x="17.015" y="18" size="1.27" layer="28" rot="MR90" align="top-center"/>
 </element>
 <element name="D6" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="19" y="31" smashed="yes" rot="MR180">
-<attribute name="NAME" x="19" y="29.015" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
+<attribute name="NAME" x="19" y="34.015" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
 <attribute name="VALUE" x="19" y="32.985" size="1.27" layer="28" rot="MR180" align="top-center"/>
 </element>
 <element name="D7" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="20.5" y="60" smashed="yes" rot="MR180">
@@ -1149,11 +1095,11 @@ design rules under a new name.</description>
 <attribute name="NAME" x="12" y="9.515" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
 <attribute name="VALUE" x="12" y="13.485" size="1.27" layer="28" rot="MR180" align="top-center"/>
 </element>
-<element name="R4" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="21" y="39.5" smashed="yes" rot="MR180">
-<attribute name="NAME" x="19.73" y="38.23" size="1.27" layer="26" rot="MR180"/>
-<attribute name="SPICEMODEL" value="NONE" x="21" y="39.5" size="1.778" layer="28" rot="MR180" display="off"/>
-<attribute name="SPICEPREFIX" value="R" x="21" y="39.5" size="1.778" layer="28" rot="MR180" display="off"/>
-<attribute name="VALUE" x="19.73" y="42.04" size="1.27" layer="28" rot="MR180"/>
+<element name="R4" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="21" y="39" smashed="yes" rot="MR180">
+<attribute name="NAME" x="19.73" y="37.73" size="1.27" layer="26" rot="MR180"/>
+<attribute name="SPICEMODEL" value="NONE" x="21" y="39" size="1.778" layer="28" rot="MR180" display="off"/>
+<attribute name="SPICEPREFIX" value="R" x="21" y="39" size="1.778" layer="28" rot="MR180" display="off"/>
+<attribute name="VALUE" x="19.73" y="41.54" size="1.27" layer="28" rot="MR180"/>
 </element>
 <element name="R5" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="21" y="63" smashed="yes" rot="MR0">
 <attribute name="NAME" x="22.27" y="64.27" size="1.27" layer="26" rot="MR0"/>
@@ -1161,7 +1107,7 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="21" y="63" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="VALUE" x="22.27" y="60.46" size="1.27" layer="28" rot="MR0"/>
 </element>
-<element name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="1uF" x="12.5" y="29" smashed="yes" rot="R180">
+<element name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="12.5" y="29" smashed="yes" rot="R180">
 <attribute name="CATEGORY" value="Capacitor" x="12.5" y="29" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MANUFACTURER" value="" x="12.5" y="29" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MPN" value="" x="12.5" y="29" size="1.778" layer="27" rot="R180" display="off"/>
@@ -1180,13 +1126,27 @@ design rules under a new name.</description>
 <attribute name="NAME" x="14.5" y="74.135" size="1.27" layer="25" align="bottom-center"/>
 <attribute name="VALUE" x="14.5" y="29.865" size="1.27" layer="27" align="top-center"/>
 </element>
+<element name="S1" library="SparkFun-Switches" package="TACTILE_SWITCH_PTH_6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value="MOMENTARY-SWITCH-SPST-PTH-6.0MM" x="12.5" y="18.5" smashed="yes" rot="MR90">
+<attribute name="NAME" x="15.802" y="18.5" size="0.6096" layer="26" font="vector" ratio="20" rot="MR90" align="bottom-center"/>
+<attribute name="PROD_ID" value=" SWCH-08441" x="12.5" y="18.5" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SF_SKU" value="COM-00097" x="12.5" y="18.5" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="9.325" y="18.5" size="0.6096" layer="28" font="vector" ratio="20" rot="MR90" align="top-center"/>
+</element>
+<element name="SG1" library="buzzer" package="F/HGP" package3d_urn="urn:adsk.eagle:package:5287/1" value="F/HGP" x="13" y="8" smashed="yes" rot="R180">
+<attribute name="MF" value="" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="MPN" value="" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="NAME" x="8.555" y="1.015" size="1.27" layer="25" ratio="10" rot="R180"/>
+<attribute name="OC_FARNELL" value="unknown" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="OC_NEWARK" value="unknown" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="POPULARITY" value="0" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="VALUE" x="16.683" y="11.81" size="1.27" layer="27" ratio="10" rot="R180"/>
+</element>
 </elements>
 <signals>
 <signal name="GND">
 <contactref element="Q5" pad="2"/>
 <contactref element="R1" pad="1"/>
 <contactref element="Q2" pad="2"/>
-<contactref element="S1" pad="1"/>
 <contactref element="J3" pad="2"/>
 <contactref element="Q1" pad="2"/>
 <contactref element="J5" pad="3"/>
@@ -1212,7 +1172,6 @@ design rules under a new name.</description>
 <via x="7.39" y="31.94" extent="1-16" drill="0.35"/>
 <via x="13.97" y="17.97" extent="1-16" drill="0.35"/>
 <via x="12.7" y="7.81" extent="1-16" drill="0.35"/>
-<contactref element="LS1" pad="-"/>
 <wire x1="7.45" y1="14.48" x2="7.45" y2="13.3792875" width="0.8128" layer="16"/>
 <wire x1="7.45" y1="13.3792875" x2="8.0132" y2="12.8160875" width="0.8128" layer="16"/>
 <wire x1="8.0132" y1="12.8160875" x2="8.0132" y2="9.4732" width="0.8128" layer="16"/>
@@ -1227,6 +1186,9 @@ design rules under a new name.</description>
 <contactref element="R5" pad="1"/>
 <contactref element="C2" pad="2"/>
 <contactref element="U1" pad="14"/>
+<contactref element="S1" pad="2"/>
+<contactref element="S1" pad="1"/>
+<contactref element="SG1" pad="1"/>
 </signal>
 <signal name="VIN">
 <contactref element="Q4" pad="3"/>
@@ -1344,17 +1306,17 @@ design rules under a new name.</description>
 <contactref element="J2" pad="4"/>
 <contactref element="D5" pad="2"/>
 <wire x1="21.86" y1="16.7" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="20.5" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="21.6" x2="17.5" y2="20.5" width="0.8128" layer="16"/>
+<wire x1="19" y1="19" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
+<wire x1="19" y1="20.1" x2="19" y2="19" width="0.8128" layer="16"/>
 <contactref element="R3" pad="1"/>
 <contactref element="U1" pad="20"/>
 <wire x1="20.83" y1="44.38" x2="20.05" y2="43.6" width="0.8128" layer="1"/>
 <wire x1="22.45" y1="44.38" x2="20.83" y2="44.38" width="0.8128" layer="1"/>
-<wire x1="18.422" y1="24" x2="17.5" y2="23.078" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="23.078" x2="17.5" y2="21.6" width="0.8128" layer="16"/>
-<wire x1="18.422" y1="24" x2="20" y2="24" width="0.8128" layer="16"/>
-<wire x1="20" y1="24" x2="21.86" y2="25.86" width="0.8128" layer="16"/>
-<wire x1="21.86" y1="25.86" x2="21.86" y2="26.86" width="0.8128" layer="16"/>
+<wire x1="18.922" y1="24" x2="19" y2="23.922" width="0.8128" layer="16"/>
+<wire x1="19" y1="23.922" x2="19" y2="20.1" width="0.8128" layer="16"/>
+<wire x1="18.922" y1="24" x2="19.5" y2="24" width="0.8128" layer="16"/>
+<wire x1="19.5" y1="24" x2="21.86" y2="26.36" width="0.8128" layer="16"/>
+<wire x1="21.86" y1="26.36" x2="21.86" y2="26.86" width="0.8128" layer="16"/>
 </signal>
 <signal name="BTN">
 <contactref element="D3" pad="2"/>
@@ -1389,11 +1351,11 @@ design rules under a new name.</description>
 <wire x1="23.5776" y1="23.05" x2="22.3076" y2="21.78" width="0.8128" layer="16"/>
 <wire x1="22.3076" y1="21.78" x2="21.86" y2="21.78" width="0.8128" layer="16"/>
 <wire x1="22.81" y1="38.19" x2="23.5776" y2="37.4224" width="0.8128" layer="16"/>
-<wire x1="22.81" y1="42.27" x2="22.81" y2="39.5" width="0.8128" layer="16"/>
-<wire x1="22.81" y1="39.5" x2="22.81" y2="38.19" width="0.8128" layer="16"/>
+<wire x1="22.81" y1="42.27" x2="22.81" y2="39" width="0.8128" layer="16"/>
+<wire x1="22.81" y1="39" x2="22.81" y2="38.19" width="0.8128" layer="16"/>
 <wire x1="23.5776" y1="37.4224" x2="23.5776" y2="23.05" width="0.8128" layer="16"/>
 <contactref element="R4" pad="2"/>
-<wire x1="22.422" y1="39.5" x2="22.81" y2="39.5" width="0.8128" layer="16"/>
+<wire x1="22.422" y1="39" x2="22.81" y2="39" width="0.8128" layer="16"/>
 </signal>
 <signal name="LEDCTL">
 <contactref element="Q1" pad="1"/>
@@ -1473,8 +1435,8 @@ design rules under a new name.</description>
 <contactref element="Q2" pad="3"/>
 <contactref element="D2" pad="2"/>
 <wire x1="3.49" y1="14.33" x2="3.66" y2="14.16" width="0.8128" layer="16"/>
-<wire x1="3.98" y1="14.16" x2="5.25" y2="15.43" width="0.8128" layer="16"/>
-<wire x1="3.66" y1="14.16" x2="3.98" y2="14.16" width="0.8128" layer="16"/>
+<wire x1="5.25" y1="14.16" x2="5.25" y2="15.43" width="0.8128" layer="16"/>
+<wire x1="3.66" y1="14.16" x2="5.25" y2="14.16" width="0.8128" layer="16"/>
 <wire x1="5.25" y1="15.43" x2="5.25" y2="13.99" width="0.8128" layer="16"/>
 <wire x1="6.502" y1="12.738" x2="6.502" y2="11.62" width="0.8128" layer="16"/>
 <wire x1="5.25" y1="13.99" x2="6.502" y2="12.738" width="0.8128" layer="16"/>
@@ -1484,43 +1446,48 @@ design rules under a new name.</description>
 <signal name="N$5">
 <contactref element="D3" pad="1"/>
 <contactref element="D2" pad="1"/>
-<contactref element="S1" pad="3"/>
-<wire x1="10.3248" y1="25.82" x2="10.3248" y2="21.3358" width="0.8128" layer="16"/>
-<wire x1="10.3248" y1="21.3358" x2="10.4394" y2="21.2212" width="0.8128" layer="16"/>
 <wire x1="13.97" y1="26.4252" x2="10.93" y2="26.4252" width="0.8128" layer="16"/>
 <wire x1="10.93" y1="26.4252" x2="10.3248" y2="25.82" width="0.8128" layer="16"/>
 <contactref element="D8" pad="2"/>
-<wire x1="10.4394" y1="21.2212" x2="12.5" y2="19.1606" width="0.8128" layer="16"/>
-<wire x1="12.5" y1="19.1606" x2="12.5" y2="12" width="0.8128" layer="16"/>
 <wire x1="12.5" y1="12" x2="13" y2="11.5" width="0.8128" layer="16"/>
 <wire x1="13" y1="11.5" x2="14.1" y2="11.5" width="0.8128" layer="16"/>
+<contactref element="S1" pad="3"/>
+<contactref element="S1" pad="4"/>
+<wire x1="10.3248" y1="25.82" x2="10.3248" y2="21.8366" width="0.8128" layer="16"/>
+<wire x1="10.3248" y1="21.8366" x2="10.2394" y2="21.7512" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="21.7512" x2="10.2394" y2="15.2488" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="15.2488" x2="10.4882" y2="15" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="15.2488" x2="12.5" y2="12.9882" width="0.8128" layer="16"/>
+<wire x1="12.5" y1="12.9882" x2="12.5" y2="12" width="0.8128" layer="16"/>
 </signal>
 <signal name="SPOUT">
 <contactref element="J7" pad="6"/>
 <contactref element="C3" pad="1"/>
-<wire x1="12.8016" y1="23.90786875" x2="12.8016" y2="13.74786875" width="0.8128" layer="1"/>
+<wire x1="12.3016" y1="24.40786875" x2="12.3016" y2="14.1984" width="0.8128" layer="1"/>
 <wire x1="2.54" y1="31.67" x2="6.08" y2="28.13" width="0.8128" layer="16"/>
 <wire x1="7.62" y1="28.13" x2="8.57946875" y2="28.13" width="0.8128" layer="1"/>
-<wire x1="8.57946875" y1="28.13" x2="12.8016" y2="23.90786875" width="0.8128" layer="1"/>
+<wire x1="8.57946875" y1="28.13" x2="12.3016" y2="24.40786875" width="0.8128" layer="1"/>
 <wire x1="2.54" y1="42.64" x2="2.54" y2="31.67" width="0.8128" layer="16"/>
 <via x="7.62" y="28.13" extent="1-16" drill="0.35"/>
 <wire x1="6.08" y1="28.13" x2="7.62" y2="28.13" width="0.8128" layer="16"/>
 <contactref element="J2" pad="1"/>
-<wire x1="12.8016" y1="13.74786875" x2="17.46946875" y2="9.08" width="0.8128" layer="1"/>
-<wire x1="17.46946875" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="1"/>
-<wire x1="21.0146" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="16"/>
-<wire x1="17.62" y1="12.4746" x2="21.0146" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="12.3016" y1="14.1984" x2="14" y2="12.5" width="0.8128" layer="1"/>
+<wire x1="18.46946875" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="1"/>
+<wire x1="20.5146" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="19.12" y1="10.4746" x2="20.5146" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="15.04946875" y1="12.5" x2="18.46946875" y2="9.08" width="0.8128" layer="1"/>
+<wire x1="14" y1="12.5" x2="15.04946875" y2="12.5" width="0.8128" layer="1"/>
 </signal>
 <signal name="SPK">
-<contactref element="LS1" pad="+"/>
 <wire x1="2.54" y1="37.02" x2="2.54" y2="16.7" width="0.8128" layer="1"/>
-<wire x1="9.45" y1="9.79" x2="9.45" y2="7.81" width="0.8128" layer="1"/>
-<wire x1="2.54" y1="16.7" x2="9.45" y2="9.79" width="0.8128" layer="1"/>
+<wire x1="2.54" y1="16.7" x2="9.19" y2="10.05" width="0.8128" layer="1"/>
 <wire x1="2.54" y1="37.02" x2="4.191" y2="38.671" width="0.8128" layer="1"/>
 <wire x1="4.191" y1="46.291" x2="4.191" y2="38.671" width="0.8128" layer="1"/>
 <contactref element="U1" pad="10"/>
 <wire x1="6.55" y1="46.92" x2="4.82" y2="46.92" width="0.8128" layer="1"/>
 <wire x1="4.82" y1="46.92" x2="4.191" y2="46.291" width="0.8128" layer="1"/>
+<contactref element="SG1" pad="2"/>
+<wire x1="9.19" y1="10.05" x2="9.19" y2="8" width="0.8128" layer="1"/>
 </signal>
 <signal name="3V3">
 <contactref element="U1" pad="2"/>

+ 192 - 193
schematic/ECU.brd

@@ -8,18 +8,18 @@
 </settings>
 <grid distance="0.5" unitdist="mm" unit="mm" style="lines" multiple="1" display="no" altdistance="5" altunitdist="mil" altunit="mm"/>
 <layers>
-<layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
-<layer number="16" name="Bottom" color="1" fill="1" visible="no" active="yes"/>
+<layer number="1" name="Top" color="4" fill="1" visible="no" active="yes"/>
+<layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
 <layer number="20" name="Dimension" color="24" fill="1" visible="yes" active="yes"/>
-<layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="22" name="bPlace" color="7" fill="1" visible="no" active="yes"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="yes"/>
-<layer number="25" name="tNames" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="26" name="bNames" color="7" fill="1" visible="no" active="yes"/>
+<layer number="21" name="tPlace" color="7" fill="1" visible="no" active="yes"/>
+<layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="yes"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
+<layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
+<layer number="26" name="bNames" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="29" name="tStop" color="7" fill="3" visible="no" active="yes"/>
@@ -32,10 +32,10 @@
 <layer number="36" name="bGlue" color="7" fill="5" visible="no" active="yes"/>
 <layer number="37" name="tTest" color="7" fill="1" visible="no" active="yes"/>
 <layer number="38" name="bTest" color="7" fill="1" visible="no" active="yes"/>
-<layer number="39" name="tKeepout" color="4" fill="11" visible="yes" active="yes"/>
-<layer number="40" name="bKeepout" color="1" fill="11" visible="no" active="yes"/>
-<layer number="41" name="tRestrict" color="4" fill="10" visible="yes" active="yes"/>
-<layer number="42" name="bRestrict" color="1" fill="10" visible="no" active="yes"/>
+<layer number="39" name="tKeepout" color="4" fill="11" visible="no" active="yes"/>
+<layer number="40" name="bKeepout" color="1" fill="11" visible="yes" active="yes"/>
+<layer number="41" name="tRestrict" color="4" fill="10" visible="no" active="yes"/>
+<layer number="42" name="bRestrict" color="1" fill="10" visible="yes" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
 <layer number="45" name="Holes" color="7" fill="1" visible="no" active="yes"/>
@@ -44,8 +44,8 @@
 <layer number="48" name="Document" color="7" fill="1" visible="no" active="yes"/>
 <layer number="49" name="Reference" color="7" fill="1" visible="no" active="yes"/>
 <layer number="50" name="dxf" color="7" fill="1" visible="no" active="no"/>
-<layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="52" name="bDocu" color="7" fill="1" visible="no" active="yes"/>
+<layer number="51" name="tDocu" color="7" fill="1" visible="no" active="yes"/>
+<layer number="52" name="bDocu" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="53" name="tGND_GNDA" color="7" fill="9" visible="no" active="no"/>
 <layer number="54" name="bGND_GNDA" color="1" fill="9" visible="no" active="no"/>
 <layer number="56" name="wert" color="7" fill="1" visible="no" active="no"/>
@@ -539,64 +539,6 @@ CONN_03
 </package3d>
 </packages3d>
 </library>
-<library name="SparkFun-Switches" urn="urn:adsk.eagle:library:535">
-<description>&lt;h3&gt;SparkFun Switches, Buttons, Encoders&lt;/h3&gt;
-In this library you'll find switches, buttons, joysticks, and anything that moves to create or disrupt an electrical connection.
-&lt;br&gt;
-&lt;br&gt;
-We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
-&lt;br&gt;
-&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
-&lt;br&gt;
-&lt;br&gt;
-&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
-&lt;br&gt;
-&lt;br&gt;
-You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
-<packages>
-<package name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:footprint:40103/1" library_version="1">
-<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square&lt;/h3&gt;
-&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
-&lt;p&gt;&lt;a href="https://www.omron.com/ecb/products/pdf/en-b3f.pdf"&gt;Datasheet&lt;/a&gt; (B3F-1000)&lt;/p&gt;</description>
-<wire x1="3.048" y1="1.016" x2="3.048" y2="2.54" width="0.2032" layer="51"/>
-<wire x1="3.048" y1="2.54" x2="2.54" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="-3.048" x2="3.048" y2="-2.54" width="0.2032" layer="51"/>
-<wire x1="3.048" y1="-2.54" x2="3.048" y2="-1.016" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="3.048" x2="-3.048" y2="2.54" width="0.2032" layer="51"/>
-<wire x1="-3.048" y1="2.54" x2="-3.048" y2="1.016" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-3.048" x2="-3.048" y2="-2.54" width="0.2032" layer="51"/>
-<wire x1="-3.048" y1="-2.54" x2="-3.048" y2="-1.016" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-3.048" x2="-2.159" y2="-3.048" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.54" y1="3.048" x2="2.159" y2="3.048" width="0.2032" layer="51"/>
-<wire x1="2.159" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="21"/>
-<wire x1="-2.159" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="21"/>
-<wire x1="3.048" y1="0.998" x2="3.048" y2="-1.016" width="0.2032" layer="21"/>
-<wire x1="-3.048" y1="1.028" x2="-3.048" y2="-1.016" width="0.2032" layer="21"/>
-<wire x1="-2.54" y1="1.27" x2="-2.54" y2="0.508" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="-0.508" x2="-2.54" y2="-1.27" width="0.2032" layer="51"/>
-<wire x1="-2.54" y1="0.508" x2="-2.159" y2="-0.381" width="0.2032" layer="51"/>
-<circle x="0" y="0" radius="1.778" width="0.2032" layer="21"/>
-<pad name="1" x="-3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="2" x="3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="3" x="-3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
-<pad name="4" x="3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
-<text x="0" y="3.302" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
-<text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
-</package>
-</packages>
-<packages3d>
-<package3d name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:package:40163/1" type="box" library_version="1">
-<description>Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square
-Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
-Datasheet (B3F-1000)</description>
-<packageinstances>
-<packageinstance name="TACTILE_SWITCH_PTH_6.0MM"/>
-</packageinstances>
-</package3d>
-</packages3d>
-</library>
 <library name="eScooter">
 <packages>
 <package name="DIOM5027X220N" urn="urn:adsk.eagle:footprint:21928331/1">
@@ -679,7 +621,65 @@ Datasheet (B3F-1000)</description>
 </package3d>
 </packages3d>
 </library>
-<library name="buzzer" urn="urn:adsk.eagle:library:113">
+<library name="SparkFun-Switches">
+<description>&lt;h3&gt;SparkFun Switches, Buttons, Encoders&lt;/h3&gt;
+In this library you'll find switches, buttons, joysticks, and anything that moves to create or disrupt an electrical connection.
+&lt;br&gt;
+&lt;br&gt;
+We've spent an enormous amount of time creating and checking these footprints and parts, but it is &lt;b&gt; the end user's responsibility&lt;/b&gt; to ensure correctness and suitablity for a given componet or application. 
+&lt;br&gt;
+&lt;br&gt;If you enjoy using this library, please buy one of our products at &lt;a href=" www.sparkfun.com"&gt;SparkFun.com&lt;/a&gt;.
+&lt;br&gt;
+&lt;br&gt;
+&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
+&lt;br&gt;
+&lt;br&gt;
+You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
+<packages>
+<package name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:footprint:40103/1">
+<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square&lt;/h3&gt;
+&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
+&lt;p&gt;&lt;a href="https://www.omron.com/ecb/products/pdf/en-b3f.pdf"&gt;Datasheet&lt;/a&gt; (B3F-1000)&lt;/p&gt;</description>
+<wire x1="3.048" y1="1.016" x2="3.048" y2="2.54" width="0.2032" layer="51"/>
+<wire x1="3.048" y1="2.54" x2="2.54" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="-3.048" x2="3.048" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="3.048" y1="-2.54" x2="3.048" y2="-1.016" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="3.048" x2="-3.048" y2="2.54" width="0.2032" layer="51"/>
+<wire x1="-3.048" y1="2.54" x2="-3.048" y2="1.016" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-3.048" x2="-3.048" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="-3.048" y1="-2.54" x2="-3.048" y2="-1.016" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-3.048" x2="-2.159" y2="-3.048" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="3.048" x2="2.159" y2="3.048" width="0.2032" layer="51"/>
+<wire x1="2.159" y1="3.048" x2="-2.159" y2="3.048" width="0.2032" layer="21"/>
+<wire x1="-2.159" y1="-3.048" x2="2.159" y2="-3.048" width="0.2032" layer="21"/>
+<wire x1="3.048" y1="0.998" x2="3.048" y2="-1.016" width="0.2032" layer="21"/>
+<wire x1="-3.048" y1="1.028" x2="-3.048" y2="-1.016" width="0.2032" layer="21"/>
+<wire x1="-2.54" y1="1.27" x2="-2.54" y2="0.508" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="-0.508" x2="-2.54" y2="-1.27" width="0.2032" layer="51"/>
+<wire x1="-2.54" y1="0.508" x2="-2.159" y2="-0.381" width="0.2032" layer="51"/>
+<circle x="0" y="0" radius="1.778" width="0.2032" layer="21"/>
+<pad name="1" x="-3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="2" x="3.2512" y="2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="3" x="-3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
+<pad name="4" x="3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
+<text x="0" y="3.302" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
+<text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
+</package>
+</packages>
+<packages3d>
+<package3d name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:package:40163/1" type="box">
+<description>Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square
+Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
+Datasheet (B3F-1000)</description>
+<packageinstances>
+<packageinstance name="TACTILE_SWITCH_PTH_6.0MM"/>
+</packageinstances>
+</package3d>
+</packages3d>
+</library>
+<library name="buzzer">
 <description>&lt;b&gt;Speakers and Buzzers&lt;/b&gt;&lt;p&gt;
 &lt;ul&gt;Distributors:
 &lt;li&gt;Buerklin
@@ -688,21 +688,17 @@ Datasheet (B3F-1000)</description>
 &lt;/ul&gt;
 &lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
 <packages>
-<package name="F/HGP" urn="urn:adsk.eagle:footprint:5238/1" library_version="2">
+<package name="F/HGP" urn="urn:adsk.eagle:footprint:5238/1" locally_modified="yes">
 <description>&lt;b&gt;BUZZER&lt;/b&gt;</description>
-<wire x1="-7.8361" y1="-1.6158" x2="-7.8361" y2="1.6158" width="0.1524" layer="21" curve="336.697868"/>
-<wire x1="-5.882" y1="-2.032" x2="-5.882" y2="2.032" width="0.1524" layer="21" curve="321.883357"/>
-<wire x1="-6.604" y1="2.032" x2="-6.604" y2="-2.032" width="0.1524" layer="21" curve="180"/>
-<wire x1="-6.604" y1="-2.032" x2="-5.882" y2="-2.032" width="0.1524" layer="21"/>
-<wire x1="-6.604" y1="2.032" x2="-5.882" y2="2.032" width="0.1524" layer="21"/>
 <pad name="1" x="-3.81" y="0" drill="1.016" diameter="2.159" shape="octagon"/>
 <pad name="2" x="3.81" y="0" drill="1.016" diameter="2.159" shape="octagon"/>
 <text x="4.445" y="6.985" size="1.27" layer="25" ratio="10">&gt;NAME</text>
 <text x="-3.683" y="-3.81" size="1.27" layer="27" ratio="10">&gt;VALUE</text>
+<circle x="0" y="0" radius="6.0827625" width="0.127" layer="21"/>
 </package>
 </packages>
 <packages3d>
-<package3d name="F/HGP" urn="urn:adsk.eagle:package:5287/1" type="box" library_version="2">
+<package3d name="F/HGP" urn="urn:adsk.eagle:package:5287/1" type="box">
 <description>BUZZER</description>
 <packageinstances>
 <packageinstance name="F/HGP"/>
@@ -903,73 +899,73 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="9.43" y="58.23" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Capacitor" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="11.2867" y="58.23" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="7.5733" y="58.23" size="1.27" layer="28" rot="MR90" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="-47.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<element name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="8.43" y="58.23" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Capacitor" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="10.2867" y="58.23" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="6.5733" y="58.23" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="-48.72" y="105.22" size="1.778" layer="28" rot="MR90" display="off"/>
 </element>
-<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="17.62" y="13.95" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Capacitor" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="19.4767" y="13.95" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="15.7633" y="13.95" size="1.27" layer="28" rot="MR90" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="-39.53" y="66.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="19.12" y="11.95" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Capacitor" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="20.9767" y="11.95" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="17.2633" y="11.95" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="-38.03" y="64.02" size="1.778" layer="28" rot="MR90" display="off"/>
 </element>
-<element name="D2" library="Diode" library_urn="urn:adsk.eagle:library:16378169" package="SOD6126X290" package3d_urn="urn:adsk.eagle:package:9427057/2" value="" x="7.62" y="25.82" smashed="yes" rot="MR0">
-<attribute name="CATEGORY" value="Diode" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="DESCRIPTION" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="FORWARD_CURRENT" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="MPN" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="NAME" x="7.62" y="27.93" size="1.27" layer="26" rot="MR0" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="PART_STATUS" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="REVERSE_VOLTAGE" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="SERIES" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="SUB-CATEGORY" value="Rectifier" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="TYPE" value="" x="-24.13" y="-32.6" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="VALUE" x="7.62" y="23.71" size="1.27" layer="28" rot="MR0" align="top-center"/>
+<element name="D2" library="Diode" library_urn="urn:adsk.eagle:library:16378169" package="SOD6126X290" package3d_urn="urn:adsk.eagle:package:9427057/2" value="" x="7.62" y="24.82" smashed="yes" rot="MR0">
+<attribute name="CATEGORY" value="Diode" x="-24.13" y="-33.6" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="DESCRIPTION" value="" x="-24.13" y="-33.6" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="FORWARD_CURRENT" value="" x="-24.13" y="-33.6" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-24.13" y="-33.6" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="MPN" value="" x="-24.13" y="-33.6" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="NAME" x="7.62" y="26.93" size="1.27" layer="26" rot="MR0" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-24.13" y="-33.6" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="PART_STATUS" value="" x="-24.13" y="-33.6" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="REVERSE_VOLTAGE" value="" x="-24.13" y="-33.6" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-24.13" y="-33.6" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="SERIES" value="" x="-24.13" y="-33.6" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="SUB-CATEGORY" value="Rectifier" x="-24.13" y="-33.6" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-24.13" y="-33.6" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="TYPE" value="" x="-24.13" y="-33.6" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="VALUE" x="7.62" y="22.71" size="1.27" layer="28" rot="MR0" align="top-center"/>
 </element>
-<element name="D3" library="Diode" library_urn="urn:adsk.eagle:library:16378169" package="SOD6126X290" package3d_urn="urn:adsk.eagle:package:9427057/2" value="" x="13.97" y="29.13" smashed="yes" rot="MR90">
-<attribute name="CATEGORY" value="Diode" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="DESCRIPTION" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="FORWARD_CURRENT" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MANUFACTURER" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="MPN" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="NAME" x="10.58" y="29.63" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="PART_STATUS" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="REVERSE_VOLTAGE" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SERIES" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="SUB-CATEGORY" value="Rectifier" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="THERMALLOSS" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="TYPE" value="" x="-44.45" y="69.77" size="1.778" layer="28" rot="MR90" display="off"/>
-<attribute name="VALUE" x="11.86" y="29.13" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D3" library="Diode" library_urn="urn:adsk.eagle:library:16378169" package="SOD6126X290" package3d_urn="urn:adsk.eagle:package:9427057/2" value="" x="13.47" y="30.13" smashed="yes" rot="MR90">
+<attribute name="CATEGORY" value="Diode" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="DESCRIPTION" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="FORWARD_CURRENT" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MANUFACTURER" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="10.08" y="30.63" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="PART_STATUS" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="REVERSE_VOLTAGE" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SERIES" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SUB-CATEGORY" value="Rectifier" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="THERMALLOSS" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="TYPE" value="" x="-44.95" y="70.77" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="11.36" y="30.13" size="1.27" layer="28" rot="MR90" align="top-center"/>
 </element>
-<element name="J1" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="Break" x="21.86" y="26.86" smashed="yes" rot="R180">
-<attribute name="NAME" x="23.13" y="25.463" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
-<attribute name="VALUE" x="23.13" y="28.892" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
+<element name="J1" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="Break" x="21.86" y="27.36" smashed="yes" rot="R180">
+<attribute name="NAME" x="23.13" y="25.963" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
+<attribute name="VALUE" x="23.13" y="29.392" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
 </element>
 <element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X06" package3d_urn="urn:adsk.eagle:package:38009/1" value="COMM" x="21.86" y="9.08" smashed="yes" rot="R90">
 <attribute name="NAME" x="20.463" y="7.81" size="0.6096" layer="25" font="vector" ratio="20" rot="R90"/>
@@ -1073,25 +1069,19 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="-48.26" y="-40.45" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="VALUE" x="6.35" y="9.08" size="1.27" layer="28" rot="MR0"/>
 </element>
-<element name="S1" library="SparkFun-Switches" library_urn="urn:adsk.eagle:library:535" package="TACTILE_SWITCH_PTH_6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value="" x="12.7" y="17.97" smashed="yes" rot="R270">
-<attribute name="NAME" x="16.002" y="17.97" size="0.6096" layer="25" font="vector" ratio="20" rot="R270" align="bottom-center"/>
-<attribute name="PROD_ID" value=" SWCH-08441" x="8.89" y="-23.94" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="SF_SKU" value="COM-00097" x="8.89" y="-23.94" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="VALUE" x="9.525" y="17.97" size="0.6096" layer="27" font="vector" ratio="20" rot="R270" align="top-center"/>
-</element>
-<element name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="17" y="24" smashed="yes" rot="MR0">
-<attribute name="NAME" x="18.27" y="25.27" size="1.27" layer="26" rot="MR0"/>
-<attribute name="SPICEMODEL" value="NONE" x="17" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="SPICEPREFIX" value="R" x="17" y="24" size="1.778" layer="28" rot="MR0" display="off"/>
-<attribute name="VALUE" x="18.27" y="21.46" size="1.27" layer="28" rot="MR0"/>
+<element name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="18" y="17.5" smashed="yes" rot="MR0">
+<attribute name="NAME" x="19.27" y="18.77" size="1.27" layer="26" rot="MR0"/>
+<attribute name="SPICEMODEL" value="NONE" x="18" y="17.5" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="SPICEPREFIX" value="R" x="18" y="17.5" size="1.778" layer="28" rot="MR0" display="off"/>
+<attribute name="VALUE" x="19.27" y="14.96" size="1.27" layer="28" rot="MR0"/>
 </element>
-<element name="D4" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="6.5" y="57" smashed="yes" rot="MR90">
-<attribute name="NAME" x="8.485" y="57" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="VALUE" x="4.515" y="57" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D4" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="5.5" y="58" smashed="yes" rot="MR90">
+<attribute name="NAME" x="7.485" y="58" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
+<attribute name="VALUE" x="3.515" y="58" size="1.27" layer="28" rot="MR90" align="top-center"/>
 </element>
-<element name="D5" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="17.5" y="19.5" smashed="yes" rot="MR90">
-<attribute name="NAME" x="19.485" y="19.5" size="1.27" layer="26" rot="MR90" align="bottom-center"/>
-<attribute name="VALUE" x="15.515" y="19.5" size="1.27" layer="28" rot="MR90" align="top-center"/>
+<element name="D5" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="18" y="24.5" smashed="yes" rot="MR180">
+<attribute name="NAME" x="18" y="22.515" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
+<attribute name="VALUE" x="18" y="26.485" size="1.27" layer="28" rot="MR180" align="top-center"/>
 </element>
 <element name="D6" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="TVS_DIODESMA" x="19" y="31" smashed="yes" rot="MR180">
 <attribute name="NAME" x="19" y="34.015" size="1.27" layer="26" rot="MR180" align="bottom-center"/>
@@ -1136,7 +1126,13 @@ design rules under a new name.</description>
 <attribute name="NAME" x="14.5" y="74.135" size="1.27" layer="25" align="bottom-center"/>
 <attribute name="VALUE" x="14.5" y="29.865" size="1.27" layer="27" align="top-center"/>
 </element>
-<element name="SG1" library="buzzer" library_urn="urn:adsk.eagle:library:113" package="F/HGP" package3d_urn="urn:adsk.eagle:package:5287/1" value="F/HGP" x="13" y="8" smashed="yes" rot="R180">
+<element name="S1" library="SparkFun-Switches" package="TACTILE_SWITCH_PTH_6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value="MOMENTARY-SWITCH-SPST-PTH-6.0MM" x="12.5" y="18.5" smashed="yes" rot="MR90">
+<attribute name="NAME" x="15.802" y="18.5" size="0.6096" layer="26" font="vector" ratio="20" rot="MR90" align="bottom-center"/>
+<attribute name="PROD_ID" value=" SWCH-08441" x="12.5" y="18.5" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="SF_SKU" value="COM-00097" x="12.5" y="18.5" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="VALUE" x="9.325" y="18.5" size="0.6096" layer="28" font="vector" ratio="20" rot="MR90" align="top-center"/>
+</element>
+<element name="SG1" library="buzzer" package="F/HGP" package3d_urn="urn:adsk.eagle:package:5287/1" value="F/HGP" x="13" y="8" smashed="yes" rot="R180">
 <attribute name="MF" value="" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MPN" value="" x="13" y="8" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="NAME" x="8.555" y="1.015" size="1.27" layer="25" ratio="10" rot="R180"/>
@@ -1151,7 +1147,6 @@ design rules under a new name.</description>
 <contactref element="Q5" pad="2"/>
 <contactref element="R1" pad="1"/>
 <contactref element="Q2" pad="2"/>
-<contactref element="S1" pad="1"/>
 <contactref element="J3" pad="2"/>
 <contactref element="Q1" pad="2"/>
 <contactref element="J5" pad="3"/>
@@ -1191,6 +1186,8 @@ design rules under a new name.</description>
 <contactref element="R5" pad="1"/>
 <contactref element="C2" pad="2"/>
 <contactref element="U1" pad="14"/>
+<contactref element="S1" pad="2"/>
+<contactref element="S1" pad="1"/>
 <contactref element="SG1" pad="1"/>
 </signal>
 <signal name="VIN">
@@ -1246,10 +1243,10 @@ design rules under a new name.</description>
 <wire x1="10.4571" y1="51.5" x2="14" y2="51.5" width="0.8128" layer="1"/>
 <via x="14" y="51.5" extent="1-16" drill="0.35"/>
 <wire x1="14" y1="51.5" x2="17" y2="48.5" width="0.8128" layer="16"/>
-<wire x1="17" y1="29.18" x2="19.32" y2="26.86" width="0.8128" layer="16"/>
+<wire x1="17" y1="29.68" x2="19.32" y2="27.36" width="0.8128" layer="16"/>
 <wire x1="17" y1="48.5" x2="17" y2="31" width="0.8128" layer="16"/>
 <contactref element="D6" pad="1"/>
-<wire x1="17" y1="31" x2="17" y2="29.18" width="0.8128" layer="16"/>
+<wire x1="17" y1="31" x2="17" y2="29.68" width="0.8128" layer="16"/>
 <wire x1="16.9" y1="31" x2="17" y2="31" width="0.8128" layer="16"/>
 <contactref element="J5" pad="2"/>
 <wire x1="2.54" y1="63.23" x2="3.31" y2="63.23" width="0.8128" layer="16"/>
@@ -1266,13 +1263,13 @@ design rules under a new name.</description>
 <via x="9.66" y="61.92" extent="1-16" drill="0.35"/>
 <contactref element="D4" pad="2"/>
 <contactref element="J5" pad="1"/>
-<wire x1="2.54" y1="60.69" x2="6.5" y2="60.69" width="0.8128" layer="16"/>
-<wire x1="6.5" y1="60.69" x2="8" y2="60.69" width="0.8128" layer="16"/>
+<wire x1="2.54" y1="60.69" x2="5.5" y2="60.69" width="0.8128" layer="16"/>
+<wire x1="5.5" y1="60.69" x2="8" y2="60.69" width="0.8128" layer="16"/>
 <wire x1="8" y1="60.69" x2="8.43" y2="60.69" width="0.8128" layer="16"/>
 <wire x1="8.43" y1="60.69" x2="9.66" y2="61.92" width="0.8128" layer="16"/>
-<wire x1="6.5" y1="59.1" x2="6.5" y2="60.69" width="0.8128" layer="16"/>
-<wire x1="8" y1="60.69" x2="8.9846" y2="59.7054" width="0.8128" layer="16"/>
-<wire x1="8.9846" y1="59.7054" x2="9.43" y2="59.7054" width="0.8128" layer="16"/>
+<wire x1="5.5" y1="60.1" x2="5.5" y2="60.69" width="0.8128" layer="16"/>
+<wire x1="8" y1="60.69" x2="8.43" y2="60.26" width="0.8128" layer="16"/>
+<wire x1="8.43" y1="60.26" x2="8.43" y2="59.7054" width="0.8128" layer="16"/>
 <contactref element="U1" pad="4"/>
 <wire x1="6.55" y1="62.16" x2="9.42" y2="62.16" width="0.8128" layer="1"/>
 <wire x1="9.42" y1="62.16" x2="9.66" y2="61.92" width="0.8128" layer="1"/>
@@ -1303,28 +1300,28 @@ design rules under a new name.</description>
 </signal>
 <signal name="ST">
 <contactref element="J1" pad="1"/>
-<wire x1="21.86" y1="26.86" x2="21.86" y2="27.86" width="0.8128" layer="1"/>
+<wire x1="21.86" y1="27.36" x2="21.86" y2="27.86" width="0.8128" layer="1"/>
 <wire x1="21.86" y1="27.86" x2="20.05" y2="29.67" width="0.8128" layer="1"/>
 <wire x1="20.05" y1="29.67" x2="20.05" y2="43.6" width="0.8128" layer="1"/>
 <contactref element="J2" pad="4"/>
 <contactref element="D5" pad="2"/>
 <wire x1="21.86" y1="16.7" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="20.5" x2="21.3" y2="16.7" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="21.6" x2="17.5" y2="20.5" width="0.8128" layer="16"/>
 <contactref element="R3" pad="1"/>
 <contactref element="U1" pad="20"/>
 <wire x1="20.83" y1="44.38" x2="20.05" y2="43.6" width="0.8128" layer="1"/>
 <wire x1="22.45" y1="44.38" x2="20.83" y2="44.38" width="0.8128" layer="1"/>
-<wire x1="18.422" y1="24" x2="17.5" y2="23.078" width="0.8128" layer="16"/>
-<wire x1="17.5" y1="23.078" x2="17.5" y2="21.6" width="0.8128" layer="16"/>
-<wire x1="18.422" y1="24" x2="20" y2="24" width="0.8128" layer="16"/>
-<wire x1="20" y1="24" x2="21.86" y2="25.86" width="0.8128" layer="16"/>
-<wire x1="21.86" y1="25.86" x2="21.86" y2="26.86" width="0.8128" layer="16"/>
+<wire x1="20.1" y1="24.5" x2="21" y2="24.5" width="0.8128" layer="16"/>
+<wire x1="21" y1="24.5" x2="21.86" y2="25.36" width="0.8128" layer="16"/>
+<wire x1="21.86" y1="25.36" x2="21.86" y2="27.36" width="0.8128" layer="16"/>
+<wire x1="20.1" y1="24.5" x2="19.422" y2="23.822" width="0.8128" layer="16"/>
+<wire x1="19.422" y1="23.822" x2="19.422" y2="17.5" width="0.8128" layer="16"/>
+<wire x1="21.86" y1="16.7" x2="20.222" y2="16.7" width="0.8128" layer="16"/>
+<wire x1="20.222" y1="16.7" x2="19.422" y2="17.5" width="0.8128" layer="16"/>
 </signal>
 <signal name="BTN">
 <contactref element="D3" pad="2"/>
-<wire x1="12.7" y1="33.1048" x2="12.7" y2="53.6948" width="0.8128" layer="16"/>
-<wire x1="12.7" y1="33.1048" x2="13.97" y2="31.8348" width="0.8128" layer="16"/>
+<wire x1="12.7" y1="33.6048" x2="12.7" y2="53.6948" width="0.8128" layer="16"/>
+<wire x1="12.7" y1="33.6048" x2="13.47" y2="32.8348" width="0.8128" layer="16"/>
 <contactref element="U1" pad="25"/>
 <wire x1="22.45" y1="57.08" x2="20.58" y2="57.08" width="0.8128" layer="1"/>
 <wire x1="16.0852" y1="57.08" x2="20.58" y2="57.08" width="0.8128" layer="16"/>
@@ -1443,22 +1440,25 @@ design rules under a new name.</description>
 <wire x1="5.25" y1="15.43" x2="5.25" y2="13.99" width="0.8128" layer="16"/>
 <wire x1="6.502" y1="12.738" x2="6.502" y2="11.62" width="0.8128" layer="16"/>
 <wire x1="5.25" y1="13.99" x2="6.502" y2="12.738" width="0.8128" layer="16"/>
-<wire x1="4.9152" y1="25.82" x2="5.25" y2="25.4852" width="0.8128" layer="16"/>
-<wire x1="5.25" y1="25.4852" x2="5.25" y2="15.43" width="0.8128" layer="16"/>
+<wire x1="4.9152" y1="24.82" x2="5.25" y2="24.4852" width="0.8128" layer="16"/>
+<wire x1="5.25" y1="24.4852" x2="5.25" y2="15.43" width="0.8128" layer="16"/>
 </signal>
 <signal name="N$5">
 <contactref element="D3" pad="1"/>
 <contactref element="D2" pad="1"/>
-<contactref element="S1" pad="3"/>
-<wire x1="10.3248" y1="25.82" x2="10.3248" y2="21.3358" width="0.8128" layer="16"/>
-<wire x1="10.3248" y1="21.3358" x2="10.4394" y2="21.2212" width="0.8128" layer="16"/>
-<wire x1="13.97" y1="26.4252" x2="10.93" y2="26.4252" width="0.8128" layer="16"/>
-<wire x1="10.93" y1="26.4252" x2="10.3248" y2="25.82" width="0.8128" layer="16"/>
+<wire x1="13.47" y1="27.4252" x2="12.93" y2="27.4252" width="0.8128" layer="16"/>
+<wire x1="12.93" y1="27.4252" x2="10.3248" y2="24.82" width="0.8128" layer="16"/>
 <contactref element="D8" pad="2"/>
-<wire x1="10.4394" y1="21.2212" x2="12.5" y2="19.1606" width="0.8128" layer="16"/>
-<wire x1="12.5" y1="19.1606" x2="12.5" y2="12" width="0.8128" layer="16"/>
 <wire x1="12.5" y1="12" x2="13" y2="11.5" width="0.8128" layer="16"/>
 <wire x1="13" y1="11.5" x2="14.1" y2="11.5" width="0.8128" layer="16"/>
+<contactref element="S1" pad="3"/>
+<contactref element="S1" pad="4"/>
+<wire x1="10.3248" y1="24.82" x2="10.3248" y2="21.8366" width="0.8128" layer="16"/>
+<wire x1="10.3248" y1="21.8366" x2="10.2394" y2="21.7512" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="21.7512" x2="10.2394" y2="15.2488" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="15.2488" x2="10.4882" y2="15" width="0.8128" layer="16"/>
+<wire x1="10.2394" y1="15.2488" x2="12.5" y2="12.9882" width="0.8128" layer="16"/>
+<wire x1="12.5" y1="12.9882" x2="12.5" y2="12" width="0.8128" layer="16"/>
 </signal>
 <signal name="SPOUT">
 <contactref element="J7" pad="6"/>
@@ -1473,22 +1473,21 @@ design rules under a new name.</description>
 <contactref element="J2" pad="1"/>
 <wire x1="12.3016" y1="14.1984" x2="14" y2="12.5" width="0.8128" layer="1"/>
 <wire x1="18.46946875" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="1"/>
-<wire x1="21.0146" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="16"/>
-<wire x1="17.62" y1="12.4746" x2="21.0146" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="20.5146" y1="9.08" x2="21.86" y2="9.08" width="0.8128" layer="16"/>
+<wire x1="19.12" y1="10.4746" x2="20.5146" y2="9.08" width="0.8128" layer="16"/>
 <wire x1="15.04946875" y1="12.5" x2="18.46946875" y2="9.08" width="0.8128" layer="1"/>
 <wire x1="14" y1="12.5" x2="15.04946875" y2="12.5" width="0.8128" layer="1"/>
 </signal>
 <signal name="SPK">
 <wire x1="2.54" y1="37.02" x2="2.54" y2="16.7" width="0.8128" layer="1"/>
-<wire x1="2.54" y1="16.7" x2="9.12" y2="10.12" width="0.8128" layer="1"/>
+<wire x1="2.54" y1="16.7" x2="9.19" y2="10.05" width="0.8128" layer="1"/>
 <wire x1="2.54" y1="37.02" x2="4.191" y2="38.671" width="0.8128" layer="1"/>
 <wire x1="4.191" y1="46.291" x2="4.191" y2="38.671" width="0.8128" layer="1"/>
 <contactref element="U1" pad="10"/>
 <wire x1="6.55" y1="46.92" x2="4.82" y2="46.92" width="0.8128" layer="1"/>
 <wire x1="4.82" y1="46.92" x2="4.191" y2="46.291" width="0.8128" layer="1"/>
 <contactref element="SG1" pad="2"/>
-<wire x1="9.19" y1="8" x2="9.19" y2="10.05" width="0.8128" layer="1"/>
-<wire x1="9.19" y1="10.05" x2="9.12" y2="10.12" width="0.8128" layer="1"/>
+<wire x1="9.19" y1="10.05" x2="9.19" y2="8" width="0.8128" layer="1"/>
 </signal>
 <signal name="3V3">
 <contactref element="U1" pad="2"/>

File diff suppressed because it is too large
+ 296 - 290
schematic/ECU.s#1


File diff suppressed because it is too large
+ 340 - 346
schematic/ECU.s#2


File diff suppressed because it is too large
+ 313 - 319
schematic/ECU.s#3


File diff suppressed because it is too large
+ 0 - 275
schematic/ECU.s#4


File diff suppressed because it is too large
+ 0 - 275
schematic/ECU.s#5


+ 9 - 9
schematic/ECU.s#6

@@ -8928,7 +8928,7 @@ BUZZER</description>
 <part name="J3" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_02" device="" package3d_urn="urn:adsk.eagle:package:38039/1" value="PWR"/>
 <part name="J4" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_05" device="" package3d_urn="urn:adsk.eagle:package:38104/1" value="DISPLAY"/>
 <part name="J5" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_03" device="" package3d_urn="urn:adsk.eagle:package:38063/1" value="THROTTLE"/>
-<part name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="1uF"/>
+<part name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="0.1uF"/>
 <part name="J6" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_02" device="" package3d_urn="urn:adsk.eagle:package:38039/1" value="LED"/>
 <part name="Q2" library="Transistor" library_urn="urn:adsk.eagle:library:16378713" deviceset="NMOSFET" device="SOT23" package3d_urn="urn:adsk.eagle:package:28738/2" value=""/>
 <part name="R2" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K"/>
@@ -8939,7 +8939,7 @@ BUZZER</description>
 <part name="S1" library="SparkFun-Switches" library_urn="urn:adsk.eagle:library:535" deviceset="MOMENTARY-SWITCH-SPST" device="-PTH-6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value=""/>
 <part name="Q5" library="Transistor" library_urn="urn:adsk.eagle:library:16378713" deviceset="NMOSFET" device="SOT23" package3d_urn="urn:adsk.eagle:package:28738/2"/>
 <part name="J7" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_06" device="SILK_FEMALE_PTH" package3d_urn="urn:adsk.eagle:package:38009/1" value="SPEED"/>
-<part name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="1uF"/>
+<part name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="0.1uF"/>
 <part name="Q1" library="Transistor" library_urn="urn:adsk.eagle:library:16378713" deviceset="NMOSFET" device="SOT23" package3d_urn="urn:adsk.eagle:package:28738/2"/>
 <part name="LS1" library="SparkFun-Electromechanical" library_urn="urn:adsk.eagle:library:516" deviceset="BUZZER" device="-PTH_KIT" package3d_urn="urn:adsk.eagle:package:38556/1"/>
 <part name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K"/>
@@ -8950,7 +8950,7 @@ BUZZER</description>
 <part name="D8" library="eScooter" deviceset="TVS_DIODE" device="SMA" package3d_urn="urn:adsk.eagle:package:21928182/1"/>
 <part name="R4" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K"/>
 <part name="R5" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K"/>
-<part name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="1uF"/>
+<part name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="0.1uF"/>
 <part name="GND1" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="GND2" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="U1" library="eScooter" deviceset="ARDUINO" device="ARDUINO_NANO" package3d_urn="urn:adsk.eagle:package:21849926/1" value="Arduino Nano Every"/>
@@ -8981,8 +8981,8 @@ BUZZER</description>
 <attribute name="NAME" x="-71.12" y="76.708" size="1.778" layer="95" font="vector"/>
 </instance>
 <instance part="C1" gate="G$1" x="0" y="93.98" smashed="yes">
-<attribute name="NAME" x="-5.08" y="93.98" size="1.778" layer="95"/>
-<attribute name="VALUE" x="-5.08" y="88.9" size="1.778" layer="96"/>
+<attribute name="NAME" x="2.54" y="93.98" size="1.778" layer="95"/>
+<attribute name="VALUE" x="2.54" y="88.9" size="1.778" layer="96"/>
 </instance>
 <instance part="J6" gate="G$1" x="144.78" y="88.9" smashed="yes" rot="MR0">
 <attribute name="VALUE" x="147.32" y="94.234" size="1.778" layer="96" font="vector" rot="MR0"/>
@@ -9024,8 +9024,8 @@ BUZZER</description>
 <attribute name="NAME" x="-71.12" y="50.292" size="1.778" layer="95" font="vector" rot="MR180"/>
 </instance>
 <instance part="C3" gate="G$1" x="-43.18" y="48.26" smashed="yes" rot="MR180">
-<attribute name="NAME" x="-48.26" y="53.34" size="1.778" layer="95" rot="MR180"/>
-<attribute name="VALUE" x="-48.26" y="48.26" size="1.778" layer="96" rot="MR180"/>
+<attribute name="NAME" x="-40.64" y="50.8" size="1.778" layer="95"/>
+<attribute name="VALUE" x="-40.64" y="48.26" size="1.778" layer="96" rot="MR180"/>
 </instance>
 <instance part="Q1" gate="G$1" x="121.92" y="83.82" smashed="yes">
 <attribute name="NAME" x="128.27" y="85.09" size="1.778" layer="95"/>
@@ -9507,7 +9507,7 @@ BUZZER</description>
 <net name="SPOUT" class="0">
 <segment>
 <pinref part="J7" gate="G$1" pin="6"/>
-<label x="-43.18" y="45.72" size="1.778" layer="95" rot="MR180"/>
+<label x="-33.02" y="43.18" size="1.778" layer="95" rot="MR0"/>
 <pinref part="C3" gate="G$1" pin="1"/>
 <wire x1="-43.18" y1="45.72" x2="-43.18" y2="43.18" width="0.1524" layer="91"/>
 <wire x1="-43.18" y1="43.18" x2="-53.34" y2="43.18" width="0.1524" layer="91"/>
@@ -9515,7 +9515,7 @@ BUZZER</description>
 <wire x1="-53.34" y1="53.34" x2="-60.96" y2="53.34" width="0.1524" layer="91"/>
 <junction x="-43.18" y="43.18"/>
 <label x="-60.96" y="53.34" size="1.778" layer="95"/>
-<wire x1="-43.18" y1="43.18" x2="-33.02" y2="43.18" width="0.1524" layer="91"/>
+<wire x1="-43.18" y1="43.18" x2="-30.48" y2="43.18" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="J2" gate="G$1" pin="1"/>

+ 12 - 14
schematic/ECU.s#7

@@ -8928,7 +8928,7 @@ BUZZER</description>
 <part name="J3" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_02" device="" package3d_urn="urn:adsk.eagle:package:38039/1" value="PWR"/>
 <part name="J4" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_05" device="" package3d_urn="urn:adsk.eagle:package:38104/1" value="DISPLAY"/>
 <part name="J5" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_03" device="" package3d_urn="urn:adsk.eagle:package:38063/1" value="THROTTLE"/>
-<part name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="1uF"/>
+<part name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="0.1uF"/>
 <part name="J6" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_02" device="" package3d_urn="urn:adsk.eagle:package:38039/1" value="LED"/>
 <part name="Q2" library="Transistor" library_urn="urn:adsk.eagle:library:16378713" deviceset="NMOSFET" device="SOT23" package3d_urn="urn:adsk.eagle:package:28738/2" value=""/>
 <part name="R2" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K"/>
@@ -8939,7 +8939,7 @@ BUZZER</description>
 <part name="S1" library="SparkFun-Switches" library_urn="urn:adsk.eagle:library:535" deviceset="MOMENTARY-SWITCH-SPST" device="-PTH-6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value=""/>
 <part name="Q5" library="Transistor" library_urn="urn:adsk.eagle:library:16378713" deviceset="NMOSFET" device="SOT23" package3d_urn="urn:adsk.eagle:package:28738/2"/>
 <part name="J7" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_06" device="SILK_FEMALE_PTH" package3d_urn="urn:adsk.eagle:package:38009/1" value="SPEED"/>
-<part name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="1uF"/>
+<part name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="0.1uF"/>
 <part name="Q1" library="Transistor" library_urn="urn:adsk.eagle:library:16378713" deviceset="NMOSFET" device="SOT23" package3d_urn="urn:adsk.eagle:package:28738/2"/>
 <part name="LS1" library="SparkFun-Electromechanical" library_urn="urn:adsk.eagle:library:516" deviceset="BUZZER" device="-PTH_KIT" package3d_urn="urn:adsk.eagle:package:38556/1"/>
 <part name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K"/>
@@ -8981,8 +8981,8 @@ BUZZER</description>
 <attribute name="NAME" x="-71.12" y="76.708" size="1.778" layer="95" font="vector"/>
 </instance>
 <instance part="C1" gate="G$1" x="0" y="93.98" smashed="yes">
-<attribute name="NAME" x="-5.08" y="93.98" size="1.778" layer="95"/>
-<attribute name="VALUE" x="-5.08" y="88.9" size="1.778" layer="96"/>
+<attribute name="NAME" x="2.54" y="93.98" size="1.778" layer="95"/>
+<attribute name="VALUE" x="2.54" y="88.9" size="1.778" layer="96"/>
 </instance>
 <instance part="J6" gate="G$1" x="144.78" y="88.9" smashed="yes" rot="MR0">
 <attribute name="VALUE" x="147.32" y="94.234" size="1.778" layer="96" font="vector" rot="MR0"/>
@@ -9024,8 +9024,8 @@ BUZZER</description>
 <attribute name="NAME" x="-71.12" y="50.292" size="1.778" layer="95" font="vector" rot="MR180"/>
 </instance>
 <instance part="C3" gate="G$1" x="-43.18" y="48.26" smashed="yes" rot="MR180">
-<attribute name="NAME" x="-48.26" y="53.34" size="1.778" layer="95" rot="MR180"/>
-<attribute name="VALUE" x="-48.26" y="48.26" size="1.778" layer="96" rot="MR180"/>
+<attribute name="NAME" x="-40.64" y="50.8" size="1.778" layer="95"/>
+<attribute name="VALUE" x="-40.64" y="48.26" size="1.778" layer="96" rot="MR180"/>
 </instance>
 <instance part="Q1" gate="G$1" x="121.92" y="83.82" smashed="yes">
 <attribute name="NAME" x="128.27" y="85.09" size="1.778" layer="95"/>
@@ -9045,7 +9045,6 @@ BUZZER</description>
 </instance>
 <instance part="D6" gate="D$1" x="-7.62" y="43.18" smashed="yes">
 <attribute name="NAME" x="-5.08" y="48.26" size="1.778" layer="95"/>
-<attribute name="VALUE" x="-5.08" y="35.56" size="1.778" layer="96"/>
 </instance>
 <instance part="D7" gate="D$1" x="66.04" y="-2.54" smashed="yes">
 <attribute name="NAME" x="68.58" y="2.54" size="1.778" layer="95"/>
@@ -9204,15 +9203,14 @@ BUZZER</description>
 </net>
 <net name="VIN" class="0">
 <segment>
-<wire x1="15.24" y1="45.72" x2="7.62" y2="45.72" width="0.1524" layer="91"/>
+<wire x1="15.24" y1="45.72" x2="5.08" y2="45.72" width="0.1524" layer="91"/>
 <label x="10.16" y="45.72" size="1.778" layer="95"/>
 <pinref part="U1" gate="G$1" pin="VIN"/>
-</segment>
-<segment>
 <pinref part="Q4" gate="G$1" pin="D"/>
 <wire x1="114.3" y1="20.32" x2="114.3" y2="22.86" width="0.1524" layer="91"/>
-<wire x1="114.3" y1="22.86" x2="55.88" y2="22.86" width="0.1524" layer="91"/>
-<label x="55.88" y="22.86" size="1.778" layer="95"/>
+<wire x1="114.3" y1="22.86" x2="5.08" y2="22.86" width="0.1524" layer="91"/>
+<label x="109.22" y="22.86" size="1.778" layer="95"/>
+<wire x1="5.08" y1="45.72" x2="5.08" y2="22.86" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="DIN" class="0">
@@ -9509,7 +9507,7 @@ BUZZER</description>
 <net name="SPOUT" class="0">
 <segment>
 <pinref part="J7" gate="G$1" pin="6"/>
-<label x="-43.18" y="45.72" size="1.778" layer="95" rot="MR180"/>
+<label x="-33.02" y="43.18" size="1.778" layer="95" rot="MR0"/>
 <pinref part="C3" gate="G$1" pin="1"/>
 <wire x1="-43.18" y1="45.72" x2="-43.18" y2="43.18" width="0.1524" layer="91"/>
 <wire x1="-43.18" y1="43.18" x2="-53.34" y2="43.18" width="0.1524" layer="91"/>
@@ -9517,7 +9515,7 @@ BUZZER</description>
 <wire x1="-53.34" y1="53.34" x2="-60.96" y2="53.34" width="0.1524" layer="91"/>
 <junction x="-43.18" y="43.18"/>
 <label x="-60.96" y="53.34" size="1.778" layer="95"/>
-<wire x1="-43.18" y1="43.18" x2="-33.02" y2="43.18" width="0.1524" layer="91"/>
+<wire x1="-43.18" y1="43.18" x2="-30.48" y2="43.18" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="J2" gate="G$1" pin="1"/>

+ 12 - 14
schematic/ECU.s#8

@@ -8928,7 +8928,7 @@ BUZZER</description>
 <part name="J3" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_02" device="" package3d_urn="urn:adsk.eagle:package:38039/1" value="PWR"/>
 <part name="J4" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_05" device="" package3d_urn="urn:adsk.eagle:package:38104/1" value="DISPLAY"/>
 <part name="J5" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_03" device="" package3d_urn="urn:adsk.eagle:package:38063/1" value="THROTTLE"/>
-<part name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="1uF"/>
+<part name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="0.1uF"/>
 <part name="J6" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_02" device="" package3d_urn="urn:adsk.eagle:package:38039/1" value="LED"/>
 <part name="Q2" library="Transistor" library_urn="urn:adsk.eagle:library:16378713" deviceset="NMOSFET" device="SOT23" package3d_urn="urn:adsk.eagle:package:28738/2" value=""/>
 <part name="R2" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K"/>
@@ -8942,7 +8942,7 @@ BUZZER</description>
 <part name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="1uF"/>
 <part name="Q1" library="Transistor" library_urn="urn:adsk.eagle:library:16378713" deviceset="NMOSFET" device="SOT23" package3d_urn="urn:adsk.eagle:package:28738/2"/>
 <part name="LS1" library="SparkFun-Electromechanical" library_urn="urn:adsk.eagle:library:516" deviceset="BUZZER" device="-PTH_KIT" package3d_urn="urn:adsk.eagle:package:38556/1"/>
-<part name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="100K"/>
+<part name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K"/>
 <part name="D4" library="eScooter" deviceset="TVS_DIODE" device="SMA" package3d_urn="urn:adsk.eagle:package:21928182/1"/>
 <part name="D5" library="eScooter" deviceset="TVS_DIODE" device="SMA" package3d_urn="urn:adsk.eagle:package:21928182/1"/>
 <part name="D6" library="eScooter" deviceset="TVS_DIODE" device="SMA" package3d_urn="urn:adsk.eagle:package:21928182/1"/>
@@ -8981,8 +8981,8 @@ BUZZER</description>
 <attribute name="NAME" x="-71.12" y="76.708" size="1.778" layer="95" font="vector"/>
 </instance>
 <instance part="C1" gate="G$1" x="0" y="93.98" smashed="yes">
-<attribute name="NAME" x="-5.08" y="93.98" size="1.778" layer="95"/>
-<attribute name="VALUE" x="-5.08" y="88.9" size="1.778" layer="96"/>
+<attribute name="NAME" x="2.54" y="93.98" size="1.778" layer="95"/>
+<attribute name="VALUE" x="2.54" y="88.9" size="1.778" layer="96"/>
 </instance>
 <instance part="J6" gate="G$1" x="144.78" y="88.9" smashed="yes" rot="MR0">
 <attribute name="VALUE" x="147.32" y="94.234" size="1.778" layer="96" font="vector" rot="MR0"/>
@@ -9024,8 +9024,8 @@ BUZZER</description>
 <attribute name="NAME" x="-71.12" y="50.292" size="1.778" layer="95" font="vector" rot="MR180"/>
 </instance>
 <instance part="C3" gate="G$1" x="-43.18" y="48.26" smashed="yes" rot="MR180">
-<attribute name="NAME" x="-48.26" y="53.34" size="1.778" layer="95" rot="MR180"/>
-<attribute name="VALUE" x="-48.26" y="48.26" size="1.778" layer="96" rot="MR180"/>
+<attribute name="NAME" x="-40.64" y="50.8" size="1.778" layer="95"/>
+<attribute name="VALUE" x="-40.64" y="48.26" size="1.778" layer="96" rot="MR180"/>
 </instance>
 <instance part="Q1" gate="G$1" x="121.92" y="83.82" smashed="yes">
 <attribute name="NAME" x="128.27" y="85.09" size="1.778" layer="95"/>
@@ -9045,7 +9045,6 @@ BUZZER</description>
 </instance>
 <instance part="D6" gate="D$1" x="-7.62" y="43.18" smashed="yes">
 <attribute name="NAME" x="-5.08" y="48.26" size="1.778" layer="95"/>
-<attribute name="VALUE" x="-5.08" y="35.56" size="1.778" layer="96"/>
 </instance>
 <instance part="D7" gate="D$1" x="66.04" y="-2.54" smashed="yes">
 <attribute name="NAME" x="68.58" y="2.54" size="1.778" layer="95"/>
@@ -9204,15 +9203,14 @@ BUZZER</description>
 </net>
 <net name="VIN" class="0">
 <segment>
-<wire x1="15.24" y1="45.72" x2="7.62" y2="45.72" width="0.1524" layer="91"/>
+<wire x1="15.24" y1="45.72" x2="5.08" y2="45.72" width="0.1524" layer="91"/>
 <label x="10.16" y="45.72" size="1.778" layer="95"/>
 <pinref part="U1" gate="G$1" pin="VIN"/>
-</segment>
-<segment>
 <pinref part="Q4" gate="G$1" pin="D"/>
 <wire x1="114.3" y1="20.32" x2="114.3" y2="22.86" width="0.1524" layer="91"/>
-<wire x1="114.3" y1="22.86" x2="55.88" y2="22.86" width="0.1524" layer="91"/>
-<label x="55.88" y="22.86" size="1.778" layer="95"/>
+<wire x1="114.3" y1="22.86" x2="5.08" y2="22.86" width="0.1524" layer="91"/>
+<label x="109.22" y="22.86" size="1.778" layer="95"/>
+<wire x1="5.08" y1="45.72" x2="5.08" y2="22.86" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="DIN" class="0">
@@ -9509,7 +9507,7 @@ BUZZER</description>
 <net name="SPOUT" class="0">
 <segment>
 <pinref part="J7" gate="G$1" pin="6"/>
-<label x="-43.18" y="45.72" size="1.778" layer="95" rot="MR180"/>
+<label x="-33.02" y="43.18" size="1.778" layer="95" rot="MR0"/>
 <pinref part="C3" gate="G$1" pin="1"/>
 <wire x1="-43.18" y1="45.72" x2="-43.18" y2="43.18" width="0.1524" layer="91"/>
 <wire x1="-43.18" y1="43.18" x2="-53.34" y2="43.18" width="0.1524" layer="91"/>
@@ -9517,7 +9515,7 @@ BUZZER</description>
 <wire x1="-53.34" y1="53.34" x2="-60.96" y2="53.34" width="0.1524" layer="91"/>
 <junction x="-43.18" y="43.18"/>
 <label x="-60.96" y="53.34" size="1.778" layer="95"/>
-<wire x1="-43.18" y1="43.18" x2="-33.02" y2="43.18" width="0.1524" layer="91"/>
+<wire x1="-43.18" y1="43.18" x2="-30.48" y2="43.18" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="J2" gate="G$1" pin="1"/>

+ 9 - 11
schematic/ECU.s#9

@@ -8928,7 +8928,7 @@ BUZZER</description>
 <part name="J3" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_02" device="" package3d_urn="urn:adsk.eagle:package:38039/1" value="PWR"/>
 <part name="J4" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_05" device="" package3d_urn="urn:adsk.eagle:package:38104/1" value="DISPLAY"/>
 <part name="J5" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_03" device="" package3d_urn="urn:adsk.eagle:package:38063/1" value="THROTTLE"/>
-<part name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="1uF"/>
+<part name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="0.1uF"/>
 <part name="J6" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_02" device="" package3d_urn="urn:adsk.eagle:package:38039/1" value="LED"/>
 <part name="Q2" library="Transistor" library_urn="urn:adsk.eagle:library:16378713" deviceset="NMOSFET" device="SOT23" package3d_urn="urn:adsk.eagle:package:28738/2" value=""/>
 <part name="R2" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K"/>
@@ -8942,14 +8942,14 @@ BUZZER</description>
 <part name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="1uF"/>
 <part name="Q1" library="Transistor" library_urn="urn:adsk.eagle:library:16378713" deviceset="NMOSFET" device="SOT23" package3d_urn="urn:adsk.eagle:package:28738/2"/>
 <part name="LS1" library="SparkFun-Electromechanical" library_urn="urn:adsk.eagle:library:516" deviceset="BUZZER" device="-PTH_KIT" package3d_urn="urn:adsk.eagle:package:38556/1"/>
-<part name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="100K"/>
+<part name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K"/>
 <part name="D4" library="eScooter" deviceset="TVS_DIODE" device="SMA" package3d_urn="urn:adsk.eagle:package:21928182/1"/>
 <part name="D5" library="eScooter" deviceset="TVS_DIODE" device="SMA" package3d_urn="urn:adsk.eagle:package:21928182/1"/>
 <part name="D6" library="eScooter" deviceset="TVS_DIODE" device="SMA" package3d_urn="urn:adsk.eagle:package:21928182/1"/>
 <part name="D7" library="eScooter" deviceset="TVS_DIODE" device="SMA" package3d_urn="urn:adsk.eagle:package:21928182/1"/>
 <part name="D8" library="eScooter" deviceset="TVS_DIODE" device="SMA" package3d_urn="urn:adsk.eagle:package:21928182/1"/>
 <part name="R4" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K"/>
-<part name="R5" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="100K"/>
+<part name="R5" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K"/>
 <part name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="1uF"/>
 <part name="GND1" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="GND2" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
@@ -8981,8 +8981,8 @@ BUZZER</description>
 <attribute name="NAME" x="-71.12" y="76.708" size="1.778" layer="95" font="vector"/>
 </instance>
 <instance part="C1" gate="G$1" x="0" y="93.98" smashed="yes">
-<attribute name="NAME" x="-5.08" y="93.98" size="1.778" layer="95"/>
-<attribute name="VALUE" x="-5.08" y="88.9" size="1.778" layer="96"/>
+<attribute name="NAME" x="2.54" y="93.98" size="1.778" layer="95"/>
+<attribute name="VALUE" x="2.54" y="88.9" size="1.778" layer="96"/>
 </instance>
 <instance part="J6" gate="G$1" x="144.78" y="88.9" smashed="yes" rot="MR0">
 <attribute name="VALUE" x="147.32" y="94.234" size="1.778" layer="96" font="vector" rot="MR0"/>
@@ -9045,7 +9045,6 @@ BUZZER</description>
 </instance>
 <instance part="D6" gate="D$1" x="-7.62" y="43.18" smashed="yes">
 <attribute name="NAME" x="-5.08" y="48.26" size="1.778" layer="95"/>
-<attribute name="VALUE" x="-5.08" y="35.56" size="1.778" layer="96"/>
 </instance>
 <instance part="D7" gate="D$1" x="66.04" y="-2.54" smashed="yes">
 <attribute name="NAME" x="68.58" y="2.54" size="1.778" layer="95"/>
@@ -9204,15 +9203,14 @@ BUZZER</description>
 </net>
 <net name="VIN" class="0">
 <segment>
-<wire x1="15.24" y1="45.72" x2="7.62" y2="45.72" width="0.1524" layer="91"/>
+<wire x1="15.24" y1="45.72" x2="5.08" y2="45.72" width="0.1524" layer="91"/>
 <label x="10.16" y="45.72" size="1.778" layer="95"/>
 <pinref part="U1" gate="G$1" pin="VIN"/>
-</segment>
-<segment>
 <pinref part="Q4" gate="G$1" pin="D"/>
 <wire x1="114.3" y1="20.32" x2="114.3" y2="22.86" width="0.1524" layer="91"/>
-<wire x1="114.3" y1="22.86" x2="55.88" y2="22.86" width="0.1524" layer="91"/>
-<label x="55.88" y="22.86" size="1.778" layer="95"/>
+<wire x1="114.3" y1="22.86" x2="5.08" y2="22.86" width="0.1524" layer="91"/>
+<label x="109.22" y="22.86" size="1.778" layer="95"/>
+<wire x1="5.08" y1="45.72" x2="5.08" y2="22.86" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="DIN" class="0">

+ 282 - 288
schematic/ECU.sch

@@ -7583,7 +7583,247 @@ Source: http://download.siliconexpert.com/pdfs/2005/02/24/Semi_Ap/2/VSH/Resistor
 </deviceset>
 </devicesets>
 </library>
-<library name="SparkFun-Switches" urn="urn:adsk.eagle:library:535">
+<library name="eScooter">
+<packages>
+<package name="DIOM5027X220N" urn="urn:adsk.eagle:footprint:21928331/1">
+<description>Molded Body, 5.00 X 2.70 X 2.20 mm body
+&lt;p&gt;Molded Body package with body size 5.00 X 2.70 X 2.20 mm&lt;/p&gt;</description>
+<wire x1="2.5" y1="1.35" x2="-3.3699" y2="1.35" width="0.12" layer="21"/>
+<wire x1="-3.3699" y1="1.35" x2="-3.3699" y2="-1.35" width="0.12" layer="21"/>
+<wire x1="-3.3699" y1="-1.35" x2="2.5" y2="-1.35" width="0.12" layer="21"/>
+<wire x1="2.5" y1="-1.35" x2="-2.5" y2="-1.35" width="0.12" layer="51"/>
+<wire x1="-2.5" y1="-1.35" x2="-2.5" y2="1.35" width="0.12" layer="51"/>
+<wire x1="-2.5" y1="1.35" x2="2.5" y2="1.35" width="0.12" layer="51"/>
+<wire x1="2.5" y1="1.35" x2="2.5" y2="-1.35" width="0.12" layer="51"/>
+<smd name="1" x="-2.1" y="0" dx="1.9118" dy="1.5118" layer="1"/>
+<smd name="2" x="2.1" y="0" dx="1.9118" dy="1.5118" layer="1"/>
+<text x="0" y="1.985" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-1.985" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
+</package>
+<package name="SON254P1750X4300X120-30M" urn="urn:adsk.eagle:footprint:21849939/1">
+<description>30-SON (DFN), 2.54 mm pitch, 43.00 X 17.50 X 1.20 mm body
+&lt;p&gt;30-pin SON (DFN) package with 2.54 mm pitch with body size 43.00 X 17.50 X 1.20 mm&lt;/p&gt;</description>
+<circle x="-9.254" y="18.9349" radius="0.25" width="0" layer="21"/>
+<wire x1="-8.75" y1="18.6849" x2="-8.75" y2="21.5" width="0.12" layer="21"/>
+<wire x1="-8.75" y1="21.5" x2="8.75" y2="21.5" width="0.12" layer="21"/>
+<wire x1="8.75" y1="21.5" x2="8.75" y2="18.6849" width="0.12" layer="21"/>
+<wire x1="-8.75" y1="-18.6849" x2="-8.75" y2="-21.5" width="0.12" layer="21"/>
+<wire x1="-8.75" y1="-21.5" x2="8.75" y2="-21.5" width="0.12" layer="21"/>
+<wire x1="8.75" y1="-21.5" x2="8.75" y2="-18.6849" width="0.12" layer="21"/>
+<wire x1="8.75" y1="-21.5" x2="-8.75" y2="-21.5" width="0.12" layer="51"/>
+<wire x1="-8.75" y1="-21.5" x2="-8.75" y2="21.5" width="0.12" layer="51"/>
+<wire x1="-8.75" y1="21.5" x2="8.75" y2="21.5" width="0.12" layer="51"/>
+<wire x1="8.75" y1="21.5" x2="8.75" y2="-21.5" width="0.12" layer="51"/>
+<smd name="1" x="-7.95" y="17.78" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="2" x="-7.95" y="15.24" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="3" x="-7.95" y="12.7" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="4" x="-7.95" y="10.16" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="5" x="-7.95" y="7.62" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="6" x="-7.95" y="5.08" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="7" x="-7.95" y="2.54" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="8" x="-7.95" y="0" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="9" x="-7.95" y="-2.54" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="10" x="-7.95" y="-5.08" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="11" x="-7.95" y="-7.62" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="12" x="-7.95" y="-10.16" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="13" x="-7.95" y="-12.7" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="14" x="-7.95" y="-15.24" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="15" x="-7.95" y="-17.78" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="16" x="7.95" y="-17.78" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="17" x="7.95" y="-15.24" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="18" x="7.95" y="-12.7" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="19" x="7.95" y="-10.16" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="20" x="7.95" y="-7.62" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="21" x="7.95" y="-5.08" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="22" x="7.95" y="-2.54" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="23" x="7.95" y="0" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="24" x="7.95" y="2.54" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="25" x="7.95" y="5.08" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="26" x="7.95" y="7.62" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="27" x="7.95" y="10.16" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="28" x="7.95" y="12.7" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="29" x="7.95" y="15.24" dx="2.5118" dy="1.3018" layer="1"/>
+<smd name="30" x="7.95" y="17.78" dx="2.5118" dy="1.3018" layer="1"/>
+<text x="0" y="22.135" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-22.135" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
+</package>
+</packages>
+<packages3d>
+<package3d name="DIOM5027X220N" urn="urn:adsk.eagle:package:21928182/1" type="model">
+<description>Molded Body, 5.00 X 2.70 X 2.20 mm body
+&lt;p&gt;Molded Body package with body size 5.00 X 2.70 X 2.20 mm&lt;/p&gt;</description>
+<packageinstances>
+<packageinstance name="DIOM5027X220N"/>
+</packageinstances>
+</package3d>
+<package3d name="SON254P1750X4300X120-30M" urn="urn:adsk.eagle:package:21849926/1" type="model">
+<description>30-SON (DFN), 2.54 mm pitch, 43.00 X 17.50 X 1.20 mm body
+&lt;p&gt;30-pin SON (DFN) package with 2.54 mm pitch with body size 43.00 X 17.50 X 1.20 mm&lt;/p&gt;</description>
+<packageinstances>
+<packageinstance name="SON254P1750X4300X120-30M"/>
+</packageinstances>
+</package3d>
+</packages3d>
+<symbols>
+<symbol name="TVS_DIODE">
+<wire x1="0" y1="0" x2="-2.54" y2="2.54" width="0.254" layer="94"/>
+<wire x1="2.54" y1="2.54" x2="0" y2="0" width="0.254" layer="94"/>
+<wire x1="-5.08" y1="-2.54" x2="-2.54" y2="0" width="0.254" layer="94"/>
+<wire x1="-2.54" y1="0" x2="2.54" y2="0" width="0.254" layer="94"/>
+<wire x1="2.54" y1="0" x2="5.08" y2="2.54" width="0.254" layer="94"/>
+<wire x1="0" y1="0" x2="-2.54" y2="-2.54" width="0.254" layer="94"/>
+<wire x1="2.54" y1="-2.54" x2="0" y2="0" width="0.254" layer="94"/>
+<wire x1="-2.54" y1="2.54" x2="2.54" y2="2.54" width="0.254" layer="94"/>
+<wire x1="-2.54" y1="-2.54" x2="2.54" y2="-2.54" width="0.254" layer="94"/>
+<pin name="P$1" x="0" y="7.62" visible="off" length="middle" rot="R270"/>
+<pin name="P$2" x="0" y="-7.62" visible="off" length="middle" rot="R90"/>
+<text x="2.54" y="5.08" size="1.778" layer="95">&gt;NAME</text>
+<text x="2.54" y="-7.62" size="1.778" layer="96">&gt;VALUE</text>
+</symbol>
+<symbol name="ARDUINO">
+<wire x1="-10.16" y1="20.32" x2="-10.16" y2="-20.32" width="0.254" layer="94"/>
+<wire x1="-10.16" y1="-20.32" x2="10.16" y2="-20.32" width="0.254" layer="94"/>
+<wire x1="10.16" y1="-20.32" x2="10.16" y2="20.32" width="0.254" layer="94"/>
+<wire x1="10.16" y1="20.32" x2="-10.16" y2="20.32" width="0.254" layer="94"/>
+<pin name="D13" x="-15.24" y="17.78" length="middle"/>
+<pin name="3V3" x="-15.24" y="15.24" length="middle" direction="pwr"/>
+<pin name="REF" x="-15.24" y="12.7" length="middle"/>
+<pin name="A0" x="-15.24" y="10.16" length="middle"/>
+<pin name="A1" x="-15.24" y="7.62" length="middle"/>
+<pin name="A2" x="-15.24" y="5.08" length="middle"/>
+<pin name="A3" x="-15.24" y="2.54" length="middle"/>
+<pin name="A4" x="-15.24" y="0" length="middle"/>
+<pin name="A5" x="-15.24" y="-2.54" length="middle"/>
+<pin name="A6" x="-15.24" y="-5.08" length="middle"/>
+<pin name="A7" x="-15.24" y="-7.62" length="middle"/>
+<pin name="5V" x="-15.24" y="-10.16" length="middle" direction="pwr"/>
+<pin name="RST" x="-15.24" y="-12.7" length="middle" direction="in"/>
+<pin name="GND" x="-15.24" y="-15.24" length="middle" direction="pwr"/>
+<pin name="VIN" x="-15.24" y="-17.78" length="middle" direction="pwr"/>
+<pin name="TX1" x="15.24" y="-17.78" length="middle" direction="out" rot="R180"/>
+<pin name="RX0" x="15.24" y="-15.24" length="middle" direction="in" rot="R180"/>
+<pin name="RST2" x="15.24" y="-12.7" length="middle" direction="in" rot="R180"/>
+<pin name="GND2" x="15.24" y="-10.16" length="middle" direction="pwr" rot="R180"/>
+<pin name="D2" x="15.24" y="-7.62" length="middle" rot="R180"/>
+<pin name="D3" x="15.24" y="-5.08" length="middle" rot="R180"/>
+<pin name="D4" x="15.24" y="-2.54" length="middle" rot="R180"/>
+<pin name="D5" x="15.24" y="0" length="middle" rot="R180"/>
+<pin name="D6" x="15.24" y="2.54" length="middle" rot="R180"/>
+<pin name="D7" x="15.24" y="5.08" length="middle" rot="R180"/>
+<pin name="D8" x="15.24" y="7.62" length="middle" rot="R180"/>
+<pin name="D9" x="15.24" y="10.16" length="middle" rot="R180"/>
+<pin name="D10" x="15.24" y="12.7" length="middle" rot="R180"/>
+<pin name="D11" x="15.24" y="15.24" length="middle" rot="R180"/>
+<pin name="D12" x="15.24" y="17.78" length="middle" rot="R180"/>
+<text x="-5.08" y="22.86" size="1.778" layer="95">&gt;NAME</text>
+<text x="-5.08" y="-25.4" size="1.778" layer="96">&gt;VALUE</text>
+</symbol>
+</symbols>
+<devicesets>
+<deviceset name="TVS_DIODE">
+<description>TVS protective diode</description>
+<gates>
+<gate name="D$1" symbol="TVS_DIODE" x="0" y="0"/>
+</gates>
+<devices>
+<device name="SMA" package="DIOM5027X220N">
+<connects>
+<connect gate="D$1" pin="P$1" pad="1"/>
+<connect gate="D$1" pin="P$2" pad="2"/>
+</connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:21928182/1"/>
+</package3dinstances>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
+<deviceset name="ARDUINO">
+<description>Ardino nano</description>
+<gates>
+<gate name="G$1" symbol="ARDUINO" x="0" y="0"/>
+</gates>
+<devices>
+<device name="ARDUINO_NANO" package="SON254P1750X4300X120-30M">
+<connects>
+<connect gate="G$1" pin="3V3" pad="2"/>
+<connect gate="G$1" pin="5V" pad="12"/>
+<connect gate="G$1" pin="A0" pad="4"/>
+<connect gate="G$1" pin="A1" pad="5"/>
+<connect gate="G$1" pin="A2" pad="6"/>
+<connect gate="G$1" pin="A3" pad="7"/>
+<connect gate="G$1" pin="A4" pad="8"/>
+<connect gate="G$1" pin="A5" pad="9"/>
+<connect gate="G$1" pin="A6" pad="10"/>
+<connect gate="G$1" pin="A7" pad="11"/>
+<connect gate="G$1" pin="D10" pad="28"/>
+<connect gate="G$1" pin="D11" pad="29"/>
+<connect gate="G$1" pin="D12" pad="30"/>
+<connect gate="G$1" pin="D13" pad="1"/>
+<connect gate="G$1" pin="D2" pad="20"/>
+<connect gate="G$1" pin="D3" pad="21"/>
+<connect gate="G$1" pin="D4" pad="22"/>
+<connect gate="G$1" pin="D5" pad="23"/>
+<connect gate="G$1" pin="D6" pad="24"/>
+<connect gate="G$1" pin="D7" pad="25"/>
+<connect gate="G$1" pin="D8" pad="26"/>
+<connect gate="G$1" pin="D9" pad="27"/>
+<connect gate="G$1" pin="GND" pad="14"/>
+<connect gate="G$1" pin="GND2" pad="19"/>
+<connect gate="G$1" pin="REF" pad="3"/>
+<connect gate="G$1" pin="RST" pad="13"/>
+<connect gate="G$1" pin="RST2" pad="18"/>
+<connect gate="G$1" pin="RX0" pad="17"/>
+<connect gate="G$1" pin="TX1" pad="16"/>
+<connect gate="G$1" pin="VIN" pad="15"/>
+</connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:21849926/1"/>
+</package3dinstances>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
+</devicesets>
+</library>
+<library name="supply1" urn="urn:adsk.eagle:library:371">
+<description>&lt;b&gt;Supply Symbols&lt;/b&gt;&lt;p&gt;
+ GND, VCC, 0V, +5V, -5V, etc.&lt;p&gt;
+ Please keep in mind, that these devices are necessary for the
+ automatic wiring of the supply signals.&lt;p&gt;
+ The pin name defined in the symbol is identical to the net which is to be wired automatically.&lt;p&gt;
+ In this library the device names are the same as the pin names of the symbols, therefore the correct signal names appear next to the supply symbols in the schematic.&lt;p&gt;
+ &lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
+<packages>
+</packages>
+<symbols>
+<symbol name="GND" urn="urn:adsk.eagle:symbol:26925/1" library_version="1">
+<wire x1="-1.905" y1="0" x2="1.905" y2="0" width="0.254" layer="94"/>
+<text x="-2.54" y="-2.54" size="1.778" layer="96">&gt;VALUE</text>
+<pin name="GND" x="0" y="2.54" visible="off" length="short" direction="sup" rot="R270"/>
+</symbol>
+</symbols>
+<devicesets>
+<deviceset name="GND" urn="urn:adsk.eagle:component:26954/1" prefix="GND" library_version="1">
+<description>&lt;b&gt;SUPPLY SYMBOL&lt;/b&gt;</description>
+<gates>
+<gate name="1" symbol="GND" x="0" y="0"/>
+</gates>
+<devices>
+<device name="">
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
+</devicesets>
+</library>
+<library name="SparkFun-Switches">
 <description>&lt;h3&gt;SparkFun Switches, Buttons, Encoders&lt;/h3&gt;
 In this library you'll find switches, buttons, joysticks, and anything that moves to create or disrupt an electrical connection.
 &lt;br&gt;
@@ -7598,7 +7838,7 @@ We've spent an enormous amount of time creating and checking these footprints an
 &lt;br&gt;
 You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
 <packages>
-<package name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:footprint:40103/1" library_version="1">
+<package name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:footprint:40103/1">
 <description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square&lt;/h3&gt;
 &lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
 &lt;p&gt;&lt;a href="https://www.omron.com/ecb/products/pdf/en-b3f.pdf"&gt;Datasheet&lt;/a&gt; (B3F-1000)&lt;/p&gt;</description>
@@ -7629,7 +7869,7 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <text x="0" y="3.302" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
 <text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
 </package>
-<package name="TACTILE_SWITCH_SMD_4.5MM" urn="urn:adsk.eagle:footprint:40104/1" library_version="1">
+<package name="TACTILE_SWITCH_SMD_4.5MM" urn="urn:adsk.eagle:footprint:40104/1">
 <description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - SMD, 4.5mm Square&lt;/h3&gt;
 &lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://spec_sheets.e-switch.com/specs/P010338.pdf"&gt;Dimensional Drawing&lt;/a&gt;&lt;/p&gt;</description>
@@ -7656,7 +7896,7 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <text x="0" y="2.413" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
 <text x="0" y="-2.413" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
 </package>
-<package name="TACTILE_SWITCH_PTH_12MM" urn="urn:adsk.eagle:footprint:40105/1" library_version="1">
+<package name="TACTILE_SWITCH_PTH_12MM" urn="urn:adsk.eagle:footprint:40105/1">
 <description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 12mm Square&lt;/h3&gt;
 &lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
 &lt;p&gt;&lt;a href="https://www.omron.com/ecb/products/pdf/en-b3f.pdf"&gt;Datasheet&lt;/a&gt; (B3F-5050)&lt;/p&gt;</description>
@@ -7687,7 +7927,7 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <text x="0" y="6.223" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
 <text x="0" y="-6.223" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
 </package>
-<package name="TACTILE_SWITCH_SMD_6.0X3.5MM" urn="urn:adsk.eagle:footprint:40106/1" library_version="1">
+<package name="TACTILE_SWITCH_SMD_6.0X3.5MM" urn="urn:adsk.eagle:footprint:40106/1">
 <description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - SMD, 6.0 x 3.5 mm&lt;/h3&gt;
 &lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
 &lt;p&gt;&lt;a href="https://www.sparkfun.com/datasheets/Components/1101.pdf"&gt;Datasheet&lt;/a&gt;&lt;/p&gt;</description>
@@ -7715,7 +7955,7 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <text x="0" y="1.905" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
 <text x="0" y="-1.905" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
 </package>
-<package name="TACTILE_SWITCH_SMD_6.2MM_TALL" urn="urn:adsk.eagle:footprint:40107/1" library_version="1">
+<package name="TACTILE_SWITCH_SMD_6.2MM_TALL" urn="urn:adsk.eagle:footprint:40107/1">
 <description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - SMD, 6.2mm Square&lt;/h3&gt;
 &lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://www.apem.com/files/apem/brochures/ADTS6-ADTSM-KTSC6.pdf"&gt;Datasheet&lt;/a&gt; (ADTSM63NVTR)&lt;/p&gt;</description>
@@ -7731,7 +7971,7 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <text x="0" y="3.175" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
 <text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
 </package>
-<package name="TACTILE_SWITCH_PTH_RIGHT_ANGLE_KIT" urn="urn:adsk.eagle:footprint:40108/1" library_version="1">
+<package name="TACTILE_SWITCH_PTH_RIGHT_ANGLE_KIT" urn="urn:adsk.eagle:footprint:40108/1">
 <description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, Right-angle&lt;/h3&gt;
 &lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://cdn.sparkfun.com/datasheets/Components/Switches/SW016.JPG"&gt;Dimensional Drawing&lt;/a&gt;&lt;/p&gt;</description>
@@ -7767,7 +8007,7 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <text x="0" y="2.286" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
 <text x="0" y="-2.286" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
 </package>
-<package name="TACTILE_SWITCH_SMD_12MM" urn="urn:adsk.eagle:footprint:40109/1" library_version="1">
+<package name="TACTILE_SWITCH_SMD_12MM" urn="urn:adsk.eagle:footprint:40109/1">
 <description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - SMD, 12mm Square&lt;/h3&gt;
 &lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
 &lt;p&gt;&lt;a href="https://cdn.sparkfun.com/datasheets/Components/Switches/N301102.pdf"&gt;Datasheet&lt;/a&gt;&lt;/p&gt;</description>
@@ -7798,7 +8038,7 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <text x="0" y="6.223" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
 <text x="0" y="-6.223" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
 </package>
-<package name="TACTILE_SWITCH_PTH_6.0MM_KIT" urn="urn:adsk.eagle:footprint:40110/1" library_version="1">
+<package name="TACTILE_SWITCH_PTH_6.0MM_KIT" urn="urn:adsk.eagle:footprint:40110/1">
 <description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square&lt;/h3&gt;
 &lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
 &lt;p&gt;&lt;b&gt;Warning:&lt;/b&gt; This is the KIT version of this package. This package has a smaller diameter top stop mask, which doesn't cover the diameter of the pad. This means only the bottom side of the pads' copper will be exposed. You'll only be able to solder to the bottom side.&lt;/p&gt;
@@ -7910,7 +8150,7 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <text x="0" y="3.175" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
 <text x="0" y="-3.175" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
 </package>
-<package name="TACTILE_SWITCH_SMD_5.2MM" urn="urn:adsk.eagle:footprint:40111/1" library_version="1">
+<package name="TACTILE_SWITCH_SMD_5.2MM" urn="urn:adsk.eagle:footprint:40111/1">
 <description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - SMD, 5.2mm Square&lt;/h3&gt;
 &lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
 &lt;p&gt;&lt;a href="https://www.sparkfun.com/datasheets/Components/Buttons/SMD-Button.pdf"&gt;Dimensional Drawing&lt;/a&gt;&lt;/p&gt;</description>
@@ -7933,7 +8173,7 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <text x="0" y="2.667" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
 <text x="0" y="-2.667" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
 </package>
-<package name="TACTILE_SWITCH_SMD_RIGHT_ANGLE" urn="urn:adsk.eagle:footprint:40112/1" library_version="1">
+<package name="TACTILE_SWITCH_SMD_RIGHT_ANGLE" urn="urn:adsk.eagle:footprint:40112/1">
 <description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - SMD, Right-angle&lt;/h3&gt;
 &lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;</description>
 <hole x="0" y="0.9" drill="0.7"/>
@@ -7954,7 +8194,7 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <text x="0" y="1.651" size="0.6096" layer="25" font="vector" ratio="20" align="bottom-center">&gt;Name</text>
 <text x="0" y="-2.286" size="0.6096" layer="27" font="vector" ratio="20" align="top-center">&gt;Value</text>
 </package>
-<package name="TACTILE_SWITCH_SMD_4.6X2.8MM" urn="urn:adsk.eagle:footprint:40113/1" library_version="1">
+<package name="TACTILE_SWITCH_SMD_4.6X2.8MM" urn="urn:adsk.eagle:footprint:40113/1">
 <description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST - SMD, 4.6 x 2.8mm&lt;/h3&gt;
 &lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://www.ck-components.com/media/1479/kmr2.pdf"&gt;Datasheet&lt;/a&gt;&lt;/p&gt;</description>
@@ -7980,7 +8220,7 @@ You are welcome to use this library for commercial purposes. For attribution, we
 </package>
 </packages>
 <packages3d>
-<package3d name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:package:40163/1" type="box" library_version="1">
+<package3d name="TACTILE_SWITCH_PTH_6.0MM" urn="urn:adsk.eagle:package:40163/1" type="box">
 <description>Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square
 Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
 Datasheet (B3F-1000)</description>
@@ -7988,7 +8228,7 @@ Datasheet (B3F-1000)</description>
 <packageinstance name="TACTILE_SWITCH_PTH_6.0MM"/>
 </packageinstances>
 </package3d>
-<package3d name="TACTILE_SWITCH_SMD_4.5MM" urn="urn:adsk.eagle:package:40162/1" type="box" library_version="1">
+<package3d name="TACTILE_SWITCH_SMD_4.5MM" urn="urn:adsk.eagle:package:40162/1" type="box">
 <description>Momentary Switch (Pushbutton) - SPST - SMD, 4.5mm Square
 Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
 Dimensional Drawing</description>
@@ -7996,7 +8236,7 @@ Dimensional Drawing</description>
 <packageinstance name="TACTILE_SWITCH_SMD_4.5MM"/>
 </packageinstances>
 </package3d>
-<package3d name="TACTILE_SWITCH_PTH_12MM" urn="urn:adsk.eagle:package:40164/1" type="box" library_version="1">
+<package3d name="TACTILE_SWITCH_PTH_12MM" urn="urn:adsk.eagle:package:40164/1" type="box">
 <description>Momentary Switch (Pushbutton) - SPST - PTH, 12mm Square
 Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
 Datasheet (B3F-5050)</description>
@@ -8004,7 +8244,7 @@ Datasheet (B3F-5050)</description>
 <packageinstance name="TACTILE_SWITCH_PTH_12MM"/>
 </packageinstances>
 </package3d>
-<package3d name="TACTILE_SWITCH_SMD_6.0X3.5MM" urn="urn:adsk.eagle:package:40165/1" type="box" library_version="1">
+<package3d name="TACTILE_SWITCH_SMD_6.0X3.5MM" urn="urn:adsk.eagle:package:40165/1" type="box">
 <description>Momentary Switch (Pushbutton) - SPST - SMD, 6.0 x 3.5 mm
 Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
 Datasheet</description>
@@ -8012,7 +8252,7 @@ Datasheet</description>
 <packageinstance name="TACTILE_SWITCH_SMD_6.0X3.5MM"/>
 </packageinstances>
 </package3d>
-<package3d name="TACTILE_SWITCH_SMD_6.2MM_TALL" urn="urn:adsk.eagle:package:40172/1" type="box" library_version="1">
+<package3d name="TACTILE_SWITCH_SMD_6.2MM_TALL" urn="urn:adsk.eagle:package:40172/1" type="box">
 <description>Momentary Switch (Pushbutton) - SPST - SMD, 6.2mm Square
 Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
 Datasheet (ADTSM63NVTR)</description>
@@ -8020,7 +8260,7 @@ Datasheet (ADTSM63NVTR)</description>
 <packageinstance name="TACTILE_SWITCH_SMD_6.2MM_TALL"/>
 </packageinstances>
 </package3d>
-<package3d name="TACTILE_SWITCH_PTH_RIGHT_ANGLE_KIT" urn="urn:adsk.eagle:package:40168/1" type="box" library_version="1">
+<package3d name="TACTILE_SWITCH_PTH_RIGHT_ANGLE_KIT" urn="urn:adsk.eagle:package:40168/1" type="box">
 <description>Momentary Switch (Pushbutton) - SPST - PTH, Right-angle
 Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
 Dimensional Drawing</description>
@@ -8028,7 +8268,7 @@ Dimensional Drawing</description>
 <packageinstance name="TACTILE_SWITCH_PTH_RIGHT_ANGLE_KIT"/>
 </packageinstances>
 </package3d>
-<package3d name="TACTILE_SWITCH_SMD_12MM" urn="urn:adsk.eagle:package:40166/1" type="box" library_version="1">
+<package3d name="TACTILE_SWITCH_SMD_12MM" urn="urn:adsk.eagle:package:40166/1" type="box">
 <description>Momentary Switch (Pushbutton) - SPST - SMD, 12mm Square
 Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
 Datasheet</description>
@@ -8036,7 +8276,7 @@ Datasheet</description>
 <packageinstance name="TACTILE_SWITCH_SMD_12MM"/>
 </packageinstances>
 </package3d>
-<package3d name="TACTILE_SWITCH_PTH_6.0MM_KIT" urn="urn:adsk.eagle:package:40170/1" type="box" library_version="1">
+<package3d name="TACTILE_SWITCH_PTH_6.0MM_KIT" urn="urn:adsk.eagle:package:40170/1" type="box">
 <description>Momentary Switch (Pushbutton) - SPST - PTH, 6.0mm Square
 Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
 Warning: This is the KIT version of this package. This package has a smaller diameter top stop mask, which doesn't cover the diameter of the pad. This means only the bottom side of the pads' copper will be exposed. You'll only be able to solder to the bottom side.
@@ -8045,7 +8285,7 @@ Datasheet (B3F-1000)</description>
 <packageinstance name="TACTILE_SWITCH_PTH_6.0MM_KIT"/>
 </packageinstances>
 </package3d>
-<package3d name="TACTILE_SWITCH_SMD_5.2MM" urn="urn:adsk.eagle:package:40167/1" type="box" library_version="1">
+<package3d name="TACTILE_SWITCH_SMD_5.2MM" urn="urn:adsk.eagle:package:40167/1" type="box">
 <description>Momentary Switch (Pushbutton) - SPST - SMD, 5.2mm Square
 Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
 Dimensional Drawing</description>
@@ -8053,14 +8293,14 @@ Dimensional Drawing</description>
 <packageinstance name="TACTILE_SWITCH_SMD_5.2MM"/>
 </packageinstances>
 </package3d>
-<package3d name="TACTILE_SWITCH_SMD_RIGHT_ANGLE" urn="urn:adsk.eagle:package:40169/1" type="box" library_version="1">
+<package3d name="TACTILE_SWITCH_SMD_RIGHT_ANGLE" urn="urn:adsk.eagle:package:40169/1" type="box">
 <description>Momentary Switch (Pushbutton) - SPST - SMD, Right-angle
 Normally-open (NO) SPST momentary switches (buttons, pushbuttons).</description>
 <packageinstances>
 <packageinstance name="TACTILE_SWITCH_SMD_RIGHT_ANGLE"/>
 </packageinstances>
 </package3d>
-<package3d name="TACTILE_SWITCH_SMD_4.6X2.8MM" urn="urn:adsk.eagle:package:40176/1" type="box" library_version="1">
+<package3d name="TACTILE_SWITCH_SMD_4.6X2.8MM" urn="urn:adsk.eagle:package:40176/1" type="box">
 <description>Momentary Switch (Pushbutton) - SPST - SMD, 4.6 x 2.8mm
 Normally-open (NO) SPST momentary switches (buttons, pushbuttons).
 Datasheet</description>
@@ -8070,7 +8310,7 @@ Datasheet</description>
 </package3d>
 </packages3d>
 <symbols>
-<symbol name="SWITCH-MOMENTARY-2" urn="urn:adsk.eagle:symbol:40102/1" library_version="1">
+<symbol name="SWITCH-MOMENTARY-2">
 <description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST&lt;/h3&gt;
 &lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;</description>
 <wire x1="1.905" y1="0" x2="2.54" y2="0" width="0.254" layer="94"/>
@@ -8084,7 +8324,7 @@ Datasheet</description>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="MOMENTARY-SWITCH-SPST" urn="urn:adsk.eagle:component:40205/1" prefix="S" library_version="1">
+<deviceset name="MOMENTARY-SWITCH-SPST" prefix="S">
 <description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST&lt;/h3&gt;
 &lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;
 &lt;h4&gt;Variants&lt;/h4&gt;
@@ -8120,8 +8360,8 @@ SparkFun BigTime Watch Kit&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;
 <devices>
 <device name="-PTH-6.0MM" package="TACTILE_SWITCH_PTH_6.0MM">
 <connects>
-<connect gate="G$1" pin="1" pad="1"/>
-<connect gate="G$1" pin="2" pad="3"/>
+<connect gate="G$1" pin="1" pad="1 2"/>
+<connect gate="G$1" pin="2" pad="3 4"/>
 </connects>
 <package3dinstances>
 <package3dinstance package3d_urn="urn:adsk.eagle:package:40163/1"/>
@@ -8299,247 +8539,7 @@ SparkFun BigTime Watch Kit&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;
 </deviceset>
 </devicesets>
 </library>
-<library name="eScooter">
-<packages>
-<package name="DIOM5027X220N" urn="urn:adsk.eagle:footprint:21928331/1">
-<description>Molded Body, 5.00 X 2.70 X 2.20 mm body
-&lt;p&gt;Molded Body package with body size 5.00 X 2.70 X 2.20 mm&lt;/p&gt;</description>
-<wire x1="2.5" y1="1.35" x2="-3.3699" y2="1.35" width="0.12" layer="21"/>
-<wire x1="-3.3699" y1="1.35" x2="-3.3699" y2="-1.35" width="0.12" layer="21"/>
-<wire x1="-3.3699" y1="-1.35" x2="2.5" y2="-1.35" width="0.12" layer="21"/>
-<wire x1="2.5" y1="-1.35" x2="-2.5" y2="-1.35" width="0.12" layer="51"/>
-<wire x1="-2.5" y1="-1.35" x2="-2.5" y2="1.35" width="0.12" layer="51"/>
-<wire x1="-2.5" y1="1.35" x2="2.5" y2="1.35" width="0.12" layer="51"/>
-<wire x1="2.5" y1="1.35" x2="2.5" y2="-1.35" width="0.12" layer="51"/>
-<smd name="1" x="-2.1" y="0" dx="1.9118" dy="1.5118" layer="1"/>
-<smd name="2" x="2.1" y="0" dx="1.9118" dy="1.5118" layer="1"/>
-<text x="0" y="1.985" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
-<text x="0" y="-1.985" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
-</package>
-<package name="SON254P1750X4300X120-30M" urn="urn:adsk.eagle:footprint:21849939/1">
-<description>30-SON (DFN), 2.54 mm pitch, 43.00 X 17.50 X 1.20 mm body
-&lt;p&gt;30-pin SON (DFN) package with 2.54 mm pitch with body size 43.00 X 17.50 X 1.20 mm&lt;/p&gt;</description>
-<circle x="-9.254" y="18.9349" radius="0.25" width="0" layer="21"/>
-<wire x1="-8.75" y1="18.6849" x2="-8.75" y2="21.5" width="0.12" layer="21"/>
-<wire x1="-8.75" y1="21.5" x2="8.75" y2="21.5" width="0.12" layer="21"/>
-<wire x1="8.75" y1="21.5" x2="8.75" y2="18.6849" width="0.12" layer="21"/>
-<wire x1="-8.75" y1="-18.6849" x2="-8.75" y2="-21.5" width="0.12" layer="21"/>
-<wire x1="-8.75" y1="-21.5" x2="8.75" y2="-21.5" width="0.12" layer="21"/>
-<wire x1="8.75" y1="-21.5" x2="8.75" y2="-18.6849" width="0.12" layer="21"/>
-<wire x1="8.75" y1="-21.5" x2="-8.75" y2="-21.5" width="0.12" layer="51"/>
-<wire x1="-8.75" y1="-21.5" x2="-8.75" y2="21.5" width="0.12" layer="51"/>
-<wire x1="-8.75" y1="21.5" x2="8.75" y2="21.5" width="0.12" layer="51"/>
-<wire x1="8.75" y1="21.5" x2="8.75" y2="-21.5" width="0.12" layer="51"/>
-<smd name="1" x="-7.95" y="17.78" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="2" x="-7.95" y="15.24" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="3" x="-7.95" y="12.7" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="4" x="-7.95" y="10.16" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="5" x="-7.95" y="7.62" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="6" x="-7.95" y="5.08" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="7" x="-7.95" y="2.54" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="8" x="-7.95" y="0" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="9" x="-7.95" y="-2.54" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="10" x="-7.95" y="-5.08" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="11" x="-7.95" y="-7.62" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="12" x="-7.95" y="-10.16" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="13" x="-7.95" y="-12.7" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="14" x="-7.95" y="-15.24" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="15" x="-7.95" y="-17.78" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="16" x="7.95" y="-17.78" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="17" x="7.95" y="-15.24" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="18" x="7.95" y="-12.7" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="19" x="7.95" y="-10.16" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="20" x="7.95" y="-7.62" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="21" x="7.95" y="-5.08" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="22" x="7.95" y="-2.54" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="23" x="7.95" y="0" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="24" x="7.95" y="2.54" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="25" x="7.95" y="5.08" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="26" x="7.95" y="7.62" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="27" x="7.95" y="10.16" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="28" x="7.95" y="12.7" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="29" x="7.95" y="15.24" dx="2.5118" dy="1.3018" layer="1"/>
-<smd name="30" x="7.95" y="17.78" dx="2.5118" dy="1.3018" layer="1"/>
-<text x="0" y="22.135" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
-<text x="0" y="-22.135" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
-</package>
-</packages>
-<packages3d>
-<package3d name="DIOM5027X220N" urn="urn:adsk.eagle:package:21928182/1" type="model">
-<description>Molded Body, 5.00 X 2.70 X 2.20 mm body
-&lt;p&gt;Molded Body package with body size 5.00 X 2.70 X 2.20 mm&lt;/p&gt;</description>
-<packageinstances>
-<packageinstance name="DIOM5027X220N"/>
-</packageinstances>
-</package3d>
-<package3d name="SON254P1750X4300X120-30M" urn="urn:adsk.eagle:package:21849926/1" type="model">
-<description>30-SON (DFN), 2.54 mm pitch, 43.00 X 17.50 X 1.20 mm body
-&lt;p&gt;30-pin SON (DFN) package with 2.54 mm pitch with body size 43.00 X 17.50 X 1.20 mm&lt;/p&gt;</description>
-<packageinstances>
-<packageinstance name="SON254P1750X4300X120-30M"/>
-</packageinstances>
-</package3d>
-</packages3d>
-<symbols>
-<symbol name="TVS_DIODE">
-<wire x1="0" y1="0" x2="-2.54" y2="2.54" width="0.254" layer="94"/>
-<wire x1="2.54" y1="2.54" x2="0" y2="0" width="0.254" layer="94"/>
-<wire x1="-5.08" y1="-2.54" x2="-2.54" y2="0" width="0.254" layer="94"/>
-<wire x1="-2.54" y1="0" x2="2.54" y2="0" width="0.254" layer="94"/>
-<wire x1="2.54" y1="0" x2="5.08" y2="2.54" width="0.254" layer="94"/>
-<wire x1="0" y1="0" x2="-2.54" y2="-2.54" width="0.254" layer="94"/>
-<wire x1="2.54" y1="-2.54" x2="0" y2="0" width="0.254" layer="94"/>
-<wire x1="-2.54" y1="2.54" x2="2.54" y2="2.54" width="0.254" layer="94"/>
-<wire x1="-2.54" y1="-2.54" x2="2.54" y2="-2.54" width="0.254" layer="94"/>
-<pin name="P$1" x="0" y="7.62" visible="off" length="middle" rot="R270"/>
-<pin name="P$2" x="0" y="-7.62" visible="off" length="middle" rot="R90"/>
-<text x="2.54" y="5.08" size="1.778" layer="95">&gt;NAME</text>
-<text x="2.54" y="-7.62" size="1.778" layer="96">&gt;VALUE</text>
-</symbol>
-<symbol name="ARDUINO">
-<wire x1="-10.16" y1="20.32" x2="-10.16" y2="-20.32" width="0.254" layer="94"/>
-<wire x1="-10.16" y1="-20.32" x2="10.16" y2="-20.32" width="0.254" layer="94"/>
-<wire x1="10.16" y1="-20.32" x2="10.16" y2="20.32" width="0.254" layer="94"/>
-<wire x1="10.16" y1="20.32" x2="-10.16" y2="20.32" width="0.254" layer="94"/>
-<pin name="D13" x="-15.24" y="17.78" length="middle"/>
-<pin name="3V3" x="-15.24" y="15.24" length="middle" direction="pwr"/>
-<pin name="REF" x="-15.24" y="12.7" length="middle"/>
-<pin name="A0" x="-15.24" y="10.16" length="middle"/>
-<pin name="A1" x="-15.24" y="7.62" length="middle"/>
-<pin name="A2" x="-15.24" y="5.08" length="middle"/>
-<pin name="A3" x="-15.24" y="2.54" length="middle"/>
-<pin name="A4" x="-15.24" y="0" length="middle"/>
-<pin name="A5" x="-15.24" y="-2.54" length="middle"/>
-<pin name="A6" x="-15.24" y="-5.08" length="middle"/>
-<pin name="A7" x="-15.24" y="-7.62" length="middle"/>
-<pin name="5V" x="-15.24" y="-10.16" length="middle" direction="pwr"/>
-<pin name="RST" x="-15.24" y="-12.7" length="middle" direction="in"/>
-<pin name="GND" x="-15.24" y="-15.24" length="middle" direction="pwr"/>
-<pin name="VIN" x="-15.24" y="-17.78" length="middle" direction="pwr"/>
-<pin name="TX1" x="15.24" y="-17.78" length="middle" direction="out" rot="R180"/>
-<pin name="RX0" x="15.24" y="-15.24" length="middle" direction="in" rot="R180"/>
-<pin name="RST2" x="15.24" y="-12.7" length="middle" direction="in" rot="R180"/>
-<pin name="GND2" x="15.24" y="-10.16" length="middle" direction="pwr" rot="R180"/>
-<pin name="D2" x="15.24" y="-7.62" length="middle" rot="R180"/>
-<pin name="D3" x="15.24" y="-5.08" length="middle" rot="R180"/>
-<pin name="D4" x="15.24" y="-2.54" length="middle" rot="R180"/>
-<pin name="D5" x="15.24" y="0" length="middle" rot="R180"/>
-<pin name="D6" x="15.24" y="2.54" length="middle" rot="R180"/>
-<pin name="D7" x="15.24" y="5.08" length="middle" rot="R180"/>
-<pin name="D8" x="15.24" y="7.62" length="middle" rot="R180"/>
-<pin name="D9" x="15.24" y="10.16" length="middle" rot="R180"/>
-<pin name="D10" x="15.24" y="12.7" length="middle" rot="R180"/>
-<pin name="D11" x="15.24" y="15.24" length="middle" rot="R180"/>
-<pin name="D12" x="15.24" y="17.78" length="middle" rot="R180"/>
-<text x="-5.08" y="22.86" size="1.778" layer="95">&gt;NAME</text>
-<text x="-5.08" y="-25.4" size="1.778" layer="96">&gt;VALUE</text>
-</symbol>
-</symbols>
-<devicesets>
-<deviceset name="TVS_DIODE">
-<description>TVS protective diode</description>
-<gates>
-<gate name="D$1" symbol="TVS_DIODE" x="0" y="0"/>
-</gates>
-<devices>
-<device name="SMA" package="DIOM5027X220N">
-<connects>
-<connect gate="D$1" pin="P$1" pad="1"/>
-<connect gate="D$1" pin="P$2" pad="2"/>
-</connects>
-<package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:21928182/1"/>
-</package3dinstances>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
-<deviceset name="ARDUINO">
-<description>Ardino nano</description>
-<gates>
-<gate name="G$1" symbol="ARDUINO" x="0" y="0"/>
-</gates>
-<devices>
-<device name="ARDUINO_NANO" package="SON254P1750X4300X120-30M">
-<connects>
-<connect gate="G$1" pin="3V3" pad="2"/>
-<connect gate="G$1" pin="5V" pad="12"/>
-<connect gate="G$1" pin="A0" pad="4"/>
-<connect gate="G$1" pin="A1" pad="5"/>
-<connect gate="G$1" pin="A2" pad="6"/>
-<connect gate="G$1" pin="A3" pad="7"/>
-<connect gate="G$1" pin="A4" pad="8"/>
-<connect gate="G$1" pin="A5" pad="9"/>
-<connect gate="G$1" pin="A6" pad="10"/>
-<connect gate="G$1" pin="A7" pad="11"/>
-<connect gate="G$1" pin="D10" pad="28"/>
-<connect gate="G$1" pin="D11" pad="29"/>
-<connect gate="G$1" pin="D12" pad="30"/>
-<connect gate="G$1" pin="D13" pad="1"/>
-<connect gate="G$1" pin="D2" pad="20"/>
-<connect gate="G$1" pin="D3" pad="21"/>
-<connect gate="G$1" pin="D4" pad="22"/>
-<connect gate="G$1" pin="D5" pad="23"/>
-<connect gate="G$1" pin="D6" pad="24"/>
-<connect gate="G$1" pin="D7" pad="25"/>
-<connect gate="G$1" pin="D8" pad="26"/>
-<connect gate="G$1" pin="D9" pad="27"/>
-<connect gate="G$1" pin="GND" pad="14"/>
-<connect gate="G$1" pin="GND2" pad="19"/>
-<connect gate="G$1" pin="REF" pad="3"/>
-<connect gate="G$1" pin="RST" pad="13"/>
-<connect gate="G$1" pin="RST2" pad="18"/>
-<connect gate="G$1" pin="RX0" pad="17"/>
-<connect gate="G$1" pin="TX1" pad="16"/>
-<connect gate="G$1" pin="VIN" pad="15"/>
-</connects>
-<package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:21849926/1"/>
-</package3dinstances>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
-</devicesets>
-</library>
-<library name="supply1" urn="urn:adsk.eagle:library:371">
-<description>&lt;b&gt;Supply Symbols&lt;/b&gt;&lt;p&gt;
- GND, VCC, 0V, +5V, -5V, etc.&lt;p&gt;
- Please keep in mind, that these devices are necessary for the
- automatic wiring of the supply signals.&lt;p&gt;
- The pin name defined in the symbol is identical to the net which is to be wired automatically.&lt;p&gt;
- In this library the device names are the same as the pin names of the symbols, therefore the correct signal names appear next to the supply symbols in the schematic.&lt;p&gt;
- &lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
-<packages>
-</packages>
-<symbols>
-<symbol name="GND" urn="urn:adsk.eagle:symbol:26925/1" library_version="1">
-<wire x1="-1.905" y1="0" x2="1.905" y2="0" width="0.254" layer="94"/>
-<text x="-2.54" y="-2.54" size="1.778" layer="96">&gt;VALUE</text>
-<pin name="GND" x="0" y="2.54" visible="off" length="short" direction="sup" rot="R270"/>
-</symbol>
-</symbols>
-<devicesets>
-<deviceset name="GND" urn="urn:adsk.eagle:component:26954/1" prefix="GND" library_version="1">
-<description>&lt;b&gt;SUPPLY SYMBOL&lt;/b&gt;</description>
-<gates>
-<gate name="1" symbol="GND" x="0" y="0"/>
-</gates>
-<devices>
-<device name="">
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
-</devicesets>
-</library>
-<library name="buzzer" urn="urn:adsk.eagle:library:113">
+<library name="buzzer">
 <description>&lt;b&gt;Speakers and Buzzers&lt;/b&gt;&lt;p&gt;
 &lt;ul&gt;Distributors:
 &lt;li&gt;Buerklin
@@ -8548,21 +8548,17 @@ SparkFun BigTime Watch Kit&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;
 &lt;/ul&gt;
 &lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
 <packages>
-<package name="F/HGP" urn="urn:adsk.eagle:footprint:5238/1" library_version="2">
+<package name="F/HGP" urn="urn:adsk.eagle:footprint:5238/1" locally_modified="yes">
 <description>&lt;b&gt;BUZZER&lt;/b&gt;</description>
-<wire x1="-7.8361" y1="-1.6158" x2="-7.8361" y2="1.6158" width="0.1524" layer="21" curve="336.697868"/>
-<wire x1="-5.882" y1="-2.032" x2="-5.882" y2="2.032" width="0.1524" layer="21" curve="321.883357"/>
-<wire x1="-6.604" y1="2.032" x2="-6.604" y2="-2.032" width="0.1524" layer="21" curve="180"/>
-<wire x1="-6.604" y1="-2.032" x2="-5.882" y2="-2.032" width="0.1524" layer="21"/>
-<wire x1="-6.604" y1="2.032" x2="-5.882" y2="2.032" width="0.1524" layer="21"/>
 <pad name="1" x="-3.81" y="0" drill="1.016" diameter="2.159" shape="octagon"/>
 <pad name="2" x="3.81" y="0" drill="1.016" diameter="2.159" shape="octagon"/>
 <text x="4.445" y="6.985" size="1.27" layer="25" ratio="10">&gt;NAME</text>
 <text x="-3.683" y="-3.81" size="1.27" layer="27" ratio="10">&gt;VALUE</text>
+<circle x="0" y="0" radius="6.0827625" width="0.127" layer="21"/>
 </package>
 </packages>
 <packages3d>
-<package3d name="F/HGP" urn="urn:adsk.eagle:package:5287/1" type="box" library_version="2">
+<package3d name="F/HGP" urn="urn:adsk.eagle:package:5287/1" type="box">
 <description>BUZZER</description>
 <packageinstances>
 <packageinstance name="F/HGP"/>
@@ -8570,7 +8566,7 @@ SparkFun BigTime Watch Kit&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;
 </package3d>
 </packages3d>
 <symbols>
-<symbol name="BWS" urn="urn:adsk.eagle:symbol:5237/1" library_version="2">
+<symbol name="BWS">
 <wire x1="-2.54" y1="5.08" x2="5.08" y2="5.08" width="0.254" layer="94" curve="180"/>
 <wire x1="-2.54" y1="5.08" x2="5.08" y2="5.08" width="0.254" layer="94"/>
 <wire x1="0" y1="3.175" x2="1.27" y2="3.175" width="0.1524" layer="94" curve="-180" cap="flat"/>
@@ -8584,7 +8580,7 @@ SparkFun BigTime Watch Kit&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="F/HGP" urn="urn:adsk.eagle:component:5322/2" prefix="SG" library_version="2">
+<deviceset name="F/HGP" prefix="SG">
 <description>&lt;b&gt;BUZZER&lt;/b&gt;&lt;p&gt; Source: Buerklin</description>
 <gates>
 <gate name="G$1" symbol="BWS" x="0" y="0"/>
@@ -8635,7 +8631,6 @@ SparkFun BigTime Watch Kit&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;
 <part name="D2" library="Diode" library_urn="urn:adsk.eagle:library:16378169" deviceset="DIODE" device="DO-215-AC" package3d_urn="urn:adsk.eagle:package:9427057/2" technology="_" value=""/>
 <part name="Q4" library="Transistor" library_urn="urn:adsk.eagle:library:16378713" deviceset="PMOSFET_" device="" package3d_urn="urn:adsk.eagle:package:28738/2" technology="BSS84" value=""/>
 <part name="D3" library="Diode" library_urn="urn:adsk.eagle:library:16378169" deviceset="DIODE" device="DO-215-AC" package3d_urn="urn:adsk.eagle:package:9427057/2" technology="_" value=""/>
-<part name="S1" library="SparkFun-Switches" library_urn="urn:adsk.eagle:library:535" deviceset="MOMENTARY-SWITCH-SPST" device="-PTH-6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1" value=""/>
 <part name="Q5" library="Transistor" library_urn="urn:adsk.eagle:library:16378713" deviceset="NMOSFET" device="SOT23" package3d_urn="urn:adsk.eagle:package:28738/2"/>
 <part name="J7" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_06" device="SILK_FEMALE_PTH" package3d_urn="urn:adsk.eagle:package:38009/1" value="SPEED"/>
 <part name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="0.1uF"/>
@@ -8652,7 +8647,8 @@ SparkFun BigTime Watch Kit&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;
 <part name="GND1" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="GND2" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="U1" library="eScooter" deviceset="ARDUINO" device="ARDUINO_NANO" package3d_urn="urn:adsk.eagle:package:21849926/1" value="Arduino Nano Every"/>
-<part name="SG1" library="buzzer" library_urn="urn:adsk.eagle:library:113" deviceset="F/HGP" device="" package3d_urn="urn:adsk.eagle:package:5287/1"/>
+<part name="S1" library="SparkFun-Switches" deviceset="MOMENTARY-SWITCH-SPST" device="-PTH-6.0MM" package3d_urn="urn:adsk.eagle:package:40163/1"/>
+<part name="SG1" library="buzzer" deviceset="F/HGP" device="" package3d_urn="urn:adsk.eagle:package:5287/1"/>
 </parts>
 <sheets>
 <sheet>
@@ -8711,10 +8707,6 @@ SparkFun BigTime Watch Kit&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;
 <attribute name="NAME" x="81.28" y="-22.86" size="1.778" layer="95" align="center"/>
 <attribute name="VALUE" x="81.28" y="-33.02" size="1.778" layer="95" align="center"/>
 </instance>
-<instance part="S1" gate="G$1" x="88.9" y="-10.16" smashed="yes">
-<attribute name="NAME" x="88.9" y="-8.636" size="1.778" layer="95" font="vector" align="bottom-center"/>
-<attribute name="VALUE" x="88.9" y="-10.668" size="1.778" layer="96" font="vector" align="top-center"/>
-</instance>
 <instance part="Q5" gate="G$1" x="88.9" y="50.8" smashed="yes" rot="MR0">
 <attribute name="NAME" x="82.55" y="52.07" size="1.778" layer="95" rot="MR0"/>
 </instance>
@@ -8770,9 +8762,11 @@ SparkFun BigTime Watch Kit&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;
 <attribute name="NAME" x="27.94" y="86.36" size="1.778" layer="95"/>
 <attribute name="VALUE" x="20.32" y="40.64" size="1.778" layer="96"/>
 </instance>
+<instance part="S1" gate="G$1" x="88.9" y="-10.16" smashed="yes">
+<attribute name="NAME" x="88.9" y="-8.636" size="1.778" layer="95" font="vector" align="bottom-center"/>
+</instance>
 <instance part="SG1" gate="G$1" x="-68.58" y="38.1" smashed="yes" rot="R90">
 <attribute name="NAME" x="-74.93" y="35.56" size="1.778" layer="95" rot="R90"/>
-<attribute name="VALUE" x="-68.58" y="44.45" size="1.778" layer="96" rot="R90"/>
 </instance>
 </instances>
 <busses>
@@ -8825,7 +8819,6 @@ SparkFun BigTime Watch Kit&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;
 <wire x1="76.2" y1="-5.08" x2="88.9" y2="-5.08" width="0.1524" layer="91"/>
 <wire x1="88.9" y1="-5.08" x2="88.9" y2="0" width="0.1524" layer="91"/>
 <label x="55.88" y="-10.16" size="1.778" layer="95"/>
-<pinref part="S1" gate="G$1" pin="1"/>
 <wire x1="88.9" y1="0" x2="88.9" y2="2.54" width="0.1524" layer="91"/>
 <wire x1="83.82" y1="-10.16" x2="76.2" y2="-10.16" width="0.1524" layer="91"/>
 <wire x1="76.2" y1="-5.08" x2="76.2" y2="-10.16" width="0.1524" layer="91"/>
@@ -8839,10 +8832,11 @@ SparkFun BigTime Watch Kit&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;
 <wire x1="66.04" y1="-10.16" x2="66.04" y2="-17.78" width="0.1524" layer="91"/>
 <wire x1="66.04" y1="-17.78" x2="73.66" y2="-17.78" width="0.1524" layer="91"/>
 <pinref part="U1" gate="G$1" pin="GND"/>
-<pinref part="SG1" gate="G$1" pin="1"/>
 <wire x1="-66.04" y1="35.56" x2="-66.04" y2="33.02" width="0.1524" layer="91"/>
 <wire x1="-66.04" y1="33.02" x2="-63.5" y2="33.02" width="0.1524" layer="91"/>
 <wire x1="-63.5" y1="33.02" x2="-63.5" y2="38.1" width="0.1524" layer="91"/>
+<pinref part="S1" gate="G$1" pin="1"/>
+<pinref part="SG1" gate="G$1" pin="1"/>
 </segment>
 <segment>
 <wire x1="124.46" y1="78.74" x2="124.46" y2="68.58" width="0.1524" layer="91"/>
@@ -9197,7 +9191,6 @@ SparkFun BigTime Watch Kit&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;
 <pinref part="D2" gate="G$1" pin="C"/>
 <wire x1="86.36" y1="-27.94" x2="99.06" y2="-27.94" width="0.1524" layer="91"/>
 <wire x1="99.06" y1="-10.16" x2="99.06" y2="-7.62" width="0.1524" layer="91"/>
-<pinref part="S1" gate="G$1" pin="2"/>
 <wire x1="99.06" y1="-17.78" x2="99.06" y2="-27.94" width="0.1524" layer="91"/>
 <wire x1="99.06" y1="-17.78" x2="88.9" y2="-17.78" width="0.1524" layer="91"/>
 <junction x="99.06" y="-17.78"/>
@@ -9205,6 +9198,7 @@ SparkFun BigTime Watch Kit&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;
 <wire x1="99.06" y1="-10.16" x2="93.98" y2="-10.16" width="0.1524" layer="91"/>
 <wire x1="99.06" y1="-10.16" x2="99.06" y2="-17.78" width="0.1524" layer="91"/>
 <junction x="99.06" y="-10.16"/>
+<pinref part="S1" gate="G$1" pin="2"/>
 </segment>
 </net>
 <net name="SPOUT" class="0">
@@ -9234,10 +9228,10 @@ SparkFun BigTime Watch Kit&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;
 <wire x1="-63.5" y1="40.64" x2="-27.94" y2="40.64" width="0.1524" layer="91"/>
 <label x="-63.5" y="40.64" size="1.778" layer="95"/>
 <pinref part="U1" gate="G$1" pin="A6"/>
-<pinref part="SG1" gate="G$1" pin="2"/>
 <wire x1="-66.04" y1="43.18" x2="-66.04" y2="45.72" width="0.1524" layer="91"/>
 <wire x1="-66.04" y1="45.72" x2="-63.5" y2="45.72" width="0.1524" layer="91"/>
 <wire x1="-63.5" y1="45.72" x2="-63.5" y2="40.64" width="0.1524" layer="91"/>
+<pinref part="SG1" gate="G$1" pin="2"/>
 </segment>
 </net>
 </nets>

+ 73 - 1
schematic/eScooter.l#1

@@ -6,7 +6,7 @@
 <setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="yes" altdistance="0.01" altunitdist="inch" altunit="inch"/>
+<grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
@@ -234,6 +234,31 @@ Source: http://www.avagotech.com/docs/AV02-0410EN</description>
 <text x="0" y="1.985" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
 <text x="0" y="-1.985" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
 </package>
+<package name="DIP826W56P254L937H458Q8B" urn="urn:adsk.eagle:footprint:22059849/1">
+<description>8-DIP, 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span, 9.38 X 6.99 X 4.58 mm body
+&lt;p&gt;8-pin DIP package with 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span with body size 9.38 X 6.99 X 4.58 mm&lt;/p&gt;</description>
+<circle x="-5.3669" y="3.81" radius="0.25" width="0" layer="21"/>
+<wire x1="-3.935" y1="4.7969" x2="-3.935" y2="4.955" width="0.12" layer="21"/>
+<wire x1="-3.935" y1="4.955" x2="3.935" y2="4.955" width="0.12" layer="21"/>
+<wire x1="3.935" y1="4.955" x2="3.935" y2="4.7969" width="0.12" layer="21"/>
+<wire x1="-3.935" y1="-4.7969" x2="-3.935" y2="-4.955" width="0.12" layer="21"/>
+<wire x1="-3.935" y1="-4.955" x2="3.935" y2="-4.955" width="0.12" layer="21"/>
+<wire x1="3.935" y1="-4.955" x2="3.935" y2="-4.7969" width="0.12" layer="21"/>
+<wire x1="3.935" y1="-4.955" x2="-3.935" y2="-4.955" width="0.12" layer="51"/>
+<wire x1="-3.935" y1="-4.955" x2="-3.935" y2="4.955" width="0.12" layer="51"/>
+<wire x1="-3.935" y1="4.955" x2="3.935" y2="4.955" width="0.12" layer="51"/>
+<wire x1="3.935" y1="4.955" x2="3.935" y2="-4.955" width="0.12" layer="51"/>
+<pad name="1" x="-4.13" y="3.81" drill="0.8657" diameter="1.4657"/>
+<pad name="2" x="-4.13" y="1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="3" x="-4.13" y="-1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="4" x="-4.13" y="-3.81" drill="0.8657" diameter="1.4657"/>
+<pad name="5" x="4.13" y="-3.81" drill="0.8657" diameter="1.4657"/>
+<pad name="6" x="4.13" y="-1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="7" x="4.13" y="1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="8" x="4.13" y="3.81" drill="0.8657" diameter="1.4657"/>
+<text x="0" y="5.59" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-5.59" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
+</package>
 </packages>
 <packages3d>
 <package3d name="DIP8" urn="urn:adsk.eagle:package:8089856/1" locally_modified="yes" type="box">
@@ -277,6 +302,13 @@ Source: http://www.avagotech.com/docs/AV02-0410EN</description>
 <packageinstance name="DIOM5027X220N"/>
 </packageinstances>
 </package3d>
+<package3d name="DIP826W56P254L937H458Q8B" urn="urn:adsk.eagle:package:22059831/1" type="model">
+<description>8-DIP, 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span, 9.38 X 6.99 X 4.58 mm body
+&lt;p&gt;8-pin DIP package with 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span with body size 9.38 X 6.99 X 4.58 mm&lt;/p&gt;</description>
+<packageinstances>
+<packageinstance name="DIP826W56P254L937H458Q8B"/>
+</packageinstances>
+</package3d>
 </packages3d>
 <symbols>
 <symbol name="MX5035">
@@ -398,6 +430,14 @@ Source: http://www.avagotech.com/docs/AV02-0410EN</description>
 <technology name=""/>
 </technologies>
 </device>
+<device name="PDIP8" package="DIP826W56P254L937H458Q8B">
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:22059831/1"/>
+</package3dinstances>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
 </devices>
 </deviceset>
 <deviceset name="C">
@@ -426,6 +466,38 @@ Source: http://www.avagotech.com/docs/AV02-0410EN</description>
 </gates>
 <devices>
 <device name="ARDUINO_NANO" package="SON254P1750X4300X120-30M">
+<connects>
+<connect gate="G$1" pin="3V3" pad="2"/>
+<connect gate="G$1" pin="5V" pad="12"/>
+<connect gate="G$1" pin="A0" pad="4"/>
+<connect gate="G$1" pin="A1" pad="5"/>
+<connect gate="G$1" pin="A2" pad="6"/>
+<connect gate="G$1" pin="A3" pad="7"/>
+<connect gate="G$1" pin="A4" pad="8"/>
+<connect gate="G$1" pin="A5" pad="9"/>
+<connect gate="G$1" pin="A6" pad="10"/>
+<connect gate="G$1" pin="A7" pad="11"/>
+<connect gate="G$1" pin="D10" pad="28"/>
+<connect gate="G$1" pin="D11" pad="29"/>
+<connect gate="G$1" pin="D12" pad="30"/>
+<connect gate="G$1" pin="D13" pad="1"/>
+<connect gate="G$1" pin="D2" pad="20"/>
+<connect gate="G$1" pin="D3" pad="21"/>
+<connect gate="G$1" pin="D4" pad="22"/>
+<connect gate="G$1" pin="D5" pad="23"/>
+<connect gate="G$1" pin="D6" pad="24"/>
+<connect gate="G$1" pin="D7" pad="25"/>
+<connect gate="G$1" pin="D8" pad="26"/>
+<connect gate="G$1" pin="D9" pad="27"/>
+<connect gate="G$1" pin="GND" pad="14"/>
+<connect gate="G$1" pin="GND2" pad="19"/>
+<connect gate="G$1" pin="REF" pad="3"/>
+<connect gate="G$1" pin="RST" pad="13"/>
+<connect gate="G$1" pin="RST2" pad="18"/>
+<connect gate="G$1" pin="RX0" pad="17"/>
+<connect gate="G$1" pin="TX1" pad="16"/>
+<connect gate="G$1" pin="VIN" pad="15"/>
+</connects>
 <package3dinstances>
 <package3dinstance package3d_urn="urn:adsk.eagle:package:21849926/1"/>
 </package3dinstances>

+ 34 - 2
schematic/eScooter.l#2

@@ -6,7 +6,7 @@
 <setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="yes" altdistance="0.01" altunitdist="inch" altunit="inch"/>
+<grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
@@ -341,7 +341,7 @@ Source: http://www.avagotech.com/docs/AV02-0410EN</description>
 <pin name="D11" x="15.24" y="15.24" length="middle" rot="R180"/>
 <pin name="D12" x="15.24" y="17.78" length="middle" rot="R180"/>
 <text x="-5.08" y="22.86" size="1.778" layer="95">&gt;NAME</text>
-<text x="-5.08" y="-22.86" size="1.778" layer="96">&gt;VALUE</text>
+<text x="-5.08" y="-25.4" size="1.778" layer="96">&gt;VALUE</text>
 </symbol>
 <symbol name="BUZZER">
 <wire x1="2.54" y1="2.54" x2="0" y2="2.54" width="0.254" layer="94"/>
@@ -426,6 +426,38 @@ Source: http://www.avagotech.com/docs/AV02-0410EN</description>
 </gates>
 <devices>
 <device name="ARDUINO_NANO" package="SON254P1750X4300X120-30M">
+<connects>
+<connect gate="G$1" pin="3V3" pad="2"/>
+<connect gate="G$1" pin="5V" pad="12"/>
+<connect gate="G$1" pin="A0" pad="4"/>
+<connect gate="G$1" pin="A1" pad="5"/>
+<connect gate="G$1" pin="A2" pad="6"/>
+<connect gate="G$1" pin="A3" pad="7"/>
+<connect gate="G$1" pin="A4" pad="8"/>
+<connect gate="G$1" pin="A5" pad="9"/>
+<connect gate="G$1" pin="A6" pad="10"/>
+<connect gate="G$1" pin="A7" pad="11"/>
+<connect gate="G$1" pin="D10" pad="28"/>
+<connect gate="G$1" pin="D11" pad="29"/>
+<connect gate="G$1" pin="D12" pad="30"/>
+<connect gate="G$1" pin="D13" pad="1"/>
+<connect gate="G$1" pin="D2" pad="20"/>
+<connect gate="G$1" pin="D3" pad="21"/>
+<connect gate="G$1" pin="D4" pad="22"/>
+<connect gate="G$1" pin="D5" pad="23"/>
+<connect gate="G$1" pin="D6" pad="24"/>
+<connect gate="G$1" pin="D7" pad="25"/>
+<connect gate="G$1" pin="D8" pad="26"/>
+<connect gate="G$1" pin="D9" pad="27"/>
+<connect gate="G$1" pin="GND" pad="14"/>
+<connect gate="G$1" pin="GND2" pad="19"/>
+<connect gate="G$1" pin="REF" pad="3"/>
+<connect gate="G$1" pin="RST" pad="13"/>
+<connect gate="G$1" pin="RST2" pad="18"/>
+<connect gate="G$1" pin="RX0" pad="17"/>
+<connect gate="G$1" pin="TX1" pad="16"/>
+<connect gate="G$1" pin="VIN" pad="15"/>
+</connects>
 <package3dinstances>
 <package3dinstance package3d_urn="urn:adsk.eagle:package:21849926/1"/>
 </package3dinstances>

+ 2 - 2
schematic/eScooter.l#3

@@ -6,7 +6,7 @@
 <setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
+<grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="yes" altdistance="0.01" altunitdist="inch" altunit="inch"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
@@ -341,7 +341,7 @@ Source: http://www.avagotech.com/docs/AV02-0410EN</description>
 <pin name="D11" x="15.24" y="15.24" length="middle" rot="R180"/>
 <pin name="D12" x="15.24" y="17.78" length="middle" rot="R180"/>
 <text x="-5.08" y="22.86" size="1.778" layer="95">&gt;NAME</text>
-<text x="-5.08" y="-25.4" size="1.778" layer="96">VALUE</text>
+<text x="-5.08" y="-25.4" size="1.778" layer="96">&gt;VALUE</text>
 </symbol>
 <symbol name="BUZZER">
 <wire x1="2.54" y1="2.54" x2="0" y2="2.54" width="0.254" layer="94"/>

+ 2 - 34
schematic/eScooter.l#4

@@ -6,7 +6,7 @@
 <setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
+<grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="yes" altdistance="0.01" altunitdist="inch" altunit="inch"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
@@ -341,7 +341,7 @@ Source: http://www.avagotech.com/docs/AV02-0410EN</description>
 <pin name="D11" x="15.24" y="15.24" length="middle" rot="R180"/>
 <pin name="D12" x="15.24" y="17.78" length="middle" rot="R180"/>
 <text x="-5.08" y="22.86" size="1.778" layer="95">&gt;NAME</text>
-<text x="-5.08" y="-25.4" size="1.778" layer="96">VALUE</text>
+<text x="-5.08" y="-22.86" size="1.778" layer="96">&gt;VALUE</text>
 </symbol>
 <symbol name="BUZZER">
 <wire x1="2.54" y1="2.54" x2="0" y2="2.54" width="0.254" layer="94"/>
@@ -426,38 +426,6 @@ Source: http://www.avagotech.com/docs/AV02-0410EN</description>
 </gates>
 <devices>
 <device name="ARDUINO_NANO" package="SON254P1750X4300X120-30M">
-<connects>
-<connect gate="G$1" pin="3V3" pad="2"/>
-<connect gate="G$1" pin="5V" pad="12"/>
-<connect gate="G$1" pin="A0" pad="4"/>
-<connect gate="G$1" pin="A1" pad="5"/>
-<connect gate="G$1" pin="A2" pad="6"/>
-<connect gate="G$1" pin="A3" pad="7"/>
-<connect gate="G$1" pin="A4" pad="8"/>
-<connect gate="G$1" pin="A5" pad="9"/>
-<connect gate="G$1" pin="A6" pad="10"/>
-<connect gate="G$1" pin="A7" pad="11"/>
-<connect gate="G$1" pin="D10" pad="28"/>
-<connect gate="G$1" pin="D11" pad="29"/>
-<connect gate="G$1" pin="D12" pad="30"/>
-<connect gate="G$1" pin="D13" pad="1"/>
-<connect gate="G$1" pin="D2" pad="20"/>
-<connect gate="G$1" pin="D3" pad="21"/>
-<connect gate="G$1" pin="D4" pad="22"/>
-<connect gate="G$1" pin="D5" pad="23"/>
-<connect gate="G$1" pin="D6" pad="24"/>
-<connect gate="G$1" pin="D7" pad="25"/>
-<connect gate="G$1" pin="D8" pad="26"/>
-<connect gate="G$1" pin="D9" pad="27"/>
-<connect gate="G$1" pin="GND" pad="14"/>
-<connect gate="G$1" pin="GND2" pad="19"/>
-<connect gate="G$1" pin="REF" pad="3"/>
-<connect gate="G$1" pin="RST" pad="13"/>
-<connect gate="G$1" pin="RST2" pad="18"/>
-<connect gate="G$1" pin="RX0" pad="17"/>
-<connect gate="G$1" pin="TX1" pad="16"/>
-<connect gate="G$1" pin="VIN" pad="15"/>
-</connects>
 <package3dinstances>
 <package3dinstance package3d_urn="urn:adsk.eagle:package:21849926/1"/>
 </package3dinstances>

+ 0 - 32
schematic/eScooter.l#5

@@ -426,38 +426,6 @@ Source: http://www.avagotech.com/docs/AV02-0410EN</description>
 </gates>
 <devices>
 <device name="ARDUINO_NANO" package="SON254P1750X4300X120-30M">
-<connects>
-<connect gate="G$1" pin="3V3" pad="2"/>
-<connect gate="G$1" pin="5V" pad="12"/>
-<connect gate="G$1" pin="A0" pad="4"/>
-<connect gate="G$1" pin="A1" pad="5"/>
-<connect gate="G$1" pin="A2" pad="6"/>
-<connect gate="G$1" pin="A3" pad="7"/>
-<connect gate="G$1" pin="A4" pad="8"/>
-<connect gate="G$1" pin="A5" pad="9"/>
-<connect gate="G$1" pin="A6" pad="10"/>
-<connect gate="G$1" pin="A7" pad="11"/>
-<connect gate="G$1" pin="D10" pad="28"/>
-<connect gate="G$1" pin="D11" pad="29"/>
-<connect gate="G$1" pin="D12" pad="30"/>
-<connect gate="G$1" pin="D13" pad="1"/>
-<connect gate="G$1" pin="D2" pad="20"/>
-<connect gate="G$1" pin="D3" pad="21"/>
-<connect gate="G$1" pin="D4" pad="22"/>
-<connect gate="G$1" pin="D5" pad="23"/>
-<connect gate="G$1" pin="D6" pad="24"/>
-<connect gate="G$1" pin="D7" pad="25"/>
-<connect gate="G$1" pin="D8" pad="26"/>
-<connect gate="G$1" pin="D9" pad="27"/>
-<connect gate="G$1" pin="GND" pad="14"/>
-<connect gate="G$1" pin="GND2" pad="19"/>
-<connect gate="G$1" pin="REF" pad="3"/>
-<connect gate="G$1" pin="RST" pad="13"/>
-<connect gate="G$1" pin="RST2" pad="18"/>
-<connect gate="G$1" pin="RX0" pad="17"/>
-<connect gate="G$1" pin="TX1" pad="16"/>
-<connect gate="G$1" pin="VIN" pad="15"/>
-</connects>
 <package3dinstances>
 <package3dinstance package3d_urn="urn:adsk.eagle:package:21849926/1"/>
 </package3dinstances>

+ 3 - 3
schematic/eScooter.l#6

@@ -486,13 +486,13 @@ Source: http://www.avagotech.com/docs/AV02-0410EN</description>
 <deviceset name="TVS_DIODE">
 <description>TVS protective diode</description>
 <gates>
-<gate name="D1" symbol="TVS_DIODE" x="0" y="0"/>
+<gate name="D$1" symbol="TVS_DIODE" x="0" y="0"/>
 </gates>
 <devices>
 <device name="SMA" package="DIOM5027X220N">
 <connects>
-<connect gate="D1" pin="P$1" pad="1"/>
-<connect gate="D1" pin="P$2" pad="2"/>
+<connect gate="D$1" pin="P$1" pad="1"/>
+<connect gate="D$1" pin="P$2" pad="2"/>
 </connects>
 <package3dinstances>
 <package3dinstance package3d_urn="urn:adsk.eagle:package:21928182/1"/>

+ 3 - 3
schematic/eScooter.l#8

@@ -486,13 +486,13 @@ Source: http://www.avagotech.com/docs/AV02-0410EN</description>
 <deviceset name="TVS_DIODE">
 <description>TVS protective diode</description>
 <gates>
-<gate name="G$1" symbol="TVS_DIODE" x="0" y="0"/>
+<gate name="D1" symbol="TVS_DIODE" x="0" y="0"/>
 </gates>
 <devices>
 <device name="SMA" package="DIOM5027X220N">
 <connects>
-<connect gate="G$1" pin="P$1" pad="1"/>
-<connect gate="G$1" pin="P$2" pad="2"/>
+<connect gate="D1" pin="P$1" pad="1"/>
+<connect gate="D1" pin="P$2" pad="2"/>
 </connects>
 <package3dinstances>
 <package3dinstance package3d_urn="urn:adsk.eagle:package:21928182/1"/>

+ 5 - 1
schematic/eScooter.l#9

@@ -486,10 +486,14 @@ Source: http://www.avagotech.com/docs/AV02-0410EN</description>
 <deviceset name="TVS_DIODE">
 <description>TVS protective diode</description>
 <gates>
-<gate name="G$1" symbol="TVS_DIODE" x="0" y="0"/>
+<gate name="D$1" symbol="TVS_DIODE" x="0" y="0"/>
 </gates>
 <devices>
 <device name="SMA" package="DIOM5027X220N">
+<connects>
+<connect gate="D$1" pin="P$1" pad="1"/>
+<connect gate="D$1" pin="P$2" pad="2"/>
+</connects>
 <package3dinstances>
 <package3dinstance package3d_urn="urn:adsk.eagle:package:21928182/1"/>
 </package3dinstances>

+ 50 - 0
schematic/eScooter.lbr

@@ -234,6 +234,31 @@ Source: http://www.avagotech.com/docs/AV02-0410EN</description>
 <text x="0" y="1.985" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
 <text x="0" y="-1.985" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
 </package>
+<package name="DIP826W56P254L937H458Q8B" urn="urn:adsk.eagle:footprint:22059849/1">
+<description>8-DIP, 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span, 9.38 X 6.99 X 4.58 mm body
+&lt;p&gt;8-pin DIP package with 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span with body size 9.38 X 6.99 X 4.58 mm&lt;/p&gt;</description>
+<circle x="-5.3669" y="3.81" radius="0.25" width="0" layer="21"/>
+<wire x1="-3.935" y1="4.7969" x2="-3.935" y2="4.955" width="0.12" layer="21"/>
+<wire x1="-3.935" y1="4.955" x2="3.935" y2="4.955" width="0.12" layer="21"/>
+<wire x1="3.935" y1="4.955" x2="3.935" y2="4.7969" width="0.12" layer="21"/>
+<wire x1="-3.935" y1="-4.7969" x2="-3.935" y2="-4.955" width="0.12" layer="21"/>
+<wire x1="-3.935" y1="-4.955" x2="3.935" y2="-4.955" width="0.12" layer="21"/>
+<wire x1="3.935" y1="-4.955" x2="3.935" y2="-4.7969" width="0.12" layer="21"/>
+<wire x1="3.935" y1="-4.955" x2="-3.935" y2="-4.955" width="0.12" layer="51"/>
+<wire x1="-3.935" y1="-4.955" x2="-3.935" y2="4.955" width="0.12" layer="51"/>
+<wire x1="-3.935" y1="4.955" x2="3.935" y2="4.955" width="0.12" layer="51"/>
+<wire x1="3.935" y1="4.955" x2="3.935" y2="-4.955" width="0.12" layer="51"/>
+<pad name="1" x="-4.13" y="3.81" drill="0.8657" diameter="1.4657"/>
+<pad name="2" x="-4.13" y="1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="3" x="-4.13" y="-1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="4" x="-4.13" y="-3.81" drill="0.8657" diameter="1.4657"/>
+<pad name="5" x="4.13" y="-3.81" drill="0.8657" diameter="1.4657"/>
+<pad name="6" x="4.13" y="-1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="7" x="4.13" y="1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="8" x="4.13" y="3.81" drill="0.8657" diameter="1.4657"/>
+<text x="0" y="5.59" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-5.59" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
+</package>
 </packages>
 <packages3d>
 <package3d name="DIP8" urn="urn:adsk.eagle:package:8089856/1" locally_modified="yes" type="box">
@@ -277,6 +302,13 @@ Source: http://www.avagotech.com/docs/AV02-0410EN</description>
 <packageinstance name="DIOM5027X220N"/>
 </packageinstances>
 </package3d>
+<package3d name="DIP826W56P254L937H458Q8B" urn="urn:adsk.eagle:package:22059831/1" type="model">
+<description>8-DIP, 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span, 9.38 X 6.99 X 4.58 mm body
+&lt;p&gt;8-pin DIP package with 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span with body size 9.38 X 6.99 X 4.58 mm&lt;/p&gt;</description>
+<packageinstances>
+<packageinstance name="DIP826W56P254L937H458Q8B"/>
+</packageinstances>
+</package3d>
 </packages3d>
 <symbols>
 <symbol name="MX5035">
@@ -398,6 +430,24 @@ Source: http://www.avagotech.com/docs/AV02-0410EN</description>
 <technology name=""/>
 </technologies>
 </device>
+<device name="PDIP8" package="DIP826W56P254L937H458Q8B">
+<connects>
+<connect gate="G$1" pin="BST" pad="1"/>
+<connect gate="G$1" pin="FB" pad="4"/>
+<connect gate="G$1" pin="GND" pad="6"/>
+<connect gate="G$1" pin="LX" pad="8"/>
+<connect gate="G$1" pin="ON/OFF" pad="5"/>
+<connect gate="G$1" pin="SGND" pad="3"/>
+<connect gate="G$1" pin="VD" pad="2"/>
+<connect gate="G$1" pin="VIN" pad="7"/>
+</connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:22059831/1"/>
+</package3dinstances>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
 </devices>
 </deviceset>
 <deviceset name="C">

+ 101 - 77
schematic/regulator.b#1

@@ -377,54 +377,6 @@ Source: coiltronics_dr_series.pdf</description>
 </package3d>
 </packages3d>
 </library>
-<library name="regulator">
-<packages>
-<package name="DIP8" urn="urn:adsk.eagle:footprint:4470/1">
-<description>&lt;b&gt;SMD DIL08&lt;/b&gt; Gull Wing Surface Mount Optioon 300&lt;p&gt;
-Source: http://www.avagotech.com/docs/AV02-0410EN</description>
-<wire x1="-4.81" y1="-3.075" x2="4.81" y2="-3.075" width="0.2032" layer="51"/>
-<wire x1="4.81" y1="-3.075" x2="4.81" y2="3.075" width="0.2032" layer="21"/>
-<wire x1="4.81" y1="3.075" x2="-4.81" y2="3.075" width="0.2032" layer="51"/>
-<wire x1="-4.81" y1="3.075" x2="-4.81" y2="-3.075" width="0.2032" layer="21"/>
-<circle x="-3.81" y="-2.159" radius="0.3667" width="0" layer="21"/>
-<smd name="1" x="-3.81" y="-4.45" dx="1.16" dy="2" layer="1"/>
-<smd name="2" x="-1.27" y="-4.45" dx="1.27" dy="2" layer="1"/>
-<smd name="3" x="1.27" y="-4.45" dx="1.27" dy="2" layer="1"/>
-<smd name="4" x="3.81" y="-4.45" dx="1.16" dy="2" layer="1"/>
-<smd name="5" x="3.81" y="4.45" dx="1.16" dy="2" layer="1"/>
-<smd name="6" x="1.27" y="4.45" dx="1.27" dy="2" layer="1"/>
-<smd name="7" x="-1.27" y="4.45" dx="1.27" dy="2" layer="1"/>
-<smd name="8" x="-3.81" y="4.45" dx="1.16" dy="2" layer="1"/>
-<text x="-5.635" y="-3.1351" size="1.27" layer="25" rot="R90">&gt;NAME</text>
-<text x="6.905" y="-4.4051" size="1.27" layer="27" rot="R90">&gt;VALUE</text>
-<rectangle x1="-4.0899" y1="-4.825" x2="-3.5301" y2="-3.81" layer="51"/>
-<rectangle x1="-1.5499" y1="-4.825" x2="-0.9901" y2="-3.81" layer="51"/>
-<rectangle x1="0.9901" y1="-4.825" x2="1.5499" y2="-3.81" layer="51"/>
-<rectangle x1="3.5301" y1="-4.825" x2="4.0899" y2="-3.81" layer="51"/>
-<rectangle x1="3.5301" y1="3.81" x2="4.0899" y2="4.825" layer="51"/>
-<rectangle x1="0.9901" y1="3.81" x2="1.5499" y2="4.825" layer="51"/>
-<rectangle x1="-1.5499" y1="3.81" x2="-0.9901" y2="4.825" layer="51"/>
-<rectangle x1="-4.0899" y1="3.81" x2="-3.5301" y2="4.825" layer="51"/>
-<rectangle x1="-2.15" y1="3.1" x2="-0.4" y2="3.81" layer="51" rot="R180"/>
-<rectangle x1="-4.1" y1="3.1" x2="-2.94" y2="3.81" layer="51" rot="R180"/>
-<rectangle x1="0.39" y1="3.1" x2="2.14" y2="3.81" layer="51" rot="R180"/>
-<rectangle x1="2.93" y1="3.1" x2="4.1" y2="3.81" layer="51" rot="R180"/>
-<rectangle x1="-4.075" y1="-3.81" x2="-2.93" y2="-3.1" layer="51"/>
-<rectangle x1="-2.14" y1="-3.81" x2="-0.39" y2="-3.1" layer="51"/>
-<rectangle x1="0.4" y1="-3.81" x2="2.15" y2="-3.1" layer="51"/>
-<rectangle x1="2.94" y1="-3.81" x2="4.1" y2="-3.1" layer="51"/>
-</package>
-</packages>
-<packages3d>
-<package3d name="DIP8" urn="urn:adsk.eagle:package:8089856/1" locally_modified="yes" type="box">
-<description>&lt;b&gt;SMD DIL08&lt;/b&gt; &lt;p&gt;
-dual in line package'</description>
-<packageinstances>
-<packageinstance name="DIP8"/>
-</packageinstances>
-</package3d>
-</packages3d>
-</library>
 <library name="SparkFun-Connectors" urn="urn:adsk.eagle:library:513">
 <description>&lt;h3&gt;SparkFun Connectors&lt;/h3&gt;
 This library contains electrically-functional connectors. 
@@ -688,6 +640,31 @@ CONN_04
 <text x="0" y="6.885" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
 <text x="0" y="-6.885" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
 </package>
+<package name="DIP826W56P254L937H458Q8B" urn="urn:adsk.eagle:footprint:22059849/1">
+<description>8-DIP, 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span, 9.38 X 6.99 X 4.58 mm body
+&lt;p&gt;8-pin DIP package with 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span with body size 9.38 X 6.99 X 4.58 mm&lt;/p&gt;</description>
+<circle x="-5.3669" y="3.81" radius="0.25" width="0" layer="21"/>
+<wire x1="-3.935" y1="4.7969" x2="-3.935" y2="4.955" width="0.12" layer="21"/>
+<wire x1="-3.935" y1="4.955" x2="3.935" y2="4.955" width="0.12" layer="21"/>
+<wire x1="3.935" y1="4.955" x2="3.935" y2="4.7969" width="0.12" layer="21"/>
+<wire x1="-3.935" y1="-4.7969" x2="-3.935" y2="-4.955" width="0.12" layer="21"/>
+<wire x1="-3.935" y1="-4.955" x2="3.935" y2="-4.955" width="0.12" layer="21"/>
+<wire x1="3.935" y1="-4.955" x2="3.935" y2="-4.7969" width="0.12" layer="21"/>
+<wire x1="3.935" y1="-4.955" x2="-3.935" y2="-4.955" width="0.12" layer="51"/>
+<wire x1="-3.935" y1="-4.955" x2="-3.935" y2="4.955" width="0.12" layer="51"/>
+<wire x1="-3.935" y1="4.955" x2="3.935" y2="4.955" width="0.12" layer="51"/>
+<wire x1="3.935" y1="4.955" x2="3.935" y2="-4.955" width="0.12" layer="51"/>
+<pad name="1" x="-4.13" y="3.81" drill="0.8657" diameter="1.4657"/>
+<pad name="2" x="-4.13" y="1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="3" x="-4.13" y="-1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="4" x="-4.13" y="-3.81" drill="0.8657" diameter="1.4657"/>
+<pad name="5" x="4.13" y="-3.81" drill="0.8657" diameter="1.4657"/>
+<pad name="6" x="4.13" y="-1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="7" x="4.13" y="1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="8" x="4.13" y="3.81" drill="0.8657" diameter="1.4657"/>
+<text x="0" y="5.59" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-5.59" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
+</package>
 </packages>
 <packages3d>
 <package3d name="DIOM5027X220N" urn="urn:adsk.eagle:package:21928182/1" type="model">
@@ -704,6 +681,13 @@ CONN_04
 <packageinstance name="CAPAE1230X1250N"/>
 </packageinstances>
 </package3d>
+<package3d name="DIP826W56P254L937H458Q8B" urn="urn:adsk.eagle:package:22059831/1" type="model">
+<description>8-DIP, 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span, 9.38 X 6.99 X 4.58 mm body
+&lt;p&gt;8-pin DIP package with 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span with body size 9.38 X 6.99 X 4.58 mm&lt;/p&gt;</description>
+<packageinstances>
+<packageinstance name="DIP826W56P254L937H458Q8B"/>
+</packageinstances>
+</package3d>
 </packages3d>
 </library>
 </libraries>
@@ -985,10 +969,6 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="1.27" y="76.2" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="VALUE" x="33.02" y="34.29" size="1.27" layer="27" rot="R180"/>
 </element>
-<element name="U1" library="regulator" package="DIP8" package3d_urn="urn:adsk.eagle:package:8089856/1" value="MAX5035DIP8" x="29.21" y="24.13" smashed="yes" rot="R90">
-<attribute name="NAME" x="27.3449" y="28.495" size="1.27" layer="25"/>
-<attribute name="VALUE" x="33.6151" y="31.035" size="1.27" layer="27" rot="R180"/>
-</element>
 <element name="J3" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02_2.54_SCREWTERM" package3d_urn="urn:adsk.eagle:package:38059/1" value="ON/OFF" x="15.24" y="30.48" smashed="yes">
 <attribute name="NAME" x="13.97" y="33.909" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="13.97" y="26.416" size="0.6096" layer="27" font="vector" ratio="20"/>
@@ -1092,19 +1072,19 @@ design rules under a new name.</description>
 <attribute name="NAME" x="24.665" y="16.51" size="1.27" layer="25" rot="R270" align="bottom-center"/>
 <attribute name="VALUE" x="10.895" y="16.51" size="1.27" layer="27" rot="R270" align="top-center"/>
 </element>
+<element name="U$1" library="eScooter" package="DIP826W56P254L937H458Q8B" package3d_urn="urn:adsk.eagle:package:22059831/1" value="MAX5035PDIP8" x="29.21" y="24.13" smashed="yes" rot="R180">
+<attribute name="NAME" x="29.21" y="18.54" size="1.27" layer="25" rot="R180" align="bottom-center"/>
+<attribute name="VALUE" x="29.21" y="29.72" size="1.27" layer="27" rot="R180" align="top-center"/>
+</element>
 </elements>
 <signals>
 <signal name="GND">
-<contactref element="U1" pad="6"/>
-<contactref element="U1" pad="3"/>
 <contactref element="C2" pad="1"/>
 <contactref element="D1" pad="A"/>
 <contactref element="C3" pad="2"/>
 <contactref element="R3" pad="1"/>
 <contactref element="J4" pad="1"/>
 <contactref element="J3" pad="P2"/>
-<wire x1="36.83" y1="25.6054" x2="36.6246" y2="25.4" width="1.27" layer="1"/>
-<wire x1="36.6246" y1="25.4" x2="33.66" y2="25.4" width="1.27" layer="1"/>
 <polygon width="1.27" layer="1">
 <vertex x="0" y="43"/>
 <vertex x="62" y="43"/>
@@ -1151,12 +1131,54 @@ design rules under a new name.</description>
 <contactref element="D2" pad="2"/>
 <contactref element="R8" pad="2"/>
 <contactref element="C4" pad="2"/>
+<contactref element="U$1" pad="6"/>
+<contactref element="U$1" pad="3"/>
+<wire x1="33.34" y1="25.4" x2="36.6246" y2="25.4" width="1.27" layer="1"/>
+<wire x1="36.6246" y1="25.4" x2="36.83" y2="25.6054" width="1.27" layer="1"/>
+<wire x1="44.45" y1="27.94" x2="50.48" y2="33.19" width="0" layer="19" extent="1-1"/>
+<wire x1="43.18" y1="29.21" x2="44.45" y2="27.94" width="0" layer="19" extent="1-1"/>
+<wire x1="41.91" y1="30.48" x2="43.18" y2="29.21" width="0" layer="19" extent="1-1"/>
+<wire x1="40.64" y1="31.75" x2="41.91" y2="30.48" width="0" layer="19" extent="1-1"/>
+<wire x1="39.37" y1="33.02" x2="40.64" y2="31.75" width="0" layer="19" extent="1-1"/>
+<wire x1="38.1" y1="34.29" x2="39.37" y2="33.02" width="0" layer="19" extent="1-1"/>
+<wire x1="36.83" y1="35.56" x2="38.1" y2="34.29" width="0" layer="19" extent="1-1"/>
+<wire x1="44.45" y1="25.4" x2="44.45" y2="27.94" width="0" layer="19" extent="1-1"/>
+<wire x1="34.29" y1="35.56" x2="36.83" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="44.45" y1="22.86" x2="44.45" y2="25.4" width="0" layer="19" extent="1-1"/>
+<wire x1="31.75" y1="35.56" x2="34.29" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="44.45" y1="20.32" x2="44.45" y2="22.86" width="0" layer="19" extent="1-1"/>
+<wire x1="45.72" y1="19.05" x2="44.45" y2="20.32" width="0" layer="19" extent="1-1"/>
+<wire x1="46.99" y1="17.78" x2="45.72" y2="19.05" width="0" layer="19" extent="1-1"/>
+<wire x1="48.26" y1="16.51" x2="46.99" y2="17.78" width="0" layer="19" extent="1-1"/>
+<wire x1="49.53" y1="15.24" x2="48.26" y2="16.51" width="0" layer="19" extent="1-1"/>
+<wire x1="50.8" y1="13.97" x2="49.53" y2="15.24" width="0" layer="19" extent="1-1"/>
+<wire x1="52.07" y1="12.7" x2="50.8" y2="13.97" width="0" layer="19" extent="1-1"/>
+<wire x1="53.34" y1="11.43" x2="52.07" y2="12.7" width="0" layer="19" extent="1-1"/>
+<wire x1="54.61" y1="10.16" x2="53.34" y2="11.43" width="0" layer="19" extent="1-1"/>
+<wire x1="29.21" y1="35.56" x2="31.75" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="26.67" y1="35.56" x2="29.21" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="24.13" y1="35.56" x2="26.67" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="21.59" y1="35.56" x2="24.13" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="19.05" y1="35.56" x2="21.59" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="16.51" y1="35.56" x2="19.05" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="46.838" y1="24.13" x2="44.45" y2="25.4" width="0" layer="19" extent="1-1"/>
+<wire x1="50.648" y1="17.78" x2="48.26" y2="16.51" width="0" layer="19" extent="1-1"/>
+<wire x1="50.648" y1="20.32" x2="50.648" y2="17.78" width="0" layer="19" extent="1-1"/>
+<wire x1="33.172" y1="31.75" x2="34.29" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="58.42" y1="8.89" x2="54.61" y2="10.16" width="0" layer="19" extent="1-1"/>
+<wire x1="15.24" y1="30.48" x2="16.51" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="10.03" y1="33.02" x2="15.24" y2="30.48" width="0" layer="19" extent="16-16"/>
+<wire x1="53.34" y1="4.25" x2="54.61" y2="10.16" width="0" layer="19" extent="1-1"/>
+<wire x1="49.53" y1="4.4988" x2="53.34" y2="4.25" width="0" layer="19" extent="1-1"/>
+<wire x1="33.34" y1="25.4" x2="33.172" y2="31.75" width="0" layer="19" extent="1-1"/>
+<wire x1="25.08" y1="25.4" x2="33.34" y2="25.4" width="0" layer="19" extent="1-1"/>
+<wire x1="2.54" y1="27.23" x2="10.03" y2="33.02" width="0" layer="19" extent="16-16"/>
+<wire x1="17.78" y1="11.585" x2="25.08" y2="25.4" width="0" layer="19" extent="1-1"/>
+<wire x1="16.66" y1="5.08" x2="17.78" y2="11.585" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VIN">
-<contactref element="U1" pad="7"/>
 <contactref element="R1" pad="1"/>
 <contactref element="J4" pad="2"/>
-<wire x1="24.76" y1="22.86" x2="21.59" y2="22.86" width="2.54" layer="1"/>
 <wire x1="21.59" y1="25.248" x2="21.59" y2="22.86" width="1.27" layer="1"/>
 <wire x1="2.54" y1="31.19" x2="6.91" y2="31.19" width="2.54" layer="1"/>
 <wire x1="6.91" y1="31.19" x2="10.16" y2="27.94" width="2.54" layer="1"/>
@@ -1168,27 +1190,26 @@ design rules under a new name.</description>
 <contactref element="C4" pad="1"/>
 <wire x1="11.43" y1="22.86" x2="10.16" y2="24.13" width="2.54" layer="1"/>
 <wire x1="10.16" y1="27.94" x2="10.16" y2="24.13" width="2.54" layer="1"/>
-<wire x1="21.59" y1="22.86" x2="17.78" y2="22.86" width="2.54" layer="1"/>
+<wire x1="17.78" y1="22.86" x2="21.59" y2="22.86" width="2.54" layer="1"/>
 <wire x1="17.78" y1="22.86" x2="11.43" y2="22.86" width="2.54" layer="1"/>
 <wire x1="17.78" y1="21.435" x2="17.78" y2="22.86" width="2.54" layer="1"/>
+<contactref element="U$1" pad="7"/>
+<wire x1="21.59" y1="22.86" x2="25.08" y2="22.86" width="2.54" layer="1"/>
 </signal>
 <signal name="N$1">
-<contactref element="U1" pad="1"/>
 <contactref element="C1" pad="1"/>
 <wire x1="30.6854" y1="16.51" x2="30.6854" y2="19.2554" width="1.27" layer="1"/>
-<wire x1="30.6854" y1="19.2554" x2="31.75" y2="20.32" width="1.27" layer="1"/>
-<wire x1="31.75" y1="20.32" x2="33.66" y2="20.32" width="1.27" layer="1"/>
+<wire x1="31.75" y1="20.32" x2="30.6854" y2="19.2554" width="1.27" layer="1"/>
+<contactref element="U$1" pad="1"/>
+<wire x1="33.34" y1="20.32" x2="31.75" y2="20.32" width="1.27" layer="1"/>
 </signal>
 <signal name="N$2">
 <contactref element="C1" pad="2"/>
-<contactref element="U1" pad="8"/>
 <contactref element="D1" pad="C"/>
 <contactref element="L1" pad="1"/>
 <wire x1="27.7346" y1="16.51" x2="27.7346" y2="19.2554" width="1.27" layer="1"/>
-<wire x1="27.7346" y1="19.2554" x2="26.67" y2="20.32" width="1.27" layer="1"/>
-<wire x1="26.67" y1="20.32" x2="24.76" y2="20.32" width="1.27" layer="1"/>
-<wire x1="24.76" y1="20.32" x2="24.13" y2="20.32" width="1.27" layer="1"/>
-<wire x1="24.13" y1="20.32" x2="22.86" y2="19.05" width="1.27" layer="1"/>
+<wire x1="26.67" y1="20.32" x2="27.7346" y2="19.2554" width="1.27" layer="1"/>
+<wire x1="22.86" y1="19.05" x2="24.13" y2="20.32" width="1.27" layer="1"/>
 <wire x1="22.86" y1="12.7" x2="22.86" y2="19.05" width="1.27" layer="1"/>
 <wire x1="29.06" y1="5.08" x2="25.4" y2="5.08" width="1.27" layer="1"/>
 <wire x1="25.4" y1="5.08" x2="22.86" y2="7.62" width="1.27" layer="1"/>
@@ -1197,45 +1218,48 @@ design rules under a new name.</description>
 <wire x1="24.13" y1="11.43" x2="31.75" y2="11.43" width="1.27" layer="1"/>
 <wire x1="39.37" y1="7.725" x2="35.455" y2="7.725" width="1.27" layer="1"/>
 <wire x1="35.455" y1="7.725" x2="31.75" y2="11.43" width="1.27" layer="1"/>
+<contactref element="U$1" pad="8"/>
+<wire x1="24.13" y1="20.32" x2="25.08" y2="20.32" width="1.27" layer="1"/>
+<wire x1="25.08" y1="20.32" x2="26.67" y2="20.32" width="1.27" layer="1"/>
 </signal>
 <signal name="12V">
 <contactref element="L1" pad="2"/>
-<contactref element="U1" pad="4"/>
 <contactref element="C3" pad="1"/>
 <wire x1="39.37" y1="26.67" x2="38.1" y2="27.94" width="1.27" layer="1"/>
-<wire x1="33.66" y1="27.94" x2="38.1" y2="27.94" width="1.27" layer="1"/>
 <wire x1="39.37" y1="26.67" x2="39.37" y2="17.675" width="1.27" layer="1"/>
 <contactref element="J1" pad="1"/>
 <wire x1="52.07" y1="6.35" x2="53.34" y2="6.35" width="1.27" layer="1"/>
 <wire x1="53.34" y1="6.35" x2="58.42" y2="6.35" width="1.27" layer="1"/>
 <wire x1="52.07" y1="6.35" x2="49.53" y2="8.89" width="1.27" layer="1"/>
-<wire x1="49.53" y1="10.7412" x2="48.9488" y2="10.7412" width="1.27" layer="1"/>
-<wire x1="48.9488" y1="10.7412" x2="47.095" y2="12.595" width="1.27" layer="1"/>
-<wire x1="47.095" y1="12.595" x2="44.45" y2="12.595" width="1.27" layer="1"/>
-<wire x1="39.37" y1="17.675" x2="44.45" y2="12.595" width="1.27" layer="1"/>
+<wire x1="49.53" y1="10.7412" x2="48.8438" y2="10.7412" width="1.27" layer="1"/>
+<wire x1="48.8438" y1="10.7412" x2="41.91" y2="17.675" width="1.27" layer="1"/>
+<wire x1="39.37" y1="17.675" x2="41.91" y2="17.675" width="1.27" layer="1"/>
 <wire x1="49.53" y1="10.7412" x2="49.53" y2="8.89" width="1.27" layer="1"/>
 <contactref element="D2" pad="1"/>
 <wire x1="53.34" y1="8.45" x2="53.34" y2="6.35" width="1.27" layer="1"/>
+<contactref element="U$1" pad="4"/>
+<wire x1="38.1" y1="27.94" x2="33.34" y2="27.94" width="1.27" layer="1"/>
 </signal>
 <signal name="N$4">
 <contactref element="C2" pad="2"/>
-<contactref element="U1" pad="2"/>
 <wire x1="36.6246" y1="22.86" x2="36.83" y2="22.6546" width="1.27" layer="1"/>
-<wire x1="33.66" y1="22.86" x2="36.6246" y2="22.86" width="1.27" layer="1"/>
+<contactref element="U$1" pad="2"/>
+<wire x1="33.34" y1="22.86" x2="36.6246" y2="22.86" width="1.27" layer="1"/>
 </signal>
 <signal name="N$5">
-<contactref element="U1" pad="5"/>
 <contactref element="R1" pad="2"/>
 <contactref element="R2" pad="1"/>
 <contactref element="J3" pad="P1"/>
 <wire x1="21.59" y1="28.092" x2="21.742" y2="27.94" width="1.27" layer="1"/>
-<wire x1="21.742" y1="27.94" x2="24.76" y2="27.94" width="1.27" layer="1"/>
 <wire x1="21.59" y1="28.092" x2="21.59" y2="30.48" width="1.27" layer="1"/>
 <wire x1="21.59" y1="30.48" x2="22.86" y2="31.75" width="1.27" layer="1"/>
 <wire x1="22.86" y1="31.75" x2="23.978" y2="31.75" width="1.27" layer="1"/>
 <wire x1="17.78" y1="30.48" x2="17.78" y2="29.21" width="1.27" layer="1"/>
 <wire x1="17.78" y1="29.21" x2="19.05" y2="27.94" width="1.27" layer="1"/>
 <wire x1="19.05" y1="27.94" x2="21.742" y2="27.94" width="1.27" layer="1"/>
+<contactref element="U$1" pad="5"/>
+<wire x1="21.59" y1="28.092" x2="24.928" y2="28.092" width="1.27" layer="1"/>
+<wire x1="24.928" y1="28.092" x2="25.08" y2="27.94" width="1.27" layer="1"/>
 </signal>
 <signal name="N$7">
 <contactref element="R2" pad="2"/>

+ 120 - 95
schematic/regulator.b#2

@@ -377,54 +377,6 @@ Source: coiltronics_dr_series.pdf</description>
 </package3d>
 </packages3d>
 </library>
-<library name="regulator">
-<packages>
-<package name="DIP8" urn="urn:adsk.eagle:footprint:4470/1">
-<description>&lt;b&gt;SMD DIL08&lt;/b&gt; Gull Wing Surface Mount Optioon 300&lt;p&gt;
-Source: http://www.avagotech.com/docs/AV02-0410EN</description>
-<wire x1="-4.81" y1="-3.075" x2="4.81" y2="-3.075" width="0.2032" layer="51"/>
-<wire x1="4.81" y1="-3.075" x2="4.81" y2="3.075" width="0.2032" layer="21"/>
-<wire x1="4.81" y1="3.075" x2="-4.81" y2="3.075" width="0.2032" layer="51"/>
-<wire x1="-4.81" y1="3.075" x2="-4.81" y2="-3.075" width="0.2032" layer="21"/>
-<circle x="-3.81" y="-2.159" radius="0.3667" width="0" layer="21"/>
-<smd name="1" x="-3.81" y="-4.45" dx="1.16" dy="2" layer="1"/>
-<smd name="2" x="-1.27" y="-4.45" dx="1.27" dy="2" layer="1"/>
-<smd name="3" x="1.27" y="-4.45" dx="1.27" dy="2" layer="1"/>
-<smd name="4" x="3.81" y="-4.45" dx="1.16" dy="2" layer="1"/>
-<smd name="5" x="3.81" y="4.45" dx="1.16" dy="2" layer="1"/>
-<smd name="6" x="1.27" y="4.45" dx="1.27" dy="2" layer="1"/>
-<smd name="7" x="-1.27" y="4.45" dx="1.27" dy="2" layer="1"/>
-<smd name="8" x="-3.81" y="4.45" dx="1.16" dy="2" layer="1"/>
-<text x="-5.635" y="-3.1351" size="1.27" layer="25" rot="R90">&gt;NAME</text>
-<text x="6.905" y="-4.4051" size="1.27" layer="27" rot="R90">&gt;VALUE</text>
-<rectangle x1="-4.0899" y1="-4.825" x2="-3.5301" y2="-3.81" layer="51"/>
-<rectangle x1="-1.5499" y1="-4.825" x2="-0.9901" y2="-3.81" layer="51"/>
-<rectangle x1="0.9901" y1="-4.825" x2="1.5499" y2="-3.81" layer="51"/>
-<rectangle x1="3.5301" y1="-4.825" x2="4.0899" y2="-3.81" layer="51"/>
-<rectangle x1="3.5301" y1="3.81" x2="4.0899" y2="4.825" layer="51"/>
-<rectangle x1="0.9901" y1="3.81" x2="1.5499" y2="4.825" layer="51"/>
-<rectangle x1="-1.5499" y1="3.81" x2="-0.9901" y2="4.825" layer="51"/>
-<rectangle x1="-4.0899" y1="3.81" x2="-3.5301" y2="4.825" layer="51"/>
-<rectangle x1="-2.15" y1="3.1" x2="-0.4" y2="3.81" layer="51" rot="R180"/>
-<rectangle x1="-4.1" y1="3.1" x2="-2.94" y2="3.81" layer="51" rot="R180"/>
-<rectangle x1="0.39" y1="3.1" x2="2.14" y2="3.81" layer="51" rot="R180"/>
-<rectangle x1="2.93" y1="3.1" x2="4.1" y2="3.81" layer="51" rot="R180"/>
-<rectangle x1="-4.075" y1="-3.81" x2="-2.93" y2="-3.1" layer="51"/>
-<rectangle x1="-2.14" y1="-3.81" x2="-0.39" y2="-3.1" layer="51"/>
-<rectangle x1="0.4" y1="-3.81" x2="2.15" y2="-3.1" layer="51"/>
-<rectangle x1="2.94" y1="-3.81" x2="4.1" y2="-3.1" layer="51"/>
-</package>
-</packages>
-<packages3d>
-<package3d name="DIP8" urn="urn:adsk.eagle:package:8089856/1" locally_modified="yes" type="box">
-<description>&lt;b&gt;SMD DIL08&lt;/b&gt; &lt;p&gt;
-dual in line package'</description>
-<packageinstances>
-<packageinstance name="DIP8"/>
-</packageinstances>
-</package3d>
-</packages3d>
-</library>
 <library name="SparkFun-Connectors" urn="urn:adsk.eagle:library:513">
 <description>&lt;h3&gt;SparkFun Connectors&lt;/h3&gt;
 This library contains electrically-functional connectors. 
@@ -688,6 +640,31 @@ CONN_04
 <text x="0" y="6.885" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
 <text x="0" y="-6.885" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
 </package>
+<package name="DIP826W56P254L937H458Q8B" urn="urn:adsk.eagle:footprint:22059849/1">
+<description>8-DIP, 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span, 9.38 X 6.99 X 4.58 mm body
+&lt;p&gt;8-pin DIP package with 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span with body size 9.38 X 6.99 X 4.58 mm&lt;/p&gt;</description>
+<circle x="-5.3669" y="3.81" radius="0.25" width="0" layer="21"/>
+<wire x1="-3.935" y1="4.7969" x2="-3.935" y2="4.955" width="0.12" layer="21"/>
+<wire x1="-3.935" y1="4.955" x2="3.935" y2="4.955" width="0.12" layer="21"/>
+<wire x1="3.935" y1="4.955" x2="3.935" y2="4.7969" width="0.12" layer="21"/>
+<wire x1="-3.935" y1="-4.7969" x2="-3.935" y2="-4.955" width="0.12" layer="21"/>
+<wire x1="-3.935" y1="-4.955" x2="3.935" y2="-4.955" width="0.12" layer="21"/>
+<wire x1="3.935" y1="-4.955" x2="3.935" y2="-4.7969" width="0.12" layer="21"/>
+<wire x1="3.935" y1="-4.955" x2="-3.935" y2="-4.955" width="0.12" layer="51"/>
+<wire x1="-3.935" y1="-4.955" x2="-3.935" y2="4.955" width="0.12" layer="51"/>
+<wire x1="-3.935" y1="4.955" x2="3.935" y2="4.955" width="0.12" layer="51"/>
+<wire x1="3.935" y1="4.955" x2="3.935" y2="-4.955" width="0.12" layer="51"/>
+<pad name="1" x="-4.13" y="3.81" drill="0.8657" diameter="1.4657"/>
+<pad name="2" x="-4.13" y="1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="3" x="-4.13" y="-1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="4" x="-4.13" y="-3.81" drill="0.8657" diameter="1.4657"/>
+<pad name="5" x="4.13" y="-3.81" drill="0.8657" diameter="1.4657"/>
+<pad name="6" x="4.13" y="-1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="7" x="4.13" y="1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="8" x="4.13" y="3.81" drill="0.8657" diameter="1.4657"/>
+<text x="0" y="5.59" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-5.59" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
+</package>
 </packages>
 <packages3d>
 <package3d name="DIOM5027X220N" urn="urn:adsk.eagle:package:21928182/1" type="model">
@@ -704,6 +681,13 @@ CONN_04
 <packageinstance name="CAPAE1230X1250N"/>
 </packageinstances>
 </package3d>
+<package3d name="DIP826W56P254L937H458Q8B" urn="urn:adsk.eagle:package:22059831/1" type="model">
+<description>8-DIP, 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span, 9.38 X 6.99 X 4.58 mm body
+&lt;p&gt;8-pin DIP package with 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span with body size 9.38 X 6.99 X 4.58 mm&lt;/p&gt;</description>
+<packageinstances>
+<packageinstance name="DIP826W56P254L937H458Q8B"/>
+</packageinstances>
+</package3d>
 </packages3d>
 </library>
 </libraries>
@@ -929,20 +913,20 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="34.9733" y="24.13" size="1.27" layer="27" rot="R270" align="top-center"/>
 <attribute name="VOLTAGE_RATING" value="" x="-7.62" y="-1.27" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPMP7343X310N" package3d_urn="urn:adsk.eagle:package:16290885/1" value="15uF" x="49.53" y="6.35" smashed="yes" rot="R270">
-<attribute name="CATEGORY" value="Capacitor" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="MANUFACTURER" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="MPN" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="NAME" x="48.655" y="6.35" size="1.27" layer="25" rot="R270" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="PART_STATUS" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="SERIES" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="THERMALLOSS" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="TYPE" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="VALUE" x="46.595" y="6.35" size="1.27" layer="27" rot="R270" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
+<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPMP7343X310N" package3d_urn="urn:adsk.eagle:package:16290885/1" value="15uF" x="49.53" y="7.62" smashed="yes" rot="R270">
+<attribute name="CATEGORY" value="Capacitor" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="MANUFACTURER" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="MPN" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="NAME" x="48.655" y="7.62" size="1.27" layer="25" rot="R270" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="PART_STATUS" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="SERIES" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="THERMALLOSS" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="TYPE" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="VALUE" x="46.595" y="7.62" size="1.27" layer="27" rot="R270" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
 <element name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" package="DO201AD" package3d_urn="urn:adsk.eagle:package:10898389/2" value="SB5100" x="22.86" y="5.08" smashed="yes" rot="R180">
 <attribute name="CREATED_BY" value="PCBLayout.com" x="2.54" y="43.18" size="1.778" layer="27" rot="R180" display="off"/>
@@ -985,10 +969,6 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="1.27" y="76.2" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="VALUE" x="33.02" y="34.29" size="1.27" layer="27" rot="R180"/>
 </element>
-<element name="U1" library="regulator" package="DIP8" package3d_urn="urn:adsk.eagle:package:8089856/1" value="MAX5035DIP8" x="29.21" y="24.13" smashed="yes" rot="R90">
-<attribute name="NAME" x="27.3449" y="28.495" size="1.27" layer="25"/>
-<attribute name="VALUE" x="33.6151" y="31.035" size="1.27" layer="27" rot="R180"/>
-</element>
 <element name="J3" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02_2.54_SCREWTERM" package3d_urn="urn:adsk.eagle:package:38059/1" value="ON/OFF" x="15.24" y="30.48" smashed="yes">
 <attribute name="NAME" x="13.97" y="33.909" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="13.97" y="26.416" size="0.6096" layer="27" font="vector" ratio="20"/>
@@ -1078,9 +1058,9 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="52.07" y="20.32" size="1.778" layer="27" display="off"/>
 <attribute name="VALUE" x="50.8" y="17.78" size="1.27" layer="27"/>
 </element>
-<element name="D2" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="P4SMAJ12CA" x="53.34" y="5.08" smashed="yes" rot="R270">
-<attribute name="NAME" x="55.325" y="5.08" size="1.27" layer="25" rot="R270" align="bottom-center"/>
-<attribute name="VALUE" x="51.355" y="5.08" size="1.27" layer="27" rot="R270" align="top-center"/>
+<element name="D2" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="P4SMAJ12CA" x="53.34" y="6.35" smashed="yes" rot="R270">
+<attribute name="NAME" x="55.325" y="6.35" size="1.27" layer="25" rot="R270" align="bottom-center"/>
+<attribute name="VALUE" x="51.355" y="6.35" size="1.27" layer="27" rot="R270" align="top-center"/>
 </element>
 <element name="R8" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="52.07" y="17.78" smashed="yes" rot="R180">
 <attribute name="NAME" x="53.34" y="16.51" size="1.27" layer="25" rot="R180"/>
@@ -1092,19 +1072,19 @@ design rules under a new name.</description>
 <attribute name="NAME" x="24.665" y="16.51" size="1.27" layer="25" rot="R270" align="bottom-center"/>
 <attribute name="VALUE" x="10.895" y="16.51" size="1.27" layer="27" rot="R270" align="top-center"/>
 </element>
+<element name="U$1" library="eScooter" package="DIP826W56P254L937H458Q8B" package3d_urn="urn:adsk.eagle:package:22059831/1" value="MAX5035PDIP8" x="29.21" y="24.13" smashed="yes" rot="R180">
+<attribute name="NAME" x="29.21" y="18.54" size="1.27" layer="25" rot="R180" align="bottom-center"/>
+<attribute name="VALUE" x="29.21" y="29.72" size="1.27" layer="27" rot="R180" align="top-center"/>
+</element>
 </elements>
 <signals>
 <signal name="GND">
-<contactref element="U1" pad="6"/>
-<contactref element="U1" pad="3"/>
 <contactref element="C2" pad="1"/>
 <contactref element="D1" pad="A"/>
 <contactref element="C3" pad="2"/>
 <contactref element="R3" pad="1"/>
 <contactref element="J4" pad="1"/>
 <contactref element="J3" pad="P2"/>
-<wire x1="36.83" y1="25.6054" x2="36.6246" y2="25.4" width="1.27" layer="1"/>
-<wire x1="36.6246" y1="25.4" x2="33.66" y2="25.4" width="1.27" layer="1"/>
 <polygon width="1.27" layer="1">
 <vertex x="0" y="43"/>
 <vertex x="62" y="43"/>
@@ -1151,12 +1131,54 @@ design rules under a new name.</description>
 <contactref element="D2" pad="2"/>
 <contactref element="R8" pad="2"/>
 <contactref element="C4" pad="2"/>
+<contactref element="U$1" pad="6"/>
+<contactref element="U$1" pad="3"/>
+<wire x1="33.34" y1="25.4" x2="36.6246" y2="25.4" width="1.27" layer="1"/>
+<wire x1="36.6246" y1="25.4" x2="36.83" y2="25.6054" width="1.27" layer="1"/>
+<wire x1="44.45" y1="27.94" x2="50.48" y2="33.19" width="0" layer="19" extent="1-1"/>
+<wire x1="43.18" y1="29.21" x2="44.45" y2="27.94" width="0" layer="19" extent="1-1"/>
+<wire x1="41.91" y1="30.48" x2="43.18" y2="29.21" width="0" layer="19" extent="1-1"/>
+<wire x1="40.64" y1="31.75" x2="41.91" y2="30.48" width="0" layer="19" extent="1-1"/>
+<wire x1="39.37" y1="33.02" x2="40.64" y2="31.75" width="0" layer="19" extent="1-1"/>
+<wire x1="38.1" y1="34.29" x2="39.37" y2="33.02" width="0" layer="19" extent="1-1"/>
+<wire x1="36.83" y1="35.56" x2="38.1" y2="34.29" width="0" layer="19" extent="1-1"/>
+<wire x1="44.45" y1="25.4" x2="44.45" y2="27.94" width="0" layer="19" extent="1-1"/>
+<wire x1="34.29" y1="35.56" x2="36.83" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="44.45" y1="22.86" x2="44.45" y2="25.4" width="0" layer="19" extent="1-1"/>
+<wire x1="31.75" y1="35.56" x2="34.29" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="44.45" y1="20.32" x2="44.45" y2="22.86" width="0" layer="19" extent="1-1"/>
+<wire x1="45.72" y1="19.05" x2="44.45" y2="20.32" width="0" layer="19" extent="1-1"/>
+<wire x1="46.99" y1="17.78" x2="45.72" y2="19.05" width="0" layer="19" extent="1-1"/>
+<wire x1="48.26" y1="16.51" x2="46.99" y2="17.78" width="0" layer="19" extent="1-1"/>
+<wire x1="49.53" y1="15.24" x2="48.26" y2="16.51" width="0" layer="19" extent="1-1"/>
+<wire x1="50.8" y1="13.97" x2="49.53" y2="15.24" width="0" layer="19" extent="1-1"/>
+<wire x1="52.07" y1="12.7" x2="50.8" y2="13.97" width="0" layer="19" extent="1-1"/>
+<wire x1="53.34" y1="11.43" x2="52.07" y2="12.7" width="0" layer="19" extent="1-1"/>
+<wire x1="54.61" y1="10.16" x2="53.34" y2="11.43" width="0" layer="19" extent="1-1"/>
+<wire x1="29.21" y1="35.56" x2="31.75" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="26.67" y1="35.56" x2="29.21" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="24.13" y1="35.56" x2="26.67" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="21.59" y1="35.56" x2="24.13" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="19.05" y1="35.56" x2="21.59" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="16.51" y1="35.56" x2="19.05" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="46.838" y1="24.13" x2="44.45" y2="25.4" width="0" layer="19" extent="1-1"/>
+<wire x1="50.648" y1="17.78" x2="48.26" y2="16.51" width="0" layer="19" extent="1-1"/>
+<wire x1="50.648" y1="20.32" x2="50.648" y2="17.78" width="0" layer="19" extent="1-1"/>
+<wire x1="33.172" y1="31.75" x2="34.29" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="58.42" y1="8.89" x2="54.61" y2="10.16" width="0" layer="19" extent="1-1"/>
+<wire x1="15.24" y1="30.48" x2="16.51" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="10.03" y1="33.02" x2="15.24" y2="30.48" width="0" layer="19" extent="16-16"/>
+<wire x1="53.34" y1="4.25" x2="54.61" y2="10.16" width="0" layer="19" extent="1-1"/>
+<wire x1="49.53" y1="4.4988" x2="53.34" y2="4.25" width="0" layer="19" extent="1-1"/>
+<wire x1="33.34" y1="25.4" x2="33.172" y2="31.75" width="0" layer="19" extent="1-1"/>
+<wire x1="25.08" y1="25.4" x2="33.34" y2="25.4" width="0" layer="19" extent="1-1"/>
+<wire x1="2.54" y1="27.23" x2="10.03" y2="33.02" width="0" layer="19" extent="16-16"/>
+<wire x1="17.78" y1="11.585" x2="25.08" y2="25.4" width="0" layer="19" extent="1-1"/>
+<wire x1="16.66" y1="5.08" x2="17.78" y2="11.585" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VIN">
-<contactref element="U1" pad="7"/>
 <contactref element="R1" pad="1"/>
 <contactref element="J4" pad="2"/>
-<wire x1="24.76" y1="22.86" x2="21.59" y2="22.86" width="2.54" layer="1"/>
 <wire x1="21.59" y1="25.248" x2="21.59" y2="22.86" width="1.27" layer="1"/>
 <wire x1="2.54" y1="31.19" x2="6.91" y2="31.19" width="2.54" layer="1"/>
 <wire x1="6.91" y1="31.19" x2="10.16" y2="27.94" width="2.54" layer="1"/>
@@ -1171,24 +1193,23 @@ design rules under a new name.</description>
 <wire x1="21.59" y1="22.86" x2="17.78" y2="22.86" width="2.54" layer="1"/>
 <wire x1="17.78" y1="22.86" x2="11.43" y2="22.86" width="2.54" layer="1"/>
 <wire x1="17.78" y1="21.435" x2="17.78" y2="22.86" width="2.54" layer="1"/>
+<contactref element="U$1" pad="7"/>
+<wire x1="25.08" y1="22.86" x2="2.54" y2="31.19" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$1">
-<contactref element="U1" pad="1"/>
 <contactref element="C1" pad="1"/>
 <wire x1="30.6854" y1="16.51" x2="30.6854" y2="19.2554" width="1.27" layer="1"/>
 <wire x1="30.6854" y1="19.2554" x2="31.75" y2="20.32" width="1.27" layer="1"/>
-<wire x1="31.75" y1="20.32" x2="33.66" y2="20.32" width="1.27" layer="1"/>
+<contactref element="U$1" pad="1"/>
+<wire x1="33.34" y1="20.32" x2="30.6854" y2="16.51" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$2">
 <contactref element="C1" pad="2"/>
-<contactref element="U1" pad="8"/>
 <contactref element="D1" pad="C"/>
 <contactref element="L1" pad="1"/>
 <wire x1="27.7346" y1="16.51" x2="27.7346" y2="19.2554" width="1.27" layer="1"/>
-<wire x1="27.7346" y1="19.2554" x2="26.67" y2="20.32" width="1.27" layer="1"/>
-<wire x1="26.67" y1="20.32" x2="24.76" y2="20.32" width="1.27" layer="1"/>
-<wire x1="24.76" y1="20.32" x2="24.13" y2="20.32" width="1.27" layer="1"/>
-<wire x1="24.13" y1="20.32" x2="22.86" y2="19.05" width="1.27" layer="1"/>
+<wire x1="26.67" y1="20.32" x2="27.7346" y2="19.2554" width="1.27" layer="1"/>
+<wire x1="22.86" y1="19.05" x2="24.13" y2="20.32" width="1.27" layer="1"/>
 <wire x1="22.86" y1="12.7" x2="22.86" y2="19.05" width="1.27" layer="1"/>
 <wire x1="29.06" y1="5.08" x2="25.4" y2="5.08" width="1.27" layer="1"/>
 <wire x1="25.4" y1="5.08" x2="22.86" y2="7.62" width="1.27" layer="1"/>
@@ -1197,44 +1218,48 @@ design rules under a new name.</description>
 <wire x1="24.13" y1="11.43" x2="31.75" y2="11.43" width="1.27" layer="1"/>
 <wire x1="39.37" y1="7.725" x2="35.455" y2="7.725" width="1.27" layer="1"/>
 <wire x1="35.455" y1="7.725" x2="31.75" y2="11.43" width="1.27" layer="1"/>
+<contactref element="U$1" pad="8"/>
+<wire x1="24.13" y1="20.32" x2="25.08" y2="20.32" width="1.27" layer="1"/>
+<wire x1="25.08" y1="20.32" x2="26.67" y2="20.32" width="1.27" layer="1"/>
 </signal>
 <signal name="12V">
 <contactref element="L1" pad="2"/>
-<contactref element="U1" pad="4"/>
 <contactref element="C3" pad="1"/>
 <wire x1="39.37" y1="26.67" x2="38.1" y2="27.94" width="1.27" layer="1"/>
-<wire x1="33.66" y1="27.94" x2="38.1" y2="27.94" width="1.27" layer="1"/>
 <wire x1="39.37" y1="26.67" x2="39.37" y2="17.675" width="1.27" layer="1"/>
 <contactref element="J1" pad="1"/>
-<wire x1="50.8" y1="6.35" x2="53.34" y2="6.35" width="1.27" layer="1"/>
+<wire x1="52.07" y1="6.35" x2="53.34" y2="6.35" width="1.27" layer="1"/>
 <wire x1="53.34" y1="6.35" x2="58.42" y2="6.35" width="1.27" layer="1"/>
-<wire x1="50.8" y1="6.35" x2="49.53" y2="7.62" width="1.27" layer="1"/>
-<wire x1="49.53" y1="9.4712" x2="49.53" y2="10.16" width="1.27" layer="1"/>
-<wire x1="49.53" y1="10.16" x2="42.015" y2="17.675" width="1.27" layer="1"/>
-<wire x1="39.37" y1="17.675" x2="42.015" y2="17.675" width="1.27" layer="1"/>
-<wire x1="49.53" y1="9.4712" x2="49.53" y2="7.62" width="1.27" layer="1"/>
+<wire x1="52.07" y1="6.35" x2="49.53" y2="8.89" width="1.27" layer="1"/>
+<wire x1="49.53" y1="10.7412" x2="48.8438" y2="10.7412" width="1.27" layer="1"/>
+<wire x1="48.8438" y1="10.7412" x2="41.91" y2="17.675" width="1.27" layer="1"/>
+<wire x1="39.37" y1="17.675" x2="41.91" y2="17.675" width="1.27" layer="1"/>
+<wire x1="49.53" y1="10.7412" x2="49.53" y2="8.89" width="1.27" layer="1"/>
 <contactref element="D2" pad="1"/>
-<wire x1="53.34" y1="7.18" x2="53.34" y2="6.35" width="1.27" layer="1"/>
+<wire x1="53.34" y1="8.45" x2="53.34" y2="6.35" width="1.27" layer="1"/>
+<contactref element="U$1" pad="4"/>
+<wire x1="38.1" y1="27.94" x2="33.34" y2="27.94" width="1.27" layer="1"/>
 </signal>
 <signal name="N$4">
 <contactref element="C2" pad="2"/>
-<contactref element="U1" pad="2"/>
 <wire x1="36.6246" y1="22.86" x2="36.83" y2="22.6546" width="1.27" layer="1"/>
-<wire x1="33.66" y1="22.86" x2="36.6246" y2="22.86" width="1.27" layer="1"/>
+<contactref element="U$1" pad="2"/>
+<wire x1="33.34" y1="22.86" x2="36.6246" y2="22.86" width="1.27" layer="1"/>
 </signal>
 <signal name="N$5">
-<contactref element="U1" pad="5"/>
 <contactref element="R1" pad="2"/>
 <contactref element="R2" pad="1"/>
 <contactref element="J3" pad="P1"/>
 <wire x1="21.59" y1="28.092" x2="21.742" y2="27.94" width="1.27" layer="1"/>
-<wire x1="21.742" y1="27.94" x2="24.76" y2="27.94" width="1.27" layer="1"/>
 <wire x1="21.59" y1="28.092" x2="21.59" y2="30.48" width="1.27" layer="1"/>
 <wire x1="21.59" y1="30.48" x2="22.86" y2="31.75" width="1.27" layer="1"/>
 <wire x1="22.86" y1="31.75" x2="23.978" y2="31.75" width="1.27" layer="1"/>
 <wire x1="17.78" y1="30.48" x2="17.78" y2="29.21" width="1.27" layer="1"/>
 <wire x1="17.78" y1="29.21" x2="19.05" y2="27.94" width="1.27" layer="1"/>
 <wire x1="19.05" y1="27.94" x2="21.742" y2="27.94" width="1.27" layer="1"/>
+<contactref element="U$1" pad="5"/>
+<wire x1="21.59" y1="28.092" x2="24.928" y2="28.092" width="1.27" layer="1"/>
+<wire x1="24.928" y1="28.092" x2="25.08" y2="27.94" width="1.27" layer="1"/>
 </signal>
 <signal name="N$7">
 <contactref element="R2" pad="2"/>

+ 141 - 117
schematic/regulator.b#3

@@ -377,54 +377,6 @@ Source: coiltronics_dr_series.pdf</description>
 </package3d>
 </packages3d>
 </library>
-<library name="regulator">
-<packages>
-<package name="DIP8" urn="urn:adsk.eagle:footprint:4470/1">
-<description>&lt;b&gt;SMD DIL08&lt;/b&gt; Gull Wing Surface Mount Optioon 300&lt;p&gt;
-Source: http://www.avagotech.com/docs/AV02-0410EN</description>
-<wire x1="-4.81" y1="-3.075" x2="4.81" y2="-3.075" width="0.2032" layer="51"/>
-<wire x1="4.81" y1="-3.075" x2="4.81" y2="3.075" width="0.2032" layer="21"/>
-<wire x1="4.81" y1="3.075" x2="-4.81" y2="3.075" width="0.2032" layer="51"/>
-<wire x1="-4.81" y1="3.075" x2="-4.81" y2="-3.075" width="0.2032" layer="21"/>
-<circle x="-3.81" y="-2.159" radius="0.3667" width="0" layer="21"/>
-<smd name="1" x="-3.81" y="-4.45" dx="1.16" dy="2" layer="1"/>
-<smd name="2" x="-1.27" y="-4.45" dx="1.27" dy="2" layer="1"/>
-<smd name="3" x="1.27" y="-4.45" dx="1.27" dy="2" layer="1"/>
-<smd name="4" x="3.81" y="-4.45" dx="1.16" dy="2" layer="1"/>
-<smd name="5" x="3.81" y="4.45" dx="1.16" dy="2" layer="1"/>
-<smd name="6" x="1.27" y="4.45" dx="1.27" dy="2" layer="1"/>
-<smd name="7" x="-1.27" y="4.45" dx="1.27" dy="2" layer="1"/>
-<smd name="8" x="-3.81" y="4.45" dx="1.16" dy="2" layer="1"/>
-<text x="-5.635" y="-3.1351" size="1.27" layer="25" rot="R90">&gt;NAME</text>
-<text x="6.905" y="-4.4051" size="1.27" layer="27" rot="R90">&gt;VALUE</text>
-<rectangle x1="-4.0899" y1="-4.825" x2="-3.5301" y2="-3.81" layer="51"/>
-<rectangle x1="-1.5499" y1="-4.825" x2="-0.9901" y2="-3.81" layer="51"/>
-<rectangle x1="0.9901" y1="-4.825" x2="1.5499" y2="-3.81" layer="51"/>
-<rectangle x1="3.5301" y1="-4.825" x2="4.0899" y2="-3.81" layer="51"/>
-<rectangle x1="3.5301" y1="3.81" x2="4.0899" y2="4.825" layer="51"/>
-<rectangle x1="0.9901" y1="3.81" x2="1.5499" y2="4.825" layer="51"/>
-<rectangle x1="-1.5499" y1="3.81" x2="-0.9901" y2="4.825" layer="51"/>
-<rectangle x1="-4.0899" y1="3.81" x2="-3.5301" y2="4.825" layer="51"/>
-<rectangle x1="-2.15" y1="3.1" x2="-0.4" y2="3.81" layer="51" rot="R180"/>
-<rectangle x1="-4.1" y1="3.1" x2="-2.94" y2="3.81" layer="51" rot="R180"/>
-<rectangle x1="0.39" y1="3.1" x2="2.14" y2="3.81" layer="51" rot="R180"/>
-<rectangle x1="2.93" y1="3.1" x2="4.1" y2="3.81" layer="51" rot="R180"/>
-<rectangle x1="-4.075" y1="-3.81" x2="-2.93" y2="-3.1" layer="51"/>
-<rectangle x1="-2.14" y1="-3.81" x2="-0.39" y2="-3.1" layer="51"/>
-<rectangle x1="0.4" y1="-3.81" x2="2.15" y2="-3.1" layer="51"/>
-<rectangle x1="2.94" y1="-3.81" x2="4.1" y2="-3.1" layer="51"/>
-</package>
-</packages>
-<packages3d>
-<package3d name="DIP8" urn="urn:adsk.eagle:package:8089856/1" locally_modified="yes" type="box">
-<description>&lt;b&gt;SMD DIL08&lt;/b&gt; &lt;p&gt;
-dual in line package'</description>
-<packageinstances>
-<packageinstance name="DIP8"/>
-</packageinstances>
-</package3d>
-</packages3d>
-</library>
 <library name="SparkFun-Connectors" urn="urn:adsk.eagle:library:513">
 <description>&lt;h3&gt;SparkFun Connectors&lt;/h3&gt;
 This library contains electrically-functional connectors. 
@@ -688,6 +640,31 @@ CONN_04
 <text x="0" y="6.885" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
 <text x="0" y="-6.885" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
 </package>
+<package name="DIP826W56P254L937H458Q8B" urn="urn:adsk.eagle:footprint:22059849/1">
+<description>8-DIP, 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span, 9.38 X 6.99 X 4.58 mm body
+&lt;p&gt;8-pin DIP package with 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span with body size 9.38 X 6.99 X 4.58 mm&lt;/p&gt;</description>
+<circle x="-5.3669" y="3.81" radius="0.25" width="0" layer="21"/>
+<wire x1="-3.935" y1="4.7969" x2="-3.935" y2="4.955" width="0.12" layer="21"/>
+<wire x1="-3.935" y1="4.955" x2="3.935" y2="4.955" width="0.12" layer="21"/>
+<wire x1="3.935" y1="4.955" x2="3.935" y2="4.7969" width="0.12" layer="21"/>
+<wire x1="-3.935" y1="-4.7969" x2="-3.935" y2="-4.955" width="0.12" layer="21"/>
+<wire x1="-3.935" y1="-4.955" x2="3.935" y2="-4.955" width="0.12" layer="21"/>
+<wire x1="3.935" y1="-4.955" x2="3.935" y2="-4.7969" width="0.12" layer="21"/>
+<wire x1="3.935" y1="-4.955" x2="-3.935" y2="-4.955" width="0.12" layer="51"/>
+<wire x1="-3.935" y1="-4.955" x2="-3.935" y2="4.955" width="0.12" layer="51"/>
+<wire x1="-3.935" y1="4.955" x2="3.935" y2="4.955" width="0.12" layer="51"/>
+<wire x1="3.935" y1="4.955" x2="3.935" y2="-4.955" width="0.12" layer="51"/>
+<pad name="1" x="-4.13" y="3.81" drill="0.8657" diameter="1.4657"/>
+<pad name="2" x="-4.13" y="1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="3" x="-4.13" y="-1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="4" x="-4.13" y="-3.81" drill="0.8657" diameter="1.4657"/>
+<pad name="5" x="4.13" y="-3.81" drill="0.8657" diameter="1.4657"/>
+<pad name="6" x="4.13" y="-1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="7" x="4.13" y="1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="8" x="4.13" y="3.81" drill="0.8657" diameter="1.4657"/>
+<text x="0" y="5.59" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-5.59" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
+</package>
 </packages>
 <packages3d>
 <package3d name="DIOM5027X220N" urn="urn:adsk.eagle:package:21928182/1" type="model">
@@ -704,6 +681,13 @@ CONN_04
 <packageinstance name="CAPAE1230X1250N"/>
 </packageinstances>
 </package3d>
+<package3d name="DIP826W56P254L937H458Q8B" urn="urn:adsk.eagle:package:22059831/1" type="model">
+<description>8-DIP, 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span, 9.38 X 6.99 X 4.58 mm body
+&lt;p&gt;8-pin DIP package with 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span with body size 9.38 X 6.99 X 4.58 mm&lt;/p&gt;</description>
+<packageinstances>
+<packageinstance name="DIP826W56P254L937H458Q8B"/>
+</packageinstances>
+</package3d>
 </packages3d>
 </library>
 </libraries>
@@ -929,29 +913,29 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="34.9733" y="24.13" size="1.27" layer="27" rot="R270" align="top-center"/>
 <attribute name="VOLTAGE_RATING" value="" x="-7.62" y="-1.27" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPMP7343X310N" package3d_urn="urn:adsk.eagle:package:16290885/1" value="15uF" x="49.53" y="6.35" smashed="yes" rot="R270">
-<attribute name="CATEGORY" value="Capacitor" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="MANUFACTURER" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="MPN" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="NAME" x="48.655" y="6.35" size="1.27" layer="25" rot="R270" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="PART_STATUS" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="SERIES" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="THERMALLOSS" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="TYPE" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="VALUE" x="46.595" y="6.35" size="1.27" layer="27" rot="R270" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
+<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPMP7343X310N" package3d_urn="urn:adsk.eagle:package:16290885/1" value="15uF" x="49.53" y="7.62" smashed="yes" rot="R270">
+<attribute name="CATEGORY" value="Capacitor" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="MANUFACTURER" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="MPN" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="NAME" x="48.655" y="7.62" size="1.27" layer="25" rot="R270" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="PART_STATUS" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="SERIES" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="THERMALLOSS" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="TYPE" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="VALUE" x="46.595" y="7.62" size="1.27" layer="27" rot="R270" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" package="DO201AD" package3d_urn="urn:adsk.eagle:package:10898389/2" value="SB5100" x="22.86" y="6.35" smashed="yes" rot="R180">
-<attribute name="CREATED_BY" value="PCBLayout.com" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="DIGIKEY_PART_NUMBER" value="MBR360GOS-ND" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="MANUFACTURER" value="ON Semiconductor" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="MPN" value="MBR360G" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="NAME" x="15.37" y="4.62" size="1.27" layer="25" ratio="10" rot="R180"/>
-<attribute name="PACKAGE" value="DO-201AD" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="VALUE" x="30.36" y="10.6" size="1.27" layer="27" ratio="10" rot="R180"/>
+<element name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" package="DO201AD" package3d_urn="urn:adsk.eagle:package:10898389/2" value="SB5100" x="22.86" y="5.08" smashed="yes" rot="R180">
+<attribute name="CREATED_BY" value="PCBLayout.com" x="2.54" y="43.18" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="DIGIKEY_PART_NUMBER" value="MBR360GOS-ND" x="2.54" y="43.18" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="MANUFACTURER" value="ON Semiconductor" x="2.54" y="43.18" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="MPN" value="MBR360G" x="2.54" y="43.18" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="NAME" x="15.37" y="3.35" size="1.27" layer="25" ratio="10" rot="R180"/>
+<attribute name="PACKAGE" value="DO-201AD" x="2.54" y="43.18" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="VALUE" x="30.36" y="9.33" size="1.27" layer="27" ratio="10" rot="R180"/>
 </element>
 <element name="J4" library="Connectors" library_urn="urn:adsk.eagle:library:14555660" package="HDR-02" package3d_urn="urn:adsk.eagle:package:10989917/2" value="IN" x="2.54" y="29.21" smashed="yes" rot="R90">
 <attribute name="CREATED_BY" value="PCBLayout.com" x="12.7" y="69.85" size="1.778" layer="27" rot="R90" display="off"/>
@@ -961,11 +945,11 @@ design rules under a new name.</description>
 <attribute name="NAME" x="1.27" y="22.86" size="1.27" layer="25"/>
 <attribute name="VALUE" x="11.43" y="25.4" size="1.27" layer="27" rot="R90"/>
 </element>
-<element name="L1" library="inductors" library_urn="urn:adsk.eagle:library:243" package="DR127" package3d_urn="urn:adsk.eagle:package:15117/1" value="DR127" x="39.37" y="11.43" smashed="yes" rot="R90">
-<attribute name="NAME" x="32.98" y="4.62" size="1.27" layer="25" rot="R180"/>
-<attribute name="POPULARITY" value="2" x="64.77" y="46.99" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="SPICEPREFIX" value="L" x="64.77" y="46.99" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="VALUE" x="43.87" y="8.43" size="1.27" layer="27" rot="R90"/>
+<element name="L1" library="inductors" library_urn="urn:adsk.eagle:library:243" package="DR127" package3d_urn="urn:adsk.eagle:package:15117/1" value="DR127" x="39.37" y="12.7" smashed="yes" rot="R90">
+<attribute name="NAME" x="32.98" y="5.89" size="1.27" layer="25" rot="R180"/>
+<attribute name="POPULARITY" value="2" x="64.77" y="48.26" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="SPICEPREFIX" value="L" x="64.77" y="48.26" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="VALUE" x="43.87" y="9.7" size="1.27" layer="27" rot="R90"/>
 </element>
 <element name="R1" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="1M" x="21.59" y="26.67" smashed="yes" rot="R90">
 <attribute name="NAME" x="17.78" y="25.4" size="1.27" layer="25"/>
@@ -985,10 +969,6 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="1.27" y="76.2" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="VALUE" x="33.02" y="34.29" size="1.27" layer="27" rot="R180"/>
 </element>
-<element name="U1" library="regulator" package="DIP8" package3d_urn="urn:adsk.eagle:package:8089856/1" value="MAX5035DIP8" x="29.21" y="24.13" smashed="yes" rot="R90">
-<attribute name="NAME" x="27.3449" y="28.495" size="1.27" layer="25"/>
-<attribute name="VALUE" x="33.6151" y="31.035" size="1.27" layer="27" rot="R180"/>
-</element>
 <element name="J3" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02_2.54_SCREWTERM" package3d_urn="urn:adsk.eagle:package:38059/1" value="ON/OFF" x="15.24" y="30.48" smashed="yes">
 <attribute name="NAME" x="13.97" y="33.909" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="13.97" y="26.416" size="0.6096" layer="27" font="vector" ratio="20"/>
@@ -1078,9 +1058,9 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="52.07" y="20.32" size="1.778" layer="27" display="off"/>
 <attribute name="VALUE" x="50.8" y="17.78" size="1.27" layer="27"/>
 </element>
-<element name="D2" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="P4SMAJ12CA" x="53.34" y="5.08" smashed="yes" rot="R270">
-<attribute name="NAME" x="55.325" y="5.08" size="1.27" layer="25" rot="R270" align="bottom-center"/>
-<attribute name="VALUE" x="51.355" y="5.08" size="1.27" layer="27" rot="R270" align="top-center"/>
+<element name="D2" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="P4SMAJ12CA" x="53.34" y="6.35" smashed="yes" rot="R270">
+<attribute name="NAME" x="55.325" y="6.35" size="1.27" layer="25" rot="R270" align="bottom-center"/>
+<attribute name="VALUE" x="51.355" y="6.35" size="1.27" layer="27" rot="R270" align="top-center"/>
 </element>
 <element name="R8" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="52.07" y="17.78" smashed="yes" rot="R180">
 <attribute name="NAME" x="53.34" y="16.51" size="1.27" layer="25" rot="R180"/>
@@ -1088,15 +1068,17 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="52.07" y="17.78" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="VALUE" x="53.34" y="20.32" size="1.27" layer="27" rot="R180"/>
 </element>
-<element name="C4" library="eScooter" package="CAPAE1230X1250N" package3d_urn="urn:adsk.eagle:package:21812541/1" value="68uF" x="11.43" y="16.51" smashed="yes" rot="R270">
-<attribute name="NAME" x="18.315" y="16.51" size="1.27" layer="25" rot="R270" align="bottom-center"/>
-<attribute name="VALUE" x="4.545" y="16.51" size="1.27" layer="27" rot="R270" align="top-center"/>
+<element name="C4" library="eScooter" package="CAPAE1230X1250N" package3d_urn="urn:adsk.eagle:package:21812541/1" value="68uF" x="17.78" y="16.51" smashed="yes" rot="R270">
+<attribute name="NAME" x="24.665" y="16.51" size="1.27" layer="25" rot="R270" align="bottom-center"/>
+<attribute name="VALUE" x="10.895" y="16.51" size="1.27" layer="27" rot="R270" align="top-center"/>
+</element>
+<element name="U$1" library="eScooter" package="DIP826W56P254L937H458Q8B" package3d_urn="urn:adsk.eagle:package:22059831/1" value="MAX5035PDIP8" x="-6.35" y="7.62" smashed="yes">
+<attribute name="NAME" x="-6.35" y="13.21" size="1.27" layer="25" align="bottom-center"/>
+<attribute name="VALUE" x="-6.35" y="2.03" size="1.27" layer="27" align="top-center"/>
 </element>
 </elements>
 <signals>
 <signal name="GND">
-<contactref element="U1" pad="6"/>
-<contactref element="U1" pad="3"/>
 <contactref element="C2" pad="1"/>
 <contactref element="D1" pad="A"/>
 <contactref element="C3" pad="2"/>
@@ -1104,7 +1086,6 @@ design rules under a new name.</description>
 <contactref element="J4" pad="1"/>
 <contactref element="J3" pad="P2"/>
 <wire x1="36.83" y1="25.6054" x2="36.6246" y2="25.4" width="1.27" layer="1"/>
-<wire x1="36.6246" y1="25.4" x2="33.66" y2="25.4" width="1.27" layer="1"/>
 <polygon width="1.27" layer="1">
 <vertex x="0" y="43"/>
 <vertex x="62" y="43"/>
@@ -1151,12 +1132,53 @@ design rules under a new name.</description>
 <contactref element="D2" pad="2"/>
 <contactref element="R8" pad="2"/>
 <contactref element="C4" pad="2"/>
+<contactref element="U$1" pad="6"/>
+<contactref element="U$1" pad="3"/>
+<wire x1="44.45" y1="27.94" x2="50.48" y2="33.19" width="0" layer="19" extent="1-1"/>
+<wire x1="43.18" y1="29.21" x2="44.45" y2="27.94" width="0" layer="19" extent="1-1"/>
+<wire x1="41.91" y1="30.48" x2="43.18" y2="29.21" width="0" layer="19" extent="1-1"/>
+<wire x1="40.64" y1="31.75" x2="41.91" y2="30.48" width="0" layer="19" extent="1-1"/>
+<wire x1="39.37" y1="33.02" x2="40.64" y2="31.75" width="0" layer="19" extent="1-1"/>
+<wire x1="38.1" y1="34.29" x2="39.37" y2="33.02" width="0" layer="19" extent="1-1"/>
+<wire x1="36.83" y1="35.56" x2="38.1" y2="34.29" width="0" layer="19" extent="1-1"/>
+<wire x1="44.45" y1="25.4" x2="44.45" y2="27.94" width="0" layer="19" extent="1-1"/>
+<wire x1="34.29" y1="35.56" x2="36.83" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="44.45" y1="22.86" x2="44.45" y2="25.4" width="0" layer="19" extent="1-1"/>
+<wire x1="31.75" y1="35.56" x2="34.29" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="44.45" y1="20.32" x2="44.45" y2="22.86" width="0" layer="19" extent="1-1"/>
+<wire x1="45.72" y1="19.05" x2="44.45" y2="20.32" width="0" layer="19" extent="1-1"/>
+<wire x1="46.99" y1="17.78" x2="45.72" y2="19.05" width="0" layer="19" extent="1-1"/>
+<wire x1="48.26" y1="16.51" x2="46.99" y2="17.78" width="0" layer="19" extent="1-1"/>
+<wire x1="49.53" y1="15.24" x2="48.26" y2="16.51" width="0" layer="19" extent="1-1"/>
+<wire x1="50.8" y1="13.97" x2="49.53" y2="15.24" width="0" layer="19" extent="1-1"/>
+<wire x1="52.07" y1="12.7" x2="50.8" y2="13.97" width="0" layer="19" extent="1-1"/>
+<wire x1="53.34" y1="11.43" x2="52.07" y2="12.7" width="0" layer="19" extent="1-1"/>
+<wire x1="54.61" y1="10.16" x2="53.34" y2="11.43" width="0" layer="19" extent="1-1"/>
+<wire x1="29.21" y1="35.56" x2="31.75" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="26.67" y1="35.56" x2="29.21" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="24.13" y1="35.56" x2="26.67" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="21.59" y1="35.56" x2="24.13" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="19.05" y1="35.56" x2="21.59" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="16.51" y1="35.56" x2="19.05" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="46.838" y1="24.13" x2="44.45" y2="25.4" width="0" layer="19" extent="1-1"/>
+<wire x1="50.648" y1="17.78" x2="48.26" y2="16.51" width="0" layer="19" extent="1-1"/>
+<wire x1="50.648" y1="20.32" x2="50.648" y2="17.78" width="0" layer="19" extent="1-1"/>
+<wire x1="33.172" y1="31.75" x2="34.29" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="58.42" y1="8.89" x2="54.61" y2="10.16" width="0" layer="19" extent="1-1"/>
+<wire x1="15.24" y1="30.48" x2="16.51" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="10.03" y1="33.02" x2="15.24" y2="30.48" width="0" layer="19" extent="16-16"/>
+<wire x1="53.34" y1="4.25" x2="54.61" y2="10.16" width="0" layer="19" extent="1-1"/>
+<wire x1="49.53" y1="4.4988" x2="53.34" y2="4.25" width="0" layer="19" extent="1-1"/>
+<wire x1="36.83" y1="25.6054" x2="41.91" y2="30.48" width="0" layer="19" extent="1-1"/>
+<wire x1="2.54" y1="27.23" x2="10.03" y2="33.02" width="0" layer="19" extent="16-16"/>
+<wire x1="17.78" y1="11.585" x2="15.24" y2="30.48" width="0" layer="19" extent="1-1"/>
+<wire x1="16.66" y1="5.08" x2="17.78" y2="11.585" width="0" layer="19" extent="1-1"/>
+<wire x1="-2.22" y1="6.35" x2="16.66" y2="5.08" width="0" layer="19" extent="1-1"/>
+<wire x1="-10.48" y1="6.35" x2="-2.22" y2="6.35" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VIN">
-<contactref element="U1" pad="7"/>
 <contactref element="R1" pad="1"/>
 <contactref element="J4" pad="2"/>
-<wire x1="24.76" y1="22.86" x2="21.59" y2="22.86" width="2.54" layer="1"/>
 <wire x1="21.59" y1="25.248" x2="21.59" y2="22.86" width="1.27" layer="1"/>
 <wire x1="2.54" y1="31.19" x2="6.91" y2="31.19" width="2.54" layer="1"/>
 <wire x1="6.91" y1="31.19" x2="10.16" y2="27.94" width="2.54" layer="1"/>
@@ -1168,73 +1190,75 @@ design rules under a new name.</description>
 <contactref element="C4" pad="1"/>
 <wire x1="11.43" y1="22.86" x2="10.16" y2="24.13" width="2.54" layer="1"/>
 <wire x1="10.16" y1="27.94" x2="10.16" y2="24.13" width="2.54" layer="1"/>
-<wire x1="21.59" y1="22.86" x2="11.43" y2="22.86" width="2.54" layer="1"/>
-<wire x1="11.43" y1="21.435" x2="11.43" y2="22.86" width="2.54" layer="1"/>
+<wire x1="21.59" y1="22.86" x2="17.78" y2="22.86" width="2.54" layer="1"/>
+<wire x1="17.78" y1="22.86" x2="11.43" y2="22.86" width="2.54" layer="1"/>
+<wire x1="17.78" y1="21.435" x2="17.78" y2="22.86" width="2.54" layer="1"/>
+<contactref element="U$1" pad="7"/>
+<wire x1="-2.22" y1="8.89" x2="2.54" y2="31.19" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$1">
-<contactref element="U1" pad="1"/>
 <contactref element="C1" pad="1"/>
 <wire x1="30.6854" y1="16.51" x2="30.6854" y2="19.2554" width="1.27" layer="1"/>
 <wire x1="30.6854" y1="19.2554" x2="31.75" y2="20.32" width="1.27" layer="1"/>
-<wire x1="31.75" y1="20.32" x2="33.66" y2="20.32" width="1.27" layer="1"/>
+<contactref element="U$1" pad="1"/>
+<wire x1="-10.48" y1="11.43" x2="30.6854" y2="16.51" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$2">
 <contactref element="C1" pad="2"/>
-<contactref element="U1" pad="8"/>
 <contactref element="D1" pad="C"/>
 <contactref element="L1" pad="1"/>
 <wire x1="27.7346" y1="16.51" x2="27.7346" y2="19.2554" width="1.27" layer="1"/>
 <wire x1="27.7346" y1="19.2554" x2="26.67" y2="20.32" width="1.27" layer="1"/>
-<wire x1="26.67" y1="20.32" x2="24.76" y2="20.32" width="1.27" layer="1"/>
-<wire x1="24.76" y1="20.32" x2="24.13" y2="20.32" width="1.27" layer="1"/>
 <wire x1="24.13" y1="20.32" x2="22.86" y2="19.05" width="1.27" layer="1"/>
 <wire x1="22.86" y1="12.7" x2="22.86" y2="19.05" width="1.27" layer="1"/>
-<wire x1="29.06" y1="6.35" x2="24.13" y2="6.35" width="1.27" layer="1"/>
-<wire x1="24.13" y1="6.35" x2="22.86" y2="7.62" width="1.27" layer="1"/>
+<wire x1="29.06" y1="5.08" x2="25.4" y2="5.08" width="1.27" layer="1"/>
+<wire x1="25.4" y1="5.08" x2="22.86" y2="7.62" width="1.27" layer="1"/>
 <wire x1="22.86" y1="7.62" x2="22.86" y2="12.7" width="1.27" layer="1"/>
 <wire x1="22.86" y1="12.7" x2="24.13" y2="11.43" width="1.27" layer="1"/>
 <wire x1="24.13" y1="11.43" x2="31.75" y2="11.43" width="1.27" layer="1"/>
-<wire x1="39.37" y1="6.455" x2="36.725" y2="6.455" width="1.27" layer="1"/>
-<wire x1="36.725" y1="6.455" x2="31.75" y2="11.43" width="1.27" layer="1"/>
+<wire x1="39.37" y1="7.725" x2="35.455" y2="7.725" width="1.27" layer="1"/>
+<wire x1="35.455" y1="7.725" x2="31.75" y2="11.43" width="1.27" layer="1"/>
+<contactref element="U$1" pad="8"/>
+<wire x1="24.13" y1="20.32" x2="26.67" y2="20.32" width="0" layer="19" extent="1-1"/>
+<wire x1="-2.22" y1="11.43" x2="24.13" y2="20.32" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="12V">
 <contactref element="L1" pad="2"/>
-<contactref element="U1" pad="4"/>
 <contactref element="C3" pad="1"/>
-<wire x1="40.64" y1="25.4" x2="38.1" y2="27.94" width="1.27" layer="1"/>
-<wire x1="33.66" y1="27.94" x2="38.1" y2="27.94" width="1.27" layer="1"/>
-<wire x1="40.64" y1="25.4" x2="40.64" y2="17.675" width="1.27" layer="1"/>
-<wire x1="40.64" y1="17.675" x2="39.37" y2="16.405" width="1.27" layer="1"/>
+<wire x1="39.37" y1="26.67" x2="38.1" y2="27.94" width="1.27" layer="1"/>
+<wire x1="39.37" y1="26.67" x2="39.37" y2="17.675" width="1.27" layer="1"/>
 <contactref element="J1" pad="1"/>
-<wire x1="50.8" y1="6.35" x2="53.34" y2="6.35" width="1.27" layer="1"/>
+<wire x1="52.07" y1="6.35" x2="53.34" y2="6.35" width="1.27" layer="1"/>
 <wire x1="53.34" y1="6.35" x2="58.42" y2="6.35" width="1.27" layer="1"/>
-<wire x1="50.8" y1="6.35" x2="49.53" y2="7.62" width="1.27" layer="1"/>
-<wire x1="49.53" y1="9.4712" x2="49.53" y2="10.16" width="1.27" layer="1"/>
-<wire x1="49.53" y1="10.16" x2="43.285" y2="16.405" width="1.27" layer="1"/>
-<wire x1="39.37" y1="16.405" x2="43.285" y2="16.405" width="1.27" layer="1"/>
-<wire x1="49.53" y1="9.4712" x2="49.53" y2="7.62" width="1.27" layer="1"/>
+<wire x1="52.07" y1="6.35" x2="49.53" y2="8.89" width="1.27" layer="1"/>
+<wire x1="49.53" y1="10.7412" x2="48.8438" y2="10.7412" width="1.27" layer="1"/>
+<wire x1="48.8438" y1="10.7412" x2="41.91" y2="17.675" width="1.27" layer="1"/>
+<wire x1="39.37" y1="17.675" x2="41.91" y2="17.675" width="1.27" layer="1"/>
+<wire x1="49.53" y1="10.7412" x2="49.53" y2="8.89" width="1.27" layer="1"/>
 <contactref element="D2" pad="1"/>
-<wire x1="53.34" y1="7.18" x2="53.34" y2="6.35" width="1.27" layer="1"/>
+<wire x1="53.34" y1="8.45" x2="53.34" y2="6.35" width="1.27" layer="1"/>
+<contactref element="U$1" pad="4"/>
+<wire x1="-10.48" y1="3.81" x2="39.37" y2="17.675" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$4">
 <contactref element="C2" pad="2"/>
-<contactref element="U1" pad="2"/>
 <wire x1="36.6246" y1="22.86" x2="36.83" y2="22.6546" width="1.27" layer="1"/>
-<wire x1="33.66" y1="22.86" x2="36.6246" y2="22.86" width="1.27" layer="1"/>
+<contactref element="U$1" pad="2"/>
+<wire x1="-10.48" y1="8.89" x2="36.6246" y2="22.86" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$5">
-<contactref element="U1" pad="5"/>
 <contactref element="R1" pad="2"/>
 <contactref element="R2" pad="1"/>
 <contactref element="J3" pad="P1"/>
 <wire x1="21.59" y1="28.092" x2="21.742" y2="27.94" width="1.27" layer="1"/>
-<wire x1="21.742" y1="27.94" x2="24.76" y2="27.94" width="1.27" layer="1"/>
 <wire x1="21.59" y1="28.092" x2="21.59" y2="30.48" width="1.27" layer="1"/>
 <wire x1="21.59" y1="30.48" x2="22.86" y2="31.75" width="1.27" layer="1"/>
 <wire x1="22.86" y1="31.75" x2="23.978" y2="31.75" width="1.27" layer="1"/>
 <wire x1="17.78" y1="30.48" x2="17.78" y2="29.21" width="1.27" layer="1"/>
 <wire x1="17.78" y1="29.21" x2="19.05" y2="27.94" width="1.27" layer="1"/>
 <wire x1="19.05" y1="27.94" x2="21.742" y2="27.94" width="1.27" layer="1"/>
+<contactref element="U$1" pad="5"/>
+<wire x1="-2.22" y1="3.81" x2="17.78" y2="30.48" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$7">
 <contactref element="R2" pad="2"/>

+ 52 - 52
schematic/regulator.b#4

@@ -929,29 +929,29 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="34.9733" y="24.13" size="1.27" layer="27" rot="R270" align="top-center"/>
 <attribute name="VOLTAGE_RATING" value="" x="-7.62" y="-1.27" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPMP7343X310N" package3d_urn="urn:adsk.eagle:package:16290885/1" value="15uF" x="49.53" y="6.35" smashed="yes" rot="R270">
-<attribute name="CATEGORY" value="Capacitor" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="MANUFACTURER" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="MPN" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="NAME" x="48.655" y="6.35" size="1.27" layer="25" rot="R270" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="PART_STATUS" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="SERIES" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="THERMALLOSS" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="TYPE" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="VALUE" x="46.595" y="6.35" size="1.27" layer="27" rot="R270" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
+<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPMP7343X310N" package3d_urn="urn:adsk.eagle:package:16290885/1" value="15uF" x="49.53" y="7.62" smashed="yes" rot="R270">
+<attribute name="CATEGORY" value="Capacitor" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="MANUFACTURER" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="MPN" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="NAME" x="48.655" y="7.62" size="1.27" layer="25" rot="R270" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="PART_STATUS" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="SERIES" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="THERMALLOSS" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="TYPE" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="VALUE" x="46.595" y="7.62" size="1.27" layer="27" rot="R270" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" package="DO201AD" package3d_urn="urn:adsk.eagle:package:10898389/2" value="SB5100" x="22.86" y="6.35" smashed="yes" rot="R180">
-<attribute name="CREATED_BY" value="PCBLayout.com" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="DIGIKEY_PART_NUMBER" value="MBR360GOS-ND" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="MANUFACTURER" value="ON Semiconductor" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="MPN" value="MBR360G" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="NAME" x="15.37" y="4.62" size="1.27" layer="25" ratio="10" rot="R180"/>
-<attribute name="PACKAGE" value="DO-201AD" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="VALUE" x="30.36" y="10.6" size="1.27" layer="27" ratio="10" rot="R180"/>
+<element name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" package="DO201AD" package3d_urn="urn:adsk.eagle:package:10898389/2" value="SB5100" x="22.86" y="5.08" smashed="yes" rot="R180">
+<attribute name="CREATED_BY" value="PCBLayout.com" x="2.54" y="43.18" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="DIGIKEY_PART_NUMBER" value="MBR360GOS-ND" x="2.54" y="43.18" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="MANUFACTURER" value="ON Semiconductor" x="2.54" y="43.18" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="MPN" value="MBR360G" x="2.54" y="43.18" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="NAME" x="15.37" y="3.35" size="1.27" layer="25" ratio="10" rot="R180"/>
+<attribute name="PACKAGE" value="DO-201AD" x="2.54" y="43.18" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="VALUE" x="30.36" y="9.33" size="1.27" layer="27" ratio="10" rot="R180"/>
 </element>
 <element name="J4" library="Connectors" library_urn="urn:adsk.eagle:library:14555660" package="HDR-02" package3d_urn="urn:adsk.eagle:package:10989917/2" value="IN" x="2.54" y="29.21" smashed="yes" rot="R90">
 <attribute name="CREATED_BY" value="PCBLayout.com" x="12.7" y="69.85" size="1.778" layer="27" rot="R90" display="off"/>
@@ -961,11 +961,11 @@ design rules under a new name.</description>
 <attribute name="NAME" x="1.27" y="22.86" size="1.27" layer="25"/>
 <attribute name="VALUE" x="11.43" y="25.4" size="1.27" layer="27" rot="R90"/>
 </element>
-<element name="L1" library="inductors" library_urn="urn:adsk.eagle:library:243" package="DR127" package3d_urn="urn:adsk.eagle:package:15117/1" value="DR127" x="39.37" y="11.43" smashed="yes" rot="R90">
-<attribute name="NAME" x="32.98" y="4.62" size="1.27" layer="25" rot="R180"/>
-<attribute name="POPULARITY" value="2" x="64.77" y="46.99" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="SPICEPREFIX" value="L" x="64.77" y="46.99" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="VALUE" x="43.87" y="8.43" size="1.27" layer="27" rot="R90"/>
+<element name="L1" library="inductors" library_urn="urn:adsk.eagle:library:243" package="DR127" package3d_urn="urn:adsk.eagle:package:15117/1" value="DR127" x="39.37" y="12.7" smashed="yes" rot="R90">
+<attribute name="NAME" x="32.98" y="5.89" size="1.27" layer="25" rot="R180"/>
+<attribute name="POPULARITY" value="2" x="64.77" y="48.26" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="SPICEPREFIX" value="L" x="64.77" y="48.26" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="VALUE" x="43.87" y="9.7" size="1.27" layer="27" rot="R90"/>
 </element>
 <element name="R1" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="1M" x="21.59" y="26.67" smashed="yes" rot="R90">
 <attribute name="NAME" x="17.78" y="25.4" size="1.27" layer="25"/>
@@ -1010,11 +1010,11 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="47.625" y="31.115" size="1.27" layer="27"/>
 </element>
 <element name="J1" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X08_LONGPADS" package3d_urn="urn:adsk.eagle:package:38142/1" value="COMM" x="58.42" y="6.35" smashed="yes" rot="R90">
-<attribute name="NAME" x="56.261" y="5.207" size="0.6096" layer="25" font="vector" ratio="20" rot="R90"/>
+<attribute name="NAME" x="56.261" y="7.747" size="0.6096" layer="25" font="vector" ratio="20" rot="R90"/>
 <attribute name="VALUE" x="61.214" y="5.334" size="0.6096" layer="27" font="vector" ratio="20" rot="R90"/>
 </element>
 <element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="STOP_LIGHT" x="52.07" y="39.37" smashed="yes" rot="R180">
-<attribute name="NAME" x="53.34" y="37.973" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
+<attribute name="NAME" x="54.61" y="39.243" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
 <attribute name="VALUE" x="53.34" y="41.402" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
 </element>
 <element name="J5" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X04" package3d_urn="urn:adsk.eagle:package:38085/1" value="DRIVER" x="58.42" y="29.21" smashed="yes" rot="R90">
@@ -1040,7 +1040,7 @@ design rules under a new name.</description>
 <attribute name="DRAIN_CURRENT" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="MANUFACTURER" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="MPN" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
-<attribute name="NAME" x="4.445" y="40.005" size="1.27" layer="26" rot="MR270"/>
+<attribute name="NAME" x="4.445" y="37.465" size="1.27" layer="26" rot="MR270"/>
 <attribute name="OPERATING_TEMP" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="PART_STATUS" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="ROHS_COMPLIANT" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
@@ -1078,9 +1078,9 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="52.07" y="20.32" size="1.778" layer="27" display="off"/>
 <attribute name="VALUE" x="50.8" y="17.78" size="1.27" layer="27"/>
 </element>
-<element name="D2" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="P4SMAJ12CA" x="53.34" y="5.08" smashed="yes" rot="R270">
-<attribute name="NAME" x="55.325" y="5.08" size="1.27" layer="25" rot="R270" align="bottom-center"/>
-<attribute name="VALUE" x="51.355" y="5.08" size="1.27" layer="27" rot="R270" align="top-center"/>
+<element name="D2" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="P4SMAJ12CA" x="53.34" y="6.35" smashed="yes" rot="R270">
+<attribute name="NAME" x="55.325" y="6.35" size="1.27" layer="25" rot="R270" align="bottom-center"/>
+<attribute name="VALUE" x="51.355" y="6.35" size="1.27" layer="27" rot="R270" align="top-center"/>
 </element>
 <element name="R8" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="52.07" y="17.78" smashed="yes" rot="R180">
 <attribute name="NAME" x="53.34" y="16.51" size="1.27" layer="25" rot="R180"/>
@@ -1088,9 +1088,9 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="52.07" y="17.78" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="VALUE" x="53.34" y="20.32" size="1.27" layer="27" rot="R180"/>
 </element>
-<element name="C4" library="eScooter" package="CAPAE1230X1250N" package3d_urn="urn:adsk.eagle:package:21812541/1" value="68uF" x="11.43" y="16.51" smashed="yes" rot="R270">
-<attribute name="NAME" x="18.315" y="16.51" size="1.27" layer="25" rot="R270" align="bottom-center"/>
-<attribute name="VALUE" x="4.545" y="16.51" size="1.27" layer="27" rot="R270" align="top-center"/>
+<element name="C4" library="eScooter" package="CAPAE1230X1250N" package3d_urn="urn:adsk.eagle:package:21812541/1" value="68uF" x="17.78" y="16.51" smashed="yes" rot="R270">
+<attribute name="NAME" x="24.665" y="16.51" size="1.27" layer="25" rot="R270" align="bottom-center"/>
+<attribute name="VALUE" x="10.895" y="16.51" size="1.27" layer="27" rot="R270" align="top-center"/>
 </element>
 </elements>
 <signals>
@@ -1168,8 +1168,9 @@ design rules under a new name.</description>
 <contactref element="C4" pad="1"/>
 <wire x1="11.43" y1="22.86" x2="10.16" y2="24.13" width="2.54" layer="1"/>
 <wire x1="10.16" y1="27.94" x2="10.16" y2="24.13" width="2.54" layer="1"/>
-<wire x1="21.59" y1="22.86" x2="11.43" y2="22.86" width="2.54" layer="1"/>
-<wire x1="11.43" y1="21.435" x2="11.43" y2="22.86" width="2.54" layer="1"/>
+<wire x1="21.59" y1="22.86" x2="17.78" y2="22.86" width="2.54" layer="1"/>
+<wire x1="17.78" y1="22.86" x2="11.43" y2="22.86" width="2.54" layer="1"/>
+<wire x1="17.78" y1="21.435" x2="17.78" y2="22.86" width="2.54" layer="1"/>
 </signal>
 <signal name="N$1">
 <contactref element="U1" pad="1"/>
@@ -1189,32 +1190,31 @@ design rules under a new name.</description>
 <wire x1="24.76" y1="20.32" x2="24.13" y2="20.32" width="1.27" layer="1"/>
 <wire x1="24.13" y1="20.32" x2="22.86" y2="19.05" width="1.27" layer="1"/>
 <wire x1="22.86" y1="12.7" x2="22.86" y2="19.05" width="1.27" layer="1"/>
-<wire x1="29.06" y1="6.35" x2="24.13" y2="6.35" width="1.27" layer="1"/>
-<wire x1="24.13" y1="6.35" x2="22.86" y2="7.62" width="1.27" layer="1"/>
+<wire x1="29.06" y1="5.08" x2="25.4" y2="5.08" width="1.27" layer="1"/>
+<wire x1="25.4" y1="5.08" x2="22.86" y2="7.62" width="1.27" layer="1"/>
 <wire x1="22.86" y1="7.62" x2="22.86" y2="12.7" width="1.27" layer="1"/>
 <wire x1="22.86" y1="12.7" x2="24.13" y2="11.43" width="1.27" layer="1"/>
 <wire x1="24.13" y1="11.43" x2="31.75" y2="11.43" width="1.27" layer="1"/>
-<wire x1="39.37" y1="6.455" x2="36.725" y2="6.455" width="1.27" layer="1"/>
-<wire x1="36.725" y1="6.455" x2="31.75" y2="11.43" width="1.27" layer="1"/>
+<wire x1="39.37" y1="7.725" x2="35.455" y2="7.725" width="1.27" layer="1"/>
+<wire x1="35.455" y1="7.725" x2="31.75" y2="11.43" width="1.27" layer="1"/>
 </signal>
 <signal name="12V">
 <contactref element="L1" pad="2"/>
 <contactref element="U1" pad="4"/>
 <contactref element="C3" pad="1"/>
-<wire x1="40.64" y1="25.4" x2="38.1" y2="27.94" width="1.27" layer="1"/>
+<wire x1="39.37" y1="26.67" x2="38.1" y2="27.94" width="1.27" layer="1"/>
 <wire x1="33.66" y1="27.94" x2="38.1" y2="27.94" width="1.27" layer="1"/>
-<wire x1="40.64" y1="25.4" x2="40.64" y2="17.675" width="1.27" layer="1"/>
-<wire x1="40.64" y1="17.675" x2="39.37" y2="16.405" width="1.27" layer="1"/>
+<wire x1="39.37" y1="26.67" x2="39.37" y2="17.675" width="1.27" layer="1"/>
 <contactref element="J1" pad="1"/>
-<wire x1="50.8" y1="6.35" x2="53.34" y2="6.35" width="1.27" layer="1"/>
+<wire x1="52.07" y1="6.35" x2="53.34" y2="6.35" width="1.27" layer="1"/>
 <wire x1="53.34" y1="6.35" x2="58.42" y2="6.35" width="1.27" layer="1"/>
-<wire x1="50.8" y1="6.35" x2="49.53" y2="7.62" width="1.27" layer="1"/>
-<wire x1="49.53" y1="9.4712" x2="49.53" y2="10.16" width="1.27" layer="1"/>
-<wire x1="49.53" y1="10.16" x2="43.285" y2="16.405" width="1.27" layer="1"/>
-<wire x1="39.37" y1="16.405" x2="43.285" y2="16.405" width="1.27" layer="1"/>
-<wire x1="49.53" y1="9.4712" x2="49.53" y2="7.62" width="1.27" layer="1"/>
+<wire x1="52.07" y1="6.35" x2="49.53" y2="8.89" width="1.27" layer="1"/>
+<wire x1="49.53" y1="10.7412" x2="48.8438" y2="10.7412" width="1.27" layer="1"/>
+<wire x1="48.8438" y1="10.7412" x2="41.91" y2="17.675" width="1.27" layer="1"/>
+<wire x1="39.37" y1="17.675" x2="41.91" y2="17.675" width="1.27" layer="1"/>
+<wire x1="49.53" y1="10.7412" x2="49.53" y2="8.89" width="1.27" layer="1"/>
 <contactref element="D2" pad="1"/>
-<wire x1="53.34" y1="7.18" x2="53.34" y2="6.35" width="1.27" layer="1"/>
+<wire x1="53.34" y1="8.45" x2="53.34" y2="6.35" width="1.27" layer="1"/>
 </signal>
 <signal name="N$4">
 <contactref element="C2" pad="2"/>

+ 53 - 52
schematic/regulator.b#5

@@ -929,29 +929,29 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="34.9733" y="24.13" size="1.27" layer="27" rot="R270" align="top-center"/>
 <attribute name="VOLTAGE_RATING" value="" x="-7.62" y="-1.27" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPMP7343X310N" package3d_urn="urn:adsk.eagle:package:16290885/1" value="15uF" x="49.53" y="6.35" smashed="yes" rot="R270">
-<attribute name="CATEGORY" value="Capacitor" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="MANUFACTURER" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="MPN" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="NAME" x="48.655" y="6.35" size="1.27" layer="25" rot="R270" align="bottom-center"/>
-<attribute name="OPERATING_TEMP" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="PART_STATUS" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="ROHS_COMPLIANT" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="SERIES" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="SUB-CATEGORY" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="THERMALLOSS" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="TYPE" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="VALUE" x="46.595" y="6.35" size="1.27" layer="27" rot="R270" align="top-center"/>
-<attribute name="VOLTAGE_RATING" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
+<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPMP7343X310N" package3d_urn="urn:adsk.eagle:package:16290885/1" value="15uF" x="49.53" y="7.62" smashed="yes" rot="R270">
+<attribute name="CATEGORY" value="Capacitor" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="MANUFACTURER" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="MPN" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="NAME" x="48.655" y="7.62" size="1.27" layer="25" rot="R270" align="bottom-center"/>
+<attribute name="OPERATING_TEMP" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="PART_STATUS" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="ROHS_COMPLIANT" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="SERIES" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="SUB-CATEGORY" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="THERMALLOSS" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="TYPE" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="VALUE" x="46.595" y="7.62" size="1.27" layer="27" rot="R270" align="top-center"/>
+<attribute name="VOLTAGE_RATING" value="" x="13.97" y="-25.4" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" package="DO201AD" package3d_urn="urn:adsk.eagle:package:10898389/2" value="SB5100" x="22.86" y="6.35" smashed="yes" rot="R180">
-<attribute name="CREATED_BY" value="PCBLayout.com" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="DIGIKEY_PART_NUMBER" value="MBR360GOS-ND" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="MANUFACTURER" value="ON Semiconductor" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="MPN" value="MBR360G" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="NAME" x="15.37" y="4.62" size="1.27" layer="25" ratio="10" rot="R180"/>
-<attribute name="PACKAGE" value="DO-201AD" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="VALUE" x="30.36" y="10.6" size="1.27" layer="27" ratio="10" rot="R180"/>
+<element name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" package="DO201AD" package3d_urn="urn:adsk.eagle:package:10898389/2" value="SB5100" x="22.86" y="5.08" smashed="yes" rot="R180">
+<attribute name="CREATED_BY" value="PCBLayout.com" x="2.54" y="43.18" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="DIGIKEY_PART_NUMBER" value="MBR360GOS-ND" x="2.54" y="43.18" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="MANUFACTURER" value="ON Semiconductor" x="2.54" y="43.18" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="MPN" value="MBR360G" x="2.54" y="43.18" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="NAME" x="15.37" y="3.35" size="1.27" layer="25" ratio="10" rot="R180"/>
+<attribute name="PACKAGE" value="DO-201AD" x="2.54" y="43.18" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="VALUE" x="30.36" y="9.33" size="1.27" layer="27" ratio="10" rot="R180"/>
 </element>
 <element name="J4" library="Connectors" library_urn="urn:adsk.eagle:library:14555660" package="HDR-02" package3d_urn="urn:adsk.eagle:package:10989917/2" value="IN" x="2.54" y="29.21" smashed="yes" rot="R90">
 <attribute name="CREATED_BY" value="PCBLayout.com" x="12.7" y="69.85" size="1.778" layer="27" rot="R90" display="off"/>
@@ -961,11 +961,11 @@ design rules under a new name.</description>
 <attribute name="NAME" x="1.27" y="22.86" size="1.27" layer="25"/>
 <attribute name="VALUE" x="11.43" y="25.4" size="1.27" layer="27" rot="R90"/>
 </element>
-<element name="L1" library="inductors" library_urn="urn:adsk.eagle:library:243" package="DR127" package3d_urn="urn:adsk.eagle:package:15117/1" value="DR127" x="39.37" y="11.43" smashed="yes" rot="R90">
-<attribute name="NAME" x="32.98" y="4.62" size="1.27" layer="25" rot="R180"/>
-<attribute name="POPULARITY" value="2" x="64.77" y="46.99" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="SPICEPREFIX" value="L" x="64.77" y="46.99" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="VALUE" x="43.87" y="8.43" size="1.27" layer="27" rot="R90"/>
+<element name="L1" library="inductors" library_urn="urn:adsk.eagle:library:243" package="DR127" package3d_urn="urn:adsk.eagle:package:15117/1" value="DR127" x="39.37" y="12.7" smashed="yes" rot="R90">
+<attribute name="NAME" x="32.98" y="5.89" size="1.27" layer="25" rot="R180"/>
+<attribute name="POPULARITY" value="2" x="64.77" y="48.26" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="SPICEPREFIX" value="L" x="64.77" y="48.26" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="VALUE" x="43.87" y="9.7" size="1.27" layer="27" rot="R90"/>
 </element>
 <element name="R1" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="1M" x="21.59" y="26.67" smashed="yes" rot="R90">
 <attribute name="NAME" x="17.78" y="25.4" size="1.27" layer="25"/>
@@ -1010,11 +1010,11 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="47.625" y="31.115" size="1.27" layer="27"/>
 </element>
 <element name="J1" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X08_LONGPADS" package3d_urn="urn:adsk.eagle:package:38142/1" value="COMM" x="58.42" y="6.35" smashed="yes" rot="R90">
-<attribute name="NAME" x="56.261" y="5.207" size="0.6096" layer="25" font="vector" ratio="20" rot="R90"/>
+<attribute name="NAME" x="56.261" y="7.747" size="0.6096" layer="25" font="vector" ratio="20" rot="R90"/>
 <attribute name="VALUE" x="61.214" y="5.334" size="0.6096" layer="27" font="vector" ratio="20" rot="R90"/>
 </element>
 <element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="STOP_LIGHT" x="52.07" y="39.37" smashed="yes" rot="R180">
-<attribute name="NAME" x="53.34" y="37.973" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
+<attribute name="NAME" x="54.61" y="39.243" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
 <attribute name="VALUE" x="53.34" y="41.402" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
 </element>
 <element name="J5" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X04" package3d_urn="urn:adsk.eagle:package:38085/1" value="DRIVER" x="58.42" y="29.21" smashed="yes" rot="R90">
@@ -1040,7 +1040,7 @@ design rules under a new name.</description>
 <attribute name="DRAIN_CURRENT" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="MANUFACTURER" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="MPN" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
-<attribute name="NAME" x="4.445" y="40.005" size="1.27" layer="26" rot="MR270"/>
+<attribute name="NAME" x="4.445" y="37.465" size="1.27" layer="26" rot="MR270"/>
 <attribute name="OPERATING_TEMP" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="PART_STATUS" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="ROHS_COMPLIANT" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
@@ -1078,9 +1078,9 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="52.07" y="20.32" size="1.778" layer="27" display="off"/>
 <attribute name="VALUE" x="50.8" y="17.78" size="1.27" layer="27"/>
 </element>
-<element name="D2" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="P4SMAJ12CA" x="53.34" y="5.08" smashed="yes" rot="R270">
-<attribute name="NAME" x="55.325" y="5.08" size="1.27" layer="25" rot="R270" align="bottom-center"/>
-<attribute name="VALUE" x="51.355" y="5.08" size="1.27" layer="27" rot="R270" align="top-center"/>
+<element name="D2" library="eScooter" package="DIOM5027X220N" package3d_urn="urn:adsk.eagle:package:21928182/1" value="P4SMAJ12CA" x="53.34" y="6.35" smashed="yes" rot="R270">
+<attribute name="NAME" x="55.325" y="6.35" size="1.27" layer="25" rot="R270" align="bottom-center"/>
+<attribute name="VALUE" x="51.355" y="6.35" size="1.27" layer="27" rot="R270" align="top-center"/>
 </element>
 <element name="R8" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K" x="52.07" y="17.78" smashed="yes" rot="R180">
 <attribute name="NAME" x="53.34" y="16.51" size="1.27" layer="25" rot="R180"/>
@@ -1088,9 +1088,9 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="52.07" y="17.78" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="VALUE" x="53.34" y="20.32" size="1.27" layer="27" rot="R180"/>
 </element>
-<element name="C4" library="eScooter" package="CAPAE1230X1250N" package3d_urn="urn:adsk.eagle:package:21812541/1" value="68uF" x="11.43" y="16.51" smashed="yes" rot="R270">
-<attribute name="NAME" x="18.315" y="16.51" size="1.27" layer="25" rot="R270" align="bottom-center"/>
-<attribute name="VALUE" x="4.545" y="16.51" size="1.27" layer="27" rot="R270" align="top-center"/>
+<element name="C4" library="eScooter" package="CAPAE1230X1250N" package3d_urn="urn:adsk.eagle:package:21812541/1" value="68uF" x="17.78" y="16.51" smashed="yes" rot="R270">
+<attribute name="NAME" x="24.665" y="16.51" size="1.27" layer="25" rot="R270" align="bottom-center"/>
+<attribute name="VALUE" x="10.895" y="16.51" size="1.27" layer="27" rot="R270" align="top-center"/>
 </element>
 </elements>
 <signals>
@@ -1168,8 +1168,9 @@ design rules under a new name.</description>
 <contactref element="C4" pad="1"/>
 <wire x1="11.43" y1="22.86" x2="10.16" y2="24.13" width="2.54" layer="1"/>
 <wire x1="10.16" y1="27.94" x2="10.16" y2="24.13" width="2.54" layer="1"/>
-<wire x1="21.59" y1="22.86" x2="11.43" y2="22.86" width="2.54" layer="1"/>
-<wire x1="11.43" y1="21.435" x2="11.43" y2="22.86" width="2.54" layer="1"/>
+<wire x1="21.59" y1="22.86" x2="17.78" y2="22.86" width="2.54" layer="1"/>
+<wire x1="17.78" y1="22.86" x2="11.43" y2="22.86" width="2.54" layer="1"/>
+<wire x1="17.78" y1="21.435" x2="17.78" y2="22.86" width="2.54" layer="1"/>
 </signal>
 <signal name="N$1">
 <contactref element="U1" pad="1"/>
@@ -1189,32 +1190,32 @@ design rules under a new name.</description>
 <wire x1="24.76" y1="20.32" x2="24.13" y2="20.32" width="1.27" layer="1"/>
 <wire x1="24.13" y1="20.32" x2="22.86" y2="19.05" width="1.27" layer="1"/>
 <wire x1="22.86" y1="12.7" x2="22.86" y2="19.05" width="1.27" layer="1"/>
-<wire x1="29.06" y1="6.35" x2="24.13" y2="6.35" width="1.27" layer="1"/>
-<wire x1="24.13" y1="6.35" x2="22.86" y2="7.62" width="1.27" layer="1"/>
+<wire x1="29.06" y1="5.08" x2="25.4" y2="5.08" width="1.27" layer="1"/>
+<wire x1="25.4" y1="5.08" x2="22.86" y2="7.62" width="1.27" layer="1"/>
 <wire x1="22.86" y1="7.62" x2="22.86" y2="12.7" width="1.27" layer="1"/>
 <wire x1="22.86" y1="12.7" x2="24.13" y2="11.43" width="1.27" layer="1"/>
 <wire x1="24.13" y1="11.43" x2="31.75" y2="11.43" width="1.27" layer="1"/>
-<wire x1="39.37" y1="6.455" x2="36.725" y2="6.455" width="1.27" layer="1"/>
-<wire x1="36.725" y1="6.455" x2="31.75" y2="11.43" width="1.27" layer="1"/>
+<wire x1="39.37" y1="7.725" x2="35.455" y2="7.725" width="1.27" layer="1"/>
+<wire x1="35.455" y1="7.725" x2="31.75" y2="11.43" width="1.27" layer="1"/>
 </signal>
 <signal name="12V">
 <contactref element="L1" pad="2"/>
 <contactref element="U1" pad="4"/>
 <contactref element="C3" pad="1"/>
-<wire x1="40.64" y1="25.4" x2="38.1" y2="27.94" width="1.27" layer="1"/>
+<wire x1="39.37" y1="26.67" x2="38.1" y2="27.94" width="1.27" layer="1"/>
 <wire x1="33.66" y1="27.94" x2="38.1" y2="27.94" width="1.27" layer="1"/>
-<wire x1="40.64" y1="25.4" x2="40.64" y2="17.675" width="1.27" layer="1"/>
-<wire x1="40.64" y1="17.675" x2="39.37" y2="16.405" width="1.27" layer="1"/>
+<wire x1="39.37" y1="26.67" x2="39.37" y2="17.675" width="1.27" layer="1"/>
 <contactref element="J1" pad="1"/>
-<wire x1="50.8" y1="6.35" x2="53.34" y2="6.35" width="1.27" layer="1"/>
+<wire x1="52.07" y1="6.35" x2="53.34" y2="6.35" width="1.27" layer="1"/>
 <wire x1="53.34" y1="6.35" x2="58.42" y2="6.35" width="1.27" layer="1"/>
-<wire x1="50.8" y1="6.35" x2="49.53" y2="7.62" width="1.27" layer="1"/>
-<wire x1="49.53" y1="9.4712" x2="49.53" y2="10.16" width="1.27" layer="1"/>
-<wire x1="49.53" y1="10.16" x2="43.285" y2="16.405" width="1.27" layer="1"/>
-<wire x1="39.37" y1="16.405" x2="43.285" y2="16.405" width="1.27" layer="1"/>
-<wire x1="49.53" y1="9.4712" x2="49.53" y2="7.62" width="1.27" layer="1"/>
+<wire x1="52.07" y1="6.35" x2="49.53" y2="8.89" width="1.27" layer="1"/>
+<wire x1="49.53" y1="10.7412" x2="48.9488" y2="10.7412" width="1.27" layer="1"/>
+<wire x1="48.9488" y1="10.7412" x2="47.095" y2="12.595" width="1.27" layer="1"/>
+<wire x1="47.095" y1="12.595" x2="44.45" y2="12.595" width="1.27" layer="1"/>
+<wire x1="39.37" y1="17.675" x2="44.45" y2="12.595" width="1.27" layer="1"/>
+<wire x1="49.53" y1="10.7412" x2="49.53" y2="8.89" width="1.27" layer="1"/>
 <contactref element="D2" pad="1"/>
-<wire x1="53.34" y1="7.18" x2="53.34" y2="6.35" width="1.27" layer="1"/>
+<wire x1="53.34" y1="8.45" x2="53.34" y2="6.35" width="1.27" layer="1"/>
 </signal>
 <signal name="N$4">
 <contactref element="C2" pad="2"/>

+ 31 - 31
schematic/regulator.b#6

@@ -929,7 +929,7 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="34.9733" y="24.13" size="1.27" layer="27" rot="R270" align="top-center"/>
 <attribute name="VOLTAGE_RATING" value="" x="-7.62" y="-1.27" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPMP7343X310N" package3d_urn="urn:adsk.eagle:package:16290885/1" value="" x="49.53" y="6.35" smashed="yes" rot="R270">
+<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPMP7343X310N" package3d_urn="urn:adsk.eagle:package:16290885/1" value="15uF" x="49.53" y="6.35" smashed="yes" rot="R270">
 <attribute name="CATEGORY" value="Capacitor" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
 <attribute name="MANUFACTURER" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
 <attribute name="MPN" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
@@ -944,14 +944,14 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="46.595" y="6.35" size="1.27" layer="27" rot="R270" align="top-center"/>
 <attribute name="VOLTAGE_RATING" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" package="DO201AD" package3d_urn="urn:adsk.eagle:package:10898389/2" value="SB5100" x="22.86" y="6.35" smashed="yes" rot="R180">
-<attribute name="CREATED_BY" value="PCBLayout.com" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="DIGIKEY_PART_NUMBER" value="MBR360GOS-ND" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="MANUFACTURER" value="ON Semiconductor" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="MPN" value="MBR360G" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="NAME" x="15.37" y="4.62" size="1.27" layer="25" ratio="10" rot="R180"/>
-<attribute name="PACKAGE" value="DO-201AD" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="VALUE" x="30.36" y="10.6" size="1.27" layer="27" ratio="10" rot="R180"/>
+<element name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" package="DO201AD" package3d_urn="urn:adsk.eagle:package:10898389/2" value="SB5100" x="22.86" y="5.08" smashed="yes" rot="R180">
+<attribute name="CREATED_BY" value="PCBLayout.com" x="2.54" y="43.18" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="DIGIKEY_PART_NUMBER" value="MBR360GOS-ND" x="2.54" y="43.18" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="MANUFACTURER" value="ON Semiconductor" x="2.54" y="43.18" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="MPN" value="MBR360G" x="2.54" y="43.18" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="NAME" x="15.37" y="3.35" size="1.27" layer="25" ratio="10" rot="R180"/>
+<attribute name="PACKAGE" value="DO-201AD" x="2.54" y="43.18" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="VALUE" x="30.36" y="9.33" size="1.27" layer="27" ratio="10" rot="R180"/>
 </element>
 <element name="J4" library="Connectors" library_urn="urn:adsk.eagle:library:14555660" package="HDR-02" package3d_urn="urn:adsk.eagle:package:10989917/2" value="IN" x="2.54" y="29.21" smashed="yes" rot="R90">
 <attribute name="CREATED_BY" value="PCBLayout.com" x="12.7" y="69.85" size="1.778" layer="27" rot="R90" display="off"/>
@@ -961,11 +961,11 @@ design rules under a new name.</description>
 <attribute name="NAME" x="1.27" y="22.86" size="1.27" layer="25"/>
 <attribute name="VALUE" x="11.43" y="25.4" size="1.27" layer="27" rot="R90"/>
 </element>
-<element name="L1" library="inductors" library_urn="urn:adsk.eagle:library:243" package="DR127" package3d_urn="urn:adsk.eagle:package:15117/1" value="DR127" x="39.37" y="11.43" smashed="yes" rot="R90">
-<attribute name="NAME" x="32.98" y="4.62" size="1.27" layer="25" rot="R180"/>
-<attribute name="POPULARITY" value="2" x="64.77" y="46.99" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="SPICEPREFIX" value="L" x="64.77" y="46.99" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="VALUE" x="43.87" y="8.43" size="1.27" layer="27" rot="R90"/>
+<element name="L1" library="inductors" library_urn="urn:adsk.eagle:library:243" package="DR127" package3d_urn="urn:adsk.eagle:package:15117/1" value="DR127" x="39.37" y="12.7" smashed="yes" rot="R90">
+<attribute name="NAME" x="32.98" y="5.89" size="1.27" layer="25" rot="R180"/>
+<attribute name="POPULARITY" value="2" x="64.77" y="48.26" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="SPICEPREFIX" value="L" x="64.77" y="48.26" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="VALUE" x="43.87" y="9.7" size="1.27" layer="27" rot="R90"/>
 </element>
 <element name="R1" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" package="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="1M" x="21.59" y="26.67" smashed="yes" rot="R90">
 <attribute name="NAME" x="17.78" y="25.4" size="1.27" layer="25"/>
@@ -1010,11 +1010,11 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="47.625" y="31.115" size="1.27" layer="27"/>
 </element>
 <element name="J1" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X08_LONGPADS" package3d_urn="urn:adsk.eagle:package:38142/1" value="COMM" x="58.42" y="6.35" smashed="yes" rot="R90">
-<attribute name="NAME" x="56.261" y="5.207" size="0.6096" layer="25" font="vector" ratio="20" rot="R90"/>
+<attribute name="NAME" x="56.261" y="7.747" size="0.6096" layer="25" font="vector" ratio="20" rot="R90"/>
 <attribute name="VALUE" x="61.214" y="5.334" size="0.6096" layer="27" font="vector" ratio="20" rot="R90"/>
 </element>
 <element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="STOP_LIGHT" x="52.07" y="39.37" smashed="yes" rot="R180">
-<attribute name="NAME" x="53.34" y="37.973" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
+<attribute name="NAME" x="54.61" y="39.243" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
 <attribute name="VALUE" x="53.34" y="41.402" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
 </element>
 <element name="J5" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X04" package3d_urn="urn:adsk.eagle:package:38085/1" value="DRIVER" x="58.42" y="29.21" smashed="yes" rot="R90">
@@ -1040,7 +1040,7 @@ design rules under a new name.</description>
 <attribute name="DRAIN_CURRENT" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="MANUFACTURER" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="MPN" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
-<attribute name="NAME" x="4.445" y="40.005" size="1.27" layer="26" rot="MR270"/>
+<attribute name="NAME" x="4.445" y="37.465" size="1.27" layer="26" rot="MR270"/>
 <attribute name="OPERATING_TEMP" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="PART_STATUS" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="ROHS_COMPLIANT" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
@@ -1088,9 +1088,9 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="52.07" y="17.78" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="VALUE" x="53.34" y="20.32" size="1.27" layer="27" rot="R180"/>
 </element>
-<element name="C4" library="eScooter" package="CAPAE1230X1250N" package3d_urn="urn:adsk.eagle:package:21812541/1" value="68uF" x="11.43" y="16.51" smashed="yes" rot="R270">
-<attribute name="NAME" x="18.315" y="16.51" size="1.27" layer="25" rot="R270" align="bottom-center"/>
-<attribute name="VALUE" x="4.545" y="16.51" size="1.27" layer="27" rot="R270" align="top-center"/>
+<element name="C4" library="eScooter" package="CAPAE1230X1250N" package3d_urn="urn:adsk.eagle:package:21812541/1" value="68uF" x="17.78" y="16.51" smashed="yes" rot="R270">
+<attribute name="NAME" x="24.665" y="16.51" size="1.27" layer="25" rot="R270" align="bottom-center"/>
+<attribute name="VALUE" x="10.895" y="16.51" size="1.27" layer="27" rot="R270" align="top-center"/>
 </element>
 </elements>
 <signals>
@@ -1168,8 +1168,9 @@ design rules under a new name.</description>
 <contactref element="C4" pad="1"/>
 <wire x1="11.43" y1="22.86" x2="10.16" y2="24.13" width="2.54" layer="1"/>
 <wire x1="10.16" y1="27.94" x2="10.16" y2="24.13" width="2.54" layer="1"/>
-<wire x1="21.59" y1="22.86" x2="11.43" y2="22.86" width="2.54" layer="1"/>
-<wire x1="11.43" y1="21.435" x2="11.43" y2="22.86" width="2.54" layer="1"/>
+<wire x1="21.59" y1="22.86" x2="17.78" y2="22.86" width="2.54" layer="1"/>
+<wire x1="17.78" y1="22.86" x2="11.43" y2="22.86" width="2.54" layer="1"/>
+<wire x1="17.78" y1="21.435" x2="17.78" y2="22.86" width="2.54" layer="1"/>
 </signal>
 <signal name="N$1">
 <contactref element="U1" pad="1"/>
@@ -1189,29 +1190,28 @@ design rules under a new name.</description>
 <wire x1="24.76" y1="20.32" x2="24.13" y2="20.32" width="1.27" layer="1"/>
 <wire x1="24.13" y1="20.32" x2="22.86" y2="19.05" width="1.27" layer="1"/>
 <wire x1="22.86" y1="12.7" x2="22.86" y2="19.05" width="1.27" layer="1"/>
-<wire x1="29.06" y1="6.35" x2="24.13" y2="6.35" width="1.27" layer="1"/>
-<wire x1="24.13" y1="6.35" x2="22.86" y2="7.62" width="1.27" layer="1"/>
+<wire x1="29.06" y1="5.08" x2="25.4" y2="5.08" width="1.27" layer="1"/>
+<wire x1="25.4" y1="5.08" x2="22.86" y2="7.62" width="1.27" layer="1"/>
 <wire x1="22.86" y1="7.62" x2="22.86" y2="12.7" width="1.27" layer="1"/>
 <wire x1="22.86" y1="12.7" x2="24.13" y2="11.43" width="1.27" layer="1"/>
 <wire x1="24.13" y1="11.43" x2="31.75" y2="11.43" width="1.27" layer="1"/>
-<wire x1="39.37" y1="6.455" x2="36.725" y2="6.455" width="1.27" layer="1"/>
-<wire x1="36.725" y1="6.455" x2="31.75" y2="11.43" width="1.27" layer="1"/>
+<wire x1="39.37" y1="7.725" x2="35.455" y2="7.725" width="1.27" layer="1"/>
+<wire x1="35.455" y1="7.725" x2="31.75" y2="11.43" width="1.27" layer="1"/>
 </signal>
 <signal name="12V">
 <contactref element="L1" pad="2"/>
 <contactref element="U1" pad="4"/>
 <contactref element="C3" pad="1"/>
-<wire x1="40.64" y1="25.4" x2="38.1" y2="27.94" width="1.27" layer="1"/>
+<wire x1="39.37" y1="26.67" x2="38.1" y2="27.94" width="1.27" layer="1"/>
 <wire x1="33.66" y1="27.94" x2="38.1" y2="27.94" width="1.27" layer="1"/>
-<wire x1="40.64" y1="25.4" x2="40.64" y2="17.675" width="1.27" layer="1"/>
-<wire x1="40.64" y1="17.675" x2="39.37" y2="16.405" width="1.27" layer="1"/>
+<wire x1="39.37" y1="26.67" x2="39.37" y2="17.675" width="1.27" layer="1"/>
 <contactref element="J1" pad="1"/>
 <wire x1="50.8" y1="6.35" x2="53.34" y2="6.35" width="1.27" layer="1"/>
 <wire x1="53.34" y1="6.35" x2="58.42" y2="6.35" width="1.27" layer="1"/>
 <wire x1="50.8" y1="6.35" x2="49.53" y2="7.62" width="1.27" layer="1"/>
 <wire x1="49.53" y1="9.4712" x2="49.53" y2="10.16" width="1.27" layer="1"/>
-<wire x1="49.53" y1="10.16" x2="43.285" y2="16.405" width="1.27" layer="1"/>
-<wire x1="39.37" y1="16.405" x2="43.285" y2="16.405" width="1.27" layer="1"/>
+<wire x1="49.53" y1="10.16" x2="42.015" y2="17.675" width="1.27" layer="1"/>
+<wire x1="39.37" y1="17.675" x2="42.015" y2="17.675" width="1.27" layer="1"/>
 <wire x1="49.53" y1="9.4712" x2="49.53" y2="7.62" width="1.27" layer="1"/>
 <contactref element="D2" pad="1"/>
 <wire x1="53.34" y1="7.18" x2="53.34" y2="6.35" width="1.27" layer="1"/>

+ 5 - 5
schematic/regulator.b#7

@@ -914,7 +914,7 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="29.21" y="18.3667" size="1.27" layer="27" rot="R180" align="top-center"/>
 <attribute name="VOLTAGE_RATING" value="" x="8.89" y="60.96" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
-<element name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="" x="36.83" y="24.13" smashed="yes" rot="R270">
+<element name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="36.83" y="24.13" smashed="yes" rot="R270">
 <attribute name="CATEGORY" value="Capacitor" x="-7.62" y="-1.27" size="1.778" layer="27" rot="R270" display="off"/>
 <attribute name="MANUFACTURER" value="" x="-7.62" y="-1.27" size="1.778" layer="27" rot="R270" display="off"/>
 <attribute name="MPN" value="" x="-7.62" y="-1.27" size="1.778" layer="27" rot="R270" display="off"/>
@@ -929,7 +929,7 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="34.9733" y="24.13" size="1.27" layer="27" rot="R270" align="top-center"/>
 <attribute name="VOLTAGE_RATING" value="" x="-7.62" y="-1.27" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPMP7343X310N" package3d_urn="urn:adsk.eagle:package:16290885/1" value="" x="49.53" y="6.35" smashed="yes" rot="R270">
+<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPMP7343X310N" package3d_urn="urn:adsk.eagle:package:16290885/1" value="15uF" x="49.53" y="6.35" smashed="yes" rot="R270">
 <attribute name="CATEGORY" value="Capacitor" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
 <attribute name="MANUFACTURER" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
 <attribute name="MPN" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
@@ -1010,11 +1010,11 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="47.625" y="31.115" size="1.27" layer="27"/>
 </element>
 <element name="J1" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X08_LONGPADS" package3d_urn="urn:adsk.eagle:package:38142/1" value="COMM" x="58.42" y="6.35" smashed="yes" rot="R90">
-<attribute name="NAME" x="56.261" y="5.207" size="0.6096" layer="25" font="vector" ratio="20" rot="R90"/>
+<attribute name="NAME" x="56.261" y="7.747" size="0.6096" layer="25" font="vector" ratio="20" rot="R90"/>
 <attribute name="VALUE" x="61.214" y="5.334" size="0.6096" layer="27" font="vector" ratio="20" rot="R90"/>
 </element>
 <element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="STOP_LIGHT" x="52.07" y="39.37" smashed="yes" rot="R180">
-<attribute name="NAME" x="53.34" y="37.973" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
+<attribute name="NAME" x="54.61" y="39.243" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
 <attribute name="VALUE" x="53.34" y="41.402" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
 </element>
 <element name="J5" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X04" package3d_urn="urn:adsk.eagle:package:38085/1" value="DRIVER" x="58.42" y="29.21" smashed="yes" rot="R90">
@@ -1040,7 +1040,7 @@ design rules under a new name.</description>
 <attribute name="DRAIN_CURRENT" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="MANUFACTURER" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="MPN" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
-<attribute name="NAME" x="4.445" y="40.005" size="1.27" layer="26" rot="MR270"/>
+<attribute name="NAME" x="4.445" y="37.465" size="1.27" layer="26" rot="MR270"/>
 <attribute name="OPERATING_TEMP" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="PART_STATUS" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>
 <attribute name="ROHS_COMPLIANT" value="" x="6.35" y="38.1" size="1.778" layer="28" rot="MR270" display="off"/>

+ 3 - 3
schematic/regulator.b#8

@@ -899,7 +899,7 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="" x="29.21" y="16.51" smashed="yes" rot="R180">
+<element name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="29.21" y="16.51" smashed="yes" rot="R180">
 <attribute name="CATEGORY" value="Capacitor" x="8.89" y="60.96" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MANUFACTURER" value="" x="8.89" y="60.96" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MPN" value="" x="8.89" y="60.96" size="1.778" layer="27" rot="R180" display="off"/>
@@ -914,7 +914,7 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="29.21" y="18.3667" size="1.27" layer="27" rot="R180" align="top-center"/>
 <attribute name="VOLTAGE_RATING" value="" x="8.89" y="60.96" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
-<element name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="" x="36.83" y="24.13" smashed="yes" rot="R270">
+<element name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="36.83" y="24.13" smashed="yes" rot="R270">
 <attribute name="CATEGORY" value="Capacitor" x="-7.62" y="-1.27" size="1.778" layer="27" rot="R270" display="off"/>
 <attribute name="MANUFACTURER" value="" x="-7.62" y="-1.27" size="1.778" layer="27" rot="R270" display="off"/>
 <attribute name="MPN" value="" x="-7.62" y="-1.27" size="1.778" layer="27" rot="R270" display="off"/>
@@ -929,7 +929,7 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="34.9733" y="24.13" size="1.27" layer="27" rot="R270" align="top-center"/>
 <attribute name="VOLTAGE_RATING" value="" x="-7.62" y="-1.27" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPMP7343X310N" package3d_urn="urn:adsk.eagle:package:16290885/1" value="" x="49.53" y="6.35" smashed="yes" rot="R270">
+<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPMP7343X310N" package3d_urn="urn:adsk.eagle:package:16290885/1" value="15uF" x="49.53" y="6.35" smashed="yes" rot="R270">
 <attribute name="CATEGORY" value="Capacitor" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
 <attribute name="MANUFACTURER" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
 <attribute name="MPN" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>

+ 4 - 4
schematic/regulator.b#9

@@ -899,7 +899,7 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="" x="29.21" y="16.51" smashed="yes" rot="R180">
+<element name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="29.21" y="16.51" smashed="yes" rot="R180">
 <attribute name="CATEGORY" value="Capacitor" x="8.89" y="60.96" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MANUFACTURER" value="" x="8.89" y="60.96" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MPN" value="" x="8.89" y="60.96" size="1.778" layer="27" rot="R180" display="off"/>
@@ -914,7 +914,7 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="29.21" y="18.3667" size="1.27" layer="27" rot="R180" align="top-center"/>
 <attribute name="VOLTAGE_RATING" value="" x="8.89" y="60.96" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
-<element name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="" x="36.83" y="24.13" smashed="yes" rot="R270">
+<element name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPC3216X135" package3d_urn="urn:adsk.eagle:package:16290893/2" value="0.1uF" x="36.83" y="24.13" smashed="yes" rot="R270">
 <attribute name="CATEGORY" value="Capacitor" x="-7.62" y="-1.27" size="1.778" layer="27" rot="R270" display="off"/>
 <attribute name="MANUFACTURER" value="" x="-7.62" y="-1.27" size="1.778" layer="27" rot="R270" display="off"/>
 <attribute name="MPN" value="" x="-7.62" y="-1.27" size="1.778" layer="27" rot="R270" display="off"/>
@@ -929,7 +929,7 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="34.9733" y="24.13" size="1.27" layer="27" rot="R270" align="top-center"/>
 <attribute name="VOLTAGE_RATING" value="" x="-7.62" y="-1.27" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPMP7343X310N" package3d_urn="urn:adsk.eagle:package:16290885/1" value="" x="49.53" y="6.35" smashed="yes" rot="R270">
+<element name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" package="CAPMP7343X310N" package3d_urn="urn:adsk.eagle:package:16290885/1" value="15uF" x="49.53" y="6.35" smashed="yes" rot="R270">
 <attribute name="CATEGORY" value="Capacitor" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
 <attribute name="MANUFACTURER" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
 <attribute name="MPN" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
@@ -944,7 +944,7 @@ design rules under a new name.</description>
 <attribute name="VALUE" x="46.595" y="6.35" size="1.27" layer="27" rot="R270" align="top-center"/>
 <attribute name="VOLTAGE_RATING" value="" x="13.97" y="-26.67" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" package="DO201AD" package3d_urn="urn:adsk.eagle:package:10898389/2" value="MBR360G" x="22.86" y="6.35" smashed="yes" rot="R180">
+<element name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" package="DO201AD" package3d_urn="urn:adsk.eagle:package:10898389/2" value="SB5100" x="22.86" y="6.35" smashed="yes" rot="R180">
 <attribute name="CREATED_BY" value="PCBLayout.com" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="DIGIKEY_PART_NUMBER" value="MBR360GOS-ND" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MANUFACTURER" value="ON Semiconductor" x="2.54" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>

+ 58 - 73
schematic/regulator.brd

@@ -377,54 +377,6 @@ Source: coiltronics_dr_series.pdf</description>
 </package3d>
 </packages3d>
 </library>
-<library name="regulator">
-<packages>
-<package name="DIP8" urn="urn:adsk.eagle:footprint:4470/1">
-<description>&lt;b&gt;SMD DIL08&lt;/b&gt; Gull Wing Surface Mount Optioon 300&lt;p&gt;
-Source: http://www.avagotech.com/docs/AV02-0410EN</description>
-<wire x1="-4.81" y1="-3.075" x2="4.81" y2="-3.075" width="0.2032" layer="51"/>
-<wire x1="4.81" y1="-3.075" x2="4.81" y2="3.075" width="0.2032" layer="21"/>
-<wire x1="4.81" y1="3.075" x2="-4.81" y2="3.075" width="0.2032" layer="51"/>
-<wire x1="-4.81" y1="3.075" x2="-4.81" y2="-3.075" width="0.2032" layer="21"/>
-<circle x="-3.81" y="-2.159" radius="0.3667" width="0" layer="21"/>
-<smd name="1" x="-3.81" y="-4.45" dx="1.16" dy="2" layer="1"/>
-<smd name="2" x="-1.27" y="-4.45" dx="1.27" dy="2" layer="1"/>
-<smd name="3" x="1.27" y="-4.45" dx="1.27" dy="2" layer="1"/>
-<smd name="4" x="3.81" y="-4.45" dx="1.16" dy="2" layer="1"/>
-<smd name="5" x="3.81" y="4.45" dx="1.16" dy="2" layer="1"/>
-<smd name="6" x="1.27" y="4.45" dx="1.27" dy="2" layer="1"/>
-<smd name="7" x="-1.27" y="4.45" dx="1.27" dy="2" layer="1"/>
-<smd name="8" x="-3.81" y="4.45" dx="1.16" dy="2" layer="1"/>
-<text x="-5.635" y="-3.1351" size="1.27" layer="25" rot="R90">&gt;NAME</text>
-<text x="6.905" y="-4.4051" size="1.27" layer="27" rot="R90">&gt;VALUE</text>
-<rectangle x1="-4.0899" y1="-4.825" x2="-3.5301" y2="-3.81" layer="51"/>
-<rectangle x1="-1.5499" y1="-4.825" x2="-0.9901" y2="-3.81" layer="51"/>
-<rectangle x1="0.9901" y1="-4.825" x2="1.5499" y2="-3.81" layer="51"/>
-<rectangle x1="3.5301" y1="-4.825" x2="4.0899" y2="-3.81" layer="51"/>
-<rectangle x1="3.5301" y1="3.81" x2="4.0899" y2="4.825" layer="51"/>
-<rectangle x1="0.9901" y1="3.81" x2="1.5499" y2="4.825" layer="51"/>
-<rectangle x1="-1.5499" y1="3.81" x2="-0.9901" y2="4.825" layer="51"/>
-<rectangle x1="-4.0899" y1="3.81" x2="-3.5301" y2="4.825" layer="51"/>
-<rectangle x1="-2.15" y1="3.1" x2="-0.4" y2="3.81" layer="51" rot="R180"/>
-<rectangle x1="-4.1" y1="3.1" x2="-2.94" y2="3.81" layer="51" rot="R180"/>
-<rectangle x1="0.39" y1="3.1" x2="2.14" y2="3.81" layer="51" rot="R180"/>
-<rectangle x1="2.93" y1="3.1" x2="4.1" y2="3.81" layer="51" rot="R180"/>
-<rectangle x1="-4.075" y1="-3.81" x2="-2.93" y2="-3.1" layer="51"/>
-<rectangle x1="-2.14" y1="-3.81" x2="-0.39" y2="-3.1" layer="51"/>
-<rectangle x1="0.4" y1="-3.81" x2="2.15" y2="-3.1" layer="51"/>
-<rectangle x1="2.94" y1="-3.81" x2="4.1" y2="-3.1" layer="51"/>
-</package>
-</packages>
-<packages3d>
-<package3d name="DIP8" urn="urn:adsk.eagle:package:8089856/1" locally_modified="yes" type="box">
-<description>&lt;b&gt;SMD DIL08&lt;/b&gt; &lt;p&gt;
-dual in line package'</description>
-<packageinstances>
-<packageinstance name="DIP8"/>
-</packageinstances>
-</package3d>
-</packages3d>
-</library>
 <library name="SparkFun-Connectors" urn="urn:adsk.eagle:library:513">
 <description>&lt;h3&gt;SparkFun Connectors&lt;/h3&gt;
 This library contains electrically-functional connectors. 
@@ -688,6 +640,31 @@ CONN_04
 <text x="0" y="6.885" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
 <text x="0" y="-6.885" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
 </package>
+<package name="DIP826W56P254L937H458Q8B" urn="urn:adsk.eagle:footprint:22059849/1">
+<description>8-DIP, 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span, 9.38 X 6.99 X 4.58 mm body
+&lt;p&gt;8-pin DIP package with 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span with body size 9.38 X 6.99 X 4.58 mm&lt;/p&gt;</description>
+<circle x="-5.3669" y="3.81" radius="0.25" width="0" layer="21"/>
+<wire x1="-3.935" y1="4.7969" x2="-3.935" y2="4.955" width="0.12" layer="21"/>
+<wire x1="-3.935" y1="4.955" x2="3.935" y2="4.955" width="0.12" layer="21"/>
+<wire x1="3.935" y1="4.955" x2="3.935" y2="4.7969" width="0.12" layer="21"/>
+<wire x1="-3.935" y1="-4.7969" x2="-3.935" y2="-4.955" width="0.12" layer="21"/>
+<wire x1="-3.935" y1="-4.955" x2="3.935" y2="-4.955" width="0.12" layer="21"/>
+<wire x1="3.935" y1="-4.955" x2="3.935" y2="-4.7969" width="0.12" layer="21"/>
+<wire x1="3.935" y1="-4.955" x2="-3.935" y2="-4.955" width="0.12" layer="51"/>
+<wire x1="-3.935" y1="-4.955" x2="-3.935" y2="4.955" width="0.12" layer="51"/>
+<wire x1="-3.935" y1="4.955" x2="3.935" y2="4.955" width="0.12" layer="51"/>
+<wire x1="3.935" y1="4.955" x2="3.935" y2="-4.955" width="0.12" layer="51"/>
+<pad name="1" x="-4.13" y="3.81" drill="0.8657" diameter="1.4657"/>
+<pad name="2" x="-4.13" y="1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="3" x="-4.13" y="-1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="4" x="-4.13" y="-3.81" drill="0.8657" diameter="1.4657"/>
+<pad name="5" x="4.13" y="-3.81" drill="0.8657" diameter="1.4657"/>
+<pad name="6" x="4.13" y="-1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="7" x="4.13" y="1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="8" x="4.13" y="3.81" drill="0.8657" diameter="1.4657"/>
+<text x="0" y="5.59" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-5.59" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
+</package>
 </packages>
 <packages3d>
 <package3d name="DIOM5027X220N" urn="urn:adsk.eagle:package:21928182/1" type="model">
@@ -704,6 +681,13 @@ CONN_04
 <packageinstance name="CAPAE1230X1250N"/>
 </packageinstances>
 </package3d>
+<package3d name="DIP826W56P254L937H458Q8B" urn="urn:adsk.eagle:package:22059831/1" type="model">
+<description>8-DIP, 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span, 9.38 X 6.99 X 4.58 mm body
+&lt;p&gt;8-pin DIP package with 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span with body size 9.38 X 6.99 X 4.58 mm&lt;/p&gt;</description>
+<packageinstances>
+<packageinstance name="DIP826W56P254L937H458Q8B"/>
+</packageinstances>
+</package3d>
 </packages3d>
 </library>
 </libraries>
@@ -985,10 +969,6 @@ design rules under a new name.</description>
 <attribute name="SPICEPREFIX" value="R" x="1.27" y="76.2" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="VALUE" x="33.02" y="34.29" size="1.27" layer="27" rot="R180"/>
 </element>
-<element name="U1" library="regulator" package="DIP8" package3d_urn="urn:adsk.eagle:package:8089856/1" value="MAX5035DIP8" x="29.21" y="24.13" smashed="yes" rot="R90">
-<attribute name="NAME" x="27.3449" y="28.495" size="1.27" layer="25"/>
-<attribute name="VALUE" x="33.6151" y="31.035" size="1.27" layer="27" rot="R180"/>
-</element>
 <element name="J3" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02_2.54_SCREWTERM" package3d_urn="urn:adsk.eagle:package:38059/1" value="ON/OFF" x="15.24" y="30.48" smashed="yes">
 <attribute name="NAME" x="13.97" y="33.909" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="13.97" y="26.416" size="0.6096" layer="27" font="vector" ratio="20"/>
@@ -1092,19 +1072,19 @@ design rules under a new name.</description>
 <attribute name="NAME" x="24.665" y="16.51" size="1.27" layer="25" rot="R270" align="bottom-center"/>
 <attribute name="VALUE" x="10.895" y="16.51" size="1.27" layer="27" rot="R270" align="top-center"/>
 </element>
+<element name="U$1" library="eScooter" package="DIP826W56P254L937H458Q8B" package3d_urn="urn:adsk.eagle:package:22059831/1" value="MAX5035PDIP8" x="29.21" y="24.13" smashed="yes" rot="R180">
+<attribute name="NAME" x="29.21" y="18.54" size="1.27" layer="25" rot="R180" align="bottom-center"/>
+<attribute name="VALUE" x="29.21" y="29.72" size="1.27" layer="27" rot="R180" align="top-center"/>
+</element>
 </elements>
 <signals>
 <signal name="GND">
-<contactref element="U1" pad="6"/>
-<contactref element="U1" pad="3"/>
 <contactref element="C2" pad="1"/>
 <contactref element="D1" pad="A"/>
 <contactref element="C3" pad="2"/>
 <contactref element="R3" pad="1"/>
 <contactref element="J4" pad="1"/>
 <contactref element="J3" pad="P2"/>
-<wire x1="36.83" y1="25.6054" x2="36.6246" y2="25.4" width="1.27" layer="1"/>
-<wire x1="36.6246" y1="25.4" x2="33.66" y2="25.4" width="1.27" layer="1"/>
 <polygon width="1.27" layer="1">
 <vertex x="0" y="43"/>
 <vertex x="62" y="43"/>
@@ -1151,12 +1131,14 @@ design rules under a new name.</description>
 <contactref element="D2" pad="2"/>
 <contactref element="R8" pad="2"/>
 <contactref element="C4" pad="2"/>
+<contactref element="U$1" pad="6"/>
+<contactref element="U$1" pad="3"/>
+<wire x1="33.34" y1="25.4" x2="36.6246" y2="25.4" width="1.27" layer="1"/>
+<wire x1="36.6246" y1="25.4" x2="36.83" y2="25.6054" width="1.27" layer="1"/>
 </signal>
 <signal name="VIN">
-<contactref element="U1" pad="7"/>
 <contactref element="R1" pad="1"/>
 <contactref element="J4" pad="2"/>
-<wire x1="24.76" y1="22.86" x2="21.59" y2="22.86" width="2.54" layer="1"/>
 <wire x1="21.59" y1="25.248" x2="21.59" y2="22.86" width="1.27" layer="1"/>
 <wire x1="2.54" y1="31.19" x2="6.91" y2="31.19" width="2.54" layer="1"/>
 <wire x1="6.91" y1="31.19" x2="10.16" y2="27.94" width="2.54" layer="1"/>
@@ -1168,27 +1150,26 @@ design rules under a new name.</description>
 <contactref element="C4" pad="1"/>
 <wire x1="11.43" y1="22.86" x2="10.16" y2="24.13" width="2.54" layer="1"/>
 <wire x1="10.16" y1="27.94" x2="10.16" y2="24.13" width="2.54" layer="1"/>
-<wire x1="21.59" y1="22.86" x2="17.78" y2="22.86" width="2.54" layer="1"/>
+<wire x1="17.78" y1="22.86" x2="21.59" y2="22.86" width="2.54" layer="1"/>
 <wire x1="17.78" y1="22.86" x2="11.43" y2="22.86" width="2.54" layer="1"/>
 <wire x1="17.78" y1="21.435" x2="17.78" y2="22.86" width="2.54" layer="1"/>
+<contactref element="U$1" pad="7"/>
+<wire x1="21.59" y1="22.86" x2="25.08" y2="22.86" width="2.54" layer="1"/>
 </signal>
 <signal name="N$1">
-<contactref element="U1" pad="1"/>
 <contactref element="C1" pad="1"/>
 <wire x1="30.6854" y1="16.51" x2="30.6854" y2="19.2554" width="1.27" layer="1"/>
-<wire x1="30.6854" y1="19.2554" x2="31.75" y2="20.32" width="1.27" layer="1"/>
-<wire x1="31.75" y1="20.32" x2="33.66" y2="20.32" width="1.27" layer="1"/>
+<wire x1="31.75" y1="20.32" x2="30.6854" y2="19.2554" width="1.27" layer="1"/>
+<contactref element="U$1" pad="1"/>
+<wire x1="33.34" y1="20.32" x2="31.75" y2="20.32" width="1.27" layer="1"/>
 </signal>
 <signal name="N$2">
 <contactref element="C1" pad="2"/>
-<contactref element="U1" pad="8"/>
 <contactref element="D1" pad="C"/>
 <contactref element="L1" pad="1"/>
 <wire x1="27.7346" y1="16.51" x2="27.7346" y2="19.2554" width="1.27" layer="1"/>
-<wire x1="27.7346" y1="19.2554" x2="26.67" y2="20.32" width="1.27" layer="1"/>
-<wire x1="26.67" y1="20.32" x2="24.76" y2="20.32" width="1.27" layer="1"/>
-<wire x1="24.76" y1="20.32" x2="24.13" y2="20.32" width="1.27" layer="1"/>
-<wire x1="24.13" y1="20.32" x2="22.86" y2="19.05" width="1.27" layer="1"/>
+<wire x1="26.67" y1="20.32" x2="27.7346" y2="19.2554" width="1.27" layer="1"/>
+<wire x1="22.86" y1="19.05" x2="24.13" y2="20.32" width="1.27" layer="1"/>
 <wire x1="22.86" y1="12.7" x2="22.86" y2="19.05" width="1.27" layer="1"/>
 <wire x1="29.06" y1="5.08" x2="25.4" y2="5.08" width="1.27" layer="1"/>
 <wire x1="25.4" y1="5.08" x2="22.86" y2="7.62" width="1.27" layer="1"/>
@@ -1197,13 +1178,14 @@ design rules under a new name.</description>
 <wire x1="24.13" y1="11.43" x2="31.75" y2="11.43" width="1.27" layer="1"/>
 <wire x1="39.37" y1="7.725" x2="35.455" y2="7.725" width="1.27" layer="1"/>
 <wire x1="35.455" y1="7.725" x2="31.75" y2="11.43" width="1.27" layer="1"/>
+<contactref element="U$1" pad="8"/>
+<wire x1="24.13" y1="20.32" x2="25.08" y2="20.32" width="1.27" layer="1"/>
+<wire x1="25.08" y1="20.32" x2="26.67" y2="20.32" width="1.27" layer="1"/>
 </signal>
 <signal name="12V">
 <contactref element="L1" pad="2"/>
-<contactref element="U1" pad="4"/>
 <contactref element="C3" pad="1"/>
 <wire x1="39.37" y1="26.67" x2="38.1" y2="27.94" width="1.27" layer="1"/>
-<wire x1="33.66" y1="27.94" x2="38.1" y2="27.94" width="1.27" layer="1"/>
 <wire x1="39.37" y1="26.67" x2="39.37" y2="17.675" width="1.27" layer="1"/>
 <contactref element="J1" pad="1"/>
 <wire x1="52.07" y1="6.35" x2="53.34" y2="6.35" width="1.27" layer="1"/>
@@ -1215,26 +1197,29 @@ design rules under a new name.</description>
 <wire x1="49.53" y1="10.7412" x2="49.53" y2="8.89" width="1.27" layer="1"/>
 <contactref element="D2" pad="1"/>
 <wire x1="53.34" y1="8.45" x2="53.34" y2="6.35" width="1.27" layer="1"/>
+<contactref element="U$1" pad="4"/>
+<wire x1="38.1" y1="27.94" x2="33.34" y2="27.94" width="1.27" layer="1"/>
 </signal>
 <signal name="N$4">
 <contactref element="C2" pad="2"/>
-<contactref element="U1" pad="2"/>
 <wire x1="36.6246" y1="22.86" x2="36.83" y2="22.6546" width="1.27" layer="1"/>
-<wire x1="33.66" y1="22.86" x2="36.6246" y2="22.86" width="1.27" layer="1"/>
+<contactref element="U$1" pad="2"/>
+<wire x1="33.34" y1="22.86" x2="36.6246" y2="22.86" width="1.27" layer="1"/>
 </signal>
 <signal name="N$5">
-<contactref element="U1" pad="5"/>
 <contactref element="R1" pad="2"/>
 <contactref element="R2" pad="1"/>
 <contactref element="J3" pad="P1"/>
 <wire x1="21.59" y1="28.092" x2="21.742" y2="27.94" width="1.27" layer="1"/>
-<wire x1="21.742" y1="27.94" x2="24.76" y2="27.94" width="1.27" layer="1"/>
 <wire x1="21.59" y1="28.092" x2="21.59" y2="30.48" width="1.27" layer="1"/>
 <wire x1="21.59" y1="30.48" x2="22.86" y2="31.75" width="1.27" layer="1"/>
 <wire x1="22.86" y1="31.75" x2="23.978" y2="31.75" width="1.27" layer="1"/>
 <wire x1="17.78" y1="30.48" x2="17.78" y2="29.21" width="1.27" layer="1"/>
 <wire x1="17.78" y1="29.21" x2="19.05" y2="27.94" width="1.27" layer="1"/>
 <wire x1="19.05" y1="27.94" x2="21.742" y2="27.94" width="1.27" layer="1"/>
+<contactref element="U$1" pad="5"/>
+<wire x1="21.59" y1="28.092" x2="24.928" y2="28.092" width="1.27" layer="1"/>
+<wire x1="24.928" y1="28.092" x2="25.08" y2="27.94" width="1.27" layer="1"/>
 </signal>
 <signal name="N$7">
 <contactref element="R2" pad="2"/>

+ 1 - 1
schematic/regulator.s#1

@@ -6377,7 +6377,7 @@ grid 2.54 mm</description>
 <part name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" deviceset="MBR360G" device="" package3d_urn="urn:adsk.eagle:package:10898389/2" value="SB5100"/>
 <part name="L1" library="inductors" library_urn="urn:adsk.eagle:library:243" deviceset="DR127" device="" package3d_urn="urn:adsk.eagle:package:15117/1"/>
 <part name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="0.1uF"/>
-<part name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C-POL" device="TANTALUM-2917(7343-METRIC)" package3d_urn="urn:adsk.eagle:package:16290885/1" technology="_"/>
+<part name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C-POL" device="TANTALUM-2917(7343-METRIC)" package3d_urn="urn:adsk.eagle:package:16290885/1" technology="_" value="15uF"/>
 <part name="R1" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="1M"/>
 <part name="R2" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="100K"/>
 <part name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="39K"/>

+ 1 - 1
schematic/regulator.s#2

@@ -6376,7 +6376,7 @@ grid 2.54 mm</description>
 <part name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="0.1uF"/>
 <part name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" deviceset="MBR360G" device="" package3d_urn="urn:adsk.eagle:package:10898389/2" value="SB5100"/>
 <part name="L1" library="inductors" library_urn="urn:adsk.eagle:library:243" deviceset="DR127" device="" package3d_urn="urn:adsk.eagle:package:15117/1"/>
-<part name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_"/>
+<part name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="0.1uF"/>
 <part name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C-POL" device="TANTALUM-2917(7343-METRIC)" package3d_urn="urn:adsk.eagle:package:16290885/1" technology="_"/>
 <part name="R1" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="1M"/>
 <part name="R2" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="100K"/>

+ 1 - 1
schematic/regulator.s#3

@@ -6373,7 +6373,7 @@ grid 2.54 mm</description>
 <parts>
 <part name="U1" library="regulator" deviceset="MAX5035" device="DIP8" package3d_urn="urn:adsk.eagle:package:8089856/1"/>
 <part name="J4" library="Connectors" library_urn="urn:adsk.eagle:library:14555660" deviceset="B2P-VH(LF)(SN)" device="" package3d_urn="urn:adsk.eagle:package:10989917/2" value="IN"/>
-<part name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_"/>
+<part name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="0.1uF"/>
 <part name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" deviceset="MBR360G" device="" package3d_urn="urn:adsk.eagle:package:10898389/2" value="SB5100"/>
 <part name="L1" library="inductors" library_urn="urn:adsk.eagle:library:243" deviceset="DR127" device="" package3d_urn="urn:adsk.eagle:package:15117/1"/>
 <part name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_"/>

+ 1 - 1
schematic/regulator.s#4

@@ -6374,7 +6374,7 @@ grid 2.54 mm</description>
 <part name="U1" library="regulator" deviceset="MAX5035" device="DIP8" package3d_urn="urn:adsk.eagle:package:8089856/1"/>
 <part name="J4" library="Connectors" library_urn="urn:adsk.eagle:library:14555660" deviceset="B2P-VH(LF)(SN)" device="" package3d_urn="urn:adsk.eagle:package:10989917/2" value="IN"/>
 <part name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_"/>
-<part name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" deviceset="MBR360G" device="" package3d_urn="urn:adsk.eagle:package:10898389/2" value="MBR360G"/>
+<part name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" deviceset="MBR360G" device="" package3d_urn="urn:adsk.eagle:package:10898389/2" value="SB5100"/>
 <part name="L1" library="inductors" library_urn="urn:adsk.eagle:library:243" deviceset="DR127" device="" package3d_urn="urn:adsk.eagle:package:15117/1"/>
 <part name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_"/>
 <part name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C-POL" device="TANTALUM-2917(7343-METRIC)" package3d_urn="urn:adsk.eagle:package:16290885/1" technology="_"/>

+ 1 - 1
schematic/regulator.s#5

@@ -6374,7 +6374,7 @@ grid 2.54 mm</description>
 <part name="U1" library="regulator" deviceset="MAX5035" device="DIP8" package3d_urn="urn:adsk.eagle:package:8089856/1"/>
 <part name="J4" library="Connectors" library_urn="urn:adsk.eagle:library:14555660" deviceset="B2P-VH(LF)(SN)" device="" package3d_urn="urn:adsk.eagle:package:10989917/2" value="IN"/>
 <part name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_"/>
-<part name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" deviceset="MBR360G" device="" package3d_urn="urn:adsk.eagle:package:10898389/2" value=""/>
+<part name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" deviceset="MBR360G" device="" package3d_urn="urn:adsk.eagle:package:10898389/2" value="MBR360G"/>
 <part name="L1" library="inductors" library_urn="urn:adsk.eagle:library:243" deviceset="DR127" device="" package3d_urn="urn:adsk.eagle:package:15117/1"/>
 <part name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_"/>
 <part name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C-POL" device="TANTALUM-2917(7343-METRIC)" package3d_urn="urn:adsk.eagle:package:16290885/1" technology="_"/>

+ 1 - 1
schematic/regulator.s#6

@@ -6374,7 +6374,7 @@ grid 2.54 mm</description>
 <part name="U1" library="regulator" deviceset="MAX5035" device="DIP8" package3d_urn="urn:adsk.eagle:package:8089856/1"/>
 <part name="J4" library="Connectors" library_urn="urn:adsk.eagle:library:14555660" deviceset="B2P-VH(LF)(SN)" device="" package3d_urn="urn:adsk.eagle:package:10989917/2" value="IN"/>
 <part name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_"/>
-<part name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" deviceset="MBR360G" device="" package3d_urn="urn:adsk.eagle:package:10898389/2" value="SB 5100"/>
+<part name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" deviceset="MBR360G" device="" package3d_urn="urn:adsk.eagle:package:10898389/2" value=""/>
 <part name="L1" library="inductors" library_urn="urn:adsk.eagle:library:243" deviceset="DR127" device="" package3d_urn="urn:adsk.eagle:package:15117/1"/>
 <part name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_"/>
 <part name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C-POL" device="TANTALUM-2917(7343-METRIC)" package3d_urn="urn:adsk.eagle:package:16290885/1" technology="_"/>

+ 1 - 1
schematic/regulator.s#7

@@ -6377,7 +6377,7 @@ grid 2.54 mm</description>
 <part name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" deviceset="MBR360G" device="" package3d_urn="urn:adsk.eagle:package:10898389/2" value="SB 5100"/>
 <part name="L1" library="inductors" library_urn="urn:adsk.eagle:library:243" deviceset="DR127" device="" package3d_urn="urn:adsk.eagle:package:15117/1"/>
 <part name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_"/>
-<part name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C-POL" device="TANTALUM-2917(7343-METRIC)" package3d_urn="urn:adsk.eagle:package:16290885/1" technology="_" value="15uF"/>
+<part name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C-POL" device="TANTALUM-2917(7343-METRIC)" package3d_urn="urn:adsk.eagle:package:16290885/1" technology="_"/>
 <part name="R1" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="1M"/>
 <part name="R2" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="100K"/>
 <part name="R3" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="39K"/>

+ 1 - 1
schematic/regulator.s#8

@@ -6376,7 +6376,7 @@ grid 2.54 mm</description>
 <part name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_"/>
 <part name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" deviceset="MBR360G" device="" package3d_urn="urn:adsk.eagle:package:10898389/2" value="SB 5100"/>
 <part name="L1" library="inductors" library_urn="urn:adsk.eagle:library:243" deviceset="DR127" device="" package3d_urn="urn:adsk.eagle:package:15117/1"/>
-<part name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="0.1uF"/>
+<part name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_"/>
 <part name="C3" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C-POL" device="TANTALUM-2917(7343-METRIC)" package3d_urn="urn:adsk.eagle:package:16290885/1" technology="_" value="15uF"/>
 <part name="R1" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="1M"/>
 <part name="R2" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="100K"/>

+ 1 - 1
schematic/regulator.s#9

@@ -6373,7 +6373,7 @@ grid 2.54 mm</description>
 <parts>
 <part name="U1" library="regulator" deviceset="MAX5035" device="DIP8" package3d_urn="urn:adsk.eagle:package:8089856/1"/>
 <part name="J4" library="Connectors" library_urn="urn:adsk.eagle:library:14555660" deviceset="B2P-VH(LF)(SN)" device="" package3d_urn="urn:adsk.eagle:package:10989917/2" value="IN"/>
-<part name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="0.1uF"/>
+<part name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_"/>
 <part name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" deviceset="MBR360G" device="" package3d_urn="urn:adsk.eagle:package:10898389/2" value="SB 5100"/>
 <part name="L1" library="inductors" library_urn="urn:adsk.eagle:library:243" deviceset="DR127" device="" package3d_urn="urn:adsk.eagle:package:15117/1"/>
 <part name="C2" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="0.1uF"/>

+ 148 - 108
schematic/regulator.sch

@@ -144,101 +144,6 @@
 </layers>
 <schematic xreflabel="%F%N/%S.%C%R" xrefpart="/%S.%C%R">
 <libraries>
-<library name="regulator">
-<packages>
-<package name="DIP8" urn="urn:adsk.eagle:footprint:4470/1">
-<description>&lt;b&gt;SMD DIL08&lt;/b&gt; Gull Wing Surface Mount Optioon 300&lt;p&gt;
-Source: http://www.avagotech.com/docs/AV02-0410EN</description>
-<wire x1="-4.81" y1="-3.075" x2="4.81" y2="-3.075" width="0.2032" layer="51"/>
-<wire x1="4.81" y1="-3.075" x2="4.81" y2="3.075" width="0.2032" layer="21"/>
-<wire x1="4.81" y1="3.075" x2="-4.81" y2="3.075" width="0.2032" layer="51"/>
-<wire x1="-4.81" y1="3.075" x2="-4.81" y2="-3.075" width="0.2032" layer="21"/>
-<circle x="-3.81" y="-2.159" radius="0.3667" width="0" layer="21"/>
-<smd name="1" x="-3.81" y="-4.45" dx="1.16" dy="2" layer="1"/>
-<smd name="2" x="-1.27" y="-4.45" dx="1.27" dy="2" layer="1"/>
-<smd name="3" x="1.27" y="-4.45" dx="1.27" dy="2" layer="1"/>
-<smd name="4" x="3.81" y="-4.45" dx="1.16" dy="2" layer="1"/>
-<smd name="5" x="3.81" y="4.45" dx="1.16" dy="2" layer="1"/>
-<smd name="6" x="1.27" y="4.45" dx="1.27" dy="2" layer="1"/>
-<smd name="7" x="-1.27" y="4.45" dx="1.27" dy="2" layer="1"/>
-<smd name="8" x="-3.81" y="4.45" dx="1.16" dy="2" layer="1"/>
-<text x="-5.635" y="-3.1351" size="1.27" layer="25" rot="R90">&gt;NAME</text>
-<text x="6.905" y="-4.4051" size="1.27" layer="27" rot="R90">&gt;VALUE</text>
-<rectangle x1="-4.0899" y1="-4.825" x2="-3.5301" y2="-3.81" layer="51"/>
-<rectangle x1="-1.5499" y1="-4.825" x2="-0.9901" y2="-3.81" layer="51"/>
-<rectangle x1="0.9901" y1="-4.825" x2="1.5499" y2="-3.81" layer="51"/>
-<rectangle x1="3.5301" y1="-4.825" x2="4.0899" y2="-3.81" layer="51"/>
-<rectangle x1="3.5301" y1="3.81" x2="4.0899" y2="4.825" layer="51"/>
-<rectangle x1="0.9901" y1="3.81" x2="1.5499" y2="4.825" layer="51"/>
-<rectangle x1="-1.5499" y1="3.81" x2="-0.9901" y2="4.825" layer="51"/>
-<rectangle x1="-4.0899" y1="3.81" x2="-3.5301" y2="4.825" layer="51"/>
-<rectangle x1="-2.15" y1="3.1" x2="-0.4" y2="3.81" layer="51" rot="R180"/>
-<rectangle x1="-4.1" y1="3.1" x2="-2.94" y2="3.81" layer="51" rot="R180"/>
-<rectangle x1="0.39" y1="3.1" x2="2.14" y2="3.81" layer="51" rot="R180"/>
-<rectangle x1="2.93" y1="3.1" x2="4.1" y2="3.81" layer="51" rot="R180"/>
-<rectangle x1="-4.075" y1="-3.81" x2="-2.93" y2="-3.1" layer="51"/>
-<rectangle x1="-2.14" y1="-3.81" x2="-0.39" y2="-3.1" layer="51"/>
-<rectangle x1="0.4" y1="-3.81" x2="2.15" y2="-3.1" layer="51"/>
-<rectangle x1="2.94" y1="-3.81" x2="4.1" y2="-3.1" layer="51"/>
-</package>
-</packages>
-<packages3d>
-<package3d name="DIP8" urn="urn:adsk.eagle:package:8089856/1" locally_modified="yes" type="box">
-<description>&lt;b&gt;SMD DIL08&lt;/b&gt; &lt;p&gt;
-dual in line package'</description>
-<packageinstances>
-<packageinstance name="DIP8"/>
-</packageinstances>
-</package3d>
-</packages3d>
-<symbols>
-<symbol name="MX5035">
-<description>The  MAX5035  easy-to-use,  high-efficiency,  high-volt-age,  step-down  DC-DC  converter  operates  from  aninput voltage up to 76V and consumes only 270μA qui-escent  current  at  no  load.</description>
-<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="-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="12.7" width="0.254" layer="94"/>
-<pin name="BST" x="-15.24" y="7.62" length="middle" direction="in"/>
-<pin name="VD" x="-15.24" y="2.54" length="middle" direction="in"/>
-<pin name="SGND" x="-15.24" y="-2.54" length="middle" direction="in"/>
-<pin name="FB" x="-15.24" y="-7.62" length="middle" direction="in"/>
-<pin name="ON/OFF" x="15.24" y="-7.62" length="middle" direction="in" rot="R180"/>
-<pin name="GND" x="15.24" y="-2.54" length="middle" direction="pwr" rot="R180"/>
-<pin name="VIN" x="15.24" y="2.54" length="middle" direction="pwr" rot="R180"/>
-<pin name="LX" x="15.24" y="7.62" length="middle" direction="pwr" rot="R180"/>
-<text x="-10.16" y="15.24" size="1.778" layer="95">&gt;NAME</text>
-<text x="-10.16" y="-17.78" size="1.778" layer="96">&gt;VALUE</text>
-</symbol>
-</symbols>
-<devicesets>
-<deviceset name="MAX5035">
-<description>The  MAX5035  easy-to-use,  high-efficiency,  high-volt-age,  step-down  DC-DC  converter  operates  from  aninput voltage up to 76V and consumes only 270μA qui-escent  current  at  no  load.</description>
-<gates>
-<gate name="G$1" symbol="MX5035" x="0" y="0"/>
-</gates>
-<devices>
-<device name="DIP8" package="DIP8">
-<connects>
-<connect gate="G$1" pin="BST" pad="1"/>
-<connect gate="G$1" pin="FB" pad="4"/>
-<connect gate="G$1" pin="GND" pad="6"/>
-<connect gate="G$1" pin="LX" pad="8"/>
-<connect gate="G$1" pin="ON/OFF" pad="5"/>
-<connect gate="G$1" pin="SGND" pad="3"/>
-<connect gate="G$1" pin="VD" pad="2"/>
-<connect gate="G$1" pin="VIN" pad="7"/>
-</connects>
-<package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:8089856/1"/>
-</package3dinstances>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
-</devicesets>
-</library>
 <library name="Connectors" urn="urn:adsk.eagle:library:14555660">
 <description>&lt;h3&gt; PCBLayout.com - Frequently Used &lt;i&gt;Connectors&lt;/i&gt;&lt;/h3&gt;
 
@@ -6276,6 +6181,66 @@ grid 2.54 mm</description>
 <text x="0" y="6.885" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
 <text x="0" y="-6.885" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
 </package>
+<package name="DIP8" urn="urn:adsk.eagle:footprint:4470/1">
+<description>&lt;b&gt;SMD DIL08&lt;/b&gt; Gull Wing Surface Mount Optioon 300&lt;p&gt;
+Source: http://www.avagotech.com/docs/AV02-0410EN</description>
+<wire x1="-4.81" y1="-3.075" x2="4.81" y2="-3.075" width="0.2032" layer="51"/>
+<wire x1="4.81" y1="-3.075" x2="4.81" y2="3.075" width="0.2032" layer="21"/>
+<wire x1="4.81" y1="3.075" x2="-4.81" y2="3.075" width="0.2032" layer="51"/>
+<wire x1="-4.81" y1="3.075" x2="-4.81" y2="-3.075" width="0.2032" layer="21"/>
+<circle x="-3.81" y="-2.159" radius="0.3667" width="0" layer="21"/>
+<smd name="1" x="-3.81" y="-4.45" dx="1.16" dy="2" layer="1"/>
+<smd name="2" x="-1.27" y="-4.45" dx="1.27" dy="2" layer="1"/>
+<smd name="3" x="1.27" y="-4.45" dx="1.27" dy="2" layer="1"/>
+<smd name="4" x="3.81" y="-4.45" dx="1.16" dy="2" layer="1"/>
+<smd name="5" x="3.81" y="4.45" dx="1.16" dy="2" layer="1"/>
+<smd name="6" x="1.27" y="4.45" dx="1.27" dy="2" layer="1"/>
+<smd name="7" x="-1.27" y="4.45" dx="1.27" dy="2" layer="1"/>
+<smd name="8" x="-3.81" y="4.45" dx="1.16" dy="2" layer="1"/>
+<text x="-5.635" y="-3.1351" size="1.27" layer="25" rot="R90">&gt;NAME</text>
+<text x="6.905" y="-4.4051" size="1.27" layer="27" rot="R90">&gt;VALUE</text>
+<rectangle x1="-4.0899" y1="-4.825" x2="-3.5301" y2="-3.81" layer="51"/>
+<rectangle x1="-1.5499" y1="-4.825" x2="-0.9901" y2="-3.81" layer="51"/>
+<rectangle x1="0.9901" y1="-4.825" x2="1.5499" y2="-3.81" layer="51"/>
+<rectangle x1="3.5301" y1="-4.825" x2="4.0899" y2="-3.81" layer="51"/>
+<rectangle x1="3.5301" y1="3.81" x2="4.0899" y2="4.825" layer="51"/>
+<rectangle x1="0.9901" y1="3.81" x2="1.5499" y2="4.825" layer="51"/>
+<rectangle x1="-1.5499" y1="3.81" x2="-0.9901" y2="4.825" layer="51"/>
+<rectangle x1="-4.0899" y1="3.81" x2="-3.5301" y2="4.825" layer="51"/>
+<rectangle x1="-2.15" y1="3.1" x2="-0.4" y2="3.81" layer="51" rot="R180"/>
+<rectangle x1="-4.1" y1="3.1" x2="-2.94" y2="3.81" layer="51" rot="R180"/>
+<rectangle x1="0.39" y1="3.1" x2="2.14" y2="3.81" layer="51" rot="R180"/>
+<rectangle x1="2.93" y1="3.1" x2="4.1" y2="3.81" layer="51" rot="R180"/>
+<rectangle x1="-4.075" y1="-3.81" x2="-2.93" y2="-3.1" layer="51"/>
+<rectangle x1="-2.14" y1="-3.81" x2="-0.39" y2="-3.1" layer="51"/>
+<rectangle x1="0.4" y1="-3.81" x2="2.15" y2="-3.1" layer="51"/>
+<rectangle x1="2.94" y1="-3.81" x2="4.1" y2="-3.1" layer="51"/>
+</package>
+<package name="DIP826W56P254L937H458Q8B" urn="urn:adsk.eagle:footprint:22059849/1">
+<description>8-DIP, 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span, 9.38 X 6.99 X 4.58 mm body
+&lt;p&gt;8-pin DIP package with 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span with body size 9.38 X 6.99 X 4.58 mm&lt;/p&gt;</description>
+<circle x="-5.3669" y="3.81" radius="0.25" width="0" layer="21"/>
+<wire x1="-3.935" y1="4.7969" x2="-3.935" y2="4.955" width="0.12" layer="21"/>
+<wire x1="-3.935" y1="4.955" x2="3.935" y2="4.955" width="0.12" layer="21"/>
+<wire x1="3.935" y1="4.955" x2="3.935" y2="4.7969" width="0.12" layer="21"/>
+<wire x1="-3.935" y1="-4.7969" x2="-3.935" y2="-4.955" width="0.12" layer="21"/>
+<wire x1="-3.935" y1="-4.955" x2="3.935" y2="-4.955" width="0.12" layer="21"/>
+<wire x1="3.935" y1="-4.955" x2="3.935" y2="-4.7969" width="0.12" layer="21"/>
+<wire x1="3.935" y1="-4.955" x2="-3.935" y2="-4.955" width="0.12" layer="51"/>
+<wire x1="-3.935" y1="-4.955" x2="-3.935" y2="4.955" width="0.12" layer="51"/>
+<wire x1="-3.935" y1="4.955" x2="3.935" y2="4.955" width="0.12" layer="51"/>
+<wire x1="3.935" y1="4.955" x2="3.935" y2="-4.955" width="0.12" layer="51"/>
+<pad name="1" x="-4.13" y="3.81" drill="0.8657" diameter="1.4657"/>
+<pad name="2" x="-4.13" y="1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="3" x="-4.13" y="-1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="4" x="-4.13" y="-3.81" drill="0.8657" diameter="1.4657"/>
+<pad name="5" x="4.13" y="-3.81" drill="0.8657" diameter="1.4657"/>
+<pad name="6" x="4.13" y="-1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="7" x="4.13" y="1.27" drill="0.8657" diameter="1.4657"/>
+<pad name="8" x="4.13" y="3.81" drill="0.8657" diameter="1.4657"/>
+<text x="0" y="5.59" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-5.59" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
+</package>
 </packages>
 <packages3d>
 <package3d name="DIOM5027X220N" urn="urn:adsk.eagle:package:21928182/1" type="model">
@@ -6292,6 +6257,20 @@ grid 2.54 mm</description>
 <packageinstance name="CAPAE1230X1250N"/>
 </packageinstances>
 </package3d>
+<package3d name="DIP8" urn="urn:adsk.eagle:package:8089856/1" locally_modified="yes" type="box">
+<description>&lt;b&gt;SMD DIL08&lt;/b&gt; &lt;p&gt;
+dual in line package'</description>
+<packageinstances>
+<packageinstance name="DIP8"/>
+</packageinstances>
+</package3d>
+<package3d name="DIP826W56P254L937H458Q8B" urn="urn:adsk.eagle:package:22059831/1" type="model">
+<description>8-DIP, 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span, 9.38 X 6.99 X 4.58 mm body
+&lt;p&gt;8-pin DIP package with 2.54 mm (0.10 in) pitch, 8.26 mm (0.33 in) span with body size 9.38 X 6.99 X 4.58 mm&lt;/p&gt;</description>
+<packageinstances>
+<packageinstance name="DIP826W56P254L937H458Q8B"/>
+</packageinstances>
+</package3d>
 </packages3d>
 <symbols>
 <symbol name="TVS_DIODE">
@@ -6318,6 +6297,23 @@ grid 2.54 mm</description>
 <text x="2.54" y="2.54" size="1.778" layer="95">&gt;NAME</text>
 <text x="2.54" y="-5.08" size="1.778" layer="96">&gt;VALUE</text>
 </symbol>
+<symbol name="MX5035">
+<description>The  MAX5035  easy-to-use,  high-efficiency,  high-volt-age,  step-down  DC-DC  converter  operates  from  aninput voltage up to 76V and consumes only 270μA qui-escent  current  at  no  load.</description>
+<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="-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="12.7" width="0.254" layer="94"/>
+<pin name="BST" x="-15.24" y="7.62" length="middle" direction="in"/>
+<pin name="VD" x="-15.24" y="2.54" length="middle" direction="in"/>
+<pin name="SGND" x="-15.24" y="-2.54" length="middle" direction="in"/>
+<pin name="FB" x="-15.24" y="-7.62" length="middle" direction="in"/>
+<pin name="ON/OFF" x="15.24" y="-7.62" length="middle" direction="in" rot="R180"/>
+<pin name="GND" x="15.24" y="-2.54" length="middle" direction="pwr" rot="R180"/>
+<pin name="VIN" x="15.24" y="2.54" length="middle" direction="pwr" rot="R180"/>
+<pin name="LX" x="15.24" y="7.62" length="middle" direction="pwr" rot="R180"/>
+<text x="-10.16" y="15.24" size="1.778" layer="95">&gt;NAME</text>
+<text x="-10.16" y="-17.78" size="1.778" layer="96">&gt;VALUE</text>
+</symbol>
 </symbols>
 <devicesets>
 <deviceset name="TVS_DIODE">
@@ -6359,6 +6355,50 @@ grid 2.54 mm</description>
 </device>
 </devices>
 </deviceset>
+<deviceset name="MAX5035">
+<description>The  MAX5035  easy-to-use,  high-efficiency,  high-volt-age,  step-down  DC-DC  converter  operates  from  aninput voltage up to 76V and consumes only 270μA qui-escent  current  at  no  load.</description>
+<gates>
+<gate name="G$1" symbol="MX5035" x="0" y="0"/>
+</gates>
+<devices>
+<device name="DIP8" package="DIP8">
+<connects>
+<connect gate="G$1" pin="BST" pad="1"/>
+<connect gate="G$1" pin="FB" pad="4"/>
+<connect gate="G$1" pin="GND" pad="6"/>
+<connect gate="G$1" pin="LX" pad="8"/>
+<connect gate="G$1" pin="ON/OFF" pad="5"/>
+<connect gate="G$1" pin="SGND" pad="3"/>
+<connect gate="G$1" pin="VD" pad="2"/>
+<connect gate="G$1" pin="VIN" pad="7"/>
+</connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:8089856/1"/>
+</package3dinstances>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+<device name="PDIP8" package="DIP826W56P254L937H458Q8B">
+<connects>
+<connect gate="G$1" pin="BST" pad="1"/>
+<connect gate="G$1" pin="FB" pad="4"/>
+<connect gate="G$1" pin="GND" pad="6"/>
+<connect gate="G$1" pin="LX" pad="8"/>
+<connect gate="G$1" pin="ON/OFF" pad="5"/>
+<connect gate="G$1" pin="SGND" pad="3"/>
+<connect gate="G$1" pin="VD" pad="2"/>
+<connect gate="G$1" pin="VIN" pad="7"/>
+</connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:22059831/1"/>
+</package3dinstances>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
 </devicesets>
 </library>
 </libraries>
@@ -6371,7 +6411,6 @@ grid 2.54 mm</description>
 </class>
 </classes>
 <parts>
-<part name="U1" library="regulator" deviceset="MAX5035" device="DIP8" package3d_urn="urn:adsk.eagle:package:8089856/1"/>
 <part name="J4" library="Connectors" library_urn="urn:adsk.eagle:library:14555660" deviceset="B2P-VH(LF)(SN)" device="" package3d_urn="urn:adsk.eagle:package:10989917/2" value="IN"/>
 <part name="C1" library="Capacitor" library_urn="urn:adsk.eagle:library:16290819" deviceset="C" device="CHIP-1206(3216-METRIC)" package3d_urn="urn:adsk.eagle:package:16290893/2" technology="_" value="0.1uF"/>
 <part name="D1" library="Diodes" library_urn="urn:adsk.eagle:library:11396254" deviceset="MBR360G" device="" package3d_urn="urn:adsk.eagle:package:10898389/2" value="SB5100"/>
@@ -6396,16 +6435,13 @@ grid 2.54 mm</description>
 <part name="D2" library="eScooter" deviceset="TVS_DIODE" device="SMA" package3d_urn="urn:adsk.eagle:package:21928182/1" value="P4SMAJ12CA"/>
 <part name="R8" library="eagle-ltspice" library_urn="urn:adsk.eagle:library:217" deviceset="R" device="R1206" package3d_urn="urn:adsk.eagle:package:13301/1" value="10K"/>
 <part name="C4" library="eScooter" deviceset="C" device="PANASONIC_H13" package3d_urn="urn:adsk.eagle:package:21812541/1" value="68uF"/>
+<part name="U$1" library="eScooter" deviceset="MAX5035" device="PDIP8" package3d_urn="urn:adsk.eagle:package:22059831/1"/>
 </parts>
 <sheets>
 <sheet>
 <plain>
 </plain>
 <instances>
-<instance part="U1" gate="G$1" x="132.08" y="101.6" smashed="yes">
-<attribute name="NAME" x="129.54" y="116.84" size="1.778" layer="95"/>
-<attribute name="VALUE" x="121.92" y="86.36" size="1.778" layer="96"/>
-</instance>
 <instance part="J4" gate="G$1" x="213.36" y="116.84" smashed="yes" rot="MR0">
 <attribute name="NAME" x="215.9" y="122.682" size="1.778" layer="95" rot="MR0"/>
 </instance>
@@ -6496,6 +6532,10 @@ grid 2.54 mm</description>
 <attribute name="NAME" x="162.56" y="109.22" size="1.778" layer="95"/>
 <attribute name="VALUE" x="162.56" y="104.14" size="1.778" layer="96" rot="MR180"/>
 </instance>
+<instance part="U$1" gate="G$1" x="132.08" y="101.6" smashed="yes">
+<attribute name="NAME" x="121.92" y="116.84" size="1.778" layer="95"/>
+<attribute name="VALUE" x="121.92" y="83.82" size="1.778" layer="96"/>
+</instance>
 </instances>
 <busses>
 </busses>
@@ -6544,7 +6584,6 @@ grid 2.54 mm</description>
 <wire x1="200.66" y1="132.08" x2="223.52" y2="132.08" width="0.1524" layer="91"/>
 <pinref part="J3" gate="G$1" pin="2"/>
 <wire x1="187.96" y1="91.44" x2="187.96" y2="66.04" width="0.1524" layer="91"/>
-<pinref part="U1" gate="G$1" pin="GND"/>
 <wire x1="160.02" y1="99.06" x2="160.02" y2="101.6" width="0.1524" layer="91"/>
 <wire x1="147.32" y1="99.06" x2="160.02" y2="99.06" width="0.1524" layer="91"/>
 <junction x="160.02" y="99.06"/>
@@ -6566,7 +6605,6 @@ grid 2.54 mm</description>
 <wire x1="208.28" y1="119.38" x2="200.66" y2="119.38" width="0.1524" layer="91"/>
 <wire x1="223.52" y1="132.08" x2="223.52" y2="33.02" width="0.1524" layer="91"/>
 <wire x1="223.52" y1="33.02" x2="78.74" y2="33.02" width="0.1524" layer="91"/>
-<pinref part="U1" gate="G$1" pin="SGND"/>
 <wire x1="116.84" y1="99.06" x2="101.6" y2="99.06" width="0.1524" layer="91"/>
 <wire x1="101.6" y1="99.06" x2="101.6" y2="104.14" width="0.1524" layer="91"/>
 <wire x1="101.6" y1="104.14" x2="104.14" y2="104.14" width="0.1524" layer="91"/>
@@ -6579,6 +6617,8 @@ grid 2.54 mm</description>
 <junction x="78.74" y="66.04"/>
 <junction x="78.74" y="33.02"/>
 <pinref part="C4" gate="G$1" pin="P$2"/>
+<pinref part="U$1" gate="G$1" pin="SGND"/>
+<pinref part="U$1" gate="G$1" pin="GND"/>
 </segment>
 </net>
 <net name="VIN" class="0">
@@ -6586,7 +6626,6 @@ grid 2.54 mm</description>
 <pinref part="Q2" gate="G$1" pin="D"/>
 <wire x1="48.26" y1="50.8" x2="48.26" y2="58.42" width="0.1524" layer="91"/>
 <label x="53.34" y="53.34" size="1.778" layer="95"/>
-<pinref part="U1" gate="G$1" pin="VIN"/>
 <wire x1="147.32" y1="104.14" x2="154.94" y2="104.14" width="0.1524" layer="91"/>
 <wire x1="182.88" y1="116.84" x2="182.88" y2="106.68" width="0.1524" layer="91"/>
 <pinref part="R1" gate="G$1" pin="1"/>
@@ -6605,15 +6644,16 @@ grid 2.54 mm</description>
 <junction x="205.74" y="116.84"/>
 <pinref part="C4" gate="G$1" pin="P$1"/>
 <label x="147.32" y="104.14" size="1.778" layer="95"/>
+<pinref part="U$1" gate="G$1" pin="VIN"/>
 </segment>
 </net>
 <net name="N$1" class="0">
 <segment>
-<pinref part="U1" gate="G$1" pin="BST"/>
 <wire x1="116.84" y1="109.22" x2="114.3" y2="109.22" width="0.1524" layer="91"/>
 <wire x1="114.3" y1="109.22" x2="114.3" y2="124.46" width="0.1524" layer="91"/>
 <pinref part="C1" gate="G$1" pin="1"/>
 <wire x1="114.3" y1="124.46" x2="127" y2="124.46" width="0.1524" layer="91"/>
+<pinref part="U$1" gate="G$1" pin="BST"/>
 </segment>
 </net>
 <net name="N$2" class="0">
@@ -6622,7 +6662,6 @@ grid 2.54 mm</description>
 <wire x1="134.62" y1="124.46" x2="137.16" y2="124.46" width="0.1524" layer="91"/>
 <wire x1="137.16" y1="124.46" x2="149.86" y2="124.46" width="0.1524" layer="91"/>
 <wire x1="149.86" y1="124.46" x2="149.86" y2="109.22" width="0.1524" layer="91"/>
-<pinref part="U1" gate="G$1" pin="LX"/>
 <wire x1="149.86" y1="109.22" x2="147.32" y2="109.22" width="0.1524" layer="91"/>
 <wire x1="137.16" y1="132.08" x2="137.16" y2="124.46" width="0.1524" layer="91"/>
 <junction x="137.16" y="124.46"/>
@@ -6631,6 +6670,7 @@ grid 2.54 mm</description>
 <wire x1="137.16" y1="132.08" x2="127" y2="132.08" width="0.1524" layer="91"/>
 <junction x="137.16" y="132.08"/>
 <pinref part="L1" gate="G$1" pin="1"/>
+<pinref part="U$1" gate="G$1" pin="LX"/>
 </segment>
 </net>
 <net name="12V" class="0">
@@ -6638,7 +6678,6 @@ grid 2.54 mm</description>
 <pinref part="L1" gate="G$1" pin="2"/>
 <wire x1="111.76" y1="132.08" x2="99.06" y2="132.08" width="0.1524" layer="91"/>
 <wire x1="99.06" y1="132.08" x2="99.06" y2="93.98" width="0.1524" layer="91"/>
-<pinref part="U1" gate="G$1" pin="FB"/>
 <wire x1="99.06" y1="93.98" x2="116.84" y2="93.98" width="0.1524" layer="91"/>
 <wire x1="99.06" y1="132.08" x2="91.44" y2="132.08" width="0.1524" layer="91"/>
 <junction x="99.06" y="132.08"/>
@@ -6655,18 +6694,18 @@ grid 2.54 mm</description>
 <pinref part="D2" gate="D$1" pin="P$1"/>
 <wire x1="78.74" y1="132.08" x2="78.74" y2="124.46" width="0.1524" layer="91"/>
 <junction x="78.74" y="132.08"/>
+<pinref part="U$1" gate="G$1" pin="FB"/>
 </segment>
 </net>
 <net name="N$4" class="0">
 <segment>
 <pinref part="C2" gate="G$1" pin="2"/>
-<pinref part="U1" gate="G$1" pin="VD"/>
 <wire x1="111.76" y1="104.14" x2="116.84" y2="104.14" width="0.1524" layer="91"/>
+<pinref part="U$1" gate="G$1" pin="VD"/>
 </segment>
 </net>
 <net name="N$5" class="0">
 <segment>
-<pinref part="U1" gate="G$1" pin="ON/OFF"/>
 <wire x1="147.32" y1="93.98" x2="182.88" y2="93.98" width="0.1524" layer="91"/>
 <pinref part="R1" gate="G$1" pin="2"/>
 <wire x1="182.88" y1="96.52" x2="182.88" y2="93.98" width="0.1524" layer="91"/>
@@ -6675,6 +6714,7 @@ grid 2.54 mm</description>
 <pinref part="R2" gate="G$1" pin="1"/>
 <pinref part="J3" gate="G$1" pin="1"/>
 <wire x1="182.88" y1="93.98" x2="187.96" y2="93.98" width="0.1524" layer="91"/>
+<pinref part="U$1" gate="G$1" pin="ON/OFF"/>
 </segment>
 </net>
 <net name="N$7" class="0">

Some files were not shown because too many files changed in this diff