diff --git a/go.mod b/go.mod index 2b3d51d1cd..035527189e 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( golang.org/x/sys v0.30.0 golang.org/x/tools v0.30.0 gopkg.in/yaml.v2 v2.4.0 - tinygo.org/x/espflash v0.3.0 + tinygo.org/x/espflasher v0.4.0 tinygo.org/x/go-llvm v0.0.0-20250422114502-b8f170971e74 ) diff --git a/go.sum b/go.sum index 6af085b56e..a3b398191d 100644 --- a/go.sum +++ b/go.sum @@ -58,7 +58,7 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -tinygo.org/x/espflash v0.3.0 h1:uhTOWZb1FyQ4MZTZWORh/bOLFQfaFr2nuM9t3pJExRM= -tinygo.org/x/espflash v0.3.0/go.mod h1:n4sWxsjN4wjHN1lKfEYjXke6/eSeLTq/lRRLJS5FNfg= +tinygo.org/x/espflasher v0.4.0 h1:0N+Ei+0qT/wGkGIoMaY2g+oI519VA5G4kUVUYHedTv8= +tinygo.org/x/espflasher v0.4.0/go.mod h1:a3hRV9EETPUkfPE6P14p4A6jKKth+oD5gtQz3nmij+8= tinygo.org/x/go-llvm v0.0.0-20250422114502-b8f170971e74 h1:ovavgTdIBWCH8YWlcfq9gkpoyT1+IxMKSn+Df27QwE8= tinygo.org/x/go-llvm v0.0.0-20250422114502-b8f170971e74/go.mod h1:GFbusT2VTA4I+l4j80b17KFK+6whv69Wtny5U+T8RR0= diff --git a/main.go b/main.go index 425d12574a..30985022e1 100644 --- a/main.go +++ b/main.go @@ -32,7 +32,7 @@ import ( "github.com/tinygo-org/tinygo/goenv" "github.com/tinygo-org/tinygo/loader" "golang.org/x/tools/go/buildutil" - "tinygo.org/x/espflash/pkg/espflash" + "tinygo.org/x/espflasher/pkg/espflasher" "tinygo.org/x/go-llvm" "go.bug.st/serial" @@ -1046,14 +1046,14 @@ const ( ) func flashBinUsingEsp32(port, resetMode, tmppath string, options *compileopts.Options) error { - var opts *espflash.FlasherOptions + var opts *espflasher.FlasherOptions // On Windows, we have to explicitly specify the reset mode to use USB JTAG. if runtime.GOOS == "windows" && resetMode == jtagReset { - opts = espflash.DefaultOptions() - opts.ResetMode = espflash.ResetUSBJTAG + opts = espflasher.DefaultOptions() + opts.ResetMode = espflasher.ResetUSBJTAG } - flasher, err := espflash.NewFlasher(port, opts) + flasher, err := espflasher.New(port, opts) if err != nil { return err }