Skip to content

Commit 6fcca3d

Browse files
committed
Renamed gRPC field to match JSON output
1 parent d187683 commit 6fcca3d

File tree

4 files changed

+49
-52
lines changed

4 files changed

+49
-52
lines changed

Diff for: commands/debug/debug_info.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -189,17 +189,17 @@ func getDebugProperties(req *rpc.GetDebugConfigRequest, pme *packagemanager.Expl
189189
cortexDebugCustomJson["cortex-debug"] = convertToJsonMap(cortexDebugProps)
190190
}
191191
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(),
203203
}, nil
204204
}
205205

Diff for: internal/cli/debug/debug.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ func newDebugInfoResult(info *rpc.GetDebugConfigResponse) *debugInfoResult {
151151
}
152152
}
153153
customConfigs := map[string]any{}
154-
for id, configJson := range info.GetCustomConfigurationsJson() {
154+
for id, configJson := range info.GetCustomConfigs() {
155155
var config any
156156
if err := json.Unmarshal([]byte(configJson), &config); err == nil {
157157
customConfigs[id] = config

Diff for: rpc/cc/arduino/cli/commands/v1/debug.pb.go

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

Diff for: rpc/cc/arduino/cli/commands/v1/debug.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ message GetDebugConfigResponse {
9393
google.protobuf.Any server_configuration = 8;
9494
// Custom debugger configurations (not handled directly by Arduino CLI but
9595
// provided for 3rd party plugins/debuggers)
96-
map<string, string> custom_configurations_json = 9;
96+
map<string, string> custom_configs = 9;
9797
// the SVD file to use
9898
string svd_file = 10;
9999
// The programmer specified in the request

0 commit comments

Comments
 (0)