Skip to content

Commit 670fe39

Browse files
committed
Upgraded arduino-cli and replaced serialutils dep
1 parent ef266fa commit 670fe39

File tree

8 files changed

+467
-1500
lines changed

8 files changed

+467
-1500
lines changed

.licenses/arduino-create-agent/go/github.com/arduino/arduino-cli/arduino/serialutils.dep.yml

-720
This file was deleted.

.licenses/arduino-create-agent/go/github.com/arduino/arduino-cli/i18n.dep.yml

-701
This file was deleted.

.licenses/arduino-create-agent/go/github.com/arduino/go-serial-utils.dep.yml

+458
Large diffs are not rendered by default.

.licenses/arduino-create-agent/go/github.com/leonelquinteros/gotext.dep.yml

-34
This file was deleted.

.licenses/arduino-create-agent/go/github.com/leonelquinteros/gotext/plurals.dep.yml

-35
This file was deleted.

go.mod

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ go 1.21
55
require (
66
fyne.io/systray v1.10.0
77
github.com/ProtonMail/go-crypto v1.1.0-alpha.0
8-
github.com/arduino/arduino-cli v0.35.0
98
github.com/arduino/go-paths-helper v1.12.0
9+
github.com/arduino/go-serial-utils v0.1.2
1010
github.com/blang/semver v3.5.1+incompatible
1111
github.com/codeclysm/extract/v3 v3.1.1
1212
github.com/gin-contrib/cors v1.5.0
@@ -56,13 +56,13 @@ require (
5656
github.com/kr/binarydist v0.1.0 // indirect
5757
github.com/kr/pretty v0.3.1 // indirect
5858
github.com/leodido/go-urn v1.2.4 // indirect
59-
github.com/leonelquinteros/gotext v1.4.0 // indirect
6059
github.com/manveru/faker v0.0.0-20171103152722-9fbc68a78c4d // indirect
6160
github.com/mattn/go-isatty v0.0.20 // indirect
6261
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6362
github.com/modern-go/reflect2 v1.0.2 // indirect
6463
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
6564
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
65+
github.com/rogpeppe/go-internal v1.12.0 // indirect
6666
github.com/sergi/go-diff v1.3.1 // indirect
6767
github.com/smartystreets/goconvey v1.6.4 // indirect
6868
github.com/tevino/abool v1.2.0 // indirect
@@ -76,5 +76,6 @@ require (
7676
golang.org/x/text v0.14.0 // indirect
7777
golang.org/x/tools v0.17.0 // indirect
7878
google.golang.org/protobuf v1.32.0 // indirect
79+
gopkg.in/ini.v1 v1.67.0 // indirect
7980
gopkg.in/yaml.v3 v3.0.1 // indirect
8081
)

go.sum

+4-6
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ github.com/AnatolyRugalev/goregen v0.1.0 h1:xrdXkLaskMnbxW0x4FWNj2yoednv0X2bcTBW
44
github.com/AnatolyRugalev/goregen v0.1.0/go.mod h1:sVlY1tjcirqLBRZnCcIq1+7/Lwmqz5g7IK8AStjOVzI=
55
github.com/ProtonMail/go-crypto v1.1.0-alpha.0 h1:nHGfwXmFvJrSR9xu8qL7BkO4DqTHXE9N5vPhgY2I+j0=
66
github.com/ProtonMail/go-crypto v1.1.0-alpha.0/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
7-
github.com/arduino/arduino-cli v0.35.0 h1:tkSpGun1hMgJPkvZJjofejWD+ivhCpvsl49H4n81iSc=
8-
github.com/arduino/arduino-cli v0.35.0/go.mod h1:9aoXZdVGQ9uwf2M1nCSB+T051KbldslMFiJaHVycVsg=
97
github.com/arduino/go-paths-helper v1.12.0 h1:xizOQtI9iHdl19qXd1EmWg5i9W//2bOCOYwlNv8F61E=
108
github.com/arduino/go-paths-helper v1.12.0/go.mod h1:jcpW4wr0u69GlXhTYydsdsqAjLaYK5n7oWHfKqOG6LM=
9+
github.com/arduino/go-serial-utils v0.1.2 h1:MRFwME4w/uaVkJ1R+wzz4KSbI9cF9IDVrYorazvjpTk=
10+
github.com/arduino/go-serial-utils v0.1.2/go.mod h1:kzIsNPgz8DFAd1sAFKve4ubxrdGcwQ4XzvRLlztsgnE=
1111
github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
1212
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
1313
github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
@@ -97,8 +97,6 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
9797
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
9898
github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
9999
github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
100-
github.com/leonelquinteros/gotext v1.4.0 h1:2NHPCto5IoMXbrT0bldPrxj0qM5asOCwtb1aUQZ1tys=
101-
github.com/leonelquinteros/gotext v1.4.0/go.mod h1:yZGXREmoGTtBvZHNcc+Yfug49G/2spuF/i/Qlsvz1Us=
102100
github.com/manveru/faker v0.0.0-20171103152722-9fbc68a78c4d h1:Zj+PHjnhRYWBK6RqCDBcAhLXoi3TzC27Zad/Vn+gnVQ=
103101
github.com/manveru/faker v0.0.0-20171103152722-9fbc68a78c4d/go.mod h1:WZy8Q5coAB1zhY9AOBJP0O6J4BuDfbupUDavKY+I3+s=
104102
github.com/manveru/gobdd v0.0.0-20131210092515-f1a17fdd710b h1:3E44bLeN8uKYdfQqVQycPnaVviZdBLbizFhU49mtbe4=
@@ -123,8 +121,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
123121
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
124122
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
125123
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
126-
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
127-
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
124+
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
125+
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
128126
github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
129127
github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
130128
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=

upload/upload.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"runtime"
2424
"strings"
2525

26-
"github.com/arduino/arduino-cli/arduino/serialutils"
2726
"github.com/arduino/arduino-create-agent/utilities"
27+
serialutils "github.com/arduino/go-serial-utils"
2828
shellwords "github.com/mattn/go-shellwords"
2929
"github.com/pkg/errors"
3030
"go.bug.st/serial/enumerator"
@@ -120,7 +120,7 @@ func Kill() {
120120
// sometimes) and an error (usually because the port listing failed)
121121
func reset(port string, wait bool, l Logger) (string, error) {
122122
info(l, "Restarting in bootloader mode")
123-
newPort, err := serialutils.Reset(port, wait, nil, false) // TODO use callbacks to print as the cli does
123+
newPort, err := serialutils.Reset(port, wait, false, nil, nil) // TODO use callbacks to print reset progress
124124
if err != nil {
125125
info(l, err)
126126
return "", err

0 commit comments

Comments
 (0)