Skip to content

Small change in upload message #1991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 24, 2022
Merged

Small change in upload message #1991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d1576c
Renamed variables
cmaglie Nov 24, 2022
80eba19
Do not print full Port structure on messages
cmaglie Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions commands/upload/upload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,10 +396,10 @@ func runProgramAction(pme *packagemanager.Explorer,
}

cb := &serialutils.ResetProgressCallbacks{
TouchingPort: func(port string) {
logrus.WithField("phase", "board reset").Infof("Performing 1200-bps touch reset on serial port %s", port)
TouchingPort: func(portAddress string) {
logrus.WithField("phase", "board reset").Infof("Performing 1200-bps touch reset on serial port %s", portAddress)
if verbose {
outStream.Write([]byte(fmt.Sprintln(tr("Performing 1200-bps touch reset on serial port %s", port))))
outStream.Write([]byte(fmt.Sprintln(tr("Performing 1200-bps touch reset on serial port %s", portAddress))))
}
},
WaitingForNewSerial: func() {
Expand All @@ -408,17 +408,17 @@ func runProgramAction(pme *packagemanager.Explorer,
outStream.Write([]byte(fmt.Sprintln(tr("Waiting for upload port..."))))
}
},
BootloaderPortFound: func(port string) {
if port != "" {
logrus.WithField("phase", "board reset").Infof("Upload port found on %s", port)
BootloaderPortFound: func(portAddress string) {
if portAddress != "" {
logrus.WithField("phase", "board reset").Infof("Upload port found on %s", portAddress)
} else {
logrus.WithField("phase", "board reset").Infof("No upload port found, using %s as fallback", actualPort)
logrus.WithField("phase", "board reset").Infof("No upload port found, using %s as fallback", actualPort.Address)
}
if verbose {
if port != "" {
outStream.Write([]byte(fmt.Sprintln(tr("Upload port found on %s", port))))
if portAddress != "" {
outStream.Write([]byte(fmt.Sprintln(tr("Upload port found on %s", portAddress))))
} else {
outStream.Write([]byte(fmt.Sprintln(tr("No upload port found, using %s as fallback", actualPort))))
outStream.Write([]byte(fmt.Sprintln(tr("No upload port found, using %s as fallback", actualPort.Address))))
}
}
},
Expand All @@ -427,11 +427,11 @@ func runProgramAction(pme *packagemanager.Explorer,
},
}

if newPort, err := serialutils.Reset(portToTouch, wait, cb, dryRun); err != nil {
if newPortAddress, err := serialutils.Reset(portToTouch, wait, cb, dryRun); err != nil {
outStream.Write([]byte(fmt.Sprintln(tr("Cannot perform port reset: %s", err))))
} else {
if newPort != "" {
actualPort.Address = newPort
if newPortAddress != "" {
actualPort.Address = newPortAddress
}
}
}
Expand Down
Loading