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

refactor: pcdin implmentation #45

Merged
merged 1 commit into from
Feb 26, 2019
Merged

refactor: pcdin implmentation #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 35 additions & 20 deletions lib/fromPgn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,18 @@ class Parser extends EventEmitter {
}
}

isN2KOver0183(sentence) {
return sentence.startsWith('$PCDIN,')
}

parseN2KOver0183(sentence) {
if ( sentence.startsWith('$PCDIN,') ) {
this.parsePCDIN(sentence)
return true
}
return false
}

//Yacht Devices NMEA2000 Wifi gateway
parseYDWG02(pgn_data) {
var split = pgn_data.split(' ')
Expand Down Expand Up @@ -300,6 +312,28 @@ class Parser extends EventEmitter {
}
}

parsePCDIN(pgn_data) {
var split = pgn_data.split(',')

var pgn = {}
pgn.pgn = parseInt(split[1], 16)
pgn.timestamp = new Date(parseInt(split[2], 16)).toISOString()
pgn.src = parseInt(split[3], 16)
pgn.dst = 255
pgn.prio = 0

var data = split[4]
if ( data.indexOf('*') != -1 ) {
data = data.split('*')[0]
}

const bs = new BitStream(Buffer.from(data, 'hex'))

if ( this._parse(pgn, bs, data.length/2) ) {
debug('parsed pgn %j', pgn)
}
}

parseString (pgn_data) {
if (typeof pgn_data === 'string' && pgn_data.trim().length > 0) {
var split = pgn_data.split(',')
Expand All @@ -308,26 +342,7 @@ class Parser extends EventEmitter {
var buffer
var len

if ( split[0] === '$PCDIN' ) {
// $PCDIN,01F119,00000000,0F,2AAF00D1067414FF*59

pgn.pgn = parseInt(split[1], 16)
pgn.timestamp = new Date(parseInt(split[2], 16)).toISOString()
pgn.src = parseInt(split[3], 16)
pgn.dst = 255
pgn.prio = 0

var data = split[4]
if ( data.indexOf('*') != -1 ) {
data = data.split('*')[0]
}
let array = new Int16Array(data.length/2)
for ( var i = 0, j = 0; i < data.length; i += 2, j++ ) {
array[j] = parseInt(data.slice(i, i+2), 16)
}
buffer = new Buffer(array)
len = data.length/2
} else if ( split[0] === '!PDGY' ) {
if ( split[0] === '!PDGY' ) {
//iKonvert
pgn.pgn = Number(split[1])
pgn.prio = Number(split[2])
Expand Down
2 changes: 1 addition & 1 deletion test/pcdin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ describe('from pcdin data converts', function () {
}
})

fromPgn.parseString(pcdin)
fromPgn.parseN2KOver0183(pcdin)
})
})