hw: erc: can

5 files changed, 93 insertions, 103 deletions

diff --git a/hw/can_gauge_interface.kicad_sch b/hw/can_gauge_interface.kicad_sch
index 99084ff..391498c 100644
--- a/hw/can_gauge_interface.kicad_sch
+++ b/hw/can_gauge_interface.kicad_sch
@@ -1684,7 +1684,7 @@
 		)
 		(uuid "616c5fd7-e848-4672-84f6-13f0bec1b8ed")
 	)
-	(label "CANbus{CAN_PHY}"
+	(label "CAN1{CAN_PHY}"
 		(at 78.74 71.12 0)
 		(effects
 			(font
@@ -1794,16 +1794,6 @@
 		)
 		(uuid "f0f1c99c-f241-46af-bb91-ed4445081492")
 	)
-	(label "FDCAN1{CAN}"
-		(at 129.54 73.66 0)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left bottom)
-		)
-		(uuid "f8af8663-276b-4684-8a7a-34dfc88d914f")
-	)
 	(label "Speed"
 		(at 41.91 53.34 0)
 		(effects
@@ -3015,16 +3005,6 @@
 				(justify right)
 			)
 		)
-		(pin "FDCAN1{CAN}" bidirectional
-			(at 152.4 78.74 180)
-			(uuid "80d26d40-e69e-4b2d-960d-2cb94de3340d")
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
 		(pin "I2C1{I2C}" bidirectional
 			(at 152.4 83.82 180)
 			(uuid "a77c5f45-6660-49d5-b946-9f31c76ad032")
@@ -3075,6 +3055,16 @@
 				(justify left)
 			)
 		)
+		(pin "CAN1{CAN_IF}" bidirectional
+			(at 152.4 78.74 180)
+			(uuid "ade3a8e9-b89b-42f5-8fa3-837d8ba53704")
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
 		(instances
 			(project "can_gauge_interface"
 				(path "/11aaed46-be21-4424-b899-cb4c1a8c3e5f"
@@ -3199,16 +3189,6 @@
 				(justify left top)
 			)
 		)
-		(pin "FDCAN1{CAN}" input
-			(at 152.4 43.18 180)
-			(uuid "4b171431-51dd-4676-904e-1d4f5ad3bacc")
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
 		(pin "SPI1{SPI DAC_~{CS}}" input
 			(at 152.4 45.72 180)
 			(uuid "b8f7fa10-1f4c-48cb-8cd6-fe7a4e6db975")
@@ -3279,6 +3259,16 @@
 				(justify right)
 			)
 		)
+		(pin "CAN1{CAN_IF}" input
+			(at 152.4 43.18 180)
+			(uuid "e249bcde-b2f2-4e2c-8661-eb40a99f0528")
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
 		(instances
 			(project "can_gauge_interface"
 				(path "/11aaed46-be21-4424-b899-cb4c1a8c3e5f"
@@ -3381,9 +3371,9 @@
 				(justify left)
 			)
 		)
-		(pin "CANbus{CAN_PHY}" bidirectional
+		(pin "CAN1{CAN_PHY}" bidirectional
 			(at 76.2 71.12 0)
-			(uuid "be0b717f-5c19-468e-978f-66efb9d7ea93")
+			(uuid "3313fef2-faef-465a-8c89-034e4ccaa0d3")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3433,9 +3423,9 @@
 				(justify left top)
 			)
 		)
-		(pin "FDCAN1{CAN}" bidirectional
-			(at 127 73.66 0)
-			(uuid "39d926d1-e258-461a-b691-ac16a5bd94f8")
+		(pin "+3.3V" input
+			(at 124.46 50.8 90)
+			(uuid "b005c460-10a8-4cea-a90c-3fe1e0d983d9")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3443,9 +3433,9 @@
 				(justify right)
 			)
 		)
-		(pin "+3.3V" input
-			(at 124.46 50.8 90)
-			(uuid "b005c460-10a8-4cea-a90c-3fe1e0d983d9")
+		(pin "+5V" input
+			(at 119.38 50.8 90)
+			(uuid "1ac34e0b-624b-4c8b-b490-ecb51efe9665")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3453,24 +3443,24 @@
 				(justify right)
 			)
 		)
-		(pin "CANbus{CAN_PHY}" bidirectional
-			(at 101.6 71.12 180)
-			(uuid "fd926bed-ffe7-42e6-9aea-a18d1b10944d")
+		(pin "CAN1{CAN_IF}" bidirectional
+			(at 127 73.66 0)
+			(uuid "059891ef-b1d0-4adf-9cea-3e7d178bab16")
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
+				(justify right)
 			)
 		)
-		(pin "+5V" input
-			(at 119.38 50.8 90)
-			(uuid "1ac34e0b-624b-4c8b-b490-ecb51efe9665")
+		(pin "CAN1{CAN_PHY}" bidirectional
+			(at 101.6 71.12 180)
+			(uuid "69b08487-d200-4896-bf91-fcd6cc289f5d")
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify right)
+				(justify left)
 			)
 		)
 		(instances
diff --git a/hw/can_xcvr.kicad_sch b/hw/can_xcvr.kicad_sch
index f52b475..8c1fe65 100644
--- a/hw/can_xcvr.kicad_sch
+++ b/hw/can_xcvr.kicad_sch
@@ -1216,7 +1216,7 @@
 		)
 		(uuid "feca919c-1616-4ec7-92fe-97d482be8c05")
 	)
-	(label "CAN.L"
+	(label "CAN1.L"
 		(at 127 60.96 0)
 		(effects
 			(font
@@ -1226,7 +1226,7 @@
 		)
 		(uuid "1a6a0a4e-7545-414c-8b11-5845f78ced7b")
 	)
-	(label "FDCAN1.RX"
+	(label "CAN1.RX"
 		(at 58.42 63.5 180)
 		(effects
 			(font
@@ -1236,7 +1236,7 @@
 		)
 		(uuid "23b6cc23-e714-4fd9-98f1-4cdb3dddd4cc")
 	)
-	(label "FDCAN1.TX"
+	(label "CAN1.TX"
 		(at 58.42 55.88 180)
 		(effects
 			(font
@@ -1246,7 +1246,7 @@
 		)
 		(uuid "3b260afe-392e-4a20-9b03-ccabcae403f1")
 	)
-	(label "CAN.H"
+	(label "CAN1.H"
 		(at 127 58.42 0)
 		(effects
 			(font
@@ -1256,7 +1256,7 @@
 		)
 		(uuid "3ee37e89-8e41-4ea0-bfd4-e37bcadd159e")
 	)
-	(hierarchical_label "CANbus{CAN_PHY}"
+	(hierarchical_label "CAN1{CAN_PHY}"
 		(shape bidirectional)
 		(at 139.7 55.88 0)
 		(effects
@@ -1265,9 +1265,9 @@
 			)
 			(justify left)
 		)
-		(uuid "389e6a98-1271-4761-8b33-c4fdecf008c6")
+		(uuid "2ca968ea-0a2e-4a4b-8c46-895285abbc7a")
 	)
-	(hierarchical_label "FDCAN1{CAN}"
+	(hierarchical_label "CAN1{CAN_IF}"
 		(shape bidirectional)
 		(at 38.1 53.34 180)
 		(effects
diff --git a/hw/connectors.kicad_sch b/hw/connectors.kicad_sch
index 5dbdedb..c8ee007 100644
--- a/hw/connectors.kicad_sch
+++ b/hw/connectors.kicad_sch
@@ -1131,31 +1131,31 @@
 		(uuid "b52a53f4-af0d-4205-8d36-64e9e81719c3")
 	)
 	(bus_entry
-		(at 76.2 38.1)
+		(at 76.2 104.14)
 		(size -2.54 2.54)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "0b9970f9-8f55-4e9a-9cfd-ec17e7305ebd")
+		(uuid "1f2077aa-dbda-4212-b898-1d0bfe9669e1")
 	)
 	(bus_entry
-		(at 76.2 104.14)
+		(at 76.2 106.68)
 		(size -2.54 2.54)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "1f2077aa-dbda-4212-b898-1d0bfe9669e1")
+		(uuid "1f48208a-b4be-47c8-a53e-2b5e4e9bc76a")
 	)
 	(bus_entry
-		(at 76.2 106.68)
+		(at 76.2 40.64)
 		(size -2.54 2.54)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "1f48208a-b4be-47c8-a53e-2b5e4e9bc76a")
+		(uuid "6099981e-288c-48d4-8cbf-5a5e43511e32")
 	)
 	(bus_entry
 		(at 76.2 101.6)
@@ -1167,13 +1167,13 @@
 		(uuid "7031b28f-0a37-49f8-991e-59d38cd8b82a")
 	)
 	(bus_entry
-		(at 76.2 40.64)
+		(at 76.2 38.1)
 		(size -2.54 2.54)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "b88c3f42-965e-47c1-8662-6dc12df79cea")
+		(uuid "f24ca7c1-634d-433d-95cb-0823fa241889")
 	)
 	(wire
 		(pts
@@ -1237,16 +1237,6 @@
 	)
 	(wire
 		(pts
-			(xy 57.15 40.64) (xy 73.66 40.64)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "24a1a1b6-b861-4453-9f86-babed3fef778")
-	)
-	(wire
-		(pts
 			(xy 43.18 106.68) (xy 73.66 106.68)
 		)
 		(stroke
@@ -1287,43 +1277,43 @@
 	)
 	(wire
 		(pts
-			(xy 43.18 48.26) (xy 43.18 49.53)
+			(xy 57.15 40.64) (xy 73.66 40.64)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "4c22e5b4-2404-4e88-bdf3-f54b384dd921")
+		(uuid "47b9bc5f-0ad6-4164-ae90-58da236040d9")
 	)
 	(wire
 		(pts
-			(xy 50.8 111.76) (xy 50.8 114.3)
+			(xy 43.18 48.26) (xy 43.18 49.53)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "56ec6058-f8e8-41b1-a489-efb6e62e747c")
+		(uuid "4c22e5b4-2404-4e88-bdf3-f54b384dd921")
 	)
 	(wire
 		(pts
-			(xy 44.45 40.64) (xy 43.18 40.64)
+			(xy 50.8 111.76) (xy 50.8 114.3)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "5c7bc381-1f48-4a8a-909d-11e53c7bef67")
+		(uuid "56ec6058-f8e8-41b1-a489-efb6e62e747c")
 	)
 	(wire
 		(pts
-			(xy 57.15 43.18) (xy 73.66 43.18)
+			(xy 44.45 40.64) (xy 43.18 40.64)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "64323c98-6d35-4feb-ab32-9dcca714b7da")
+		(uuid "5c7bc381-1f48-4a8a-909d-11e53c7bef67")
 	)
 	(wire
 		(pts
@@ -1465,6 +1455,16 @@
 		)
 		(uuid "d35bda09-9da3-4a8b-8ea5-98bb3771e024")
 	)
+	(wire
+		(pts
+			(xy 57.15 43.18) (xy 73.66 43.18)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "dcedbcef-3bc4-4235-ace4-1a149817ffe6")
+	)
 	(bus
 		(pts
 			(xy 76.2 104.14) (xy 76.2 106.68)
@@ -1545,45 +1545,45 @@
 		)
 		(uuid "4f50f099-e995-4b8e-b60f-058e605b2568")
 	)
-	(label "CAN.L"
-		(at 57.15 43.18 0)
+	(label "SWD.IO"
+		(at 43.18 106.68 0)
 		(effects
 			(font
 				(size 1.27 1.27)
 			)
 			(justify left bottom)
 		)
-		(uuid "57221f61-83fa-4e0a-84df-e4164a2e4c44")
+		(uuid "608b761b-f7ce-4454-baf5-a42f900611a9")
 	)
-	(label "SWD.IO"
-		(at 43.18 106.68 0)
+	(label "CAN1.H"
+		(at 57.15 40.64 0)
 		(effects
 			(font
 				(size 1.27 1.27)
 			)
 			(justify left bottom)
 		)
-		(uuid "608b761b-f7ce-4454-baf5-a42f900611a9")
+		(uuid "8ffea966-497c-425d-88df-d8a7822eee1a")
 	)
-	(label "An4"
-		(at 57.15 63.5 0)
+	(label "CAN1.L"
+		(at 57.15 43.18 0)
 		(effects
 			(font
 				(size 1.27 1.27)
 			)
 			(justify left bottom)
 		)
-		(uuid "ac5bb90f-9739-4249-8d62-7dd8086ccd6c")
+		(uuid "a19d203b-e43f-4487-b6c1-70cc80352039")
 	)
-	(label "CAN.H"
-		(at 57.15 40.64 0)
+	(label "An4"
+		(at 57.15 63.5 0)
 		(effects
 			(font
 				(size 1.27 1.27)
 			)
 			(justify left bottom)
 		)
-		(uuid "e25d14b7-2bd1-473b-9e7f-09024bff5e02")
+		(uuid "ac5bb90f-9739-4249-8d62-7dd8086ccd6c")
 	)
 	(label "An2"
 		(at 44.45 63.5 180)
@@ -1595,7 +1595,7 @@
 		)
 		(uuid "fe1bca60-f871-4d9d-9559-04e1d38f2d4c")
 	)
-	(hierarchical_label "CANbus{CAN_PHY}"
+	(hierarchical_label "CAN1{CAN_PHY}"
 		(shape bidirectional)
 		(at 76.2 38.1 0)
 		(effects
@@ -1604,7 +1604,7 @@
 			)
 			(justify left)
 		)
-		(uuid "1c7cfe89-3694-4361-b65d-420f7a4927f1")
+		(uuid "24cf4204-1631-4fe3-86d1-ea4bd9fe26b2")
 	)
 	(hierarchical_label "Tach"
 		(shape input)
diff --git a/hw/headers.kicad_sch b/hw/headers.kicad_sch
index 3b55b1f..34320b4 100644
--- a/hw/headers.kicad_sch
+++ b/hw/headers.kicad_sch
@@ -1257,7 +1257,7 @@
 		)
 		(uuid "ff78af74-6bde-4d94-a2ff-152660e9fd82")
 	)
-	(label "FDCAN1.RX"
+	(label "CAN1.RX"
 		(at 43.18 104.14 0)
 		(effects
 			(font
@@ -1307,7 +1307,7 @@
 		)
 		(uuid "9c48615d-d48e-4c40-bab0-15b986360916")
 	)
-	(label "FDCAN1.TX"
+	(label "CAN1.TX"
 		(at 43.18 101.6 0)
 		(effects
 			(font
@@ -1414,7 +1414,7 @@
 		)
 		(uuid "d1bb3557-0180-45b7-b3f2-788c40a2873f")
 	)
-	(hierarchical_label "FDCAN1{CAN}"
+	(hierarchical_label "CAN1{CAN_IF}"
 		(shape input)
 		(at 63.5 99.06 0)
 		(effects
diff --git a/hw/microcontroller.kicad_sch b/hw/microcontroller.kicad_sch
index 3292082..5c669da 100644
--- a/hw/microcontroller.kicad_sch
+++ b/hw/microcontroller.kicad_sch
@@ -1378,7 +1378,7 @@
 			(embedded_fonts no)
 		)
 	)
-	(bus_alias "CAN"
+	(bus_alias "CAN_IF"
 		(members "TX" "RX")
 	)
 	(bus_alias "CAN_PHY"
@@ -2282,7 +2282,7 @@
 		)
 		(uuid "f9d82dd0-c45d-4961-a703-f0059545eef9")
 	)
-	(label "FDCAN1.TX"
+	(label "CAN1.TX"
 		(at 41.91 114.3 0)
 		(effects
 			(font
@@ -2372,7 +2372,7 @@
 		)
 		(uuid "7ccdaeb5-1d4b-458b-ab5c-c91f899a1246")
 	)
-	(label "FDCAN1.RX"
+	(label "CAN1.RX"
 		(at 93.98 99.06 180)
 		(effects
 			(font
@@ -2392,7 +2392,7 @@
 		)
 		(uuid "904f3090-bcc6-436e-8086-c16f7a9f76b4")
 	)
-	(label "FDCAN1.RX"
+	(label "CAN1.RX"
 		(at 41.91 111.76 0)
 		(effects
 			(font
@@ -2462,7 +2462,7 @@
 		)
 		(uuid "d02f09c1-a1c1-4fa7-b91a-4f22b4998f2c")
 	)
-	(label "FDCAN1.TX"
+	(label "CAN1.TX"
 		(at 160.02 63.5 0)
 		(effects
 			(font
@@ -2538,7 +2538,7 @@
 		)
 		(uuid "a93cd4f1-2d59-45f8-a294-67e83c99b7e4")
 	)
-	(hierarchical_label "FDCAN1{CAN}"
+	(hierarchical_label "CAN1{CAN_IF}"
 		(shape bidirectional)
 		(at 38.1 114.3 180)
 		(effects