arduino
diff --git a/‎commands/debug/debug_info.go
Copy file name to clipboardExpand all lines: commands/debug/debug_info.go
+1Lines changed: 1 addition & 0 deletions b/‎commands/debug/debug_info.go
Copy file name to clipboardExpand all lines: commands/debug/debug_info.go
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎internal/cli/debug/debug.go
Copy file name to clipboardExpand all lines: internal/cli/debug/debug.go
+5Lines changed: 5 additions & 0 deletions b/‎internal/cli/debug/debug.go
Copy file name to clipboardExpand all lines: internal/cli/debug/debug.go
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎internal/integrationtest/debug/debug_test.go
Copy file name to clipboardExpand all lines: internal/integrationtest/debug/debug_test.go
+1Lines changed: 1 addition & 0 deletions b/‎internal/integrationtest/debug/debug_test.go
Copy file name to clipboardExpand all lines: internal/integrationtest/debug/debug_test.go
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎internal/integrationtest/debug/testdata/hardware/my/samd/boards.txt
Copy file name to clipboardExpand all lines: internal/integrationtest/debug/testdata/hardware/my/samd/boards.txt
+1Lines changed: 1 addition & 0 deletions b/‎internal/integrationtest/debug/testdata/hardware/my/samd/boards.txt
Copy file name to clipboardExpand all lines: internal/integrationtest/debug/testdata/hardware/my/samd/boards.txt
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎rpc/cc/arduino/cli/commands/v1/debug.pb.go
Copy file name to clipboardExpand all lines: rpc/cc/arduino/cli/commands/v1/debug.pb.go
+27-17Lines changed: 27 additions & 17 deletions b/‎rpc/cc/arduino/cli/commands/v1/debug.pb.go
Copy file name to clipboardExpand all lines: rpc/cc/arduino/cli/commands/v1/debug.pb.go
+27-17Lines changed: 27 additions & 17 deletions
diff --git a/‎rpc/cc/arduino/cli/commands/v1/debug.proto
Copy file name to clipboardExpand all lines: rpc/cc/arduino/cli/commands/v1/debug.proto
+2Lines changed: 2 additions & 0 deletions b/‎rpc/cc/arduino/cli/commands/v1/debug.proto
Copy file name to clipboardExpand all lines: rpc/cc/arduino/cli/commands/v1/debug.proto
+2Lines changed: 2 additions & 0 deletions
@@ -191,6 +191,7 @@ func getDebugProperties(req *rpc.GetDebugConfigRequest, pme *packagemanager.Expl
 		Server:                 server,
 		ServerPath:             debugProperties.Get("server." + server + ".path"),
 		ServerConfiguration:    &serverConfiguration,
+		SvdFile:                debugProperties.Get("svd_file"),
 		Toolchain:              toolchain,
 		ToolchainPath:          debugProperties.Get("toolchain.path"),
 		ToolchainPrefix:        debugProperties.Get("toolchain.prefix"),
 
@@ -124,6 +124,7 @@ type debugInfoResult struct {
 	Server                  string `json:"server,omitempty"`
 	ServerPath              string `json:"server_path,omitempty"`
 	ServerConfig            any    `json:"server_configuration,omitempty"`
+	SvdFile                 string `json:"svd_file,omitempty"`
 	CortexDebugCustomConfig any    `json:"cortex-debug_custom_configuration,omitempty"`
 }
 
@@ -163,6 +164,7 @@ func newDebugInfoResult(info *rpc.GetDebugConfigResponse) *debugInfoResult {
 		Server:                  info.Server,
 		ServerPath:              info.ServerPath,
 		ServerConfig:            serverConfig,
+		SvdFile:                 info.SvdFile,
 		CortexDebugCustomConfig: cortexDebugCustomConfig,
 	}
 }
@@ -179,6 +181,9 @@ func (r *debugInfoResult) String() string {
 	t.AddRow(tr("Toolchain type"), table.NewCell(r.Toolchain, green))
 	t.AddRow(tr("Toolchain path"), table.NewCell(r.ToolchainPath, dimGreen))
 	t.AddRow(tr("Toolchain prefix"), table.NewCell(r.ToolchainPrefix, dimGreen))
+	if r.SvdFile != "" {
+		t.AddRow(tr("SVD file path"), table.NewCell(r.SvdFile, dimGreen))
+	}
 	switch r.Toolchain {
 	case "gcc":
 		// no options available at the moment...
 
@@ -130,6 +130,7 @@ func testAllDebugInformation(t *testing.T, env *integrationtest.Environment, cli
 				"third"
 			]
 		},
+		"svd_file": "svd-file",
 		"cortex-debug_custom_configuration": {
 			"anotherStringParamer": "hellooo",
 			"overrideRestartCommands": [
 
@@ -43,3 +43,4 @@ my.debug.cortex-debug.custom.overrideRestartCommands.1=monitor gdb_sync
 my.debug.cortex-debug.custom.overrideRestartCommands.2=thb setup
 my.debug.cortex-debug.custom.overrideRestartCommands.3=c
 my.debug.cortex-debug.custom.anotherStringParamer=hellooo
+my.debug.svd_file=svd-file
@@ -94,6 +94,8 @@ message GetDebugConfigResponse {
   // cortex-debug custom JSON configuration, it is provided as is from
   // the platform developers.
   string cortex_debug_custom_json = 9;
+  // the SVD file to use
+  string svd_file = 10;
 }
 
 // Configurations specific for the 'gcc' toolchain
Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,7 @@ func testAllDebugInformation(t testing.T, env integrationtest.Environment, cli`
`130`	`130`	`"third"`
`131`	`131`	`]`
`132`	`132`	`},`
	`133`	`+ "svd_file": "svd-file",`
`133`	`134`	`"cortex-debug_custom_configuration": {`
`134`	`135`	`"anotherStringParamer": "hellooo",`
`135`	`136`	`"overrideRestartCommands": [`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,8 @@ message GetDebugConfigResponse {`
`94`	`94`	`// cortex-debug custom JSON configuration, it is provided as is from`
`95`	`95`	`// the platform developers.`
`96`	`96`	`string cortex_debug_custom_json = 9;`
	`97`	`+ // the SVD file to use`
	`98`	`+ string svd_file = 10;`
`97`	`99`	`}`
`98`	`100`
`99`	`101`	`// Configurations specific for the 'gcc' toolchain`