Add test target, parallelize load and info across two devices

cmd/info/main.go

@@ -3,11 +3,18 @@ package main
 import (
 	"fmt"
 	"os"
+	"sync"
 	"time"
 
 	"github.com/theater/picomap/lib/client"
 )
 
+type deviceResult struct {
+	dev  string
+	info *client.ResponseInfo
+	err  error
+}
+
 func main() {
 	if err := run(); err != nil {
 		fmt.Fprintf(os.Stderr, "error: %v\n", err)
@@ -21,27 +28,42 @@ func run() error {
 		return err
 	}
 	if len(devs) == 0 {
-		return fmt.Errorf("no device found")
-	}
-	dev := devs[0]
-
-	fmt.Printf("Device: %s\n", dev)
-	c, err := client.NewSerial(dev, 2*time.Second)
-	if err != nil {
-		return err
-	}
-	info, err := c.Info()
-	c.Close()
-	if err != nil {
-		return err
+		return fmt.Errorf("no devices found")
 	}
 
-	fmt.Printf("Board ID: %02X%02X%02X%02X%02X%02X%02X%02X\n",
-		info.BoardID[0], info.BoardID[1], info.BoardID[2], info.BoardID[3],
-		info.BoardID[4], info.BoardID[5], info.BoardID[6], info.BoardID[7])
-	fmt.Printf("MAC: %02X:%02X:%02X:%02X:%02X:%02X\n",
-		info.MAC[0], info.MAC[1], info.MAC[2],
-		info.MAC[3], info.MAC[4], info.MAC[5])
+	results := make([]deviceResult, len(devs))
+	var wg sync.WaitGroup
+	for i, dev := range devs {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			results[i].dev = dev
+			c, err := client.NewSerial(dev, 2*time.Second)
+			if err != nil {
+				results[i].err = err
+				return
+			}
+			info, err := c.Info()
+			c.Close()
+			results[i].info = info
+			results[i].err = err
+		}()
+	}
+	wg.Wait()
+
+	for _, r := range results {
+		fmt.Printf("Device: %s\n", r.dev)
+		if r.err != nil {
+			fmt.Fprintf(os.Stderr, "  error: %v\n", r.err)
+			continue
+		}
+		fmt.Printf("  Board ID: %02X%02X%02X%02X%02X%02X%02X%02X\n",
+			r.info.BoardID[0], r.info.BoardID[1], r.info.BoardID[2], r.info.BoardID[3],
+			r.info.BoardID[4], r.info.BoardID[5], r.info.BoardID[6], r.info.BoardID[7])
+		fmt.Printf("  MAC: %02X:%02X:%02X:%02X:%02X:%02X\n",
+			r.info.MAC[0], r.info.MAC[1], r.info.MAC[2],
+			r.info.MAC[3], r.info.MAC[4], r.info.MAC[5])
+	}
 
 	return nil
 }

cmd/load/main.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"sync"
 	"time"
 
 	"github.com/theater/picomap/lib/client"
@@ -25,7 +26,7 @@ func main() {
 	}
 }
 
-func run(buildDir string) error {
+func build(buildDir string) error {
 	fmt.Println("Configuring...")
 	cmake := exec.Command("cmake", "-S", filepath.Join(filepath.Dir(buildDir)), "-B", buildDir)
 	cmake.Stdout = os.Stdout
@@ -41,36 +42,116 @@ func run(buildDir string) error {
 	if err := cmd.Run(); err != nil {
 		return fmt.Errorf("build failed: %w", err)
 	}
+	return nil
+}
+
+func boardSerial(id [8]byte) string {
+	return fmt.Sprintf("%02X%02X%02X%02X%02X%02X%02X%02X",
+		id[0], id[1], id[2], id[3], id[4], id[5], id[6], id[7])
+}
+
+func run(buildDir string) error {
+	if err := build(buildDir); err != nil {
+		return err
+	}
 
 	devs, err := client.ListSerial()
 	if err != nil {
 		return err
 	}
-	if len(devs) > 0 {
-		dev := devs[0]
-		fmt.Printf("Sending PICOBOOT request to %s...\n", dev)
-		c, err := client.NewSerial(dev, 2*time.Second)
+	if len(devs) < 2 {
+		return fmt.Errorf("expected 2 devices, found %d", len(devs))
+	}
+
+	serials := make([]string, 2)
+	errs := make([]error, 2)
+
+	var wg sync.WaitGroup
+	for i := range 2 {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			c, err := client.NewSerial(devs[i], 2*time.Second)
+			if err != nil {
+				errs[i] = err
+				return
+			}
+			info, err := c.Info()
+			c.Close()
+			if err != nil {
+				errs[i] = err
+				return
+			}
+			serials[i] = boardSerial(info.BoardID)
+		}()
+	}
+	wg.Wait()
+	for i, err := range errs {
+		if err != nil {
+			return fmt.Errorf("info %s: %w", devs[i], err)
+		}
+	}
+
+	fmt.Println("Sending PICOBOOT requests...")
+	for i := range 2 {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			c, err := client.NewSerial(devs[i], 2*time.Second)
+			if err != nil {
+				errs[i] = err
+				return
+			}
+			err = c.PICOBOOT()
+			c.Close()
+			if err != nil {
+				errs[i] = fmt.Errorf("PICOBOOT %s: %w", devs[i], err)
+			}
+		}()
+	}
+	wg.Wait()
+	for _, err := range errs {
 		if err != nil {
 			return err
 		}
-		err = c.PICOBOOT()
-		c.Close()
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "warning: PICOBOOT request failed: %v\n", err)
-		} else {
-			fmt.Println("Device confirmed reboot into PICOBOOT mode.")
-		}
-		time.Sleep(2 * time.Second)
 	}
 
-	uf2 := filepath.Join(buildDir, "picomap.uf2")
+	time.Sleep(2 * time.Second)
+
+	uf2s := []string{
+		filepath.Join(buildDir, "picomap.uf2"),
+		filepath.Join(buildDir, "picomap_test.uf2"),
+	}
+
 	fmt.Println("Loading firmware...")
-	if err := picotool.Load(uf2); err != nil {
-		return err
+	for i := range 2 {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			errs[i] = picotool.Load(uf2s[i], serials[i])
+		}()
+	}
+	wg.Wait()
+	for i, err := range errs {
+		if err != nil {
+			return fmt.Errorf("load %s: %w", serials[i], err)
+		}
 	}
 
 	fmt.Println("Rebooting...")
-	_ = picotool.Reboot()
+	for i := range 2 {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			errs[i] = picotool.Reboot(serials[i])
+		}()
+	}
+	wg.Wait()
+	for i, err := range errs {
+		if err != nil {
+			return fmt.Errorf("reboot %s: %w", serials[i], err)
+		}
+	}
 
 	fmt.Println("Done.")
 	return nil