Do not bail out upload if the 1200-bps touch fails (makes upload more resilient) (#913)

cmaglie · web-flow · commit e3c2f6f3b927 · 2020-08-21T11:03:29.000+02:00
diff --git a/commands/upload/upload.go b/commands/upload/upload.go
@@ -286,7 +286,8 @@ func runProgramAction(pm *packagemanager.PackageManager,
 						outStream.Write([]byte(fmt.Sprintln()))
 					}
 					if err := touchSerialPortAt1200bps(p); err != nil {
-						return fmt.Errorf("cannot perform reset: %s", err)
+						outStream.Write([]byte(fmt.Sprintf("Cannot perform port reset: %s", err)))
+						outStream.Write([]byte(fmt.Sprintln()))
 					}
 					break
 				}

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,8 @@ func runProgramAction(pm *packagemanager.PackageManager,`
`286`	`286`	`outStream.Write([]byte(fmt.Sprintln()))`
`287`	`287`	`}`
`288`	`288`	`if err := touchSerialPortAt1200bps(p); err != nil {`
`289`		`- return fmt.Errorf("cannot perform reset: %s", err)`
	`289`	`+ outStream.Write([]byte(fmt.Sprintf("Cannot perform port reset: %s", err)))`
	`290`	`+ outStream.Write([]byte(fmt.Sprintln()))`
`290`	`291`	`}`
`291`	`292`	`break`
`292`	`293`	`}`