DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix altitude in packed decoder to be signed (#403)

Browse Source 
See #403
This commit is contained in:
Gijs Noorlander 2019-07-27 02:32:39 +02:00
parent 3648bc794a
commit 2aafc839d5
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/TTN/packed_decoder.js
View File

@ -20,11 +20,11 @@ function Decoder(bytes, port) {
} }
// combined wifi counter and gps data // combined wifi counter and gps data
if (bytes.length === 15) { if (bytes.length === 15) {
return decode(bytes, [uint16, latLng, latLng, uint8, hdop, uint16], ['wifi', 'latitude', 'longitude', 'sats', 'hdop', 'altitude']); return decode(bytes, [uint16, latLng, latLng, uint8, hdop, altitude], ['wifi', 'latitude', 'longitude', 'sats', 'hdop', 'altitude']);
} }
// combined wifi + ble counter and gps data // combined wifi + ble counter and gps data
if (bytes.length === 17) { if (bytes.length === 17) {
return decode(bytes, [uint16, uint16, latLng, latLng, uint8, hdop, uint16], ['wifi', 'ble', 'latitude', 'longitude', 'sats', 'hdop', 'altitude']); return decode(bytes, [uint16, uint16, latLng, latLng, uint8, hdop, altitude], ['wifi', 'ble', 'latitude', 'longitude', 'sats', 'hdop', 'altitude']);
} }
} }
@ -42,7 +42,7 @@ function Decoder(bytes, port) {
if (port === 4) { if (port === 4) {
// gps data // gps data
return decode(bytes, [latLng, latLng, uint8, hdop, uint16], ['latitude', 'longitude', 'sats', 'hdop', 'altitude']); return decode(bytes, [latLng, latLng, uint8, hdop, altitude], ['latitude', 'longitude', 'sats', 'hdop', 'altitude']);
} }
if (port === 5) { if (port === 5) {
@ -147,6 +147,18 @@ var hdop = function (bytes) {
}; };
hdop.BYTES = 2; hdop.BYTES = 2;
var altitude = function (bytes) {
if (bytes.length !== altitude.BYTES) {
throw new Error('Altitude must have exactly 2 bytes');
}
var alt = bytesToInt(bytes);
if (alt > 32767) {
alt -= 65536;
}
return alt;
};
altitude.BYTES = 2;
var float = function (bytes) { var float = function (bytes) {
if (bytes.length !== float.BYTES) { if (bytes.length !== float.BYTES) {
throw new Error('Float must have exactly 2 bytes'); throw new Error('Float must have exactly 2 bytes');
@ -253,6 +265,7 @@ if (typeof module === 'object' && typeof module.exports !== 'undefined') {
pressure: pressure, pressure: pressure,
latLng: latLng, latLng: latLng,
hdop: hdop, hdop: hdop,
altitude: altitude,
bitmap1: bitmap1, bitmap1: bitmap1,
bitmap2: bitmap2, bitmap2: bitmap2,
version: version, version: version,