Skip to content

GitLab

A
arduino-cli
Unverified Commit d55ba400 authored by Cristian Maglie's avatar Cristian Maglie Committed by GitHub
Browse files
Options

Various minor refactors (#1501) 

* Factored pluggable monitor creation

* Factored out code duplication

* EnumerateMonitorPortSettings does require only protocol

* Monitor.Open does require only address and protocol

* Added GetPortAddressAndProtocol helper

* fix i18n

* Apply suggestions from code review
Co-authored-by: default avatarSilvano Cerza <3314350+silvanocerza@users.noreply.github.com>
parent 5441ea43
Hide whitespace changes
Inline Side-by-side
Showing with 127 additions and 125 deletions
arduino/monitor/monitor.go
View file @ d55ba400
...@@ -29,7 +29,6 @@ import ( ...@@ -29,7 +29,6 @@ import (
"github.com/arduino/arduino-cli/cli/globals" "github.com/arduino/arduino-cli/cli/globals"
"github.com/arduino/arduino-cli/executils" "github.com/arduino/arduino-cli/executils"
"github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/i18n"
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
...@@ -264,9 +263,9 @@ func (mon *PluggableMonitor) Configure(param, value string) error { ...@@ -264,9 +263,9 @@ func (mon *PluggableMonitor) Configure(param, value string) error {
} }
// Open connects to the given Port. A communication channel is opened // Open connects to the given Port. A communication channel is opened
func (mon *PluggableMonitor) Open(port *rpc.Port) (io.ReadWriter, error) { func (mon *PluggableMonitor) Open(portAddress, portProtocol string) (io.ReadWriter, error) {
if port.Protocol != mon.supportedProtocol { if portProtocol != mon.supportedProtocol {
return nil, fmt.Errorf("invalid monitor protocol '%s': only '%s' is accepted", port.Protocol, mon.supportedProtocol) return nil, fmt.Errorf("invalid monitor protocol '%s': only '%s' is accepted", portProtocol, mon.supportedProtocol)
} }
tcpListener, err := net.Listen("tcp", "127.0.0.1:") tcpListener, err := net.Listen("tcp", "127.0.0.1:")
...@@ -276,7 +275,7 @@ func (mon *PluggableMonitor) Open(port *rpc.Port) (io.ReadWriter, error) { ...@@ -276,7 +275,7 @@ func (mon *PluggableMonitor) Open(port *rpc.Port) (io.ReadWriter, error) {
defer tcpListener.Close() defer tcpListener.Close()
tcpListenerPort := tcpListener.Addr().(*net.TCPAddr).Port tcpListenerPort := tcpListener.Addr().(*net.TCPAddr).Port
if err := mon.sendCommand(fmt.Sprintf("OPEN 127.0.0.1:%d %s\n", tcpListenerPort, port.Address)); err != nil { if err := mon.sendCommand(fmt.Sprintf("OPEN 127.0.0.1:%d %s\n", tcpListenerPort, portAddress)); err != nil {
return nil, err return nil, err
} }
if _, err := mon.waitMessage(time.Second*10, "open"); err != nil { if _, err := mon.waitMessage(time.Second*10, "open"); err != nil {
......
arduino/monitor/monitor_test.go
View file @ d55ba400
...@@ -24,7 +24,6 @@ import ( ...@@ -24,7 +24,6 @@ import (
"testing" "testing"
"time" "time"
"github.com/arduino/arduino-cli/arduino/discovery"
"github.com/arduino/arduino-cli/executils" "github.com/arduino/arduino-cli/executils"
"github.com/arduino/go-paths-helper" "github.com/arduino/go-paths-helper"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
...@@ -59,12 +58,11 @@ func TestDummyMonitor(t *testing.T) { ...@@ -59,12 +58,11 @@ func TestDummyMonitor(t *testing.T) {
err = mon.Configure("speed", "38400") err = mon.Configure("speed", "38400")
require.NoError(t, err) require.NoError(t, err)
port := &discovery.Port{Address: "/dev/ttyACM0", Protocol: "test"} rw, err := mon.Open("/dev/ttyACM0", "test")
rw, err := mon.Open(port.ToRPC())
require.NoError(t, err) require.NoError(t, err)
// Double open -> error: port already opened // Double open -> error: port already opened
_, err = mon.Open(port.ToRPC()) _, err = mon.Open("/dev/ttyACM0", "test")
require.Error(t, err) require.Error(t, err)
// Write "TEST" // Write "TEST"
...@@ -93,7 +91,7 @@ func TestDummyMonitor(t *testing.T) { ...@@ -93,7 +91,7 @@ func TestDummyMonitor(t *testing.T) {
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
require.Equal(t, int32(1), atomic.LoadInt32(&completed)) require.Equal(t, int32(1), atomic.LoadInt32(&completed))
rw, err = mon.Open(port.ToRPC()) rw, err = mon.Open("/dev/ttyACM0", "test")
require.NoError(t, err) require.NoError(t, err)
n, err = rw.Write([]byte("TEST")) n, err = rw.Write([]byte("TEST"))
require.NoError(t, err) require.NoError(t, err)
......
cli/arguments/port.go
View file @ d55ba400
...@@ -46,6 +46,21 @@ func (p *Port) AddToCommand(cmd *cobra.Command) { ...@@ -46,6 +46,21 @@ func (p *Port) AddToCommand(cmd *cobra.Command) {
cmd.Flags().DurationVar(&p.timeout, "discovery-timeout", 5*time.Second, tr("Max time to wait for port discovery, e.g.: 30s, 1m")) cmd.Flags().DurationVar(&p.timeout, "discovery-timeout", 5*time.Second, tr("Max time to wait for port discovery, e.g.: 30s, 1m"))
} }
// GetPortAddressAndProtocol returns only the port address and the port protocol
// without any other port metadata obtained from the discoveries. This method allows
// to bypass the discoveries unless the protocol is not specified: in this
// case the discoveries are needed to autodetect the protocol.
func (p *Port) GetPortAddressAndProtocol(instance *rpc.Instance, sk *sketch.Sketch) (string, string, error) {
if p.protocol != "" {
return p.address, p.protocol, nil
}
port, err := p.GetPort(instance, sk)
if err != nil {
return "", "", err
}
return port.Address, port.Protocol, nil
}
// GetPort returns the Port obtained by parsing command line arguments. // GetPort returns the Port obtained by parsing command line arguments.
// The extra metadata for the ports is obtained using the pluggable discoveries. // The extra metadata for the ports is obtained using the pluggable discoveries.
func (p *Port) GetPort(instance *rpc.Instance, sk *sketch.Sketch) (*discovery.Port, error) { func (p *Port) GetPort(instance *rpc.Instance, sk *sketch.Sketch) (*discovery.Port, error) {
......
cli/monitor/monitor.go
View file @ d55ba400
...@@ -70,23 +70,23 @@ func runMonitorCmd(cmd *cobra.Command, args []string) { ...@@ -70,23 +70,23 @@ func runMonitorCmd(cmd *cobra.Command, args []string) {
quiet = true quiet = true
} }
port, err := portArgs.GetPort(instance, nil) portAddress, portProtocol, err := portArgs.GetPortAddressAndProtocol(instance, nil)
if err != nil { if err != nil {
feedback.Error(err) feedback.Error(err)
os.Exit(errorcodes.ErrGeneric) os.Exit(errorcodes.ErrGeneric)
} }
enumerateResp, err := monitor.EnumerateMonitorPortSettings(context.Background(), &rpc.EnumerateMonitorPortSettingsRequest{
Instance: instance,
PortProtocol: portProtocol,
Fqbn: "",
})
if err != nil {
feedback.Error(tr("Error getting port settings details: %s", err))
os.Exit(errorcodes.ErrGeneric)
}
if describe { if describe {
res, err := monitor.EnumerateMonitorPortSettings(context.Background(), &rpc.EnumerateMonitorPortSettingsRequest{ feedback.PrintResult(&detailsResult{Settings: enumerateResp.Settings})
Instance: instance,
Port: port.ToRPC(),
Fqbn: "",
})
if err != nil {
feedback.Error(tr("Error getting port settings details: %s"), err)
os.Exit(errorcodes.ErrGeneric)
}
feedback.PrintResult(&detailsResult{Settings: res.Settings})
return return
} }
...@@ -99,15 +99,6 @@ func runMonitorCmd(cmd *cobra.Command, args []string) { ...@@ -99,15 +99,6 @@ func runMonitorCmd(cmd *cobra.Command, args []string) {
configuration := &rpc.MonitorPortConfiguration{} configuration := &rpc.MonitorPortConfiguration{}
if len(configs) > 0 { if len(configs) > 0 {
resp, err := monitor.EnumerateMonitorPortSettings(context.Background(), &rpc.EnumerateMonitorPortSettingsRequest{
Instance: instance,
Port: port.ToRPC(),
Fqbn: "",
})
if err != nil {
feedback.Error(err)
os.Exit(errorcodes.ErrGeneric)
}
for _, config := range configs { for _, config := range configs {
split := strings.SplitN(config, "=", 2) split := strings.SplitN(config, "=", 2)
k := "" k := ""
...@@ -118,7 +109,7 @@ func runMonitorCmd(cmd *cobra.Command, args []string) { ...@@ -118,7 +109,7 @@ func runMonitorCmd(cmd *cobra.Command, args []string) {
} }
var setting *rpc.MonitorPortSettingDescriptor var setting *rpc.MonitorPortSettingDescriptor
for _, s := range resp.GetSettings() { for _, s := range enumerateResp.GetSettings() {
if k == "" { if k == "" {
if contains(s.EnumValues, v) { if contains(s.EnumValues, v) {
setting = s setting = s
...@@ -151,7 +142,7 @@ func runMonitorCmd(cmd *cobra.Command, args []string) { ...@@ -151,7 +142,7 @@ func runMonitorCmd(cmd *cobra.Command, args []string) {
} }
portProxy, _, err := monitor.Monitor(context.Background(), &rpc.MonitorRequest{ portProxy, _, err := monitor.Monitor(context.Background(), &rpc.MonitorRequest{
Instance: instance, Instance: instance,
Port: port.ToRPC(), Port: &rpc.Port{Address: portAddress, Protocol: portProtocol},
Fqbn: "", Fqbn: "",
PortConfiguration: configuration, PortConfiguration: configuration,
}) })
...@@ -178,7 +169,7 @@ func runMonitorCmd(cmd *cobra.Command, args []string) { ...@@ -178,7 +169,7 @@ func runMonitorCmd(cmd *cobra.Command, args []string) {
}() }()
if !quiet { if !quiet {
feedback.Print(tr("Connected to %s! Press CTRL-C to exit.", port.String())) feedback.Print(tr("Connected to %s! Press CTRL-C to exit.", portAddress))
} }
// Wait for port closed // Wait for port closed
......
commands/monitor/monitor.go
View file @ d55ba400
...@@ -59,18 +59,11 @@ func Monitor(ctx context.Context, req *rpc.MonitorRequest) (*PortProxy, *pluggab ...@@ -59,18 +59,11 @@ func Monitor(ctx context.Context, req *rpc.MonitorRequest) (*PortProxy, *pluggab
return nil, nil, &commands.InvalidInstanceError{} return nil, nil, &commands.InvalidInstanceError{}
} }
monitorRef, err := findMonitorForProtocolAndBoard(pm, req.GetPort(), req.GetFqbn()) m, err := findMonitorForProtocolAndBoard(pm, req.GetPort().GetProtocol(), req.GetFqbn())
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
tool := pm.FindMonitorDependency(monitorRef)
if tool == nil {
return nil, nil, &commands.MonitorNotFoundError{Monitor: monitorRef.String()}
}
m := pluggableMonitor.New(monitorRef.Name, tool.InstallDir.Join(monitorRef.Name).String())
if err := m.Run(); err != nil { if err := m.Run(); err != nil {
return nil, nil, &commands.FailedMonitorError{Cause: err} return nil, nil, &commands.FailedMonitorError{Cause: err}
} }
...@@ -80,7 +73,7 @@ func Monitor(ctx context.Context, req *rpc.MonitorRequest) (*PortProxy, *pluggab ...@@ -80,7 +73,7 @@ func Monitor(ctx context.Context, req *rpc.MonitorRequest) (*PortProxy, *pluggab
return nil, nil, &commands.FailedMonitorError{Cause: err} return nil, nil, &commands.FailedMonitorError{Cause: err}
} }
monIO, err := m.Open(req.GetPort()) monIO, err := m.Open(req.GetPort().GetAddress(), req.GetPort().GetProtocol())
if err != nil { if err != nil {
return nil, nil, &commands.FailedMonitorError{Cause: err} return nil, nil, &commands.FailedMonitorError{Cause: err}
} }
...@@ -95,15 +88,13 @@ func Monitor(ctx context.Context, req *rpc.MonitorRequest) (*PortProxy, *pluggab ...@@ -95,15 +88,13 @@ func Monitor(ctx context.Context, req *rpc.MonitorRequest) (*PortProxy, *pluggab
}, descriptor, nil }, descriptor, nil
} }
func findMonitorForProtocolAndBoard(pm *packagemanager.PackageManager, port *rpc.Port, fqbn string) (*cores.MonitorDependency, error) { func findMonitorForProtocolAndBoard(pm *packagemanager.PackageManager, protocol, fqbn string) (*pluggableMonitor.PluggableMonitor, error) {
if port == nil {
return nil, &commands.MissingPortError{}
}
protocol := port.GetProtocol()
if protocol == "" { if protocol == "" {
return nil, &commands.MissingPortProtocolError{} return nil, &commands.MissingPortProtocolError{}
} }
var monitorDepOrRecipe *cores.MonitorDependency
// If a board is specified search the monitor in the board package first // If a board is specified search the monitor in the board package first
if fqbn != "" { if fqbn != "" {
fqbn, err := cores.ParseFQBN(fqbn) fqbn, err := cores.ParseFQBN(fqbn)
...@@ -115,16 +106,33 @@ func findMonitorForProtocolAndBoard(pm *packagemanager.PackageManager, port *rpc ...@@ -115,16 +106,33 @@ func findMonitorForProtocolAndBoard(pm *packagemanager.PackageManager, port *rpc
if err != nil { if err != nil {
return nil, &commands.UnknownFQBNError{Cause: err} return nil, &commands.UnknownFQBNError{Cause: err}
} }
if mon, ok := boardPlatform.Monitors[protocol]; ok { if mon, ok := boardPlatform.Monitors[protocol]; ok {
return mon, nil monitorDepOrRecipe = mon
} }
} }
// Otherwise look in all package for a suitable monitor if monitorDepOrRecipe == nil {
for _, platformRel := range pm.InstalledPlatformReleases() { // Otherwise look in all package for a suitable monitor
if mon, ok := platformRel.Monitors[protocol]; ok { for _, platformRel := range pm.InstalledPlatformReleases() {
return mon, nil if mon, ok := platformRel.Monitors[protocol]; ok {
monitorDepOrRecipe = mon
break
}
} }
} }
return nil, &commands.NoMonitorAvailableForProtocolError{Protocol: protocol}
if monitorDepOrRecipe == nil {
return nil, &commands.NoMonitorAvailableForProtocolError{Protocol: protocol}
}
tool := pm.FindMonitorDependency(monitorDepOrRecipe)
if tool == nil {
return nil, &commands.MonitorNotFoundError{Monitor: monitorDepOrRecipe.String()}
}
return pluggableMonitor.New(
monitorDepOrRecipe.Name,
tool.InstallDir.Join(monitorDepOrRecipe.Name).String(),
), nil
} }
commands/monitor/settings.go
View file @ d55ba400
...@@ -30,18 +30,11 @@ func EnumerateMonitorPortSettings(ctx context.Context, req *rpc.EnumerateMonitor ...@@ -30,18 +30,11 @@ func EnumerateMonitorPortSettings(ctx context.Context, req *rpc.EnumerateMonitor
return nil, &commands.InvalidInstanceError{} return nil, &commands.InvalidInstanceError{}
} }
monitorRef, err := findMonitorForProtocolAndBoard(pm, req.GetPort(), req.GetFqbn()) m, err := findMonitorForProtocolAndBoard(pm, req.GetPortProtocol(), req.GetFqbn())
if err != nil { if err != nil {
return nil, err return nil, err
} }
tool := pm.FindMonitorDependency(monitorRef)
if tool == nil {
return nil, &commands.MonitorNotFoundError{Monitor: monitorRef.String()}
}
m := pluggableMonitor.New(monitorRef.Name, tool.InstallDir.Join(monitorRef.Name).String())
if err := m.Run(); err != nil { if err := m.Run(); err != nil {
return nil, &commands.FailedMonitorError{Cause: err} return nil, &commands.FailedMonitorError{Cause: err}
} }
......
i18n/data/en.po
View file @ d55ba400
...@@ -427,7 +427,7 @@ msgstr "Configuring platform." ...@@ -427,7 +427,7 @@ msgstr "Configuring platform."
msgid "Connected" msgid "Connected"
msgstr "Connected" msgstr "Connected"
#: cli/monitor/monitor.go:181 #: cli/monitor/monitor.go:172
msgid "Connected to %s! Press CTRL-C to exit." msgid "Connected to %s! Press CTRL-C to exit."
msgstr "Connected to %s! Press CTRL-C to exit." msgstr "Connected to %s! Press CTRL-C to exit."
...@@ -504,7 +504,7 @@ msgstr "Debugging not supported for board %s" ...@@ -504,7 +504,7 @@ msgstr "Debugging not supported for board %s"
msgid "Debugging supported:" msgid "Debugging supported:"
msgstr "Debugging supported:" msgstr "Debugging supported:"
#: cli/monitor/monitor.go:199 #: cli/monitor/monitor.go:190
msgid "Default" msgid "Default"
msgstr "Default" msgstr "Default"
...@@ -790,7 +790,7 @@ msgstr "Error getting information for library %s" ...@@ -790,7 +790,7 @@ msgstr "Error getting information for library %s"
msgid "Error getting libraries info: %v" msgid "Error getting libraries info: %v"
msgstr "Error getting libraries info: %v" msgstr "Error getting libraries info: %v"
#: cli/monitor/monitor.go:86 #: cli/monitor/monitor.go:85
msgid "Error getting port settings details: %s" msgid "Error getting port settings details: %s"
msgstr "Error getting port settings details: %s" msgstr "Error getting port settings details: %s"
...@@ -1138,7 +1138,7 @@ msgstr "Global variables use {0} bytes of dynamic memory." ...@@ -1138,7 +1138,7 @@ msgstr "Global variables use {0} bytes of dynamic memory."
#: cli/core/list.go:84 #: cli/core/list.go:84
#: cli/core/search.go:114 #: cli/core/search.go:114
#: cli/monitor/monitor.go:199 #: cli/monitor/monitor.go:190
#: cli/outdated/outdated.go:62 #: cli/outdated/outdated.go:62
msgid "ID" msgid "ID"
msgstr "ID" msgstr "ID"
...@@ -1475,7 +1475,7 @@ msgstr "Missing sketch path" ...@@ -1475,7 +1475,7 @@ msgstr "Missing sketch path"
msgid "Monitor '%s' not found" msgid "Monitor '%s' not found"
msgstr "Monitor '%s' not found" msgstr "Monitor '%s' not found"
#: cli/monitor/monitor.go:147 #: cli/monitor/monitor.go:138
msgid "Monitor port settings:" msgid "Monitor port settings:"
msgstr "Monitor port settings:" msgstr "Monitor port settings:"
...@@ -1731,8 +1731,8 @@ msgstr "Platform size (bytes):" ...@@ -1731,8 +1731,8 @@ msgstr "Platform size (bytes):"
msgid "Port" msgid "Port"
msgstr "Port" msgstr "Port"
#: cli/monitor/monitor.go:168 #: cli/monitor/monitor.go:159
#: cli/monitor/monitor.go:175 #: cli/monitor/monitor.go:166
msgid "Port closed:" msgid "Port closed:"
msgstr "Port closed:" msgstr "Port closed:"
...@@ -1873,7 +1873,7 @@ msgstr "Sets a setting value." ...@@ -1873,7 +1873,7 @@ msgstr "Sets a setting value."
msgid "Sets where to save the configuration file." msgid "Sets where to save the configuration file."
msgstr "Sets where to save the configuration file." msgstr "Sets where to save the configuration file."
#: cli/monitor/monitor.go:199 #: cli/monitor/monitor.go:190
msgid "Setting" msgid "Setting"
msgstr "Setting" msgstr "Setting"
...@@ -2348,7 +2348,7 @@ msgstr "VERSION" ...@@ -2348,7 +2348,7 @@ msgstr "VERSION"
msgid "VERSION_NUMBER" msgid "VERSION_NUMBER"
msgstr "VERSION_NUMBER" msgstr "VERSION_NUMBER"
#: cli/monitor/monitor.go:199 #: cli/monitor/monitor.go:190
msgid "Values" msgid "Values"
msgstr "Values" msgstr "Values"
...@@ -2503,7 +2503,7 @@ msgstr "cleaning build path" ...@@ -2503,7 +2503,7 @@ msgstr "cleaning build path"
msgid "command" msgid "command"
msgstr "command" msgstr "command"
#: arduino/monitor/monitor.go:150 #: arduino/monitor/monitor.go:149
msgid "command '%[1]s' failed: %[2]s" msgid "command '%[1]s' failed: %[2]s"
msgstr "command '%[1]s' failed: %[2]s" msgstr "command '%[1]s' failed: %[2]s"
...@@ -2516,7 +2516,7 @@ msgstr "command '%[1]s' failed: %[2]s" ...@@ -2516,7 +2516,7 @@ msgstr "command '%[1]s' failed: %[2]s"
msgid "command failed: %s" msgid "command failed: %s"
msgstr "command failed: %s" msgstr "command failed: %s"
#: arduino/monitor/monitor.go:147 #: arduino/monitor/monitor.go:146
msgid "communication out of sync, expected '%[1]s', received '%[2]s'" msgid "communication out of sync, expected '%[1]s', received '%[2]s'"
msgstr "communication out of sync, expected '%[1]s', received '%[2]s'" msgstr "communication out of sync, expected '%[1]s', received '%[2]s'"
...@@ -2855,11 +2855,11 @@ msgstr "invalid platform archive size: %s" ...@@ -2855,11 +2855,11 @@ msgstr "invalid platform archive size: %s"
msgid "invalid pluggable monitor reference: %s" msgid "invalid pluggable monitor reference: %s"
msgstr "invalid pluggable monitor reference: %s" msgstr "invalid pluggable monitor reference: %s"
#: cli/monitor/monitor.go:130 #: cli/monitor/monitor.go:121
msgid "invalid port configuration value for %s: %s" msgid "invalid port configuration value for %s: %s"
msgstr "invalid port configuration value for %s: %s" msgstr "invalid port configuration value for %s: %s"
#: cli/monitor/monitor.go:139 #: cli/monitor/monitor.go:130
msgid "invalid port configuration: %s" msgid "invalid port configuration: %s"
msgstr "invalid port configuration: %s" msgstr "invalid port configuration: %s"
...@@ -3106,11 +3106,11 @@ msgstr "pluggable discovery already added: %s" ...@@ -3106,11 +3106,11 @@ msgstr "pluggable discovery already added: %s"
msgid "port" msgid "port"
msgstr "port" msgstr "port"
#: cli/arguments/port.go:122 #: cli/arguments/port.go:137
msgid "port not found: %[1]s %[2]s" msgid "port not found: %[1]s %[2]s"
msgstr "port not found: %[1]s %[2]s" msgstr "port not found: %[1]s %[2]s"
#: arduino/monitor/monitor.go:239 #: arduino/monitor/monitor.go:238
msgid "protocol version not supported: requested %[1]d, got %[2]d" msgid "protocol version not supported: requested %[1]d, got %[2]d"
msgstr "protocol version not supported: requested %[1]d, got %[2]d" msgstr "protocol version not supported: requested %[1]d, got %[2]d"
...@@ -3300,7 +3300,7 @@ msgstr "the platform has no releases" ...@@ -3300,7 +3300,7 @@ msgstr "the platform has no releases"
msgid "the server responded with status %s" msgid "the server responded with status %s"
msgstr "the server responded with status %s" msgstr "the server responded with status %s"
#: arduino/monitor/monitor.go:140 #: arduino/monitor/monitor.go:139
msgid "timeout waiting for message" msgid "timeout waiting for message"
msgstr "timeout waiting for message" msgstr "timeout waiting for message"
......
i18n/rice-box.go
View file @ d55ba400
This source diff could not be displayed because it is too large. You can view the blob instead.
rpc/cc/arduino/cli/commands/v1/monitor.pb.go
View file @ d55ba400
...@@ -299,8 +299,8 @@ type EnumerateMonitorPortSettingsRequest struct { ...@@ -299,8 +299,8 @@ type EnumerateMonitorPortSettingsRequest struct {
// Arduino Core Service instance from the `Init` response. // Arduino Core Service instance from the `Init` response.
Instance *Instance `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"` Instance *Instance `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"`
// The Port to enumerate settings. // The port protoco to enumerate settings.
Port *Port `protobuf:"bytes,2,opt,name=port,proto3" json:"port,omitempty"` PortProtocol string `protobuf:"bytes,2,opt,name=port_protocol,json=portProtocol,proto3" json:"port_protocol,omitempty"`
// The board FQBN we are trying to connect to. This is optional, and it's // The board FQBN we are trying to connect to. This is optional, and it's
// needed to disambiguate if more than one platform provides the pluggable // needed to disambiguate if more than one platform provides the pluggable
// monitor for a given port protocol. // monitor for a given port protocol.
...@@ -346,11 +346,11 @@ func (x *EnumerateMonitorPortSettingsRequest) GetInstance() *Instance { ...@@ -346,11 +346,11 @@ func (x *EnumerateMonitorPortSettingsRequest) GetInstance() *Instance {
return nil return nil
} }
func (x *EnumerateMonitorPortSettingsRequest) GetPort() *Port { func (x *EnumerateMonitorPortSettingsRequest) GetPortProtocol() string {
if x != nil { if x != nil {
return x.Port return x.PortProtocol
} }
return nil return ""
} }
func (x *EnumerateMonitorPortSettingsRequest) GetFqbn() string { func (x *EnumerateMonitorPortSettingsRequest) GetFqbn() string {
...@@ -544,41 +544,40 @@ var file_cc_arduino_cli_commands_v1_monitor_proto_rawDesc = []byte{ ...@@ -544,41 +544,40 @@ var file_cc_arduino_cli_commands_v1_monitor_proto_rawDesc = []byte{
0x1d, 0x0a, 0x0a, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x1d, 0x0a, 0x0a, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x49, 0x64, 0x12, 0x14, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x49, 0x64, 0x12, 0x14,
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76,
0x61, 0x6c, 0x75, 0x65, 0x22, 0xb1, 0x01, 0x0a, 0x23, 0x45, 0x6e, 0x75, 0x6d, 0x65, 0x72, 0x61, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xa0, 0x01, 0x0a, 0x23, 0x45, 0x6e, 0x75, 0x6d, 0x65, 0x72, 0x61,
0x74, 0x65, 0x4d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x53, 0x65, 0x74, 0x74, 0x65, 0x4d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x53, 0x65, 0x74,
0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x40, 0x0a, 0x08, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x40, 0x0a, 0x08,
0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24,
0x2e, 0x63, 0x63, 0x2e, 0x61, 0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x2e, 0x63, 0x6c, 0x69, 0x2e, 0x2e, 0x63, 0x63, 0x2e, 0x61, 0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x2e, 0x63, 0x6c, 0x69, 0x2e,
0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x73, 0x74, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x73, 0x74,
0x61, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x34, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x23,
0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x63, 0x0a, 0x0d, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18,
0x63, 0x2e, 0x61, 0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x2e, 0x63, 0x6c, 0x69, 0x2e, 0x63, 0x6f, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x6f, 0x72, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f,
0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x6f, 0x72, 0x74, 0x52, 0x04, 0x63, 0x6f, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x71, 0x62, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28,
0x70, 0x6f, 0x72, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x71, 0x62, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x09, 0x52, 0x04, 0x66, 0x71, 0x62, 0x6e, 0x22, 0x7c, 0x0a, 0x24, 0x45, 0x6e, 0x75, 0x6d, 0x65,
0x28, 0x09, 0x52, 0x04, 0x66, 0x71, 0x62, 0x6e, 0x22, 0x7c, 0x0a, 0x24, 0x45, 0x6e, 0x75, 0x6d, 0x72, 0x61, 0x74, 0x65, 0x4d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x53,
0x65, 0x72, 0x61, 0x74, 0x65, 0x4d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x54, 0x0a, 0x08, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
0x12, 0x54, 0x0a, 0x08, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x0b, 0x32, 0x38, 0x2e, 0x63, 0x63, 0x2e, 0x61, 0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x2e, 0x63,
0x28, 0x0b, 0x32, 0x38, 0x2e, 0x63, 0x63, 0x2e, 0x61, 0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x2e, 0x6c, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x4d,
0x63, 0x6c, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e,
0x4d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x67, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x52, 0x08, 0x73, 0x65, 0x74,
0x6e, 0x67, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x52, 0x08, 0x73, 0x65, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x22, 0x9e, 0x01, 0x0a, 0x1c, 0x4d, 0x6f, 0x6e, 0x69, 0x74, 0x6f,
0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x22, 0x9e, 0x01, 0x0a, 0x1c, 0x4d, 0x6f, 0x6e, 0x69, 0x74, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x44, 0x65, 0x73, 0x63,
0x6f, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x44, 0x65, 0x73, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e,
0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x65, 0x74, 0x74, 0x69, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x65, 0x74, 0x74,
0x6e, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x65, 0x74, 0x69, 0x6e, 0x67, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x02,
0x74, 0x69, 0x6e, 0x67, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x74,
0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12,
0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x1f, 0x0a, 0x0b, 0x65, 0x6e, 0x75, 0x6d, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x04,
0x12, 0x1f, 0x0a, 0x0b, 0x65, 0x6e, 0x75, 0x6d, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x65, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73,
0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x65, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52,
0x73, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x2f, 0x61, 0x72, 0x64,
0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x2f, 0x61, 0x72, 0x75, 0x69, 0x6e, 0x6f, 0x2d, 0x63, 0x6c, 0x69, 0x2f, 0x72, 0x70, 0x63, 0x2f, 0x63, 0x63, 0x2f,
0x64, 0x75, 0x69, 0x6e, 0x6f, 0x2d, 0x63, 0x6c, 0x69, 0x2f, 0x72, 0x70, 0x63, 0x2f, 0x63, 0x63, 0x61, 0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x2f, 0x63, 0x6c, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x6d,
0x2f, 0x61, 0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x2f, 0x63, 0x6c, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73,
0x6d, 0x61, 0x6e, 0x64, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
...@@ -612,13 +611,12 @@ var file_cc_arduino_cli_commands_v1_monitor_proto_depIdxs = []int32{ ...@@ -612,13 +611,12 @@ var file_cc_arduino_cli_commands_v1_monitor_proto_depIdxs = []int32{
3, // 3: cc.arduino.cli.commands.v1.MonitorPortConfiguration.settings:type_name -> cc.arduino.cli.commands.v1.MonitorPortSetting 3, // 3: cc.arduino.cli.commands.v1.MonitorPortConfiguration.settings:type_name -> cc.arduino.cli.commands.v1.MonitorPortSetting
3, // 4: cc.arduino.cli.commands.v1.MonitorResponse.applied_settings:type_name -> cc.arduino.cli.commands.v1.MonitorPortSetting 3, // 4: cc.arduino.cli.commands.v1.MonitorResponse.applied_settings:type_name -> cc.arduino.cli.commands.v1.MonitorPortSetting
7, // 5: cc.arduino.cli.commands.v1.EnumerateMonitorPortSettingsRequest.instance:type_name -> cc.arduino.cli.commands.v1.Instance 7, // 5: cc.arduino.cli.commands.v1.EnumerateMonitorPortSettingsRequest.instance:type_name -> cc.arduino.cli.commands.v1.Instance
8, // 6: cc.arduino.cli.commands.v1.EnumerateMonitorPortSettingsRequest.port:type_name -> cc.arduino.cli.commands.v1.Port 6, // 6: cc.arduino.cli.commands.v1.EnumerateMonitorPortSettingsResponse.settings:type_name -> cc.arduino.cli.commands.v1.MonitorPortSettingDescriptor
6, // 7: cc.arduino.cli.commands.v1.EnumerateMonitorPortSettingsResponse.settings:type_name -> cc.arduino.cli.commands.v1.MonitorPortSettingDescriptor 7, // [7:7] is the sub-list for method output_type
8, // [8:8] is the sub-list for method output_type 7, // [7:7] is the sub-list for method input_type
8, // [8:8] is the sub-list for method input_type 7, // [7:7] is the sub-list for extension type_name
8, // [8:8] is the sub-list for extension type_name 7, // [7:7] is the sub-list for extension extendee
8, // [8:8] is the sub-list for extension extendee 0, // [0:7] is the sub-list for field type_name
0, // [0:8] is the sub-list for field type_name
} }
func init() { file_cc_arduino_cli_commands_v1_monitor_proto_init() } func init() { file_cc_arduino_cli_commands_v1_monitor_proto_init() }
......
rpc/cc/arduino/cli/commands/v1/monitor.proto
View file @ d55ba400
...@@ -61,8 +61,8 @@ message MonitorPortSetting { ...@@ -61,8 +61,8 @@ message MonitorPortSetting {
message EnumerateMonitorPortSettingsRequest { message EnumerateMonitorPortSettingsRequest {
// Arduino Core Service instance from the `Init` response. // Arduino Core Service instance from the `Init` response.
Instance instance = 1; Instance instance = 1;
// The Port to enumerate settings. // The port protocol to enumerate settings.
Port port = 2; string port_protocol = 2;
// The board FQBN we are trying to connect to. This is optional, and it's // The board FQBN we are trying to connect to. This is optional, and it's
// needed to disambiguate if more than one platform provides the pluggable // needed to disambiguate if more than one platform provides the pluggable
// monitor for a given port protocol. // monitor for a given port protocol.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment