add baudrate to OpenSerial (it makes more sense), usefull for new cmd

Author: umbynos

cli/certificates/flash.go

@@ -94,12 +94,16 @@ func runFlash(cmd *cobra.Command, args []string) {
 	// Get flasher depending on which module to use
 	var f flasher.Flasher
 	moduleName := board.Module
+
+	// This matches the baudrate used in the FirmwareUpdater.ino sketch
+	// https://github.com/arduino-libraries/WiFiNINA/blob/master/examples/Tools/FirmwareUpdater/FirmwareUpdater.ino
+	const baudRate = 1000000
 	switch moduleName {
 	case "NINA":
 		// we use address and not bootloaderPort because the board should not be in bootloader mode
-		f, err = flasher.NewNinaFlasher(address)
+		f, err = flasher.NewNinaFlasher(commonFlags.Address, baudRate)
 	case "WINC1500":
-		f, err = flasher.NewWincFlasher(address)
+		f, err = flasher.NewWincFlasher(commonFlags.Address, baudRate)
 	default:
 		err = fmt.Errorf("unknown module: %s", moduleName)
 	}

cli/firmware/flash.go

@@ -139,12 +139,16 @@ func updateFirmware(board *firmwareindex.IndexBoard, loaderSketch, moduleName st
 
 	// Get flasher depending on which module to use
 	var f flasher.Flasher
+
+	// This matches the baudrate used in the FirmwareUpdater.ino sketch
+	// https://github.com/arduino-libraries/WiFiNINA/blob/master/examples/Tools/FirmwareUpdater/FirmwareUpdater.ino
+	const baudRate = 1000000
 	switch moduleName {
 	case "NINA":
 		// we use address and not bootloaderPort because the board should not be in bootloader mode
-		f, err = flasher.NewNinaFlasher(address)
+		f, err = flasher.NewNinaFlasher(commonFlags.Address, baudRate)
 	case "WINC1500":
-		f, err = flasher.NewWincFlasher(address)
+		f, err = flasher.NewWincFlasher(commonFlags.Address, baudRate)
 	default:
 		err = fmt.Errorf("unknown module: %s", moduleName)
 		feedback.Errorf("Error during firmware flashing: %s", err)

flasher/flasher.go

@@ -62,11 +62,7 @@ type Flasher interface {
 	sendCommand(data CommandData) error
 }
 
-// This matches the baudrate used in the FirmwareUpdater.ino sketch
-// https://github.com/arduino-libraries/WiFiNINA/blob/master/examples/Tools/FirmwareUpdater/FirmwareUpdater.ino
-const baudRate = 1000000
-
-func OpenSerial(portAddress string) (serial.Port, error) {
+func OpenSerial(portAddress string, baudRate int) (serial.Port, error) {
 
 	port, err := serial.Open(portAddress, &serial.Mode{BaudRate: baudRate})
 	if err != nil {

flasher/nina.go

@@ -36,8 +36,8 @@ import (
 )
 
 // NewNinaFlasher creates an new instance of NinaFlasher
-func NewNinaFlasher(portAddress string) (*NinaFlasher, error) {
-	port, err := OpenSerial(portAddress)
+func NewNinaFlasher(portAddress string, baudRate int) (*NinaFlasher, error) {
+	port, err := OpenSerial(portAddress, baudRate)
 	if err != nil {
 		logrus.Error(err)
 		return nil, err

flasher/winc.go

@@ -35,8 +35,8 @@ import (
 	"go.bug.st/serial"
 )
 
-func NewWincFlasher(portAddress string) (*WincFlasher, error) {
-	port, err := OpenSerial(portAddress)
+func NewWincFlasher(portAddress string, baudRate int) (*WincFlasher, error) {
+	port, err := OpenSerial(portAddress, baudRate)
 	if err != nil {
 		logrus.Error(err)
 		return nil, err