feat: auto guess port for monitoring
This commit is contained in:
@@ -36,6 +36,8 @@ var Cmd = &base.Command{
|
||||
func init() {
|
||||
Cmd.Run = runCmd
|
||||
base.PassBuildFlags(Cmd)
|
||||
|
||||
flags.AddCommonFlags(&Cmd.Flag)
|
||||
flags.AddBuildFlags(&Cmd.Flag)
|
||||
flags.AddOutputFlags(&Cmd.Flag)
|
||||
}
|
||||
|
||||
@@ -31,6 +31,7 @@ var Cmd = &base.Command{
|
||||
|
||||
func init() {
|
||||
Cmd.Run = runCmd
|
||||
flags.AddCommonFlags(&Cmd.Flag)
|
||||
flags.AddBuildFlags(&Cmd.Flag)
|
||||
}
|
||||
|
||||
|
||||
@@ -27,8 +27,11 @@ var CheckLinkArgs bool
|
||||
var CheckLLFiles bool
|
||||
var GenLLFiles bool
|
||||
|
||||
func AddCommonFlags(fs *flag.FlagSet) {
|
||||
fs.BoolVar(&Verbose, "v", false, "Verbose output")
|
||||
}
|
||||
|
||||
func AddBuildFlags(fs *flag.FlagSet) {
|
||||
fs.BoolVar(&Verbose, "v", false, "Verbose mode")
|
||||
fs.StringVar(&Tags, "tags", "", "Build tags")
|
||||
fs.StringVar(&BuildEnv, "buildenv", "", "Build environment")
|
||||
if buildenv.Dev {
|
||||
|
||||
@@ -35,6 +35,7 @@ var Cmd = &base.Command{
|
||||
|
||||
func init() {
|
||||
Cmd.Run = runCmd
|
||||
flags.AddCommonFlags(&Cmd.Flag)
|
||||
flags.AddBuildFlags(&Cmd.Flag)
|
||||
flags.AddEmbeddedFlags(&Cmd.Flag)
|
||||
}
|
||||
|
||||
@@ -22,6 +22,7 @@ import (
|
||||
|
||||
"github.com/goplus/llgo/cmd/internal/base"
|
||||
"github.com/goplus/llgo/cmd/internal/flags"
|
||||
"github.com/goplus/llgo/internal/crosscompile"
|
||||
"github.com/goplus/llgo/internal/monitor"
|
||||
)
|
||||
|
||||
@@ -32,6 +33,7 @@ var Cmd = &base.Command{
|
||||
}
|
||||
|
||||
func init() {
|
||||
flags.AddCommonFlags(&Cmd.Flag)
|
||||
flags.AddEmbeddedFlags(&Cmd.Flag)
|
||||
Cmd.Run = runMonitor
|
||||
}
|
||||
@@ -45,24 +47,30 @@ func runMonitor(cmd *base.Command, args []string) {
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
if flags.Port == "" && flags.Target == "" {
|
||||
fmt.Fprintf(os.Stderr, "llgo monitor: must specify either -port or -target\n")
|
||||
return
|
||||
}
|
||||
|
||||
var executable string
|
||||
if len(args) == 1 {
|
||||
executable = args[0]
|
||||
}
|
||||
|
||||
var serialPort []string
|
||||
if flags.Target != "" {
|
||||
conf, err := crosscompile.UseTarget(flags.Target)
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "llgo monitor: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
serialPort = conf.Flash.SerialPort
|
||||
}
|
||||
|
||||
config := monitor.MonitorConfig{
|
||||
Port: flags.Port,
|
||||
Target: flags.Target,
|
||||
BaudRate: flags.BaudRate,
|
||||
Executable: executable,
|
||||
SerialPort: serialPort,
|
||||
}
|
||||
|
||||
if err := monitor.Monitor(config, true); err != nil {
|
||||
if err := monitor.Monitor(config, flags.Verbose); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "llgo monitor: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
@@ -48,11 +48,13 @@ func init() {
|
||||
Cmd.Run = runCmd
|
||||
CmpTestCmd.Run = runCmpTest
|
||||
base.PassBuildFlags(Cmd)
|
||||
flags.AddCommonFlags(&Cmd.Flag)
|
||||
flags.AddBuildFlags(&Cmd.Flag)
|
||||
flags.AddEmulatorFlags(&Cmd.Flag)
|
||||
flags.AddEmbeddedFlags(&Cmd.Flag) // for -target support
|
||||
|
||||
base.PassBuildFlags(CmpTestCmd)
|
||||
flags.AddCommonFlags(&CmpTestCmd.Flag)
|
||||
flags.AddBuildFlags(&CmpTestCmd.Flag)
|
||||
flags.AddEmulatorFlags(&CmpTestCmd.Flag)
|
||||
flags.AddEmbeddedFlags(&CmpTestCmd.Flag) // for -target support
|
||||
|
||||
@@ -17,6 +17,7 @@ var Cmd = &base.Command{
|
||||
|
||||
func init() {
|
||||
Cmd.Run = runCmd
|
||||
flags.AddCommonFlags(&Cmd.Flag)
|
||||
flags.AddBuildFlags(&Cmd.Flag)
|
||||
flags.AddEmulatorFlags(&Cmd.Flag)
|
||||
flags.AddEmbeddedFlags(&Cmd.Flag)
|
||||
|
||||
Reference in New Issue
Block a user