From 84a1ccf4444808d76688b3a13d2b2a72e5e9c10f Mon Sep 17 00:00:00 2001
From: Richard Zink <richard@familie-zink.org>
Date: Mon, 10 Mar 2025 14:18:19 +0100
Subject: [PATCH] Cleaned USB2 schematic

---
 .../12_USB2_Hub_and_Connectors.kicad_sch      | 135 +++++------------
 hardware/mainboard/14_Keyboard.kicad_sch      | 141 ++++++------------
 hardware/mainboard/mainboard.kicad_sch        | 126 +++++++++++++++-
 3 files changed, 200 insertions(+), 202 deletions(-)

diff --git a/hardware/mainboard/12_USB2_Hub_and_Connectors.kicad_sch b/hardware/mainboard/12_USB2_Hub_and_Connectors.kicad_sch
index 5c94ea6..9245eae 100644
--- a/hardware/mainboard/12_USB2_Hub_and_Connectors.kicad_sch
+++ b/hardware/mainboard/12_USB2_Hub_and_Connectors.kicad_sch
@@ -4651,8 +4651,8 @@
 		)
 		(uuid "b8d0dbe4-b69f-4a83-93e3-2f3798c46964")
 	)
-	(global_label "USB_KEYBOARD_DM"
-		(shape bidirectional)
+	(hierarchical_label "USB1_DM"
+		(shape input)
 		(at 46.99 64.77 180)
 		(effects
 			(font
@@ -4660,59 +4660,10 @@
 			)
 			(justify right)
 		)
-		(uuid "1eeac530-d0ba-497a-8f21-d33d252d2c2c")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 46.99 64.77 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
+		(uuid "606dcdbf-b728-407d-b93d-8b435a106758")
 	)
-	(global_label "USB20_HOST0_DP"
-		(shape bidirectional)
-		(at 46.99 67.31 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right)
-		)
-		(uuid "aa18a2d8-6e46-4f75-8396-d21595bc0e9c")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 46.99 67.31 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-	)
-	(global_label "USB20_HOST0_DM"
-		(shape bidirectional)
-		(at 46.99 69.85 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right)
-		)
-		(uuid "acc1b94e-61c7-417d-a9ca-c0a5cc186d38")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 46.99 69.85 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-	)
-	(global_label "USB_KEYBOARD_DP"
-		(shape bidirectional)
+	(hierarchical_label "USB1_DP"
+		(shape input)
 		(at 46.99 62.23 180)
 		(effects
 			(font
@@ -4720,38 +4671,20 @@
 			)
 			(justify right)
 		)
-		(uuid "b9667ec4-7a27-4d68-b4fc-8d043bc2e8c7")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 46.99 62.23 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
+		(uuid "6ec79063-a78e-48e4-829e-0d203dd270d5")
 	)
-	(global_label "USB_LTE_DP"
-		(shape bidirectional)
-		(at 170.18 67.31 0)
+	(hierarchical_label "USB0_DM"
+		(shape input)
+		(at 46.99 69.85 180)
 		(effects
 			(font
 				(size 1.27 1.27)
 			)
-			(justify left)
-		)
-		(uuid "ba8d94fb-9cfb-4a3c-91a1-107890b839ba")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 170.18 67.31 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
+			(justify right)
 		)
+		(uuid "746dbf26-690e-4519-a5b8-f777795d9dab")
 	)
-	(global_label "GPIO1_A4/USB2_PWREN"
+	(hierarchical_label "~{USB2_PWR_EN}"
 		(shape input)
 		(at 57.15 219.71 180)
 		(effects
@@ -4760,19 +4693,21 @@
 			)
 			(justify right)
 		)
-		(uuid "bd62fd4f-be6b-4850-8690-9d6648e3b311")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 57.15 219.71 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
+		(uuid "92cb4b5f-4441-4a81-9fd8-3167b2a332f1")
 	)
-	(global_label "USB_LTE_DM"
-		(shape bidirectional)
+	(hierarchical_label "USB0_DP"
+		(shape input)
+		(at 46.99 67.31 180)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "c37ab164-b9c6-4e76-ad27-b1c48ea28fc0")
+	)
+	(hierarchical_label "USB2_DM"
+		(shape input)
 		(at 170.18 64.77 0)
 		(effects
 			(font
@@ -4780,16 +4715,18 @@
 			)
 			(justify left)
 		)
-		(uuid "c84f4f5a-9eb9-4996-b581-f4104ce75962")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 170.18 64.77 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
+		(uuid "f0ad4383-ceb9-437d-a25e-528a28fcff6d")
+	)
+	(hierarchical_label "USB2_DP"
+		(shape input)
+		(at 170.18 67.31 0)
+		(effects
+			(font
+				(size 1.27 1.27)
 			)
+			(justify left)
 		)
+		(uuid "fd41407e-3644-4a5a-9a2b-756dc1b1d43b")
 	)
 	(symbol
 		(lib_id "mainboard:Ground-GND")
diff --git a/hardware/mainboard/14_Keyboard.kicad_sch b/hardware/mainboard/14_Keyboard.kicad_sch
index 5609c6d..a85b3d4 100644
--- a/hardware/mainboard/14_Keyboard.kicad_sch
+++ b/hardware/mainboard/14_Keyboard.kicad_sch
@@ -5450,26 +5450,6 @@
 			)
 		)
 	)
-	(global_label "USB_KEYBOARD_DM"
-		(shape input)
-		(at 97.79 140.97 270)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right)
-		)
-		(uuid "05294212-edf6-48f8-ba71-89a376454559")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 97.79 140.97 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-	)
 	(global_label "ROW6"
 		(shape bidirectional)
 		(at 325.12 101.6 0)
@@ -5590,26 +5570,6 @@
 			)
 		)
 	)
-	(global_label "PWR_BTN_L"
-		(shape input)
-		(at 219.71 181.61 0)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left)
-		)
-		(uuid "1891c1e6-9e67-473a-9041-d835547017ce")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 219.71 181.61 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-	)
 	(global_label "ROW4"
 		(shape bidirectional)
 		(at 325.12 88.9 0)
@@ -6110,46 +6070,6 @@
 			)
 		)
 	)
-	(global_label "USB_KEYBOARD_DP"
-		(shape input)
-		(at 100.33 140.97 270)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right)
-		)
-		(uuid "b60d4a11-7bfe-48c0-ad96-0542ed89c4f1")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 100.33 140.97 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-	)
-	(global_label "PWR_BTN_H"
-		(shape input)
-		(at 261.62 168.91 270)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right)
-		)
-		(uuid "b7a493d2-8843-447c-9fa5-4daa4de7184b")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 261.62 168.91 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-	)
 	(global_label "ROW1"
 		(shape bidirectional)
 		(at 325.12 81.28 0)
@@ -6310,6 +6230,50 @@
 			)
 		)
 	)
+	(hierarchical_label "USB_DM"
+		(shape input)
+		(at 97.79 140.97 270)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "10936eb7-fac2-4014-af37-0ae83d22c8ce")
+	)
+	(hierarchical_label "PWR_BTN_H"
+		(shape input)
+		(at 261.62 168.91 270)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "77295cae-688e-476a-9849-153e3e892596")
+	)
+	(hierarchical_label "PWR_BTN_L"
+		(shape input)
+		(at 219.71 181.61 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "d8766788-fb1d-4a78-aa21-87ff7a2e7e30")
+	)
+	(hierarchical_label "USB_DP"
+		(shape input)
+		(at 100.33 140.97 270)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "e8fe90c7-2685-4bd3-83df-6e8a4e5134ca")
+	)
 	(symbol
 		(lib_id "mainboard:0402B104K250NT")
 		(at 106.68 181.61 90)
@@ -6994,7 +6958,6 @@
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
 			)
 		)
 		(property "Footprint" "mainboard:"
@@ -7618,7 +7581,6 @@
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
 			)
 		)
 		(property "Footprint" "mainboard:"
@@ -7750,7 +7712,6 @@
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
 			)
 		)
 		(property "Footprint" "mainboard:"
@@ -8233,7 +8194,6 @@
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
 			)
 		)
 		(property "Footprint" "mainboard:"
@@ -8294,12 +8254,11 @@
 			)
 		)
 		(property "Value" "+3.3V"
-			(at 87.63 134.62 90)
+			(at 87.63 134.62 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
 			)
 		)
 		(property "Footprint" "mainboard:"
@@ -9134,12 +9093,11 @@
 			)
 		)
 		(property "Value" "+3.3V_KEY"
-			(at 87.63 109.22 90)
+			(at 87.63 109.22 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
 			)
 		)
 		(property "Footprint" "mainboard:"
@@ -9560,7 +9518,6 @@
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
 			)
 		)
 		(property "Footprint" "mainboard:"
@@ -9872,7 +9829,6 @@
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
 			)
 		)
 		(property "Footprint" "mainboard:"
@@ -10166,7 +10122,6 @@
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
 			)
 		)
 		(property "Footprint" "mainboard:"
@@ -10232,7 +10187,6 @@
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
 			)
 		)
 		(property "Footprint" "mainboard:"
@@ -10298,7 +10252,6 @@
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
 			)
 		)
 		(property "Footprint" "mainboard:"
@@ -10364,7 +10317,6 @@
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
 			)
 		)
 		(property "Footprint" "mainboard:"
@@ -10562,7 +10514,6 @@
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
 			)
 		)
 		(property "Footprint" "mainboard:"
diff --git a/hardware/mainboard/mainboard.kicad_sch b/hardware/mainboard/mainboard.kicad_sch
index 07b92cd..3e46982 100644
--- a/hardware/mainboard/mainboard.kicad_sch
+++ b/hardware/mainboard/mainboard.kicad_sch
@@ -532,8 +532,8 @@
 		)
 	)
 	(sheet
-		(at 34.29 158.75)
-		(size 12.7 3.81)
+		(at 88.9 177.8)
+		(size 25.4 25.4)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
@@ -548,7 +548,7 @@
 		)
 		(uuid "8cfb5e11-a71f-45fa-8675-4058f56774f6")
 		(property "Sheetname" "USB 2 Hub & Connectors"
-			(at 34.29 158.0384 0)
+			(at 88.9 177.0884 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -557,7 +557,7 @@
 			)
 		)
 		(property "Sheetfile" "12_USB2_Hub_and_Connectors.kicad_sch"
-			(at 34.29 163.1446 0)
+			(at 88.9 203.7846 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -565,6 +565,76 @@
 				(justify left top)
 			)
 		)
+		(pin "USB0_DM" input
+			(at 88.9 200.66 180)
+			(uuid "ca270ec5-a1d1-4a42-9e54-696220ff0552")
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(pin "USB0_DP" input
+			(at 88.9 198.12 180)
+			(uuid "2fb0affe-27af-4e28-ad88-b142b2347e61")
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(pin "USB1_DM" input
+			(at 114.3 194.31 0)
+			(uuid "5c057282-1336-4c21-8ed3-1080c9cc2eb1")
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+			)
+		)
+		(pin "USB1_DP" input
+			(at 114.3 191.77 0)
+			(uuid "caedf5cb-fc1e-4344-87f8-1e5e81960ec9")
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+			)
+		)
+		(pin "USB2_DM" input
+			(at 114.3 200.66 0)
+			(uuid "3d4f735f-2fc0-4019-ade8-0f74c33e846f")
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+			)
+		)
+		(pin "USB2_DP" input
+			(at 114.3 198.12 0)
+			(uuid "fdf275ae-ae4b-480d-b9d9-56bf6ad85e28")
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+			)
+		)
+		(pin "~{USB2_PWR_EN}" input
+			(at 114.3 180.34 0)
+			(uuid "70feb4e7-a4a5-4693-bc11-e84872980dbd")
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+			)
+		)
 		(instances
 			(project "mainboard"
 				(path "/e8df7ad4-0398-46fe-8df2-22f014c5f1dd"
@@ -1426,8 +1496,8 @@
 		)
 	)
 	(sheet
-		(at 35.56 186.69)
-		(size 12.7 3.81)
+		(at 139.7 165.1)
+		(size 25.4 12.7)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
@@ -1442,7 +1512,7 @@
 		)
 		(uuid "b53c68d6-890a-48ca-a848-4e830d0e96f7")
 		(property "Sheetname" "Keyboard"
-			(at 35.56 185.9784 0)
+			(at 139.7 164.3884 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1451,7 +1521,7 @@
 			)
 		)
 		(property "Sheetfile" "14_Keyboard.kicad_sch"
-			(at 35.56 191.0846 0)
+			(at 139.7 178.3846 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1459,6 +1529,46 @@
 				(justify left top)
 			)
 		)
+		(pin "PWR_BTN_H" input
+			(at 165.1 167.64 0)
+			(uuid "1151f74b-5bf2-43de-9db9-dae44e5dae90")
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+			)
+		)
+		(pin "PWR_BTN_L" input
+			(at 165.1 170.18 0)
+			(uuid "054e1e44-e3b6-4aa1-aea6-ebb76a91a1b6")
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+			)
+		)
+		(pin "USB_DM" input
+			(at 139.7 170.18 180)
+			(uuid "377c48ba-a833-4be0-8010-3f9bd4d83cd6")
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(pin "USB_DP" input
+			(at 139.7 167.64 180)
+			(uuid "36a1d5e1-593c-4dc9-9697-1f6db05d487a")
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
 		(instances
 			(project "mainboard"
 				(path "/e8df7ad4-0398-46fe-8df2-22f014c5f1dd"