Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade go-nmea dependency #2

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

upgrade go-nmea dependency #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6c147e
upgrade lib
Aug 18, 2023
4119ca6
use tip of nmea
Aug 18, 2023
f4a3c32
foo
Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions aisnmea/assembler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package aisnmea

import (
"github.com/BertoldVdb/go-ais"
nmea "github.com/adrianmo/go-nmea"
)

Expand All @@ -12,7 +11,7 @@ type VdmPacket struct {
MessageType string
Payload []byte
Packet ais.Packet
TagBlock nmea.TagBlock
TagBlock nmea.TagBlock
}

type vdmAssemblyWork struct {
Expand Down
4 changes: 1 addition & 3 deletions aisnmea/nmea.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import (
"errors"
"fmt"

"github.com/BertoldVdb/go-ais"

nmea "github.com/adrianmo/go-nmea"
)

Expand Down Expand Up @@ -153,7 +151,7 @@ func (nc *NMEACodec) EncodeSentence(p VdmPacket) []string {
output[0] = fmt.Sprintf("!%s%s,1,1,,%c,%s,%d", p.TalkerID, p.MessageType, channel, asciiPayload, fillBits)
output[0] = addChecksum(output[0])

tagBlock := encodeTagBlock(&p.TagBlock, 1,1,0, false)
tagBlock := encodeTagBlock(&p.TagBlock, 1, 1, 0, false)
if tagBlock != "" {
output[0] = fmt.Sprintf("%s%s", tagBlock, output[0])
}
Expand Down
1 change: 0 additions & 1 deletion aisnmea/nmea_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"strings"
"testing"

"github.com/BertoldVdb/go-ais"
"github.com/adrianmo/go-nmea"
)

Expand Down
3 changes: 1 addition & 2 deletions bench_decode_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ package ais_test
import (
"bufio"
"compress/gzip"
"github.com/BertoldVdb/go-ais"
"github.com/BertoldVdb/go-ais/aisnmea"
ais "github.com/nilsmagnus/go-ais"
"io"
"os"
"strings"
Expand Down
3 changes: 1 addition & 2 deletions deep_compare_archive_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ package ais_test
import (
"bufio"
"compress/gzip"
"github.com/BertoldVdb/go-ais"
"github.com/BertoldVdb/go-ais/aisnmea"
"github.com/nilsmagnus/go-ais/aisnmea"
"io"
"os"
"reflect"
Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/BertoldVdb/go-ais
module github.com/nilsmagnus/go-ais

go 1.13
go 1.20

require github.com/adrianmo/go-nmea v1.3.0
require github.com/adrianmo/go-nmea v1.8.0
5 changes: 2 additions & 3 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github.com/adrianmo/go-nmea v1.3.0 h1:BFrLRj/oIh+DYujIKpuQievq7X3NDHYq57kNgsfr2GY=
github.com/adrianmo/go-nmea v1.3.0/go.mod h1:u8bPnpKt/D/5rll/5l9f6iDfeq5WZW0+/SXdkwix6Tg=
github.com/adrianmo/go-nmea v1.8.0 h1:KE6xDTMQNoKoyCb7IQRXGOIbn4WJlUKwIuRD4LbpKlM=
github.com/adrianmo/go-nmea v1.8.0/go.mod h1:u8bPnpKt/D/5rll/5l9f6iDfeq5WZW0+/SXdkwix6Tg=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand All @@ -8,7 +8,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
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=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=