Pass context as pointer

Author: vipau

src/github.com/arduino-libraries/WiFi101-FirmwareUpdater/bossac/bossac.go

@@ -16,7 +16,7 @@ import (
 type Bossac struct {
 }
 
-func (b *Bossac) Flash(ctx context.Context, filename string) error {
+func (b *Bossac) Flash(ctx *context.Context, filename string) error {
 	log.Println("Flashing " + filename)
 
 	port, err := reset(ctx.PortName, true)
@@ -26,12 +26,12 @@ func (b *Bossac) Flash(ctx context.Context, filename string) error {
 	err = invokeBossac([]string{ctx.ProgrammerPath, "-e", "-R", "-p", port, "-w", filename})
 
 	ports, err := serial.GetPortsList()
-	ctx.PortName = waitReset(ports, port)
+	ctx.PortName = waitPort(ports, port)
 
 	return err
 }
 
-func (b *Bossac) DumpAndFlash(ctx context.Context, filename string) (string, error) {
+func (b *Bossac) DumpAndFlash(ctx *context.Context, filename string) (string, error) {
 	log.Println("Flashing " + filename)
 	dir, err := ioutil.TempDir("", "wifiFlasher_dump")
 	port, err := reset(ctx.PortName, true)
@@ -46,7 +46,7 @@ func (b *Bossac) DumpAndFlash(ctx context.Context, filename string) (string, err
 	err = invokeBossac([]string{ctx.ProgrammerPath, "-e", "-R", "-p", port, "-w", filename})
 
 	ports, err := serial.GetPortsList()
-	ctx.PortName = waitReset(ports, port)
+	ctx.PortName = waitPort(ports, port)
 
 	return filepath.Join(dir, "dump.bin"), err
 }
@@ -158,6 +158,36 @@ func waitReset(beforeReset []string, originalPort string) string {
 	return port
 }
 
+func waitPort(beforeReset []string, originalPort string) string {
+	var port string
+	timeout := false
+
+	go func() {
+		time.Sleep(10 * time.Second)
+		timeout = true
+	}()
+
+	for {
+		ports, _ := serial.GetPortsList()
+		port = differ(ports, beforeReset)
+
+		if port != "" {
+			break
+		}
+		if timeout {
+			break
+		}
+		time.Sleep(time.Millisecond * 100)
+	}
+
+	// try to upload on the existing port if the touch was ineffective
+	if port == "" {
+		port = originalPort
+	}
+
+	return port
+}
+
 // differ returns the first item that differ between the two input slices
 func differ(slice1 []string, slice2 []string) string {
 	m := map[string]int{}

src/github.com/arduino-libraries/WiFi101-FirmwareUpdater/context/context.go

@@ -28,6 +28,6 @@ type Context struct {
 }
 
 type Programmer interface {
-	DumpAndFlash(ctx Context, filename string) (string, error)
-	Flash(ctx Context, filename string) error
+	DumpAndFlash(ctx *Context, filename string) (string, error)
+	Flash(ctx *Context, filename string) error
 }

src/github.com/arduino-libraries/WiFi101-FirmwareUpdater/nina/main.go

@@ -47,9 +47,9 @@ func Run(ctx context.Context) {
 	if ctx.FWUploaderBinary != "" {
 		log.Println("Flashing firmware uploader")
 		if ctx.BinaryToRestore == "" {
-			ctx.BinaryToRestore, err = programmer.DumpAndFlash(ctx, ctx.FWUploaderBinary)
+			ctx.BinaryToRestore, err = programmer.DumpAndFlash(&ctx, ctx.FWUploaderBinary)
 		} else {
-			err = programmer.Flash(ctx, ctx.FWUploaderBinary)
+			err = programmer.Flash(&ctx, ctx.FWUploaderBinary)
 		}
 		if err != nil {
 			log.Fatal(err)
@@ -105,7 +105,7 @@ func Run(ctx context.Context) {
 		log.Println("Restoring previous sketch")
 		f.Close()
 
-		if err := programmer.Flash(ctx, ctx.BinaryToRestore); err != nil {
+		if err := programmer.Flash(&ctx, ctx.BinaryToRestore); err != nil {
 			log.Fatal(err)
 		}
 

src/github.com/arduino-libraries/WiFi101-FirmwareUpdater/winc/main.go

@@ -43,9 +43,9 @@ func Run(ctx context.Context) {
 	if ctx.FWUploaderBinary != "" {
 		log.Println("Flashing firmware uploader")
 		if ctx.BinaryToRestore == "" {
-			ctx.BinaryToRestore, err = programmer.DumpAndFlash(ctx, ctx.FWUploaderBinary)
+			ctx.BinaryToRestore, err = programmer.DumpAndFlash(&ctx, ctx.FWUploaderBinary)
 		} else {
-			err = programmer.Flash(ctx, ctx.FWUploaderBinary)
+			err = programmer.Flash(&ctx, ctx.FWUploaderBinary)
 		}
 		if err != nil {
 			log.Fatal(err)
@@ -101,7 +101,7 @@ func Run(ctx context.Context) {
 		log.Println("Restoring previous sketch")
 		f.Close()
 
-		if err := programmer.Flash(ctx, ctx.BinaryToRestore); err != nil {
+		if err := programmer.Flash(&ctx, ctx.BinaryToRestore); err != nil {
 			log.Fatal(err)
 		}