Skip to content

Commit adece05

Browse files
committed
Handle programmer path being passed externally
1 parent 95b2dd2 commit adece05

File tree

1 file changed

+4
-4
lines changed
  • src/github.com/arduino-libraries/WiFi101-FirmwareUpdater/bossac

1 file changed

+4
-4
lines changed

src/github.com/arduino-libraries/WiFi101-FirmwareUpdater/bossac/bossac.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func (b *Bossac) Flash(ctx context.Context, filename string) error {
2323
if err != nil {
2424
return err
2525
}
26-
err = invokeBossac([]string{"-e", "-R", "-p", port, "-w" , filename})
26+
err = invokeBossac([]string{ctx.ProgrammerPath, "-e", "-R", "-p", port, "-w" , filename})
2727

2828
ports, err := serial.GetPortsList()
2929
port = waitReset(ports, port)
@@ -38,12 +38,12 @@ func (b *Bossac)DumpAndFlash(ctx context.Context, filename string) (string, erro
3838
if err != nil {
3939
return "", err
4040
}
41-
err = invokeBossac([]string{"-u", "-r", "-p", port, filepath.Join(dir, "dump.bin")})
41+
err = invokeBossac([]string{ctx.ProgrammerPath, "-u", "-r", "-p", port, filepath.Join(dir, "dump.bin")})
4242
log.Println("Original sketch saved at " + filepath.Join(dir, "dump.bin"))
4343
if err != nil {
4444
return "", err
4545
}
46-
err = invokeBossac([]string{"-e", "-R", "-p", port, "-w" , filename})
46+
err = invokeBossac([]string{ctx.ProgrammerPath, "-e", "-R", "-p", port, "-w" , filename})
4747

4848
ports, err := serial.GetPortsList()
4949
port = waitReset(ports, port)
@@ -52,7 +52,7 @@ func (b *Bossac)DumpAndFlash(ctx context.Context, filename string) (string, erro
5252
}
5353

5454
func invokeBossac(args []string) error {
55-
cmd := exec.Command("bossac/bossac", args...)
55+
cmd := exec.Command(args[0], args[1:]...)
5656
var out bytes.Buffer
5757
cmd.Stdout = &out
5858
err := cmd.Run()

0 commit comments

Comments
 (0)