From 07ac01b993f2b8fcf46eca8326165a6ef6f1a4d0 Mon Sep 17 00:00:00 2001
From: Fisch <interfisch@gmx.net>
Date: Tue, 13 Jun 2023 23:45:17 +0200
Subject: [PATCH] add ds18b20 temperature sensors

---
 Bobbycar_wiring/Bobbycar_wiring.kicad_sch | 1281 ++++++++++-----------
 controller_teensy/include/display.h       |    7 +-
 controller_teensy/include/logging.h       |    6 +-
 controller_teensy/include/temperature.h   |  105 ++
 controller_teensy/platformio.ini          |    3 +-
 controller_teensy/src/main.cpp            |   18 +-
 6 files changed, 717 insertions(+), 703 deletions(-)
 create mode 100644 controller_teensy/include/temperature.h

diff --git a/Bobbycar_wiring/Bobbycar_wiring.kicad_sch b/Bobbycar_wiring/Bobbycar_wiring.kicad_sch
index 5ca219c..41ec7f1 100644
--- a/Bobbycar_wiring/Bobbycar_wiring.kicad_sch
+++ b/Bobbycar_wiring/Bobbycar_wiring.kicad_sch
@@ -597,191 +597,6 @@
         )
       )
     )
-    (symbol "Bobbycar_wiring-rescue:LED_Dual_CAC-Device" (pin_names (offset 0)) (in_bom yes) (on_board yes)
-      (property "Reference" "D" (id 0) (at 0 5.715 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "LED_Dual_CAC-Device" (id 1) (at 0 -6.35 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Footprint" "" (id 2) (at 1.27 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "" (id 3) (at 1.27 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "LED* LED_SMD:* LED_THT:*" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "LED_Dual_CAC-Device_0_1"
-        (circle (center -2.54 0) (radius 0.2794)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (polyline
-          (pts
-            (xy -4.572 0)
-            (xy -2.54 0)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 1.27 -1.27)
-            (xy 1.27 -3.81)
-          )
-          (stroke (width 0.2032) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 1.27 3.81)
-            (xy 1.27 1.27)
-          )
-          (stroke (width 0.2032) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 3.81 -2.54)
-            (xy 1.905 -2.54)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 3.81 2.54)
-            (xy 1.905 2.54)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -1.27 -1.27)
-            (xy -1.27 -3.81)
-            (xy 1.27 -2.54)
-            (xy -1.27 -1.27)
-          )
-          (stroke (width 0.2032) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -1.27 3.81)
-            (xy -1.27 1.27)
-            (xy 1.27 2.54)
-            (xy -1.27 3.81)
-          )
-          (stroke (width 0.2032) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 2.032 2.54)
-            (xy -2.54 2.54)
-            (xy -2.54 -2.54)
-            (xy 2.032 -2.54)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 2.032 5.08)
-            (xy 3.556 6.604)
-            (xy 2.794 6.604)
-            (xy 3.556 6.604)
-            (xy 3.556 5.842)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 3.302 4.064)
-            (xy 4.826 5.588)
-            (xy 4.064 5.588)
-            (xy 4.826 5.588)
-            (xy 4.826 4.826)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (circle (center 0 0) (radius 4.572)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type background))
-        )
-      )
-      (symbol "LED_Dual_CAC-Device_1_1"
-        (pin input line (at 7.62 2.54 180) (length 3.81)
-          (name "K1" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin input line (at -7.62 0 0) (length 3.048)
-          (name "A" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-        (pin input line (at 7.62 -2.54 180) (length 3.81)
-          (name "K2" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
-    (symbol "Bobbycar_wiring-rescue:SW_DPST_x2-Switch" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "SW" (id 0) (at 0 3.175 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "SW_DPST_x2-Switch" (id 1) (at 0 -2.54 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Footprint" "" (id 2) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "" (id 3) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "SW_DPST_x2-Switch_0_0"
-        (circle (center -2.032 0) (radius 0.508)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -1.524 0.254)
-            (xy 1.524 1.778)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (circle (center 2.032 0) (radius 0.508)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-      )
-      (symbol "SW_DPST_x2-Switch_1_1"
-        (pin passive line (at -5.08 0 0) (length 2.54)
-          (name "A" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 5.08 0 180) (length 2.54)
-          (name "B" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-      )
-      (symbol "SW_DPST_x2-Switch_2_1"
-        (pin input line (at -5.08 0 0) (length 2.54)
-          (name "A" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
-        (pin input line (at 5.08 0 180) (length 2.54)
-          (name "B" (effects (font (size 1.27 1.27))))
-          (number "4" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "Connector:Conn_01x02_Female" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
       (property "Reference" "J" (id 0) (at 0 2.54 0)
         (effects (font (size 1.27 1.27)))
@@ -2059,6 +1874,117 @@
         )
       )
     )
+    (symbol "Sensor_Temperature:DS18B20" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
+      (property "Reference" "U" (id 0) (at -3.81 6.35 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "DS18B20" (id 1) (at 6.35 6.35 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "Package_TO_SOT_THT:TO-92_Inline" (id 2) (at -25.4 -6.35 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "http://datasheets.maximintegrated.com/en/ds/DS18B20.pdf" (id 3) (at -3.81 6.35 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "OneWire 1Wire Dallas Maxim" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Programmable Resolution 1-Wire Digital Thermometer TO-92" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "TO*92*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "DS18B20_0_1"
+        (rectangle (start -5.08 5.08) (end 5.08 -5.08)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type background))
+        )
+        (circle (center -3.302 -2.54) (radius 1.27)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (rectangle (start -2.667 -1.905) (end -3.937 0)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (arc (start -2.667 3.175) (mid -3.302 3.81) (end -3.937 3.175)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -3.937 0.635)
+            (xy -3.302 0.635)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -3.937 1.27)
+            (xy -3.302 1.27)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -3.937 1.905)
+            (xy -3.302 1.905)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -3.937 2.54)
+            (xy -3.302 2.54)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -3.937 3.175)
+            (xy -3.937 0)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -3.937 3.175)
+            (xy -3.302 3.175)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -2.667 3.175)
+            (xy -2.667 0)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+      )
+      (symbol "DS18B20_1_1"
+        (pin power_in line (at 0 -7.62 90) (length 2.54)
+          (name "GND" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at 7.62 0 180) (length 2.54)
+          (name "DQ" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin power_in line (at 0 7.62 270) (length 2.54)
+          (name "VDD" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Switch:SW_Push_SPDT" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
       (property "Reference" "SW" (id 0) (at 0 4.318 0)
         (effects (font (size 1.27 1.27)))
@@ -2601,7 +2527,7 @@
     )
   )
 
-  (junction (at 62.23 53.34) (diameter 0) (color 0 0 0 0)
+  (junction (at 57.785 53.34) (diameter 0) (color 0 0 0 0)
     (uuid 051b8cb0-ae77-4e09-98a7-bf2103319e66)
   )
   (junction (at 41.91 152.4) (diameter 0) (color 0 0 0 0)
@@ -2613,23 +2539,26 @@
   (junction (at 186.69 128.27) (diameter 0) (color 0 0 0 0)
     (uuid 0bb5c886-5f9c-4c29-83d9-f58a572fcd79)
   )
-  (junction (at 90.17 34.29) (diameter 0) (color 0 0 0 0)
+  (junction (at 79.375 34.29) (diameter 0) (color 0 0 0 0)
     (uuid 123968c6-74e7-4754-8c36-08ea08e42555)
   )
   (junction (at 44.45 154.94) (diameter 0) (color 0 0 0 0)
     (uuid 17f40a5c-3441-49ae-8b83-88ce922d0e3d)
   )
+  (junction (at 138.43 166.37) (diameter 0) (color 0 0 0 0)
+    (uuid 1dcbe33f-cc83-406d-a028-85a460c31bac)
+  )
   (junction (at 83.185 93.98) (diameter 0) (color 0 0 0 0)
     (uuid 2235841a-9c52-451a-9616-b84a520feeb5)
   )
+  (junction (at 124.46 151.13) (diameter 0) (color 0 0 0 0)
+    (uuid 242321c3-d992-4644-83b0-153f6d6ae855)
+  )
   (junction (at 273.05 133.35) (diameter 0) (color 0 0 0 0)
     (uuid 294c0b81-a58f-43d9-b3ff-58ec3e95d3c4)
   )
-  (junction (at 147.955 80.01) (diameter 0) (color 0 0 0 0)
-    (uuid 31799447-fd07-4760-945e-f0b3deaaea3e)
-  )
-  (junction (at 182.88 57.785) (diameter 0) (color 0 0 0 0)
-    (uuid 35351f64-441a-4f62-87d4-a200c91bb3de)
+  (junction (at 154.305 158.75) (diameter 0) (color 0 0 0 0)
+    (uuid 30ff234b-df3a-42aa-bb37-f6ff7d49aec5)
   )
   (junction (at 185.42 152.4) (diameter 0) (color 0 0 0 0)
     (uuid 38f3170a-b54c-4011-af49-381b27b9e9bb)
@@ -2640,25 +2569,28 @@
   (junction (at 186.69 119.38) (diameter 0) (color 0 0 0 0)
     (uuid 40412e4d-fa67-404b-8675-fb145207776f)
   )
-  (junction (at 185.42 68.58) (diameter 0) (color 0 0 0 0)
-    (uuid 5037a3f1-8665-4753-8111-3cc5f01f527e)
-  )
   (junction (at 253.365 156.845) (diameter 0) (color 0 0 0 0)
     (uuid 5096b250-cff0-4068-b724-0f0e0414784d)
   )
-  (junction (at 182.88 80.01) (diameter 0) (color 0 0 0 0)
-    (uuid 51e2a64a-e03c-401f-bbf1-282827dc3883)
+  (junction (at 147.955 142.875) (diameter 0) (color 0 0 0 0)
+    (uuid 51826272-e64e-4c84-9c7b-b0f63fbb4416)
+  )
+  (junction (at 132.08 173.99) (diameter 0) (color 0 0 0 0)
+    (uuid 64b3d048-4b62-4ef4-8a26-25f8e11cab31)
   )
   (junction (at 83.82 172.72) (diameter 0) (color 0 0 0 0)
     (uuid 69403c96-f918-448f-9931-0f743ebdeac3)
   )
-  (junction (at 185.42 82.55) (diameter 0) (color 0 0 0 0)
-    (uuid 694fe12e-f636-4239-9f50-17d1e83c559a)
+  (junction (at 147.955 158.75) (diameter 0) (color 0 0 0 0)
+    (uuid 6bbe664c-afc8-4a26-beda-656dd9cea5b8)
+  )
+  (junction (at 138.43 151.13) (diameter 0) (color 0 0 0 0)
+    (uuid 6fb4cb96-e032-467f-b1ab-7c739561664d)
   )
   (junction (at 275.59 130.81) (diameter 0) (color 0 0 0 0)
     (uuid 73e22f62-48fa-4032-ab99-c63ffdb6815b)
   )
-  (junction (at 74.93 48.26) (diameter 0) (color 0 0 0 0)
+  (junction (at 64.135 48.26) (diameter 0) (color 0 0 0 0)
     (uuid 79451892-db6b-4999-916d-6392174ee493)
   )
   (junction (at 189.865 130.81) (diameter 0) (color 0 0 0 0)
@@ -2667,24 +2599,12 @@
   (junction (at 253.365 149.225) (diameter 0) (color 0 0 0 0)
     (uuid 88d9f69e-d0e5-4bba-b2dc-36fd356eba4e)
   )
-  (junction (at 185.42 57.785) (diameter 0) (color 0 0 0 0)
-    (uuid 8b0c0bc4-8c66-4ee6-94d3-7711afdbbace)
-  )
   (junction (at 102.87 86.36) (diameter 0) (color 0 0 0 0)
     (uuid 8e0c5536-8f0c-41c4-a920-c1fe2d0aeb28)
   )
   (junction (at 209.55 31.75) (diameter 0) (color 0 0 0 0)
     (uuid 90b82718-91a8-42b9-8b5c-f55037401d9a)
   )
-  (junction (at 182.88 68.58) (diameter 0) (color 0 0 0 0)
-    (uuid 92ecfc54-4a5a-4f80-835f-341e5f4566e0)
-  )
-  (junction (at 180.34 57.785) (diameter 0) (color 0 0 0 0)
-    (uuid 9654c0fa-eebe-4319-94a4-df6f955eea98)
-  )
-  (junction (at 180.34 68.58) (diameter 0) (color 0 0 0 0)
-    (uuid 983cd6c3-109c-4c73-99a3-ba679cdd09e5)
-  )
   (junction (at 271.145 157.48) (diameter 0) (color 0 0 0 0)
     (uuid 9f171a87-ffde-46b1-b9bd-87ba6a6c823d)
   )
@@ -2697,7 +2617,10 @@
   (junction (at 90.17 173.355) (diameter 0) (color 0 0 0 0)
     (uuid e6bbf99a-2bfc-49bf-a0f1-56b03ff0b655)
   )
-  (junction (at 66.04 29.21) (diameter 0) (color 0 0 0 0)
+  (junction (at 124.46 166.37) (diameter 0) (color 0 0 0 0)
+    (uuid efd22a7b-d2dc-4142-bf5e-6904cf5b3836)
+  )
+  (junction (at 61.595 29.21) (diameter 0) (color 0 0 0 0)
     (uuid fad4c712-0a2e-465d-a9f8-83d26bd66e37)
   )
 
@@ -2712,18 +2635,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 00ebed69-1ae8-4281-9dbb-78160329662c)
   )
-  (wire (pts (xy 62.23 53.34) (xy 62.23 74.93))
+  (wire (pts (xy 57.785 53.34) (xy 57.785 74.93))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 02538207-54a8-4266-8d51-23871852b2ff)
   )
-  (wire (pts (xy 158.75 43.18) (xy 158.75 55.88))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 03b1ac56-3611-4584-aaf7-656eb89a5a58)
-  )
-  (wire (pts (xy 181.61 38.1) (xy 182.88 38.1))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 03f57fb4-32a3-4bc6-85b9-fd8ece4a9592)
-  )
   (wire (pts (xy 271.145 157.48) (xy 278.765 157.48))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 046aff1b-63dd-4fa2-ad6b-a0c87f57f7dd)
@@ -2732,19 +2647,20 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 048b98a1-7408-4bd3-ba48-56b856855483)
   )
-  (wire (pts (xy 151.13 43.18) (xy 148.59 43.18))
+  (wire (pts (xy 140.335 43.18) (xy 137.795 43.18))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 04cf2f2c-74bf-400d-b4f6-201720df00ed)
   )
-  (wire (pts (xy 185.42 57.785) (xy 185.42 68.58))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 06407d5a-4471-4505-93e6-0953c197b726)
-  )
-  (wire (pts (xy 74.93 43.18) (xy 74.93 48.26))
+  (wire (pts (xy 64.135 43.18) (xy 64.135 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 083becc8-e25d-4206-9636-55457650bbe3)
   )
-  (wire (pts (xy 132.08 167.64) (xy 133.35 167.64))
+  (polyline (pts (xy 102.87 149.225) (xy 102.87 179.07))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 09e06fde-36b0-4ab7-b996-d98c02ce3f76)
+  )
+
+  (wire (pts (xy 150.495 39.37) (xy 151.765 39.37))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 09ec5a1f-8168-4109-a329-ef099cef6d16)
   )
@@ -2781,11 +2697,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0d8dc964-deb7-44e6-848e-a4828cd6ccf5)
   )
-  (wire (pts (xy 267.97 140.97) (xy 173.99 140.97))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 0dbb758d-d359-4d2a-8a5d-77dfe99df357)
-  )
-  (wire (pts (xy 132.08 160.02) (xy 139.7 160.02))
+  (wire (pts (xy 150.495 31.75) (xy 158.115 31.75))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0e78b584-2869-48ac-b293-95bd208efc94)
   )
@@ -2797,7 +2709,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0f6a1023-ed00-4bd6-afef-ff227538c5e3)
   )
-  (wire (pts (xy 177.8 52.07) (xy 177.8 57.785))
+  (wire (pts (xy 177.8 36.195) (xy 177.8 57.785))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 11274c77-8dea-42af-9338-4bcf2f325c89)
   )
@@ -2825,10 +2737,19 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 13519fa0-f319-4568-9da1-27e7fc596e16)
   )
+  (wire (pts (xy 156.21 145.415) (xy 160.655 145.415))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 13786dec-2489-4053-b561-88e4a3312eb2)
+  )
   (wire (pts (xy 20.32 146.685) (xy 25.4 146.685))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1542b558-bfe7-4e44-b051-52e954f089c4)
   )
+  (polyline (pts (xy 158.115 179.07) (xy 102.87 179.07))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 1570d25c-8719-49ce-9fd6-6144a7fe414f)
+  )
+
   (wire (pts (xy 265.43 130.81) (xy 275.59 130.81))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 15f2b6d5-48c4-4f31-8b9d-7d2668e7fe00)
@@ -2841,22 +2762,14 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 170a1464-a955-4bdc-927d-f8249fd0c04c)
   )
-  (wire (pts (xy 66.04 29.21) (xy 66.04 76.2))
+  (wire (pts (xy 61.595 29.21) (xy 61.595 76.2))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 17ed3508-fa2e-4593-a799-bfd39a6cc14d)
   )
-  (wire (pts (xy 159.385 82.55) (xy 165.735 82.55))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 180684cf-f7b0-46b2-aea4-1f93e406cf59)
-  )
   (wire (pts (xy 127 74.93) (xy 214.63 74.93))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 181e9518-7706-4189-a885-5e6e3aee3bb9)
   )
-  (wire (pts (xy 147.955 80.01) (xy 147.955 82.55))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 193cbccc-28f2-4437-8064-d229e44aa604)
-  )
   (wire (pts (xy 83.185 93.98) (xy 83.185 78.74))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1df9a412-b56c-4e84-b38b-6a4bc05a97be)
@@ -2878,6 +2791,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1fe5bc2b-0fca-4819-a520-4615dfab4d15)
   )
+  (wire (pts (xy 154.305 140.335) (xy 154.305 158.75))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 20c35e19-7499-4a32-968e-c106eec1aefe)
+  )
   (wire (pts (xy 69.215 172.72) (xy 69.215 175.895))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 25531609-ada1-438f-9524-2d6b2aacec2a)
@@ -2890,7 +2807,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 26a5e061-05bb-41a8-bc7a-df1564b11e90)
   )
-  (wire (pts (xy 132.08 191.77) (xy 133.35 191.77))
+  (wire (pts (xy 150.495 63.5) (xy 151.765 63.5))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2721b0da-8699-4bf1-80bb-1d6b9e717c61)
   )
@@ -2903,7 +2820,7 @@
     (uuid 282c8e53-3acc-42f0-a92a-6aa976b97a93)
   )
 
-  (wire (pts (xy 148.59 38.1) (xy 151.13 38.1))
+  (wire (pts (xy 137.795 38.1) (xy 140.335 38.1))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2878a73c-5447-4cd9-8194-14f52ab9459c)
   )
@@ -2911,27 +2828,27 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 28e146f5-f85f-47b5-94b5-a67c33d23635)
   )
-  (wire (pts (xy 182.88 57.785) (xy 182.88 68.58))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 2a71f78d-0911-4a41-a0ce-aa50e93d68c8)
-  )
-  (wire (pts (xy 161.925 35.56) (xy 161.925 52.07))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 2b8b629c-53ef-4ac6-91d7-f1a071136889)
-  )
-  (wire (pts (xy 135.89 165.1) (xy 132.08 165.1))
+  (wire (pts (xy 154.305 36.83) (xy 150.495 36.83))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2ba9fb94-a1fa-486c-8933-fbe2803c354e)
   )
+  (wire (pts (xy 109.855 166.37) (xy 124.46 166.37))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 2c0237bf-a60c-4752-b240-a0ed4b05992b)
+  )
   (wire (pts (xy 72.39 160.02) (xy 69.85 160.02))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2d84a257-2801-4282-83f8-8a08920949d3)
   )
+  (wire (pts (xy 160.655 142.875) (xy 147.955 142.875))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 2f50addc-928c-4435-b241-4bd66bfb0934)
+  )
   (wire (pts (xy 55.88 99.06) (xy 55.88 105.41))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2fd044b6-377e-455f-89e0-f4f69a117f77)
   )
-  (wire (pts (xy 135.89 150.495) (xy 135.89 165.1))
+  (wire (pts (xy 154.305 22.225) (xy 154.305 36.83))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3017e6b7-2d49-4427-9dc1-83cc27ee24a4)
   )
@@ -2947,22 +2864,22 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 32380bb4-3280-497e-9558-7a21f00e00dd)
   )
-  (wire (pts (xy 173.355 82.55) (xy 185.42 82.55))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 32445bc6-e73d-4201-9666-5de468baf622)
-  )
   (wire (pts (xy 185.42 68.58) (xy 185.42 82.55))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 32551a79-b842-47a9-8e23-7783a840e131)
   )
-  (wire (pts (xy 161.925 80.01) (xy 147.955 80.01))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 329094f4-8898-41df-ac65-e73e1fd74cbf)
-  )
   (wire (pts (xy 20.32 168.91) (xy 20.32 168.275))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 33072d10-86aa-4a72-9898-01c2c9b5842e)
   )
+  (wire (pts (xy 154.305 173.99) (xy 154.305 158.75))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 33aa439f-8f27-4c20-8909-3dc70d367c43)
+  )
+  (wire (pts (xy 138.43 166.37) (xy 156.21 166.37))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 33e2f234-7e68-4c90-b3d3-06c043b0935f)
+  )
   (wire (pts (xy 27.94 176.53) (xy 25.4 176.53))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 34e399b2-48be-42f9-842e-e3b66c7c06bb)
@@ -2975,7 +2892,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 35a7735a-ee25-458f-bb48-cd448dcda5d3)
   )
-  (wire (pts (xy 62.23 53.34) (xy 92.71 53.34))
+  (wire (pts (xy 57.785 53.34) (xy 81.915 53.34))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 35c09d1f-2914-4d1e-a002-df30af772f3b)
   )
@@ -2987,6 +2904,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3628add0-cc90-4ce6-bc0a-7b0499cb2a43)
   )
+  (polyline (pts (xy 182.88 43.815) (xy 170.815 43.815))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 374316c4-15a5-4072-bc2a-06291d270741)
+  )
+
   (wire (pts (xy 25.4 154.94) (xy 25.4 160.655))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 39ae077c-5133-4896-9953-71244e980cb5)
@@ -2995,15 +2917,15 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 39d7e422-7f67-4268-a2ed-2db52be51cae)
   )
-  (wire (pts (xy 158.75 43.18) (xy 168.91 43.18))
+  (wire (pts (xy 160.655 140.335) (xy 154.305 140.335))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 3a41dd27-ec14-44d5-b505-aad1d829f79a)
+    (uuid 3aa28a58-d2d7-4f0a-91cb-81d577d309f4)
   )
   (wire (pts (xy 38.735 154.94) (xy 44.45 154.94))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3bc3df81-b30e-4a41-a38c-bca401c1fdb4)
   )
-  (wire (pts (xy 132.08 181.61) (xy 139.065 181.61))
+  (wire (pts (xy 150.495 53.34) (xy 157.48 53.34))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3bce23fc-cdab-4616-8963-9c1f94f76e8b)
   )
@@ -3011,7 +2933,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3bdb6e74-df98-4382-9a1e-8b7b42de8b63)
   )
-  (wire (pts (xy 132.08 184.15) (xy 139.065 184.15))
+  (wire (pts (xy 150.495 55.88) (xy 157.48 55.88))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3be16d8f-c504-4be9-bb1b-a581c1c2e941)
   )
@@ -3027,11 +2949,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3e2959fb-f853-45ab-a70d-cefa40ed4a13)
   )
-  (wire (pts (xy 87.63 43.18) (xy 116.84 43.18))
+  (wire (pts (xy 76.835 43.18) (xy 106.045 43.18))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3e3d55c8-e0ea-48fb-8421-a84b7cb7055b)
   )
-  (wire (pts (xy 66.04 29.21) (xy 92.71 29.21))
+  (wire (pts (xy 61.595 29.21) (xy 81.915 29.21))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 422b10b9-e829-44a2-8808-05edd8cb3050)
   )
@@ -3043,10 +2965,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 44a31d09-65ce-45e2-98f9-0649161b54b4)
   )
-  (wire (pts (xy 158.75 55.88) (xy 175.26 55.88))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 44d10368-2885-4218-b8f1-52a5fde92cb3)
-  )
   (wire (pts (xy 214.63 77.47) (xy 180.34 77.47))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 44dee830-40ed-4a00-8c4e-ba626f32dc1e)
@@ -3059,7 +2977,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 474c69f2-d47e-44b5-9fe8-4f70b718e8d8)
   )
-  (wire (pts (xy 90.17 38.1) (xy 90.17 34.29))
+  (wire (pts (xy 79.375 38.1) (xy 79.375 34.29))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 475ed8b3-90bf-48cd-bce5-d8f48b689541)
   )
@@ -3067,6 +2985,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 489dbc75-626f-4f7d-a79e-4718b12503a5)
   )
+  (polyline (pts (xy 102.87 149.225) (xy 158.115 149.225))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 48e63767-c45b-4543-b818-8f00f0600bf9)
+  )
+
   (wire (pts (xy 205.74 146.05) (xy 205.74 87.63))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 49df14a4-9231-4e0c-8be6-325780f5026d)
@@ -3083,6 +3006,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4c843bdb-6c9e-40dd-85e2-0567846e18ba)
   )
+  (wire (pts (xy 175.26 136.525) (xy 175.26 142.875))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 4cd66851-08f4-4acb-9fff-9781de2b31d6)
+  )
   (wire (pts (xy 123.825 133.35) (xy 214.63 133.35))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4d35d179-1fe5-442a-89de-d0579ca2bbc5)
@@ -3091,6 +3018,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4dbb109d-2431-40ac-8260-8df88fdef5cd)
   )
+  (wire (pts (xy 138.43 142.875) (xy 138.43 151.13))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 4f7c7ee0-aecc-4a3e-93eb-625bf8325b8f)
+  )
   (wire (pts (xy 184.15 128.27) (xy 186.69 128.27))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4fdf05e9-f289-448e-914a-b6881900d6c1)
@@ -3127,6 +3058,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 54dfed87-fbe5-47ab-b620-2d6ba5ea0bcb)
   )
+  (wire (pts (xy 147.955 142.875) (xy 147.955 150.495))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 55612800-7186-4844-8635-2f2dadf3eaf1)
+  )
   (wire (pts (xy 87.63 172.72) (xy 83.82 172.72))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 55c7ef39-b251-4a11-94d4-60a109929c6f)
@@ -3135,11 +3070,15 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 56e486f5-556e-4d8e-a75a-487ed98d2e59)
   )
+  (wire (pts (xy 147.955 158.75) (xy 147.955 158.115))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 58c209f0-2b9e-4f7d-aa27-5cf3bc9ef328)
+  )
   (wire (pts (xy 205.74 152.4) (xy 205.74 156.21))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 58d71c09-ba53-43d7-9fc9-7054806963d2)
   )
-  (wire (pts (xy 177.8 68.58) (xy 177.8 70.485))
+  (wire (pts (xy 177.8 68.58) (xy 177.8 69.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 58dfd4b5-1213-4f4d-8f38-79c6f352f825)
   )
@@ -3147,6 +3086,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 58e8a243-dbf1-46ec-a9ca-62db6c046a4b)
   )
+  (polyline (pts (xy 182.88 20.32) (xy 182.88 43.815))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 59066bb7-c104-449a-a331-bd2de5193eeb)
+  )
+
   (wire (pts (xy 94.615 118.11) (xy 28.575 118.11))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5a040418-8644-4cf8-9de0-ba3624649e9e)
@@ -3167,11 +3111,15 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5c3c20ac-7d6a-4a6a-8d79-b176608d957f)
   )
+  (wire (pts (xy 146.05 158.75) (xy 147.955 158.75))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 5d0d6a13-8484-4646-bacd-2fbc9cb5413d)
+  )
   (wire (pts (xy 76.835 175.895) (xy 76.835 174.625))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5dba2df1-c0a7-451c-ad63-7260d7b1f5a8)
   )
-  (wire (pts (xy 55.88 29.21) (xy 66.04 29.21))
+  (wire (pts (xy 55.88 29.21) (xy 61.595 29.21))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5f312b85-6822-40a3-b417-2df49696ca2d)
   )
@@ -3179,14 +3127,14 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5f38bdb2-3657-474e-8e86-d6bb0b298110)
   )
+  (wire (pts (xy 117.475 173.99) (xy 132.08 173.99))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 5fffc123-8d12-4fe8-9d11-1182bb078146)
+  )
   (wire (pts (xy 74.295 173.99) (xy 74.295 175.895))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6064ea35-013e-4b86-a6c4-39586d23a64c)
   )
-  (wire (pts (xy 182.88 56.515) (xy 182.88 57.785))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 613cedd3-6317-45b7-905c-7688baf53bf3)
-  )
   (wire (pts (xy 209.55 31.75) (xy 231.14 31.75))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6202b522-e646-49af-83e4-b5d7844d80bd)
@@ -3207,10 +3155,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 62c26a31-4bf5-4a49-846e-2a9deae7bdd9)
   )
-  (wire (pts (xy 182.88 38.1) (xy 182.88 48.895))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 62e8c4d4-266c-4e53-8981-1028251d724c)
-  )
   (wire (pts (xy 208.28 69.85) (xy 208.28 39.37))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 63884a0c-3153-4b16-b576-b3d0570549ad)
@@ -3231,10 +3175,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6513181c-0a6a-4560-9a18-17450c36ae2a)
   )
-  (wire (pts (xy 180.34 80.01) (xy 182.88 80.01))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 6551a109-65d8-49b9-807b-12ceb41c46a8)
-  )
   (wire (pts (xy 38.735 176.53) (xy 44.45 176.53))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 655a4dd6-df89-48f2-a803-643990d058bd)
@@ -3251,16 +3191,16 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 68422ffc-83e4-42e5-b1dc-f3b10be98daf)
   )
-  (polyline (pts (xy 165.1 48.26) (xy 165.1 22.86))
+  (polyline (pts (xy 170.815 20.32) (xy 182.88 20.32))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 6ac3ab53-7523-4805-bfd2-5de19dff127e)
+    (uuid 6994715a-fbff-431c-b736-e87cb0a095c3)
   )
 
   (wire (pts (xy 202.565 118.11) (xy 214.63 118.11))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6b341153-e6a9-446e-a41f-f0b6803ef98d)
   )
-  (wire (pts (xy 133.35 167.64) (xy 133.35 169.545))
+  (wire (pts (xy 151.765 39.37) (xy 151.765 41.275))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6bb2c937-e8ff-43d0-9b06-456594eb25e9)
   )
@@ -3300,7 +3240,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 719e9152-e8ec-4038-bff3-e10dc6873da6)
   )
-  (wire (pts (xy 80.01 43.18) (xy 74.93 43.18))
+  (wire (pts (xy 69.215 43.18) (xy 64.135 43.18))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 725cdf26-4b92-46db-bca9-10d930002dda)
   )
@@ -3308,6 +3248,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 72c5b5dc-7d0c-4e1d-aa45-7f2d6eeb3e27)
   )
+  (wire (pts (xy 117.475 158.75) (xy 117.475 173.99))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 743de486-ba09-4c49-9dff-9a92fef55316)
+  )
   (wire (pts (xy 189.865 130.81) (xy 214.63 130.81))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7468e343-8d98-49cd-b0f3-87e6dfd3c57b)
@@ -3316,9 +3260,9 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 751655c2-941f-4109-8347-98c9fd930f4e)
   )
-  (wire (pts (xy 180.34 43.18) (xy 180.34 57.785))
+  (wire (pts (xy 132.08 158.75) (xy 132.08 173.99))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 75c8508a-aa91-42ac-a3e8-5f7b38c6618f)
+    (uuid 76dfc600-0790-43a0-9bc4-d0e98f5de9c1)
   )
   (wire (pts (xy 20.32 160.655) (xy 25.4 160.655))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -3328,11 +3272,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 78fc26a2-c6aa-4020-b71c-d7cbb33d50cf)
   )
-  (wire (pts (xy 161.925 35.56) (xy 166.37 35.56))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 7a2b8997-41f5-4d37-9b4a-91e13dfae36c)
-  )
-  (wire (pts (xy 74.93 48.26) (xy 92.71 48.26))
+  (wire (pts (xy 64.135 48.26) (xy 81.915 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7acd513a-187b-4936-9f93-2e521ce33ad5)
   )
@@ -3378,23 +3318,15 @@
     (uuid 83c5181e-f5ee-453c-ae5c-d7256ba8837d)
   )
 
-  (wire (pts (xy 181.61 33.02) (xy 185.42 33.02))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 844d7d7a-b386-45a8-aaf6-bf41bbcb43b5)
-  )
   (wire (pts (xy 173.355 140.335) (xy 194.31 140.335))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 85827b25-c667-4d1b-8921-52bdc5430650)
   )
-  (wire (pts (xy 147.955 78.74) (xy 147.955 80.01))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 8723f50e-a484-4a9a-b72b-07dbeb8b0cf9)
-  )
   (wire (pts (xy 53.34 165.1) (xy 53.34 174.625))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 885d043f-b4c9-4eb2-820d-d417cb4bc866)
   )
-  (polyline (pts (xy 88.9 22.86) (xy 110.49 22.86))
+  (polyline (pts (xy 78.105 22.86) (xy 99.695 22.86))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 888fd7cb-2fc6-480c-bcfa-0b71303087d3)
   )
@@ -3427,7 +3359,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8d023456-8ad9-4f7e-897d-e73ffdb4933e)
   )
-  (wire (pts (xy 55.88 48.26) (xy 74.93 48.26))
+  (wire (pts (xy 55.88 48.26) (xy 64.135 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8e295ed4-82cb-4d9f-8888-7ad2dd4d5129)
   )
@@ -3435,15 +3367,15 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 90e4b67e-0a6e-42bc-93bf-45939b80c9b6)
   )
-  (wire (pts (xy 179.07 43.18) (xy 180.34 43.18))
+  (wire (pts (xy 124.46 166.37) (xy 138.43 166.37))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 90e761f6-1432-4f73-ad28-fa8869b7ec31)
+    (uuid 934617ba-f1d2-4fc0-b39f-da9adea05461)
   )
   (wire (pts (xy 118.11 106.045) (xy 118.11 113.03))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 940380cb-8cf9-45b8-b600-7d8ce8a785d6)
   )
-  (wire (pts (xy 151.13 38.1) (xy 151.13 43.18))
+  (wire (pts (xy 140.335 38.1) (xy 140.335 43.18))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 955cc99e-a129-42cf-abc7-aa99813fdb5f)
   )
@@ -3455,19 +3387,19 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 95e06b65-459a-4ab7-a258-2019fd7c750c)
   )
-  (wire (pts (xy 132.08 189.23) (xy 135.89 189.23))
+  (wire (pts (xy 180.34 57.785) (xy 180.34 36.195))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 962cc689-6c3f-4789-be43-adc84250ba02)
+  )
+  (wire (pts (xy 150.495 60.96) (xy 154.305 60.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 96b1672c-107c-4f66-9cdb-f0ef0147a931)
   )
-  (wire (pts (xy 173.99 140.97) (xy 173.99 142.875))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 96c51c57-c97b-45e2-82c7-453cd584593a)
-  )
   (wire (pts (xy 55.88 99.06) (xy 69.85 99.06))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 973c2694-75a7-49b1-b02c-677cd56f102c)
   )
-  (wire (pts (xy 21.59 74.93) (xy 62.23 74.93))
+  (wire (pts (xy 21.59 74.93) (xy 57.785 74.93))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 974c48bf-534e-4335-98e1-b0426c783e99)
   )
@@ -3483,7 +3415,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 98b00c9d-9188-4bce-aa70-92d12dd9cf82)
   )
-  (wire (pts (xy 55.88 53.34) (xy 62.23 53.34))
+  (wire (pts (xy 55.88 53.34) (xy 57.785 53.34))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 99186658-0361-40ba-ae93-62f23c5622e6)
   )
@@ -3517,11 +3449,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9ed2e82a-459f-49e0-a3a3-7e6e749f942c)
   )
-  (polyline (pts (xy 193.04 22.86) (xy 193.04 48.26))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a07b6b2b-7179-4297-b163-5e47ffbe76d3)
-  )
-
   (wire (pts (xy 72.39 147.32) (xy 72.39 160.02))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a1d929f8-3a0d-4870-a15e-1c1a86c261e8)
@@ -3530,15 +3457,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a2ce8f9b-adf1-448a-bac0-2619d7ebe60c)
   )
-  (wire (pts (xy 185.42 33.02) (xy 185.42 48.895))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a62609cd-29b7-4918-b97d-7b2404ba61cf)
-  )
   (wire (pts (xy 277.495 139.7) (xy 273.05 139.7))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a750b54f-ce9a-4e25-81d4-783e53359803)
   )
-  (polyline (pts (xy 110.49 22.86) (xy 110.49 58.42))
+  (polyline (pts (xy 99.695 22.86) (xy 99.695 58.42))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a92f3b72-ed6d-4d99-9da6-35771bec3c77)
   )
@@ -3551,7 +3474,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid aa130053-a451-4f12-97f7-3d4d891a5f83)
   )
-  (polyline (pts (xy 110.49 58.42) (xy 88.9 58.42))
+  (polyline (pts (xy 99.695 58.42) (xy 78.105 58.42))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid aa1c6f47-cbd4-4cbd-8265-e5ac08b7ffc8)
   )
@@ -3560,7 +3483,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid aa2eacdf-1a2e-4d23-b912-06ac5f7ded68)
   )
-  (wire (pts (xy 132.08 154.94) (xy 139.7 154.94))
+  (wire (pts (xy 150.495 26.67) (xy 158.115 26.67))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ab0f8664-d5a3-4b53-8cc3-378b631c9ad2)
   )
@@ -3592,7 +3515,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b09ae3e0-9b16-4a90-b478-4499f6711690)
   )
-  (wire (pts (xy 132.08 157.48) (xy 139.7 157.48))
+  (wire (pts (xy 150.495 29.21) (xy 158.115 29.21))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b16abbd0-e4cb-40d4-98e5-66d17adc4be4)
   )
@@ -3632,9 +3555,9 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b7e38b71-6d85-4ad8-86ce-f4ab1ba6f773)
   )
-  (wire (pts (xy 161.925 52.07) (xy 177.8 52.07))
+  (wire (pts (xy 156.21 166.37) (xy 156.21 145.415))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b9858390-3c52-4708-9763-39c76728af56)
+    (uuid b928e2b5-5098-438e-85fc-c41bb04cf4c8)
   )
   (wire (pts (xy 130.175 147.32) (xy 72.39 147.32))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -3652,11 +3575,15 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bc7a2468-32b3-4b79-85cd-4436ca556dc4)
   )
+  (wire (pts (xy 147.955 142.875) (xy 138.43 142.875))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid bcfd5886-f378-4947-9815-f92d60528bcf)
+  )
   (wire (pts (xy 273.05 54.61) (xy 189.23 54.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bd33b194-268e-44c3-b0b1-b7463d83fbac)
   )
-  (wire (pts (xy 132.08 179.07) (xy 139.065 179.07))
+  (wire (pts (xy 150.495 50.8) (xy 157.48 50.8))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bf2d9170-305c-4572-8df6-eade0284a305)
   )
@@ -3664,7 +3591,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c05406da-4334-464f-bb93-fbd722076165)
   )
-  (wire (pts (xy 132.08 186.69) (xy 139.065 186.69))
+  (wire (pts (xy 150.495 58.42) (xy 157.48 58.42))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c3d7ef96-01f7-4013-b5ae-83025d220958)
   )
@@ -3688,7 +3615,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ca4978dc-e8c9-435b-870d-c73495b4384d)
   )
-  (wire (pts (xy 133.35 191.77) (xy 133.35 192.405))
+  (wire (pts (xy 151.765 63.5) (xy 151.765 64.135))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cb23987e-7f68-4b0c-b8d0-70a75811cf17)
   )
@@ -3728,11 +3655,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d0fa14a9-87a1-4c41-979e-8cc67abc98e7)
   )
-  (polyline (pts (xy 193.04 48.26) (xy 165.1 48.26))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d1a9be32-38ba-44e6-bc35-f031541ab1fe)
-  )
-
   (wire (pts (xy 36.83 105.41) (xy 55.88 105.41))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d2426135-d731-4d3b-8194-196fcabad088)
@@ -3766,6 +3688,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d8bdf508-15d3-4f90-8178-10bcfb73bdb9)
   )
+  (polyline (pts (xy 170.815 20.32) (xy 170.815 43.815))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid dd6c67ea-60fc-4139-bdbb-6af245b71587)
+  )
+
   (wire (pts (xy 121.92 86.36) (xy 125.73 86.36))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dde8619c-5a8c-40eb-9845-65e6a654222d)
@@ -3774,7 +3701,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid de370984-7922-4327-a0ba-7cd613995df4)
   )
-  (wire (pts (xy 116.84 38.1) (xy 90.17 38.1))
+  (wire (pts (xy 106.045 38.1) (xy 79.375 38.1))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid df2a6036-7274-4398-9365-148b6ddab90d)
   )
@@ -3806,11 +3733,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e0fdc9e3-6cb5-437a-9c64-19897a32764c)
   )
-  (wire (pts (xy 173.355 142.875) (xy 173.99 142.875))
+  (wire (pts (xy 173.355 142.875) (xy 175.26 142.875))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e1afae85-306e-42bd-85a3-7a49d4649e8e)
   )
-  (wire (pts (xy 24.13 76.2) (xy 66.04 76.2))
+  (wire (pts (xy 24.13 76.2) (xy 61.595 76.2))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e2b24e25-1a0d-434a-876b-c595b47d80d2)
   )
@@ -3830,7 +3757,12 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e7ca093d-becf-48be-bcb1-fbd2cb0cb4d1)
   )
-  (wire (pts (xy 135.89 175.26) (xy 135.89 189.23))
+  (polyline (pts (xy 158.115 149.225) (xy 158.115 179.07))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid e848cb4e-e9be-4642-b62e-cfdc7033410f)
+  )
+
+  (wire (pts (xy 154.305 46.99) (xy 154.305 60.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e9e5540b-6e27-4ccf-9c1c-d90ccd70998f)
   )
@@ -3842,20 +3774,15 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid eafceaa3-db6a-4bec-8bfa-66cc46e34681)
   )
-  (polyline (pts (xy 166.37 22.86) (xy 193.04 22.86))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ebca7c5e-ae52-43e5-ac6c-69a96a9a5b24)
-  )
-
   (wire (pts (xy 92.71 173.99) (xy 92.71 175.895))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ec345777-3fcb-485c-9c66-7db8bc2ec160)
   )
-  (wire (pts (xy 169.545 80.01) (xy 172.72 80.01))
+  (wire (pts (xy 124.46 151.13) (xy 138.43 151.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ecefd600-74c9-47b2-8a25-5a2bc3b25338)
+    (uuid ecc085bf-cf88-402a-86fd-421cc6711a7f)
   )
-  (wire (pts (xy 55.88 34.29) (xy 90.17 34.29))
+  (wire (pts (xy 55.88 34.29) (xy 79.375 34.29))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ee29d712-3378-4507-a00b-003526b29bb1)
   )
@@ -3871,19 +3798,15 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f231868d-7f9d-4c70-b11c-09a356269a86)
   )
-  (wire (pts (xy 132.08 162.56) (xy 139.7 162.56))
+  (wire (pts (xy 150.495 34.29) (xy 158.115 34.29))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f2666a09-71bc-41f7-8113-e71fd587d788)
   )
-  (polyline (pts (xy 88.9 58.42) (xy 88.9 22.86))
+  (polyline (pts (xy 78.105 58.42) (xy 78.105 22.86))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f28e56e7-283b-4b9a-ae27-95e89770fbf8)
   )
 
-  (wire (pts (xy 185.42 56.515) (xy 185.42 57.785))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f3044f68-903d-4063-b253-30d8e3a83eae)
-  )
   (wire (pts (xy 21.59 81.28) (xy 21.59 74.93))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f357ddb5-3f44-43b0-b00d-d64f5c62ba4a)
@@ -3896,7 +3819,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f496a215-b81d-45e3-9134-ba08e2d5c22f)
   )
-  (wire (pts (xy 175.26 55.88) (xy 175.26 57.785))
+  (wire (pts (xy 175.26 36.195) (xy 175.26 57.785))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f4bcada2-de59-4b6a-9c25-98af2d8af36a)
   )
@@ -3908,21 +3831,25 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f8138d67-fb86-4aa2-b417-31f473dd1c8f)
   )
+  (wire (pts (xy 132.08 173.99) (xy 154.305 173.99))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid f84d027b-e408-49b5-88a7-0c14d643aaf3)
+  )
   (wire (pts (xy 87.63 137.16) (xy 87.63 110.49))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid faae2960-92c8-4c3d-beae-989872686eda)
   )
-  (wire (pts (xy 90.17 34.29) (xy 92.71 34.29))
+  (wire (pts (xy 109.855 151.13) (xy 124.46 151.13))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid fb6cb771-0d4c-4dd8-8cdc-b3014e3b2816)
+  )
+  (wire (pts (xy 79.375 34.29) (xy 81.915 34.29))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fc83cd71-1198-4019-87a1-dc154bceead3)
   )
-  (wire (pts (xy 147.955 82.55) (xy 151.765 82.55))
+  (wire (pts (xy 154.305 158.75) (xy 147.955 158.75))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid fd152457-b2c3-4932-8a00-cbda36a1b98d)
-  )
-  (wire (pts (xy 180.34 57.785) (xy 180.34 68.58))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid fdc2f410-bd36-4b99-bc4f-1ce22945b717)
+    (uuid fd98f339-fe73-46ac-8819-106fae4c243a)
   )
   (wire (pts (xy 87.63 172.72) (xy 87.63 175.895))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -3937,7 +3864,7 @@
     (uuid ff13f467-bccc-4e90-8ee4-7cc88e1c283c)
   )
 
-  (text "40A AGU Fuse" (at 90.17 41.91 180)
+  (text "40A AGU Fuse" (at 79.375 41.91 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 011ee658-718d-416a-85fd-961729cd1ee5)
   )
@@ -3949,7 +3876,7 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 10d8ad0e-6a08-4053-92aa-23a15910fd21)
   )
-  (text "orange" (at 179.705 58.42 90)
+  (text "white" (at 179.705 58.42 90)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 159a8128-3914-4e76-bfdf-3b05561ebc34)
   )
@@ -3958,6 +3885,10 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 1c3169e1-78dc-4f3a-b1a2-bf02578265f6)
   )
+  (text "ESCRear" (at 120.65 151.13 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 220d5d35-346f-41be-b288-da39d00eee33)
+  )
   (text "red/blue" (at 60.325 101.6 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 26c57574-e303-4cc8-896b-e7ea7adae64d)
@@ -3974,18 +3905,10 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 2db910a0-b943-40b4-b81f-068ba5265f56)
   )
-  (text "yellow" (at 182.245 55.88 90)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 31edcb87-d276-4440-aca9-8e75e51a047b)
-  )
   (text "red" (at 95.25 171.45 90)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 358757e3-e4fa-4400-84f1-d961c8f598ae)
   )
-  (text "blue" (at 185.42 59.055 90)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 3b358fdd-fd85-4eb9-8265-d954721869f4)
-  )
   (text "Serial connector for debugging" (at 237.49 43.18 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 3cc43de6-1ec2-4ee2-8051-fd4513087883)
@@ -4002,7 +3925,7 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 44035e53-ff94-45ad-801f-55a1ce042a0d)
   )
-  (text "Charging Connectors" (at 90.17 22.86 0)
+  (text "Charging Connectors" (at 79.375 22.86 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 4a7e3849-3bc9-4bb3-b16a-fab2f5cee0e5)
   )
@@ -4010,7 +3933,7 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 4db55cb8-197b-4402-871f-ce582b65664b)
   )
-  (text "red" (at 177.8 57.785 90)
+  (text "orange" (at 177.8 57.785 90)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 552aa453-5cf8-4fda-9a74-7b6ed84d3d66)
   )
@@ -4018,6 +3941,10 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 79770cd5-32d7-429a-8248-0d9e6212231a)
   )
+  (text "Temperature Sensors" (at 103.505 178.435 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 7d7825fe-3575-4880-8895-50cba24aefca)
+  )
   (text "ENGINE\nSTART" (at 41.91 81.28 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 88cb65f4-7e9e-44eb-8692-3b6e2e788a94)
@@ -4034,13 +3961,9 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid a6d8ac8f-a013-4f9e-876c-42c5338d8d69)
   )
-  (text "Mode Button" (at 172.72 22.86 0)
+  (text "Air" (at 109.22 151.13 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid a8219a78-6b33-4efa-a789-6a67ce8f7a50)
-  )
-  (text "Green" (at 181.61 38.1 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid b78cb2c1-ae4b-4d9b-acd8-d7fe342342f2)
+    (uuid aedc8460-3540-47e7-9836-ac56bfaab205)
   )
   (text "175mA\n5V" (at 12.7 173.99 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
@@ -4062,9 +3985,9 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid dccc4ac5-8f16-4274-951b-cfdb225a3d97)
   )
-  (text "Achtung_ Startbutton pin 4 und 5 getauscht!" (at 105.41 120.015 0)
+  (text "ESCFront" (at 133.985 151.13 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid ded3aa6c-bb84-41f6-b2cf-6526daddab10)
+    (uuid ddb3028d-6be5-4fc0-9fb3-649767d9c798)
   )
   (text "NC" (at 48.26 96.52 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
@@ -4078,10 +4001,6 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid e97b5984-9f0f-43a4-9b8a-838eef4cceb2)
   )
-  (text "Red" (at 181.61 33.02 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid f9b1563b-384a-447c-9f47-736504e995c8)
-  )
   (text "black" (at 87.63 170.815 90)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid fc03b48b-b580-43df-a800-152783c84131)
@@ -4091,18 +4010,26 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 45c0d5de-0c38-4b34-9f0c-f09c6304feba)
   )
+  (label "WS2812_VCC" (at 177.8 41.275 90)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 55163b3e-65d4-4228-9531-72854e94d29d)
+  )
   (label "RX" (at 228.6 39.37 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 71c6e723-673c-45a9-a0e4-9742220c52a3)
   )
-  (label "GND" (at 163.83 43.18 0)
+  (label "WS2812_GND" (at 175.26 41.275 90)
     (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 84d296ba-3d39-4264-ad19-947f90c54396)
+    (uuid 7d39d336-0246-4c5d-bf4c-8e789280199d)
   )
   (label "GND" (at 227.33 31.75 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 935057d5-6882-4c15-9a35-54677912ba12)
   )
+  (label "WS2812_DataIn" (at 180.34 41.275 90)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 992f95a4-a9cd-4c20-af2a-77abc7bc8964)
+  )
   (label "TX" (at 228.6 41.91 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid b4833916-7a3e-4498-86fb-ec6d13262ffe)
@@ -4137,10 +4064,10 @@
       (effects (font (size 1.27 1.27)) hide)
     )
   )
-  (global_label "CS_A0" (shape input) (at 139.7 154.94 0) (fields_autoplaced)
+  (global_label "CS_A0" (shape input) (at 158.115 26.67 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 30906d31-ca7a-4c10-96e8-3bc670d5af48)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 147.7694 154.8606 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 166.1844 26.5906 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
@@ -4151,10 +4078,10 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "MISO" (shape input) (at 139.7 162.56 0) (fields_autoplaced)
+  (global_label "MISO" (shape input) (at 158.115 34.29 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 3d98b1cd-6cfa-486c-8b7e-051efb2589a7)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 146.6204 162.4806 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 165.0354 34.2106 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
@@ -4172,10 +4099,10 @@
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "MOSI" (shape input) (at 139.7 160.02 0) (fields_autoplaced)
+  (global_label "MOSI" (shape input) (at 158.115 31.75 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 57bdf219-1bc6-4414-bbcb-7aefd03d51fc)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 146.6204 159.9406 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 165.0354 31.6706 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
@@ -4193,10 +4120,10 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "SCK" (shape input) (at 139.7 157.48 0) (fields_autoplaced)
+  (global_label "SCK" (shape input) (at 158.115 29.21 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 8f9d85b0-c057-44e3-b5c1-635b210f6ec3)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 145.7737 157.4006 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 164.1887 29.1306 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
@@ -4207,17 +4134,17 @@
       (effects (font (size 1.27 1.27)) hide)
     )
   )
-  (global_label "MISO" (shape input) (at 139.065 186.69 0) (fields_autoplaced)
+  (global_label "MISO" (shape input) (at 157.48 58.42 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid b7657e6a-8846-482f-9bfe-ee3d6d44dcfa)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 145.9854 186.6106 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 164.4004 58.3406 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "SD_CS" (shape input) (at 139.065 179.07 0) (fields_autoplaced)
+  (global_label "SD_CS" (shape input) (at 157.48 50.8 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid c299adeb-9ec5-48f4-9b0e-cddd4bfbd097)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 147.3159 178.9906 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 165.7309 50.7206 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
@@ -4249,17 +4176,17 @@
       (effects (font (size 1.27 1.27)) hide)
     )
   )
-  (global_label "MOSI" (shape input) (at 139.065 184.15 0) (fields_autoplaced)
+  (global_label "MOSI" (shape input) (at 157.48 55.88 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid de866c43-7d25-4594-ba0a-1bbc63fddedc)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 145.9854 184.0706 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 164.4004 55.8006 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "SCK" (shape input) (at 139.065 181.61 0) (fields_autoplaced)
+  (global_label "SCK" (shape input) (at 157.48 53.34 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid e949624c-dbc2-435f-80ba-bf29b47a1473)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 145.1387 181.5306 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 163.5537 53.2606 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
@@ -4275,10 +4202,10 @@
     (property "Datasheet" "" (id 3) (at 76.835 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "~" (uuid 289d2381-c24d-462b-86ba-5805292aae77))
-    (pin "~" (uuid 289d2381-c24d-462b-86ba-5805292aae77))
-    (pin "~" (uuid 289d2381-c24d-462b-86ba-5805292aae77))
-    (pin "~" (uuid 289d2381-c24d-462b-86ba-5805292aae77))
+    (pin "~" (uuid 289d2381-c24d-462b-86ba-5805292aae7a))
+    (pin "~" (uuid 289d2381-c24d-462b-86ba-5805292aae7a))
+    (pin "~" (uuid 289d2381-c24d-462b-86ba-5805292aae7a))
+    (pin "~" (uuid 289d2381-c24d-462b-86ba-5805292aae7a))
   )
 
   (symbol (lib_id "Bobbycar_components:powerlatch") (at 50.165 133.35 0) (unit 1)
@@ -4292,13 +4219,13 @@
     (property "Datasheet" "" (id 3) (at 50.165 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "~" (uuid 7672a6d3-c089-44dd-b44a-004517620f77))
-    (pin "~" (uuid 7672a6d3-c089-44dd-b44a-004517620f77))
-    (pin "~" (uuid 7672a6d3-c089-44dd-b44a-004517620f77))
-    (pin "~" (uuid 7672a6d3-c089-44dd-b44a-004517620f77))
-    (pin "~" (uuid 7672a6d3-c089-44dd-b44a-004517620f77))
-    (pin "~" (uuid 7672a6d3-c089-44dd-b44a-004517620f77))
-    (pin "~" (uuid 7672a6d3-c089-44dd-b44a-004517620f77))
+    (pin "~" (uuid 7672a6d3-c089-44dd-b44a-004517620f7d))
+    (pin "~" (uuid 7672a6d3-c089-44dd-b44a-004517620f7d))
+    (pin "~" (uuid 7672a6d3-c089-44dd-b44a-004517620f7d))
+    (pin "~" (uuid 7672a6d3-c089-44dd-b44a-004517620f7d))
+    (pin "~" (uuid 7672a6d3-c089-44dd-b44a-004517620f7d))
+    (pin "~" (uuid 7672a6d3-c089-44dd-b44a-004517620f7d))
+    (pin "~" (uuid 7672a6d3-c089-44dd-b44a-004517620f7d))
   )
 
   (symbol (lib_id "Switch:SW_Push_SPDT") (at 44.45 99.06 0) (unit 1)
@@ -4397,15 +4324,15 @@
     (pin "4" (uuid 9b17a8c6-b370-462f-a6fd-222b922e0494))
   )
 
-  (symbol (lib_id "Device:Fuse") (at 83.82 43.18 90) (unit 1)
+  (symbol (lib_id "Device:Fuse") (at 73.025 43.18 90) (unit 1)
     (in_bom no) (on_board no)
     (uuid 00000000-0000-0000-0000-00005dee315d)
-    (property "Reference" "F1" (id 0) (at 83.82 48.1838 90))
-    (property "Value" "AGU Fuseholder" (id 1) (at 83.82 45.8724 90))
-    (property "Footprint" "" (id 2) (at 83.82 44.958 90)
+    (property "Reference" "F1" (id 0) (at 73.025 48.1838 90))
+    (property "Value" "AGU Fuseholder" (id 1) (at 73.025 45.8724 90))
+    (property "Footprint" "" (id 2) (at 73.025 44.958 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 83.82 43.18 0)
+    (property "Datasheet" "~" (id 3) (at 73.025 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 580a5354-cf0a-4eee-b1e3-a7e1e2f69ea4))
@@ -4427,8 +4354,8 @@
     (property "Datasheet" "" (id 3) (at 58.42 33.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "~" (uuid 5e737bb7-9ff1-43d7-bb29-d92d56c2e837))
-    (pin "~" (uuid 5e737bb7-9ff1-43d7-bb29-d92d56c2e837))
+    (pin "~" (uuid 5e737bb7-9ff1-43d7-bb29-d92d56c2e838))
+    (pin "~" (uuid 5e737bb7-9ff1-43d7-bb29-d92d56c2e838))
   )
 
   (symbol (lib_id "Bobbycar_components:xt60_male") (at 55.88 50.8 90) (unit 1)
@@ -4446,72 +4373,72 @@
     (property "Datasheet" "" (id 3) (at 58.42 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "~" (uuid 283e418a-9a69-45b9-b0eb-506e5b012a21))
-    (pin "~" (uuid 283e418a-9a69-45b9-b0eb-506e5b012a21))
+    (pin "~" (uuid 283e418a-9a69-45b9-b0eb-506e5b012a22))
+    (pin "~" (uuid 283e418a-9a69-45b9-b0eb-506e5b012a22))
   )
 
-  (symbol (lib_id "Bobbycar_components:xt60_female") (at 92.71 31.75 270) (mirror x) (unit 1)
+  (symbol (lib_id "Bobbycar_components:xt60_female") (at 81.915 31.75 270) (mirror x) (unit 1)
     (in_bom no) (on_board no)
     (uuid 00000000-0000-0000-0000-00005def4065)
-    (property "Reference" "J7" (id 0) (at 97.79 31.75 90))
-    (property "Value" "xt60_female" (id 1) (at 97.79 25.4 90))
-    (property "Footprint" "" (id 2) (at 92.71 31.75 0)
+    (property "Reference" "J7" (id 0) (at 86.995 31.75 90))
+    (property "Value" "xt60_female" (id 1) (at 86.995 25.4 90))
+    (property "Footprint" "" (id 2) (at 81.915 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 92.71 31.75 0)
+    (property "Datasheet" "" (id 3) (at 81.915 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "~" (uuid abfe2d16-5c1c-42e5-a5b8-7ee7611663a9))
-    (pin "~" (uuid abfe2d16-5c1c-42e5-a5b8-7ee7611663a9))
+    (pin "~" (uuid abfe2d16-5c1c-42e5-a5b8-7ee7611663aa))
+    (pin "~" (uuid abfe2d16-5c1c-42e5-a5b8-7ee7611663aa))
   )
 
-  (symbol (lib_id "Bobbycar_components:xt60_female") (at 92.71 50.8 270) (mirror x) (unit 1)
+  (symbol (lib_id "Bobbycar_components:xt60_female") (at 81.915 50.8 270) (mirror x) (unit 1)
     (in_bom no) (on_board no)
     (uuid 00000000-0000-0000-0000-00005def4204)
-    (property "Reference" "J8" (id 0) (at 97.79 50.8 90))
-    (property "Value" "xt60_female" (id 1) (at 97.79 44.45 90))
-    (property "Footprint" "" (id 2) (at 92.71 50.8 0)
+    (property "Reference" "J8" (id 0) (at 86.995 50.8 90))
+    (property "Value" "xt60_female" (id 1) (at 86.995 44.45 90))
+    (property "Footprint" "" (id 2) (at 81.915 50.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 92.71 50.8 0)
+    (property "Datasheet" "" (id 3) (at 81.915 50.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "~" (uuid 87069b1b-beb7-4ccb-b34c-3dbae8f09b86))
-    (pin "~" (uuid 87069b1b-beb7-4ccb-b34c-3dbae8f09b86))
+    (pin "~" (uuid 87069b1b-beb7-4ccb-b34c-3dbae8f09b87))
+    (pin "~" (uuid 87069b1b-beb7-4ccb-b34c-3dbae8f09b87))
   )
 
-  (symbol (lib_id "Bobbycar_components:xt90antispark_female") (at 116.84 40.64 270) (unit 1)
+  (symbol (lib_id "Bobbycar_components:xt90antispark_female") (at 106.045 40.64 270) (unit 1)
     (in_bom no) (on_board no)
     (uuid 00000000-0000-0000-0000-00005df005fa)
-    (property "Reference" "J9" (id 0) (at 116.84 53.34 90)
+    (property "Reference" "J9" (id 0) (at 106.045 53.34 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "xt90antispark_female" (id 1) (at 116.84 50.8 90)
+    (property "Value" "xt90antispark_female" (id 1) (at 106.045 50.8 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 116.84 40.64 0)
+    (property "Footprint" "" (id 2) (at 106.045 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 116.84 40.64 0)
+    (property "Datasheet" "" (id 3) (at 106.045 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "~" (uuid 47077c27-146a-406e-a83a-e467ee31c5ee))
-    (pin "~" (uuid 47077c27-146a-406e-a83a-e467ee31c5ee))
+    (pin "~" (uuid 47077c27-146a-406e-a83a-e467ee31c5ef))
+    (pin "~" (uuid 47077c27-146a-406e-a83a-e467ee31c5ef))
   )
 
-  (symbol (lib_id "Bobbycar_components:xt90_male") (at 148.59 40.64 90) (mirror x) (unit 1)
+  (symbol (lib_id "Bobbycar_components:xt90_male") (at 137.795 40.64 90) (mirror x) (unit 1)
     (in_bom no) (on_board no)
     (uuid 00000000-0000-0000-0000-00005df0861f)
-    (property "Reference" "J11" (id 0) (at 141.1224 28.829 90))
-    (property "Value" "xt90_male" (id 1) (at 141.1224 31.1404 90))
-    (property "Footprint" "" (id 2) (at 148.59 40.64 0)
+    (property "Reference" "J11" (id 0) (at 130.3274 28.829 90))
+    (property "Value" "xt90_male" (id 1) (at 130.3274 31.1404 90))
+    (property "Footprint" "" (id 2) (at 137.795 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 148.59 40.64 0)
+    (property "Datasheet" "" (id 3) (at 137.795 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "~" (uuid aa0df799-0b67-406d-90cf-6dbd82290546))
-    (pin "~" (uuid aa0df799-0b67-406d-90cf-6dbd82290546))
+    (pin "~" (uuid aa0df799-0b67-406d-90cf-6dbd82290547))
+    (pin "~" (uuid aa0df799-0b67-406d-90cf-6dbd82290547))
   )
 
   (symbol (lib_id "Connector_Generic:Conn_01x04") (at 90.17 180.975 90) (mirror x) (unit 1)
@@ -4550,8 +4477,8 @@
     (property "Datasheet" "" (id 3) (at 22.86 105.41 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "~" (uuid a5adf9fc-330f-4cad-bdb2-e0f8fb1b77b6))
-    (pin "~" (uuid a5adf9fc-330f-4cad-bdb2-e0f8fb1b77b6))
+    (pin "~" (uuid a5adf9fc-330f-4cad-bdb2-e0f8fb1b77b7))
+    (pin "~" (uuid a5adf9fc-330f-4cad-bdb2-e0f8fb1b77b7))
   )
 
   (symbol (lib_id "Bobbycar_components:xt30_female") (at 22.86 81.28 0) (mirror x) (unit 1)
@@ -4569,25 +4496,8 @@
     (property "Datasheet" "" (id 3) (at 22.86 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "~" (uuid 92c8a67d-ecef-4663-99f5-c2b6e82bc067))
-    (pin "~" (uuid 92c8a67d-ecef-4663-99f5-c2b6e82bc067))
-  )
-
-  (symbol (lib_id "Bobbycar_wiring-rescue:SW_DPST_x2-Switch") (at 173.99 43.18 0) (unit 1)
-    (in_bom no) (on_board no)
-    (uuid 00000000-0000-0000-0000-00005df361c7)
-    (property "Reference" "SW2" (id 0) (at 173.99 37.211 0))
-    (property "Value" "MODESWITCH" (id 1) (at 173.99 45.72 0))
-    (property "Footprint" "" (id 2) (at 173.99 43.18 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 173.99 43.18 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid d506e6ce-5890-4ac5-a76c-dee140d36875))
-    (pin "2" (uuid 7bee351d-dee3-45fb-b4ea-22619b98910a))
-    (pin "3" (uuid 5a4d6bfd-f8b3-4981-8668-0ea5d63394c6))
-    (pin "4" (uuid 85dc366c-aced-4db7-994a-f59e7019ab3f))
+    (pin "~" (uuid 92c8a67d-ecef-4663-99f5-c2b6e82bc068))
+    (pin "~" (uuid 92c8a67d-ecef-4663-99f5-c2b6e82bc068))
   )
 
   (symbol (lib_id "Bobbycar_wiring-rescue:LED_Dual_2pin-Device") (at 44.45 86.36 0) (unit 1)
@@ -4605,52 +4515,6 @@
     (pin "2" (uuid 7046a794-f49a-4bba-922e-a64b18321ede))
   )
 
-  (symbol (lib_id "Bobbycar_wiring-rescue:LED_Dual_CAC-Device") (at 173.99 35.56 0) (unit 1)
-    (in_bom no) (on_board no)
-    (uuid 00000000-0000-0000-0000-00005df45e41)
-    (property "Reference" "D2" (id 0) (at 173.99 24.765 0))
-    (property "Value" "MODELED_RED/GREEN" (id 1) (at 173.99 27.0764 0))
-    (property "Footprint" "" (id 2) (at 175.26 35.56 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 175.26 35.56 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 22abc470-4032-48e7-a05c-986fa95ef01c))
-    (pin "2" (uuid 6dd07dbc-24b7-4960-95f2-8ee9adbf89a6))
-    (pin "3" (uuid 23d9876c-9c1c-4e69-81e0-418a7b9b8156))
-  )
-
-  (symbol (lib_id "Device:R") (at 185.42 52.705 180) (unit 1)
-    (in_bom no) (on_board no)
-    (uuid 00000000-0000-0000-0000-00005df4cd3f)
-    (property "Reference" "R5" (id 0) (at 186.69 56.515 90))
-    (property "Value" "66" (id 1) (at 185.42 52.705 90))
-    (property "Footprint" "" (id 2) (at 187.198 52.705 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 185.42 52.705 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid c25873a0-a879-4098-a3da-0cee0d184bec))
-    (pin "2" (uuid 698a101f-2fee-4678-b5fc-9fdf32270aaa))
-  )
-
-  (symbol (lib_id "Device:R") (at 182.88 52.705 180) (unit 1)
-    (in_bom no) (on_board no)
-    (uuid 00000000-0000-0000-0000-00005df4cdeb)
-    (property "Reference" "R4" (id 0) (at 181.61 56.515 90))
-    (property "Value" "20" (id 1) (at 182.88 52.705 90))
-    (property "Footprint" "" (id 2) (at 184.658 52.705 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 182.88 52.705 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 184ae2b4-08f4-4808-b6fd-ac4ca15793dd))
-    (pin "2" (uuid 98ea380b-6e6e-4c71-b703-5baee338ff4f))
-  )
-
   (symbol (lib_id "Device:R") (at 186.69 123.825 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005df4d8f9)
@@ -4700,8 +4564,8 @@
     (property "Datasheet" "" (id 3) (at 26.67 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "~" (uuid c8baad8e-84f6-4984-837a-38ef6d0b77c1))
-    (pin "~" (uuid c8baad8e-84f6-4984-837a-38ef6d0b77c1))
+    (pin "~" (uuid c8baad8e-84f6-4984-837a-38ef6d0b77c2))
+    (pin "~" (uuid c8baad8e-84f6-4984-837a-38ef6d0b77c2))
   )
 
   (symbol (lib_id "Bobbycar_components:xt60_female") (at 26.67 50.8 270) (mirror x) (unit 1)
@@ -4715,8 +4579,8 @@
     (property "Datasheet" "" (id 3) (at 26.67 50.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "~" (uuid a4649d4d-6aa3-4f07-b7a6-0d73d155ec92))
-    (pin "~" (uuid a4649d4d-6aa3-4f07-b7a6-0d73d155ec92))
+    (pin "~" (uuid a4649d4d-6aa3-4f07-b7a6-0d73d155ec93))
+    (pin "~" (uuid a4649d4d-6aa3-4f07-b7a6-0d73d155ec93))
   )
 
   (symbol (lib_id "Device:R") (at 240.665 156.845 0) (unit 1)
@@ -4754,6 +4618,26 @@
     (pin "1" (uuid 9ed56567-0773-4d00-8ae9-985a6328b985))
   )
 
+  (symbol (lib_id "Sensor_Temperature:DS18B20") (at 109.855 158.75 0) (unit 1)
+    (in_bom no) (on_board no)
+    (uuid 01b04aab-8171-4a7b-a8ce-0c1c7877b6c2)
+    (property "Reference" "U?" (id 0) (at 111.125 169.545 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "DS18B20" (id 1) (at 114.3 171.45 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Package_TO_SOT_THT:TO-92_Inline" (id 2) (at 84.455 165.1 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "http://datasheets.maximintegrated.com/en/ds/DS18B20.pdf" (id 3) (at 106.045 152.4 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid f2c806e6-4ce0-4bd4-8ecc-44f0444caa15))
+    (pin "2" (uuid 1eb67d84-1aa7-4add-84e5-6c8d2e6a9208))
+    (pin "3" (uuid 925fedd2-8a06-4553-872d-ea2d77aaaf96))
+  )
+
   (symbol (lib_id "power:GNDD") (at 209.55 33.655 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 073f2160-76bb-422b-a642-f8ccef9d914c)
@@ -4802,12 +4686,12 @@
   )
 
   (symbol (lib_id "power:+3V3") (at 95.25 155.575 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes)
     (uuid 17bbe4ce-9503-4041-ad73-c8128abff18a)
     (property "Reference" "#PWR0101" (id 0) (at 95.25 159.385 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (id 1) (at 97.79 154.3049 0)
+    (property "Value" "+3V3" (id 1) (at 95.25 151.765 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 95.25 155.575 0)
@@ -4836,19 +4720,35 @@
     )
   )
 
-  (symbol (lib_id "power:+3V3") (at 135.89 175.26 0) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 175.26 136.525 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 1decd28b-79a7-42cf-985a-835665426fb5)
+    (property "Reference" "#PWR?" (id 0) (at 175.26 140.335 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V3" (id 1) (at 175.26 130.81 0))
+    (property "Footprint" "" (id 2) (at 175.26 136.525 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 175.26 136.525 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 3b4a4306-72f7-4c2f-8f87-9bd901d8fa65))
+  )
+
+  (symbol (lib_id "power:+3V3") (at 154.305 46.99 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 209a52d9-34f5-461b-a5a9-7614beec1350)
-    (property "Reference" "#PWR0104" (id 0) (at 135.89 179.07 0)
+    (property "Reference" "#PWR0104" (id 0) (at 154.305 50.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (id 1) (at 138.43 173.9899 0)
+    (property "Value" "+3V3" (id 1) (at 156.845 45.7199 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 135.89 175.26 0)
+    (property "Footprint" "" (id 2) (at 154.305 46.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 135.89 175.26 0)
+    (property "Datasheet" "" (id 3) (at 154.305 46.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 6c0bfd92-8534-4bfc-b177-5093e82a16e3))
@@ -4906,17 +4806,17 @@
     )
   )
 
-  (symbol (lib_id "power:GNDD") (at 133.35 192.405 0) (unit 1)
+  (symbol (lib_id "power:GNDD") (at 151.765 64.135 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 265ab290-422e-4c21-8885-def8f7b4fff2)
-    (property "Reference" "#PWR0102" (id 0) (at 133.35 198.755 0)
+    (property "Reference" "#PWR0102" (id 0) (at 151.765 70.485 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDD" (id 1) (at 138.43 193.04 0))
-    (property "Footprint" "" (id 2) (at 133.35 192.405 0)
+    (property "Value" "GNDD" (id 1) (at 156.845 64.77 0))
+    (property "Footprint" "" (id 2) (at 151.765 64.135 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 133.35 192.405 0)
+    (property "Datasheet" "" (id 3) (at 151.765 64.135 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9e916333-53d7-46f1-af83-a4a577edede9))
@@ -4989,6 +4889,25 @@
     (pin "2" (uuid e0796aca-2f81-455a-a691-b46a4238c524))
   )
 
+  (symbol (lib_id "Device:R") (at 147.955 154.305 0) (unit 1)
+    (in_bom no) (on_board no) (fields_autoplaced)
+    (uuid 2f90d030-3c70-4867-bd2c-7cece159e46d)
+    (property "Reference" "R?" (id 0) (at 150.495 153.0349 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "4k7" (id 1) (at 150.495 155.5749 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "" (id 2) (at 146.177 154.305 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 147.955 154.305 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid b9220007-d05b-4d93-ba7d-f6cd3c8224f2))
+    (pin "2" (uuid d8e1b606-85c8-4af7-a848-537c81e38b0c))
+  )
+
   (symbol (lib_id "power:GNDD") (at 175.895 153.67 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 317a0451-4a59-4cbc-a72d-3e1ab111bf0a)
@@ -5040,24 +4959,6 @@
     (pin "1" (uuid 238d1833-6e79-400f-b71f-579bd76f3524))
   )
 
-  (symbol (lib_id "power:+3V3") (at 147.955 78.74 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 399807e1-dc92-46d4-a20f-de1099903873)
-    (property "Reference" "#PWR0128" (id 0) (at 147.955 82.55 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+3V3" (id 1) (at 147.32 77.47 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "" (id 2) (at 147.955 78.74 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 147.955 78.74 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid c5d84e23-00dc-4dff-b948-e8178c85edb9))
-  )
-
   (symbol (lib_id "Device:LED") (at 240.665 148.59 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 3bb18da8-1d29-4ca2-9c9f-354d4d607da0)
@@ -5096,21 +4997,6 @@
     (pin "2" (uuid 92384a39-efea-4cb1-895a-67ae00039a48))
   )
 
-  (symbol (lib_id "Device:R") (at 169.545 82.55 90) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 3e8af8d2-61ad-4b7b-a8c3-49b10b20614f)
-    (property "Reference" "R8" (id 0) (at 169.545 88.9 90))
-    (property "Value" "220" (id 1) (at 169.545 86.995 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 169.545 84.328 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 169.545 82.55 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 1e2f0986-f6bb-4518-b7d6-35c28eca69ff))
-    (pin "2" (uuid ec672b4d-b03e-466e-bcea-cfc41370c2b8))
-  )
-
   (symbol (lib_id "power:+5V") (at 253.365 149.225 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 434284aa-8cbb-41ad-afd5-27d8a3147a22)
@@ -5164,7 +5050,7 @@
     (in_bom yes) (on_board yes)
     (uuid 4bd42f9e-5f27-4b96-970b-d15afedbd1e2)
     (property "Reference" "J22" (id 0) (at 169.545 66.675 0))
-    (property "Value" "Modebutton" (id 1) (at 171.45 62.23 0))
+    (property "Value" "LED" (id 1) (at 172.72 63.5 0))
     (property "Footprint" "Connector_JST:JST_XH_B5B-XH-A_1x05_P2.50mm_Vertical" (id 2) (at 180.34 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -5178,6 +5064,26 @@
     (pin "5" (uuid b5e2c913-af59-4f42-a0f2-9a1933adba86))
   )
 
+  (symbol (lib_id "Sensor_Temperature:DS18B20") (at 124.46 158.75 0) (unit 1)
+    (in_bom no) (on_board no)
+    (uuid 4fa31c47-ffd9-4fde-a7a5-dbb94990be0e)
+    (property "Reference" "U?" (id 0) (at 125.73 169.545 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "DS18B20" (id 1) (at 128.27 171.45 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Package_TO_SOT_THT:TO-92_Inline" (id 2) (at 99.06 165.1 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "http://datasheets.maximintegrated.com/en/ds/DS18B20.pdf" (id 3) (at 120.65 152.4 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 0566a3a1-e9fc-4c0a-b4bd-b1b7050f4c99))
+    (pin "2" (uuid bce6aa02-ce98-4b99-aa5a-4a9a56553baa))
+    (pin "3" (uuid 9c72c810-35b5-4db9-adf7-ad129a3e018c))
+  )
+
   (symbol (lib_id "power:+3V3") (at 271.145 149.86 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 5060e89b-de41-48a2-a6ef-5199a34228a9)
@@ -5194,15 +5100,15 @@
     (pin "1" (uuid 437518ad-1392-4e49-a31b-ee0e02e765a5))
   )
 
-  (symbol (lib_id "Connector_Generic:Conn_01x06") (at 127 186.69 180) (unit 1)
+  (symbol (lib_id "Connector_Generic:Conn_01x06") (at 145.415 58.42 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 5928dbe9-0871-4bbb-9305-f5643ea80ae3)
-    (property "Reference" "J20" (id 0) (at 127 172.085 0))
-    (property "Value" "SPI_A1" (id 1) (at 127 174.625 0))
-    (property "Footprint" "Connector_JST:JST_XH_B6B-XH-A_1x06_P2.50mm_Vertical" (id 2) (at 127 186.69 0)
+    (property "Reference" "J20" (id 0) (at 145.415 43.815 0))
+    (property "Value" "SPI_A1" (id 1) (at 145.415 46.355 0))
+    (property "Footprint" "Connector_JST:JST_XH_B6B-XH-A_1x06_P2.50mm_Vertical" (id 2) (at 145.415 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 127 186.69 0)
+    (property "Datasheet" "~" (id 3) (at 145.415 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d79e93f8-aecb-4b13-b24f-65d9a26d9818))
@@ -5217,7 +5123,7 @@
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 59898735-6d49-4374-9248-57b452b7a507)
     (property "Reference" "J28" (id 0) (at 168.91 132.08 0))
-    (property "Value" "A2A3" (id 1) (at 168.91 134.62 0))
+    (property "Value" "Aux1" (id 1) (at 168.91 134.62 0))
     (property "Footprint" "Connector_JST:JST_XH_B4B-XH-A_1x04_P2.50mm_Vertical" (id 2) (at 168.275 140.335 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -5352,15 +5258,15 @@
     (pin "1" (uuid 07c45946-d464-4603-a3f6-20ef3fc63c84))
   )
 
-  (symbol (lib_id "Connector_Generic:Conn_01x06") (at 127 162.56 180) (unit 1)
+  (symbol (lib_id "Connector_Generic:Conn_01x06") (at 145.415 34.29 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 681d79c7-18bf-4681-af44-d9bc71db3cdf)
-    (property "Reference" "J27" (id 0) (at 127 148.59 0))
-    (property "Value" "SPI_A0" (id 1) (at 127 151.13 0))
-    (property "Footprint" "Connector_JST:JST_XH_B6B-XH-A_1x06_P2.50mm_Vertical" (id 2) (at 127 162.56 0)
+    (property "Reference" "J27" (id 0) (at 145.415 20.32 0))
+    (property "Value" "SPI_A0" (id 1) (at 145.415 22.86 0))
+    (property "Footprint" "Connector_JST:JST_XH_B6B-XH-A_1x06_P2.50mm_Vertical" (id 2) (at 145.415 34.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 127 162.56 0)
+    (property "Datasheet" "~" (id 3) (at 145.415 34.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9503058d-67c6-4296-9380-eddc362c75ac))
@@ -5435,21 +5341,6 @@
     )
   )
 
-  (symbol (lib_id "Device:LED") (at 155.575 82.55 180) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 811586a1-db84-4daa-bfe7-5245aa46c68a)
-    (property "Reference" "D4" (id 0) (at 157.1625 74.93 0))
-    (property "Value" "LED_M_Rd" (id 1) (at 157.1625 77.47 0))
-    (property "Footprint" "LED_SMD:LED_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 155.575 82.55 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 155.575 82.55 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid ed9a2a3a-c546-4c71-8caf-095bac77495a))
-    (pin "2" (uuid c5b77efc-29a7-43c7-bc32-426067c46314))
-  )
-
   (symbol (lib_id "power:+5V") (at 229.235 22.86 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8257d3bb-ead7-4a39-9be6-4d3d87b3214d)
@@ -5466,24 +5357,6 @@
     (pin "1" (uuid 752c4ef3-e771-4102-9c3e-663521f89ebe))
   )
 
-  (symbol (lib_id "power:+3V3") (at 177.8 70.485 180) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 83aee38f-b5bf-47cd-93dd-0b9be2280f72)
-    (property "Reference" "#PWR0114" (id 0) (at 177.8 66.675 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+3V3" (id 1) (at 178.435 71.755 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "" (id 2) (at 177.8 70.485 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 177.8 70.485 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 381fc542-7eda-471d-8135-7457c5feefb3))
-  )
-
   (symbol (lib_id "Connector_Generic:Conn_01x04") (at 71.755 180.975 90) (mirror x) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 848d2835-2ae7-4588-a43f-542ecd1149b3)
@@ -5539,34 +5412,19 @@
     (pin "5" (uuid 3f808b17-54c6-445f-bb00-34565390156d))
   )
 
-  (symbol (lib_id "Device:LED") (at 165.735 80.01 180) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 8d30ff6d-4d05-49e7-a571-b2ca34f7c391)
-    (property "Reference" "D5" (id 0) (at 167.3225 72.39 0))
-    (property "Value" "LED_M_Gr" (id 1) (at 167.3225 74.93 0))
-    (property "Footprint" "LED_SMD:LED_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 165.735 80.01 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 165.735 80.01 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 1ad943c2-f574-401a-aff9-c2ef9ed92eaf))
-    (pin "2" (uuid 11f7c42f-1411-4905-9d7a-ee647bf2fdaf))
-  )
-
-  (symbol (lib_id "power:+3V3") (at 135.89 150.495 0) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 154.305 22.225 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 93502907-ac1e-42c0-8149-1694bc08a34f)
-    (property "Reference" "#PWR0123" (id 0) (at 135.89 154.305 0)
+    (property "Reference" "#PWR0123" (id 0) (at 154.305 26.035 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (id 1) (at 138.43 149.2249 0)
+    (property "Value" "+3V3" (id 1) (at 156.845 20.9549 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 135.89 150.495 0)
+    (property "Footprint" "" (id 2) (at 154.305 22.225 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 135.89 150.495 0)
+    (property "Datasheet" "" (id 3) (at 154.305 22.225 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e4f20660-4cdd-4095-8793-6e6e9b0d06f8))
@@ -5664,17 +5522,17 @@
     (pin "1" (uuid b4fb9a0d-b7d0-40ee-8cd5-29c167577214))
   )
 
-  (symbol (lib_id "power:GNDD") (at 133.35 169.545 0) (unit 1)
+  (symbol (lib_id "power:GNDD") (at 151.765 41.275 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid af7b60bb-b56d-4b57-b67c-f928a646a83b)
-    (property "Reference" "#PWR0122" (id 0) (at 133.35 175.895 0)
+    (property "Reference" "#PWR0122" (id 0) (at 151.765 47.625 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDD" (id 1) (at 137.795 170.18 0))
-    (property "Footprint" "" (id 2) (at 133.35 169.545 0)
+    (property "Value" "GNDD" (id 1) (at 156.21 41.91 0))
+    (property "Footprint" "" (id 2) (at 151.765 41.275 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 133.35 169.545 0)
+    (property "Datasheet" "" (id 3) (at 151.765 41.275 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0ac91d0c-56d0-49ed-a5d9-a284f86e6ccb))
@@ -5804,6 +5662,27 @@
     (pin "3" (uuid eb8b703a-f4bc-4270-9633-8d55ceed84bf))
   )
 
+  (symbol (lib_id "Connector:Conn_01x04_Male") (at 165.735 140.335 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid d515e23f-bb03-41b6-b5a5-72eb81ed731b)
+    (property "Reference" "J?" (id 0) (at 161.925 132.08 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "Aux1" (id 1) (at 160.655 134.62 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Connector_JST:JST_XH_B4B-XH-A_1x04_P2.50mm_Vertical" (id 2) (at 165.735 140.335 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 165.735 140.335 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 892f1353-0fa6-446f-b1d5-a9d4d2a96483))
+    (pin "2" (uuid 5a7be970-171c-4662-9d68-acd426347e32))
+    (pin "3" (uuid aba6655f-49c7-4e3e-ab30-8f578e311230))
+    (pin "4" (uuid c476ef7c-2abf-4e3e-9000-cbd723f138d6))
+  )
+
   (symbol (lib_id "power:GNDD") (at 240.665 161.925 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid d6f3cc5c-d794-4493-ac64-0f9597c264d5)
@@ -5826,7 +5705,7 @@
     (property "Reference" "J21" (id 0) (at 169.545 58.42 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "Modebutton" (id 1) (at 187.96 55.88 0)
+    (property "Value" "LED" (id 1) (at 187.325 61.595 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 180.34 62.865 0)
@@ -6018,21 +5897,6 @@
     (pin "2" (uuid 307677ca-9e99-49ab-ad2e-cf1556304ee3))
   )
 
-  (symbol (lib_id "Device:R") (at 176.53 80.01 90) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid e9a4b31b-88d2-4db5-8fdc-2089fc1f3822)
-    (property "Reference" "R9" (id 0) (at 176.53 76.2 90))
-    (property "Value" "220" (id 1) (at 176.53 78.105 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 176.53 81.788 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 176.53 80.01 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 2c6df8dd-a782-4923-98de-322f40f34599))
-    (pin "2" (uuid dcfd21d8-c2a5-45be-9682-12de0f994c40))
-  )
-
   (symbol (lib_id "Connector:Conn_01x05_Male") (at 75.565 96.52 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid e9cd0895-f2af-4ced-b6da-f2c3670a59f4)
@@ -6073,6 +5937,42 @@
     (pin "5" (uuid 5a4981ed-c4eb-4e11-bc77-b6ec923481e1))
   )
 
+  (symbol (lib_id "power:+5V") (at 177.8 69.85 180) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid f678b9e2-0848-4fad-b60a-0cc9b21ffc54)
+    (property "Reference" "#PWR?" (id 0) (at 177.8 66.04 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+5V" (id 1) (at 180.34 72.39 0))
+    (property "Footprint" "" (id 2) (at 177.8 69.85 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 177.8 69.85 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 64550d67-0ec3-4e82-acd0-2bed8d778435))
+  )
+
+  (symbol (lib_id "Sensor_Temperature:DS18B20") (at 138.43 158.75 0) (unit 1)
+    (in_bom no) (on_board no)
+    (uuid f725f99d-577e-4c78-b498-2f13bafefa52)
+    (property "Reference" "U?" (id 0) (at 139.7 169.545 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "DS18B20" (id 1) (at 142.875 171.45 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Package_TO_SOT_THT:TO-92_Inline" (id 2) (at 113.03 165.1 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "http://datasheets.maximintegrated.com/en/ds/DS18B20.pdf" (id 3) (at 134.62 152.4 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 73904af9-97ae-4122-9c3f-61601f88e1ec))
+    (pin "2" (uuid e90183ed-6c06-4895-95b8-c82e1838efe1))
+    (pin "3" (uuid 7b8f2440-4720-49c2-b12a-5743e7700b85))
+  )
+
   (symbol (lib_id "Mechanical:MountingHole") (at 18.415 189.865 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid fd7d5320-21ef-43ff-8ac7-9d18a93a301d)
@@ -6134,9 +6034,6 @@
     (path "/242e6486-3ee4-40f6-aec0-502dbc662bcb"
       (reference "#PWR0113") (unit 1) (value "GNDD") (footprint "")
     )
-    (path "/83aee38f-b5bf-47cd-93dd-0b9be2280f72"
-      (reference "#PWR0114") (unit 1) (value "+3V3") (footprint "")
-    )
     (path "/65c48aa8-fcb3-4a7e-a3ca-ff467f8d2058"
       (reference "#PWR0115") (unit 1) (value "+5V") (footprint "")
     )
@@ -6176,9 +6073,6 @@
     (path "/b312fe82-2291-4115-ba2f-49ff492db30f"
       (reference "#PWR0127") (unit 1) (value "GNDD") (footprint "")
     )
-    (path "/399807e1-dc92-46d4-a20f-de1099903873"
-      (reference "#PWR0128") (unit 1) (value "+3V3") (footprint "")
-    )
     (path "/d6f3cc5c-d794-4493-ac64-0f9597c264d5"
       (reference "#PWR0129") (unit 1) (value "GNDD") (footprint "")
     )
@@ -6191,6 +6085,12 @@
     (path "/63ed4210-07d8-473f-b760-9d266fc78857"
       (reference "#PWR0132") (unit 1) (value "+3V3") (footprint "")
     )
+    (path "/1decd28b-79a7-42cf-985a-835665426fb5"
+      (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
+    )
+    (path "/f678b9e2-0848-4fad-b60a-0cc9b21ffc54"
+      (reference "#PWR?") (unit 1) (value "+5V") (footprint "")
+    )
     (path "/970dd28f-31ef-478f-a970-8ccde72756aa"
       (reference "BT1") (unit 1) (value "3V") (footprint "Battery:BatteryHolder_Keystone_1058_1x2032")
     )
@@ -6209,18 +6109,9 @@
     (path "/00000000-0000-0000-0000-00005df36553"
       (reference "D1") (unit 1) (value "POWERLED") (footprint "")
     )
-    (path "/00000000-0000-0000-0000-00005df45e41"
-      (reference "D2") (unit 1) (value "MODELED_RED/GREEN") (footprint "")
-    )
     (path "/69653f3d-33db-4c25-a0b9-0e4d8fbc5dc0"
       (reference "D3") (unit 1) (value "LED_Start") (footprint "LED_SMD:LED_0805_2012Metric_Pad1.15x1.40mm_HandSolder")
     )
-    (path "/811586a1-db84-4daa-bfe7-5245aa46c68a"
-      (reference "D4") (unit 1) (value "LED_M_Rd") (footprint "LED_SMD:LED_0805_2012Metric_Pad1.15x1.40mm_HandSolder")
-    )
-    (path "/8d30ff6d-4d05-49e7-a571-b2ca34f7c391"
-      (reference "D5") (unit 1) (value "LED_M_Gr") (footprint "LED_SMD:LED_0805_2012Metric_Pad1.15x1.40mm_HandSolder")
-    )
     (path "/635ec49e-9cbd-4692-bf28-2c01ce4f576f"
       (reference "D6") (unit 1) (value "LED_5V") (footprint "LED_SMD:LED_0805_2012Metric_Pad1.15x1.40mm_HandSolder")
     )
@@ -6309,10 +6200,10 @@
       (reference "J20") (unit 1) (value "SPI_A1") (footprint "Connector_JST:JST_XH_B6B-XH-A_1x06_P2.50mm_Vertical")
     )
     (path "/d72f9dce-da31-4e9a-9bd1-f31f0fbaefc7"
-      (reference "J21") (unit 1) (value "Modebutton") (footprint "")
+      (reference "J21") (unit 1) (value "LED") (footprint "")
     )
     (path "/4bd42f9e-5f27-4b96-970b-d15afedbd1e2"
-      (reference "J22") (unit 1) (value "Modebutton") (footprint "Connector_JST:JST_XH_B5B-XH-A_1x05_P2.50mm_Vertical")
+      (reference "J22") (unit 1) (value "LED") (footprint "Connector_JST:JST_XH_B5B-XH-A_1x05_P2.50mm_Vertical")
     )
     (path "/3d200879-e508-42c8-871e-c01cb537c9c8"
       (reference "J23") (unit 1) (value "Fan") (footprint "")
@@ -6330,11 +6221,14 @@
       (reference "J27") (unit 1) (value "SPI_A0") (footprint "Connector_JST:JST_XH_B6B-XH-A_1x06_P2.50mm_Vertical")
     )
     (path "/59898735-6d49-4374-9248-57b452b7a507"
-      (reference "J28") (unit 1) (value "A2A3") (footprint "Connector_JST:JST_XH_B4B-XH-A_1x04_P2.50mm_Vertical")
+      (reference "J28") (unit 1) (value "Aux1") (footprint "Connector_JST:JST_XH_B4B-XH-A_1x04_P2.50mm_Vertical")
     )
     (path "/b6b07b55-5386-4308-adef-f8cbc0d898b2"
       (reference "J29") (unit 1) (value "A6_7_8") (footprint "Connector_JST:JST_XH_B5B-XH-A_1x05_P2.50mm_Vertical")
     )
+    (path "/d515e23f-bb03-41b6-b5a5-72eb81ed731b"
+      (reference "J?") (unit 1) (value "Aux1") (footprint "Connector_JST:JST_XH_B4B-XH-A_1x04_P2.50mm_Vertical")
+    )
     (path "/cda57f29-e09c-4cd2-82df-d69b76217973"
       (reference "JP1") (unit 1) (value "3V3 5V") (footprint "Jumper:SolderJumper-3_P1.3mm_Open_RoundedPad1.0x1.5mm")
     )
@@ -6359,36 +6253,24 @@
     (path "/00000000-0000-0000-0000-00005df4d9c1"
       (reference "R3") (unit 1) (value "4k7") (footprint "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder")
     )
-    (path "/00000000-0000-0000-0000-00005df4cdeb"
-      (reference "R4") (unit 1) (value "20") (footprint "")
-    )
-    (path "/00000000-0000-0000-0000-00005df4cd3f"
-      (reference "R5") (unit 1) (value "66") (footprint "")
-    )
     (path "/e5888145-258e-4072-a4a4-1d6b01f054e1"
       (reference "R6") (unit 1) (value "220") (footprint "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder")
     )
     (path "/63b3fa74-f017-4e8b-905d-aa53ede83c8f"
       (reference "R7") (unit 1) (value "330") (footprint "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder")
     )
-    (path "/3e8af8d2-61ad-4b7b-a8c3-49b10b20614f"
-      (reference "R8") (unit 1) (value "220") (footprint "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder")
-    )
-    (path "/e9a4b31b-88d2-4db5-8fdc-2089fc1f3822"
-      (reference "R9") (unit 1) (value "220") (footprint "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder")
-    )
     (path "/6323e935-33b8-4cba-a4cc-dd83eb81d1cd"
       (reference "R10") (unit 1) (value "330") (footprint "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder")
     )
     (path "/006af538-c4e1-4b1e-b1cd-f5d6c88dc226"
       (reference "R11") (unit 1) (value "220") (footprint "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder")
     )
+    (path "/2f90d030-3c70-4867-bd2c-7cece159e46d"
+      (reference "R?") (unit 1) (value "4k7") (footprint "")
+    )
     (path "/00000000-0000-0000-0000-00005decf526"
       (reference "SW1") (unit 1) (value "POWERBUTTON") (footprint "")
     )
-    (path "/00000000-0000-0000-0000-00005df361c7"
-      (reference "SW2") (unit 1) (value "MODESWITCH") (footprint "")
-    )
     (path "/00000000-0000-0000-0000-00005decec56"
       (reference "U1") (unit 1) (value "powerlatch") (footprint "")
     )
@@ -6401,5 +6283,14 @@
     (path "/df46d812-1554-4ce7-8fc5-5c8cb8cd26f4"
       (reference "U4") (unit 1) (value "Teensy3.2") (footprint "teensy:Teensy30_31_32_All_Pins")
     )
+    (path "/01b04aab-8171-4a7b-a8ce-0c1c7877b6c2"
+      (reference "U?") (unit 1) (value "DS18B20") (footprint "Package_TO_SOT_THT:TO-92_Inline")
+    )
+    (path "/4fa31c47-ffd9-4fde-a7a5-dbb94990be0e"
+      (reference "U?") (unit 1) (value "DS18B20") (footprint "Package_TO_SOT_THT:TO-92_Inline")
+    )
+    (path "/f725f99d-577e-4c78-b498-2f13bafefa52"
+      (reference "U?") (unit 1) (value "DS18B20") (footprint "Package_TO_SOT_THT:TO-92_Inline")
+    )
   )
 )
diff --git a/controller_teensy/include/display.h b/controller_teensy/include/display.h
index 23e0adc..942d6af 100644
--- a/controller_teensy/include/display.h
+++ b/controller_teensy/include/display.h
@@ -181,8 +181,11 @@ void display_standingDisplay(ESCSerialComm& escFront, ESCSerialComm& escRear) {
   display.print(" V");
   display.println();
 
-  display.print(F("Temp:")); display.print(escFront.getFeedback_boardTemp());
-  display.print(F("/")); display.print(escRear.getFeedback_boardTemp());
+  //display.print(F("Temp:")); display.print(escFront.getFeedback_boardTemp());
+  //display.print(F("/")); display.print(escRear.getFeedback_boardTemp());
+  display.print(F("T:")); display.print(temp_ESCFront,0);
+  display.print(F("/")); display.print(temp_ESCRear,0);
+  display.print(F("/")); display.print(temp_Air,0);
   display.print(" C");
   display.println();
 
diff --git a/controller_teensy/include/logging.h b/controller_teensy/include/logging.h
index ab01837..519debe 100644
--- a/controller_teensy/include/logging.h
+++ b/controller_teensy/include/logging.h
@@ -65,7 +65,8 @@ void loggingLoop(unsigned long loopmillis,ESCSerialComm& escFront, ESCSerialComm
           dataFile.print("current_FrontL,current_FrontR,current_RearL,current_RearR,");
           dataFile.print("rpm_FrontL,rpm_FrontR,rpm_RearL,rpm_RearR,");
           dataFile.print("temp_Front,temp_Rear,vbat_Front,vbat_Rear,");
-          dataFile.println("currentAll,throttle,brake,speed,trip_Front,trip_Rear,currentConsumed_Front,currentConsumed_Rear");
+          dataFile.print("currentAll,throttle,brake,speed,trip_Front,trip_Rear,currentConsumed_Front,currentConsumed_Rear");
+          dataFile.println("temp_ESCFront,temp_ESCRear,temp_Air");
           dataFile.print("#TIMESTAMP:"); dataFile.println(now());
           logging_headerWritten=true;
         }
@@ -94,6 +95,9 @@ void loggingLoop(unsigned long loopmillis,ESCSerialComm& escFront, ESCSerialComm
         dataFile.print(escRear.getTrip());  dataFile.print(";");
         dataFile.print(escFront.getCurrentConsumed(),3); dataFile.print(";");
         dataFile.print(escRear.getCurrentConsumed(),3); dataFile.print(";");
+        dataFile.print(temp_ESCFront,2); dataFile.print(";");
+        dataFile.print(temp_ESCRear,2); dataFile.print(";");
+        dataFile.print(temp_Air,2); dataFile.print(";");
         dataFile.println("");
         dataFile.close();
       }
diff --git a/controller_teensy/include/temperature.h b/controller_teensy/include/temperature.h
new file mode 100644
index 0000000..c8cf60a
--- /dev/null
+++ b/controller_teensy/include/temperature.h
@@ -0,0 +1,105 @@
+#ifndef _TEMPERATURE_H_
+#define _TEMPERATURE_H_
+
+#include <OneWire.h>
+#include <DallasTemperature.h>
+
+DeviceAddress thermometerESCFront={0x28,0xFF,0x64,0x0E,0x77,0xB0,0xAB,0x4B}; //IC with one marking  28FF640E77B0AB4B
+float temp_ESCFront;
+DeviceAddress thermometerESCRear={0x28,0xFF,0x64,0x0E,0x76,0x5D,0x86,0xC2}; //IC with two markings  
+float temp_ESCRear;
+DeviceAddress thermometerAir={0x28,0xFF,0x64,0x0E,0x74,0x7E,0xFE,0x23}; //IC with three markings 28FF640E747EFE23
+float temp_Air;
+
+#define ONE_WIRE_BUS A2 //GPIO pin
+#define TEMPERATURE_PRECISION 12 //max is 12
+#define READINTERVAL_DS18B20 5000 //ms
+
+// Setup a oneWire instance to communicate with any OneWire devices (not just Maxim/Dallas temperature ICs)
+OneWire oneWire(ONE_WIRE_BUS);
+
+// Pass our oneWire reference to Dallas Temperature.
+DallasTemperature sensors(&oneWire);
+
+void initTemperature();
+void temperatureLoop();
+void printAddress(DeviceAddress deviceAddress);
+
+void initTemperature() {
+
+  sensors.begin();
+  delay(1000);
+
+
+  Serial.print("Locating devices...");
+  Serial.print("Found ");
+  Serial.print(sensors.getDeviceCount(), DEC);
+  Serial.println(" devices.");
+
+  delay(1000);
+
+  delay(1000);
+
+
+  //Just search for devices. Only needed when connecting a new sensor to find the address
+  oneWire.reset_search();
+  
+  for (uint8_t i=0;i<sensors.getDeviceCount();i++){
+    DeviceAddress _addr;
+    if (!oneWire.search(_addr)) {
+      Serial.print("Error: Device not found");
+    }else{
+      Serial.print("Found device. Address:");
+      printAddress(_addr);
+    }
+    Serial.println();
+      
+  }
+
+  delay(1000);
+
+  //sensors.setResolution(thermometerReservoir, TEMPERATURE_PRECISION);
+ 
+}
+
+void temperatureLoop(unsigned long loopmillis) {
+    static unsigned long last_read_ds18b20;
+    static bool flag_requestTemperatures=false;
+    if (loopmillis>last_read_ds18b20+READINTERVAL_DS18B20) { 
+        if (loopmillis>last_read_ds18b20+READINTERVAL_DS18B20*10) { //timeout
+            Serial.println("Warn: Request Temperatures Timeout!");
+            flag_requestTemperatures=false;
+        }
+        if (!flag_requestTemperatures) {
+            unsigned long _start=millis();
+            sensors.requestTemperatures(); //this takes ~34ms
+            Serial.print("DS Request took ms:"); Serial.println(millis()-_start);
+            flag_requestTemperatures=true;
+        }
+        if (sensors.isConversionComplete()) {
+            flag_requestTemperatures=false;
+            last_read_ds18b20=loopmillis;
+            temp_ESCFront= sensors.getTempC(thermometerESCFront); //This takes ~12.5ms
+            temp_ESCRear= sensors.getTempC(thermometerESCRear);
+            temp_Air= sensors.getTempC(thermometerAir);            
+            /*
+            Serial.print("temp_ESCFront: "); Serial.println(temp_ESCFront);
+            Serial.print("temp_ESCRear: "); Serial.println(temp_ESCRear);
+            Serial.print("temp_Air: "); Serial.println(temp_Air);
+            */
+        }
+    }
+}
+
+
+
+void printAddress(DeviceAddress deviceAddress)
+{
+  for (uint8_t i = 0; i < 8; i++)
+  {
+    // zero pad the address if necessary
+    if (deviceAddress[i] < 16) Serial.print("0");
+    Serial.print(deviceAddress[i], HEX);
+  }
+}
+#endif
\ No newline at end of file
diff --git a/controller_teensy/platformio.ini b/controller_teensy/platformio.ini
index c8391f1..2311658 100644
--- a/controller_teensy/platformio.ini
+++ b/controller_teensy/platformio.ini
@@ -24,4 +24,5 @@ lib_deps =
     robtillaart/ADS1X15@^0.3.9
     adafruit/Adafruit SSD1306@^2.5.7
     arduino-libraries/SD@^1.2.4
-    https://github.com/adafruit/Adafruit_NeoPixel
\ No newline at end of file
+    https://github.com/adafruit/Adafruit_NeoPixel
+    https://github.com/milesburton/Arduino-Temperature-Control-Library/
\ No newline at end of file
diff --git a/controller_teensy/src/main.cpp b/controller_teensy/src/main.cpp
index 1a4fbdb..983c78a 100644
--- a/controller_teensy/src/main.cpp
+++ b/controller_teensy/src/main.cpp
@@ -8,7 +8,7 @@
 #include "helpfunctions.h"
 #include "hoverboard-esc-serial-comm.h"
 #include "led.h"
-
+#include "temperature.h"
 
 //#include "comms.h"
 String getLogFilename();
@@ -21,6 +21,8 @@ String getLogFilename();
 
 
 
+
+
 ESCSerialComm escFront(Serial2);
 ESCSerialComm escRear(Serial3);
 //Serial1 = TX1=1, RX1=0
@@ -116,6 +118,7 @@ void setup()
   led_simpeProgress(5,true);
 
   //init ADS1115
+  
   if (!ADS.begin()) {
     Serial.println("Error:"); delay(2000); Serial.println("ADS1115 Init Error!");
     led_simpeProgress(6,false);
@@ -142,6 +145,9 @@ void setup()
     Serial.println("RTC has set the system time");
     led_simpeProgress(7,true);
   }
+
+  initTemperature();
+  led_simpeProgress(8,true);
   
 
 
@@ -198,10 +204,10 @@ void loop() {
   */
 
 
-
+  
 
   
-  if (loopmillis - last_adsread > ADSREADPERIOD) { //read teensy adc and filter
+  if (ADS.isConnected() && (loopmillis - last_adsread > ADSREADPERIOD) ) { //read teensy adc and filter
     last_adsread=loopmillis;
     if (ADS.isBusy() == false) //reads a register on ads
     {
@@ -277,6 +283,9 @@ void loop() {
     display_update(escFront,escRear);
   }
 
+  //Temperature
+  temperatureLoop(loopmillis);
+
   //Fan
   static unsigned long last_fan_update=0;
   #define FANUPDATEPERIOD 5000
@@ -285,7 +294,8 @@ void loop() {
   if (loopmillis - last_fan_update > FANUPDATEPERIOD) {
     last_fan_update=loopmillis;
     boolean fanstatus=digitalRead(PIN_FAN);
-    float temp=max(escFront.getFeedback_boardTemp(),escRear.getFeedback_boardTemp());
+    //float temp=max(escFront.getFeedback_boardTemp(),escRear.getFeedback_boardTemp());
+    float temp=max(temp_ESCFront,temp_ESCRear);
     if (!escFront.getControllerConnected() || !escRear.getControllerConnected()) { //boards are not powered on
       digitalWrite(PIN_FAN,HIGH); //force fan on
     }else{ //if both controllers are on, use temperature regulation