Commit 6fcca3d

committed

Renamed gRPC field to match JSON output

1 parent d187683 commit 6fcca3dCopy full SHA for 6fcca3d

File tree

+49

-52

lines changed

+49

-52

lines changed

Lines changed: 11 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -189,17 +189,17 @@ func getDebugProperties(req rpc.GetDebugConfigRequest, pme packagemanager.Expl`
`189`	`189`	`cortexDebugCustomJson["cortex-debug"] = convertToJsonMap(cortexDebugProps)`
`190`	`190`	`}`
`191`	`191`	`return &rpc.GetDebugConfigResponse{`
`192`		`- Executable: debugProperties.Get("executable"),`
`193`		`- Server: server,`
`194`		`- ServerPath: debugProperties.Get("server." + server + ".path"),`
`195`		`- ServerConfiguration: &serverConfiguration,`
`196`		`- SvdFile: debugProperties.Get("svd_file"),`
`197`		`- Toolchain: toolchain,`
`198`		`- ToolchainPath: debugProperties.Get("toolchain.path"),`
`199`		`- ToolchainPrefix: debugProperties.Get("toolchain.prefix"),`
`200`		`- ToolchainConfiguration: &toolchainConfiguration,`
`201`		`- CustomConfigurationsJson: cortexDebugCustomJson,`
`202`		`- Programmer: req.GetProgrammer(),`
	`192`	`+ Executable: debugProperties.Get("executable"),`
	`193`	`+ Server: server,`
	`194`	`+ ServerPath: debugProperties.Get("server." + server + ".path"),`
	`195`	`+ ServerConfiguration: &serverConfiguration,`
	`196`	`+ SvdFile: debugProperties.Get("svd_file"),`
	`197`	`+ Toolchain: toolchain,`
	`198`	`+ ToolchainPath: debugProperties.Get("toolchain.path"),`
	`199`	`+ ToolchainPrefix: debugProperties.Get("toolchain.prefix"),`
	`200`	`+ ToolchainConfiguration: &toolchainConfiguration,`
	`201`	`+ CustomConfigs: cortexDebugCustomJson,`
	`202`	`+ Programmer: req.GetProgrammer(),`
`203`	`203`	`}, nil`
`204`	`204`	`}`
`205`	`205`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ func newDebugInfoResult(info rpc.GetDebugConfigResponse) debugInfoResult {`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`	`customConfigs := map[string]any{}`
`154`		`- for id, configJson := range info.GetCustomConfigurationsJson() {`
	`154`	`+ for id, configJson := range info.GetCustomConfigs() {`
`155`	`155`	`var config any`
`156`	`156`	`if err := json.Unmarshal([]byte(configJson), &config); err == nil {`
`157`	`157`	`customConfigs[id] = config`

Lines changed: 36 additions & 39 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ message GetDebugConfigResponse {`
`93`	`93`	`google.protobuf.Any server_configuration = 8;`
`94`	`94`	`// Custom debugger configurations (not handled directly by Arduino CLI but`
`95`	`95`	`// provided for 3rd party plugins/debuggers)`
`96`		`- map<string, string> custom_configurations_json = 9;`
	`96`	`+ map<string, string> custom_configs = 9;`
`97`	`97`	`// the SVD file to use`
`98`	`98`	`string svd_file = 10;`
`99`	`99`	`// The programmer specified in the request`

Comments

(0)