Merge pull request #1 from bcmi-labs/fix-invalid-port-on-mac

Fix invalid serial port on mac

Author: facchinm

go.mod

@@ -0,0 +1,8 @@
+module github.com/arduino-libraries/FirmwareUpdater
+
+require (
+	github.com/creack/goselect v0.0.0-20180501195510-58854f77ee8d // indirect
+	github.com/facchinm/go-serial v0.0.0-20190206110233-459a153afba0
+	go.bug.st/serial.v1 v0.0.0-20180827123349-5f7892a7bb45
+	golang.org/x/sys v0.0.0-20190411185658-b44545bcd369 // indirect
+)

go.sum

@@ -0,0 +1,8 @@
+github.com/creack/goselect v0.0.0-20180501195510-58854f77ee8d h1:6o8WW5zZ+Ny9sbk69epnAPmBzrBaRnvci+l4+pqleeY=
+github.com/creack/goselect v0.0.0-20180501195510-58854f77ee8d/go.mod h1:gHrIcH/9UZDn2qgeTUeW5K9eZsVYCH6/60J/FHysWyE=
+github.com/facchinm/go-serial v0.0.0-20190206110233-459a153afba0 h1:TmQMjEpI656fxIDUgWVNnAvFJ6eaHx2uCVOlrX07+Yc=
+github.com/facchinm/go-serial v0.0.0-20190206110233-459a153afba0/go.mod h1:082o96cvX/yKg1NvcnyT1HriTGUI5jLbCbtAVqbsTyw=
+go.bug.st/serial.v1 v0.0.0-20180827123349-5f7892a7bb45 h1:mACY1anK6HNCZtm/DK2Rf2ZPHggVqeB0+7rY9Gl6wyI=
+go.bug.st/serial.v1 v0.0.0-20180827123349-5f7892a7bb45/go.mod h1:dRSl/CVCTf56CkXgJMDOdSwNfo2g1orOGE/gBGdvjZw=
+golang.org/x/sys v0.0.0-20190411185658-b44545bcd369 h1:aBlRBZoCuZNRDClvfkDoklQqdLzBaA3uViASg2z2p24=
+golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

modules/nina/flasher.go

@@ -22,6 +22,7 @@ package nina
 import (
 	"crypto/md5"
 	"encoding/binary"
+	"github.com/arduino-libraries/FirmwareUpdater/utils"
 	"log"
 	"time"
 
@@ -235,19 +236,9 @@ func (flasher *Flasher) Md5sum(data []byte) error {
 	return nil
 }
 
-func OpenSerial(portName string) (serial.Port, error) {
-	mode := &serial.Mode{
-		BaudRate: 115200,
-		Vtimeout: 255,
-		Vmin:     0,
-	}
-
-	return serial.Open(portName, mode)
-}
-
 func OpenFlasher(portName string) (*Flasher, error) {
 
-	port, err := OpenSerial(portName)
+	port, err := utils.OpenSerial(portName)
 
 	if err != nil {
 		return nil, &FlasherError{err: "Error opening serial port. " + err.Error()}

modules/nina/main.go

@@ -49,7 +49,7 @@ func Run(ctx context.Context) {
 	}
 
 	if ctx.FWUploaderBinary != "" {
-		log.Println("Flashing firmware uploader")
+		log.Println("Flashing firmware uploader nina")
 		if ctx.BinaryToRestore == "" {
 			ctx.BinaryToRestore, err = programmer.DumpAndFlash(&ctx, ctx.FWUploaderBinary)
 		} else {

modules/sara/flasher.go

@@ -20,10 +20,11 @@
 package sara
 
 import (
+	"github.com/arduino-libraries/FirmwareUpdater/utils"
 	serial "github.com/facchinm/go-serial"
-	"time"
-	"strings"
 	"log"
+	"strings"
+	"time"
 	//"strconv"
 )
 
@@ -44,7 +45,7 @@ func (flasher *Flasher) Hello() error {
 	f.Expect("ATE0", "OK", 100)
 	f.Expect("ATE0", "OK", 100)
 	f.Expect("ATE0", "OK", 100)
-	_, err := flasher.Expect("AT", "OK", 100);
+	_, err := flasher.Expect("AT", "OK", 100)
 	return err
 }
 
@@ -65,7 +66,7 @@ func (flasher *Flasher) ExpectMinBytes(buffer string, response string, timeout i
 
 	start := time.Now()
 
-	for ((time.Since(start) < time.Duration(timeout) * time.Millisecond && !strings.Contains(string(res), response)) || (len(res) < min_bytes)) {
+	for (time.Since(start) < time.Duration(timeout)*time.Millisecond && !strings.Contains(string(res), response)) || (len(res) < min_bytes) {
 		data := 0
 		partial := make([]byte, 65535)
 		data, err = flasher.port.Read(partial)
@@ -79,7 +80,7 @@ func (flasher *Flasher) ExpectMinBytes(buffer string, response string, timeout i
 	log.Println(string(res))
 
 	if !strings.Contains(string(res), response) {
-		return  string(res), &FlasherError{err: "Expected " + response + ", got " + string(res)}
+		return string(res), &FlasherError{err: "Expected " + response + ", got " + string(res)}
 	}
 	return string(res), nil
 }
@@ -104,7 +105,6 @@ func (flasher *Flasher) Write(address uint32, buffer []byte) error {
 	return nil
 }
 
-
 // Fill buffer with data coming from serial port.
 // Blocks until the buffer is full.
 func (flasher *Flasher) serialFillBuffer(buffer []byte) error {
@@ -131,19 +131,9 @@ func (flasher *Flasher) sendCommand(payload []byte) error {
 	return nil
 }
 
-func OpenSerial(portName string) (serial.Port, error) {
-	mode := &serial.Mode{
-		BaudRate: 1000000,
-		Vtimeout: 100,
-		Vmin:     0,
-	}
-
-	return serial.Open(portName, mode)
-}
-
 func OpenFlasher(portName string) (*Flasher, error) {
 
-	port, err := OpenSerial(portName)
+	port, err := utils.OpenSerial(portName)
 	if err != nil {
 		return nil, &FlasherError{err: "Error opening serial port. " + err.Error()}
 	}

modules/sara/main.go

@@ -39,7 +39,7 @@ func Run(ctx context.Context) {
 	programmer = &bossac.Bossac{}
 
 	if ctx.FWUploaderBinary != "" {
-		log.Println("Flashing firmware uploader")
+		log.Println("Flashing firmware uploader sara")
 		if ctx.BinaryToRestore == "" {
 			ctx.BinaryToRestore, err = programmer.DumpAndFlash(&ctx, ctx.FWUploaderBinary)
 		} else {
@@ -118,7 +118,7 @@ func flashFirmware(ctx context.Context) error {
 		return err
 	}
 
-	_, err = f.Expect("AT+UDWNFILE=\"UPDATE.BIN\"," + strconv.Itoa(len(fwData)) + ",\"FOAT\"", ">", 20000)
+	_, err = f.Expect("AT+UDWNFILE=\"UPDATE.BIN\","+strconv.Itoa(len(fwData))+",\"FOAT\"", ">", 20000)
 	if err != nil {
 		return err
 	}
@@ -144,9 +144,9 @@ func flashFirmware(ctx context.Context) error {
 
 	// wait up to 20 minutes trying to ping the module. After 20 minutes signal the error
 	start := time.Now()
-	for (time.Since(start) < time.Minute * 20) {
+	for time.Since(start) < time.Minute*20 {
 		err = f.Hello()
-		if (err == nil) {
+		if err == nil {
 			return nil
 		}
 		time.Sleep(1 * time.Second)

modules/winc/flasher.go

@@ -21,6 +21,7 @@ package winc
 
 import (
 	"encoding/binary"
+	"github.com/arduino-libraries/FirmwareUpdater/utils"
 	serial "github.com/facchinm/go-serial"
 	"log"
 	"time"
@@ -192,19 +193,9 @@ func (flasher *Flasher) sendCommand(command byte, address uint32, val uint32, pa
 	return nil
 }
 
-func OpenSerial(portName string) (serial.Port, error) {
-	mode := &serial.Mode{
-		BaudRate: 1000000,
-		Vtimeout: 100,
-		Vmin:     0,
-	}
-
-	return serial.Open(portName, mode)
-}
-
 func OpenFlasher(portName string) (*Flasher, error) {
 
-	port, err := OpenSerial(portName)
+	port, err := utils.OpenSerial(portName)
 	if err != nil {
 		return nil, &FlasherError{err: "Error opening serial port. " + err.Error()}
 	}

modules/winc/main.go

@@ -41,7 +41,7 @@ func Run(ctx context.Context) {
 	programmer = &bossac.Bossac{}
 
 	if ctx.FWUploaderBinary != "" {
-		log.Println("Flashing firmware uploader")
+		log.Println("Flashing firmware uploader winc")
 		if ctx.BinaryToRestore == "" {
 			ctx.BinaryToRestore, err = programmer.DumpAndFlash(&ctx, ctx.FWUploaderBinary)
 		} else {

utils/flasher.go

@@ -0,0 +1,34 @@
+package utils
+
+import (
+	"github.com/facchinm/go-serial"
+	"log"
+)
+
+// http://www.ni.com/product-documentation/54548/en/
+var baudRates = []int{
+	// Standard baud rates supported by most serial ports
+	115200,
+	57600,
+	56000,
+	38400,
+}
+
+func OpenSerial(portName string) (serial.Port, error) {
+	var port serial.Port
+	var err error
+	for _, baudRate := range baudRates {
+		mode := &serial.Mode{
+			BaudRate: baudRate,
+			Vtimeout: 255,
+			Vmin:     0,
+		}
+		port, err := serial.Open(portName, mode)
+		if err == nil {
+			log.Printf("Open the serial port with baud rate %d", baudRate)
+			return port, nil
+		}
+	}
+	return port, err
+
+}