Skip to content

Commit

Permalink
Added support for chirpstack v4, renamed respective folders & file(s)…
Browse files Browse the repository at this point in the history
…, template names, updated generator script. Chirpstack v4 decoder to be verified.
  • Loading branch information
dparyani committed Mar 20, 2024
1 parent ffc4833 commit 8b59472
Show file tree
Hide file tree
Showing 49 changed files with 89 additions and 86 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Filename|Product Application|Versions|CRCs
chirpstack-v3/Lifefinder-R13.js|Lifefinder|R13|3321548430
chirpstack-v3/Lifefinder-squad-R13.js|Lifefinder-squad|R13|3505805917
chirpstack-v3/Airport-int-R11-to-R13.js|Airport-int|R13 R12 R11|1695912328
chirpstack-v3/Airport-int-R13.js|Airport-int|R13|1872032769
chirpstack-v3/Radiotest-measure-R12-to-R13.js|Radiotest-measure|R13 R12|190349531
chirpstack-v3/Square-air-R13.js|Square-air|R13|472391447
chirpstack-v3/Square-air-R11-to-R12.js|Square-air|R12 R11|915094797
chirpstack-v3/Puck-radar-R13.js|Puck-radar|R13|561898260
chirpstack-v3/Puck-radar-R11-to-R12.js|Puck-radar|R12 R11|1325798073
chirpstack-v3/Square-comfort-R11-to-R12.js|Square-comfort|R12 R11|3530880224
chirpstack-v3/Square-comfort-R13.js|Square-comfort|R13|4174894842
chirpstack-v3/Lifefinder-wifi-R13.js|Lifefinder-wifi|R13|691254335
chirpstack-v3/Puck-radar-fast-rejoin-R12.js|Puck-radar-fast-rejoin|R12|729172455
chirpstack-v3/Puck-radar-fast-rejoin-R13.js|Puck-radar-fast-rejoin|R13|1121182195
chirpstack-v3/Sniffer-R12-to-R13.js|Sniffer|R13 R12|1047034189, 3509502476
chirpstack-v3/Digital-gpio-R13.js|Digital-gpio|R13|1617091456, 1835511761, 3497448490
chirpstack-v3/Square-comfort-sound-R11-to-R12.js|Square-comfort-sound|R12 R11|2387046759
chirpstack-v3/Square-comfort-sound-R13.js|Square-comfort-sound|R13|2766427005
chirpstack-v3/Lifefinder-motion-R13.js|Lifefinder-motion|R13|3031484599
chirpstack-v3/US-Frequency-hop-test-R12-to-R13.js|US-Frequency-hop-test|R13 R12|3999624005
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down

This file was deleted.

4 changes: 2 additions & 2 deletions basic-translators/dots-basic-translators-generator.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ console.log("Translator version: " + translatorVersion);

// Define templates
const templates = [
{ name: 'chirpstack', path: './chirpstack/template/dots-chirpstack-v3-decoder-template.cjs', outputDir: './chirpstack' },
{ name: 'ttn', path: './thethingsnetwork/template/dots-ttn-decoder-template.cjs', outputDir: './thethingsnetwork' },
{ name: 'chirpstack-v3', path: './chirpstack-v3/template/dots-chirpstack-v3-decoder-template.cjs', outputDir: './chirpstack-v3' },
{ name: 'ttn-and-chirpstack-v4', path: './thethingsnetwork-chirpstack-v4/template/dots-ttn-and-chirpstack-v4-decoder-template.cjs', outputDir: './thethingsnetwork-chirpstack-v4' },
// Add more templates as needed
];

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Filename|Product Application|Versions|CRCs
thethingsnetwork-chirpstack-v4/Lifefinder-R13.js|Lifefinder|R13|3321548430
thethingsnetwork-chirpstack-v4/Lifefinder-squad-R13.js|Lifefinder-squad|R13|3505805917
thethingsnetwork-chirpstack-v4/Airport-int-R11-to-R13.js|Airport-int|R13 R12 R11|1695912328
thethingsnetwork-chirpstack-v4/Airport-int-R13.js|Airport-int|R13|1872032769
thethingsnetwork-chirpstack-v4/Radiotest-measure-R12-to-R13.js|Radiotest-measure|R13 R12|190349531
thethingsnetwork-chirpstack-v4/Square-air-R13.js|Square-air|R13|472391447
thethingsnetwork-chirpstack-v4/Square-air-R11-to-R12.js|Square-air|R12 R11|915094797
thethingsnetwork-chirpstack-v4/Puck-radar-R13.js|Puck-radar|R13|561898260
thethingsnetwork-chirpstack-v4/Puck-radar-R11-to-R12.js|Puck-radar|R12 R11|1325798073
thethingsnetwork-chirpstack-v4/Square-comfort-R11-to-R12.js|Square-comfort|R12 R11|3530880224
thethingsnetwork-chirpstack-v4/Square-comfort-R13.js|Square-comfort|R13|4174894842
thethingsnetwork-chirpstack-v4/Lifefinder-wifi-R13.js|Lifefinder-wifi|R13|691254335
thethingsnetwork-chirpstack-v4/Puck-radar-fast-rejoin-R12.js|Puck-radar-fast-rejoin|R12|729172455
thethingsnetwork-chirpstack-v4/Puck-radar-fast-rejoin-R13.js|Puck-radar-fast-rejoin|R13|1121182195
thethingsnetwork-chirpstack-v4/Sniffer-R12-to-R13.js|Sniffer|R13 R12|1047034189, 3509502476
thethingsnetwork-chirpstack-v4/Digital-gpio-R13.js|Digital-gpio|R13|1617091456
thethingsnetwork-chirpstack-v4/Digital-gpio-R11-to-R12.js|Digital-gpio|R12 R11|3497448490
thethingsnetwork-chirpstack-v4/Square-comfort-sound-R11-to-R12.js|Square-comfort-sound|R12 R11|2387046759
thethingsnetwork-chirpstack-v4/Square-comfort-sound-R13.js|Square-comfort-sound|R13|2766427005
thethingsnetwork-chirpstack-v4/Lifefinder-motion-R13.js|Lifefinder-motion|R13|3031484599
thethingsnetwork-chirpstack-v4/US-Frequency-hop-test-R12-to-R13.js|US-Frequency-hop-test|R13 R12|3999624005
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ THE SOFTWARE.
// - bytes is an array of bytes, e.g. [225, 230, 255, 0]
// - variables contains the device variables e.g. {"calibration": "3.5"} (both the key / value are of type string)
// The function must return an object, e.g. {"temperature": 22.5}
//
// This Decoder is also applicable for Chirpstack v4

function decodeUplink(input) {
var iotnode = {
Expand Down Expand Up @@ -1025,7 +1027,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ THE SOFTWARE.
// - bytes is an array of bytes, e.g. [225, 230, 255, 0]
// - variables contains the device variables e.g. {"calibration": "3.5"} (both the key / value are of type string)
// The function must return an object, e.g. {"temperature": 22.5}
//
// This Decoder is also applicable for Chirpstack v4

function decodeUplink(input) {
var iotnode = {
Expand Down Expand Up @@ -1025,7 +1027,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ THE SOFTWARE.
// - bytes is an array of bytes, e.g. [225, 230, 255, 0]
// - variables contains the device variables e.g. {"calibration": "3.5"} (both the key / value are of type string)
// The function must return an object, e.g. {"temperature": 22.5}
//
// This Decoder is also applicable for Chirpstack v4

function decodeUplink(input) {
var iotnode = {
Expand Down Expand Up @@ -1025,7 +1027,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ THE SOFTWARE.
// - bytes is an array of bytes, e.g. [225, 230, 255, 0]
// - variables contains the device variables e.g. {"calibration": "3.5"} (both the key / value are of type string)
// The function must return an object, e.g. {"temperature": 22.5}
//
// This Decoder is also applicable for Chirpstack v4

function decodeUplink(input) {
var iotnode = {
Expand Down Expand Up @@ -1025,7 +1027,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ THE SOFTWARE.
// - bytes is an array of bytes, e.g. [225, 230, 255, 0]
// - variables contains the device variables e.g. {"calibration": "3.5"} (both the key / value are of type string)
// The function must return an object, e.g. {"temperature": 22.5}
//
// This Decoder is also applicable for Chirpstack v4

function decodeUplink(input) {
var iotnode = {
Expand Down Expand Up @@ -1025,7 +1027,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ THE SOFTWARE.
// - bytes is an array of bytes, e.g. [225, 230, 255, 0]
// - variables contains the device variables e.g. {"calibration": "3.5"} (both the key / value are of type string)
// The function must return an object, e.g. {"temperature": 22.5}
//
// This Decoder is also applicable for Chirpstack v4

function decodeUplink(input) {
var iotnode = {
Expand Down Expand Up @@ -1025,7 +1027,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ THE SOFTWARE.
// - bytes is an array of bytes, e.g. [225, 230, 255, 0]
// - variables contains the device variables e.g. {"calibration": "3.5"} (both the key / value are of type string)
// The function must return an object, e.g. {"temperature": 22.5}
//
// This Decoder is also applicable for Chirpstack v4

function decodeUplink(input) {
var iotnode = {
Expand Down Expand Up @@ -1025,7 +1027,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ THE SOFTWARE.
// - bytes is an array of bytes, e.g. [225, 230, 255, 0]
// - variables contains the device variables e.g. {"calibration": "3.5"} (both the key / value are of type string)
// The function must return an object, e.g. {"temperature": 22.5}
//
// This Decoder is also applicable for Chirpstack v4

function decodeUplink(input) {
var iotnode = {
Expand Down Expand Up @@ -1025,7 +1027,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ THE SOFTWARE.
// - bytes is an array of bytes, e.g. [225, 230, 255, 0]
// - variables contains the device variables e.g. {"calibration": "3.5"} (both the key / value are of type string)
// The function must return an object, e.g. {"temperature": 22.5}
//
// This Decoder is also applicable for Chirpstack v4

function decodeUplink(input) {
var iotnode = {
Expand Down Expand Up @@ -1025,7 +1027,6 @@ function translate(iotnode) {
if (!description)
return symbolTable;

//var descriptions = description.split(/ {3,}/);
var descriptions = description.split(' + ');
for (var i = 0; i < descriptions.length; ++i) {
// Example MAP file line: M output OUTPUT_NOW 184 0xb8
Expand Down
Loading

0 comments on commit 8b59472

Please sign in to comment.