feat: llgo monitor -target target -port port

This commit is contained in:
Li Jie
2025-09-06 21:29:48 +08:00
parent 519faabfe1
commit 9a5b231c88
8 changed files with 464 additions and 10 deletions

View File

@@ -21,6 +21,7 @@ var Tags string
var Target string
var Emulator bool
var Port string
var BaudRate int
var AbiMode int
var CheckLinkArgs bool
var CheckLLFiles bool
@@ -30,7 +31,6 @@ func AddBuildFlags(fs *flag.FlagSet) {
fs.BoolVar(&Verbose, "v", false, "Verbose mode")
fs.StringVar(&Tags, "tags", "", "Build tags")
fs.StringVar(&BuildEnv, "buildenv", "", "Build environment")
fs.StringVar(&Target, "target", "", "Target platform (e.g., rp2040, wasi)")
if buildenv.Dev {
fs.IntVar(&AbiMode, "abi", 2, "ABI mode (default 2). 0 = none, 1 = cfunc, 2 = allfunc.")
fs.BoolVar(&CheckLinkArgs, "check-linkargs", false, "check link args valid")
@@ -46,7 +46,9 @@ func AddEmulatorFlags(fs *flag.FlagSet) {
}
func AddEmbeddedFlags(fs *flag.FlagSet) {
fs.StringVar(&Target, "target", "", "Target platform (e.g., rp2040, wasi)")
fs.StringVar(&Port, "port", "", "Target port for flashing")
fs.IntVar(&BaudRate, "baudrate", 115200, "Baudrate for serial communication")
}
func AddCmpTestFlags(fs *flag.FlagSet) {
@@ -57,18 +59,18 @@ func UpdateConfig(conf *build.Config) {
conf.Tags = Tags
conf.Verbose = Verbose
conf.Target = Target
conf.Port = Port
conf.BaudRate = BaudRate
switch conf.Mode {
case build.ModeBuild:
conf.OutFile = OutputFile
conf.FileFormat = FileFormat
case build.ModeRun, build.ModeTest:
conf.Emulator = Emulator
conf.Port = Port
case build.ModeInstall:
conf.Port = Port
case build.ModeCmpTest:
conf.Emulator = Emulator
conf.Port = Port
conf.GenExpect = Gen
}
if buildenv.Dev {

View File

@@ -0,0 +1,69 @@
/*
* Copyright (c) 2025 The GoPlus Authors (goplus.org). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package monitor
import (
"fmt"
"os"
"github.com/goplus/llgo/cmd/internal/base"
"github.com/goplus/llgo/cmd/internal/flags"
"github.com/goplus/llgo/internal/monitor"
)
// Cmd represents the monitor command.
var Cmd = &base.Command{
UsageLine: "llgo monitor [flags] [executable]",
Short: "Monitor serial output from device",
}
func init() {
flags.AddEmbeddedFlags(&Cmd.Flag)
Cmd.Run = runMonitor
}
func runMonitor(cmd *base.Command, args []string) {
cmd.Flag.Parse(args)
args = cmd.Flag.Args()
if len(args) > 1 {
fmt.Fprintf(os.Stderr, "llgo monitor: too many arguments\n")
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]
}
config := monitor.MonitorConfig{
Port: flags.Port,
Target: flags.Target,
BaudRate: flags.BaudRate,
Executable: executable,
}
if err := monitor.Monitor(config, true); err != nil {
fmt.Fprintf(os.Stderr, "llgo monitor: %v\n", err)
os.Exit(1)
}
}

29
cmd/llgo/monitor_cmd.gox Normal file
View File

@@ -0,0 +1,29 @@
/*
* Copyright (c) 2025 The GoPlus Authors (goplus.org). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import (
self "github.com/goplus/llgo/cmd/internal/monitor"
)
use "monitor [flags] [executable]"
short "Monitor serial output from device"
flagOff
run args => {
self.Cmd.Run self.Cmd, args
}

View File

@@ -8,6 +8,7 @@ import (
"github.com/goplus/llgo/cmd/internal/build"
"github.com/goplus/llgo/cmd/internal/clean"
"github.com/goplus/llgo/cmd/internal/install"
"github.com/goplus/llgo/cmd/internal/monitor"
"github.com/goplus/llgo/cmd/internal/run"
"github.com/goplus/llgo/cmd/internal/test"
"github.com/goplus/llgo/internal/env"
@@ -40,6 +41,10 @@ type Cmd_install struct {
type App struct {
xcmd.App
}
type Cmd_monitor struct {
xcmd.Command
*App
}
type Cmd_run struct {
xcmd.Command
*App
@@ -64,10 +69,11 @@ func (this *App) Main() {
_xgo_obj2 := &Cmd_cmptest{App: this}
_xgo_obj3 := &Cmd_get{App: this}
_xgo_obj4 := &Cmd_install{App: this}
_xgo_obj5 := &Cmd_run{App: this}
_xgo_obj6 := &Cmd_test{App: this}
_xgo_obj7 := &Cmd_version{App: this}
xcmd.Gopt_App_Main(this, _xgo_obj0, _xgo_obj1, _xgo_obj2, _xgo_obj3, _xgo_obj4, _xgo_obj5, _xgo_obj6, _xgo_obj7)
_xgo_obj5 := &Cmd_monitor{App: this}
_xgo_obj6 := &Cmd_run{App: this}
_xgo_obj7 := &Cmd_test{App: this}
_xgo_obj8 := &Cmd_version{App: this}
xcmd.Gopt_App_Main(this, _xgo_obj0, _xgo_obj1, _xgo_obj2, _xgo_obj3, _xgo_obj4, _xgo_obj5, _xgo_obj6, _xgo_obj7, _xgo_obj8)
}
//line cmd/llgo/build_cmd.gox:20
@@ -163,6 +169,25 @@ func (this *Cmd_install) Classfname() string {
return "install"
}
//line cmd/llgo/monitor_cmd.gox:21
func (this *Cmd_monitor) Main(_xgo_arg0 string) {
this.Command.Main(_xgo_arg0)
//line cmd/llgo/monitor_cmd.gox:21:1
this.Use("monitor [flags] [executable]")
//line cmd/llgo/monitor_cmd.gox:23:1
this.Short("Monitor serial output from device")
//line cmd/llgo/monitor_cmd.gox:25:1
this.FlagOff()
//line cmd/llgo/monitor_cmd.gox:27:1
this.Run__1(func(args []string) {
//line cmd/llgo/monitor_cmd.gox:28:1
monitor.Cmd.Run(monitor.Cmd, args)
})
}
func (this *Cmd_monitor) Classfname() string {
return "monitor"
}
//line cmd/llgo/run_cmd.gox:20
func (this *Cmd_run) Main(_xgo_arg0 string) {
this.Command.Main(_xgo_arg0)