From 075c464093b8b1d4024f2826fd1fb9bfada780dd Mon Sep 17 00:00:00 2001 From: deadprogram Date: Mon, 13 Apr 2026 16:51:11 +0200 Subject: [PATCH] espflasher: update to 0.6-pre for testing Signed-off-by: deadprogram --- go.mod | 2 +- go.sum | 4 ++-- main.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index d18a92d9bf..6ffbbcd9c7 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/espflasher v0.5.0 + tinygo.org/x/espflasher v0.5.1-0.20260413094849-d440195aec03 tinygo.org/x/go-llvm v0.0.0-20250422114502-b8f170971e74 ) diff --git a/go.sum b/go.sum index f223a4bf1b..6be6c47a77 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/espflasher v0.5.0 h1:aLYv6ldFw/Bxj36e4DaEqjGMUwx+LvI7xdapqz49LQ8= -tinygo.org/x/espflasher v0.5.0/go.mod h1:a3hRV9EETPUkfPE6P14p4A6jKKth+oD5gtQz3nmij+8= +tinygo.org/x/espflasher v0.5.1-0.20260413094849-d440195aec03 h1:+DEWGpJ0dQcSyUbUiqUVKt6HgjpMyrXn0UeeyQwvJ28= +tinygo.org/x/espflasher v0.5.1-0.20260413094849-d440195aec03/go.mod h1:tr5u08HoE67WD5zxJesCiiVF/R1b6Akz3yXwh5zah8U= 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 f0d7bd46c4..de7b060f23 100644 --- a/main.go +++ b/main.go @@ -1089,6 +1089,7 @@ func flashHexUsingMSD(volumes []string, tmppath string, options *compileopts.Opt } const ( + defaultReset = "default" classicReset = "classic" jtagReset = "jtag" ) @@ -1101,8 +1102,7 @@ func flashBinUsingEsp32(port, resetMode, tmppath string, options *compileopts.Op opts.FlashBaudRate = options.BaudRate } - // On Windows, we have to explicitly specify the reset mode to use USB JTAG. - if runtime.GOOS == "windows" && resetMode == jtagReset { + if resetMode == jtagReset { opts.ResetMode = espflasher.ResetUSBJTAG }