theater/picomap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch commands to slog, disable net_poll pending fix

Browse Source
This commit is contained in:
Ian Gulliver
2026-04-07 07:43:16 +09:00
parent 46db2fd966
commit a9193d51e4
4 changed files with 60 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
cmd/info/main.go
View File

@@ -1,7 +1,8 @@
package main package main
import ( import (
"fmt" "encoding/hex"
"log/slog"
"net" "net"
"os" "os"
"sync" "sync"
@@ -18,7 +19,7 @@ type deviceResult struct {
func main() { func main() {
if err := run(); err != nil { if err := run(); err != nil {
fmt.Fprintf(os.Stderr, "error: %v\n", err) slog.Error("fatal", "err", err)
os.Exit(1) os.Exit(1)
} }
} }
@@ -29,39 +30,46 @@ func run() error {
return err return err
} }
if len(devs) == 0 { if len(devs) == 0 {
return fmt.Errorf("no devices found") slog.Error("no devices found")
os.Exit(1)
} }
results := make([]deviceResult, len(devs)) results := make([]deviceResult, len(devs))
var wg sync.WaitGroup var wg sync.WaitGroup
for i, dev := range devs { for i, dev := range devs {
results[i].dev = dev results[i].dev = dev
log := slog.With("dev", dev)
wg.Go(func() { wg.Go(func() {
log.Info("connecting")
c, err := client.NewSerial(dev, 2*time.Second) c, err := client.NewSerial(dev, 2*time.Second)
if err != nil { if err != nil {
results[i].err = err results[i].err = err
return return
} }
log.Info("requesting info")
info, err := c.Info() info, err := c.Info()
c.Close() c.Close()
results[i].info = info if err != nil {
results[i].err = err results[i].err = err
return
}
log.Info("got info", "firmware", info.FirmwareName)
results[i].info = info
}) })
} }
wg.Wait() wg.Wait()
for _, r := range results { for _, r := range results {
fmt.Printf("Device: %s\n", r.dev)
if r.err != nil { if r.err != nil {
fmt.Fprintf(os.Stderr, " error: %v\n", r.err) slog.Error("device error", "dev", r.dev, "err", r.err)
continue continue
} }
fmt.Printf(" Board ID: %02X%02X%02X%02X%02X%02X%02X%02X\n", slog.Info("device",
r.info.BoardID[0], r.info.BoardID[1], r.info.BoardID[2], r.info.BoardID[3], "dev", r.dev,
r.info.BoardID[4], r.info.BoardID[5], r.info.BoardID[6], r.info.BoardID[7]) "board_id", hex.EncodeToString(r.info.BoardID[:]),
fmt.Printf(" MAC: %s\n", net.HardwareAddr(r.info.MAC[:])) "mac", net.HardwareAddr(r.info.MAC[:]).String(),
fmt.Printf(" IP: %s\n", net.IP(r.info.IP[:])) "ip", net.IP(r.info.IP[:]).String(),
fmt.Printf(" Firmware: %s\n", r.info.FirmwareName) "firmware", r.info.FirmwareName)
} }
return nil return nil

32
cmd/load/main.go
View File

@@ -2,6 +2,7 @@ package main
import ( import (
"fmt" "fmt"
"log/slog"
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
@@ -15,19 +16,19 @@ import (
func main() { func main() {
wd, err := os.Getwd() wd, err := os.Getwd()
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "error: %v\n", err) slog.Error("fatal", "err", err)
os.Exit(1) os.Exit(1)
} }
buildDir := filepath.Join(wd, "firmware", "build") buildDir := filepath.Join(wd, "firmware", "build")
if err := run(buildDir); err != nil { if err := run(buildDir); err != nil {
fmt.Fprintf(os.Stderr, "error: %v\n", err) slog.Error("fatal", "err", err)
os.Exit(1) os.Exit(1)
} }
} }
func build(buildDir string) error { func build(buildDir string) error {
fmt.Println("Configuring...") slog.Info("configuring")
cmake := exec.Command("cmake", "-S", filepath.Join(filepath.Dir(buildDir)), "-B", buildDir) cmake := exec.Command("cmake", "-S", filepath.Join(filepath.Dir(buildDir)), "-B", buildDir)
cmake.Stdout = os.Stdout cmake.Stdout = os.Stdout
cmake.Stderr = os.Stderr cmake.Stderr = os.Stderr
@@ -35,7 +36,7 @@ func build(buildDir string) error {
return fmt.Errorf("cmake failed: %w", err) return fmt.Errorf("cmake failed: %w", err)
} }
fmt.Println("Building...") slog.Info("building")
cmd := exec.Command("make", "-C", buildDir) cmd := exec.Command("make", "-C", buildDir)
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
@@ -65,10 +66,13 @@ func run(buildDir string) error {
serials := make([]string, 2) serials := make([]string, 2)
errs := make([]error, 2) errs := make([]error, 2)
uf2Names := []string{"picomap", "picomap_test"}
var wg sync.WaitGroup var wg sync.WaitGroup
for i := range 2 { for i := range 2 {
log := slog.With("dev", devs[i])
wg.Go(func() { wg.Go(func() {
log.Info("connecting for info")
c, err := client.NewSerial(devs[i], 2*time.Second) c, err := client.NewSerial(devs[i], 2*time.Second)
if err != nil { if err != nil {
errs[i] = err errs[i] = err
@@ -81,18 +85,20 @@ func run(buildDir string) error {
return return
} }
serials[i] = boardSerial(info.BoardID) serials[i] = boardSerial(info.BoardID)
log.Info("got info", "serial", serials[i], "firmware", info.FirmwareName)
}) })
} }
wg.Wait() wg.Wait()
for i, err := range errs { for i, err := range errs {
if err != nil { if err != nil {
return fmt.Errorf("info %s: %w", devs[i], err) return fmt.Errorf("[%s] info: %w", devs[i], err)
} }
} }
fmt.Println("Sending PICOBOOT requests...")
for i := range 2 { for i := range 2 {
log := slog.With("serial", serials[i])
wg.Go(func() { wg.Go(func() {
log.Info("sending PICOBOOT")
c, err := client.NewSerial(devs[i], 2*time.Second) c, err := client.NewSerial(devs[i], 2*time.Second)
if err != nil { if err != nil {
errs[i] = err errs[i] = err
@@ -101,8 +107,10 @@ func run(buildDir string) error {
err = c.PICOBOOT() err = c.PICOBOOT()
c.Close() c.Close()
if err != nil { if err != nil {
errs[i] = fmt.Errorf("PICOBOOT %s: %w", devs[i], err) errs[i] = fmt.Errorf("PICOBOOT %s: %w", serials[i], err)
return
} }
log.Info("PICOBOOT sent")
}) })
} }
wg.Wait() wg.Wait()
@@ -117,19 +125,23 @@ func run(buildDir string) error {
filepath.Join(buildDir, "picomap_test.uf2"), filepath.Join(buildDir, "picomap_test.uf2"),
} }
fmt.Println("Loading firmware...")
for i := range 2 { for i := range 2 {
log := slog.With("serial", serials[i])
wg.Go(func() { wg.Go(func() {
log.Info("loading", "uf2", uf2Names[i])
errs[i] = picotool.Load(uf2s[i], serials[i], 10*time.Second) errs[i] = picotool.Load(uf2s[i], serials[i], 10*time.Second)
if errs[i] == nil {
log.Info("loaded", "uf2", uf2Names[i])
}
}) })
} }
wg.Wait() wg.Wait()
for i, err := range errs { for i, err := range errs {
if err != nil { if err != nil {
return fmt.Errorf("load %s: %w", serials[i], err) return fmt.Errorf("[%s] load: %w", serials[i], err)
} }
} }
fmt.Println("Done.") slog.Info("done")
return nil return nil
} }

26
cmd/test/main.go
View File

@@ -1,7 +1,7 @@
package main package main
import ( import (
"fmt" "log/slog"
"os" "os"
"time" "time"
@@ -10,12 +10,12 @@ import (
func main() { func main() {
if len(os.Args) < 2 { if len(os.Args) < 2 {
fmt.Fprintf(os.Stderr, "usage: test <name>\n") slog.Error("usage: test <name>")
os.Exit(1) os.Exit(1)
} }
if err := run(os.Args[1]); err != nil { if err := run(os.Args[1]); err != nil {
fmt.Fprintf(os.Stderr, "error: %v\n", err) slog.Error("fatal", "err", err)
os.Exit(1) os.Exit(1)
} }
} }
@@ -28,25 +28,32 @@ func run(name string) error {
var testDev string var testDev string
for _, dev := range devs { for _, dev := range devs {
log := slog.With("dev", dev)
log.Info("connecting for info")
c, err := client.NewSerial(dev, 2*time.Second) c, err := client.NewSerial(dev, 2*time.Second)
if err != nil { if err != nil {
log.Warn("connect error", "err", err)
continue continue
} }
info, err := c.Info() info, err := c.Info()
c.Close() c.Close()
if err != nil { if err != nil {
log.Warn("info error", "err", err)
continue continue
} }
log.Info("got info", "firmware", info.FirmwareName)
if info.FirmwareName == "picomap_test" { if info.FirmwareName == "picomap_test" {
testDev = dev testDev = dev
break break
} }
} }
if testDev == "" { if testDev == "" {
return fmt.Errorf("no picomap_test device found") slog.Error("no picomap_test device found")
os.Exit(1)
} }
fmt.Printf("test %s on %s\n", name, testDev) log := slog.With("dev", testDev)
log.Info("running test", "name", name)
c, err := client.NewSerial(testDev, 10*time.Second) c, err := client.NewSerial(testDev, 10*time.Second)
if err != nil { if err != nil {
@@ -56,17 +63,18 @@ func run(name string) error {
result, err := c.Test(name) result, err := c.Test(name)
if err != nil { if err != nil {
return fmt.Errorf("remote: %w", err) slog.Error("remote error", "dev", testDev, "err", err)
os.Exit(1)
} }
for _, msg := range result.Messages { for _, msg := range result.Messages {
fmt.Printf(" [remote] %s\n", msg) log.Info("remote", "msg", msg)
} }
if result.Pass { if result.Pass {
fmt.Println("PASS") log.Info("PASS")
} else { } else {
fmt.Println("FAIL") log.Error("FAIL")
os.Exit(1) os.Exit(1)
} }
return nil return nil

2
firmware/lib/dispatch.cpp
View File

@@ -33,7 +33,7 @@ void dispatch_schedule_ms(uint32_t ms, std::function<void()> fn) {
usb.drain(); usb.drain();
timers.run(); timers.run();
net_poll(); //net_poll();
while (tud_cdc_available()) { while (tud_cdc_available()) {
uint8_t byte; uint8_t byte;