diff options
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}, |