Fix upload problems

cmaglie · cmaglie · commit 9e649fa1cc30 · 2021-04-19T15:22:25.000+02:00
diff --git a/go.mod b/go.mod
@@ -6,9 +6,10 @@ go 1.14
 replace go.bug.st/serial => github.com/cmaglie/go-serial v0.0.0-20200923162623-b214c147e37e
 
 require (
-	github.com/arduino/arduino-cli v0.0.0-20200924151007-69ac12c98b2b
-	github.com/arduino/go-paths-helper v1.3.2
+	github.com/arduino/arduino-cli v0.0.0-20210419093035-6ca680d235a3
+	github.com/arduino/go-paths-helper v1.4.0
+	github.com/imjasonmiller/godice v0.1.2 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.6.1
-	go.bug.st/serial v1.1.1
+	go.bug.st/serial v1.1.2
 )
diff --git a/go.sum b/go.sum
diff --git a/modules/nina/main.go b/modules/nina/main.go
@@ -57,7 +57,7 @@ func Run(ctx *context.Context) {
 		if programmer == nil {
 			log.Fatal("ERROR: You must specify a programmer!")
 		}
-		if err := programmer.Flash(ctx.FWUploaderBinary); err != nil {
+		if err := programmer.Flash(ctx.FWUploaderBinary, nil); err != nil {
 			log.Fatal(err)
 		}
 	}
@@ -112,7 +112,7 @@ func Run(ctx *context.Context) {
 		if programmer == nil {
 			log.Fatal("ERROR: You must specify a programmer!")
 		}
-		if err := programmer.Flash(ctx.BinaryToRestore); err != nil {
+		if err := programmer.Flash(ctx.BinaryToRestore, nil); err != nil {
 			log.Fatal(err)
 		}
 	}
diff --git a/modules/sara/main.go b/modules/sara/main.go
@@ -39,7 +39,7 @@ func Run(ctx *context.Context) {
 
 	if ctx.FWUploaderBinary != "" {
 		log.Println("Flashing firmware uploader sara")
-		if err := programmer.Flash(ctx.FWUploaderBinary); err != nil {
+		if err := programmer.Flash(ctx.FWUploaderBinary, nil); err != nil {
 			log.Fatal(err)
 		}
 	}
@@ -87,7 +87,7 @@ func Run(ctx *context.Context) {
 	if ctx.BinaryToRestore != "" {
 		log.Println("Restoring previous sketch")
 
-		if err := programmer.Flash(ctx.BinaryToRestore); err != nil {
+		if err := programmer.Flash(ctx.BinaryToRestore, nil); err != nil {
 			log.Fatal(err)
 		}
 	}
diff --git a/modules/winc/main.go b/modules/winc/main.go
@@ -41,7 +41,7 @@ func Run(ctx *context.Context) {
 
 	if ctx.FWUploaderBinary != "" {
 		log.Println("Flashing firmware uploader winc")
-		if err := programmer.Flash(ctx.FWUploaderBinary); err != nil {
+		if err := programmer.Flash(ctx.FWUploaderBinary, nil); err != nil {
 			log.Fatal(err)
 		}
 	}
@@ -95,7 +95,7 @@ func Run(ctx *context.Context) {
 	if ctx.BinaryToRestore != "" {
 		log.Println("Restoring previous sketch")
 
-		if err := programmer.Flash(ctx.BinaryToRestore); err != nil {
+		if err := programmer.Flash(ctx.BinaryToRestore, nil); err != nil {
 			log.Fatal(err)
 		}
 	}
diff --git a/programmers/avrdude/avrdude.go b/programmers/avrdude/avrdude.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/arduino/FirmwareUpdater/utils/context"
+	"github.com/arduino/arduino-cli/arduino/serialutils"
 	"github.com/arduino/arduino-cli/executils"
 	"github.com/arduino/go-paths-helper"
 )
@@ -24,7 +25,7 @@ func NewAvrdude(ctx *context.Context) *Avrdude {
 	}
 }
 
-func (b *Avrdude) Flash(filename string) error {
+func (b *Avrdude) Flash(filename string, cb *serialutils.ResetProgressCallbacks) error {
 	log.Println("Flashing " + filename)
 	err := b.invoke(
 		fmt.Sprintf("-C%s", b.configPath),
@@ -38,7 +39,7 @@ func (b *Avrdude) Flash(filename string) error {
 		fmt.Sprintf("-Uflash:w:%s:i", filename),
 		"-Ufuse8:w:0x00:m")
 
-	time.Sleep(3 * time.Second)
+	time.Sleep(5 * time.Second)
 
 	return err
 }
diff --git a/programmers/bossac/bossac.go b/programmers/bossac/bossac.go
@@ -23,19 +23,20 @@ func NewBossac(ctx *context.Context) *Bossac {
 	}
 }
 
-func (b *Bossac) Flash(filename string) error {
+func (b *Bossac) Flash(filename string, cb *serialutils.ResetProgressCallbacks) error {
 	log.Println("Entering board into bootloader mode")
-	port, err := serialutils.Reset(b.portName, true)
+	port, err := serialutils.Reset(b.portName, true, cb)
 	if err != nil {
 		return err
 	}
 
 	log.Println("Flashing " + filename)
+	if port == "" {
+		port = b.portName
+	}
 	err = b.invoke("-e", "-R", "-p", port, "-w", filename)
 
-	b.portName, err = serialutils.WaitForNewSerialPortOrDefaultTo(port)
-	log.Println("Board is back online " + b.portName)
-	time.Sleep(1 * time.Second)
+	time.Sleep(5 * time.Second)
 
 	return err
 }
diff --git a/programmers/rp2040load/rp2040load.go b/programmers/rp2040load/rp2040load.go
@@ -3,6 +3,7 @@ package rp2040load
 import (
 	"log"
 	"os"
+	"time"
 
 	"github.com/arduino/FirmwareUpdater/utils/context"
 	"github.com/arduino/arduino-cli/arduino/serialutils"
@@ -22,9 +23,9 @@ func NewRP2040Load(ctx *context.Context) *RP2040Load {
 	}
 }
 
-func (b *RP2040Load) Flash(filename string) error {
+func (b *RP2040Load) Flash(filename string, cb *serialutils.ResetProgressCallbacks) error {
 	log.Println("Entering board into bootloader mode")
-	port, err := serialutils.Reset(b.portName, true)
+	_, err := serialutils.Reset(b.portName, true, cb)
 	if err != nil {
 		return err
 	}
@@ -34,8 +35,8 @@ func (b *RP2040Load) Flash(filename string) error {
 		log.Fatalf("Error flashing %s: %s", filename, err)
 	}
 
-	b.portName, err = serialutils.WaitForNewSerialPortOrDefaultTo(port)
-	log.Println("Board is back online " + b.portName)
+	time.Sleep(5 * time.Second)
+
 	return err
 }
 
diff --git a/utils/context/context.go b/utils/context/context.go
@@ -2,6 +2,8 @@ package context
 
 import (
 	"fmt"
+
+	"github.com/arduino/arduino-cli/arduino/serialutils"
 )
 
 type addressFlags []string
@@ -29,5 +31,5 @@ type Context struct {
 }
 
 type Programmer interface {
-	Flash(filename string) error
+	Flash(filename string, cb *serialutils.ResetProgressCallbacks) error
 }

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ func Run(ctx *context.Context) {`
`57`	`57`	`if programmer == nil {`
`58`	`58`	`log.Fatal("ERROR: You must specify a programmer!")`
`59`	`59`	`}`
`60`		`- if err := programmer.Flash(ctx.FWUploaderBinary); err != nil {`
	`60`	`+ if err := programmer.Flash(ctx.FWUploaderBinary, nil); err != nil {`
`61`	`61`	`log.Fatal(err)`
`62`	`62`	`}`
`63`	`63`	`}`
`@@ -112,7 +112,7 @@ func Run(ctx *context.Context) {`
`112`	`112`	`if programmer == nil {`
`113`	`113`	`log.Fatal("ERROR: You must specify a programmer!")`
`114`	`114`	`}`
`115`		`- if err := programmer.Flash(ctx.BinaryToRestore); err != nil {`
	`115`	`+ if err := programmer.Flash(ctx.BinaryToRestore, nil); err != nil {`
`116`	`116`	`log.Fatal(err)`
`117`	`117`	`}`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ func Run(ctx *context.Context) {`
`39`	`39`
`40`	`40`	`if ctx.FWUploaderBinary != "" {`
`41`	`41`	`log.Println("Flashing firmware uploader sara")`
`42`		`- if err := programmer.Flash(ctx.FWUploaderBinary); err != nil {`
	`42`	`+ if err := programmer.Flash(ctx.FWUploaderBinary, nil); err != nil {`
`43`	`43`	`log.Fatal(err)`
`44`	`44`	`}`
`45`	`45`	`}`
`@@ -87,7 +87,7 @@ func Run(ctx *context.Context) {`
`87`	`87`	`if ctx.BinaryToRestore != "" {`
`88`	`88`	`log.Println("Restoring previous sketch")`
`89`	`89`
`90`		`- if err := programmer.Flash(ctx.BinaryToRestore); err != nil {`
	`90`	`+ if err := programmer.Flash(ctx.BinaryToRestore, nil); err != nil {`
`91`	`91`	`log.Fatal(err)`
`92`	`92`	`}`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func Run(ctx *context.Context) {`
`41`	`41`
`42`	`42`	`if ctx.FWUploaderBinary != "" {`
`43`	`43`	`log.Println("Flashing firmware uploader winc")`
`44`		`- if err := programmer.Flash(ctx.FWUploaderBinary); err != nil {`
	`44`	`+ if err := programmer.Flash(ctx.FWUploaderBinary, nil); err != nil {`
`45`	`45`	`log.Fatal(err)`
`46`	`46`	`}`
`47`	`47`	`}`
`@@ -95,7 +95,7 @@ func Run(ctx *context.Context) {`
`95`	`95`	`if ctx.BinaryToRestore != "" {`
`96`	`96`	`log.Println("Restoring previous sketch")`
`97`	`97`
`98`		`- if err := programmer.Flash(ctx.BinaryToRestore); err != nil {`
	`98`	`+ if err := programmer.Flash(ctx.BinaryToRestore, nil); err != nil {`
`99`	`99`	`log.Fatal(err)`
`100`	`100`	`}`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`	`"time"`
`8`	`8`
`9`	`9`	`"github.com/arduino/FirmwareUpdater/utils/context"`
	`10`	`+ "github.com/arduino/arduino-cli/arduino/serialutils"`
`10`	`11`	`"github.com/arduino/arduino-cli/executils"`
`11`	`12`	`"github.com/arduino/go-paths-helper"`
`12`	`13`	`)`
`@@ -24,7 +25,7 @@ func NewAvrdude(ctx context.Context) Avrdude {`
`24`	`25`	`}`
`25`	`26`	`}`
`26`	`27`
`27`		`-func (b *Avrdude) Flash(filename string) error {`
	`28`	`+func (b Avrdude) Flash(filename string, cb serialutils.ResetProgressCallbacks) error {`
`28`	`29`	`log.Println("Flashing " + filename)`
`29`	`30`	`err := b.invoke(`
`30`	`31`	`fmt.Sprintf("-C%s", b.configPath),`
`@@ -38,7 +39,7 @@ func (b *Avrdude) Flash(filename string) error {`
`38`	`39`	`fmt.Sprintf("-Uflash:w:%s:i", filename),`
`39`	`40`	`"-Ufuse8:w:0x00:m")`
`40`	`41`
`41`		`- time.Sleep(3 * time.Second)`
	`42`	`+ time.Sleep(5 * time.Second)`
`42`	`43`
`43`	`44`	`return err`
`44`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,19 +23,20 @@ func NewBossac(ctx context.Context) Bossac {`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`26`		`-func (b *Bossac) Flash(filename string) error {`
	`26`	`+func (b Bossac) Flash(filename string, cb serialutils.ResetProgressCallbacks) error {`
`27`	`27`	`log.Println("Entering board into bootloader mode")`
`28`		`- port, err := serialutils.Reset(b.portName, true)`
	`28`	`+ port, err := serialutils.Reset(b.portName, true, cb)`
`29`	`29`	`if err != nil {`
`30`	`30`	`return err`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`log.Println("Flashing " + filename)`
	`34`	`+ if port == "" {`
	`35`	`+ port = b.portName`
	`36`	`+ }`
`34`	`37`	`err = b.invoke("-e", "-R", "-p", port, "-w", filename)`
`35`	`38`
`36`		`- b.portName, err = serialutils.WaitForNewSerialPortOrDefaultTo(port)`
`37`		`- log.Println("Board is back online " + b.portName)`
`38`		`- time.Sleep(1 * time.Second)`
	`39`	`+ time.Sleep(5 * time.Second)`
`39`	`40`
`40`	`41`	`return err`
`41`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package rp2040load`
`3`	`3`	`import (`
`4`	`4`	`"log"`
`5`	`5`	`"os"`
	`6`	`+ "time"`
`6`	`7`
`7`	`8`	`"github.com/arduino/FirmwareUpdater/utils/context"`
`8`	`9`	`"github.com/arduino/arduino-cli/arduino/serialutils"`
`@@ -22,9 +23,9 @@ func NewRP2040Load(ctx context.Context) RP2040Load {`
`22`	`23`	`}`
`23`	`24`	`}`
`24`	`25`
`25`		`-func (b *RP2040Load) Flash(filename string) error {`
	`26`	`+func (b RP2040Load) Flash(filename string, cb serialutils.ResetProgressCallbacks) error {`
`26`	`27`	`log.Println("Entering board into bootloader mode")`
`27`		`- port, err := serialutils.Reset(b.portName, true)`
	`28`	`+ _, err := serialutils.Reset(b.portName, true, cb)`
`28`	`29`	`if err != nil {`
`29`	`30`	`return err`
`30`	`31`	`}`
`@@ -34,8 +35,8 @@ func (b *RP2040Load) Flash(filename string) error {`
`34`	`35`	`log.Fatalf("Error flashing %s: %s", filename, err)`
`35`	`36`	`}`
`36`	`37`
`37`		`- b.portName, err = serialutils.WaitForNewSerialPortOrDefaultTo(port)`
`38`		`- log.Println("Board is back online " + b.portName)`
	`38`	`+ time.Sleep(5 * time.Second)`
	`39`	`+`
`39`	`40`	`return err`
`40`	`41`	`}`
`41`	`42`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@ package context`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
	`5`	`+`
	`6`	`+ "github.com/arduino/arduino-cli/arduino/serialutils"`
`5`	`7`	`)`
`6`	`8`
`7`	`9`	`type addressFlags []string`
`@@ -29,5 +31,5 @@ type Context struct {`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`type Programmer interface {`
`32`		`- Flash(filename string) error`
	`34`	`+ Flash(filename string, cb *serialutils.ResetProgressCallbacks) error`
`33`	`35`	`}`