summaryrefslogtreecommitdiff
path: root/recipes-connectivity
diff options
context:
space:
mode:
authorHarsh Sharma <harsh.sharma@multitech.com>2022-08-04 16:32:06 -0500
committerHarsh Sharma <harsh.sharma@multitech.com>2022-08-04 16:32:06 -0500
commitb8c1bfe1fa546e15b54d5f3f7f14f6d9ad56c65b (patch)
tree13dbf7ec7dd57bb111d686ae852a5dc732e482bd /recipes-connectivity
parentaccc74c6f8764efcaca608b8b2fc557c355c7b04 (diff)
downloadmeta-mlinux-b8c1bfe1fa546e15b54d5f3f7f14f6d9ad56c65b.tar.gz
meta-mlinux-b8c1bfe1fa546e15b54d5f3f7f14f6d9ad56c65b.tar.bz2
meta-mlinux-b8c1bfe1fa546e15b54d5f3f7f14f6d9ad56c65b.zip
Updated lora packet forwarder recipe and lns init script
Diffstat (limited to 'recipes-connectivity')
-rw-r--r--recipes-connectivity/lora/lora-gateway/lora_gateway-gpsd-3.23.patch55
-rwxr-xr-xrecipes-connectivity/lora/lora-network-server/lora-network-server.init36
-rw-r--r--recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923-LBT.basic128
-rw-r--r--recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923.basic128
-rw-r--r--recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AU915.basic128
-rw-r--r--recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.EU868.basic112
-rw-r--r--recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.IN865.basic128
-rw-r--r--recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.KR920-LBT.basic128
-rw-r--r--recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.RU864.basic112
-rw-r--r--recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic128
-rw-r--r--recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-gpsd-3.23.patch25
-rw-r--r--recipes-connectivity/lora/lora-packet-forwarder/mtcdt3hs/lora-packet-forwarder.default2
-rw-r--r--recipes-connectivity/lora/lora-packet-forwarder/temp_lut.json.MTCAP2.EU86875
-rw-r--r--recipes-connectivity/lora/lora-packet-forwarder/temp_lut.json.MTCAP2.US91575
-rw-r--r--recipes-connectivity/lora/lora-packet-forwarder_4.0.22.bb46
15 files changed, 958 insertions, 348 deletions
diff --git a/recipes-connectivity/lora/lora-gateway/lora_gateway-gpsd-3.23.patch b/recipes-connectivity/lora/lora-gateway/lora_gateway-gpsd-3.23.patch
new file mode 100644
index 0000000..25b0d25
--- /dev/null
+++ b/recipes-connectivity/lora/lora-gateway/lora_gateway-gpsd-3.23.patch
@@ -0,0 +1,55 @@
+From d631d2a3c35baac66d75acea0b2e25a6b804c7e1 Mon Sep 17 00:00:00 2001
+From: Serhii Voloshynov <serhii.voloshynov@globallogic.com>
+Date: Tue, 8 Feb 2022 15:56:18 +0200
+Subject: [PATCH] gpsd: add fixes to support new gpsd 3.23
+
+---
+ libloragw/inc/loragw_gps.h | 1 +
+ libloragw/tst/test_loragw_gps.c | 5 +++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/libloragw/inc/loragw_gps.h b/libloragw/inc/loragw_gps.h
+index 0714974..dd4aa0f 100644
+--- a/libloragw/inc/loragw_gps.h
++++ b/libloragw/inc/loragw_gps.h
+@@ -27,6 +27,7 @@ Maintainer: Michael Coracin
+ #include <time.h> /* time library */
+ #include <termios.h> /* speed_t */
+ #include <unistd.h> /* ssize_t */
++#include <gpsd_config.h>
+ #include <gpsd.h>
+ #include <gpsdclient.h>
+ #include <errno.h> /* error messages */
+diff --git a/libloragw/tst/test_loragw_gps.c b/libloragw/tst/test_loragw_gps.c
+index 994c0ad..d6706b7 100644
+--- a/libloragw/tst/test_loragw_gps.c
++++ b/libloragw/tst/test_loragw_gps.c
+@@ -31,6 +31,7 @@ Maintainer: Michael Coracin
+ #include <signal.h> /* sigaction */
+ #include <stdlib.h> /* exit */
+ #include <unistd.h> /* read */
++#include <gpsd_config.h>
+ #include <gps.h>
+ #include <gpsd.h>
+
+@@ -128,7 +129,7 @@ int main()
+ while ((quit_sig != 1) && (exit_sig != 1)) {
+ wait_ms(100);
+ int r = gps_read(&gpsdata, 0, 0);
+- if (r!= -1 && (gpsdata.status != STATUS_NO_FIX) &&
++ if (r!= -1 && (gpsdata.fix.status != STATUS_NO_FIX) &&
+ (gpsdata.fix.mode == MODE_2D || gpsdata.fix.mode == MODE_3D) &&
+ !isnan(gpsdata.fix.latitude) &&
+ !isnan(gpsdata.fix.longitude)) {
+@@ -142,7 +143,7 @@ int main()
+ printf("\n--- GPS ---\n");
+ printf("Set: %lld\n", gpsdata.set);
+ printf("Online: %10.0f\n", gpsdata.online);
+- printf("Status: %d\n", gpsdata.status);
++ printf("Status: %d\n", gpsdata.fix.status);
+ printf("Satellites Used: %d\n", gpsdata.satellites_used);
+ printf("Mode: %d\n", gpsdata.fix.mode);
+ printf("UTC time: %lld.%09ld\n", (long long)time_reference_gps.utc.tv_sec, time_reference_gps.utc.tv_nsec);
+--
+2.25.1
+
diff --git a/recipes-connectivity/lora/lora-network-server/lora-network-server.init b/recipes-connectivity/lora/lora-network-server/lora-network-server.init
index d89c06d..0c1ae19 100755
--- a/recipes-connectivity/lora/lora-network-server/lora-network-server.init
+++ b/recipes-connectivity/lora/lora-network-server/lora-network-server.init
@@ -100,10 +100,10 @@ setup_mtcdt3() {
}
hardware_found() {
- if [[ "$hw_id" =~ "$mtcdt3_id" ]]; then
- setup_mtcdt3
- elif [[ "$lora_id" =~ "$lora_mtac_g_id" ]]; then
+ if [[ "$lora_id" =~ "$lora_mtac_g_id" ]]; then
setup_mtcdt_2_1
+ elif [[ "$lora_id" =~ "$lora_mtac_2g4_id" ]]; then
+ setup_mtcdt_2g4
elif [[ "$lora_id" =~ "$lora_mtac_003_id" ]]; then
setup_mtcdt003
elif [[ "$lora_id" =~ "$lora_mtac_id" ]]; then
@@ -118,8 +118,6 @@ hardware_found() {
}
setup_mtcdt_2_1() {
- ln -sf /dev/spidev32766.2 /dev/spidev0.0
-
if [[ "$lora_id" = "$lora_mtac_g16_id868" ]]; then
GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_EU868
elif [[ "$lora_id" = "$lora_mtac_g16_id915" ]]; then
@@ -190,11 +188,6 @@ setup_mtcap3() {
}
setup_mtcdt() {
- if [ -d $port1 ] && [[ $(cat $port1/hw-version) = $lora_hw ]]; then
- ln -sf /dev/spidev32766.2 /dev/spidev0.0
- elif [ -d $port2 ] && [[ $(cat $port2/hw-version) = $lora_hw ]]; then
- ln -sf /dev/spidev32765.2 /dev/spidev0.0
- fi
GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_1_0
if [ "$lora_hw" = "$lora_1_0_hw" ] && [[ ! "$lora_id" =~ .*-SPI ]]; then
ln -sf /opt/lora/basic_pkt_fwd-usb $pkt_fwd
@@ -269,14 +262,7 @@ do_start() {
if hardware_found; then
echo "Found $lora_id with $lora_hw hardware"
- if [[ "$hw_id" =~ "$mtcdt3_id" ]]; then
- mts-io-sysfs store lora/reset 0
- mts-io-sysfs store lora-2/reset 0
- sleep 0.25
- mts-io-sysfs store lora/reset 1
- mts-io-sysfs store lora-2/reset 1
- sleep 0.25
- elif [[ "$lora_id" =~ "$lora_mtac_g_id" ]]; then
+ if [[ "$lora_id" =~ "$lora_mtac_g_id" ]]; then
echo Resetting 2.1 LoRa
/usr/sbin/mts-util-lora2-reset -g -f >/dev/null 2>&1
sleep 0.25
@@ -316,11 +302,9 @@ do_start() {
if [ "$no_lora_hw" != "true" ]; then
# start packet forwarder
- if [[ "$hw_id" =~ "$mtcdt3_id" ]]; then
- sleep 0.5
- else
- sleep 4
- fi
+
+ sleep 4
+
/usr/sbin/start-stop-daemon --chdir $run_dir/1 --start --background --make-pidfile \
--pidfile $pkt_fwd_pidfile --startas /bin/bash \
-- -c "exec $pkt_fwd $pkt_fwd_options 2>&1"
@@ -332,10 +316,8 @@ do_start() {
fi
fi
- if [[ ! "$hw_id" =~ "$mtcdt3_id" ]]; then
- renice -n -20 -p $(pgrep lora-network-se)
- renice -n -20 -p $(pgrep $(basename $pkt_fwd))
- fi
+ renice -n -20 -p $(pgrep lora-network-se)
+ renice -n -20 -p $(pgrep $(basename $pkt_fwd))
echo "OK"
}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923-LBT.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923-LBT.basic
index 6c14d3c..3148a88 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923-LBT.basic
+++ b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923-LBT.basic
@@ -113,22 +113,118 @@
"tx_enable": false,
"type": "SX1257"
},
- "tx_lut_0":{"dig_gain":2,"mix_gain":15,"pa_gain":1,"rf_power":10},
- "tx_lut_1":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":11},
- "tx_lut_2":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":12},
- "tx_lut_3":{"dig_gain":0,"mix_gain":10,"pa_gain":2,"rf_power":13},
- "tx_lut_4":{"dig_gain":3,"mix_gain":14,"pa_gain":2,"rf_power":14},
- "tx_lut_5":{"dig_gain":1,"mix_gain":12,"pa_gain":2,"rf_power":15},
- "tx_lut_6":{"dig_gain":0,"mix_gain":12,"pa_gain":2,"rf_power":16},
- "tx_lut_7":{"dig_gain":2,"mix_gain":14,"pa_gain":2,"rf_power":17},
- "tx_lut_8":{"dig_gain":2,"mix_gain":15,"pa_gain":2,"rf_power":18},
- "tx_lut_9":{"dig_gain":1,"mix_gain":15,"pa_gain":2,"rf_power":19},
- "tx_lut_10":{"dig_gain":0,"mix_gain":9,"pa_gain":3,"rf_power":20},
- "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":21},
- "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":22},
- "tx_lut_13":{"dig_gain":0,"mix_gain":11,"pa_gain":3,"rf_power":23},
- "tx_lut_14":{"dig_gain":2,"mix_gain":14,"pa_gain":3,"rf_power":24},
- "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":25}
+ "tx_lut_0" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 9,
+ "pa_gain" : 0,
+ "rf_power" : -6
+ },
+ "tx_lut_1" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 9,
+ "pa_gain" : 0,
+ "rf_power" : -3
+ },
+ "tx_lut_10" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 10,
+ "pa_gain" : 2,
+ "rf_power" : 16
+ },
+ "tx_lut_11" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 14,
+ "pa_gain" : 2,
+ "rf_power" : 20
+ },
+ "tx_lut_12" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 8,
+ "pa_gain" : 3,
+ "rf_power" : 23
+ },
+ "tx_lut_13" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 13,
+ "pa_gain" : 3,
+ "rf_power" : 25
+ },
+ "tx_lut_14" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 12,
+ "pa_gain" : 3,
+ "rf_power" : 26
+ },
+ "tx_lut_15" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 15,
+ "pa_gain" : 3,
+ "rf_power" : 27
+ },
+ "tx_lut_2" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 13,
+ "pa_gain" : 0,
+ "rf_power" : 0
+ },
+ "tx_lut_3" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 10,
+ "pa_gain" : 1,
+ "rf_power" : 3
+ },
+ "tx_lut_4" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 10,
+ "pa_gain" : 1,
+ "rf_power" : 6
+ },
+ "tx_lut_5" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 15,
+ "pa_gain" : 1,
+ "rf_power" : 10
+ },
+ "tx_lut_6" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 13,
+ "pa_gain" : 1,
+ "rf_power" : 11
+ },
+ "tx_lut_7" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 15,
+ "pa_gain" : 1,
+ "rf_power" : 12
+ },
+ "tx_lut_8" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 8,
+ "pa_gain" : 2,
+ "rf_power" : 13
+ },
+ "tx_lut_9" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 12,
+ "pa_gain" : 2,
+ "rf_power" : 14
+ }
},
"gateway_conf": {
"gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923.basic
index 3731a2d..2755bb4 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923.basic
+++ b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923.basic
@@ -81,22 +81,118 @@
"tx_enable": false,
"type": "SX1257"
},
- "tx_lut_0":{"dig_gain":2,"mix_gain":15,"pa_gain":1,"rf_power":10},
- "tx_lut_1":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":11},
- "tx_lut_2":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":12},
- "tx_lut_3":{"dig_gain":0,"mix_gain":10,"pa_gain":2,"rf_power":13},
- "tx_lut_4":{"dig_gain":3,"mix_gain":14,"pa_gain":2,"rf_power":14},
- "tx_lut_5":{"dig_gain":1,"mix_gain":12,"pa_gain":2,"rf_power":15},
- "tx_lut_6":{"dig_gain":0,"mix_gain":12,"pa_gain":2,"rf_power":16},
- "tx_lut_7":{"dig_gain":2,"mix_gain":14,"pa_gain":2,"rf_power":17},
- "tx_lut_8":{"dig_gain":2,"mix_gain":15,"pa_gain":2,"rf_power":18},
- "tx_lut_9":{"dig_gain":1,"mix_gain":15,"pa_gain":2,"rf_power":19},
- "tx_lut_10":{"dig_gain":0,"mix_gain":9,"pa_gain":3,"rf_power":20},
- "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":21},
- "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":22},
- "tx_lut_13":{"dig_gain":0,"mix_gain":11,"pa_gain":3,"rf_power":23},
- "tx_lut_14":{"dig_gain":2,"mix_gain":14,"pa_gain":3,"rf_power":24},
- "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":25}
+ "tx_lut_0" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 9,
+ "pa_gain" : 0,
+ "rf_power" : -6
+ },
+ "tx_lut_1" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 9,
+ "pa_gain" : 0,
+ "rf_power" : -3
+ },
+ "tx_lut_10" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 10,
+ "pa_gain" : 2,
+ "rf_power" : 16
+ },
+ "tx_lut_11" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 14,
+ "pa_gain" : 2,
+ "rf_power" : 20
+ },
+ "tx_lut_12" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 8,
+ "pa_gain" : 3,
+ "rf_power" : 23
+ },
+ "tx_lut_13" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 13,
+ "pa_gain" : 3,
+ "rf_power" : 25
+ },
+ "tx_lut_14" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 12,
+ "pa_gain" : 3,
+ "rf_power" : 26
+ },
+ "tx_lut_15" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 15,
+ "pa_gain" : 3,
+ "rf_power" : 27
+ },
+ "tx_lut_2" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 13,
+ "pa_gain" : 0,
+ "rf_power" : 0
+ },
+ "tx_lut_3" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 10,
+ "pa_gain" : 1,
+ "rf_power" : 3
+ },
+ "tx_lut_4" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 10,
+ "pa_gain" : 1,
+ "rf_power" : 6
+ },
+ "tx_lut_5" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 15,
+ "pa_gain" : 1,
+ "rf_power" : 10
+ },
+ "tx_lut_6" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 13,
+ "pa_gain" : 1,
+ "rf_power" : 11
+ },
+ "tx_lut_7" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 15,
+ "pa_gain" : 1,
+ "rf_power" : 12
+ },
+ "tx_lut_8" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 8,
+ "pa_gain" : 2,
+ "rf_power" : 13
+ },
+ "tx_lut_9" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 12,
+ "pa_gain" : 2,
+ "rf_power" : 14
+ }
},
"gateway_conf": {
"gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AU915.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AU915.basic
index c2a284e..81c381c 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AU915.basic
+++ b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AU915.basic
@@ -79,22 +79,118 @@
"tx_delay_1ch_us": 4000000,
"tx_delay_2ch_us": 4000000
},
- "tx_lut_0":{"dig_gain":2,"mix_gain":15,"pa_gain":1,"rf_power":10},
- "tx_lut_1":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":11},
- "tx_lut_2":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":12},
- "tx_lut_3":{"dig_gain":0,"mix_gain":10,"pa_gain":2,"rf_power":13},
- "tx_lut_4":{"dig_gain":3,"mix_gain":14,"pa_gain":2,"rf_power":14},
- "tx_lut_5":{"dig_gain":1,"mix_gain":12,"pa_gain":2,"rf_power":15},
- "tx_lut_6":{"dig_gain":0,"mix_gain":12,"pa_gain":2,"rf_power":16},
- "tx_lut_7":{"dig_gain":2,"mix_gain":14,"pa_gain":2,"rf_power":17},
- "tx_lut_8":{"dig_gain":2,"mix_gain":15,"pa_gain":2,"rf_power":18},
- "tx_lut_9":{"dig_gain":1,"mix_gain":15,"pa_gain":2,"rf_power":19},
- "tx_lut_10":{"dig_gain":0,"mix_gain":9,"pa_gain":3,"rf_power":20},
- "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":21},
- "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":22},
- "tx_lut_13":{"dig_gain":0,"mix_gain":11,"pa_gain":3,"rf_power":23},
- "tx_lut_14":{"dig_gain":2,"mix_gain":14,"pa_gain":3,"rf_power":24},
- "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":25}
+ "tx_lut_0" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 9,
+ "pa_gain" : 0,
+ "rf_power" : -6
+ },
+ "tx_lut_1" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 9,
+ "pa_gain" : 0,
+ "rf_power" : -3
+ },
+ "tx_lut_10" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 10,
+ "pa_gain" : 2,
+ "rf_power" : 16
+ },
+ "tx_lut_11" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 14,
+ "pa_gain" : 2,
+ "rf_power" : 20
+ },
+ "tx_lut_12" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 8,
+ "pa_gain" : 3,
+ "rf_power" : 23
+ },
+ "tx_lut_13" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 13,
+ "pa_gain" : 3,
+ "rf_power" : 25
+ },
+ "tx_lut_14" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 12,
+ "pa_gain" : 3,
+ "rf_power" : 26
+ },
+ "tx_lut_15" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 15,
+ "pa_gain" : 3,
+ "rf_power" : 27
+ },
+ "tx_lut_2" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 13,
+ "pa_gain" : 0,
+ "rf_power" : 0
+ },
+ "tx_lut_3" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 10,
+ "pa_gain" : 1,
+ "rf_power" : 3
+ },
+ "tx_lut_4" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 10,
+ "pa_gain" : 1,
+ "rf_power" : 6
+ },
+ "tx_lut_5" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 15,
+ "pa_gain" : 1,
+ "rf_power" : 10
+ },
+ "tx_lut_6" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 13,
+ "pa_gain" : 1,
+ "rf_power" : 11
+ },
+ "tx_lut_7" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 15,
+ "pa_gain" : 1,
+ "rf_power" : 12
+ },
+ "tx_lut_8" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 8,
+ "pa_gain" : 2,
+ "rf_power" : 13
+ },
+ "tx_lut_9" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 12,
+ "pa_gain" : 2,
+ "rf_power" : 14
+ }
},
"gateway_conf": {
"forward_crc_disabled": false,
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.EU868.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.EU868.basic
index 710a228..c0edcd3 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.EU868.basic
+++ b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.EU868.basic
@@ -82,22 +82,102 @@
"bandwidth": 125000,
"datarate": 50000
},
- "tx_lut_0":{"dig_gain":1,"mix_gain":10,"pa_gain":1,"rf_power":4},
- "tx_lut_1":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":11},
- "tx_lut_2":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":12},
- "tx_lut_3":{"dig_gain":0,"mix_gain":10,"pa_gain":2,"rf_power":13},
- "tx_lut_4":{"dig_gain":3,"mix_gain":14,"pa_gain":2,"rf_power":14},
- "tx_lut_5":{"dig_gain":1,"mix_gain":12,"pa_gain":2,"rf_power":15},
- "tx_lut_6":{"dig_gain":0,"mix_gain":12,"pa_gain":2,"rf_power":16},
- "tx_lut_7":{"dig_gain":2,"mix_gain":14,"pa_gain":2,"rf_power":17},
- "tx_lut_8":{"dig_gain":2,"mix_gain":15,"pa_gain":2,"rf_power":18},
- "tx_lut_9":{"dig_gain":1,"mix_gain":15,"pa_gain":2,"rf_power":19},
- "tx_lut_10":{"dig_gain":0,"mix_gain":9,"pa_gain":3,"rf_power":20},
- "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":21},
- "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":22},
- "tx_lut_13":{"dig_gain":0,"mix_gain":11,"pa_gain":3,"rf_power":23},
- "tx_lut_14":{"dig_gain":2,"mix_gain":14,"pa_gain":3,"rf_power":24},
- "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":25}
+ "tx_lut_0": {
+ "pa_gain": 0,
+ "mix_gain": 9,
+ "rf_power": -6,
+ "dig_gain": 1
+ },
+ "tx_lut_1": {
+ "pa_gain": 0,
+ "mix_gain": 12,
+ "rf_power": -3,
+ "dig_gain": 1
+ },
+ "tx_lut_2": {
+ "pa_gain": 1,
+ "mix_gain": 8,
+ "rf_power": 0,
+ "dig_gain": 2
+ },
+ "tx_lut_3": {
+ "pa_gain": 1,
+ "mix_gain": 11,
+ "rf_power": 3,
+ "dig_gain": 3
+ },
+ "tx_lut_4": {
+ "pa_gain": 1,
+ "mix_gain": 10,
+ "rf_power": 6,
+ "dig_gain": 0
+ },
+ "tx_lut_5": {
+ "pa_gain": 2,
+ "mix_gain": 11,
+ "rf_power": 10,
+ "dig_gain": 3
+ },
+ "tx_lut_6": {
+ "pa_gain": 2,
+ "mix_gain": 9,
+ "rf_power": 11,
+ "dig_gain": 1
+ },
+ "tx_lut_7": {
+ "pa_gain": 2,
+ "mix_gain": 9,
+ "rf_power": 12,
+ "dig_gain": 0
+ },
+ "tx_lut_8": {
+ "pa_gain": 2,
+ "mix_gain": 11,
+ "rf_power": 13,
+ "dig_gain": 2
+ },
+ "tx_lut_9": {
+ "pa_gain": 2,
+ "mix_gain": 11,
+ "rf_power": 14,
+ "dig_gain": 1
+ },
+ "tx_lut_10": {
+ "pa_gain": 2,
+ "mix_gain": 12,
+ "rf_power": 16,
+ "dig_gain": 0
+ },
+ "tx_lut_11": {
+ "pa_gain": 3,
+ "mix_gain": 10,
+ "rf_power": 20,
+ "dig_gain": 3
+ },
+ "tx_lut_12": {
+ "pa_gain": 3,
+ "mix_gain": 9,
+ "rf_power": 23,
+ "dig_gain": 0
+ },
+ "tx_lut_13": {
+ "pa_gain": 3,
+ "mix_gain": 12,
+ "rf_power": 25,
+ "dig_gain": 2
+ },
+ "tx_lut_14": {
+ "pa_gain": 3,
+ "mix_gain": 13,
+ "rf_power": 26,
+ "dig_gain": 0
+ },
+ "tx_lut_15": {
+ "pa_gain": 3,
+ "mix_gain": 15,
+ "rf_power": 27,
+ "dig_gain": 2
+ }
},
"gateway_conf": {
"gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.IN865.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.IN865.basic
index c45db75..332b9bb 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.IN865.basic
+++ b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.IN865.basic
@@ -82,22 +82,118 @@
"tx_enable": false,
"type": "SX1257"
},
- "tx_lut_0":{"dig_gain":2,"mix_gain":15,"pa_gain":1,"rf_power":10},
- "tx_lut_1":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":11},
- "tx_lut_2":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":12},
- "tx_lut_3":{"dig_gain":0,"mix_gain":10,"pa_gain":2,"rf_power":13},
- "tx_lut_4":{"dig_gain":3,"mix_gain":14,"pa_gain":2,"rf_power":14},
- "tx_lut_5":{"dig_gain":1,"mix_gain":12,"pa_gain":2,"rf_power":15},
- "tx_lut_6":{"dig_gain":0,"mix_gain":12,"pa_gain":2,"rf_power":16},
- "tx_lut_7":{"dig_gain":2,"mix_gain":14,"pa_gain":2,"rf_power":17},
- "tx_lut_8":{"dig_gain":2,"mix_gain":15,"pa_gain":2,"rf_power":18},
- "tx_lut_9":{"dig_gain":1,"mix_gain":15,"pa_gain":2,"rf_power":19},
- "tx_lut_10":{"dig_gain":0,"mix_gain":9,"pa_gain":3,"rf_power":20},
- "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":21},
- "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":22},
- "tx_lut_13":{"dig_gain":0,"mix_gain":11,"pa_gain":3,"rf_power":23},
- "tx_lut_14":{"dig_gain":2,"mix_gain":14,"pa_gain":3,"rf_power":24},
- "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":25}
+ "tx_lut_0" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 9,
+ "pa_gain" : 0,
+ "rf_power" : -6
+ },
+ "tx_lut_1" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 9,
+ "pa_gain" : 0,
+ "rf_power" : -3
+ },
+ "tx_lut_10" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 10,
+ "pa_gain" : 2,
+ "rf_power" : 16
+ },
+ "tx_lut_11" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 14,
+ "pa_gain" : 2,
+ "rf_power" : 20
+ },
+ "tx_lut_12" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 8,
+ "pa_gain" : 3,
+ "rf_power" : 23
+ },
+ "tx_lut_13" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 13,
+ "pa_gain" : 3,
+ "rf_power" : 25
+ },
+ "tx_lut_14" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 12,
+ "pa_gain" : 3,
+ "rf_power" : 26
+ },
+ "tx_lut_15" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 15,
+ "pa_gain" : 3,
+ "rf_power" : 27
+ },
+ "tx_lut_2" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 13,
+ "pa_gain" : 0,
+ "rf_power" : 0
+ },
+ "tx_lut_3" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 10,
+ "pa_gain" : 1,
+ "rf_power" : 3
+ },
+ "tx_lut_4" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 10,
+ "pa_gain" : 1,
+ "rf_power" : 6
+ },
+ "tx_lut_5" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 15,
+ "pa_gain" : 1,
+ "rf_power" : 10
+ },
+ "tx_lut_6" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 13,
+ "pa_gain" : 1,
+ "rf_power" : 11
+ },
+ "tx_lut_7" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 15,
+ "pa_gain" : 1,
+ "rf_power" : 12
+ },
+ "tx_lut_8" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 8,
+ "pa_gain" : 2,
+ "rf_power" : 13
+ },
+ "tx_lut_9" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 12,
+ "pa_gain" : 2,
+ "rf_power" : 14
+ }
},
"gateway_conf": {
"gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.KR920-LBT.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.KR920-LBT.basic
index 9daa32e..fa7c520 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.KR920-LBT.basic
+++ b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.KR920-LBT.basic
@@ -112,22 +112,118 @@
"tx_enable": false,
"type": "SX1257"
},
- "tx_lut_0":{"dig_gain":2,"mix_gain":15,"pa_gain":1,"rf_power":10},
- "tx_lut_1":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":11},
- "tx_lut_2":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":12},
- "tx_lut_3":{"dig_gain":0,"mix_gain":10,"pa_gain":2,"rf_power":13},
- "tx_lut_4":{"dig_gain":3,"mix_gain":14,"pa_gain":2,"rf_power":14},
- "tx_lut_5":{"dig_gain":1,"mix_gain":12,"pa_gain":2,"rf_power":15},
- "tx_lut_6":{"dig_gain":0,"mix_gain":12,"pa_gain":2,"rf_power":16},
- "tx_lut_7":{"dig_gain":2,"mix_gain":14,"pa_gain":2,"rf_power":17},
- "tx_lut_8":{"dig_gain":2,"mix_gain":15,"pa_gain":2,"rf_power":18},
- "tx_lut_9":{"dig_gain":1,"mix_gain":15,"pa_gain":2,"rf_power":19},
- "tx_lut_10":{"dig_gain":0,"mix_gain":9,"pa_gain":3,"rf_power":20},
- "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":21},
- "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":22},
- "tx_lut_13":{"dig_gain":0,"mix_gain":11,"pa_gain":3,"rf_power":23},
- "tx_lut_14":{"dig_gain":2,"mix_gain":14,"pa_gain":3,"rf_power":24},
- "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":25}
+ "tx_lut_0" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 9,
+ "pa_gain" : 0,
+ "rf_power" : -6
+ },
+ "tx_lut_1" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 9,
+ "pa_gain" : 0,
+ "rf_power" : -3
+ },
+ "tx_lut_10" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 10,
+ "pa_gain" : 2,
+ "rf_power" : 16
+ },
+ "tx_lut_11" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 14,
+ "pa_gain" : 2,
+ "rf_power" : 20
+ },
+ "tx_lut_12" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 8,
+ "pa_gain" : 3,
+ "rf_power" : 23
+ },
+ "tx_lut_13" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 13,
+ "pa_gain" : 3,
+ "rf_power" : 25
+ },
+ "tx_lut_14" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 12,
+ "pa_gain" : 3,
+ "rf_power" : 26
+ },
+ "tx_lut_15" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 15,
+ "pa_gain" : 3,
+ "rf_power" : 27
+ },
+ "tx_lut_2" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 13,
+ "pa_gain" : 0,
+ "rf_power" : 0
+ },
+ "tx_lut_3" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 10,
+ "pa_gain" : 1,
+ "rf_power" : 3
+ },
+ "tx_lut_4" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 10,
+ "pa_gain" : 1,
+ "rf_power" : 6
+ },
+ "tx_lut_5" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 15,
+ "pa_gain" : 1,
+ "rf_power" : 10
+ },
+ "tx_lut_6" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 13,
+ "pa_gain" : 1,
+ "rf_power" : 11
+ },
+ "tx_lut_7" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 15,
+ "pa_gain" : 1,
+ "rf_power" : 12
+ },
+ "tx_lut_8" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 8,
+ "pa_gain" : 2,
+ "rf_power" : 13
+ },
+ "tx_lut_9" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 12,
+ "pa_gain" : 2,
+ "rf_power" : 14
+ }
},
"gateway_conf": {
"gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.RU864.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.RU864.basic
index d185858..a0636a7 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.RU864.basic
+++ b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.RU864.basic
@@ -82,22 +82,102 @@
"bandwidth": 125000,
"datarate": 50000
},
- "tx_lut_0":{"dig_gain":2,"mix_gain":15,"pa_gain":1,"rf_power":10},
- "tx_lut_1":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":11},
- "tx_lut_2":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":12},
- "tx_lut_3":{"dig_gain":0,"mix_gain":10,"pa_gain":2,"rf_power":13},
- "tx_lut_4":{"dig_gain":3,"mix_gain":14,"pa_gain":2,"rf_power":14},
- "tx_lut_5":{"dig_gain":1,"mix_gain":12,"pa_gain":2,"rf_power":15},
- "tx_lut_6":{"dig_gain":0,"mix_gain":12,"pa_gain":2,"rf_power":16},
- "tx_lut_7":{"dig_gain":2,"mix_gain":14,"pa_gain":2,"rf_power":17},
- "tx_lut_8":{"dig_gain":2,"mix_gain":15,"pa_gain":2,"rf_power":18},
- "tx_lut_9":{"dig_gain":1,"mix_gain":15,"pa_gain":2,"rf_power":19},
- "tx_lut_10":{"dig_gain":0,"mix_gain":9,"pa_gain":3,"rf_power":20},
- "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":21},
- "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":22},
- "tx_lut_13":{"dig_gain":0,"mix_gain":11,"pa_gain":3,"rf_power":23},
- "tx_lut_14":{"dig_gain":2,"mix_gain":14,"pa_gain":3,"rf_power":24},
- "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":25}
+ "tx_lut_0": {
+ "pa_gain": 0,
+ "mix_gain": 9,
+ "rf_power": -6,
+ "dig_gain": 1
+ },
+ "tx_lut_1": {
+ "pa_gain": 0,
+ "mix_gain": 12,
+ "rf_power": -3,
+ "dig_gain": 1
+ },
+ "tx_lut_2": {
+ "pa_gain": 1,
+ "mix_gain": 8,
+ "rf_power": 0,
+ "dig_gain": 2
+ },
+ "tx_lut_3": {
+ "pa_gain": 1,
+ "mix_gain": 11,
+ "rf_power": 3,
+ "dig_gain": 3
+ },
+ "tx_lut_4": {
+ "pa_gain": 1,
+ "mix_gain": 10,
+ "rf_power": 6,
+ "dig_gain": 0
+ },
+ "tx_lut_5": {
+ "pa_gain": 2,
+ "mix_gain": 11,
+ "rf_power": 10,
+ "dig_gain": 3
+ },
+ "tx_lut_6": {
+ "pa_gain": 2,
+ "mix_gain": 9,
+ "rf_power": 11,
+ "dig_gain": 1
+ },
+ "tx_lut_7": {
+ "pa_gain": 2,
+ "mix_gain": 9,
+ "rf_power": 12,
+ "dig_gain": 0
+ },
+ "tx_lut_8": {
+ "pa_gain": 2,
+ "mix_gain": 11,
+ "rf_power": 13,
+ "dig_gain": 2
+ },
+ "tx_lut_9": {
+ "pa_gain": 2,
+ "mix_gain": 11,
+ "rf_power": 14,
+ "dig_gain": 1
+ },
+ "tx_lut_10": {
+ "pa_gain": 2,
+ "mix_gain": 12,
+ "rf_power": 16,
+ "dig_gain": 0
+ },
+ "tx_lut_11": {
+ "pa_gain": 3,
+ "mix_gain": 10,
+ "rf_power": 20,
+ "dig_gain": 3
+ },
+ "tx_lut_12": {
+ "pa_gain": 3,
+ "mix_gain": 9,
+ "rf_power": 23,
+ "dig_gain": 0
+ },
+ "tx_lut_13": {
+ "pa_gain": 3,
+ "mix_gain": 12,
+ "rf_power": 25,
+ "dig_gain": 2
+ },
+ "tx_lut_14": {
+ "pa_gain": 3,
+ "mix_gain": 13,
+ "rf_power": 26,
+ "dig_gain": 0
+ },
+ "tx_lut_15": {
+ "pa_gain": 3,
+ "mix_gain": 15,
+ "rf_power": 27,
+ "dig_gain": 2
+ }
},
"gateway_conf": {
"gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic
index dd39ac7..afcd070 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic
+++ b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic
@@ -96,22 +96,118 @@
"tx_enable" : false,
"type" : "SX1257"
},
- "tx_lut_0":{"dig_gain":2,"mix_gain":15,"pa_gain":1,"rf_power":10},
- "tx_lut_1":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":11},
- "tx_lut_2":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":12},
- "tx_lut_3":{"dig_gain":0,"mix_gain":10,"pa_gain":2,"rf_power":13},
- "tx_lut_4":{"dig_gain":3,"mix_gain":14,"pa_gain":2,"rf_power":14},
- "tx_lut_5":{"dig_gain":1,"mix_gain":12,"pa_gain":2,"rf_power":15},
- "tx_lut_6":{"dig_gain":0,"mix_gain":12,"pa_gain":2,"rf_power":16},
- "tx_lut_7":{"dig_gain":2,"mix_gain":14,"pa_gain":2,"rf_power":17},
- "tx_lut_8":{"dig_gain":2,"mix_gain":15,"pa_gain":2,"rf_power":18},
- "tx_lut_9":{"dig_gain":1,"mix_gain":15,"pa_gain":2,"rf_power":19},
- "tx_lut_10":{"dig_gain":0,"mix_gain":9,"pa_gain":3,"rf_power":20},
- "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":21},
- "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":22},
- "tx_lut_13":{"dig_gain":0,"mix_gain":11,"pa_gain":3,"rf_power":23},
- "tx_lut_14":{"dig_gain":2,"mix_gain":14,"pa_gain":3,"rf_power":24},
- "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":25}
+ "tx_lut_0" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 9,
+ "pa_gain" : 0,
+ "rf_power" : -6
+ },
+ "tx_lut_1" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 9,
+ "pa_gain" : 0,
+ "rf_power" : -3
+ },
+ "tx_lut_10" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 10,
+ "pa_gain" : 2,
+ "rf_power" : 16
+ },
+ "tx_lut_11" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 14,
+ "pa_gain" : 2,
+ "rf_power" : 20
+ },
+ "tx_lut_12" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 8,
+ "pa_gain" : 3,
+ "rf_power" : 23
+ },
+ "tx_lut_13" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 13,
+ "pa_gain" : 3,
+ "rf_power" : 25
+ },
+ "tx_lut_14" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 12,
+ "pa_gain" : 3,
+ "rf_power" : 26
+ },
+ "tx_lut_15" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 15,
+ "pa_gain" : 3,
+ "rf_power" : 27
+ },
+ "tx_lut_2" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 13,
+ "pa_gain" : 0,
+ "rf_power" : 0
+ },
+ "tx_lut_3" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 10,
+ "pa_gain" : 1,
+ "rf_power" : 3
+ },
+ "tx_lut_4" :
+ {
+ "dig_gain" : 2,
+ "mix_gain" : 10,
+ "pa_gain" : 1,
+ "rf_power" : 6
+ },
+ "tx_lut_5" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 15,
+ "pa_gain" : 1,
+ "rf_power" : 10
+ },
+ "tx_lut_6" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 13,
+ "pa_gain" : 1,
+ "rf_power" : 11
+ },
+ "tx_lut_7" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 15,
+ "pa_gain" : 1,
+ "rf_power" : 12
+ },
+ "tx_lut_8" :
+ {
+ "dig_gain" : 0,
+ "mix_gain" : 8,
+ "pa_gain" : 2,
+ "rf_power" : 13
+ },
+ "tx_lut_9" :
+ {
+ "dig_gain" : 3,
+ "mix_gain" : 12,
+ "pa_gain" : 2,
+ "rf_power" : 14
+ }
},
"gateway_conf": {
"gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-gpsd-3.23.patch b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-gpsd-3.23.patch
new file mode 100644
index 0000000..3612c41
--- /dev/null
+++ b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-gpsd-3.23.patch
@@ -0,0 +1,25 @@
+From d7140b20ae1261e3b4382eb7d438773e98576da3 Mon Sep 17 00:00:00 2001
+From: Serhii Voloshynov <serhii.voloshynov@globallogic.com>
+Date: Tue, 8 Feb 2022 16:47:56 +0200
+Subject: [PATCH] add fixes to support new gpsd 3.23
+
+---
+ lora_pkt_fwd/src/lora_pkt_fwd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lora_pkt_fwd/src/lora_pkt_fwd.c b/lora_pkt_fwd/src/lora_pkt_fwd.c
+index 33d1a87..ece850d 100644
+--- a/lora_pkt_fwd/src/lora_pkt_fwd.c
++++ b/lora_pkt_fwd/src/lora_pkt_fwd.c
+@@ -3532,7 +3532,7 @@ void thread_gps(void) {
+ wait_ms(100);
+ int r = gps_read (&gpsdata,0,0);
+ int used=0;
+- if (r!= -1 && (gpsdata.status != STATUS_NO_FIX) &&
++ if (r!= -1 && (gpsdata.fix.status != STATUS_NO_FIX) &&
+ (gpsdata.fix.mode == MODE_2D || gpsdata.fix.mode == MODE_3D) &&
+ !isnan(gpsdata.fix.latitude) &&
+ !isnan(gpsdata.fix.longitude)) {
+--
+2.25.1
+
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/mtcdt3hs/lora-packet-forwarder.default b/recipes-connectivity/lora/lora-packet-forwarder/mtcdt3hs/lora-packet-forwarder.default
new file mode 100644
index 0000000..0f92640
--- /dev/null
+++ b/recipes-connectivity/lora/lora-packet-forwarder/mtcdt3hs/lora-packet-forwarder.default
@@ -0,0 +1,2 @@
+# set to "yes" or "no" to control starting on boot
+ENABLED="no"
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/temp_lut.json.MTCAP2.EU868 b/recipes-connectivity/lora/lora-packet-forwarder/temp_lut.json.MTCAP2.EU868
deleted file mode 100644
index 39aa8f5..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/temp_lut.json.MTCAP2.EU868
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-"LUT-BASE": {
-"tx_lut_0":{"rf_power": 0, "pa_gain": 0, "mix_gain": 12, "dig_gain": 0},
-"tx_lut_1":{"rf_power": 1, "pa_gain": 0, "mix_gain": 13, "dig_gain": 0},
-"tx_lut_2":{"rf_power": 2, "pa_gain": 0, "mix_gain": 14, "dig_gain": 0},
-"tx_lut_3":{"rf_power": 3, "pa_gain": 0, "mix_gain": 15, "dig_gain": 0},
-"tx_lut_4":{"rf_power": 4, "pa_gain": 1, "mix_gain": 8, "dig_gain": 0},
-"tx_lut_5":{"rf_power": 5, "pa_gain": 1, "mix_gain": 10, "dig_gain": 0},
-"tx_lut_6":{"rf_power": 6, "pa_gain": 1, "mix_gain": 11, "dig_gain": 0},
-"tx_lut_7":{"rf_power": 7, "pa_gain": 1, "mix_gain": 14, "dig_gain": 0},
-"tx_lut_8":{"rf_power": 8, "pa_gain": 2, "mix_gain": 8, "dig_gain": 0},
-"tx_lut_9":{"rf_power": 9, "pa_gain": 2, "mix_gain": 9, "dig_gain": 0},
-"tx_lut_10":{"rf_power": 10, "pa_gain": 2, "mix_gain": 10, "dig_gain": 0},
-"tx_lut_11":{"rf_power": 11, "pa_gain": 2, "mix_gain": 12, "dig_gain": 0},
-"tx_lut_12":{"rf_power": 12, "pa_gain": 2, "mix_gain": 13, "dig_gain": 0},
-"tx_lut_13":{"rf_power": 13, "pa_gain": 2, "mix_gain": 15, "dig_gain": 0},
-"tx_lut_14":{"rf_power": 14, "pa_gain": 3, "mix_gain": 9, "dig_gain": 0},
-"tx_lut_15":{"rf_power": 15, "pa_gain": 3, "mix_gain": 11, "dig_gain": 0}
-},
-"LUT-40": [
-2.8,2.8,1.8,0.1,3.5,3.0,2.9,1.1,4.2,3.6,3.2,2.2,4.7,4.3,3.8,3.0,
-99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,
-17.1,16.1,14.8,11.4,18.8,17.9,16.9,13.8,20.1,19.4,18.4,15.4,22.6,21.8,20.9,18.4,
-23.9,23.2,22.2,19.8,25.6,25.1,24.4,22.1,28.2,27.8,27.1,23.9,29.4,29.1,28.8,27.4
-],
-"LUT-29": [
-2.6,2.6,1.6,0.0,3.2,3.0,2.5,1.1,4.0,3.5,3.1,1.9,4.5,4.2,3.6,2.6,
-99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,
-16.6,15.7,14.4,10.9,18.4,17.6,16.6,13.3,19.9,19.1,18.1,15.2,22.1,21.4,20.6,17.9,
-23.6,22.8,21.9,19.4,25.4,24.9,24.2,21.9,28.1,27.6,26.8,23.6,29.2,28.9,28.6,27.1
-],
-"LUT-19": [
-2.4,1.9,2.4,-0.2,3.0,2.6,2.1,0.7,3.6,3.2,3.0,1.6,4.3,4.0,3.5,2.2,
-99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,
-16.2,15.2,14.1,10.4,17.9,17.1,16.1,12.8,19.4,18.6,17.6,14.6,21.9,20.9,19.9,17.4,
-23.4,22.4,21.4,18.9,25.1,24.6,23.9,21.4,27.9,27.2,26.2,22.9,29.1,28.9,28.4,26.8
-],
-"LUT-9": [
-2.1,1.8,1.1,-0.6,2.9,2.5,1.9,0.5,3.5,3.0,2.5,1.4,4.2,3.8,3.1,2.2,
-99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,
-15.9,14.8,13.7,10.2,17.8,16.9,15.8,12.3,19.1,18.4,17.4,14.3,21.6,20.6,19.8,17.1,
-22.9,22.1,21.1,18.6,24.9,24.2,23.6,21.1,27.6,26.9,26.1,22.6,28.9,28.6,28.2,26.4
-],
-"LUT2": [
-1.8,1.2,0.7,-1.1,2.5,2.0,1.6,-0.0,3.0,2.6,2.2,0.9,3.8,3.2,2.9,1.8,
-7.8,6.8,5.3,1.9,11.2,10.4,9.2,6.0,13.1,11.9,10.8,8.1,99.9,99.9,99.9,99.9,
-15.3,14.2,13.1,9.6,17.2,16.2,15.1,11.8,18.6,17.6,16.6,13.6,20.9,20.1,19.1,16.4,
-22.4,21.6,20.6,18.1,24.4,23.9,23.1,20.6,27.2,26.4,25.2,21.9,28.8,28.4,27.9,25.9
-],
-"LUT21": [
-1.1,0.7,-0.0,-2.0,1.9,1.4,0.9,-0.7,2.5,2.1,1.6,0.1,3.1,2.8,2.2,1.1,
-6.3,5.2,4.0,0.7,9.7,8.8,7.8,4.7,11.1,10.2,9.3,6.7,14.6,13.8,13.1,10.9,
-14.1,13.2,11.8,8.2,16.1,15.1,13.9,10.7,17.6,16.8,15.7,12.4,19.9,19.1,17.9,15.2,
-21.4,20.4,19.6,16.9,23.6,22.9,22.1,19.4,26.4,25.4,24.1,20.4,28.1,27.9,27.2,24.6
-],
-"LUT40": [
-0.7,-0.0,-0.6,-2.8,1.4,0.9,0.2,-1.4,2.0,1.6,1.1,-0.6,2.6,2.2,1.8,0.3,
-5.5,4.2,3.0,-0.4,8.8,8.0,6.8,3.5,10.2,9.3,8.4,5.5,13.4,12.8,12.1,9.9,
-13.2,12.1,10.6,7.2,15.2,14.2,12.9,9.6,16.6,15.8,14.7,11.4,19.1,18.1,17.1,14.4,
-20.6,19.6,18.6,15.9,22.9,21.9,21.1,18.6,25.1,24.4,22.9,19.2,27.6,27.2,26.4,23.4
-],
-"LUT58": [
--0.0,-0.7,-1.2,-3.6,0.8,0.2,-0.3,-2.2,1.4,0.9,0.5,-1.2,2.0,1.6,1.1,-0.2,
-4.5,3.1,1.9,-1.6,7.8,7.0,5.8,2.5,9.2,8.4,7.5,4.5,12.7,12.1,11.3,9.1,
-12.2,10.8,9.7,6.2,14.2,13.1,11.8,8.3,15.7,14.7,13.6,10.2,18.1,17.1,16.1,13.2,
-19.6,18.6,17.6,14.8,21.9,21.2,20.2,17.6,24.1,22.9,21.6,17.8,27.1,26.2,25.2,22.1
-],
-"LUT77": [
--0.9,-1.4,-2.2,-4.8,-0.0,-0.6,-1.1,-3.2,0.8,0.2,-0.3,-2.1,1.2,0.8,0.3,-1.1,
-3.5,1.9,0.6,-3.0,6.7,5.7,4.5,1.1,8.2,7.3,6.2,3.1,11.7,11.1,10.2,7.8,
-11.2,9.6,8.2,4.8,12.9,11.8,10.4,7.0,14.6,13.4,12.2,8.9,16.9,15.9,14.8,11.8,
-18.4,17.4,16.4,13.6,20.9,20.1,19.1,16.4,22.8,21.4,20.1,16.4,26.1,25.1,23.9,20.6
-]
-}
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/temp_lut.json.MTCAP2.US915 b/recipes-connectivity/lora/lora-packet-forwarder/temp_lut.json.MTCAP2.US915
deleted file mode 100644
index 08d5e33..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/temp_lut.json.MTCAP2.US915
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-"LUT-BASE": {
-"tx_lut_0":{"rf_power": 0, "pa_gain": 0, "mix_gain": 13, "dig_gain": 0},
-"tx_lut_1":{"rf_power": 1, "pa_gain": 0, "mix_gain": 15, "dig_gain": 0},
-"tx_lut_2":{"rf_power": 2, "pa_gain": 1, "mix_gain": 8, "dig_gain": 0},
-"tx_lut_3":{"rf_power": 3, "pa_gain": 1, "mix_gain": 9, "dig_gain": 0},
-"tx_lut_4":{"rf_power": 4, "pa_gain": 1, "mix_gain": 10, "dig_gain": 0},
-"tx_lut_5":{"rf_power": 5, "pa_gain": 1, "mix_gain": 11, "dig_gain": 0},
-"tx_lut_6":{"rf_power": 6, "pa_gain": 1, "mix_gain": 14, "dig_gain": 0},
-"tx_lut_7":{"rf_power": 7, "pa_gain": 2, "mix_gain": 8, "dig_gain": 0},
-"tx_lut_8":{"rf_power": 8, "pa_gain": 2, "mix_gain": 9, "dig_gain": 0},
-"tx_lut_9":{"rf_power": 9, "pa_gain": 2, "mix_gain": 10, "dig_gain": 0},
-"tx_lut_10":{"rf_power": 10, "pa_gain": 2, "mix_gain": 11, "dig_gain": 0},
-"tx_lut_11":{"rf_power": 11, "pa_gain": 2, "mix_gain": 12, "dig_gain": 0},
-"tx_lut_12":{"rf_power": 12, "pa_gain": 2, "mix_gain": 13, "dig_gain": 0},
-"tx_lut_13":{"rf_power": 13, "pa_gain": 3, "mix_gain": 8, "dig_gain": 0},
-"tx_lut_14":{"rf_power": 14, "pa_gain": 3, "mix_gain": 10, "dig_gain": 0},
-"tx_lut_15":{"rf_power": 15, "pa_gain": 3, "mix_gain": 13, "dig_gain": 0}
-},
-"LUT-40": [
-2.5,2.4,2.0,1.7,2.8,2.7,2.5,2.1,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,
-99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,17.2,16.3,15.3,12.2,
-18.8,18.0,17.1,14.3,20.1,21.6,21.1,15.9,22.5,22.4,21.9,21.1,23.4,22.8,22.8,22.1,
-23.6,23.4,23.2,22.3,28.3,27.7,26.9,23.4,30.0,30.1,29.9,29.6,30.6,30.6,30.6,30.5
-],
-"LUT-30": [
-2.2,2.1,1.8,1.4,2.7,2.7,2.3,2.0,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,
-99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,16.6,15.7,14.7,11.5,
-18.2,17.4,16.4,13.7,19.6,21.2,17.8,19.3,22.2,22.1,21.2,20.5,22.8,22.5,21.9,21.4,
-23.6,23.2,23.0,22.1,27.9,27.0,26.0,22.6,30.0,29.3,28.8,29.4,30.5,30.5,30.5,30.4
-],
-"LUT-20": [
-2.1,1.9,1.8,1.3,2.4,2.2,2.0,1.6,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,
-99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,15.9,15.1,13.9,10.7,
-17.6,16.8,15.8,12.9,18.9,18.2,17.2,14.5,21.7,21.4,20.7,19.5,22.3,22.1,21.7,20.4,
-23.1,22.5,22.5,21.6,27.2,26.4,25.3,21.7,29.4,28.9,28.2,25.8,30.4,30.4,30.3,30.1
-],
-"LUT-10": [
-1.8,1.4,1.2,0.9,2.3,2.1,1.9,1.4,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,
-99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,99.9,15.5,14.3,13.3,10.0,
-17.0,16.2,15.1,12.2,18.3,17.5,16.5,13.9,19.7,20.8,18.1,19.6,21.5,21.3,21.6,19.9,
-22.3,22.0,22.0,20.9,26.6,25.7,24.4,20.9,29.0,28.5,27.7,25.1,30.2,30.3,30.2,30.1
-],
-"LUT1": [
-1.2,1.2,0.9,0.2,2.0,1.6,1.5,0.9,6.7,5.9,4.8,1.3,8.6,7.5,6.7,3.7,
-10.2,8.9,8.1,5.1,12.7,9.9,9.8,6.8,99.9,99.9,99.9,99.9,14.6,13.7,12.5,9.2,
-16.3,15.6,14.5,11.4,17.8,16.8,15.9,13.1,19.1,18.3,17.4,14.8,21.0,21.1,20.6,19.8,
-21.9,21.7,21.5,20.4,26.0,24.8,23.6,19.9,28.6,27.9,27.0,24.2,30.0,29.9,30.1,29.7
-],
-"LUT20": [
-0.7,0.5,0.2,-0.2,1.2,1.0,0.8,0.2,5.4,4.3,3.0,0.0,7.0,6.2,5.1,2.1,
-8.2,7.4,6.6,3.6,9.4,8.8,7.9,5.5,12.3,12.4,11.8,11.3,13.3,12.5,11.0,7.7,
-15.0,14.2,13.1,9.9,16.4,15.6,14.6,11.6,17.9,17.1,16.1,13.4,19.2,18.5,17.5,15.0,
-21.0,20.5,20.2,19.4,24.4,23.3,22.0,18.3,27.5,26.8,25.8,22.6,29.7,29.5,29.6,29.2
-],
-"LUT39": [
--0.6,-0.8,-1.3,-2.6,0.4,0.1,-0.2,-1.0,3.9,2.6,1.5,-1.9,5.5,4.7,3.5,0.4,
-6.8,6.0,5.0,2.1,8.2,7.4,6.5,4.0,11.2,10.6,10.7,9.9,11.9,10.7,9.4,6.1,
-13.8,12.6,11.5,8.2,15.0,14.2,13.1,10.0,16.4,15.6,14.7,11.8,18.0,17.1,16.1,13.5,
-19.5,18.8,18.0,16.0,22.7,21.4,20.1,16.5,26.0,25.3,24.1,20.8,29.1,28.8,28.5,27.2
-],
-"LUT57": [
--1.3,-1.8,-2.6,-4.2,-0.5,-0.7,-1.0,-2.1,2.8,1.3,0.0,-3.5,4.2,3.1,2.0,-1.2,
-5.5,4.7,3.6,0.5,6.8,6.1,5.2,2.3,9.7,9.3,8.8,7.0,10.7,9.1,7.8,4.4,
-12.2,11.3,9.9,6.6,13.6,12.7,11.8,8.5,15.2,14.3,13.3,10.3,16.6,15.8,14.8,12.1,
-18.2,17.3,16.2,13.6,21.3,19.7,18.4,14.8,24.7,23.7,22.5,18.9,28.3,28.0,27.7,25.7
-],
-"LUT77": [
--2.4,-2.9,-3.6,-5.5,-1.2,-1.6,-2.0,-3.6,1.2,-0.5,-1.9,-5.2,2.7,1.5,0.3,-3.0,
-4.1,3.1,2.0,-1.0,5.6,4.6,3.6,0.6,8.7,8.1,7.4,5.2,9.3,7.5,6.3,2.7,
-10.7,9.5,8.2,4.8,12.0,11.1,9.9,6.6,13.6,12.7,11.6,8.6,15.1,14.3,13.2,10.3,
-16.6,15.6,14.7,12.0,19.7,18.1,16.4,12.7,22.8,21.8,20.5,16.9,27.5,26.7,25.6,22.8
-]
-}
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder_4.0.22.bb b/recipes-connectivity/lora/lora-packet-forwarder_4.0.22.bb
index 3eaa70a..000caff 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder_4.0.22.bb
+++ b/recipes-connectivity/lora/lora-packet-forwarder_4.0.22.bb
@@ -7,10 +7,9 @@ LICENSE = "Proprietary"
LIC_FILES_CHKSUM = "file://LICENSE;md5=22af7693d7b76ef0fc76161c4be76c45"
DEPENDS = "lora-gateway logrotate lora-logging gpsd"
RDEPENDS_${PN} += "bash"
-FILESEXTRAPATHS_append_mtcdt3hs := ":${THISDIR}/lora-packet-forwarder/mtcdt3"
-PR = "r32"
+PR = "r42"
+
SRCREV = "${PV}"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
SRC_URI = "git://git.multitech.net/packet_forwarder_mtac_full;branch=master;protocol=git \
file://README.md \
@@ -43,16 +42,12 @@ SRC_URI = "git://git.multitech.net/packet_forwarder_mtac_full;branch=master;prot
file://global_conf.json.MTCAP2-LORA-1.5.KR920-LBT \
file://global_conf.json.MTCAP2-LORA-1.5.RU864 \
file://global_conf.json.MTCAP2-LORA-1.5.US915 \
- file://temp_lut.json.MTCAP2.US915 \
- file://temp_lut.json.MTCAP2.EU868 \
file://local_conf.json \
"
S = "${WORKDIR}/git"
B = "${S}"
-TARGET_CC_ARCH += "${LDFLAGS}"
-
LORA_DIR = "/opt/lora"
@@ -62,7 +57,7 @@ export LGW_INC = "${STAGING_INCDIR}/lora"
CFLAGS += "-I${LGW_INC} -Iinc -I. -std=gnu11"
do_compile() {
- oe_runmake
+ oe_runmake LDFLAGS=${LDFLAGS}
}
do_install() {
@@ -116,41 +111,6 @@ do_install_append_mtcap() {
install -m 644 ${WORKDIR}/global_conf.json.MTCAP2-LORA-1.5.AS923-LBT ${D}${LORA_DIR}/global_conf.json.MTCAP2_LORA_1_5.AS923-LBT
install -m 644 ${WORKDIR}/global_conf.json.MTCAP2-LORA-1.5.KR920-LBT ${D}${LORA_DIR}/global_conf.json.MTCAP2_LORA_1_5.KR920-LBT
install -m 644 ${WORKDIR}/global_conf.json.MTCAP2-LORA-1.5.IN865 ${D}${LORA_DIR}/global_conf.json.MTCAP2_LORA_1_5.IN865
-
- install -m 644 ${WORKDIR}/temp_lut.json.MTCAP2.US915 ${D}${LORA_DIR}/
- install -m 644 ${WORKDIR}/temp_lut.json.MTCAP2.EU868 ${D}${LORA_DIR}/
-}
-
-do_install_append_mtcdt3() {
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_0
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_0.EU868
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.EU868
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.RU864.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.RU864
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_0.US915
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.US915
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.AU915.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.AU915
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.AS923.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.AS923
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.AS923-LBT.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.AS923-LBT
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.KR920-LBT.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.KR920-LBT
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.IN865.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.IN865
-}
-
-do_install_append_mtcdt3hs() {
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_0
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_0.EU868
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.EU868
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.RU864.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.RU864
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_0.US915
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.US915
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.AU915.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.AU915
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.AS923.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.AS923
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.AS923-LBT.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.AS923-LBT
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.KR920-LBT.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.KR920-LBT
- install -m 644 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.IN865.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.IN865
}
do_install_append_mtcpmhs() {