Merge branch 'main' of https://github.com/ableTI/robotica

1 files changed, 474 insertions, 289 deletions

diff --git a/PCB/aparte_pcb/onder/onder.kicad_sch b/PCB/aparte_pcb/onder/onder.kicad_sch
index 6ea482b..e804e34 100644
--- a/PCB/aparte_pcb/onder/onder.kicad_sch
+++ b/PCB/aparte_pcb/onder/onder.kicad_sch
@@ -10,22 +10,22 @@
 		(company "Mendelcollege")
 	)
 	(lib_symbols
-		(symbol "Connector:Conn_01x13_Socket"
+		(symbol "Connector:Conn_01x04_Socket"
 			(pin_names
 				(offset 1.016) hide)
 			(exclude_from_sim no)
 			(in_bom yes)
 			(on_board yes)
 			(property "Reference" "J"
-				(at 0 17.78 0)
+				(at 0 5.08 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
 				)
 			)
-			(property "Value" "Conn_01x13_Socket"
-				(at 0 -17.78 0)
+			(property "Value" "Conn_01x04_Socket"
+				(at 0 -7.62 0)
 				(effects
 					(font
 						(size 1.27 1.27)
@@ -50,7 +50,7 @@
 					(hide yes)
 				)
 			)
-			(property "Description" "Generic connector, single row, 01x13, script generated"
+			(property "Description" "Generic connector, single row, 01x04, script generated"
 				(at 0 0 0)
 				(effects
 					(font
@@ -85,11 +85,11 @@
 					(hide yes)
 				)
 			)
-			(symbol "Conn_01x13_Socket_1_1"
+			(symbol "Conn_01x04_Socket_1_1"
 				(arc
-					(start 0 -14.732)
-					(mid -0.5058 -15.24)
-					(end 0 -15.748)
+					(start 0 -4.572)
+					(mid -0.5058 -5.08)
+					(end 0 -5.588)
 					(stroke
 						(width 0.1524)
 						(type default)
@@ -99,9 +99,9 @@
 					)
 				)
 				(arc
-					(start 0 -12.192)
-					(mid -0.5058 -12.7)
-					(end 0 -13.208)
+					(start 0 -2.032)
+					(mid -0.5058 -2.54)
+					(end 0 -3.048)
 					(stroke
 						(width 0.1524)
 						(type default)
@@ -110,10 +110,10 @@
 						(type none)
 					)
 				)
-				(arc
-					(start 0 -9.652)
-					(mid -0.5058 -10.16)
-					(end 0 -10.668)
+				(polyline
+					(pts
+						(xy -1.27 -5.08) (xy -0.508 -5.08)
+					)
 					(stroke
 						(width 0.1524)
 						(type default)
@@ -122,10 +122,34 @@
 						(type none)
 					)
 				)
-				(arc
-					(start 0 -7.112)
-					(mid -0.5058 -7.62)
-					(end 0 -8.128)
+				(polyline
+					(pts
+						(xy -1.27 -2.54) (xy -0.508 -2.54)
+					)
+					(stroke
+						(width 0.1524)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy -1.27 0) (xy -0.508 0)
+					)
+					(stroke
+						(width 0.1524)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy -1.27 2.54) (xy -0.508 2.54)
+					)
 					(stroke
 						(width 0.1524)
 						(type default)
@@ -135,9 +159,9 @@
 					)
 				)
 				(arc
-					(start 0 -4.572)
-					(mid -0.5058 -5.08)
-					(end 0 -5.588)
+					(start 0 0.508)
+					(mid -0.5058 0)
+					(end 0 -0.508)
 					(stroke
 						(width 0.1524)
 						(type default)
@@ -147,9 +171,9 @@
 					)
 				)
 				(arc
-					(start 0 -2.032)
-					(mid -0.5058 -2.54)
-					(end 0 -3.048)
+					(start 0 3.048)
+					(mid -0.5058 2.54)
+					(end 0 2.032)
 					(stroke
 						(width 0.1524)
 						(type default)
@@ -158,10 +182,160 @@
 						(type none)
 					)
 				)
-				(polyline
-					(pts
-						(xy -1.27 -15.24) (xy -0.508 -15.24)
+				(pin passive line
+					(at -5.08 2.54 0)
+					(length 3.81)
+					(name "Pin_1"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "1"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at -5.08 0 0)
+					(length 3.81)
+					(name "Pin_2"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "2"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at -5.08 -2.54 0)
+					(length 3.81)
+					(name "Pin_3"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "3"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at -5.08 -5.08 0)
+					(length 3.81)
+					(name "Pin_4"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "4"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+			)
+		)
+		(symbol "Connector:Conn_01x10_Socket"
+			(pin_names
+				(offset 1.016) hide)
+			(exclude_from_sim no)
+			(in_bom yes)
+			(on_board yes)
+			(property "Reference" "J"
+				(at 0 12.7 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "Value" "Conn_01x10_Socket"
+				(at 0 -15.24 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "Footprint" ""
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Datasheet" "~"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Description" "Generic connector, single row, 01x10, script generated"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
 					)
+					(hide yes)
+				)
+			)
+			(property "ki_locked" ""
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "ki_keywords" "connector"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "ki_fp_filters" "Connector*:*_1x??_*"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(symbol "Conn_01x10_Socket_1_1"
+				(arc
+					(start 0 -12.192)
+					(mid -0.5058 -12.7)
+					(end 0 -13.208)
 					(stroke
 						(width 0.1524)
 						(type default)
@@ -170,10 +344,22 @@
 						(type none)
 					)
 				)
-				(polyline
-					(pts
-						(xy -1.27 -12.7) (xy -0.508 -12.7)
+				(arc
+					(start 0 -9.652)
+					(mid -0.5058 -10.16)
+					(end 0 -10.668)
+					(stroke
+						(width 0.1524)
+						(type default)
+					)
+					(fill
+						(type none)
 					)
+				)
+				(arc
+					(start 0 -7.112)
+					(mid -0.5058 -7.62)
+					(end 0 -8.128)
 					(stroke
 						(width 0.1524)
 						(type default)
@@ -182,10 +368,22 @@
 						(type none)
 					)
 				)
-				(polyline
-					(pts
-						(xy -1.27 -10.16) (xy -0.508 -10.16)
+				(arc
+					(start 0 -4.572)
+					(mid -0.5058 -5.08)
+					(end 0 -5.588)
+					(stroke
+						(width 0.1524)
+						(type default)
+					)
+					(fill
+						(type none)
 					)
+				)
+				(arc
+					(start 0 -2.032)
+					(mid -0.5058 -2.54)
+					(end 0 -3.048)
 					(stroke
 						(width 0.1524)
 						(type default)
@@ -196,7 +394,7 @@
 				)
 				(polyline
 					(pts
-						(xy -1.27 -7.62) (xy -0.508 -7.62)
+						(xy -1.27 -12.7) (xy -0.508 -12.7)
 					)
 					(stroke
 						(width 0.1524)
@@ -208,7 +406,7 @@
 				)
 				(polyline
 					(pts
-						(xy -1.27 -5.08) (xy -0.508 -5.08)
+						(xy -1.27 -10.16) (xy -0.508 -10.16)
 					)
 					(stroke
 						(width 0.1524)
@@ -220,7 +418,7 @@
 				)
 				(polyline
 					(pts
-						(xy -1.27 -2.54) (xy -0.508 -2.54)
+						(xy -1.27 -7.62) (xy -0.508 -7.62)
 					)
 					(stroke
 						(width 0.1524)
@@ -232,7 +430,7 @@
 				)
 				(polyline
 					(pts
-						(xy -1.27 0) (xy -0.508 0)
+						(xy -1.27 -5.08) (xy -0.508 -5.08)
 					)
 					(stroke
 						(width 0.1524)
@@ -244,7 +442,7 @@
 				)
 				(polyline
 					(pts
-						(xy -1.27 2.54) (xy -0.508 2.54)
+						(xy -1.27 -2.54) (xy -0.508 -2.54)
 					)
 					(stroke
 						(width 0.1524)
@@ -256,7 +454,7 @@
 				)
 				(polyline
 					(pts
-						(xy -1.27 5.08) (xy -0.508 5.08)
+						(xy -1.27 0) (xy -0.508 0)
 					)
 					(stroke
 						(width 0.1524)
@@ -268,7 +466,7 @@
 				)
 				(polyline
 					(pts
-						(xy -1.27 7.62) (xy -0.508 7.62)
+						(xy -1.27 2.54) (xy -0.508 2.54)
 					)
 					(stroke
 						(width 0.1524)
@@ -280,7 +478,7 @@
 				)
 				(polyline
 					(pts
-						(xy -1.27 10.16) (xy -0.508 10.16)
+						(xy -1.27 5.08) (xy -0.508 5.08)
 					)
 					(stroke
 						(width 0.1524)
@@ -292,7 +490,7 @@
 				)
 				(polyline
 					(pts
-						(xy -1.27 12.7) (xy -0.508 12.7)
+						(xy -1.27 7.62) (xy -0.508 7.62)
 					)
 					(stroke
 						(width 0.1524)
@@ -304,7 +502,7 @@
 				)
 				(polyline
 					(pts
-						(xy -1.27 15.24) (xy -0.508 15.24)
+						(xy -1.27 10.16) (xy -0.508 10.16)
 					)
 					(stroke
 						(width 0.1524)
@@ -374,32 +572,8 @@
 						(type none)
 					)
 				)
-				(arc
-					(start 0 13.208)
-					(mid -0.5058 12.7)
-					(end 0 12.192)
-					(stroke
-						(width 0.1524)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(arc
-					(start 0 15.748)
-					(mid -0.5058 15.24)
-					(end 0 14.732)
-					(stroke
-						(width 0.1524)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
 				(pin passive line
-					(at -5.08 15.24 0)
+					(at -5.08 10.16 0)
 					(length 3.81)
 					(name "Pin_1"
 						(effects
@@ -417,7 +591,7 @@
 					)
 				)
 				(pin passive line
-					(at -5.08 -7.62 0)
+					(at -5.08 -12.7 0)
 					(length 3.81)
 					(name "Pin_10"
 						(effects
@@ -435,61 +609,7 @@
 					)
 				)
 				(pin passive line
-					(at -5.08 -10.16 0)
-					(length 3.81)
-					(name "Pin_11"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "11"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-				(pin passive line
-					(at -5.08 -12.7 0)
-					(length 3.81)
-					(name "Pin_12"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "12"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-				(pin passive line
-					(at -5.08 -15.24 0)
-					(length 3.81)
-					(name "Pin_13"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "13"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-				(pin passive line
-					(at -5.08 12.7 0)
+					(at -5.08 7.62 0)
 					(length 3.81)
 					(name "Pin_2"
 						(effects
@@ -507,7 +627,7 @@
 					)
 				)
 				(pin passive line
-					(at -5.08 10.16 0)
+					(at -5.08 5.08 0)
 					(length 3.81)
 					(name "Pin_3"
 						(effects
@@ -525,7 +645,7 @@
 					)
 				)
 				(pin passive line
-					(at -5.08 7.62 0)
+					(at -5.08 2.54 0)
 					(length 3.81)
 					(name "Pin_4"
 						(effects
@@ -543,7 +663,7 @@
 					)
 				)
 				(pin passive line
-					(at -5.08 5.08 0)
+					(at -5.08 0 0)
 					(length 3.81)
 					(name "Pin_5"
 						(effects
@@ -561,7 +681,7 @@
 					)
 				)
 				(pin passive line
-					(at -5.08 2.54 0)
+					(at -5.08 -2.54 0)
 					(length 3.81)
 					(name "Pin_6"
 						(effects
@@ -579,7 +699,7 @@
 					)
 				)
 				(pin passive line
-					(at -5.08 0 0)
+					(at -5.08 -5.08 0)
 					(length 3.81)
 					(name "Pin_7"
 						(effects
@@ -597,7 +717,7 @@
 					)
 				)
 				(pin passive line
-					(at -5.08 -2.54 0)
+					(at -5.08 -7.62 0)
 					(length 3.81)
 					(name "Pin_8"
 						(effects
@@ -615,7 +735,7 @@
 					)
 				)
 				(pin passive line
-					(at -5.08 -5.08 0)
+					(at -5.08 -10.16 0)
 					(length 3.81)
 					(name "Pin_9"
 						(effects
@@ -1947,16 +2067,16 @@
 		(uuid "022ec7fe-b303-4159-afc7-02b2fdbdbcb1")
 	)
 	(junction
-		(at 125.73 60.96)
+		(at 212.09 121.92)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "0343fe66-e01d-4526-81a5-9d960feb7875")
+		(uuid "0256d30e-8287-4035-96ef-d53a206dcdb7")
 	)
 	(junction
-		(at 196.85 121.92)
+		(at 125.73 60.96)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "048a7a11-c7a8-4704-ac87-e36060f6c6f7")
+		(uuid "0343fe66-e01d-4526-81a5-9d960feb7875")
 	)
 	(junction
 		(at 101.6 82.55)
@@ -2031,12 +2151,6 @@
 		(uuid "1cabcdf5-8cb3-4cbf-981f-a996c09bca49")
 	)
 	(junction
-		(at 212.09 121.92)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "1fd7f192-db3a-4548-ae37-a1bc25f5ec83")
-	)
-	(junction
 		(at 58.42 81.28)
 		(diameter 0)
 		(color 0 0 0 0)
@@ -2361,6 +2475,12 @@
 		(uuid "b7cda1d8-6979-4240-9ca9-c9aa35aded56")
 	)
 	(junction
+		(at 196.85 121.92)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "b84a1168-f185-42ee-ba18-85b6e8112001")
+	)
+	(junction
 		(at 63.5 82.55)
 		(diameter 0)
 		(color 0 0 0 0)
@@ -2706,16 +2826,6 @@
 	)
 	(wire
 		(pts
-			(xy 212.09 121.92) (xy 247.65 121.92)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "1937bf3f-67e1-4456-93f3-6e8b4268acc3")
-	)
-	(wire
-		(pts
 			(xy 110.49 129.54) (xy 266.7 129.54)
 		)
 		(stroke
@@ -3146,6 +3256,16 @@
 	)
 	(wire
 		(pts
+			(xy 196.85 121.92) (xy 212.09 121.92)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "4efc6796-2f11-4b55-94fd-80096b46494d")
+	)
+	(wire
+		(pts
 			(xy 63.5 82.55) (xy 44.45 82.55)
 		)
 		(stroke
@@ -3856,6 +3976,16 @@
 	)
 	(wire
 		(pts
+			(xy 212.09 121.92) (xy 247.65 121.92)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "a91a22d2-43eb-4747-9793-e4a2a5395798")
+	)
+	(wire
+		(pts
 			(xy 55.88 121.92) (xy 71.12 121.92)
 		)
 		(stroke
@@ -3926,16 +4056,6 @@
 	)
 	(wire
 		(pts
-			(xy 212.09 109.22) (xy 212.09 121.92)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "b26c6cb2-e7d4-497a-8bd6-e7f84834b33e")
-	)
-	(wire
-		(pts
 			(xy 158.75 82.55) (xy 139.7 82.55)
 		)
 		(stroke
@@ -4036,16 +4156,6 @@
 	)
 	(wire
 		(pts
-			(xy 196.85 121.92) (xy 212.09 121.92)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "bd1fc571-9ee4-4822-b169-45013dc5a3f8")
-	)
-	(wire
-		(pts
 			(xy 269.24 50.8) (xy 278.13 50.8)
 		)
 		(stroke
@@ -4356,6 +4466,16 @@
 	)
 	(wire
 		(pts
+			(xy 212.09 109.22) (xy 212.09 121.92)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "e1017f93-e5fe-4b1f-88a2-8e51429a34bf")
+	)
+	(wire
+		(pts
 			(xy 260.35 33.02) (xy 260.35 86.36)
 		)
 		(stroke
@@ -5096,7 +5216,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "Library:FOTORES"
+		(property "Footprint" "Library:FOTORESist"
 			(at 44.45 108.585 90)
 			(effects
 				(font
@@ -5454,7 +5574,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "Library:FOTORES"
+		(property "Footprint" "Library:FOTORESist"
 			(at 120.65 108.585 90)
 			(effects
 				(font
@@ -6330,7 +6450,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "Library:FOTORES"
+		(property "Footprint" "Library:FOTORESist"
 			(at 106.68 108.585 90)
 			(effects
 				(font
@@ -6400,7 +6520,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "Library:FOTORES"
+		(property "Footprint" "Library:FOTORESist"
 			(at 137.16 108.585 90)
 			(effects
 				(font
@@ -6661,6 +6781,100 @@
 		)
 	)
 	(symbol
+		(lib_id "Connector:Conn_01x10_Socket")
+		(at 283.21 38.1 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "5fe49ee3-c428-4045-bad5-fded1ebac212")
+		(property "Reference" "J2"
+			(at 284.48 38.0999 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Value" "Conn_01x10_Socket"
+			(at 284.48 40.6399 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Footprint" "Connector_JST:JST_EH_S10B-EH_1x10_P2.50mm_Horizontal"
+			(at 283.21 38.1 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 283.21 38.1 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Generic connector, single row, 01x10, script generated"
+			(at 283.21 38.1 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "10"
+			(uuid "2500de06-c3e6-470a-af1d-f4fe02d2cd0b")
+		)
+		(pin "9"
+			(uuid "c4fda4e4-9627-4e53-a10f-3cd1bffc8606")
+		)
+		(pin "6"
+			(uuid "af385b40-4a75-4f96-9cb3-edcb62d480be")
+		)
+		(pin "3"
+			(uuid "57f16631-6029-4c47-ae71-b38d07a88d39")
+		)
+		(pin "7"
+			(uuid "5fc69b64-d51f-4f73-948d-c6339f4cfe17")
+		)
+		(pin "2"
+			(uuid "8a5839f4-8de4-4837-a234-0cbb41bab7ab")
+		)
+		(pin "4"
+			(uuid "3fcda6d8-66f2-4a49-8ff4-db1dfdc0808a")
+		)
+		(pin "8"
+			(uuid "7c70eff7-9ae2-46ce-a923-fddbc5a9bae4")
+		)
+		(pin "5"
+			(uuid "2fb0c0a0-9651-40e4-a12c-5dc2a2b2892d")
+		)
+		(pin "1"
+			(uuid "31cc735b-e250-4836-9585-70a333227b0a")
+		)
+		(instances
+			(project ""
+				(path "/ad4887b8-c911-42f3-ba06-5ec84621d2a6"
+					(reference "J2")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
 		(lib_id "Library:R_US")
 		(at 20.32 74.93 0)
 		(unit 1)
@@ -7262,7 +7476,7 @@
 				)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Library:NPN"
 			(at 177.8 170.18 0)
 			(effects
 				(font
@@ -7403,6 +7617,82 @@
 		)
 	)
 	(symbol
+		(lib_id "Connector:Conn_01x04_Socket")
+		(at 283.21 55.88 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "82ca7ae0-f7b1-45b1-86b7-6b5952ed11cf")
+		(property "Reference" "J1"
+			(at 284.48 55.8799 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Value" "Conn_01x04_Socket"
+			(at 284.48 58.4199 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Footprint" "Connector_JST:JST_EH_S4B-EH_1x04_P2.50mm_Horizontal"
+			(at 283.21 55.88 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 283.21 55.88 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Generic connector, single row, 01x04, script generated"
+			(at 283.21 55.88 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "f3eba8de-7e57-473f-a0bc-1073b9dc6bf7")
+		)
+		(pin "2"
+			(uuid "a01098d0-b432-4e7f-a3be-e3a9d3543eb9")
+		)
+		(pin "3"
+			(uuid "b085455c-d06b-4eef-a86f-c32543e0141c")
+		)
+		(pin "4"
+			(uuid "87170c79-30de-42c8-822f-48fb5240b26e")
+		)
+		(instances
+			(project ""
+				(path "/ad4887b8-c911-42f3-ba06-5ec84621d2a6"
+					(reference "J1")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
 		(lib_id "Library:A1050")
 		(at 91.44 113.03 90)
 		(unit 1)
@@ -7430,7 +7720,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "Library:FOTORES"
+		(property "Footprint" "Library:FOTORESist"
 			(at 91.44 108.585 90)
 			(effects
 				(font
@@ -7716,7 +8006,7 @@
 				)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Library:NPN"
 			(at 207.01 170.18 0)
 			(effects
 				(font
@@ -8038,7 +8328,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "Library:FOTORES"
+		(property "Footprint" "Library:FOTORESist"
 			(at 59.69 108.585 90)
 			(effects
 				(font
@@ -9088,7 +9378,7 @@
 				)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Library:NPN"
 			(at 191.77 170.18 0)
 			(effects
 				(font
@@ -9297,111 +9587,6 @@
 		)
 	)
 	(symbol
-		(lib_id "Connector:Conn_01x13_Socket")
-		(at 283.21 43.18 0)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "e14741e8-539f-48b1-ad97-671b174b4d89")
-		(property "Reference" "J1"
-			(at 284.48 41.9099 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-				(hide yes)
-			)
-		)
-		(property "Value" "Conn_01x13_Socket"
-			(at 284.48 44.4499 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-				(hide yes)
-			)
-		)
-		(property "Footprint" ""
-			(at 283.21 43.18 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 283.21 43.18 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Generic connector, single row, 01x13, script generated"
-			(at 283.21 43.18 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "9"
-			(uuid "7be3672a-d12a-4335-bdff-4310b430ccf8")
-		)
-		(pin "7"
-			(uuid "a541f1df-094c-4af4-ab7e-841920f9d43a")
-		)
-		(pin "8"
-			(uuid "4d3dd38f-e69d-4382-98ff-0d4b2040dec1")
-		)
-		(pin "11"
-			(uuid "5a4d07cd-a6dc-485d-a95a-2a86bd75cad9")
-		)
-		(pin "3"
-			(uuid "affa6f2c-0bf4-454c-936e-96210e170528")
-		)
-		(pin "2"
-			(uuid "225dbc04-8898-410e-814b-57cc462a832e")
-		)
-		(pin "4"
-			(uuid "cd401e4c-ab7b-437f-a433-a31b7c0b97b4")
-		)
-		(pin "5"
-			(uuid "62b8c792-a2f8-4e3b-a3ec-deb508957e0a")
-		)
-		(pin "13"
-			(uuid "be54f923-5f88-417a-83ac-63604702c150")
-		)
-		(pin "6"
-			(uuid "3517811a-ddde-404f-8bd5-e27dd09e98a7")
-		)
-		(pin "1"
-			(uuid "3dd72ef1-8117-4063-ad27-dd6293516b04")
-		)
-		(pin "10"
-			(uuid "249f5253-12a9-48eb-bfbe-9e5626d996ab")
-		)
-		(pin "12"
-			(uuid "61f29e9f-af01-4750-b5c1-3975f48cfc0a")
-		)
-		(instances
-			(project ""
-				(path "/ad4887b8-c911-42f3-ba06-5ec84621d2a6"
-					(reference "J1")
-					(unit 1)
-				)
-			)
-		)
-	)
-	(symbol
 		(lib_id "Library:R_US")
 		(at 120.65 74.93 0)
 		(unit 1)
@@ -9565,7 +9750,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "Library:FOTORES"
+		(property "Footprint" "Library:FOTORESist"
 			(at 27.94 108.585 90)
 			(effects
 				(font
@@ -9717,7 +9902,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "Library:FOTORES"
+		(property "Footprint" "Library:FOTORESist"
 			(at 74.93 108.585 90)
 			(effects
 				(font