Add IPv6 link-local address to net_init and info response, use WaitGroup.Go

cmd/info/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"net"
 	"os"
 	"sync"
 	"time"
@@ -34,10 +35,8 @@ func run() error {
 	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
+		results[i].dev = dev
+		wg.Go(func() {
 			c, err := client.NewSerial(dev, 2*time.Second)
 			if err != nil {
 				results[i].err = err
@@ -47,7 +46,7 @@ func run() error {
 			c.Close()
 			results[i].info = info
 			results[i].err = err
-		}()
+		})
 	}
 	wg.Wait()
 
@@ -60,9 +59,8 @@ func run() error {
 		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])
+		fmt.Printf("  MAC: %s\n", net.HardwareAddr(r.info.MAC[:]))
+		fmt.Printf("  Link-Local: %s\n", net.IP(r.info.LinkLocal[:]))
 	}
 
 	return nil

cmd/load/main.go

@@ -68,9 +68,7 @@ func run(buildDir string) error {
 
 	var wg sync.WaitGroup
 	for i := range 2 {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
+		wg.Go(func() {
 			c, err := client.NewSerial(devs[i], 2*time.Second)
 			if err != nil {
 				errs[i] = err
@@ -83,7 +81,7 @@ func run(buildDir string) error {
 				return
 			}
 			serials[i] = boardSerial(info.BoardID)
-		}()
+		})
 	}
 	wg.Wait()
 	for i, err := range errs {
@@ -94,9 +92,7 @@ func run(buildDir string) error {
 
 	fmt.Println("Sending PICOBOOT requests...")
 	for i := range 2 {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
+		wg.Go(func() {
 			c, err := client.NewSerial(devs[i], 2*time.Second)
 			if err != nil {
 				errs[i] = err
@@ -107,7 +103,7 @@ func run(buildDir string) error {
 			if err != nil {
 				errs[i] = fmt.Errorf("PICOBOOT %s: %w", devs[i], err)
 			}
-		}()
+		})
 	}
 	wg.Wait()
 	for _, err := range errs {
@@ -117,11 +113,9 @@ func run(buildDir string) error {
 	}
 
 	for i := range 2 {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
+		wg.Go(func() {
 			errs[i] = picotool.WaitForBootsel(serials[i], 10*time.Second)
-		}()
+		})
 	}
 	wg.Wait()
 	for i, err := range errs {
@@ -137,11 +131,9 @@ func run(buildDir string) error {
 
 	fmt.Println("Loading firmware...")
 	for i := range 2 {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
+		wg.Go(func() {
 			errs[i] = picotool.Load(uf2s[i], serials[i])
-		}()
+		})
 	}
 	wg.Wait()
 	for i, err := range errs {