pcb: Solve external and PoE power supply

Now there are 6 locations for 3 zero Ohm resistors. Three places to
power by PoE and three to power externally. Never all of them should be
placed.

1 files changed, 5 insertions, 174 deletions

diff --git a/pcb/iot-contact.kicad_sch b/pcb/iot-contact.kicad_sch
index 5c6ee50..3c73c52 100644
--- a/pcb/iot-contact.kicad_sch
+++ b/pcb/iot-contact.kicad_sch
@@ -4983,17 +4983,6 @@
 			(embedded_fonts no)
 		)
 	)
-	(text "Never use PoE and external power supply together!\nSignificant hardware damage will be the result.\n\nThus two assembly options:\n\n- default: R21 and R20 placed, J3 not\n- development: J3 placed, R21 and R20 not"
-		(exclude_from_sim no)
-		(at 17.78 140.208 0)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left)
-		)
-		(uuid "56f4af8c-1572-4497-98f2-10a81ab55e1d")
-	)
 	(text "TODO: Reduce ESD / EMC by resistors?"
 		(exclude_from_sim no)
 		(at 137.414 15.494 0)
@@ -5184,16 +5173,6 @@
 	)
 	(wire
 		(pts
-			(xy 76.2 127) (xy 76.2 144.78)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "13558a93-0d72-490c-b2d4-76b158009154")
-	)
-	(wire
-		(pts
 			(xy 217.17 142.24) (xy 223.52 142.24)
 		)
 		(stroke
@@ -5564,7 +5543,7 @@
 	)
 	(wire
 		(pts
-			(xy 73.66 97.79) (xy 73.66 119.38)
+			(xy 73.66 97.79) (xy 73.66 147.32)
 		)
 		(stroke
 			(width 0)
@@ -5834,16 +5813,6 @@
 	)
 	(wire
 		(pts
-			(xy 73.66 127) (xy 73.66 147.32)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "971042ff-9153-429b-8aa9-301753acfb57")
-	)
-	(wire
-		(pts
 			(xy 63.5 97.79) (xy 73.66 97.79)
 		)
 		(stroke
@@ -6184,7 +6153,7 @@
 	)
 	(wire
 		(pts
-			(xy 76.2 95.25) (xy 76.2 119.38)
+			(xy 76.2 95.25) (xy 76.2 144.78)
 		)
 		(stroke
 			(width 0)
@@ -6603,75 +6572,6 @@
 	)
 	(symbol
 		(lib_id "Device:R")
-		(at 76.2 123.19 0)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(uuid "33b81749-5b08-4a33-813a-48d8303138bf")
-		(property "Reference" "R20"
-			(at 78.74 121.9199 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Value" "0R"
-			(at 78.74 124.4599 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Footprint" ""
-			(at 74.422 123.19 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 76.2 123.19 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Resistor"
-			(at 76.2 123.19 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "2"
-			(uuid "6b917709-1e4f-4012-8d2b-863a8dac0432")
-		)
-		(pin "1"
-			(uuid "6e218c01-b3c5-48ab-bb7e-7794e27e9fcd")
-		)
-		(instances
-			(project ""
-				(path "/5defd195-0277-4d04-9f5f-69e505c9845c"
-					(reference "R20")
-					(unit 1)
-				)
-			)
-		)
-	)
-	(symbol
-		(lib_id "Device:R")
 		(at 190.5 53.34 0)
 		(unit 1)
 		(exclude_from_sim no)
@@ -6980,75 +6880,6 @@
 		)
 	)
 	(symbol
-		(lib_id "Device:R")
-		(at 73.66 123.19 0)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(uuid "51e5f4c2-5260-4700-98e9-b5127bdcc34a")
-		(property "Reference" "R21"
-			(at 71.12 121.9199 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify right)
-			)
-		)
-		(property "Value" "0R"
-			(at 71.12 124.4599 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify right)
-			)
-		)
-		(property "Footprint" ""
-			(at 71.882 123.19 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 73.66 123.19 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Resistor"
-			(at 73.66 123.19 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "2"
-			(uuid "e471e29f-3547-4764-b50e-f8ea849b95a3")
-		)
-		(pin "1"
-			(uuid "dc812fef-0bdc-4108-abc8-3eaa91644a66")
-		)
-		(instances
-			(project ""
-				(path "/5defd195-0277-4d04-9f5f-69e505c9845c"
-					(reference "R21")
-					(unit 1)
-				)
-			)
-		)
-	)
-	(symbol
 		(lib_id "74xGxx:74AHC1G04")
 		(at 204.47 142.24 0)
 		(unit 1)
@@ -7651,7 +7482,7 @@
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
-		(dnp yes)
+		(dnp no)
 		(uuid "82545faa-f3c8-4796-a053-beafee983540")
 		(property "Reference" "J3"
 			(at 71.12 151.13 0)
@@ -7687,8 +7518,8 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "Non-PoE 5V power input"
-			(at 52.324 157.48 0)
+		(property "Description" "Non-PoE power input"
+			(at 71.374 163.068 0)
 			(effects
 				(font
 					(size 1.27 1.27)