From 88188d3ccbb6fa8b36032fea524c058a78708316 Mon Sep 17 00:00:00 2001 From: Dmitry Lisin Date: Sun, 3 May 2020 23:40:15 +0300 Subject: [PATCH] Use go.mod friendly version of go.bug.st/serial library --- go.mod | 5 +---- go.sum | 17 +++++++---------- platforms/firmata/client/examples/blink.go | 4 ++-- platforms/firmata/firmata_adaptor.go | 2 +- platforms/mavlink/mavlink_adaptor.go | 2 +- platforms/megapi/megapi_adaptor.go | 2 +- platforms/neurosky/neurosky_adaptor.go | 2 +- platforms/sphero/sphero_adaptor.go | 2 +- 8 files changed, 15 insertions(+), 21 deletions(-) diff --git a/go.mod b/go.mod index 3e6bda377..7d3b886e3 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.13 require ( github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect - github.com/creack/goselect v0.1.0 // indirect github.com/donovanhide/eventsource v0.0.0-20171031113327-3ed64d21fb0b github.com/eclipse/paho.mqtt.golang v1.2.0 github.com/go-ble/ble v0.0.0-20190521171521-147700f13610 @@ -25,13 +24,11 @@ require ( github.com/sigurn/crc8 v0.0.0-20160107002456-e55481d6f45c github.com/sigurn/utils v0.0.0-20190728110027-e1fefb11a144 // indirect github.com/stretchr/testify v1.4.0 - github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07 github.com/urfave/cli v1.22.1 github.com/veandco/go-sdl2 v0.3.3 - go.bug.st/serial.v1 v0.0.0-20180827123349-5f7892a7bb45 + go.bug.st/serial v1.0.0 gocv.io/x/gocv v0.21.0 golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc // indirect golang.org/x/net v0.0.0-20190930134127-c5a3c61f89f3 - golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24 // indirect periph.io/x/periph v3.6.2+incompatible ) diff --git a/go.sum b/go.sum index a64ba2e14..2e0733a90 100644 --- a/go.sum +++ b/go.sum @@ -5,8 +5,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSY github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/creack/goselect v0.1.0 h1:4QiXIhcpSQF50XGaBsFzesjwX/1qOY5bOveQPmN9CXY= -github.com/creack/goselect v0.1.0/go.mod h1:gHrIcH/9UZDn2qgeTUeW5K9eZsVYCH6/60J/FHysWyE= +github.com/creack/goselect v0.1.1 h1:tiSSgKE1eJtxs1h/VgGQWuXUP0YS4CDIFMp6vaI1ls0= +github.com/creack/goselect v0.1.1/go.mod h1:a/NhLweNvqIYMuxcMOuWY516Cimucms3DglDzQP3hKY= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/donovanhide/eventsource v0.0.0-20171031113327-3ed64d21fb0b h1:eR1P/A4QMYF2/LpHRhYAts9wyYEtF7qNk/tVNiYCWc8= @@ -67,16 +67,13 @@ github.com/sigurn/utils v0.0.0-20190728110027-e1fefb11a144/go.mod h1:VRI4lXkrUH5 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07 h1:UyzmZLoiDWMRywV4DUYb9Fbt8uiOSooupjTq10vpvnU= -github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/veandco/go-sdl2 v0.3.3 h1:4/TirgB2MQ7oww3pM3Yfgf1YbChMlAQAmiCPe5koK0I= github.com/veandco/go-sdl2 v0.3.3/go.mod h1:FB+kTpX9YTE+urhYiClnRzpOXbiWgaU3+5F2AB78DPg= -go.bug.st/serial.v1 v0.0.0-20180827123349-5f7892a7bb45 h1:mACY1anK6HNCZtm/DK2Rf2ZPHggVqeB0+7rY9Gl6wyI= -go.bug.st/serial.v1 v0.0.0-20180827123349-5f7892a7bb45/go.mod h1:dRSl/CVCTf56CkXgJMDOdSwNfo2g1orOGE/gBGdvjZw= -gocv.io/x/gocv v0.20.0 h1:2q75zQ8Zel2tB69G6qrmf/E7EdvaCs90qvkHzdSBOAg= -gocv.io/x/gocv v0.20.0/go.mod h1:vZETJRwLnl11muQ6iL3q4ju+0oJRrdmYdv5xJTH7WYA= +go.bug.st/serial v1.0.0 h1:ogEPzrllCsnG00EqKRjeYvPRsO7NJW6DqykzkdD6E/k= +go.bug.st/serial v1.0.0/go.mod h1:rpXPISGjuNjPTRTcMlxi9lN6LoIPxd1ixVjBd8aSk/Q= +gocv.io/x/gocv v0.21.0 h1:dVjagrupZrfCRY0qPEaYWgoNMRpBel6GYDH4mvQOK8Y= gocv.io/x/gocv v0.21.0/go.mod h1:Rar2PS6DV+T4FL+PM535EImD/h13hGVaHhnCu1xarBs= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= @@ -95,8 +92,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24 h1:R8bzl0244nw47n1xKs1MUMAaTNgjavKcN/aX2Ss3+Fo= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9 h1:ZBzSG/7F4eNKz2L3GE9o300RX0Az1Bw5HF7PDraD+qU= +golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/platforms/firmata/client/examples/blink.go b/platforms/firmata/client/examples/blink.go index 4590f76d7..f8b0d1d4b 100644 --- a/platforms/firmata/client/examples/blink.go +++ b/platforms/firmata/client/examples/blink.go @@ -8,12 +8,12 @@ import ( "fmt" "time" - "github.com/tarm/serial" + "go.bug.st/serial" "gobot.io/x/gobot/platforms/firmata/client" ) func main() { - sp, err := serial.OpenPort(&serial.Config{Name: "/dev/ttyACM0", Baud: 57600}) + sp, err := serial.Open("/dev/ttyACM0", &serial.Mode{BaudRate: 57600}) if err != nil { panic(err) } diff --git a/platforms/firmata/firmata_adaptor.go b/platforms/firmata/firmata_adaptor.go index 6975df4b7..72f65b322 100644 --- a/platforms/firmata/firmata_adaptor.go +++ b/platforms/firmata/firmata_adaptor.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - serial "go.bug.st/serial.v1" + "go.bug.st/serial" "gobot.io/x/gobot" "gobot.io/x/gobot/drivers/i2c" "gobot.io/x/gobot/platforms/firmata/client" diff --git a/platforms/mavlink/mavlink_adaptor.go b/platforms/mavlink/mavlink_adaptor.go index 8f1a36126..53bffd925 100644 --- a/platforms/mavlink/mavlink_adaptor.go +++ b/platforms/mavlink/mavlink_adaptor.go @@ -3,7 +3,7 @@ package mavlink import ( "io" - serial "go.bug.st/serial.v1" + "go.bug.st/serial" "gobot.io/x/gobot" common "gobot.io/x/gobot/platforms/mavlink/common" ) diff --git a/platforms/megapi/megapi_adaptor.go b/platforms/megapi/megapi_adaptor.go index 27da9ed71..43b3c942c 100644 --- a/platforms/megapi/megapi_adaptor.go +++ b/platforms/megapi/megapi_adaptor.go @@ -4,7 +4,7 @@ import ( "io" "time" - serial "go.bug.st/serial.v1" + "go.bug.st/serial" "gobot.io/x/gobot" ) diff --git a/platforms/neurosky/neurosky_adaptor.go b/platforms/neurosky/neurosky_adaptor.go index c7ba53c79..874362da9 100644 --- a/platforms/neurosky/neurosky_adaptor.go +++ b/platforms/neurosky/neurosky_adaptor.go @@ -4,7 +4,7 @@ package neurosky import ( "io" - serial "go.bug.st/serial.v1" + "go.bug.st/serial" ) // Adaptor is the Gobot Adaptor for the Neurosky Mindwave diff --git a/platforms/sphero/sphero_adaptor.go b/platforms/sphero/sphero_adaptor.go index c8978717b..f0ca75630 100644 --- a/platforms/sphero/sphero_adaptor.go +++ b/platforms/sphero/sphero_adaptor.go @@ -5,7 +5,7 @@ import ( "gobot.io/x/gobot" - serial "go.bug.st/serial.v1" + "go.bug.st/serial" ) // Adaptor represents a Connection to a Sphero