harden the flashing process on win pt2 (#76)

* harden upload on windows pt2 (was using port before touch)

* the correct address is used once the board comes back from bootloader mode

Author: umbynos

cli/firmware/flash.go

@@ -151,19 +151,8 @@ func run(cmd *cobra.Command, args []string) {
 
 	loaderSketch := strings.ReplaceAll(loaderSketchPath.String(), loaderSketchPath.Ext(), "")
 
-	uploaderCommand := board.GetUploaderCommand()
-	uploaderCommand = strings.ReplaceAll(uploaderCommand, "{tool_dir}", filepath.FromSlash(uploadToolDir.String()))
-	uploaderCommand = strings.ReplaceAll(uploaderCommand, "{serial.port.file}", address)
-	uploaderCommand = strings.ReplaceAll(uploaderCommand, "{loader.sketch}", loaderSketch)
-
-	commandLine, err := properties.SplitQuotedString(uploaderCommand, "\"", false)
-	if err != nil {
-		feedback.Errorf(`Error splitting command line "%s": %s`, uploaderCommand, err)
-		os.Exit(errorcodes.ErrGeneric)
-	}
-
 	for retry := 1; retry <= int(retries); retry++ {
-		err = updateFirmware(board, commandLine, moduleName, firmwareFile)
+		err = updateFirmware(board, loaderSketch, moduleName, uploadToolDir, firmwareFile)
 		if err == nil {
 			logrus.Info("Operation completed: success! :-)")
 			break
@@ -178,10 +167,10 @@ func run(cmd *cobra.Command, args []string) {
 	}
 }
 
-func updateFirmware(board *firmwareindex.IndexBoard, commandLine []string, moduleName string, firmwareFile *paths.Path) error {
+func updateFirmware(board *firmwareindex.IndexBoard, loaderSketch, moduleName string, uploadToolDir, firmwareFile *paths.Path) error {
 	var err error
 	// Check if board needs a 1200bps touch for upload
-	uploadPort := address
+	bootloaderPort := address
 	if board.UploadTouch {
 		logrus.Info("Putting board into bootloader mode")
 		newUploadPort, err := serialutils.Reset(address, board.UploadWait, nil)
@@ -190,10 +179,21 @@ func updateFirmware(board *firmwareindex.IndexBoard, commandLine []string, modul
 		}
 		if newUploadPort != "" {
 			logrus.Infof("Found port to upload Loader: %s", newUploadPort)
-			uploadPort = newUploadPort
+			bootloaderPort = newUploadPort
 		}
 	}
 
+	uploaderCommand := board.GetUploaderCommand()
+	uploaderCommand = strings.ReplaceAll(uploaderCommand, "{tool_dir}", filepath.FromSlash(uploadToolDir.String()))
+	uploaderCommand = strings.ReplaceAll(uploaderCommand, "{serial.port.file}", bootloaderPort)
+	uploaderCommand = strings.ReplaceAll(uploaderCommand, "{loader.sketch}", loaderSketch)
+
+	commandLine, err := properties.SplitQuotedString(uploaderCommand, "\"", false)
+	if err != nil {
+		feedback.Errorf(`Error splitting command line "%s": %s`, uploaderCommand, err)
+		os.Exit(errorcodes.ErrGeneric)
+	}
+
 	// Flash loader Sketch
 	programmerOut := new(bytes.Buffer)
 	programmerErr := new(bytes.Buffer)
@@ -208,15 +208,16 @@ func updateFirmware(board *firmwareindex.IndexBoard, commandLine []string, modul
 
 	// Wait a bit after flashing the loader sketch for the board to become
 	// available again.
-	time.Sleep(2 * time.Second)
+	time.Sleep(3 * time.Second)
 
 	// Get flasher depending on which module to use
 	var f flasher.Flasher
 	switch moduleName {
 	case "NINA":
-		f, err = flasher.NewNinaFlasher(uploadPort)
+		// we use address and not bootloaderPort because the board should not be in bootloader mode
+		f, err = flasher.NewNinaFlasher(address)
 	case "WINC1500":
-		f, err = flasher.NewWincFlasher(uploadPort)
+		f, err = flasher.NewWincFlasher(address)
 	default:
 		err = fmt.Errorf("unknown module: %s", moduleName)
 		feedback.Errorf("Error during firmware flashing: %s", err)