latest design

.gitignore

@@ -1,3 +1,5 @@
 *-backups/
 *_old
 jlcpcb/
+.DS_Store
+**/*.bak

Maerklin System Control.kicad_pcb

@@ -389,8 +389,8 @@
 			)
 		)
 		(property "Value" "UP"
-			(at 3.75 6.7 0)
+			(at 3.20055 6.99085 0)
-			(layer "F.Fab")
+			(layer "F.SilkS")
 			(uuid "b7101e9d-bf33-4a0f-928a-e2adcb8706cd")
 			(effects
 				(font
@@ -761,8 +761,8 @@
 			)
 		)
 		(property "Value" "LEFT"
-			(at 3.75 6.7 0)
+			(at 2.997645 7.06885 0)
-			(layer "F.Fab")
+			(layer "F.SilkS")
 			(uuid "8feb40ce-0ca5-4b84-9880-38254b7bb472")
 			(effects
 				(font
@@ -1346,8 +1346,8 @@
 			)
 		)
 		(property "Value" "RIGHT"
-			(at 3.75 6.7 0)
+			(at 3.39855 7.06885 0)
-			(layer "F.Fab")
+			(layer "F.SilkS")
 			(uuid "289a351c-cdb2-404a-b5ba-2a4359eb8f7a")
 			(effects
 				(font
@@ -1718,8 +1718,8 @@
 			)
 		)
 		(property "Value" "DOWN"
-			(at 3.75 6.7 0)
+			(at 3.20055 7.18685 0)
-			(layer "F.Fab")
+			(layer "F.SilkS")
 			(uuid "c8a501c5-822e-406d-8eff-ac3182576513")
 			(effects
 				(font
@@ -2090,8 +2090,8 @@
 			)
 		)
 		(property "Value" "BACK"
-			(at 3.75 6.7 0)
+			(at 3.41055 7.06885 0)
-			(layer "F.Fab")
+			(layer "F.SilkS")
 			(uuid "cabde035-6b76-453a-af0f-36ff118cf43e")
 			(effects
 				(font
@@ -2888,8 +2888,8 @@
 			)
 		)
 		(property "Value" "SELECT"
-			(at 3.75 6.7 0)
+			(at 3.40455 6.94085 0)
-			(layer "F.Fab")
+			(layer "F.SilkS")
 			(uuid "21faa429-2266-4b85-a40d-fb007b356b56")
 			(effects
 				(font
@@ -6167,28 +6167,20 @@
 		)
 	)
 	(segment
-		(start 87.75675 59.45175)
+		(start 107.86145 57.75315)
-		(end 99.11965 59.45175)
+		(end 109.13145 56.48315)
 		(width 0.2)
 		(layer "F.Cu")
 		(net 1)
-		(uuid "12122271-3b1a-49fe-80ce-947467a4fc9b")
+		(uuid "5d7b541b-e89c-4759-8b37-f0bffdb9c34e")
-	)
-	(segment
-		(start 109.13145 56.48315)
-		(end 107.97975 56.48315)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 1)
-		(uuid "242bc1dc-1976-4bca-996b-9e922c544231")
 	)
 	(segment
 		(start 100.81825 57.75315)
-		(end 106.97825 57.75315)
+		(end 107.86145 57.75315)
 		(width 0.2)
 		(layer "F.Cu")
 		(net 1)
-		(uuid "4a139838-842f-4bd0-97cb-11180ed38a44")
+		(uuid "606d13c0-762f-4ed7-be03-f9bababc9f44")
 	)
 	(segment
 		(start 99.11965 59.45175)
@@ -6196,23 +6188,15 @@
 		(width 0.2)
 		(layer "F.Cu")
 		(net 1)
-		(uuid "8a3f7b4d-4a95-4500-b4ab-55c256b7a3a8")
+		(uuid "65f36579-181f-48b2-8ca2-0683be0525a2")
 	)
 	(segment
-		(start 107.97975 56.75165)
+		(start 87.75675 59.45175)
-		(end 107.97975 56.48315)
+		(end 99.11965 59.45175)
 		(width 0.2)
 		(layer "F.Cu")
 		(net 1)
-		(uuid "b7df98fc-dda9-4ccd-a989-afe854ea9ec3")
+		(uuid "9a4dda02-f766-40c1-af0d-7f77b7ac6fd5")
-	)
-	(segment
-		(start 106.97825 57.75315)
-		(end 107.97975 56.75165)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 1)
-		(uuid "c9bd05ee-5cef-4d37-9e57-ee6fe78e1be9")
 	)
 	(via
 		(at 87.75675 59.45175)
@@ -6239,28 +6223,28 @@
 		(uuid "ebf6ab0f-bc38-4005-9e9b-6b4d99bf4f84")
 	)
 	(segment
-		(start 93.82145 90.65115)
+		(start 103.24485 40.15515)
-		(end 95.69245 88.78015)
+		(end 78.38945 40.15515)
 		(width 0.5)
 		(layer "F.Cu")
 		(net 2)
-		(uuid "971626af-1a4c-4ab5-bf91-ecacf15b91cf")
+		(uuid "11dad0de-ec1a-4bc5-a3e3-bb5a43e9bbd6")
 	)
 	(segment
-		(start 95.69245 88.78015)
+		(start 78.38945 40.15515)
-		(end 122.76545 88.78015)
+		(end 78.5146 40.03)
 		(width 0.5)
 		(layer "F.Cu")
 		(net 2)
-		(uuid "ef944a21-5a9b-4f2f-a4b2-0440484bbe5b")
+		(uuid "65a123d2-0268-4648-9ddf-04349d5e9026")
 	)
-	(segment
+	(via
-		(start 122.76545 88.78015)
+		(at 103.24485 40.15515)
-		(end 124.51545 90.53015)
+		(size 0.6)
-		(width 0.5)
+		(drill 0.3)
-		(layer "F.Cu")
+		(layers "F.Cu" "B.Cu")
 		(net 2)
-		(uuid "f56775e7-5f66-4bf2-9865-9ef2c008e70f")
+		(uuid "bdddd05e-5a95-4c96-8064-934c88a8eed7")
 	)
 	(segment
 		(start 124.51545 90.53015)
@@ -6270,22 +6254,6 @@
 		(net 2)
 		(uuid "360ca824-90de-4071-8337-0f10452701a2")
 	)
-	(segment
-		(start 93.82145 88.89945)
-		(end 93.82145 90.65115)
-		(width 0.5)
-		(layer "B.Cu")
-		(net 2)
-		(uuid "3732b2af-c5bb-47eb-9ebf-7122c9de406c")
-	)
-	(segment
-		(start 88.88945 83.96745)
-		(end 93.82145 88.89945)
-		(width 0.5)
-		(layer "B.Cu")
-		(net 2)
-		(uuid "3e81b84d-0ba9-49c4-9dea-32580c0cfc8d")
-	)
 	(segment
 		(start 124.51545 59.16715)
 		(end 121.83145 56.48315)
@@ -6295,36 +6263,44 @@
 		(uuid "53b73008-8a10-4b2d-9206-c2947738da60")
 	)
 	(segment
-		(start 78.38945 40.15515)
+		(start 105.50345 40.15515)
-		(end 78.38945 41.45685)
+		(end 121.83145 56.48315)
 		(width 0.5)
 		(layer "B.Cu")
 		(net 2)
-		(uuid "9497d9c2-c9ab-413d-9ca3-c0d3a04b84d3")
+		(uuid "6f4349ba-fcee-49af-ab2d-20702af7cdd0")
 	)
 	(segment
-		(start 78.38945 41.45685)
+		(start 103.24485 40.15515)
-		(end 88.88945 51.95685)
+		(end 105.50345 40.15515)
 		(width 0.5)
 		(layer "B.Cu")
 		(net 2)
-		(uuid "cda8b5dc-bb6c-4359-a123-0bf55760489c")
+		(uuid "7cf8a59f-a20c-449a-8f25-85bbef596c26")
 	)
 	(segment
-		(start 88.88945 51.95685)
+		(start 93.82145 88.89945)
-		(end 88.88945 83.96745)
+		(end 93.82145 90.65115)
 		(width 0.5)
 		(layer "B.Cu")
 		(net 2)
-		(uuid "ea9f85c4-7d4b-478f-956e-665200c8b6c4")
+		(uuid "a6dbb098-001f-42e0-8829-7d2688a14fa1")
 	)
 	(segment
 		(start 98.20635 41.40735)
-		(end 75.44525 41.40735)
+		(end 72.02165 41.40735)
 		(width 0.2)
 		(layer "F.Cu")
 		(net 4)
-		(uuid "1b7116ce-28a2-4a46-a6aa-7e4a6beecb94")
+		(uuid "4f17674d-222f-42b1-8aae-b46728d436ef")
+	)
+	(segment
+		(start 72.02165 41.40735)
+		(end 70.76945 40.15515)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 4)
+		(uuid "53946fd0-7a43-4d86-a303-d5c5397805fd")
 	)
 	(segment
 		(start 100.06855 43.26955)
@@ -6332,63 +6308,7 @@
 		(width 0.2)
 		(layer "F.Cu")
 		(net 4)
-		(uuid "1f785da0-b369-4a63-9ac1-c1944aaee5e8")
+		(uuid "bd93b75f-818c-4f6d-be5a-0b992ec2c31e")
-	)
-	(segment
-		(start 74.46115 40.42325)
-		(end 74.46115 39.67805)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 4)
-		(uuid "3096ea87-8cf3-4432-b0b0-f55924846c97")
-	)
-	(segment
-		(start 73.78655 39.00345)
-		(end 72.83235 39.00345)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 4)
-		(uuid "5b4f9f7b-ef8a-4b96-a4b8-e018ccc1b6a8")
-	)
-	(segment
-		(start 71.92115 39.91465)
-		(end 71.92115 40.15515)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 4)
-		(uuid "717b790e-33ed-481e-91c0-a785d77d9ac5")
-	)
-	(segment
-		(start 70.76945 40.15515)
-		(end 71.92115 40.15515)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 4)
-		(uuid "8e6e72e6-623a-4e71-bc03-9e18344a30fc")
-	)
-	(segment
-		(start 72.83235 39.00345)
-		(end 71.92115 39.91465)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 4)
-		(uuid "a89c0b7a-a898-4e10-911e-1a5a2f64c2fc")
-	)
-	(segment
-		(start 75.44525 41.40735)
-		(end 74.46115 40.42325)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 4)
-		(uuid "c9dce873-7ca4-4e3d-9490-124bedbd1e31")
-	)
-	(segment
-		(start 74.46115 39.67805)
-		(end 73.78655 39.00345)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 4)
-		(uuid "df8b839e-7ca9-4a35-b7d5-ba1f06b63f1d")
 	)
 	(via
 		(at 100.06855 43.26955)
@@ -6422,112 +6342,48 @@
 		(net 4)
 		(uuid "c952fd6c-250f-4c2a-8db7-9f569594f016")
 	)
-	(segment
-		(start 121.54795 34.75485)
-		(end 121.81645 34.75485)
-		(width 0.2)
-		(layer "B.Cu")
-		(net 5)
-		(uuid "2f349492-47a7-4100-9c71-7e205cd202e5")
-	)
-	(segment
-		(start 123.03165 64.68895)
-		(end 123.03165 58.52905)
-		(width 0.2)
-		(layer "B.Cu")
-		(net 5)
-		(uuid "3fe8e75b-30e6-452c-a4bb-12ba2a4a0844")
-	)
-	(segment
-		(start 122.25575 57.75315)
-		(end 121.43465 57.75315)
-		(width 0.2)
-		(layer "B.Cu")
-		(net 5)
-		(uuid "48f01d20-c07f-4293-84f3-a206d64a2906")
-	)
 	(segment
 		(start 119.51545 90.53015)
-		(end 119.51545 68.20515)
+		(end 125.87 84.1756)
 		(width 0.2)
-		(layer "B.Cu")
+		(layer "F.Cu")
 		(net 5)
-		(uuid "535c0609-b527-44bd-a494-2e8096b349b2")
+		(uuid "c458fc17-a069-463c-93d0-0be9e06796f1")
 	)
 	(segment
-		(start 123.03165 58.52905)
+		(start 125.87 84.1756)
-		(end 122.25575 57.75315)
+		(end 125.87 37.6567)
 		(width 0.2)
-		(layer "B.Cu")
+		(layer "F.Cu")
 		(net 5)
-		(uuid "9b59782f-e34f-49aa-94c1-bb8eccface60")
+		(uuid "db972ab6-1133-40d6-9dc9-d4669f77854d")
 	)
 	(segment
-		(start 120.65745 35.64535)
+		(start 125.87 37.6567)
-		(end 121.54795 34.75485)
+		(end 121.81645 33.60315)
 		(width 0.2)
-		(layer "B.Cu")
+		(layer "F.Cu")
 		(net 5)
-		(uuid "a4330c02-5d87-4631-9f5b-770380bd99be")
+		(uuid "f61401ad-0f11-42a6-ab82-c9a7596d2c43")
 	)
 	(segment
-		(start 120.65745 56.97595)
+		(start 94.9898 42.6498)
-		(end 120.65745 35.64535)
+		(end 94.9898 44.7188)
-		(width 0.2)
-		(layer "B.Cu")
-		(net 5)
-		(uuid "b265b372-e1db-405a-b6fc-6c46b886e378")
-	)
-	(segment
-		(start 121.43465 57.75315)
-		(end 120.65745 56.97595)
-		(width 0.2)
-		(layer "B.Cu")
-		(net 5)
-		(uuid "ce3961b8-46ab-45c0-ab28-9ba9a39d6c39")
-	)
-	(segment
-		(start 119.51545 68.20515)
-		(end 123.03165 64.68895)
-		(width 0.2)
-		(layer "B.Cu")
-		(net 5)
-		(uuid "e9b100fa-ff27-44ad-a71a-ff0967190838")
-	)
-	(segment
-		(start 121.81645 33.60315)
-		(end 121.81645 34.75485)
-		(width 0.2)
-		(layer "B.Cu")
-		(net 5)
-		(uuid "eb9d8ea6-007a-4ca0-a4e6-9d1cf76062b5")
-	)
-	(segment
-		(start 81.66945 58.03915)
-		(end 75.16945 58.03915)
 		(width 0.2)
 		(layer "F.Cu")
 		(net 17)
-		(uuid "0c7accad-8c90-42b8-ab71-3fc9dd5fafc9")
+		(uuid "4e8a74e4-71a7-4011-86a7-326328a5b6ac")
 	)
 	(segment
-		(start 93.36755 46.34105)
+		(start 94.9898 44.7188)
 		(end 81.66945 58.03915)
 		(width 0.2)
 		(layer "F.Cu")
 		(net 17)
-		(uuid "5b2df6e7-1310-4014-bb4f-25f9037d3cb5")
+		(uuid "574517ec-490a-4b99-a252-2a1806942ead")
-	)
-	(segment
-		(start 94.21465 46.34105)
-		(end 93.36755 46.34105)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 17)
-		(uuid "fb8aa282-a0ed-4355-a614-cb6cf77b408b")
 	)
 	(via
-		(at 94.21465 46.34105)
+		(at 94.9898 42.6498)
 		(size 0.6)
 		(drill 0.3)
 		(layers "F.Cu" "B.Cu")
@@ -6535,36 +6391,20 @@
 		(uuid "48da53a9-4b84-4da7-a170-4b91593cc26b")
 	)
 	(segment
-		(start 104.03645 34.75485)
+		(start 94.9898 42.6498)
-		(end 103.24465 34.75485)
+		(end 104.03645 33.60315)
 		(width 0.2)
 		(layer "B.Cu")
 		(net 17)
-		(uuid "169d84cb-bd33-41cd-b3b0-d1a445843991")
+		(uuid "7eaded5d-80b8-478c-bd65-a0052f0ebcee")
 	)
 	(segment
-		(start 104.03645 33.60315)
+		(start 81.66945 58.03915)
-		(end 104.03645 34.75485)
+		(end 75.16945 58.03915)
 		(width 0.2)
 		(layer "B.Cu")
 		(net 17)
-		(uuid "5933bc15-ab35-4d88-a5a7-02f8e75055e9")
+		(uuid "cbcb0e99-b160-4542-8400-ac7bb052f7ff")
-	)
-	(segment
-		(start 94.21465 43.78485)
-		(end 94.21465 46.34105)
-		(width 0.2)
-		(layer "B.Cu")
-		(net 17)
-		(uuid "aed43a78-023e-4adf-aee0-847df9fc4390")
-	)
-	(segment
-		(start 103.24465 34.75485)
-		(end 94.21465 43.78485)
-		(width 0.2)
-		(layer "B.Cu")
-		(net 17)
-		(uuid "e6fb4750-6c08-4914-9fd8-ce6892d6aff5")
 	)
 	(segment
 		(start 91.47145 67.46115)
@@ -6574,37 +6414,29 @@
 		(net 18)
 		(uuid "87a246d9-e180-4ed5-b8a2-1bcecd21fb90")
 	)
-	(segment
-		(start 105.30645 35.75635)
-		(end 106.30795 34.75485)
-		(width 0.2)
-		(layer "B.Cu")
-		(net 18)
-		(uuid "0a5782a4-0962-4618-adbb-6919cc8ebdb6")
-	)
 	(segment
 		(start 91.47145 67.46115)
 		(end 91.47145 50.99995)
 		(width 0.2)
 		(layer "B.Cu")
 		(net 18)
-		(uuid "60636a96-3f2e-4aa0-8ad7-9b5a23d6b195")
+		(uuid "09a00f80-a0f3-4ab5-985b-8d8adfc2bcd6")
-	)
-	(segment
-		(start 106.57645 33.60315)
-		(end 106.57645 34.75485)
-		(width 0.2)
-		(layer "B.Cu")
-		(net 18)
-		(uuid "7dc9fc61-1653-43f7-87bc-7ed42d39883e")
 	)
 	(segment
 		(start 105.30645 37.16495)
-		(end 105.30645 35.75635)
+		(end 105.30645 34.87315)
 		(width 0.2)
 		(layer "B.Cu")
 		(net 18)
-		(uuid "92c38c61-826f-4ad8-8ac7-290718cd9693")
+		(uuid "32a62106-10c9-4aac-bfd3-16151e492ff3")
+	)
+	(segment
+		(start 105.30645 34.87315)
+		(end 106.57645 33.60315)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 18)
+		(uuid "3b187330-a67e-4993-8327-7fa3fdba6245")
 	)
 	(segment
 		(start 91.47145 50.99995)
@@ -6612,71 +6444,39 @@
 		(width 0.2)
 		(layer "B.Cu")
 		(net 18)
-		(uuid "b86b332a-8774-4807-9df2-ba8c94fa3993")
+		(uuid "7ba271f2-9266-4948-8410-79fb188cf11e")
 	)
 	(segment
-		(start 106.30795 34.75485)
+		(start 91.69085 52.69265)
-		(end 106.57645 34.75485)
+		(end 107.87 36.5135)
 		(width 0.2)
-		(layer "B.Cu")
+		(layer "F.Cu")
-		(net 18)
+		(net 19)
-		(uuid "c09c6106-9be1-40a5-95b3-52b4e4a747da")
+		(uuid "192b254f-1eca-4e5e-b73d-f1b988dd4c2c")
 	)
 	(segment
-		(start 107.96475 36.41875)
+		(start 107.87 34.8496)
+		(end 109.11645 33.60315)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 19)
+		(uuid "3a595bb7-7fef-4434-af85-84734501e9a7")
+	)
+	(segment
+		(start 88.11295 52.69265)
 		(end 91.69085 52.69265)
 		(width 0.2)
 		(layer "F.Cu")
 		(net 19)
-		(uuid "71051f3c-3694-4520-9081-0ddbca660493")
+		(uuid "739bd964-a099-4b7a-9eb0-414cbac48bfe")
 	)
 	(segment
-		(start 107.96475 35.61855)
+		(start 107.87 36.5135)
-		(end 107.96475 36.41875)
+		(end 107.87 34.8496)
 		(width 0.2)
 		(layer "F.Cu")
 		(net 19)
-		(uuid "9920ff71-19c4-4b0d-9f61-9c14208eae16")
+		(uuid "84324f16-a587-46d8-88a1-6a9098f6468b")
-	)
-	(segment
-		(start 109.11645 34.75485)
-		(end 108.82845 34.75485)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 19)
-		(uuid "a629488f-2249-45d2-988d-05db30646496")
-	)
-	(segment
-		(start 81.66945 77.34315)
-		(end 75.16945 77.34315)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 19)
-		(uuid "c175f7a1-1ed3-4a16-b36b-64e135c42ebd")
-	)
-	(segment
-		(start 91.69085 52.69265)
-		(end 88.11295 52.69265)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 19)
-		(uuid "d7f5cfc1-f5e4-4c6d-b82c-eab784778ee3")
-	)
-	(segment
-		(start 108.82845 34.75485)
-		(end 107.96475 35.61855)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 19)
-		(uuid "ebad0c1a-f100-442c-94bd-799959fb02f7")
-	)
-	(segment
-		(start 109.11645 33.60315)
-		(end 109.11645 34.75485)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 19)
-		(uuid "fd51b10f-9ebe-4bbc-8569-12bf679f7d80")
 	)
 	(via
 		(at 88.11295 52.69265)
@@ -6687,12 +6487,44 @@
 		(uuid "9cdf5e3b-954f-4675-bf6c-13ab4f954664")
 	)
 	(segment
-		(start 88.35675 70.65585)
+		(start 81.66945 77.34315)
-		(end 88.35675 52.93645)
+		(end 75.16945 77.34315)
 		(width 0.2)
 		(layer "B.Cu")
 		(net 19)
-		(uuid "1a6f4d30-f22c-42bd-a3a7-1575d59e2355")
+		(uuid "0dbff3a9-4b06-4123-91a6-5074d01926bd")
+	)
+	(segment
+		(start 87.37 53.4356)
+		(end 88.11295 52.69265)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 19)
+		(uuid "319f0391-54cb-4e9b-9b37-b25399f0a9a2")
+	)
+	(segment
+		(start 88.35675 57.01675)
+		(end 87.37 56.03)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 19)
+		(uuid "6858f511-4bdf-44f9-9c36-aca6341854aa")
+	)
+	(segment
+		(start 87.37 56.03)
+		(end 87.37 53.4356)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 19)
+		(uuid "6ff0eaec-7116-4088-a2e1-174c091f8863")
+	)
+	(segment
+		(start 88.35675 70.65585)
+		(end 88.35675 57.01675)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 19)
+		(uuid "d175ea7e-caea-4e0c-968b-d94e73ee4493")
 	)
 	(segment
 		(start 81.66945 77.34315)
@@ -6700,95 +6532,63 @@
 		(width 0.2)
 		(layer "B.Cu")
 		(net 19)
-		(uuid "54c7a48d-048d-4e1a-b1e7-2437bc59d9da")
+		(uuid "f064eb78-ce79-49cf-8bf9-0aa49d437b17")
 	)
 	(segment
-		(start 88.35675 52.93645)
+		(start 88.04615 58.85005)
-		(end 88.11295 52.69265)
+		(end 110.37 36.5262)
 		(width 0.2)
-		(layer "B.Cu")
+		(layer "F.Cu")
-		(net 19)
+		(net 20)
-		(uuid "a8d33a45-93c1-401c-97b4-2d963859c751")
+		(uuid "23c40928-8eff-46fd-a0a2-46c6c320dce1")
+	)
+	(segment
+		(start 110.37 36.5262)
+		(end 110.37 34.8896)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 20)
+		(uuid "33d291fe-63f6-470b-9bc0-9fe7d3ec5483")
+	)
+	(segment
+		(start 71.88945 67.46115)
+		(end 78.89655 67.46115)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 20)
+		(uuid "37acc87f-7866-479c-834b-d9f741bde154")
+	)
+	(segment
+		(start 110.37 34.8896)
+		(end 111.65645 33.60315)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 20)
+		(uuid "40170007-453d-4458-b11b-ecf45d1b9503")
+	)
+	(segment
+		(start 78.89655 67.46115)
+		(end 87.50765 58.85005)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 20)
+		(uuid "7af747c3-39cc-4ef5-b3c6-3f9dcd10af8f")
+	)
+	(segment
+		(start 87.50765 58.85005)
+		(end 88.04615 58.85005)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 20)
+		(uuid "e3bdb748-b8dd-4f49-a2ff-48088f74e067")
 	)
 	(segment
 		(start 71.88945 67.46115)
 		(end 65.38945 67.46115)
 		(width 0.2)
-		(layer "F.Cu")
+		(layer "B.Cu")
 		(net 20)
-		(uuid "5b64e4cd-ba40-481e-ae42-bd4da69eaeae")
+		(uuid "9d18afc5-413c-4197-8f00-aec2378ac361")
-	)
-	(segment
-		(start 111.36845 34.75485)
-		(end 110.50475 35.61855)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 20)
-		(uuid "689cfbea-ec39-40b6-bec6-eba8fe41fff1")
-	)
-	(segment
-		(start 110.50475 36.39145)
-		(end 88.04615 58.85005)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 20)
-		(uuid "6f8f2741-b515-47e2-a93c-6d579ce4c0db")
-	)
-	(segment
-		(start 78.89655 67.46115)
-		(end 71.88945 67.46115)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 20)
-		(uuid "74aa9db6-6259-46df-a929-a27b332d58c4")
-	)
-	(segment
-		(start 111.65645 34.75485)
-		(end 111.36845 34.75485)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 20)
-		(uuid "7cec0e85-a5d8-47a4-925a-13089d40b2a2")
-	)
-	(segment
-		(start 87.50765 58.85005)
-		(end 78.89655 67.46115)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 20)
-		(uuid "8300c176-c447-4a65-8533-b193a5d1a400")
-	)
-	(segment
-		(start 111.65645 33.60315)
-		(end 111.65645 34.75485)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 20)
-		(uuid "ad7091d4-658f-498b-9aac-3e65522fc736")
-	)
-	(segment
-		(start 88.04615 58.85005)
-		(end 87.50765 58.85005)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 20)
-		(uuid "e0375eb2-2260-48ba-b987-514dd3699a97")
-	)
-	(segment
-		(start 110.50475 35.61855)
-		(end 110.50475 36.39145)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 20)
-		(uuid "f8d92b99-87ac-423b-87dd-a8aa61603127")
-	)
-	(segment
-		(start 106.96545 77.08915)
-		(end 100.46545 77.08915)
-		(width 0.2)
-		(layer "F.Cu")
-		(net 21)
-		(uuid "5af0bfe4-d166-4376-9f21-4ec3c2d1e556")
 	)
 	(segment
 		(start 104.05145 73.50315)
@@ -6798,6 +6598,14 @@
 		(net 21)
 		(uuid "7a26bd89-d216-4c0b-9937-5afd6d4270be")
 	)
+	(segment
+		(start 106.96545 77.08915)
+		(end 100.46545 77.08915)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 21)
+		(uuid "9080dc78-669e-4d44-bee8-a94ab0f8c9f5")
+	)
 	(segment
 		(start 104.05145 59.02315)
 		(end 104.05145 73.50315)
@@ -6810,81 +6618,49 @@
 		(start 122.45945 67.46115)
 		(end 115.95945 67.46115)
 		(width 0.2)
-		(layer "F.Cu")
-		(net 22)
-		(uuid "6de9e3cb-7b51-4ce4-bb4b-2b6c2d3b7fc9")
-	)
-	(segment
-		(start 107.74315 59.36115)
-		(end 115.84315 67.46115)
-		(width 0.2)
 		(layer "B.Cu")
 		(net 22)
-		(uuid "2e8616c1-1908-4c2a-9510-077a356676b4")
+		(uuid "4eb8adac-adb4-4e26-b08b-afb15cbb89cb")
 	)
 	(segment
-		(start 106.59145 59.02315)
+		(start 115.02945 67.46115)
-		(end 107.74315 59.02315)
-		(width 0.2)
-		(layer "B.Cu")
-		(net 22)
-		(uuid "6fcefa05-9203-4b54-a267-37b41029778e")
-	)
-	(segment
-		(start 107.74315 59.02315)
-		(end 107.74315 59.36115)
-		(width 0.2)
-		(layer "B.Cu")
-		(net 22)
-		(uuid "8bfc8073-2595-4c01-a39d-b8e0b9325ec5")
-	)
-	(segment
-		(start 115.84315 67.46115)
 		(end 115.95945 67.46115)
 		(width 0.2)
 		(layer "B.Cu")
 		(net 22)
-		(uuid "eec3bdad-14aa-447c-b222-1bccb0767885")
+		(uuid "552dd5c3-b29c-47d8-a9ad-b3a7353d9055")
 	)
 	(segment
-		(start 121.83145 59.02315)
+		(start 106.59145 59.02315)
-		(end 121.83145 60.17485)
+		(end 115.02945 67.46115)
 		(width 0.2)
 		(layer "B.Cu")
-		(net 31)
+		(net 22)
-		(uuid "00b4e0a1-b1f8-485f-9339-0986f61492c8")
+		(uuid "b165e912-bc9c-4403-92b3-ec92dc67f4d3")
 	)
 	(segment
-		(start 117.88945 80.20035)
+		(start 119.37 77.4656)
-		(end 107.68365 90.40615)
+		(end 119.37 61.4846)
 		(width 0.2)
-		(layer "B.Cu")
+		(layer "F.Cu")
 		(net 31)
-		(uuid "35c234af-27d5-40fc-a447-845f0b3cf647")
+		(uuid "1fca7b27-b4b8-46d3-b8f3-ab2d8911feea")
 	)
 	(segment
-		(start 107.68365 90.40615)
+		(start 106.42945 90.40615)
-		(end 106.42945 90.40615)
+		(end 119.37 77.4656)
 		(width 0.2)
-		(layer "B.Cu")
+		(layer "F.Cu")
 		(net 31)
-		(uuid "401271db-a29b-4276-bfcf-b27d0cd3e707")
+		(uuid "696eb369-a135-4b1b-bb1c-c2ceb8a5eab6")
 	)
 	(segment
-		(start 121.83145 60.17485)
+		(start 119.37 61.4846)
-		(end 117.88945 64.11685)
+		(end 121.83145 59.02315)
 		(width 0.2)
-		(layer "B.Cu")
+		(layer "F.Cu")
 		(net 31)
-		(uuid "77893505-5e50-4356-9001-9881721b28d0")
+		(uuid "bb3fa781-c3a2-4966-beb0-9d8ae303b07b")
-	)
-	(segment
-		(start 117.88945 64.11685)
-		(end 117.88945 80.20035)
-		(width 0.2)
-		(layer "B.Cu")
-		(net 31)
-		(uuid "d49d87ec-3fad-4fc1-9097-53a80093e1b1")
 	)
 	(zone
 		(net 3)

Maerklin System Control.kicad_prl

@@ -1,6 +1,6 @@
 {
   "board": {
-    "active_layer": 0,
+    "active_layer": 31,
     "active_layer_preset": "All Layers",
     "auto_track_width": true,
     "hidden_netclasses": [],

Maerklin System Control.kicad_sch

@@ -1902,6 +1902,374 @@
 				)
 			)
 		)
+		(symbol "SW_Push_Dual_x2_1"
+			(pin_names
+				(offset 1.016) hide)
+			(exclude_from_sim no)
+			(in_bom yes)
+			(on_board yes)
+			(property "Reference" "SW"
+				(at 1.27 2.54 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(justify left)
+				)
+			)
+			(property "Value" "SW_Push_Dual_x2"
+				(at 0 -1.524 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "Footprint" ""
+				(at 0 5.08 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Datasheet" "~"
+				(at 0 5.08 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Description" "Push button switch, generic, separate symbols, four pins"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "ki_keywords" "switch normally-open pushbutton push-button"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(symbol "SW_Push_Dual_x2_1_0_1"
+				(circle
+					(center -2.032 0)
+					(radius 0.508)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 0 1.27) (xy 0 3.048)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 2.54 1.27) (xy -2.54 1.27)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(circle
+					(center 2.032 0)
+					(radius 0.508)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+			)
+			(symbol "SW_Push_Dual_x2_1_1_1"
+				(pin passive line
+					(at -5.08 0 0)
+					(length 2.54)
+					(name "C"
+						(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 "D"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "2"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+			)
+			(symbol "SW_Push_Dual_x2_1_2_1"
+				(pin passive line
+					(at -5.08 0 0)
+					(length 2.54)
+					(name "C"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "3"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at 5.08 0 180)
+					(length 2.54)
+					(name "D"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "4"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+			)
+		)
+		(symbol "SW_Push_Dual_x2_2"
+			(pin_names
+				(offset 1.016) hide)
+			(exclude_from_sim no)
+			(in_bom yes)
+			(on_board yes)
+			(property "Reference" "SW"
+				(at 1.27 2.54 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(justify left)
+				)
+			)
+			(property "Value" "SW_Push_Dual_x2"
+				(at 0 -1.524 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "Footprint" ""
+				(at 0 5.08 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Datasheet" "~"
+				(at 0 5.08 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Description" "Push button switch, generic, separate symbols, four pins"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "ki_keywords" "switch normally-open pushbutton push-button"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(symbol "SW_Push_Dual_x2_2_0_1"
+				(circle
+					(center -2.032 0)
+					(radius 0.508)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 0 1.27) (xy 0 3.048)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 2.54 1.27) (xy -2.54 1.27)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(circle
+					(center 2.032 0)
+					(radius 0.508)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+			)
+			(symbol "SW_Push_Dual_x2_2_1_1"
+				(pin passive line
+					(at -5.08 0 0)
+					(length 2.54)
+					(name "C"
+						(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 "D"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "2"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+			)
+			(symbol "SW_Push_Dual_x2_2_2_1"
+				(pin passive line
+					(at -5.08 0 0)
+					(length 2.54)
+					(name "C"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "3"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at 5.08 0 180)
+					(length 2.54)
+					(name "D"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "4"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+			)
+		)
 		(symbol "Switch:SW_Push_Dual_x2"
 			(pin_names
 				(offset 1.016) hide)
@@ -3182,9 +3550,19 @@
 		)
 		(uuid "1092308c-d67f-423e-85f5-3f0aaed43e6b")
 	)
+	(text "Hole"
+		(exclude_from_sim no)
+		(at 42.672 56.896 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+		)
+		(uuid "11c6f87b-28de-4cdc-a040-433949c36062")
+	)
 	(text "Power / Data"
 		(exclude_from_sim no)
-		(at 90.424 20.574 0)
+		(at 89.408 20.066 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -3945,7 +4323,7 @@
 		(dnp no)
 		(uuid "3cdb50dd-bdd2-49be-9f3d-12facbb0909a")
 		(property "Reference" "SW3"
-			(at 60.96 91.44 0)
+			(at 60.706 92.71 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3953,7 +4331,7 @@
 			)
 		)
 		(property "Value" "DOWN"
-			(at 60.96 93.98 0)
+			(at 60.706 95.25 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4151,6 +4529,7 @@
 		)
 	)
 	(symbol
+		(lib_name "SW_Push_Dual_x2_2")
 		(lib_id "Switch:SW_Push_Dual_x2")
 		(at 26.67 100.33 0)
 		(unit 1)
@@ -4712,6 +5091,7 @@
 		)
 	)
 	(symbol
+		(lib_name "SW_Push_Dual_x2_1")
 		(lib_id "Switch:SW_Push_Dual_x2")
 		(at 44.45 100.33 0)
 		(unit 1)