tinygo-org/tinygo
1
0
Fork 0
mirror of https://github.com/tinygo-org/tinygo.git synced 2026-08-19 12:04:03 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

compileopts: add 'retries' flag to allow setting the number of times to retry locating the MSD volume when flashing

Browse Source 
Signed-off-by: deadprogram <ron@hybridgroup.com>
This commit is contained in:
deadprogram
2022-11-06 21:47:58 +01:00
committed by Ron Evans
parent 2001c44ed3
commit 73b368270c
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compileopts/options.go
+1
View File
@@ -51,6 +51,7 @@ type Options struct {
PrintJSON bool PrintJSON bool
Monitor bool Monitor bool
BaudRate int BaudRate int
Retries int
} }
// Verify performs a validation on the given options, raising an error if options are not valid. // Verify performs a validation on the given options, raising an error if options are not valid.
main.go
+6 -6
View File
@@ -928,8 +928,6 @@ func touchSerialPortAt1200bps(port string) (err error) {
return fmt.Errorf("opening port: %s", err) return fmt.Errorf("opening port: %s", err)
} }
const maxMSDRetries = 10
func flashUF2UsingMSD(volume, tmppath string, options *compileopts.Options) error { func flashUF2UsingMSD(volume, tmppath string, options *compileopts.Options) error {
// find standard UF2 info path // find standard UF2 info path
var infoPath string var infoPath string
@@ -951,7 +949,7 @@ func flashUF2UsingMSD(volume, tmppath string, options *compileopts.Options) erro
infoPath = path + "/INFO_UF2.TXT" infoPath = path + "/INFO_UF2.TXT"
} }
d, err := locateDevice(volume, infoPath) d, err := locateDevice(volume, infoPath, options.Retries)
if err != nil { if err != nil {
return err return err
} }
@@ -980,7 +978,7 @@ func flashHexUsingMSD(volume, tmppath string, options *compileopts.Options) erro
destPath = path + "/" destPath = path + "/"
} }
d, err := locateDevice(volume, destPath) d, err := locateDevice(volume, destPath, options.Retries)
if err != nil { if err != nil {
return err return err
} }
@@ -988,10 +986,10 @@ func flashHexUsingMSD(volume, tmppath string, options *compileopts.Options) erro
return moveFile(tmppath, d+"/flash.hex") return moveFile(tmppath, d+"/flash.hex")
} }
func locateDevice(volume, path string) (string, error) { func locateDevice(volume, path string, maxRetries int) (string, error) {
var d []string var d []string
var err error var err error
for i := 0; i < maxMSDRetries; i++ { for i := 0; i < maxRetries; i++ {
d, err = filepath.Glob(path) d, err = filepath.Glob(path)
if err != nil { if err != nil {
return "", err return "", err
@@ -1398,6 +1396,7 @@ func main() {
ocdCommandsString := flag.String("ocd-commands", "", "OpenOCD commands, overriding target spec (can specify multiple separated by commas)") ocdCommandsString := flag.String("ocd-commands", "", "OpenOCD commands, overriding target spec (can specify multiple separated by commas)")
ocdOutput := flag.Bool("ocd-output", false, "print OCD daemon output during debug") ocdOutput := flag.Bool("ocd-output", false, "print OCD daemon output during debug")
port := flag.String("port", "", "flash port (can specify multiple candidates separated by commas)") port := flag.String("port", "", "flash port (can specify multiple candidates separated by commas)")
maxRetries := flag.Int("retries", 10, "the maximum number of times to retry locating the MSD volume to be used for flashing")
programmer := flag.String("programmer", "", "which hardware programmer to use") programmer := flag.String("programmer", "", "which hardware programmer to use")
ldflags := flag.String("ldflags", "", "Go link tool compatible ldflags") ldflags := flag.String("ldflags", "", "Go link tool compatible ldflags")
llvmFeatures := flag.String("llvm-features", "", "comma separated LLVM features to enable") llvmFeatures := flag.String("llvm-features", "", "comma separated LLVM features to enable")
@@ -1494,6 +1493,7 @@ func main() {
PrintJSON: flagJSON, PrintJSON: flagJSON,
Monitor: *monitor, Monitor: *monitor,
BaudRate: *baudrate, BaudRate: *baudrate,
Retries: *maxRetries,
} }
if *printCommands { if *printCommands {
options.PrintCommands = printCommand options.PrintCommands = printCommand