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

Merge pull request #559 from cyberman54/development

Browse Source 
ex post clean solution for issue #510
This commit is contained in:
Verkehrsrot 2020-03-01 20:47:51 +01:00 committed by GitHub
commit c61500fe7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/TTN/packed_decoder.js
View File

@ -4,8 +4,6 @@
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 {};

12
src/TTN/plain_converter.js
View File

@ -4,14 +4,24 @@
function Converter(decoded, port) { function Converter(decoded, port) {
var converted = decoded; var converted = decoded;
var pax = 0;
if (port === 1) { if (port === 1) {
converted.pax = converted.ble + converted.wifi;
if ('wifi' in converted) {
pax += converted.wifi
}
if ('ble' in converted) {
pax += converted.ble
}
converted.pax = pax;
if (converted.hdop) { if (converted.hdop) {
converted.hdop /= 100; converted.hdop /= 100;
converted.latitude /= 1000000; converted.latitude /= 1000000;
converted.longitude /= 1000000; converted.longitude /= 1000000;
} }
} }
return converted; return converted;

2
src/TTN/plain_decoder.js
View File

@ -3,8 +3,6 @@
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;