Skip to content

Commit

Permalink
* update gomavlib
Browse files Browse the repository at this point in the history
* switch to go 1.15
  • Loading branch information
aler9 committed Nov 24, 2020
1 parent f4f0793 commit 9e4e7f7
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

BASE_IMAGE = amd64/golang:1.13-alpine3.10
BASE_IMAGE = amd64/golang:1.15-alpine3.12

.PHONY: $(shell ls)

Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module mavp2p

go 1.15

require (
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
github.com/aler9/gomavlib v0.0.0-20191214183340-7ef85c972f00
github.com/aler9/gomavlib v0.0.0-20201120101036-18fe8fc2cf89
gopkg.in/alecthomas/kingpin.v2 v2.2.6
)

go 1.13
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZq
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2cI+DC1Mbh0TJxzA3RcLoMsFw+aXw7E=
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
github.com/aler9/gomavlib v0.0.0-20191214183340-7ef85c972f00 h1:m8Cv/lSuqoU9CNq/AKYuVoJvkF0TmTOCwNngnoezik0=
github.com/aler9/gomavlib v0.0.0-20191214183340-7ef85c972f00/go.mod h1:zVDnk00REBXaBGeztlQy0cjcxDn2A2BQ8I7u4ntmD5s=
github.com/aler9/gomavlib v0.0.0-20201120101036-18fe8fc2cf89 h1:skfBSJhuNrLGdE5Sb2QCPTzMGHdYJwZ5V3CP0sJFnug=
github.com/aler9/gomavlib v0.0.0-20201120101036-18fe8fc2cf89/go.mod h1:NvPzUjXjXlFJuEq23QHIuNnwymuh+/ebvKQkK3bh3ng=
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/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
Expand Down
11 changes: 5 additions & 6 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ import (
"time"

"github.com/aler9/gomavlib"
"github.com/aler9/gomavlib/dialects/common"
"github.com/aler9/gomavlib/pkg/dialect"
"github.com/aler9/gomavlib/pkg/dialects/common"
"github.com/aler9/gomavlib/pkg/msg"
"gopkg.in/alecthomas/kingpin.v2"
)

Expand Down Expand Up @@ -138,17 +140,14 @@ func main() {

// decode/encode only a minimal set of messages.
// other messages change too frequently and cannot be integrated into a static tool.
msgs := []gomavlib.Message{}
msgs := []msg.Message{}
if *hbDisable == false || *streamReqDisable == false {
msgs = append(msgs, &common.MessageHeartbeat{})
}
if *streamReqDisable == false {
msgs = append(msgs, &common.MessageRequestDataStream{})
}
dialect, err := gomavlib.NewDialect(3, msgs)
if err != nil {
initError(err.Error())
}
dialect := &dialect.Dialect{3, msgs}

node, err := gomavlib.NewNode(gomavlib.NodeConf{
Endpoints: econfs,
Expand Down
File renamed without changes.

0 comments on commit 9e4e7f7

Please sign in to comment.