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

Timeserver.json: bugfix missing port 0xff message

Browse Source
This commit is contained in:
Verkehrsrot 2019-10-05 13:11:59 +02:00
parent bfa43726ee
commit c37db3d4d3
1 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
src/Timeserver/Nodered-Timeserver.json
View File

@ -1,6 +1,6 @@
[ [
{ {
"id": "49e3c067.e782e", "id": "9b4f492d.fbfd18",
"type": "change", "type": "change",
"z": "449c1517.e25f4c", "z": "449c1517.e25f4c",
"name": "Payload", "name": "Payload",
@ -48,32 +48,32 @@
"from": "", "from": "",
"to": "", "to": "",
"reg": false, "reg": false,
"x": 240, "x": 220,
"y": 513, "y": 520,
"wires": [ "wires": [
[ [
"84f1cda2.069e7" "53a85e2c.2728d"
] ]
] ]
}, },
{ {
"id": "cc140589.dea168", "id": "9c105726.613a58",
"type": "mqtt in", "type": "mqtt in",
"z": "449c1517.e25f4c", "z": "449c1517.e25f4c",
"name": "listen", "name": "listen",
"topic": "+/devices/+/up", "topic": "+/devices/+/up",
"qos": "2", "qos": "2",
"broker": "2a15ab6f.ab2244", "broker": "2a15ab6f.ab2244",
"x": 110, "x": 90,
"y": 120, "y": 127,
"wires": [ "wires": [
[ [
"4f97d75.6c87528" "113ef524.57edeb"
] ]
] ]
}, },
{ {
"id": "72d5e7ee.d1eba8", "id": "1c9a7438.6e38ec",
"type": "mqtt out", "type": "mqtt out",
"z": "449c1517.e25f4c", "z": "449c1517.e25f4c",
"name": "send", "name": "send",
@ -81,28 +81,28 @@
"qos": "", "qos": "",
"retain": "", "retain": "",
"broker": "2a15ab6f.ab2244", "broker": "2a15ab6f.ab2244",
"x": 730, "x": 710,
"y": 513, "y": 520,
"wires": [] "wires": []
}, },
{ {
"id": "4f97d75.6c87528", "id": "113ef524.57edeb",
"type": "json", "type": "json",
"z": "449c1517.e25f4c", "z": "449c1517.e25f4c",
"name": "Convert", "name": "Convert",
"property": "payload", "property": "payload",
"action": "", "action": "",
"pretty": false, "pretty": false,
"x": 260, "x": 240,
"y": 120, "y": 127,
"wires": [ "wires": [
[ [
"9f4b8dd3.2f0d2" "120561a.088359e"
] ]
] ]
}, },
{ {
"id": "9f4b8dd3.2f0d2", "id": "120561a.088359e",
"type": "switch", "type": "switch",
"z": "449c1517.e25f4c", "z": "449c1517.e25f4c",
"name": "Timeport", "name": "Timeport",
@ -118,97 +118,97 @@
"checkall": "true", "checkall": "true",
"repair": false, "repair": false,
"outputs": 1, "outputs": 1,
"x": 420, "x": 400,
"y": 120, "y": 127,
"wires": [ "wires": [
[ [
"8ed813a9.a9319" "d6f27e8e.93242"
] ]
] ]
}, },
{ {
"id": "dac8aafa.389298", "id": "90e76b02.6298f8",
"type": "json", "type": "json",
"z": "449c1517.e25f4c", "z": "449c1517.e25f4c",
"name": "Convert", "name": "Convert",
"property": "payload", "property": "payload",
"action": "", "action": "",
"pretty": false, "pretty": false,
"x": 580, "x": 560,
"y": 513, "y": 520,
"wires": [ "wires": [
[ [
"72d5e7ee.d1eba8" "1c9a7438.6e38ec"
] ]
] ]
}, },
{ {
"id": "8ed813a9.a9319", "id": "d6f27e8e.93242",
"type": "base64", "type": "base64",
"z": "449c1517.e25f4c", "z": "449c1517.e25f4c",
"name": "Decode", "name": "Decode",
"action": "", "action": "",
"property": "payload.payload_raw", "property": "payload.payload_raw",
"x": 580, "x": 560,
"y": 120, "y": 127,
"wires": [ "wires": [
[ [
"831ab883.d6a238" "b8bd33fd.61caa"
] ]
] ]
}, },
{ {
"id": "84f1cda2.069e7", "id": "53a85e2c.2728d",
"type": "base64", "type": "base64",
"z": "449c1517.e25f4c", "z": "449c1517.e25f4c",
"name": "Encode", "name": "Encode",
"action": "", "action": "",
"property": "payload.payload_raw", "property": "payload.payload_raw",
"x": 420, "x": 400,
"y": 513, "y": 520,
"wires": [ "wires": [
[ [
"dac8aafa.389298" "90e76b02.6298f8"
] ]
] ]
}, },
{ {
"id": "6190967b.01f758", "id": "15980d22.6f4663",
"type": "comment", "type": "comment",
"z": "449c1517.e25f4c", "z": "449c1517.e25f4c",
"name": "LoRaWAN Timeserver v1.2", "name": "LoRaWAN Timeserver v1.21",
"info": "PLEASE NOTE: There is a patent filed for the time sync algorithm used in the\ncode of this file. The shown implementation example is covered by the\nrepository's licencse, but you may not be eligible to deploy the applied\nalgorithm in applications without granted license by the patent holder.", "info": "PLEASE NOTE: There is a patent filed for the time sync algorithm used in the\ncode of this file. The shown implementation example is covered by the\nrepository's licencse, but you may not be eligible to deploy the applied\nalgorithm in applications without granted license by the patent holder.",
"x": 170, "x": 160,
"y": 40, "y": 47,
"wires": [] "wires": []
}, },
{ {
"id": "831ab883.d6a238", "id": "b8bd33fd.61caa",
"type": "function", "type": "function",
"z": "449c1517.e25f4c", "z": "449c1517.e25f4c",
"name": "Timeserver Logic", "name": "Timeserver Logic",
"func": "/* LoRaWAN Timeserver\n\nconstruct 7 byte timesync_answer from gateway timestamp and node's time_sync_req\n\nbyte meaning\n1 sequence number (taken from node's time_sync_req)\n2 timezone in 15 minutes steps\n3..6 current second (from epoch time 1970)\n7 1/250ths fractions of current second\n\n*/\n\nfunction timecompare(a, b) {\n \n const timeA = a.time;\n const timeB = b.time;\n\n let comparison = 0;\n if (timeA > timeB) {\n comparison = 1;\n } else if (timeA < timeB) {\n comparison = -1;\n }\n return comparison;\n}\n\nlet confidence = 2000; // max millisecond diff gateway time to server time\n\n// guess if we have received a valid time_sync_req command\nif (msg.payload.payload_raw.length != 1)\n return;\n\nvar deviceMsg = { payload: msg.payload.dev_id };\nvar seqNo = msg.payload[0];\nvar seqNoMsg = { payload: seqNo };\nvar gateway_list = msg.payload.metadata.gateways;\n\n// filter all gateway timestamps that have milliseconds part (which we assume have a \".\")\nvar gateways = gateway_list.filter(function (element) {\n return (element.time.includes(\".\"));\n});\n\nvar gateway_time = gateways.map(gw => {\n return {\n time: new Date(gw.time),\n eui: gw.gtw_id,\n }\n });\nvar server_time = new Date(msg.payload.metadata.time);\n\n// validate all gateway timestamps against lorawan server_time (which is assumed to be recent)\nvar gw_timestamps = gateway_time.filter(function (element) {\n return ((element.time > (server_time - confidence) && element.time <= server_time));\n});\n\n// if no timestamp left, we have no valid one and exit\nif (gw_timestamps.length === 0) {\n var notavailMsg = { payload: \"n/a\" };\n var notimeMsg = { payload: 0xff }; \n var buf2 = Buffer.alloc(1);\n msg.payload = new Buffer(buf2.fill(0xff));\n return [notavailMsg, notavailMsg, deviceMsg, seqNoMsg, msg];}\n\n// sort time array in ascending order to find most recent timestamp for time answer\ngw_timestamps.sort(timecompare);\n\nvar timestamp = gw_timestamps[0].time;\nvar eui = gw_timestamps[0].eui;\nvar offset = server_time - timestamp;\n\nvar seconds = Math.floor(timestamp/1000);\nvar fractions = (timestamp % 1000) / 4;\n\nlet buf = new ArrayBuffer(7);\nnew DataView(buf).setUint8(0, seqNo);\n// Timezone (in 15min steps)\nvar timezone = 8; // CET = UTC+2h\nnew DataView(buf).setUint8(1, timezone);\nnew DataView(buf).setUint32(2, seconds);\nnew DataView(buf).setUint8(6, fractions);\n\nmsg.payload = new Buffer(new Uint8Array(buf));\nmsg.port = 9;\nvar euiMsg = { payload: eui };\nvar offsetMsg = { payload: offset };\n\nreturn [euiMsg, offsetMsg, deviceMsg, seqNoMsg, msg];", "func": "/* LoRaWAN Timeserver\n\nconstruct 7 byte timesync_answer from gateway timestamp and node's time_sync_req\n\nbyte meaning\n1 sequence number (taken from node's time_sync_req)\n2 timezone in 15 minutes steps\n3..6 current second (from epoch time 1970)\n7 1/250ths fractions of current second\n\n*/\n\nfunction timecompare(a, b) {\n \n const timeA = a.time;\n const timeB = b.time;\n\n let comparison = 0;\n if (timeA > timeB) {\n comparison = 1;\n } else if (timeA < timeB) {\n comparison = -1;\n }\n return comparison;\n}\n\nlet confidence = 2000; // max millisecond diff gateway time to server time\n\n// guess if we have received a valid time_sync_req command\nif (msg.payload.payload_raw.length != 1)\n return;\n\nvar deviceMsg = { payload: msg.payload.dev_id };\nvar seqNo = msg.payload[0];\nvar seqNoMsg = { payload: seqNo };\nvar gateway_list = msg.payload.metadata.gateways;\n\n// filter all gateway timestamps that have milliseconds part (which we assume have a \".\")\nvar gateways = gateway_list.filter(function (element) {\n return (element.time.includes(\".\"));\n});\n\nvar gateway_time = gateways.map(gw => {\n return {\n time: new Date(gw.time),\n eui: gw.gtw_id,\n }\n });\nvar server_time = new Date(msg.payload.metadata.time);\n\n// validate all gateway timestamps against lorawan server_time (which is assumed to be recent)\nvar gw_timestamps = gateway_time.filter(function (element) {\n return ((element.time > (server_time - confidence) && element.time <= server_time));\n});\n\n// if no timestamp left, we have no valid one and exit\nif (gw_timestamps.length === 0) {\n var notavailMsg = { payload: \"n/a\" };\n var notimeMsg = { payload: 0xff }; \n var buf2 = Buffer.alloc(1);\n msg.payload = new Buffer(buf2.fill(0xff));\n msg.port = 9; // Paxcounter TIMEPORT\n return [notavailMsg, notavailMsg, deviceMsg, seqNoMsg, msg];}\n\n// sort time array in ascending order to find most recent timestamp for time answer\ngw_timestamps.sort(timecompare);\n\nvar timestamp = gw_timestamps[0].time;\nvar eui = gw_timestamps[0].eui;\nvar offset = server_time - timestamp;\n\nvar seconds = Math.floor(timestamp/1000);\nvar fractions = (timestamp % 1000) / 4;\n\nlet buf = new ArrayBuffer(7);\nnew DataView(buf).setUint8(0, seqNo);\n// Timezone (in 15min steps)\nvar timezone = 8; // CET = UTC+2h\nnew DataView(buf).setUint8(1, timezone);\nnew DataView(buf).setUint32(2, seconds);\nnew DataView(buf).setUint8(6, fractions);\n\nmsg.payload = new Buffer(new Uint8Array(buf));\nmsg.port = 9; // Paxcounter TIMEPORT\nvar euiMsg = { payload: eui };\nvar offsetMsg = { payload: offset };\n\nreturn [euiMsg, offsetMsg, deviceMsg, seqNoMsg, msg];",
"outputs": 5, "outputs": 5,
"noerr": 0, "noerr": 0,
"x": 350, "x": 330,
"y": 320, "y": 327,
"wires": [ "wires": [
[ [
"37722d4b.08e3c2", "c9a83ac9.50fd18",
"a8a04c7a.c5fbd", "6aeb3720.a89618",
"a15454a9.fa0948" "6ac55bbe.12ac54"
], ],
[ [
"46ce842a.614d5c" "de908e66.b6fd3"
], ],
[ [
"a5dbb4ef.019168" "d5a35bab.44cb18"
], ],
[ [
"1cb58e7f.221362" "3a661f0a.c61b1"
], ],
[ [
"49e3c067.e782e" "9b4f492d.fbfd18"
] ]
], ],
"outputLabels": [ "outputLabels": [
@ -220,7 +220,7 @@
] ]
}, },
{ {
"id": "37722d4b.08e3c2", "id": "c9a83ac9.50fd18",
"type": "debug", "type": "debug",
"z": "449c1517.e25f4c", "z": "449c1517.e25f4c",
"name": "Timeserver Gw", "name": "Timeserver Gw",
@ -229,13 +229,13 @@
"console": false, "console": false,
"tostatus": true, "tostatus": true,
"complete": "payload", "complete": "payload",
"x": 700, "x": 680,
"y": 240, "y": 247,
"wires": [], "wires": [],
"icon": "node-red/bridge.png" "icon": "node-red/bridge.png"
}, },
{ {
"id": "8712a5ac.ed18e8", "id": "247204ab.a9f83c",
"type": "ui_text", "type": "ui_text",
"z": "449c1517.e25f4c", "z": "449c1517.e25f4c",
"group": "edb7cc8d.a3817", "group": "edb7cc8d.a3817",
@ -246,12 +246,12 @@
"label": "Last answer at:", "label": "Last answer at:",
"format": "{{msg.payload}}", "format": "{{msg.payload}}",
"layout": "col-center", "layout": "col-center",
"x": 810, "x": 790,
"y": 300, "y": 307,
"wires": [] "wires": []
}, },
{ {
"id": "46ce842a.614d5c", "id": "de908e66.b6fd3",
"type": "ui_gauge", "type": "ui_gauge",
"z": "449c1517.e25f4c", "z": "449c1517.e25f4c",
"name": "Timeserver offset", "name": "Timeserver offset",
@ -272,12 +272,12 @@
], ],
"seg1": "", "seg1": "",
"seg2": "", "seg2": "",
"x": 710, "x": 690,
"y": 380, "y": 387,
"wires": [] "wires": []
}, },
{ {
"id": "a8a04c7a.c5fbd", "id": "6aeb3720.a89618",
"type": "ui_text", "type": "ui_text",
"z": "449c1517.e25f4c", "z": "449c1517.e25f4c",
"group": "edb7cc8d.a3817", "group": "edb7cc8d.a3817",
@ -288,28 +288,28 @@
"label": "Gateway", "label": "Gateway",
"format": "{{msg.payload}}", "format": "{{msg.payload}}",
"layout": "col-center", "layout": "col-center",
"x": 700, "x": 680,
"y": 340, "y": 347,
"wires": [] "wires": []
}, },
{ {
"id": "a15454a9.fa0948", "id": "6ac55bbe.12ac54",
"type": "function", "type": "function",
"z": "449c1517.e25f4c", "z": "449c1517.e25f4c",
"name": "Time", "name": "Time",
"func": "msg.payload = new Date().toLocaleString('en-GB', {timeZone: 'Europe/Berlin'});\nreturn msg;", "func": "msg.payload = new Date().toLocaleString('en-GB', {timeZone: 'Europe/Berlin'});\nreturn msg;",
"outputs": 1, "outputs": 1,
"noerr": 0, "noerr": 0,
"x": 670, "x": 650,
"y": 300, "y": 307,
"wires": [ "wires": [
[ [
"8712a5ac.ed18e8" "247204ab.a9f83c"
] ]
] ]
}, },
{ {
"id": "a5dbb4ef.019168", "id": "d5a35bab.44cb18",
"type": "ui_text", "type": "ui_text",
"z": "449c1517.e25f4c", "z": "449c1517.e25f4c",
"group": "edb7cc8d.a3817", "group": "edb7cc8d.a3817",
@ -320,12 +320,12 @@
"label": "Device", "label": "Device",
"format": "{{msg.payload}}", "format": "{{msg.payload}}",
"layout": "col-center", "layout": "col-center",
"x": 700, "x": 680,
"y": 420, "y": 427,
"wires": [] "wires": []
}, },
{ {
"id": "1cb58e7f.221362", "id": "3a661f0a.c61b1",
"type": "ui_text", "type": "ui_text",
"z": "449c1517.e25f4c", "z": "449c1517.e25f4c",
"group": "edb7cc8d.a3817", "group": "edb7cc8d.a3817",
@ -336,8 +336,8 @@
"label": "Sequence", "label": "Sequence",
"format": "{{}}", "format": "{{}}",
"layout": "col-center", "layout": "col-center",
"x": 700, "x": 680,
"y": 460, "y": 467,
"wires": [] "wires": []
}, },
{ {