Commit b3cf8e19 authored by Cristian Maglie's avatar Cristian Maglie Committed by Silvano Cerza

Allow upload without specifing port, even if the board requires 1200-bps-touch...

Allow upload without specifing port, even if the board requires 1200-bps-touch on the serial port (#1263)
parent 46c23166
...@@ -296,9 +296,8 @@ func runProgramAction(pm *packagemanager.PackageManager, ...@@ -296,9 +296,8 @@ func runProgramAction(pm *packagemanager.PackageManager,
// Perform reset via 1200bps touch if requested // Perform reset via 1200bps touch if requested
if uploadProperties.GetBoolean("upload.use_1200bps_touch") { if uploadProperties.GetBoolean("upload.use_1200bps_touch") {
if port == "" { if port == "" {
return fmt.Errorf("no upload port provided") outStream.Write([]byte(fmt.Sprintln("Skipping 1200-bps touch reset: no serial port selected!")))
} } else {
ports, err := serial.GetPortsList() ports, err := serial.GetPortsList()
if err != nil { if err != nil {
return fmt.Errorf("cannot get serial port list: %s", err) return fmt.Errorf("cannot get serial port list: %s", err)
...@@ -318,6 +317,7 @@ func runProgramAction(pm *packagemanager.PackageManager, ...@@ -318,6 +317,7 @@ func runProgramAction(pm *packagemanager.PackageManager,
} }
} }
} }
}
// Wait for upload port if requested // Wait for upload port if requested
if uploadProperties.GetBoolean("upload.wait_for_upload_port") { if uploadProperties.GetBoolean("upload.wait_for_upload_port") {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment