Skip to content

Get default port address and protocol from sketch profile using monitor -s <sketchPath> #2329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 24, 2023
Merged

Get default port address and protocol from sketch profile using monitor -s <sketchPath> #2329

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
82e3356
Get default port address and protocol from sketch profile
MatteoPologruto Sep 20, 2023
85b1a53
remove sketch flag
alessio-perugini Oct 18, 2023
93b2b86
introduve IsPortFlagSet method recevier
alessio-perugini Oct 24, 2023
65eb91d
Added integration tests
cmaglie Oct 20, 2023
3f50c4a
always load the sketch if present
alessio-perugini Oct 24, 2023
00d8940
better handle some edge cases
alessio-perugini Oct 24, 2023
6c0a0f3
InitSketchPath make warnings configurable
alessio-perugini Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
introduve IsPortFlagSet method recevier
  • Loading branch information
@alessio-perugini
alessio-perugini committed Oct 24, 2023
commit 93b2b86d92d40551acd5b4e7e3cf8e26c155f006
5 changes: 5 additions & 0 deletions internal/cli/arguments/port.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,3 +155,8 @@ func (p *Port) DetectFQBN(inst *rpc.Instance) (string, *rpc.Port) {
}
return "", nil
}

// IsPortFlagSet returns true if the port address is provided
func (p *Port) IsPortFlagSet() bool {
return p.address != ""
}
10 changes: 3 additions & 7 deletions internal/cli/monitor/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,7 @@ func NewCommand() *cobra.Command {
if len(args) > 0 {
sketchPath = args[0]
}
var portProvidedFromFlag bool
if p := cmd.Flags().Lookup("port"); p != nil && p.Changed {
portProvidedFromFlag = true
}
runMonitorCmd(&portArgs, &fqbnArg, &profileArg, sketchPath, configs, describe, timestamp, quiet, raw, portProvidedFromFlag)
runMonitorCmd(&portArgs, &fqbnArg, &profileArg, sketchPath, configs, describe, timestamp, quiet, raw)
},
}
portArgs.AddToCommand(monitorCommand)
Expand All @@ -87,7 +83,7 @@ func NewCommand() *cobra.Command {

func runMonitorCmd(
portArgs *arguments.Port, fqbnArg *arguments.Fqbn, profileArg *arguments.Profile, sketchPathArg string,
configs []string, describe, timestamp, quiet, raw bool, portProvidedFromFlag bool,
configs []string, describe, timestamp, quiet, raw bool,
) {
logrus.Info("Executing `arduino-cli monitor`")

Expand All @@ -101,7 +97,7 @@ func runMonitorCmd(
defaultPort, defaultProtocol string
)

if !portProvidedFromFlag {
if !portArgs.IsPortFlagSet() {
sketchPath := arguments.InitSketchPath(sketchPathArg)
sketch, err := sk.LoadSketch(context.Background(), &rpc.LoadSketchRequest{SketchPath: sketchPath.String()})
if err != nil {
Expand Down