Add reverse polarity protection diodes; Start cleaning up top part of PCB

CommonSense.kicad_sch

@@ -555,6 +555,71 @@
         )
       )
     )
+    (symbol "Device:D_Schottky" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "D" (at 0 2.54 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "D_Schottky" (at 0 -2.54 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "diode Schottky" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Schottky diode" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "TO-???* *_Diode_* *SingleDiode* D_*" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "D_Schottky_0_1"
+        (polyline
+          (pts
+            (xy 1.27 0)
+            (xy -1.27 0)
+          )
+          (stroke (width 0) (type default))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 1.27 1.27)
+            (xy 1.27 -1.27)
+            (xy -1.27 0)
+            (xy 1.27 1.27)
+          )
+          (stroke (width 0.254) (type default))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -1.905 0.635)
+            (xy -1.905 1.27)
+            (xy -1.27 1.27)
+            (xy -1.27 -1.27)
+            (xy -0.635 -1.27)
+            (xy -0.635 -0.635)
+          )
+          (stroke (width 0.254) (type default))
+          (fill (type none))
+        )
+      )
+      (symbol "D_Schottky_1_1"
+        (pin passive line (at -3.81 0 0) (length 2.54)
+          (name "K" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 3.81 0 180) (length 2.54)
+          (name "A" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Device:L" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
       (property "Reference" "L" (at -1.27 0 90)
         (effects (font (size 1.27 1.27)))
@@ -1338,11 +1403,11 @@
         )
       )
     )
-    (symbol "power:+3V3" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
+    (symbol "power:+3V0" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
       (property "Reference" "#PWR" (at 0 -3.81 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Value" "+3V3" (at 0 3.556 0)
+      (property "Value" "+3V0" (at 0 3.556 0)
         (effects (font (size 1.27 1.27)))
       )
       (property "Footprint" "" (at 0 0 0)
@@ -1354,10 +1419,10 @@
       (property "ki_keywords" "global power" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Power symbol creates a global label with name \"+3V3\"" (at 0 0 0)
+      (property "ki_description" "Power symbol creates a global label with name \"+3V0\"" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "+3V3_0_1"
+      (symbol "+3V0_0_1"
         (polyline
           (pts
             (xy -0.762 1.27)
@@ -1383,9 +1448,61 @@
           (fill (type none))
         )
       )
-      (symbol "+3V3_1_1"
+      (symbol "+3V0_1_1"
         (pin power_in line (at 0 0 90) (length 0) hide
-          (name "+3V3" (effects (font (size 1.27 1.27))))
+          (name "+3V0" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
+    (symbol "power:+BATT" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
+      (property "Reference" "#PWR" (at 0 -3.81 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Value" "+BATT" (at 0 3.556 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "global power battery" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Power symbol creates a global label with name \"+BATT\"" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "+BATT_0_1"
+        (polyline
+          (pts
+            (xy -0.762 1.27)
+            (xy 0 2.54)
+          )
+          (stroke (width 0) (type default))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0 0)
+            (xy 0 2.54)
+          )
+          (stroke (width 0) (type default))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0 2.54)
+            (xy 0.762 1.27)
+          )
+          (stroke (width 0) (type default))
+          (fill (type none))
+        )
+      )
+      (symbol "+BATT_1_1"
+        (pin power_in line (at 0 0 90) (length 0) hide
+          (name "+BATT" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
       )
@@ -1435,6 +1552,12 @@
   (junction (at 242.57 66.04) (diameter 0) (color 0 0 0 0)
     (uuid 1dfd44f6-572d-4d85-965f-21e2826b8228)
   )
+  (junction (at 27.94 46.99) (diameter 0) (color 0 0 0 0)
+    (uuid 25a4d898-8ad3-45de-947b-580991fdc333)
+  )
+  (junction (at 217.17 60.96) (diameter 0) (color 0 0 0 0)
+    (uuid 2bbc9882-fe25-4b3c-b592-f58d591854a2)
+  )
   (junction (at 255.27 109.22) (diameter 0) (color 0 0 0 0)
     (uuid 31931e47-646b-44ab-a416-57a1bb33f861)
   )
@@ -1459,18 +1582,21 @@
   (junction (at 53.34 96.52) (diameter 0) (color 0 0 0 0)
     (uuid 84737e80-ea07-48fb-a396-71751eec4327)
   )
+  (junction (at 27.94 41.91) (diameter 0) (color 0 0 0 0)
+    (uuid ac7266c1-f578-4cb6-9e4a-ee2f31940e7b)
+  )
   (junction (at 170.18 40.64) (diameter 0) (color 0 0 0 0)
     (uuid ada36751-3256-47f5-86e5-573521f9a2a5)
   )
   (junction (at 175.26 142.24) (diameter 0) (color 0 0 0 0)
     (uuid b35aed4a-fbb8-4f0b-b5ef-9677ad26094e)
   )
-  (junction (at 217.17 60.96) (diameter 0) (color 0 0 0 0)
-    (uuid b6fe117a-edc4-45ad-ad27-f9ecf4fc4621)
-  )
   (junction (at 172.72 146.05) (diameter 0) (color 0 0 0 0)
     (uuid b778d09b-1089-4ad5-b740-66a846b14b0f)
   )
+  (junction (at 40.64 44.45) (diameter 0) (color 0 0 0 0)
+    (uuid c079eecf-bcfd-47b1-930e-df503ed0393e)
+  )
   (junction (at 242.57 78.74) (diameter 0) (color 0 0 0 0)
     (uuid c70f1dde-4d01-48ae-8bf6-7d9aa64ba090)
   )
@@ -1562,6 +1688,10 @@
     (stroke (width 0) (type default))
     (uuid 191bdc9a-85b4-419f-9720-35b64d769273)
   )
+  (wire (pts (xy 38.1 41.91) (xy 40.64 41.91))
+    (stroke (width 0) (type default))
+    (uuid 19e1f1f4-06cb-4692-9764-07d313eeb6d2)
+  )
   (wire (pts (xy 172.72 146.05) (xy 172.72 151.13))
     (stroke (width 0) (type default))
     (uuid 1a7d3e12-5059-4bd7-b47b-4141ff23c1cb)
@@ -1590,7 +1720,11 @@
     (stroke (width 0) (type default))
     (uuid 22b33564-2237-4ba8-b123-0ab19ad16694)
   )
-  (wire (pts (xy 34.29 50.8) (xy 34.29 53.34))
+  (wire (pts (xy 27.94 46.99) (xy 30.48 46.99))
+    (stroke (width 0) (type default))
+    (uuid 22e9d575-3043-4539-b585-d08b2c7ae1ff)
+  )
+  (wire (pts (xy 27.94 58.42) (xy 27.94 60.96))
     (stroke (width 0) (type default))
     (uuid 2505c02d-d21a-4a40-9d51-f8a2203a57b4)
   )
@@ -1650,7 +1784,7 @@
     (stroke (width 0) (type default))
     (uuid 3c7c154c-3bd6-45c7-b812-a54111b05db4)
   )
-  (wire (pts (xy 34.29 40.64) (xy 34.29 43.18))
+  (wire (pts (xy 27.94 39.37) (xy 27.94 41.91))
     (stroke (width 0) (type default))
     (uuid 3d65097c-a78e-40a5-9405-d0a73c938a3c)
   )
@@ -1690,9 +1824,9 @@
     (stroke (width 0) (type default))
     (uuid 4cd8c1f6-604b-43ed-ba55-784cb5fb86bc)
   )
-  (wire (pts (xy 217.17 59.69) (xy 217.17 60.96))
+  (wire (pts (xy 40.64 41.91) (xy 40.64 44.45))
     (stroke (width 0) (type default))
-    (uuid 50b794a3-3b24-44ab-8647-91a9ce4249a7)
+    (uuid 4d35492a-a3f2-4a80-b42c-5621ee366a08)
   )
   (wire (pts (xy 53.34 86.36) (xy 53.34 87.63))
     (stroke (width 0) (type default))
@@ -1806,6 +1940,10 @@
     (stroke (width 0) (type default))
     (uuid 84c318c3-934c-4d2f-8d95-4667cfcad85f)
   )
+  (wire (pts (xy 40.64 46.99) (xy 38.1 46.99))
+    (stroke (width 0) (type default))
+    (uuid 8791713d-a610-4fcf-a359-c26084ce6e7b)
+  )
   (wire (pts (xy 247.65 72.39) (xy 246.38 72.39))
     (stroke (width 0) (type default))
     (uuid 880c3c1c-1770-442b-bfd5-331f0c54bea0)
@@ -1830,6 +1968,10 @@
     (stroke (width 0) (type default))
     (uuid 96bfd1a7-94fd-4040-97fd-aa21cc14db3a)
   )
+  (wire (pts (xy 46.99 39.37) (xy 46.99 44.45))
+    (stroke (width 0) (type default))
+    (uuid 97b78e57-c742-4c3d-893b-559019896c45)
+  )
   (wire (pts (xy 115.57 93.98) (xy 124.46 93.98))
     (stroke (width 0) (type default))
     (uuid 97d70f07-e8f6-4769-ad0f-f84a43f84c5c)
@@ -1838,6 +1980,10 @@
     (stroke (width 0) (type default))
     (uuid 9802b143-83b7-4080-a27b-ddf78dd454e8)
   )
+  (wire (pts (xy 40.64 44.45) (xy 40.64 46.99))
+    (stroke (width 0) (type default))
+    (uuid 9897d4db-ce66-4526-99b5-2882d242b850)
+  )
   (wire (pts (xy 20.32 125.73) (xy 26.67 125.73))
     (stroke (width 0) (type default))
     (uuid 98b631d8-da7d-4870-8ee1-58f142adc1ba)
@@ -1910,6 +2056,10 @@
     (stroke (width 0) (type default))
     (uuid b4aba003-d2d6-47ee-81c1-a4e040be01d9)
   )
+  (wire (pts (xy 46.99 44.45) (xy 40.64 44.45))
+    (stroke (width 0) (type default))
+    (uuid b62b2170-86b0-433c-a290-39480eac3463)
+  )
   (wire (pts (xy 175.26 40.64) (xy 175.26 41.91))
     (stroke (width 0) (type default))
     (uuid b6c3c7d1-bed4-437a-8197-5c611f9bee54)
@@ -2098,6 +2248,10 @@
     (stroke (width 0) (type default))
     (uuid ef83a2f2-08c6-420f-b85c-345b2d76aaf8)
   )
+  (wire (pts (xy 27.94 46.99) (xy 27.94 50.8))
+    (stroke (width 0) (type default))
+    (uuid efcbff19-6344-465e-8ee2-b401ed75d280)
+  )
   (wire (pts (xy 99.06 87.63) (xy 101.6 87.63))
     (stroke (width 0) (type default))
     (uuid f10eb7c9-8d64-475a-9a9e-03149df30f6f)
@@ -2110,10 +2264,18 @@
     (stroke (width 0) (type default))
     (uuid fa77510c-e148-4b97-9b60-2a0ec7bbc5ed)
   )
+  (wire (pts (xy 27.94 41.91) (xy 27.94 46.99))
+    (stroke (width 0) (type default))
+    (uuid facadd6a-8f36-4911-9069-c8ac73314bce)
+  )
   (wire (pts (xy 210.82 83.82) (xy 222.25 83.82))
     (stroke (width 0) (type default))
     (uuid fc065920-c5a8-46a9-a0cf-6b7291ea780a)
   )
+  (wire (pts (xy 27.94 41.91) (xy 30.48 41.91))
+    (stroke (width 0) (type default))
+    (uuid fc24ea1f-7740-45f9-b4ae-15e63ba2eb7a)
+  )
   (wire (pts (xy 168.91 146.05) (xy 172.72 146.05))
     (stroke (width 0) (type default))
     (uuid fcc970b1-1af2-4a72-a564-82d9d5b7db0d)
@@ -2131,7 +2293,7 @@
     (uuid fee80bf8-b464-41e0-b55e-eb283bcb058b)
   )
 
-  (rectangle (start 58.42 33.02) (end 77.47 68.58)
+  (rectangle (start 58.42 31.75) (end 77.47 68.58)
     (stroke (width 0) (type dash))
     (fill (type none))
     (uuid 1631e2e6-c979-463e-8cf2-12e8894c8110)
@@ -2141,7 +2303,7 @@
     (fill (type none))
     (uuid 2bd399c4-f9db-4930-b04d-f231e91688d2)
   )
-  (rectangle (start 26.67 33.02) (end 53.34 60.96)
+  (rectangle (start 22.86 31.75) (end 50.8 68.58)
     (stroke (width 0) (type dash))
     (fill (type none))
     (uuid 3c3dd608-ee79-49c7-9164-027696686acc)
@@ -2167,14 +2329,6 @@
     (uuid f4b48032-2762-4a45-9cb3-b3bf5c508e10)
   )
 
-  (text_box "TODO: Add reverse polarity protection"
-    (at 30.48 62.23 0) (size 19.05 7.62)
-    (stroke (width 0) (type default))
-    (fill (type color) (color 255 255 194 1))
-    (effects (font (size 1.27 1.27)) (justify left top))
-    (uuid 962383f0-811b-4f71-8751-ccde41f0392d)
-  )
-
   (text "Humidity & Temperature Sensor" (at 16.51 77.47 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 250da02d-7335-4c90-a2a8-1bc77836d60c)
@@ -2191,11 +2345,11 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 38da088d-eb75-4a57-b99a-524f8a5d0f5a)
   )
-  (text "Status LED" (at 58.42 33.02 0)
+  (text "Status LED" (at 58.42 31.75 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 69353684-579d-46af-9f63-3d6addb2ccf8)
   )
-  (text "Power" (at 26.67 33.02 0)
+  (text "Power" (at 22.86 31.75 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid dc7e1242-3e2d-4801-8a38-dbc596ecb32f)
   )
@@ -2434,36 +2588,6 @@
     )
   )
 
-  (symbol (lib_id "power:+3V3") (at 53.34 85.09 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 053572df-d744-4d53-8054-cc69b1919705)
-    (property "Reference" "#PWR020" (at 53.34 88.9 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+3V3" (at 53.34 80.01 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "" (at 53.34 85.09 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (at 53.34 85.09 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid cc9b91ba-ebb5-47a4-8e09-16e940e2a774))
-    (instances
-      (project "CommonSense"
-        (path "/38fbf0b5-ae68-401e-b1a9-e916ed01fc13"
-          (reference "#PWR020") (unit 1)
-        )
-      )
-      (project "nodemcu_humidity_shield"
-        (path "/523ef776-806b-43b6-937c-22b5e6ba7731"
-          (reference "#PWR015") (unit 1)
-        )
-      )
-    )
-  )
-
   (symbol (lib_id "Device:C") (at 106.68 93.98 270) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 09d09a6d-cbdc-4a5f-ab2c-ac3f5d30f7cc)
@@ -2556,31 +2680,26 @@
     )
   )
 
-  (symbol (lib_id "power:+3V3") (at 144.78 130.81 0) (unit 1)
+  (symbol (lib_id "power:+3V0") (at 63.5 119.38 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 15043649-4cd0-453f-b1a5-e3901abc4c6d)
+    (uuid 12dfd446-afa1-48bd-9ab7-c4f21d1c9c10)
-    (property "Reference" "#PWR08" (at 144.78 134.62 0)
+    (property "Reference" "#PWR010" (at 63.5 123.19 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (at 144.78 125.73 0)
+    (property "Value" "+3V0" (at 63.5 114.3 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "" (at 144.78 130.81 0)
+    (property "Footprint" "" (at 63.5 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 144.78 130.81 0)
+    (property "Datasheet" "" (at 63.5 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid fc6f0556-9bbd-4fe7-9774-cf58b98b8858))
+    (pin "1" (uuid d7985804-d8a5-45ba-a728-fa73f1f927a5))
     (instances
       (project "CommonSense"
         (path "/38fbf0b5-ae68-401e-b1a9-e916ed01fc13"
-          (reference "#PWR08") (unit 1)
+          (reference "#PWR010") (unit 1)
-        )
-      )
-      (project "nodemcu_humidity_shield"
-        (path "/523ef776-806b-43b6-937c-22b5e6ba7731"
-          (reference "#PWR018") (unit 1)
         )
       )
     )
@@ -2792,33 +2911,28 @@
     )
   )
 
-  (symbol (lib_id "power:+3V3") (at 217.17 59.69 0) (mirror y) (unit 1)
+  (symbol (lib_id "power:+3V0") (at 144.78 59.69 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 3b556707-2127-4bc3-acfd-8173f8344f7f)
+    (uuid 3f9d4447-bacf-45b3-94b6-79192aa87c9f)
-    (property "Reference" "#PWR013" (at 217.17 63.5 0)
+    (property "Reference" "#PWR013" (at 144.78 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (at 217.17 54.61 0)
+    (property "Value" "+3V0" (at 144.78 54.61 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "" (at 217.17 59.69 0)
+    (property "Footprint" "" (at 144.78 59.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 217.17 59.69 0)
+    (property "Datasheet" "" (at 144.78 59.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 4b7853ce-edb8-4d76-aa37-161094ac98c2))
+    (pin "1" (uuid 9c45660c-568e-4a0c-897c-d8c37d06a1c4))
     (instances
       (project "CommonSense"
         (path "/38fbf0b5-ae68-401e-b1a9-e916ed01fc13"
           (reference "#PWR013") (unit 1)
         )
       )
-      (project "nodemcu_humidity_shield"
-        (path "/523ef776-806b-43b6-937c-22b5e6ba7731"
-          (reference "#PWR07") (unit 1)
-        )
-      )
     )
   )
 
@@ -2853,19 +2967,19 @@
     )
   )
 
-  (symbol (lib_id "power:GND") (at 34.29 53.34 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 27.94 60.96 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 47922505-22f5-45be-ae5a-21cf626acf6a)
-    (property "Reference" "#PWR03" (at 34.29 59.69 0)
+    (property "Reference" "#PWR03" (at 27.94 67.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (at 34.29 58.42 0)
+    (property "Value" "GND" (at 27.94 66.04 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "" (at 34.29 53.34 0)
+    (property "Footprint" "" (at 27.94 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 34.29 53.34 0)
+    (property "Datasheet" "" (at 27.94 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 77e1d528-46bb-4d05-bed2-6fa662a7d86d))
@@ -2883,6 +2997,32 @@
     )
   )
 
+  (symbol (lib_id "Device:D_Schottky") (at 34.29 46.99 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid 4c04a4c0-456f-4964-b599-fa273f2331b5)
+    (property "Reference" "D2" (at 30.48 45.72 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "CDBU0130L-HF " (at 38.1 49.53 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Diode_SMD:D_0603_1608Metric" (at 34.29 46.99 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (at 34.29 46.99 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 9a06e438-0fd5-4225-94ed-61ac81596019))
+    (pin "2" (uuid 2919edf1-e49d-46d5-b85b-a693b2ae4ed7))
+    (instances
+      (project "CommonSense"
+        (path "/38fbf0b5-ae68-401e-b1a9-e916ed01fc13"
+          (reference "D2") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "Device:C") (at 144.78 66.04 0) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 4e153c1e-562b-47d4-ac10-9a9993abab30)
@@ -2914,31 +3054,6 @@
     )
   )
 
-  (symbol (lib_id "power:+3V3") (at 63.5 119.38 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid 50045842-04c6-42ad-942a-1cc0d16e6d7c)
-    (property "Reference" "#PWR025" (at 63.5 123.19 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+3V3" (at 63.5 115.57 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "" (at 63.5 119.38 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (at 63.5 119.38 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 3a44fda6-85e5-4cc5-9a3b-c81ce4e97740))
-    (instances
-      (project "CommonSense"
-        (path "/38fbf0b5-ae68-401e-b1a9-e916ed01fc13"
-          (reference "#PWR025") (unit 1)
-        )
-      )
-    )
-  )
-
   (symbol (lib_id "Device:C") (at 106.68 81.28 270) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 5120d237-477c-44b3-8d43-738b8b8217bd)
@@ -2970,31 +3085,6 @@
     )
   )
 
-  (symbol (lib_id "power:+3V3") (at 24.13 142.24 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid 534ca1be-ad96-4fdc-86d7-c05922d61830)
-    (property "Reference" "#PWR024" (at 24.13 146.05 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+3V3" (at 20.32 140.97 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "" (at 24.13 142.24 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (at 24.13 142.24 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 48e1a24b-27a2-4c20-9e69-aef6c2d93d45))
-    (instances
-      (project "CommonSense"
-        (path "/38fbf0b5-ae68-401e-b1a9-e916ed01fc13"
-          (reference "#PWR024") (unit 1)
-        )
-      )
-    )
-  )
-
   (symbol (lib_id "Device:C") (at 251.46 66.04 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 566e2bda-4877-4dac-8a61-64ae1419765c)
@@ -3129,6 +3219,32 @@
     )
   )
 
+  (symbol (lib_id "Device:D_Schottky") (at 34.29 41.91 180) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid 67f65e3b-7dc7-49c5-93ad-0b72a987737c)
+    (property "Reference" "D3" (at 38.1 40.64 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "CDBU0130L-HF " (at 38.1 38.1 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Diode_SMD:D_0603_1608Metric" (at 34.29 41.91 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (at 34.29 41.91 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 02513bc1-6386-41ed-8ea0-f164a3900017))
+    (pin "2" (uuid a921d312-8a98-4c5d-a806-23fe7cbdc932))
+    (instances
+      (project "CommonSense"
+        (path "/38fbf0b5-ae68-401e-b1a9-e916ed01fc13"
+          (reference "D3") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "power:GND") (at 175.26 52.07 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 6c9cb458-d5ee-4560-9677-233596a65238)
@@ -3159,36 +3275,6 @@
     )
   )
 
-  (symbol (lib_id "power:+3V3") (at 34.29 40.64 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 6ee37ea0-133b-424a-a62b-a792c75d72c2)
-    (property "Reference" "#PWR02" (at 34.29 44.45 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+3V3" (at 34.29 35.56 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "" (at 34.29 40.64 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (at 34.29 40.64 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid d8e5b35a-0741-4917-9911-ef252a344634))
-    (instances
-      (project "CommonSense"
-        (path "/38fbf0b5-ae68-401e-b1a9-e916ed01fc13"
-          (reference "#PWR02") (unit 1)
-        )
-      )
-      (project "nodemcu_humidity_shield"
-        (path "/523ef776-806b-43b6-937c-22b5e6ba7731"
-          (reference "#PWR010") (unit 1)
-        )
-      )
-    )
-  )
-
   (symbol (lib_id "Device:C") (at 53.34 91.44 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 6fdeadae-6f77-4a28-99f5-c6e7ef12c298)
@@ -3309,36 +3395,6 @@
     )
   )
 
-  (symbol (lib_id "power:+3V3") (at 144.78 59.69 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 7e20892c-cbd2-4342-9a87-83863a041f1a)
-    (property "Reference" "#PWR010" (at 144.78 63.5 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+3V3" (at 144.78 54.61 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "" (at 144.78 59.69 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (at 144.78 59.69 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid d11a8f65-d624-4d16-8137-394829abfece))
-    (instances
-      (project "CommonSense"
-        (path "/38fbf0b5-ae68-401e-b1a9-e916ed01fc13"
-          (reference "#PWR010") (unit 1)
-        )
-      )
-      (project "nodemcu_humidity_shield"
-        (path "/523ef776-806b-43b6-937c-22b5e6ba7731"
-          (reference "#PWR013") (unit 1)
-        )
-      )
-    )
-  )
-
   (symbol (lib_id "power:GND") (at 24.13 144.78 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 8378105b-1305-4876-b255-7db71ae2dda0)
@@ -3364,6 +3420,31 @@
     )
   )
 
+  (symbol (lib_id "power:+3V0") (at 158.75 139.7 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid 84a1e863-509d-479d-88c6-5ddfc761af94)
+    (property "Reference" "#PWR023" (at 158.75 143.51 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V0" (at 158.75 134.62 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 158.75 139.7 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 158.75 139.7 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid f25c7dc9-46f8-4402-b3ed-909e76adf6fe))
+    (instances
+      (project "CommonSense"
+        (path "/38fbf0b5-ae68-401e-b1a9-e916ed01fc13"
+          (reference "#PWR023") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "Device:R") (at 165.1 146.05 270) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 8557f8fd-230f-4c92-8b7d-d4c99c7092e0)
@@ -3537,6 +3618,56 @@
     )
   )
 
+  (symbol (lib_id "power:+3V0") (at 53.34 85.09 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid a0bd026b-837b-4b50-b7f2-7e92acc1eeb9)
+    (property "Reference" "#PWR08" (at 53.34 88.9 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V0" (at 53.34 80.01 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 53.34 85.09 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 53.34 85.09 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 5ba6819c-8d4e-4848-9354-b144e943ea1d))
+    (instances
+      (project "CommonSense"
+        (path "/38fbf0b5-ae68-401e-b1a9-e916ed01fc13"
+          (reference "#PWR08") (unit 1)
+        )
+      )
+    )
+  )
+
+  (symbol (lib_id "power:+3V0") (at 144.78 130.81 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid a2b75e97-c295-4dbe-a1c6-ecedc0e67f81)
+    (property "Reference" "#PWR024" (at 144.78 134.62 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V0" (at 144.78 125.73 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 144.78 130.81 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 144.78 130.81 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 10015060-115d-49ad-84ae-cd83dc217c39))
+    (instances
+      (project "CommonSense"
+        (path "/38fbf0b5-ae68-401e-b1a9-e916ed01fc13"
+          (reference "#PWR024") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "Connector_Generic:Conn_01x02") (at 29.21 144.78 0) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid a4166a52-9bc6-4775-bc8e-3c3145bd85ba)
@@ -3654,6 +3785,31 @@
     )
   )
 
+  (symbol (lib_id "power:+3V0") (at 46.99 39.37 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid ac7fa3d6-7811-47bb-af72-90d0e34c29ad)
+    (property "Reference" "#PWR02" (at 46.99 43.18 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V0" (at 46.99 34.29 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 46.99 39.37 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 46.99 39.37 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid a2ad2aaf-489a-4c8d-bb5a-4d1c28e704c6))
+    (instances
+      (project "CommonSense"
+        (path "/38fbf0b5-ae68-401e-b1a9-e916ed01fc13"
+          (reference "#PWR02") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "Device:Crystal_GND23") (at 242.57 72.39 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid af526e3f-77cb-404a-91d8-e54cf992be68)
@@ -3842,6 +3998,31 @@
     )
   )
 
+  (symbol (lib_id "power:+3V0") (at 217.17 60.96 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid d657d8dc-0f22-4efa-b3ff-44494c205eb1)
+    (property "Reference" "#PWR020" (at 217.17 64.77 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V0" (at 217.17 55.88 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 217.17 60.96 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 217.17 60.96 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 5fe6d5fc-a3c5-450a-ae1f-3ac5ae4647de))
+    (instances
+      (project "CommonSense"
+        (path "/38fbf0b5-ae68-401e-b1a9-e916ed01fc13"
+          (reference "#PWR020") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "Device:C") (at 251.46 78.74 90) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid da2e6944-af5a-42f8-bf49-aae18bb6cbbb)
@@ -3987,6 +4168,31 @@
     )
   )
 
+  (symbol (lib_id "power:+BATT") (at 24.13 142.24 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid e094ccc3-a690-41ca-91f1-565ce1902990)
+    (property "Reference" "#PWR025" (at 24.13 146.05 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+BATT" (at 24.13 137.16 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 24.13 142.24 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 24.13 142.24 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 1fa3d7f5-7171-4825-93a6-2d0026d30f1f))
+    (instances
+      (project "CommonSense"
+        (path "/38fbf0b5-ae68-401e-b1a9-e916ed01fc13"
+          (reference "#PWR025") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "Device:Antenna") (at 270.51 96.52 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid e2d8e1a3-c8d6-4806-a137-543999a190e8)
@@ -4073,19 +4279,44 @@
     )
   )
 
-  (symbol (lib_id "Device:Battery_Cell") (at 34.29 48.26 0) (unit 1)
+  (symbol (lib_id "power:+BATT") (at 27.94 39.37 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid ec02c77c-52b1-4016-b229-314e7bb92ee9)
+    (uuid ebb96e06-21c1-4939-81b2-dfed3a049482)
-    (property "Reference" "BT1" (at 38.1 45.1485 0)
+    (property "Reference" "#PWR04" (at 27.94 43.18 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "Battery_Cell" (at 38.1 47.6885 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Battery:BatteryHolder_Keystone_3034_1x20mm" (at 34.29 46.736 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 34.29 46.736 90)
+    (property "Value" "+BATT" (at 27.94 34.29 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 27.94 39.37 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 27.94 39.37 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 933267b6-acaf-472b-a579-970268c84f0d))
+    (instances
+      (project "CommonSense"
+        (path "/38fbf0b5-ae68-401e-b1a9-e916ed01fc13"
+          (reference "#PWR04") (unit 1)
+        )
+      )
+    )
+  )
+
+  (symbol (lib_id "Device:Battery_Cell") (at 27.94 55.88 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid ec02c77c-52b1-4016-b229-314e7bb92ee9)
+    (property "Reference" "BT1" (at 29.21 57.15 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "Battery_Cell" (at 29.21 59.69 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Battery:BatteryHolder_Keystone_3034_1x20mm" (at 27.94 54.356 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (at 27.94 54.356 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid eadee52a-e8e3-44a5-a2d9-53a890b56d10))
@@ -4104,36 +4335,6 @@
     )
   )
 
-  (symbol (lib_id "power:+3V3") (at 158.75 139.7 0) (mirror y) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid f3b07eaa-f917-4076-962f-8065a003b0c7)
-    (property "Reference" "#PWR023" (at 158.75 143.51 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+3V3" (at 158.75 134.62 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "" (at 158.75 139.7 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (at 158.75 139.7 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 72e23063-2879-4c3e-b53a-09f7b0c9df25))
-    (instances
-      (project "CommonSense"
-        (path "/38fbf0b5-ae68-401e-b1a9-e916ed01fc13"
-          (reference "#PWR023") (unit 1)
-        )
-      )
-      (project "nodemcu_humidity_shield"
-        (path "/523ef776-806b-43b6-937c-22b5e6ba7731"
-          (reference "#PWR018") (unit 1)
-        )
-      )
-    )
-  )
-
   (symbol (lib_id "power:GND") (at 99.06 88.9 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid f4716fd7-aad3-410b-9591-3f638dc21030)