Skip to content

Commit 74dd907

Browse files
[skip-changelog] Handle errors that occur during reset (#2183)
1 parent ba534c0 commit 74dd907

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Diff for: arduino/serialutils/serialutils.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ func Reset(portToTouch string, wait bool, cb *ResetProgressCallbacks, dryRun boo
131131
if dryRun {
132132
// do nothing!
133133
} else {
134-
if err := TouchSerialPortAt1200bps(portToTouch); err != nil {
135-
fmt.Println(tr("TOUCH: error during reset: %s", err))
134+
if err := TouchSerialPortAt1200bps(portToTouch); err != nil && !wait {
135+
return "", errors.Errorf(tr("TOUCH: error during reset: %s", err))
136136
}
137137
}
138138
}

Diff for: commands/upload/upload.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ func runProgramAction(pme *packagemanager.Explorer,
430430
}
431431

432432
if newPortAddress, err := serialutils.Reset(portToTouch, wait, cb, dryRun); err != nil {
433-
outStream.Write([]byte(fmt.Sprintln(tr("Cannot perform port reset: %s", err))))
433+
errStream.Write([]byte(fmt.Sprintln(tr("Cannot perform port reset: %s", err))))
434434
} else {
435435
if newPortAddress != "" {
436436
actualPort.Address = newPortAddress

0 commit comments

Comments
 (0)