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

fix: preserve src and prio when encode actisense format #215

Merged
merged 2 commits into from
Apr 2, 2023
Merged

fix: preserve src and prio when encode actisense format #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29b105b
fix: preserve src and prio when encode actisense format
sbender9 Apr 2, 2023
a660f29
test: expect correct src in customPgn test
sbender9 Apr 2, 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
2 changes: 1 addition & 1 deletion lib/stringMsg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ exports.encodeActisense = ({
].join(','))

exports.toActisenseSerialFormat = (pgn, data, dst=255, src=0) => exports.encodeActisense({
pgn, data, dst, src,
pgn, data, dst, src, prio
})

// A764027.880 05FF7 1EF00 E59861060202FFFFFFFF03030000FFFFFFFFFFFFFFFFFFFF0000FFFFFF7FFFFFFF7FFFFFFF7F0000FF7F
Expand Down
6 changes: 3 additions & 3 deletions lib/toPgn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,15 +292,15 @@ function canboat2Buffer(canboatData) {
}

function pgnToActisenseSerialFormat(pgn) {
return encodeActisense({ pgn: pgn.pgn, data: toPgn(pgn), dst: pgn.dst})
return encodeActisense({ pgn: pgn.pgn, data: toPgn(pgn), dst: pgn.dst, src: pgn.src, prio: pgn.prio})
}

function pgnToActisenseN2KAsciiFormat(pgn) {
return encodeActisenseN2KACSII({ pgn: pgn.pgn, data: toPgn(pgn), dst: pgn.dst})
return encodeActisenseN2KACSII({ pgn: pgn.pgn, data: toPgn(pgn), dst: pgn.dst, src: pgn.src, prio: pgn.prio})
}

function pgnToN2KActisenseFormat(pgn) {
return encodeN2KActisense({ pgn: pgn.pgn, data: toPgn(pgn), dst: pgn.dst})
return encodeN2KActisense({ pgn: pgn.pgn, data: toPgn(pgn), dst: pgn.dst, src: pgn.src, prio: pgn.prio})
}

function toiKonvertSerialFormat(pgn, data, dst=255) {
Expand Down
2 changes: 1 addition & 1 deletion test/customPgns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ describe('custom pgns', function () {

var actisense = pgnToActisenseSerialFormat(expected)
actisense = actisense.slice(actisense.indexOf(','))
actisense.should.equal(',2,127999,0,255,21,3c,c2,3f,f1,ff,ff,ff,ff,ff,ff,ff,ff,ff,ff,7f,ff,7f,ff,7f,ff,ff')
actisense.should.equal(',2,127999,172,255,21,3c,c2,3f,f1,ff,ff,ff,ff,ff,ff,ff,ff,ff,ff,7f,ff,7f,ff,7f,ff,ff')
done()
})

Expand Down