Merge branch 'main' into ECAD-#22-debug-interface

pcb/dyna-micro/dyna-micro.kicad_pro

@@ -625,6 +625,10 @@
     [
       "3b69b8b5-74b9-4ef8-b089-9f6703a47935",
       "Pressure Sensor"
+    ],
+    [
+      "1545cd58-ec56-43ca-991f-528eab9b04ea",
+      "USB"
     ]
   ],
   "text_variables": {}

pcb/dyna-micro/dyna-micro.kicad_sch

@@ -7,7 +7,7 @@
 	(lib_symbols)
 	(wire
 		(pts
-			(xy 137.16 113.03) (xy 152.4 113.03)
+			(xy 137.16 113.03) (xy 153.67 113.03)
 		)
 		(stroke
 			(width 0)
@@ -17,7 +17,27 @@
 	)
 	(wire
 		(pts
-			(xy 137.16 107.95) (xy 152.4 107.95)
+			(xy 185.42 88.9) (xy 201.93 88.9)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "25be2a33-117e-42e6-b6d7-13f5c9350b88")
+	)
+	(wire
+		(pts
+			(xy 185.42 86.36) (xy 201.93 86.36)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "2962ea9b-55f6-4186-92d8-6a33bed4f6dd")
+	)
+	(wire
+		(pts
+			(xy 137.16 107.95) (xy 153.67 107.95)
 		)
 		(stroke
 			(width 0)
@@ -27,7 +47,7 @@
 	)
 	(wire
 		(pts
-			(xy 137.16 123.19) (xy 152.4 123.19)
+			(xy 137.16 123.19) (xy 153.67 123.19)
 		)
 		(stroke
 			(width 0)
@@ -37,7 +57,7 @@
 	)
 	(wire
 		(pts
-			(xy 137.16 91.44) (xy 152.4 91.44)
+			(xy 137.16 91.44) (xy 153.67 91.44)
 		)
 		(stroke
 			(width 0)
@@ -47,7 +67,7 @@
 	)
 	(wire
 		(pts
-			(xy 137.16 88.9) (xy 152.4 88.9)
+			(xy 137.16 88.9) (xy 153.67 88.9)
 		)
 		(stroke
 			(width 0)
@@ -57,7 +77,7 @@
 	)
 	(wire
 		(pts
-			(xy 137.16 86.36) (xy 152.4 86.36)
+			(xy 137.16 86.36) (xy 153.67 86.36)
 		)
 		(stroke
 			(width 0)
@@ -67,7 +87,7 @@
 	)
 	(wire
 		(pts
-			(xy 137.16 110.49) (xy 152.4 110.49)
+			(xy 137.16 110.49) (xy 153.67 110.49)
 		)
 		(stroke
 			(width 0)
@@ -77,7 +97,7 @@
 	)
 	(wire
 		(pts
-			(xy 137.16 115.57) (xy 152.4 115.57)
+			(xy 137.16 115.57) (xy 153.67 115.57)
 		)
 		(stroke
 			(width 0)
@@ -87,7 +107,7 @@
 	)
 	(wire
 		(pts
-			(xy 137.16 120.65) (xy 152.4 120.65)
+			(xy 137.16 120.65) (xy 153.67 120.65)
 		)
 		(stroke
 			(width 0)
@@ -97,7 +117,7 @@
 	)
 	(wire
 		(pts
-			(xy 137.16 93.98) (xy 152.4 93.98)
+			(xy 137.16 93.98) (xy 153.67 93.98)
 		)
 		(stroke
 			(width 0)
@@ -105,6 +125,68 @@
 		)
 		(uuid "c6009f43-4e6d-4c8e-982b-c4f7d1f909c7")
 	)
+	(sheet
+		(at 201.93 85.09)
+		(size 12.7 5.08)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(stroke
+			(width 0.1524)
+			(type solid)
+		)
+		(fill
+			(color 0 0 0 0.0000)
+		)
+		(uuid "1545cd58-ec56-43ca-991f-528eab9b04ea")
+		(property "Sheetname" "USB"
+			(at 201.93 84.3784 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left bottom)
+			)
+		)
+		(property "Sheetfile" "usb-c.kicad_sch"
+			(at 201.93 90.7546 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left top)
+			)
+		)
+		(pin "D+" bidirectional
+			(at 201.93 86.36 180)
+			(uuid "fd321604-bf4c-4306-b4fa-179e106bcfdf")
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(pin "D-" bidirectional
+			(at 201.93 88.9 180)
+			(uuid "552f5c22-8930-4991-91e1-865ac96b0fec")
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(instances
+			(project "dyna-micro"
+				(path "/0389eb62-6503-47dc-9bba-f194441b9f54"
+					(page "5")
+				)
+			)
+		)
+	)
 	(sheet
 		(at 121.92 83.82)
 		(size 15.24 12.7)
@@ -130,7 +212,7 @@
 				(justify left bottom)
 			)
 		)
-		(property "Sheetfile" "PressureSensor.kicad_sch"
+		(property "Sheetfile" "pressure-sensor.kicad_sch"
 			(at 121.92 97.1046 0)
 			(effects
 				(font
@@ -169,9 +251,9 @@
 				(justify right)
 			)
 		)
-		(pin "~CS" input
+		(pin "~{CS}" input
 			(at 137.16 93.98 0)
-			(uuid "114d920f-2164-498a-857c-aa4d001c69cc")
+			(uuid "9f2db093-86f8-4bad-922d-68180068f1bf")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -188,7 +270,7 @@
 		)
 	)
 	(sheet
-		(at 152.4 83.82)
+		(at 153.67 83.82)
 		(size 31.75 43.18)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -204,7 +286,7 @@
 		)
 		(uuid "3f625fbe-0d7d-4f9d-a789-e3d398a1e499")
 		(property "Sheetname" "MCU"
-			(at 152.4 83.1084 0)
+			(at 153.67 83.1084 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -212,8 +294,8 @@
 				(justify left bottom)
 			)
 		)
-		(property "Sheetfile" "STM32U545CETxQ.kicad_sch"
+		(property "Sheetfile" "microcontroller.kicad_sch"
-			(at 152.4 127.5846 0)
+			(at 153.67 127.5846 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -222,7 +304,7 @@
 			)
 		)
 		(property "Field2" ""
-			(at 152.4 83.82 0)
+			(at 153.67 83.82 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -230,7 +312,7 @@
 			)
 		)
 		(pin "PRES_MISO" input
-			(at 152.4 86.36 180)
+			(at 153.67 86.36 180)
 			(uuid "7fa5a1d8-78ed-4791-bfcd-3df070a1f907")
 			(effects
 				(font
@@ -239,8 +321,8 @@
 				(justify left)
 			)
 		)
-		(pin "USB_DN" bidirectional
+		(pin "USB_D-" bidirectional
-			(at 184.15 88.9 0)
+			(at 185.42 88.9 0)
 			(uuid "438d4058-3668-4025-b855-bc059ee0a2d3")
 			(effects
 				(font
@@ -250,7 +332,7 @@
 			)
 		)
 		(pin "SWDIO" bidirectional
-			(at 184.15 95.25 0)
+			(at 185.42 95.25 0)
 			(uuid "459fa982-2a73-4056-9b0c-6db61762e346")
 			(effects
 				(font
@@ -260,7 +342,7 @@
 			)
 		)
 		(pin "PRES_MOSI" output
-			(at 152.4 88.9 180)
+			(at 153.67 88.9 180)
 			(uuid "916734a5-76c4-43a8-a70f-51629b38250b")
 			(effects
 				(font
@@ -270,7 +352,7 @@
 			)
 		)
 		(pin "PRES_SCK" output
-			(at 152.4 91.44 180)
+			(at 153.67 91.44 180)
 			(uuid "d3bdb61a-de28-4352-8017-28f62b286f14")
 			(effects
 				(font
@@ -279,8 +361,8 @@
 				(justify left)
 			)
 		)
-		(pin "USB_DP" bidirectional
+		(pin "USB_D+" bidirectional
-			(at 184.15 86.36 0)
+			(at 185.42 86.36 0)
 			(uuid "20a21a7f-7d95-41ae-95a2-af86583badee")
 			(effects
 				(font
@@ -290,7 +372,7 @@
 			)
 		)
 		(pin "SWCLK" bidirectional
-			(at 184.15 97.79 0)
+			(at 185.42 97.79 0)
 			(uuid "a65b75bd-128e-44ba-9e9d-f5029397fd72")
 			(effects
 				(font
@@ -300,7 +382,7 @@
 			)
 		)
 		(pin "FLASH_MISO" input
-			(at 152.4 110.49 180)
+			(at 153.67 110.49 180)
 			(uuid "3e62d2f4-fcde-4b23-aa26-b1bbcc720485")
 			(effects
 				(font
@@ -310,7 +392,7 @@
 			)
 		)
 		(pin "FLASH_MOSI" output
-			(at 152.4 113.03 180)
+			(at 153.67 113.03 180)
 			(uuid "f1c70797-cd8a-4727-8445-27cded8a49a2")
 			(effects
 				(font
@@ -320,7 +402,7 @@
 			)
 		)
 		(pin "FLASH_SCK" output
-			(at 152.4 115.57 180)
+			(at 153.67 115.57 180)
 			(uuid "f74315e2-5546-4669-812f-12dbc13b4eec")
 			(effects
 				(font
@@ -329,9 +411,9 @@
 				(justify left)
 			)
 		)
-		(pin "FLASH_~CS" output
+		(pin "PRES_~{SC}" output
-			(at 152.4 107.95 180)
+			(at 153.67 93.98 180)
-			(uuid "dd66f90b-03ee-4a70-9256-06a6dd4503fb")
+			(uuid "c8ea607a-cf04-4502-bae6-04a21b7bc904")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -339,9 +421,9 @@
 				(justify left)
 			)
 		)
-		(pin "FLASH_~WP" output
+		(pin "FLASH_~{WP}" output
-			(at 152.4 123.19 180)
+			(at 153.67 123.19 180)
-			(uuid "a057d616-c00b-46ac-8c83-3d3dd26725e2")
+			(uuid "640bf5a5-459f-4dad-baf6-c1e8e3a310f9")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -349,9 +431,9 @@
 				(justify left)
 			)
 		)
-		(pin "FLASH_~RST" output
+		(pin "FLASH_~{CS}" output
-			(at 152.4 120.65 180)
+			(at 153.67 107.95 180)
-			(uuid "eaa2e668-9532-44f5-a06e-56d5c267bbf9")
+			(uuid "0991da82-7c60-4d3a-84e1-93c6e115bfa8")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -359,9 +441,9 @@
 				(justify left)
 			)
 		)
-		(pin "PRES_~SC" output
+		(pin "FLASH_~{RST}" output
-			(at 152.4 93.98 180)
+			(at 153.67 120.65 180)
-			(uuid "e3b38bb3-5d0d-44b6-8fad-3b97e7e7713a")
+			(uuid "367d5138-6d20-4a1e-873e-427d07b48456")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -441,29 +523,29 @@
 				(justify right)
 			)
 		)
-		(pin "~RST" input
+		(pin "~{CS}" input
-			(at 137.16 120.65 0)
-			(uuid "fb495b64-c1ff-4f63-9c8d-769044bd7801")
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify right)
-			)
-		)
-		(pin "~WP" input
-			(at 137.16 123.19 0)
-			(uuid "aeabb7fb-629b-4eef-a7ac-dbad035307c2")
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify right)
-			)
-		)
-		(pin "~CS" input
 			(at 137.16 107.95 0)
-			(uuid "daa7fd87-adc6-40c8-92b1-d12d178ef375")
+			(uuid "cfaa43d7-4512-4dd9-9684-e8f0df9f7f56")
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+			)
+		)
+		(pin "~{WP}" input
+			(at 137.16 123.19 0)
+			(uuid "324f7c7f-6dbb-48b6-bcfe-fa117dcd615d")
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+			)
+		)
+		(pin "~{RST}" input
+			(at 137.16 120.65 0)
+			(uuid "c8d87e50-c9a8-42d7-a783-99f93f6d563e")
 			(effects
 				(font
 					(size 1.27 1.27)

pcb/dyna-micro/flash.kicad_sch

@@ -655,7 +655,7 @@
 		)
 		(uuid "03797530-9748-49a5-81b0-cc6093ba624f")
 	)
-	(hierarchical_label "~WP"
+	(hierarchical_label "~{WP}"
 		(shape input)
 		(at 134.62 93.98 180)
 		(effects
@@ -666,7 +666,7 @@
 		)
 		(uuid "0e331980-54ff-4c38-aaf2-7bd835b70277")
 	)
-	(hierarchical_label "~CS"
+	(hierarchical_label "~{CS}"
 		(shape input)
 		(at 134.62 83.82 180)
 		(effects
@@ -699,7 +699,7 @@
 		)
 		(uuid "bd845fcd-8c6a-4a18-b005-a3d735ad5f1a")
 	)
-	(hierarchical_label "~RST"
+	(hierarchical_label "~{RST}"
 		(shape input)
 		(at 134.62 96.52 180)
 		(effects

pcb/dyna-micro/pressure-sensor.kicad_sch

@@ -629,7 +629,7 @@
 		)
 		(uuid "b37f3708-fa97-45fb-9ed9-974f3faf91cb")
 	)
-	(hierarchical_label "~CS"
+	(hierarchical_label "~{CS}"
 		(shape input)
 		(at 130.81 106.68 180)
 		(effects
@@ -819,7 +819,7 @@
 			(uuid "870e77f0-68c2-4cc6-abbb-fb24bd35860b")
 		)
 		(instances
-			(project ""
+			(project "dyna-micro"
 				(path "/0389eb62-6503-47dc-9bba-f194441b9f54/3b69b8b5-74b9-4ef8-b089-9f6703a47935"
 					(reference "U3")
 					(unit 1)

sw/sw.ioc

@@ -12,26 +12,29 @@ Mcu.IP1=RCC
 Mcu.IP2=SPI1
 Mcu.IP3=SPI3
 Mcu.IP4=SYS
-Mcu.IP5=USB_OTG_FS
+Mcu.IP5=USART1
-Mcu.IPNb=6
+Mcu.IP6=USB_OTG_FS
+Mcu.IPNb=7
 Mcu.Name=STM32L4Q5CGTx
 Mcu.Package=LQFP48
 Mcu.Pin0=PA5
 Mcu.Pin1=PA6
-Mcu.Pin10=PB4 (NJTRST)
+Mcu.Pin10=PA15 (JTDI)
-Mcu.Pin11=PB5
+Mcu.Pin11=PB3 (JTDO/TRACESWO)
-Mcu.Pin12=PB6
+Mcu.Pin12=PB4 (NJTRST)
-Mcu.Pin13=PB7
+Mcu.Pin13=PB5
-Mcu.Pin14=VP_SYS_VS_Systick
+Mcu.Pin14=PB6
+Mcu.Pin15=PB7
+Mcu.Pin16=VP_SYS_VS_Systick
 Mcu.Pin2=PA7
 Mcu.Pin3=PB0
-Mcu.Pin4=PA11
+Mcu.Pin4=PA9
-Mcu.Pin5=PA12
+Mcu.Pin5=PA10
-Mcu.Pin6=PA13 (JTMS/SWDIO)
+Mcu.Pin6=PA11
-Mcu.Pin7=PA14 (JTCK/SWCLK)
+Mcu.Pin7=PA12
-Mcu.Pin8=PA15 (JTDI)
+Mcu.Pin8=PA13 (JTMS/SWDIO)
-Mcu.Pin9=PB3 (JTDO/TRACESWO)
+Mcu.Pin9=PA14 (JTCK/SWCLK)
-Mcu.PinsNb=15
+Mcu.PinsNb=17
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32L4Q5CGTx
@@ -48,13 +51,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:true\:false\:true\:false
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
+PA10.Mode=Asynchronous
+PA10.Signal=USART1_RX
 PA11.Mode=Device_Only
 PA11.Signal=USB_OTG_FS_DM
 PA12.Mode=Device_Only
 PA12.Signal=USB_OTG_FS_DP
 PA13\ (JTMS/SWDIO).Locked=true
+PA13\ (JTMS/SWDIO).Mode=Serial_Wire
 PA13\ (JTMS/SWDIO).Signal=SYS_JTMS-SWDIO
 PA14\ (JTCK/SWCLK).Locked=true
+PA14\ (JTCK/SWCLK).Mode=Serial_Wire
 PA14\ (JTCK/SWCLK).Signal=SYS_JTCK-SWCLK
 PA15\ (JTDI).GPIOParameters=GPIO_Label
 PA15\ (JTDI).GPIO_Label=FLASH_CS
@@ -72,6 +79,8 @@ PA7.GPIOParameters=GPIO_Label
 PA7.GPIO_Label=PRES_MOSI
 PA7.Mode=Full_Duplex_Master
 PA7.Signal=SPI1_MOSI
+PA9.Mode=Asynchronous
+PA9.Signal=USART1_TX
 PB0.GPIOParameters=GPIO_Label
 PB0.GPIO_Label=PRES_CS
 PB0.Locked=true
@@ -199,6 +208,8 @@ SPI3.Direction=SPI_DIRECTION_2LINES
 SPI3.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate
 SPI3.Mode=SPI_MODE_MASTER
 SPI3.VirtualType=VM_MASTER
+USART1.IPParameters=VirtualMode-Asynchronous
+USART1.VirtualMode-Asynchronous=VM_ASYNC
 USB_OTG_FS.IPParameters=VirtualMode
 USB_OTG_FS.VirtualMode=Device_Only
 VP_SYS_VS_Systick.Mode=SysTick