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

bugfix in decoders plain & packed

Browse Source
This commit is contained in:
Verkehrsrot 2019-12-27 12:57:22 +01:00
parent 985548e73e
commit b9949d8eb9
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/TTN/packed_decoder.js
View File

@ -4,6 +4,8 @@
function Decoder(bytes, port) { function Decoder(bytes, port) {
var decoded = {}; var decoded = {};
decoded.wifi = 0;
decoded.ble = 0;
if (bytes.length === 0) { if (bytes.length === 0) {
return {}; return {};
@ -147,7 +149,7 @@ var int8 = function (bytes) {
if (bytes.length !== int8.BYTES) { if (bytes.length !== int8.BYTES) {
throw new Error('int8 must have exactly 1 byte'); throw new Error('int8 must have exactly 1 byte');
} }
var value = +(bytesToInt(bytes)); var value = +(bytesToInt(bytes));
if (value > 127) { if (value > 127) {
value -= 256; value -= 256;
} }
@ -159,7 +161,7 @@ var int16 = function (bytes) {
if (bytes.length !== int16.BYTES) { if (bytes.length !== int16.BYTES) {
throw new Error('int16 must have exactly 2 bytes'); throw new Error('int16 must have exactly 2 bytes');
} }
var value = +(bytesToInt(bytes)); var value = +(bytesToInt(bytes));
if (value > 32767) { if (value > 32767) {
value -= 65536; value -= 65536;
} }
@ -171,7 +173,7 @@ var int32 = function (bytes) {
if (bytes.length !== int32.BYTES) { if (bytes.length !== int32.BYTES) {
throw new Error('int32 must have exactly 4 bytes'); throw new Error('int32 must have exactly 4 bytes');
} }
var value = +(bytesToInt(bytes)); var value = +(bytesToInt(bytes));
if (value > 2147483647) { if (value > 2147483647) {
value -= 4294967296; value -= 4294967296;
} }

4
src/TTN/plain_decoder.js
View File

@ -3,6 +3,8 @@
function Decoder(bytes, port) { function Decoder(bytes, port) {
var decoded = {}; var decoded = {};
decoded.wifi = 0;
decoded.ble = 0;
if (port === 1) { if (port === 1) {
var i = 0; var i = 0;
@ -10,7 +12,7 @@ function Decoder(bytes, port) {
if (bytes.length >= 2) { if (bytes.length >= 2) {
decoded.wifi = (bytes[i++] << 8) | bytes[i++]; decoded.wifi = (bytes[i++] << 8) | bytes[i++];
} }
if (bytes.length === 4 || bytes.length > 15) { if (bytes.length === 4 || bytes.length > 15) {
decoded.ble = (bytes[i++] << 8) | bytes[i++]; decoded.ble = (bytes[i++] << 8) | bytes[i++];
} }