pcb: U5: Finish hierarchical labels for serial ports

2 files changed, 511 insertions, 67 deletions

diff --git a/pcb/soundbox.kicad_sch b/pcb/soundbox.kicad_sch
index 549b2a7..d160fb4 100644
--- a/pcb/soundbox.kicad_sch
+++ b/pcb/soundbox.kicad_sch
@@ -2721,12 +2721,6 @@
 		(uuid "75250703-bad1-4381-a0cc-88b6e76f4d59")
 	)
 	(junction
-		(at 63.5 114.3)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "bd91d90c-08bc-486c-a801-96dc81fa6427")
-	)
-	(junction
 		(at 261.62 93.98)
 		(diameter 0)
 		(color 0 0 0 0)
@@ -2804,43 +2798,43 @@
 	)
 	(wire
 		(pts
-			(xy 63.5 114.3) (xy 63.5 116.84)
+			(xy 247.65 38.1) (xy 247.65 31.75)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "4ef4af24-9cbe-4c75-a2dd-c6ee542c231d")
+		(uuid "63fabc8f-7fc1-4173-ba8e-81b521ec897f")
 	)
 	(wire
 		(pts
-			(xy 247.65 38.1) (xy 247.65 31.75)
+			(xy 234.95 38.1) (xy 234.95 27.94)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "63fabc8f-7fc1-4173-ba8e-81b521ec897f")
+		(uuid "7cedf541-2daf-403d-a85c-5ec82ea37975")
 	)
 	(wire
 		(pts
-			(xy 234.95 38.1) (xy 234.95 27.94)
+			(xy 261.62 90.17) (xy 261.62 93.98)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "7cedf541-2daf-403d-a85c-5ec82ea37975")
+		(uuid "82a94e0e-ef05-448d-8ad5-6a7da53eeb05")
 	)
 	(wire
 		(pts
-			(xy 261.62 90.17) (xy 261.62 93.98)
+			(xy 31.75 166.37) (xy 40.64 166.37)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "82a94e0e-ef05-448d-8ad5-6a7da53eeb05")
+		(uuid "9be3f81e-988d-4f80-b309-f92a0f43cad7")
 	)
 	(wire
 		(pts
@@ -2854,73 +2848,73 @@
 	)
 	(wire
 		(pts
-			(xy 247.65 58.42) (xy 247.65 59.69)
+			(xy 130.81 81.28) (xy 140.97 81.28)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "aea595f8-b21f-44e4-b442-293f1c574667")
+		(uuid "a57c2ebe-e566-496a-82cd-d788c4346efe")
 	)
 	(wire
 		(pts
-			(xy 260.35 38.1) (xy 260.35 35.56)
+			(xy 63.5 111.76) (xy 63.5 116.84)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "b16a64cf-4f45-4c3e-a463-4fffea2caccd")
+		(uuid "ad2e8ec5-896a-4019-a4af-94cd8c08a62b")
 	)
 	(wire
 		(pts
-			(xy 261.62 93.98) (xy 261.62 109.22)
+			(xy 247.65 58.42) (xy 247.65 59.69)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "c47a71ca-8e7d-4713-9049-9ffdac41771c")
+		(uuid "aea595f8-b21f-44e4-b442-293f1c574667")
 	)
 	(wire
 		(pts
-			(xy 63.5 111.76) (xy 63.5 114.3)
+			(xy 260.35 38.1) (xy 260.35 35.56)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "d3b63bf0-8a06-4c81-856c-1e911b563f6d")
+		(uuid "b16a64cf-4f45-4c3e-a463-4fffea2caccd")
 	)
 	(wire
 		(pts
-			(xy 247.65 45.72) (xy 247.65 49.53)
+			(xy 261.62 93.98) (xy 261.62 109.22)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "e3964cf7-95f1-485e-abca-bf4799d06260")
+		(uuid "c47a71ca-8e7d-4713-9049-9ffdac41771c")
 	)
 	(wire
 		(pts
-			(xy 260.35 45.72) (xy 260.35 49.53)
+			(xy 247.65 45.72) (xy 247.65 49.53)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "e7075ca1-6e4b-4677-9383-f4bd622dd00c")
+		(uuid "e3964cf7-95f1-485e-abca-bf4799d06260")
 	)
 	(wire
 		(pts
-			(xy 67.31 114.3) (xy 63.5 114.3)
+			(xy 260.35 45.72) (xy 260.35 49.53)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "ee1260ba-cd46-4af4-9263-c56784508ad4")
+		(uuid "e7075ca1-6e4b-4677-9383-f4bd622dd00c")
 	)
 	(wire
 		(pts
@@ -2964,6 +2958,16 @@
 	)
 	(wire
 		(pts
+			(xy 31.75 163.83) (xy 40.64 163.83)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "fc8beae9-ebce-44e4-8270-735d40b2c4a6")
+	)
+	(wire
+		(pts
 			(xy 234.95 57.15) (xy 234.95 58.42)
 		)
 		(stroke
@@ -3002,53 +3006,69 @@
 		)
 		(uuid "fcab79b8-a2e7-4707-b043-effd53cd6401")
 	)
-	(global_label "WIPE"
-		(shape output)
-		(at 246.38 93.98 180)
-		(fields_autoplaced yes)
+	(label "VERSION"
+		(at 63.5 115.57 0)
 		(effects
 			(font
 				(size 1.27 1.27)
 			)
-			(justify right)
+			(justify left bottom)
 		)
-		(uuid "0621ca81-04b5-4c46-ab2b-c61253be0738")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 238.9196 93.98 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify right)
-				(hide yes)
+		(uuid "03b454f9-9351-4f70-b0be-3c5fe7d5c74f")
+	)
+	(label "BTL_RXD"
+		(at 171.45 73.66 0)
+		(effects
+			(font
+				(size 1.27 1.27)
 			)
+			(justify left bottom)
 		)
+		(uuid "3470c621-9420-4115-964f-fd7ab820c9ae")
 	)
-	(global_label "REBOOT"
-		(shape output)
-		(at 246.38 109.22 180)
-		(fields_autoplaced yes)
+	(label "BTL_RXD"
+		(at 31.75 163.83 0)
 		(effects
 			(font
 				(size 1.27 1.27)
 			)
-			(justify right)
+			(justify left bottom)
 		)
-		(uuid "0dd2637b-c03a-4874-8aee-c55c691a94d7")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 236.0772 109.22 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify right)
-				(hide yes)
+		(uuid "70b2a82a-23fd-4e19-be10-2b2cde65207e")
+	)
+	(label "BTL_TXD"
+		(at 171.45 71.12 0)
+		(effects
+			(font
+				(size 1.27 1.27)
 			)
+			(justify left bottom)
 		)
+		(uuid "96625900-4c3c-4d63-a5ce-d0f6a36c6465")
 	)
-	(global_label "VERSION"
-		(shape input)
-		(at 140.97 81.28 180)
+	(label "BTL_TXD"
+		(at 31.75 166.37 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left bottom)
+		)
+		(uuid "a47c020a-403d-4ae3-90d0-032b9f48e580")
+	)
+	(label "VERSION"
+		(at 130.81 81.28 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left bottom)
+		)
+		(uuid "e655c7d8-ef1d-49c2-b81a-f0b4d2b84e49")
+	)
+	(global_label "WIPE"
+		(shape output)
+		(at 246.38 93.98 180)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -3056,9 +3076,9 @@
 			)
 			(justify right)
 		)
-		(uuid "323aeef4-5498-4f7e-882c-1ab13d3bf87e")
+		(uuid "0621ca81-04b5-4c46-ab2b-c61253be0738")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 130.0019 81.28 0)
+			(at 238.9196 93.98 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3068,24 +3088,24 @@
 			)
 		)
 	)
-	(global_label "VERSION"
+	(global_label "REBOOT"
 		(shape output)
-		(at 67.31 114.3 0)
+		(at 246.38 109.22 180)
 		(fields_autoplaced yes)
 		(effects
 			(font
 				(size 1.27 1.27)
 			)
-			(justify left)
+			(justify right)
 		)
-		(uuid "b2459a3d-dd40-4d7c-8fe8-23694f46518a")
+		(uuid "0dd2637b-c03a-4874-8aee-c55c691a94d7")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 78.2781 114.3 0)
+			(at 236.0772 109.22 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
+				(justify right)
 				(hide yes)
 			)
 		)
@@ -4953,6 +4973,86 @@
 				(justify left top)
 			)
 		)
+		(pin "PORT_A_TXD" output
+			(at 40.64 149.86 180)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+			(uuid "a0b33cf5-feaf-46a9-9d70-b0bd4731e616")
+		)
+		(pin "PORT_A_RXD" input
+			(at 40.64 152.4 180)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+			(uuid "d9ed1f96-79c1-4bf2-824b-beb470c0858c")
+		)
+		(pin "PORT_B_TXD" output
+			(at 40.64 163.83 180)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+			(uuid "b6993739-7a39-4183-b7b7-ee21a7cff3ba")
+		)
+		(pin "PORT_B_RXD" input
+			(at 40.64 166.37 180)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+			(uuid "c9fc049d-f01a-4444-8618-e05c0b1669f9")
+		)
+		(pin "~{PORT_B_RTS}" output
+			(at 40.64 168.91 180)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+			(uuid "f021ccc4-aae8-48ab-a558-a2f6e0dbb2fb")
+		)
+		(pin "~{PORT_B_DTR}" output
+			(at 40.64 171.45 180)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+			(uuid "3dcffd69-6320-4bf3-aef8-3705ff32cf3f")
+		)
+		(pin "~{PORT_A_RTS}" output
+			(at 40.64 154.94 180)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+			(uuid "5d90e11a-d00e-4392-9f62-9aface3d139d")
+		)
+		(pin "~{PORT_A_DTR}" output
+			(at 40.64 157.48 180)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+			(uuid "3dc1b5fd-fd2e-465a-932f-ce6e951590d9")
+		)
 		(instances
 			(project "soundbox"
 				(path "/455ca4d6-9dda-4003-9db8-aa66aec94f73"
diff --git a/pcb/usb.kicad_sch b/pcb/usb.kicad_sch
index 8cd324a..f581c9f 100644
--- a/pcb/usb.kicad_sch
+++ b/pcb/usb.kicad_sch
@@ -2217,6 +2217,182 @@
 			)
 		)
 	)
+	(no_connect
+		(at 203.2 80.01)
+		(uuid "049e3689-9d56-4401-8eb3-ac0f0319312a")
+	)
+	(no_connect
+		(at 203.2 128.27)
+		(uuid "103a7c7b-f3f6-48d4-9c07-70857684abff")
+	)
+	(no_connect
+		(at 203.2 120.65)
+		(uuid "12feafb6-b92b-4f20-b47e-874631071f72")
+	)
+	(no_connect
+		(at 203.2 118.11)
+		(uuid "13d9bf4a-ae4b-4665-a04f-d484b99fc231")
+	)
+	(no_connect
+		(at 203.2 133.35)
+		(uuid "198d87f2-dd09-468d-b684-fdc135f488b1")
+	)
+	(no_connect
+		(at 203.2 87.63)
+		(uuid "300d0f36-cd2d-4bd3-821e-9954c5aef4cf")
+	)
+	(no_connect
+		(at 203.2 74.93)
+		(uuid "33be5519-8847-4be7-9bfe-110434ce7d0b")
+	)
+	(no_connect
+		(at 203.2 85.09)
+		(uuid "466102af-7829-4554-8892-2f38b0c66e3d")
+	)
+	(no_connect
+		(at 203.2 110.49)
+		(uuid "86a82605-c562-4fa8-aef7-108cbe45aba7")
+	)
+	(no_connect
+		(at 203.2 102.87)
+		(uuid "8fd03309-da5a-47e2-9564-63d2b19cafef")
+	)
+	(no_connect
+		(at 203.2 77.47)
+		(uuid "95ebea55-f6c4-4ebe-a9ee-97880b3bdb2a")
+	)
+	(no_connect
+		(at 203.2 82.55)
+		(uuid "a824f602-9d04-460a-b5e6-4f749a73f3df")
+	)
+	(no_connect
+		(at 203.2 130.81)
+		(uuid "adaf6c06-2b08-4abd-9c83-aec29461c16e")
+	)
+	(no_connect
+		(at 203.2 62.23)
+		(uuid "ae50d539-944c-40a9-9434-23f5a93f4071")
+	)
+	(no_connect
+		(at 203.2 107.95)
+		(uuid "b8374690-14b4-48e3-98eb-0f81f0bae419")
+	)
+	(no_connect
+		(at 203.2 135.89)
+		(uuid "c94cda74-af2e-4f65-b399-0332cc5c253a")
+	)
+	(no_connect
+		(at 203.2 67.31)
+		(uuid "cb388132-7c2b-40c3-9b73-07b19b290f01")
+	)
+	(no_connect
+		(at 203.2 57.15)
+		(uuid "cda855cf-a1f3-480a-9791-94b9859dfc89")
+	)
+	(no_connect
+		(at 203.2 64.77)
+		(uuid "d0482dcc-6904-437d-ae6d-250124c62b2f")
+	)
+	(no_connect
+		(at 203.2 123.19)
+		(uuid "d0da4cb0-7ffd-4d01-99bd-31657ba21a18")
+	)
+	(no_connect
+		(at 203.2 113.03)
+		(uuid "dcaef24b-75fe-48c2-b3a0-a26dd2fff72b")
+	)
+	(no_connect
+		(at 203.2 125.73)
+		(uuid "dffb2230-eae5-43ad-8c6f-e341d32a1498")
+	)
+	(no_connect
+		(at 203.2 72.39)
+		(uuid "f481816f-809f-4ec4-b04e-fdcf7625ef58")
+	)
+	(no_connect
+		(at 203.2 90.17)
+		(uuid "f5221037-71dc-4fba-96f5-96d4af16a41d")
+	)
+	(wire
+		(pts
+			(xy 203.2 59.69) (xy 215.9 59.69)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "3fc7d120-c557-49f4-b832-6ef0289b14ec")
+	)
+	(wire
+		(pts
+			(xy 203.2 54.61) (xy 215.9 54.61)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "468bd959-3a06-419c-9556-72a3afbe130a")
+	)
+	(wire
+		(pts
+			(xy 203.2 95.25) (xy 215.9 95.25)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "954894fc-5611-45a9-bc3e-0db92042e307")
+	)
+	(wire
+		(pts
+			(xy 203.2 105.41) (xy 215.9 105.41)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "a1eb5fde-4dff-49b5-a3c2-ec3f425fa290")
+	)
+	(wire
+		(pts
+			(xy 203.2 100.33) (xy 215.9 100.33)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "d1335816-e4e0-49a8-bcc8-9b85e94d74f4")
+	)
+	(wire
+		(pts
+			(xy 203.2 52.07) (xy 215.9 52.07)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "d55a73eb-59e5-4d78-979c-928ff3396bad")
+	)
+	(wire
+		(pts
+			(xy 203.2 49.53) (xy 215.9 49.53)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "d90ff8f4-7ade-444d-bc5a-d29c4cbef33d")
+	)
+	(wire
+		(pts
+			(xy 203.2 97.79) (xy 215.9 97.79)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "ea81d804-51ec-4a63-8e5f-31d6de6fd89b")
+	)
 	(text "TODO:\nEEPROM for FTDI chip config"
 		(exclude_from_sim no)
 		(at 172.212 73.914 0)
@@ -2227,6 +2403,174 @@
 		)
 		(uuid "65100956-027c-4f06-8eb9-e6c633e27f51")
 	)
+	(label "~{PORT_A_RTS}"
+		(at 203.2 54.61 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left bottom)
+		)
+		(uuid "04bc2aba-5f36-4ebf-9948-b3c86f50a038")
+	)
+	(label "PORT_B_RXD"
+		(at 203.2 97.79 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left bottom)
+		)
+		(uuid "0588e8e8-3aca-4ac9-ae43-96e1cc506fa0")
+	)
+	(label "PORT_B_TXD"
+		(at 203.2 95.25 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left bottom)
+		)
+		(uuid "15c5fcae-3def-4771-a7f8-c0be3d888d64")
+	)
+	(label "~{PORT_A_DTR}"
+		(at 203.2 59.69 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left bottom)
+		)
+		(uuid "4684bb39-0037-4c7b-a03b-45c5b9d329ad")
+	)
+	(label "PORT_A_RXD"
+		(at 203.2 52.07 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left bottom)
+		)
+		(uuid "4dace03a-2ea5-40c8-b3d8-61c319fa57f9")
+	)
+	(label "~{PORT_B_DTR}"
+		(at 203.2 105.41 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left bottom)
+		)
+		(uuid "6fc9158e-bc45-4edb-b42a-c25f10766d46")
+	)
+	(label "~{PORT_B_RTS}"
+		(at 203.2 100.33 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left bottom)
+		)
+		(uuid "71619ffa-e85c-4112-b200-403ae0af0cd3")
+	)
+	(label "PORT_A_TXD"
+		(at 203.2 49.53 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left bottom)
+		)
+		(uuid "a7562aa5-30a0-4374-b53f-4224c36b28b8")
+	)
+	(hierarchical_label "~{PORT_B_RTS}"
+		(shape output)
+		(at 215.9 100.33 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "0f584a4f-2f8c-47bc-94c8-2b56adfadefb")
+	)
+	(hierarchical_label "~{PORT_A_DTR}"
+		(shape output)
+		(at 215.9 59.69 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "3bb95442-66c3-46dd-bfd8-d973db50c5de")
+	)
+	(hierarchical_label "PORT_B_RXD"
+		(shape input)
+		(at 215.9 97.79 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "418f0bdb-a425-4811-9f5a-061aef970a42")
+	)
+	(hierarchical_label "~{PORT_A_RTS}"
+		(shape output)
+		(at 215.9 54.61 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "7b247184-122b-4109-99f0-c845259e9973")
+	)
+	(hierarchical_label "PORT_A_TXD"
+		(shape output)
+		(at 215.9 49.53 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "8e7d3f55-2029-4fef-9914-73819c9a985f")
+	)
+	(hierarchical_label "~{PORT_B_DTR}"
+		(shape output)
+		(at 215.9 105.41 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "9b5b78e3-755f-427e-a370-bfc91ec6f3d5")
+	)
+	(hierarchical_label "PORT_A_RXD"
+		(shape input)
+		(at 215.9 52.07 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "da0f57bc-e6d6-4471-88ee-c8765ab522c1")
+	)
+	(hierarchical_label "PORT_B_TXD"
+		(shape output)
+		(at 215.9 95.25 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "e787c864-7706-40b4-b13a-178843e2578f")
+	)
 	(symbol
 		(lib_id "Connector:USB_C_Receptacle")
 		(at 91.44 86.36 0)