From cb7d470ba45af260e3ec9a0ebf7b066be5a7b311 Mon Sep 17 00:00:00 2001 From: Ayke van Laethem Date: Thu, 22 Feb 2024 20:38:50 +0100 Subject: [PATCH] main: change `monitor -info` to `ports` I believe this provides a better UX. --- main.go | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/main.go b/main.go index 1a9e624e..64c3389a 100644 --- a/main.go +++ b/main.go @@ -1225,6 +1225,7 @@ func usage(command string) { fmt.Fprintln(os.Stderr, " gdb: run/flash and immediately enter GDB") fmt.Fprintln(os.Stderr, " lldb: run/flash and immediately enter LLDB") fmt.Fprintln(os.Stderr, " monitor: open communication port") + fmt.Fprintln(os.Stderr, " ports: list available serial ports") fmt.Fprintln(os.Stderr, " env: list environment variables used during build") fmt.Fprintln(os.Stderr, " list: run go list using the TinyGo root") fmt.Fprintln(os.Stderr, " clean: empty cache directory ("+goenv.Get("GOCACHE")+")") @@ -1437,7 +1438,6 @@ func main() { llvmFeatures := flag.String("llvm-features", "", "comma separated LLVM features to enable") cpuprofile := flag.String("cpuprofile", "", "cpuprofile output") monitor := flag.Bool("monitor", false, "enable serial monitor") - info := flag.Bool("info", false, "print information") baudrate := flag.Int("baudrate", 115200, "baudrate of serial monitor") // Internal flags, that are only intended for TinyGo development. @@ -1733,17 +1733,15 @@ func main() { os.Exit(1) } case "monitor": - if *info { - serialPortInfo, err := ListSerialPorts() - handleCompilerError(err) - for _, s := range serialPortInfo { - fmt.Printf("%s %4s %4s %s\n", s.Name, s.VID, s.PID, s.Target) - } - } else { - config, err := builder.NewConfig(options) - handleCompilerError(err) - err = Monitor("", *port, config) - handleCompilerError(err) + config, err := builder.NewConfig(options) + handleCompilerError(err) + err = Monitor("", *port, config) + handleCompilerError(err) + case "ports": + serialPortInfo, err := ListSerialPorts() + handleCompilerError(err) + for _, s := range serialPortInfo { + fmt.Printf("%s %4s %4s %s\n", s.Name, s.VID, s.PID, s.Target) } case "targets": specs, err := compileopts.GetTargetSpecs()