diff options
| author | Andrii Pientsov <andrii.pientsov@globallogic.com> | 2020-05-27 15:05:10 +0300 |
|---|---|---|
| committer | Andrii Pientsov <andrii.pientsov@globallogic.com> | 2020-05-27 15:05:10 +0300 |
| commit | e919ef1e33c2cb56856cdbd22792a3bc3f36341d (patch) | |
| tree | eb08d052d64d0814ea1cfc75664b64be68eaffbb | |
| parent | e0d7185cbf41d7921acdb90bcac898f5e9786848 (diff) | |
| download | meta-mlinux-atmel-e919ef1e33c2cb56856cdbd22792a3bc3f36341d.tar.gz meta-mlinux-atmel-e919ef1e33c2cb56856cdbd22792a3bc3f36341d.tar.bz2 meta-mlinux-atmel-e919ef1e33c2cb56856cdbd22792a3bc3f36341d.zip | |
Remove duplicate LoRa
103 files changed, 0 insertions, 11643 deletions
diff --git a/recipes-connectivity/lora/lora-basic-station/lora-basic-station-disable-device-mode.patch b/recipes-connectivity/lora/lora-basic-station/lora-basic-station-disable-device-mode.patch deleted file mode 100644 index d81d041..0000000 --- a/recipes-connectivity/lora/lora-basic-station/lora-basic-station-disable-device-mode.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/sx1301conf.c b/src/sx1301conf.c -index bca649c..c2681a4 100644 ---- a/src/sx1301conf.c -+++ b/src/sx1301conf.c -@@ -433,7 +433,10 @@ int sx1301conf_start (struct sx1301conf* sx1301conf, u4_t cca_region) { - } - - LOG(MOD_RAL|INFO, "Station device: %s (PPS capture %sabled)", sx1301conf->device, sx1301conf->pps ? "en":"dis"); -+ -+#ifndef CFG_prod - lgwx_device_mode = sys_deviceMode; -+#endif - int err = lgw_start(); - if( err == LGW_HAL_SUCCESS ) { - lgw_reg_w(LGW_GPS_EN, sx1301conf->pps ? 1 : 0); diff --git a/recipes-connectivity/lora/lora-basic-station/lora-basic-station-fix-clksrc-0.patch b/recipes-connectivity/lora/lora-basic-station/lora-basic-station-fix-clksrc-0.patch deleted file mode 100644 index c534460..0000000 --- a/recipes-connectivity/lora/lora-basic-station/lora-basic-station-fix-clksrc-0.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/sx1301conf.c b/src/sx1301conf.c -index bca649c..fe62351 100644 ---- a/src/sx1301conf.c -+++ b/src/sx1301conf.c -@@ -193,7 +193,8 @@ static void parse_sx1301_conf (ujdec_t* D, struct sx1301conf* sx1301conf) { - break; - } - case J_clksrc: { - sx1301conf->boardconf.clksrc = uj_intRange(D, 0, LGW_RF_CHAIN_NB-1); -+ sx1301conf->boardconf.clksrc = 0; - break; - } - case J_tx_gain_lut: { - diff --git a/recipes-connectivity/lora/lora-basic-station/lora-basic-station-sys-linux-log-fix.patch b/recipes-connectivity/lora/lora-basic-station/lora-basic-station-sys-linux-log-fix.patch deleted file mode 100644 index 83be080..0000000 --- a/recipes-connectivity/lora/lora-basic-station/lora-basic-station-sys-linux-log-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src-linux/sys_linux.c b/src-linux/sys_linux.c -index f8286c8..7afc073 100644 ---- a/src-linux/sys_linux.c -+++ b/src-linux/sys_linux.c -@@ -724,7 +724,7 @@ static int parseStationConf () { - case J_nodc: - case J_nodwell: - case J_device_mode: { -- LOG(MOD_S2E|WARNING, "Feature not supported in production level code (station.conf) - ignored: %s", D->field.name); -- uj_skipValue(D); -+ LOG(MOD_S2E|WARNING, "Feature not supported in production level code (station.conf) - ignored: %s", D.field.name); -+ uj_skipValue(&D); - break; - } diff --git a/recipes-connectivity/lora/lora-basic-station/lora-basic-station.default b/recipes-connectivity/lora/lora-basic-station/lora-basic-station.default deleted file mode 100644 index 0f92640..0000000 --- a/recipes-connectivity/lora/lora-basic-station/lora-basic-station.default +++ /dev/null @@ -1,2 +0,0 @@ -# set to "yes" or "no" to control starting on boot -ENABLED="no" diff --git a/recipes-connectivity/lora/lora-basic-station/lora-basic-station.init b/recipes-connectivity/lora/lora-basic-station/lora-basic-station.init deleted file mode 100755 index 45c6eee..0000000 --- a/recipes-connectivity/lora/lora-basic-station/lora-basic-station.init +++ /dev/null @@ -1,165 +0,0 @@ -#!/bin/bash - - -NAME="lora-basic-station" -ENABLED="yes" - - -[ -f /etc/default/$NAME ] && source /etc/default/$NAME - -run_dir=/var/run/lora -opt_conf_dir=/opt/lora -conf_dir=/var/config/lora -conf_file=$conf_dir/station.conf -tc_uri_file=$conf_dir/tc.uri -tc_key_file=$conf_dir/tc.key -tc_trust_file=$conf_dir/tc.trust - -pkt_fwd=$run_dir/1/station -pkt_fwd_pidfile=$run_dir/station.pid - -port1=/sys/devices/platform/mts-io/ap1 -port2=/sys/devices/platform/mts-io/ap2 - -lora_mtac_id="MTAC-LORA" -lora_1_0_hw="MTAC-LORA-1.0" -lora_1_5_h_hw="MTAC-LORA-1.5" -lora_2_1_hw="MTAC-LORA-2.1" - -lora_mtac_id="MTAC-LORA" -lora_mtac_id915="MTAC-LORA-915" -lora_mtac_id868="MTAC-LORA-868" -lora_mtac_h_id915="MTAC-LORA-H-915" -lora_mtac_h_id868="MTAC-LORA-H-868" - -lora_mtcap_id="MTCAP-LORA" -lora_mtcap_id868="MTCAP-LORA-868" -lora_mtcap_id915="MTCAP-LORA-915" - -lora_mtac_g_id="MTAC-LORA-G" -lora_mtac_g16_id868="MTAC-LORA-G16-868" -lora_mtac_g16_id915="MTAC-LORA-G16-915" -lora_mtac_g64_id868="MTAC-LORA-G64-868" -lora_mtac_g64_id915="MTAC-LORA-G64-915" - -pkt_fwd_options="" - -gps_path="/dev/gps0" - -read_lora_hw_info() { - lora_id=$(mts-io-sysfs show lora/product-id 2> /dev/null) - lora_hw=$(mts-io-sysfs show lora/hw-version 2> /dev/null) - lora_eui=$(mts-io-sysfs show lora/eui 2> /dev/null) - lora_eui_raw=${lora_eui//:/} -} - -hardware_found() { - if [[ "$lora_id" =~ "$lora_mtac_g_id" ]]; then - setup_mtcdt_2_1 - elif [[ "$lora_id" =~ "$lora_mtcap_id" ]]; then - setup_mtcap - elif [[ "$lora_id" =~ "$lora_mtac_id" ]]; then - setup_mtcdt - else - return 1 - fi - return 0 -} - -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 - - ln -sf /opt/lora/station $pkt_fwd -} - -setup_mtcap() { - - ln -sf /opt/lora/station $pkt_fwd -} - -setup_mtcdt_2_1() { - echo LORA-2.1 not supported - return 1 -} - -do_start() { - - mkdir -p $run_dir/1 - rm -rf $run_dir/1/* - - read_lora_hw_info - - if hardware_found; then - echo "Found $lora_id with $lora_hw hardware. Configuring" - else - echo "$0: LORA card not detected" - exit 1 - fi - - if ! [ -f $conf_file ]; then - echo "$0: $conf_file missing" - exit 1 - fi - - # - # copy conf files to the run directory - # - cp $conf_file $run_dir/1/ - cp $tc_uri_file $run_dir/1/ - cp $tc_key_file $run_dir/1/ - cp $tc_trust_file $run_dir/1/ - - sed -i.bak "s/\(.*routerid\"\s*\:\s*\"\)<.*>[^\"]*\(.*\)/\1${lora_eui_raw}\2/g" /var/run/lora/1/station.conf - - # - # start packet forwarder - # - echo -n "Starting $NAME: " - - /usr/sbin/start-stop-daemon --chdir $run_dir/1 --background --start --make-pidfile \ - --pidfile $pkt_fwd_pidfile --startas /bin/bash -- -c "exec $pkt_fwd $pkt_fwd_options" - - renice -n -20 -p $(pgrep $(basename $pkt_fwd)) - - echo "OK" -} - - -do_stop() { - echo -n "Stopping $NAME: " - start-stop-daemon --stop --quiet --oknodo --pidfile $pkt_fwd_pidfile --retry 5 - rm -f $pkt_fwd_pidfile - echo "OK" -} - - -if [ "$ENABLED" != "yes" ]; then - echo "$NAME: disabled in /etc/default" - exit -fi - - -case "$1" in - "start") - do_start - ;; - "stop") - do_stop - ;; - "restart") - ## Stop the service and regardless of whether it was - ## running or not, start it again. - do_stop - do_start - ;; - *) - ## If no parameters are given, print which are avaiable. - echo "Usage: $0 {start|stop|restart}" - exit 1 - ;; -esac - diff --git a/recipes-connectivity/lora/lora-basic-station/setup.gmk b/recipes-connectivity/lora/lora-basic-station/setup.gmk deleted file mode 100644 index 1319e79..0000000 --- a/recipes-connectivity/lora/lora-basic-station/setup.gmk +++ /dev/null @@ -1,91 +0,0 @@ -# -*- makefile -*- - -# Top dir of s2core -# - override accordingly in makefile including this setup.gmk - -platform ?= mlinux -variant ?= std - - -ARCH ?= -CROSS_COMPILE ?= -export - -# TOOLPREFIX=${CROSS_COMPILE} - - -BD=build-${platform}-${variant} - -# -- Architecture specific -CFG.arm-linux-gnueabihf = mlinux -# CFG.x86_64-linux-gnu = linux - -# -- Variant specific -# testsim runs libloragw inside master process -# testms uses a master slave model -#CFG.testsim = logini_lvl=DEBUG selftests tlsdebug lgwsim ral_lgw -#CFG.testms = logini_lvl=DEBUG selftests tlsdebug lgwsim ral_master_slave -#CFG.testfs = logini_lvl=DEBUG selftests tlsdebug lgwsim ral_lgw -#CFG.testpin = logini_lvl=INFO tlsdebug ral_lgw testpin -#CFG.std = logini_lvl=INFO tlsdebug ral_lgw -#CFG.stdn = logini_lvl=INFO tlsdebug ral_master_slave -#CFG.debug = logini_lvl=DEBUG selftests tlsdebug ral_lgw -#CFG.debugn = logini_lvl=DEBUG selftests tlsdebug ral_master_slave - -# -- Platform specific -CFG.linux = linux lgw1 no_leds -CFG.rpi = linux lgw1 no_leds -CFG.kerlink = linux lgw1 no_leds -CFG.mlinux = linux lgw1 no_leds ral_lgw prod - -SD.default = src-linux - -SD = $(or ${SD.${platform}}, ${SD.default}) - -UTILS.linux = mtuns - -UTILS = $(or ${UTILS.${platform}}, ${UTILS.default}) - -PERSO.default = -PERSO = $(or ${PERSO.${platform}}, ${PERSO.default}) -PERSOH = $(if ${PERSO},perso.h,) - -# Paths to dependencies -MBEDLIBS = -lmbedtls -lmbedx509 -lmbedcrypto - -# -lm: Needed for lgw which uses pow/ceil -ifneq (minihub,$(platform)) -SYSLIBS = -lm -endif - -CFLAGS.linux.testsim = -g -O0 --coverage -CFLAGS.linux.testms = -g -O0 --coverage -CFLAGS.linux.testfs = -g -O0 --coverage -CFLAGS.linux.testpin = -g -O3 -CFLAGS.linux.std = -g -O3 -CFLAGS.mlinux.std = -g -O3 - -LIBS.mlinux = -lloragw ${MBEDLIBS} -lrt -lm -lpthread -LIBS.linux = -llgw ${MBEDLIBS} -lpthread -LIBS.rpi = -llgw ${MBEDLIBS} -lpthread -LIBS.kerlink = -llgw ${MBEDLIBS} -lrt -lpthread - -xCFG = ${CFG.${ARCH}} ${CFG.${platform}} ${CFG.${variant}} ${CFG.${platform}.${variant}} -xCFLAGS = ${CFLAGS.${ARCH}} ${CFLAGS.${platform}} ${CFLAGS.${variant}} ${CFLAGS.${platform}.${variant}} -xINCS = ${INCS.${ARCH}} ${INCS.${platform}} ${INCS.${variant}} -xLDFLAGS = ${LDFLAGS.${ARCH}} ${LDFLAGS.${platform}} ${LDFLAGS.${variant}} -xLIBS = ${LIBS.${ARCH}} ${LIBS.${platform}} ${LIBS.${variant}} -xFILES = ${FILES.${ARCH}} ${FILES.${platform}} ${FILES.${variant}} -xOCFLAGS = ${OCFLAGS.${ARCH}} ${OCFLAGS.${platform}} ${OCFLAGS.${variant}} - -DEFS = -DCFG_platform_${platform} -DCFG_platform=\"${platform}\" -DCFG_variant_${variant} -DCFG_variant=\"${variant}\" -DEFS += -DCFG_bdate='"$(shell date -u '+%Y-%m-%d %H:%M:%S')"' -DEFS += -DCFG_version='"$(shell if [ -f ${TD}/VERSION.txt ]; then cat ${TD}/VERSION.txt; else git describe --tag; fi)(${platform}/${variant})"' -DEFS += -DCFG_commit='"$(shell if git rev-parse --git-dir >/dev/null 2>&1; then git rev-parse --short HEAD; else echo -; fi)"' -DEFS += ${xCFG:%=-DCFG_%} -INCS = ${VPATH:%=-I%} -I ${TD}/${BD}/include ${xINCS} -CFLAGS += -std=gnu11 ${INCS} ${DEFS} ${xCFLAGS} ${MORECFLAGS} -LDFLAGS += -L ${TD}/${BD}/lib ${xLDFLAGS} -LIBS = ${xLIBS} ${SYSLIBS} -FILES = ${xFILES} -OCFLAGS = ${xOCFLAGS} diff --git a/recipes-connectivity/lora/lora-basic-station/tc.uri b/recipes-connectivity/lora/lora-basic-station/tc.uri deleted file mode 100644 index 62ad13e..0000000 --- a/recipes-connectivity/lora/lora-basic-station/tc.uri +++ /dev/null @@ -1 +0,0 @@ -wss://127.0.0.1:9002 diff --git a/recipes-connectivity/lora/lora-basic-station_2.0.3.bb b/recipes-connectivity/lora/lora-basic-station_2.0.3.bb deleted file mode 100644 index 2db6a14..0000000 --- a/recipes-connectivity/lora/lora-basic-station_2.0.3.bb +++ /dev/null @@ -1,58 +0,0 @@ -DESCRIPTION = "LoRa Basic Station" -HOMEPAGE = "https://github.com/lorabasics/basicstation" -PRIORITY = "optional" -SECTION = "console/utils" -# Semtech license is a modified BSD-style license -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7706b51ea6d730e45568141c660072d5" -DEPENDS = "lora-gateway logrotate lora-logging mbedtls" -RDEPENDS_${PN} += "bash" -PR = "r1" - -SRCREV = "v${PV}" - -SRC_URI = "git://github.com/lorabasics/basicstation.git;protocol=git \ - file://setup.gmk \ - file://lora-basic-station.init \ - file://lora-basic-station.default \ - file://tc.uri \ - file://lora-basic-station-disable-device-mode.patch \ - file://lora-basic-station-sys-linux-log-fix.patch \ - file://lora-basic-station-fix-clksrc-0.patch \ -" - - -S = "${WORKDIR}/git" -B = "${S}" - -LORA_DIR = "/opt/lora" - -export LGW_PATH = "${STAGING_LIBDIR}/lora" -export LGW_INC = "${STAGING_INCDIR}/lora" - -CFLAGS += "-I${STAGING_INCDIR} -I${STAGING_INCDIR}/lora -I${WORKDIR}/git/deps -Iinc -I. -std=gnu11 -L${STAGING_LIBDIR}/lora" - -do_compile() { - rm -fr ${S}/deps/lgw - ln -s ${STAGING_INCDIR}/lora ${S}/deps/lgw - cp ${WORKDIR}/setup.gmk ${S}/setup.gmk - oe_runmake -} - -do_install() { - install -d ${D}${LORA_DIR} - install -m 755 ${S}/build-mlinux-std/bin/station ${D}${LORA_DIR}/ - install -m 755 ${WORKDIR}/tc.uri ${D}${LORA_DIR}/ - - install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/lora-basic-station.default ${D}${sysconfdir}/default/lora-basic-station - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/lora-basic-station.init ${D}${sysconfdir}/init.d/lora-basic-station -} - -FILES_${PN} += "${LORA_DIR}" - -# disable this on purpose for dev purposes -do_rm_work() { - echo "skipping" -} diff --git a/recipes-connectivity/lora/lora-gateway-geolocation/config.json b/recipes-connectivity/lora/lora-gateway-geolocation/config.json deleted file mode 100644 index 0413918..0000000 --- a/recipes-connectivity/lora/lora-gateway-geolocation/config.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "SX1301_array_conf":[ - { - "board_type": "MASTER", - "board_rx_freq": 866500000, /* ad9361 RX center frequency in Hz */ - "board_rx_bw": 7000000, /* ad9361 RX bandwidth in Hz */ - 'full_duplex": false, - "rf_chain_conf":[ - { - "rx_enable": true, - "tx_enable": false, - "rssi_offset": -202.5, - "rssi_offset_coeff_a": 20, - "rssi_offset_coeff_b": 2925 - },{ - "rx_enable": true, - "tx_enable": false, - "rssi_offset": -202.5, - "rssi_offset_coeff_a": 20, - "rssi_offset_coeff_b": 2925 - }], - "SX1301_conf":[ - { - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 1, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - }], - "FSK_sync": "C194C1", - "loramac_public": true, - "dsp_stat_interval": 10, - "nb_dsp": 1, - "aes_key": "ABCDEF0123456789ABCDEF0123456789", - "calibration_temperature_celsius_room": 22, - "calibration_temperature_code_ad9361": 77 - }], - "gateway_conf": { - "gateway_ID": "00AEAEFFFE000000", - "log_rotate_period": 600 - } -} diff --git a/recipes-connectivity/lora/lora-gateway-geolocation/config_64ch.json b/recipes-connectivity/lora/lora-gateway-geolocation/config_64ch.json deleted file mode 100644 index 570b62f..0000000 --- a/recipes-connectivity/lora/lora-gateway-geolocation/config_64ch.json +++ /dev/null @@ -1,153 +0,0 @@ -{ - "SX1301_array_conf":[ - { - "board_type": "MASTER", - "board_rx_freq": 866500000, /* radio RX central frequency in Hz */ - "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */ - "full_duplex": false, /* radio mode */ - "rf_chain_conf":[ - { - "rx_enable": true, - "tx_enable": false, - "rssi_offset": -202.5, - "rssi_offset_coeff_a": 20, - "rssi_offset_coeff_b": 2925 - }], - "SX1301_conf":[ - { - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - }], - "FSK_sync": "C194C1", - "loramac_public": true, - "nb_dsp": 1, - "dsp_stat_interval": 10, - "aes_key": "ABCDEF0123456789ABCDEF0123456789", - "calibration_temperature_celsius_room": 22, - "calibration_temperature_code_ad9361": 77 - }, - { - "board_type": "SLAVE", - "board_rx_freq": 866500000, /* radio RX central frequency in Hz */ - "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */ - "SX1301_conf":[ - { - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - }], - "FSK_sync": "C194C1", - "loramac_public": true, - "nb_dsp": 3, - "dsp_stat_interval": 10 - }], - "gateway_conf": { - "gateway_ID": "00AEAEFFFE000000", - "log_rotate_period": 600 - } -} diff --git a/recipes-connectivity/lora/lora-gateway-geolocation_5.1.0.bb b/recipes-connectivity/lora/lora-gateway-geolocation_5.1.0.bb deleted file mode 100644 index 511a8b3..0000000 --- a/recipes-connectivity/lora/lora-gateway-geolocation_5.1.0.bb +++ /dev/null @@ -1,58 +0,0 @@ -DESCRIPTION = "LoRa Gateway Geolocation library" -PRIORITY = "optional" -SECTION = "console/utils" -# Semtech license is a modified BSD-style license -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://mlinux4/LICENSE.TXT;md5=86776875df1423114abfcec938f3e565" -DEPENDS = "" -# Source revision -PSR = "r4" -# Recipe revision -PR = "r6" -SRCREV = "v${PV}" - -SRC_URI = "http://multitech.net/downloads/lora-packet-forwarder-geolocation_arm926ejste_${PV}-${PSR}.tar.gz \ - file://config.json \ - file://config_64ch.json \ - " - -SRC_URI[md5sum] = "542f02198a3258ca2ad4e549524e3ddc" -SRC_URI[sha256sum] = "8176f5f55f96b7a72946cfb51743a8ea4f88a4033e54009e7bcf8f03077d248e" - -S = "${WORKDIR}" - -CFLAGS += "-Iinc -I." - -do_compile() { -} - -do_install() { -} - -do_install_append_mtcdt() { - install -d ${D}${includedir}/lora - install -d ${D}${libdir}/lora - install -m 0644 mlinux4/libsx1301ar/* ${D}${includedir}/lora - - install -d ${D}/sbin - # Set UID to be able to read FPGA revision as non-root. - install -m 04755 mlinux4/gateway-utils-geo/fpga_flash_loader ${D}/sbin/sem-fpga-loader - - install -d ${D}/opt/lora/ - install -d ${D}/opt/lora/gateway-utils-geo - install -m 0755 mlinux4/gateway-utils-geo/* ${D}/opt/lora/gateway-utils-geo/ - install -m 0755 ${WORKDIR}/config.json ${D}/opt/lora/gateway-utils-geo/ - install -m 0755 ${WORKDIR}/config_64ch.json ${D}/opt/lora/gateway-utils-geo/ -} - -PACKAGES += "${PN}-utils ${PN}-utils-dbg" - -FILES_${PN} = "${libdir}/lora/lora-gw-geolocation-readme.md ${includedir}/lora /usr/lib/" -FILES_${PN}-utils = "/opt/lora/gateway-utils-geo/* /sbin/sem-fpga-loader" -FILES_${PN}-utils-dbg = "/opt/lora/gateway-utils-geo/.debug " -FILES_${PN}-staticdev = "${libdir}/lora/libsx1301ar.a" - -# disable this on purpose for dev purposes -do_rm_work() { - echo "skipping" -} diff --git a/recipes-connectivity/lora/lora-gateway-usb/library.cfg b/recipes-connectivity/lora/lora-gateway-usb/library.cfg deleted file mode 100644 index 3d5d95a..0000000 --- a/recipes-connectivity/lora/lora-gateway-usb/library.cfg +++ /dev/null @@ -1,70 +0,0 @@ -# That file will be included in the Makefile files that have hardware dependencies - -### SPI interface to the concentrator ### -# Accepted values: -# native Linux native SPI driver (/dev/spidev32766.0) -# ftdi FTDI SPI-over-USB bridge using libmpsse/libftdi/libusb - -CFG_SPI= ftdi -CFG_SPI_DEV = "/dev/spidev32766.2" - -### Concentrator chip ### -# Accepted values: -# sx1301 Semtech SX1301 production chip -# fpga1301 FPGA containing the SX1301 IP - -CFG_CHIP= sx1301 - -### Radio chip(s) ### -# Accepted values: -# sx1257 Dual SX1257 transceivers, covering 860-1000 MHz -# sx1255 Dual SX1255 transceivers, covering 400-510 MHz - -CFG_RADIO= sx1257 - -### RF band configuration ### -# Used to configured frequency restrictions (eg. if a SAW filter is installed) -# Accepted values: -# full Full range supported by the radio(s) -# eu868 ETSI 868 (866) MHz band -# us915 FCC 915 MHz band -# cn470 China 470 MHz band -# eu433 ETSI 433 MHz band -# cn780 China 780 MHz band - -CFG_BAND= full - -### Board misc parameters & calibration ### -# Used to configure misc board options. -# RX RSSI indication and TX power are highly dependant on radio, band, filter -# and RF front-ends, and must be calibrated for each new board design. -# Available calibration parameters: -# dev_nano_868 FPGA-based nano-concentrator, with 868 MHz SAW filter -# ref_1301_868 SX1301 reference board with SX1257 radios, 868 MHz filters -# ref_1301_433 SX1301 reference board with SX1255 radios, 433 MHz filters -# kerlink_868 Kerlink LoRa 868MHz gateway -# kerlink_433 Kerlink LoRa 433MHz gateway -# cisco_433 Cisco LoRa 433MHz gateway -# cisco_470 Cisco LoRa 470MHz gateway -# cisco_780 Cisco LoRa 780MHz gateway -# Keep empty for no calibration parameters (neutral values will be used). - -# MTAC-LORA 900MHz -CFG_BRD= mtaclora - -### Network Type ### -# Accepted values: -# private Default -# lora_mac Only compliant with devices running LoRa MAC - -CFG_NET= private - -### Debug options ### -# Set the DEBUG_* to 1 to activate debug mode in individual modules. -# Warning: that makes the module *very verbose*, do not use for production - -DEBUG_AUX= 0 -DEBUG_SPI= 0 -DEBUG_REG= 0 -DEBUG_HAL= 0 -DEBUG_GPS= 0 diff --git a/recipes-connectivity/lora/lora-gateway-usb/lora-gateway-debug.patch b/recipes-connectivity/lora/lora-gateway-usb/lora-gateway-debug.patch deleted file mode 100644 index dba4392..0000000 --- a/recipes-connectivity/lora/lora-gateway-usb/lora-gateway-debug.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: git/libloragw/src/loragw_hal.c -=================================================================== ---- git.orig/libloragw/src/loragw_hal.c 2014-12-16 16:07:20.812506157 -0600 -+++ git/libloragw/src/loragw_hal.c 2014-12-16 16:18:34.427454833 -0600 -@@ -1626,6 +1626,8 @@ - break; - } - } -+ -+ DEBUG_PRINTF("DEBUG: Tx pow_index %d, rf_power %d\n", pow_index, tx_pow_table[pow_index].rf_power); - - /* loading TX imbalance correction */ - target_mix_gain = tx_pow_table[pow_index].mix_gain; diff --git a/recipes-connectivity/lora/lora-gateway-usb/lora-gateway-sync-word.patch b/recipes-connectivity/lora/lora-gateway-usb/lora-gateway-sync-word.patch deleted file mode 100644 index e51e02a..0000000 --- a/recipes-connectivity/lora/lora-gateway-usb/lora-gateway-sync-word.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/libloragw/inc/loragw_hal.h b/libloragw/inc/loragw_hal.h -index 1516b65..24c5969 100644 ---- a/libloragw/inc/loragw_hal.h -+++ b/libloragw/inc/loragw_hal.h -@@ -302,6 +312,11 @@ struct lgw_pkt_tx_s { - - /* -------------------------------------------------------------------------- */ - /* --- PUBLIC FUNCTIONS PROTOTYPES ------------------------------------------ */ -+/** -+ * @brief Configure the lora synch word -+ * @param word for synch -+ */ -+void lgw_conf_lora_synch_word(uint8_t word); - - /** - @brief Configure an RF chain (must configure before start) -diff --git a/libloragw/src/loragw_hal.c b/libloragw/src/loragw_hal.c -index 5dbdf45..d0fe288 100644 ---- a/libloragw/src/loragw_hal.c -+++ b/libloragw/src/loragw_hal.c -@@ -827,6 +851,19 @@ void lgw_constant_adjust(void) { - /* -------------------------------------------------------------------------- */ - /* --- PUBLIC FUNCTIONS DEFINITION ------------------------------------------ */ - -+void lgw_conf_lora_synch_word(uint8_t word) { -+ uint8_t peak1 = word >> 4; -+ uint8_t peak2 = word & 0x0F; -+ -+ lgw_reg_w(LGW_FRAME_SYNCH_PEAK1_POS, peak1); /* default 1 */ -+ lgw_reg_w(LGW_FRAME_SYNCH_PEAK2_POS, peak2); /* default 2 */ -+ lgw_reg_w(LGW_MBWSSF_FRAME_SYNCH_PEAK1_POS, peak1); /* default 1 */ -+ lgw_reg_w(LGW_MBWSSF_FRAME_SYNCH_PEAK2_POS, peak2); /* default 2 */ -+ lgw_reg_w(LGW_TX_FRAME_SYNCH_PEAK1_POS, peak1); /* default 1 */ -+ lgw_reg_w(LGW_TX_FRAME_SYNCH_PEAK2_POS, peak2); /* default 2 */ -+} -+ -+ - int lgw_rxrf_setconf(uint8_t rf_chain, struct lgw_conf_rxrf_s conf) { - - /* check if the concentrator is running */ diff --git a/recipes-connectivity/lora/lora-gateway-usb_1.7.0mts.bb b/recipes-connectivity/lora/lora-gateway-usb_1.7.0mts.bb deleted file mode 100644 index e7e5fed..0000000 --- a/recipes-connectivity/lora/lora-gateway-usb_1.7.0mts.bb +++ /dev/null @@ -1,59 +0,0 @@ -DESCRIPTION = "LoRa Gateway library" -HOMEPAGE = "https://www.semtech.com/" -PRIORITY = "optional" -SECTION = "console/utils" -# Semtech license is a modified BSD-style license -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a2bdef95625509f821ba00460e3ae0eb" -DEPENDS = "libftdi libmpsse libusb1" -INC_PR = "r9" -PR = "${INC_PR}.1" -BRANCH = "1.7.0-mts" -SRCREV = "631dfedf1b535b6c3861d3c3868e02f48a84fb06" - -SRC_URI = "git://git.multitech.net/lora_gateway;protocol=git;branch=${BRANCH} \ - file://lora-gateway-debug.patch \ - file://lora-gateway-sync-word.patch \ - file://library.cfg \ - " - -S = "${WORKDIR}/git" - -CFLAGS += "-Iinc -I. -DLIBFTDI1=1" - -do_configure_append() { - # copy over custom library.cfg - cp ${WORKDIR}/library.cfg ${S}/libloragw/ -} - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}${includedir}/lora-usb - install -d ${D}${libdir}/lora-usb - install -m 0644 libloragw/libloragw.a ${D}${libdir}/lora-usb - install -m 0644 libloragw/library.cfg ${D}${libdir}/lora-usb - install -m 0644 libloragw/inc/* ${D}${includedir}/lora-usb - - install -d ${D}/opt/lora - install -d ${D}/opt/lora/gateway-utils-usb - install -m 0755 util_pkt_logger/util_pkt_logger ${D}/opt/lora/gateway-utils-usb/util_pkt_logger-usb - install -m 0755 util_band_survey/util_band_survey ${D}/opt/lora/gateway-utils-usb/util_band_survey-usb - install -m 0755 util_spi_stress/util_spi_stress ${D}/opt/lora/gateway-utils-usb/util_spi_stress-usb - install -m 0755 util_tx_test/util_tx_test ${D}/opt/lora/gateway-utils-usb/util_tx_test-usb -} - -PACKAGES += "${PN}-utils ${PN}-utils-dbg" - -FILES_${PN}-utils = "/opt/lora/gateway-utils-usb/*" -FILES_${PN}-utils-dbg = "/opt/lora/.debug" -FILES_${PN}-dev = "${includedir}/lora-usb ${libdir}/lora-usb/library.cfg" -FILES_${PN}-staticdev = "${libdir}/lora-usb/libloragw.a" - -# disable this on purpose for dev purposes -do_rm_work() { - echo "skipping" -} - diff --git a/recipes-connectivity/lora/lora-gateway/library_4.0.cfg b/recipes-connectivity/lora/lora-gateway/library_4.0.cfg deleted file mode 100644 index 4126bf3..0000000 --- a/recipes-connectivity/lora/lora-gateway/library_4.0.cfg +++ /dev/null @@ -1,13 +0,0 @@ -# That file will be included in the Makefile files that have hardware dependencies - -### Debug options ### -# Set the DEBUG_* to 1 to activate debug mode in individual modules. -# Warning: that makes the module *very verbose*, do not use for production - -DEBUG_AUX= 0 -DEBUG_SPI= 0 -DEBUG_REG= 0 -DEBUG_HAL= 0 -DEBUG_LBT= 0 -DEBUG_GPS= 0 - diff --git a/recipes-connectivity/lora/lora-gateway/ln-lora-spi-dev.sh b/recipes-connectivity/lora/lora-gateway/ln-lora-spi-dev.sh deleted file mode 100644 index c350fff..0000000 --- a/recipes-connectivity/lora/lora-gateway/ln-lora-spi-dev.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -port1=/sys/devices/platform/mts-io/ap1 -port2=/sys/devices/platform/mts-io/ap2 - -lora_hw=$(mts-io-sysfs show lora/hw-version 2> /dev/null) - -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 diff --git a/recipes-connectivity/lora/lora-gateway/lora-gateway-add-fpga-version-28-31-33.patch b/recipes-connectivity/lora/lora-gateway/lora-gateway-add-fpga-version-28-31-33.patch deleted file mode 100644 index 7e73263..0000000 --- a/recipes-connectivity/lora/lora-gateway/lora-gateway-add-fpga-version-28-31-33.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/libloragw/src/loragw_reg.c b/libloragw/src/loragw_reg.c -index 7e396bc..478f46a 100644 ---- a/libloragw/src/loragw_reg.c -+++ b/libloragw/src/loragw_reg.c -@@ -48,7 +48,7 @@ Maintainer: Sylvain Miermont - #define PAGE_ADDR 0x00 - #define PAGE_MASK 0x03 - --const uint8_t FPGA_VERSION[] = { 31, 33 }; /* several versions could be supported */ -+const uint8_t FPGA_VERSION[] = { 28, 31, 33 }; /* several versions could be supported */ - - /* - auto generated register mapping for C code : 11-Jul-2013 13:20:40 -@@ -415,6 +415,16 @@ bool check_fpga_version(uint8_t version) { - return false; - } - -+uint8_t read_fpga_version() { -+ uint8_t u = 0; -+ uint8_t spi_stat = lgw_spi_r(lgw_spi_target, LGW_SPI_MUX_MODE1, LGW_SPI_MUX_TARGET_FPGA, loregs[LGW_VERSION].addr, &u); -+ if (spi_stat != LGW_SPI_SUCCESS) { -+ DEBUG_MSG("ERROR READING VERSION REGISTER\n"); -+ return LGW_REG_ERROR; -+ } -+ return u; -+} -+ - /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - - int reg_w_align32(void *spi_target, uint8_t spi_mux_mode, uint8_t spi_mux_target, struct lgw_reg_s r, int32_t reg_value) { diff --git a/recipes-connectivity/lora/lora-gateway/lora-gateway-add-fpga-version-28.patch b/recipes-connectivity/lora/lora-gateway/lora-gateway-add-fpga-version-28.patch deleted file mode 100644 index c5f47dd..0000000 --- a/recipes-connectivity/lora/lora-gateway/lora-gateway-add-fpga-version-28.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libloragw/src/loragw_reg.c b/libloragw/src/loragw_reg.c -index 7fe0f67..dc90d93 100644 ---- a/libloragw/src/loragw_reg.c -+++ b/libloragw/src/loragw_reg.c -@@ -48,7 +48,7 @@ Maintainer: Sylvain Miermont - #define PAGE_ADDR 0x00 - #define PAGE_MASK 0x03 - --const uint8_t FPGA_VERSION[] = { 27 }; /* several versions could be supported */ -+const uint8_t FPGA_VERSION[] = { 27, 28 }; /* several versions could be supported */ - - /* - auto generated register mapping for C code : 11-Jul-2013 13:20:40 diff --git a/recipes-connectivity/lora/lora-gateway/lora-gateway-add-spi-path-function.patch b/recipes-connectivity/lora/lora-gateway/lora-gateway-add-spi-path-function.patch deleted file mode 100644 index fa5e68c..0000000 --- a/recipes-connectivity/lora/lora-gateway/lora-gateway-add-spi-path-function.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/libloragw/inc/loragw_spi.h b/libloragw/inc/loragw_spi.h -index fef1f48..74ef251 100644 ---- a/libloragw/inc/loragw_spi.h -+++ b/libloragw/inc/loragw_spi.h -@@ -46,6 +46,14 @@ Maintainer: Sylvain Miermont - /* -------------------------------------------------------------------------- */ - /* --- PUBLIC FUNCTIONS PROTOTYPES ------------------------------------------ */ - -+/* set SPI device */ -+/** -+@brief LoRa concentrator SPI path configuration for spidev -+@param path pointer to spidev device -+@return LGW_SPI_SUCCESS if path is valid, LGW_SPI_ERROR if not -+*/ -+int lgw_spi_set_path(const char *path); -+ - /** - @brief LoRa concentrator SPI setup (configure I/O and peripherals) - @param spi_target_ptr pointer on a generic pointer to SPI target (implementation dependant) -diff --git a/libloragw/src/loragw_spi.native.c b/libloragw/src/loragw_spi.native.c -index c01ed1c..3472133 100644 ---- a/libloragw/src/loragw_spi.native.c -+++ b/libloragw/src/loragw_spi.native.c -@@ -56,10 +56,24 @@ Maintainer: Sylvain Miermont - #define SPI_SPEED 8000000 - #define SPI_DEV_PATH "/dev/spidev0.0" - //#define SPI_DEV_PATH "/dev/spidev32766.0" -+char* spi_dev_path = SPI_DEV_PATH; - - /* -------------------------------------------------------------------------- */ - /* --- PUBLIC FUNCTIONS DEFINITION ------------------------------------------ */ - -+/* set SPI device */ -+int lgw_spi_set_path(const char *path) { -+ if (path) { -+ spi_dev_path = path; -+ return LGW_SPI_SUCCESS; -+ } -+ else { -+ return LGW_SPI_ERROR; -+ } -+} -+ -+ -+ - /* SPI initialization and configuration */ - int lgw_spi_open(void **spi_target_ptr) { - int *spi_device = NULL; -@@ -78,7 +92,7 @@ int lgw_spi_open(void **spi_target_ptr) { - } - - /* open SPI device */ -- dev = open(SPI_DEV_PATH, O_RDWR); -+ dev = open(spi_dev_path, O_RDWR); - if (dev < 0) { - DEBUG_PRINTF("ERROR: failed to open SPI device %s\n", SPI_DEV_PATH); - return LGW_SPI_ERROR; diff --git a/recipes-connectivity/lora/lora-gateway/lora-gateway-change-util-tx-continuous-clksrc.patch b/recipes-connectivity/lora/lora-gateway/lora-gateway-change-util-tx-continuous-clksrc.patch deleted file mode 100644 index bdc05ad..0000000 --- a/recipes-connectivity/lora/lora-gateway/lora-gateway-change-util-tx-continuous-clksrc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/util_tx_continuous/src/util_tx_continuous.c b/util_tx_continuous/src/util_tx_continuous.c -index 31f45ac..f9cf033 100644 ---- a/util_tx_continuous/src/util_tx_continuous.c -+++ b/util_tx_continuous/src/util_tx_continuous.c -@@ -297,7 +297,7 @@ int main(int argc, char **argv) - /* Board config */ - memset(&boardconf, 0, sizeof(boardconf)); - boardconf.lorawan_public = true; -- boardconf.clksrc = 1; /* Radio B is source by default */ -+ boardconf.clksrc = 0; /* Radio B is source by default */ - lgw_board_setconf(boardconf); - - /* RF config */ diff --git a/recipes-connectivity/lora/lora-gateway/lora-gateway-gpsd.patch b/recipes-connectivity/lora/lora-gateway/lora-gateway-gpsd.patch deleted file mode 100644 index 08d566c..0000000 --- a/recipes-connectivity/lora/lora-gateway/lora-gateway-gpsd.patch +++ /dev/null @@ -1,636 +0,0 @@ -diff --git a/libloragw/Makefile b/libloragw/Makefile -index 53c33d9..4575bdc 100644 ---- a/libloragw/Makefile -+++ b/libloragw/Makefile -@@ -10,14 +10,14 @@ CROSS_COMPILE ?= - CC := $(CROSS_COMPILE)gcc - AR := $(CROSS_COMPILE)ar - --CFLAGS := -O2 -Wall -Wextra -std=c99 -Iinc -I. -+CFLAGS := -O2 -Wall -Wextra -std=c99 -Iinc -I. -isystem =/usr/include/gps - - OBJDIR = obj - INCLUDES = $(wildcard inc/*.h) - - ### linking options - --LIBS := -lloragw -lrt -lm -+LIBS := -lloragw -lrt -lm -lgps - - ### general build targets - -diff --git a/libloragw/inc/loragw_gps.h b/libloragw/inc/loragw_gps.h -index 6dbd30b..59b2d37 100644 ---- a/libloragw/inc/loragw_gps.h -+++ b/libloragw/inc/loragw_gps.h -@@ -27,9 +27,11 @@ Maintainer: Michael Coracin - #include <time.h> /* time library */ - #include <termios.h> /* speed_t */ - #include <unistd.h> /* ssize_t */ -+#include <gpsd.h> -+#include <gpsdclient.h> -+#include <errno.h> /* error messages */ - - #include "config.h" /* library configuration options (dynamically generated) */ -- - /* -------------------------------------------------------------------------- */ - /* --- PUBLIC TYPES --------------------------------------------------------- */ - -@@ -83,6 +85,7 @@ enum gps_msg { - UBX_NAV_TIMEUTC /*!> UTC Time Solution */ - }; - -+// struct gps_data_t gpsdata; - /* -------------------------------------------------------------------------- */ - /* --- PUBLIC CONSTANTS ----------------------------------------------------- */ - -@@ -99,21 +102,19 @@ enum gps_msg { - /** - @brief Configure a GPS module - --@param tty_path path to the TTY connected to the GPS --@param gps_familly parameter (eg. ubx6 for uBlox gen.6) --@param target_brate target baudrate for communication (0 keeps default target baudrate) --@param fd_ptr pointer to a variable to receive file descriptor on GPS tty --@return success if the function was able to connect and configure a GPS module -+@param gpsdata handler for gpsd data -+@param source source for setup of gpsd -+@return success if the function was able to connect and configure a GPSD stream - */ --int lgw_gps_enable(char* tty_path, char* gps_familly, speed_t target_brate, int* fd_ptr); -+int lgw_gps_enable(struct gps_data_t *gpsdata, struct fixsource_t *source); - - /** - @brief Restore GPS serial configuration and close serial device - --@param fd file descriptor on GPS tty -+@param gpsdata handler for gpsd data - @return success if the function was able to complete - */ --int lgw_gps_disable(int fd); -+int lgw_gps_disable(struct gps_data_t *gpsdata); - - /** - @brief Parse messages coming from the GPS system (or other GNSS) -diff --git a/libloragw/src/loragw_gps.c b/libloragw/src/loragw_gps.c -index c0e0ded..f4774be 100644 ---- a/libloragw/src/loragw_gps.c -+++ b/libloragw/src/loragw_gps.c -@@ -84,6 +84,7 @@ static double gps_mlo = 0.0; /* minutes of longitude */ - static char gps_olo = 0; /* orientation (E-W) of longitude */ - static short gps_alt = 0; /* altitude */ - static bool gps_pos_ok = false; -+static bool gps_lock_ok = false; - - static char gps_mod = 'N'; /* GPS mode (N no fix, A autonomous, D differential) */ - static short gps_sat = 0; /* number of satellites used for fix */ -@@ -251,109 +252,22 @@ int str_chop(char *s, int buff_size, char separator, int *idx_ary, int max_idx) - /* -------------------------------------------------------------------------- */ - /* --- PUBLIC FUNCTIONS DEFINITION ------------------------------------------ */ - --int lgw_gps_enable(char *tty_path, char *gps_family, speed_t target_brate, int *fd_ptr) { -- int i; -- struct termios ttyopt; /* serial port options */ -- int gps_tty_dev; /* file descriptor to the serial port of the GNSS module */ -- uint8_t ubx_cmd_timegps[UBX_MSG_NAVTIMEGPS_LEN] = { -- 0xB5, 0x62, /* UBX Sync Chars */ -- 0x06, 0x01, /* CFG-MSG Class/ID */ -- 0x08, 0x00, /* Payload length */ -- 0x01, 0x20, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, /* Enable NAV-TIMEGPS output on serial */ -- 0x32, 0x94 }; /* Checksum */ -- ssize_t num_written; -+int lgw_gps_enable(struct gps_data_t *gpsdata, struct fixsource_t *source) { - -- /* check input parameters */ -- CHECK_NULL(tty_path); -- CHECK_NULL(fd_ptr); -+ unsigned int flags; -+ fd_set fds; -+ flags = WATCH_ENABLE; -+ flags |= WATCH_RAW; -+ flags |= WATCH_NMEA; -+ gpsd_source_spec(NULL, source); - -- /* open TTY device */ -- gps_tty_dev = open(tty_path, O_RDWR | O_NOCTTY); -- if (gps_tty_dev <= 0) { -- DEBUG_MSG("ERROR: TTY PORT FAIL TO OPEN, CHECK PATH AND ACCESS RIGHTS\n"); -+ if (gps_open(source->server, source->port, gpsdata) != 0) { -+ DEBUG_MSG("gpspipe: could not connect to gpsd %s:%s, %s(%d)\n", -+ source->server, source->port, gps_errstr(errno), errno); - return LGW_GPS_ERROR; - } -- *fd_ptr = gps_tty_dev; -- -- /* manage the different GPS modules families */ -- if (gps_family == NULL) { -- DEBUG_MSG("WARNING: this version of GPS module may not be supported\n"); -- } else if (strncmp(gps_family, "ubx7", 4) != 0) { -- /* The current implementation relies on proprietary messages from U-Blox */ -- /* GPS modules (UBX, NAV-TIMEGPS...) and has only be tested with a u-blox 7. */ -- /* Those messages allow to get NATIVE GPS time (no leap seconds) required */ -- /* for class-B handling and GPS synchronization */ -- /* see lgw_parse_ubx() function for details */ -- DEBUG_MSG("WARNING: this version of GPS module may not be supported\n"); -- } - -- /* manage the target bitrate */ -- if (target_brate != 0) { -- DEBUG_MSG("WARNING: target_brate parameter ignored for now\n"); // TODO -- } -- -- /* get actual serial port configuration */ -- i = tcgetattr(gps_tty_dev, &ttyopt); -- if (i != 0) { -- DEBUG_MSG("ERROR: IMPOSSIBLE TO GET TTY PORT CONFIGURATION\n"); -- return LGW_GPS_ERROR; -- } -- -- /* Save current serial port configuration for restoring later */ -- memcpy(&ttyopt_restore, &ttyopt, sizeof ttyopt); -- -- /* update baudrates */ -- cfsetispeed(&ttyopt, DEFAULT_BAUDRATE); -- cfsetospeed(&ttyopt, DEFAULT_BAUDRATE); -- -- /* update terminal parameters */ -- /* The following configuration should allow to: -- - Get ASCII NMEA messages -- - Get UBX binary messages -- - Send UBX binary commands -- Note: as binary data have to be read/written, we need to disable -- various character processing to avoid loosing data */ -- /* Control Modes */ -- ttyopt.c_cflag |= CLOCAL; /* local connection, no modem control */ -- ttyopt.c_cflag |= CREAD; /* enable receiving characters */ -- ttyopt.c_cflag |= CS8; /* 8 bit frames */ -- ttyopt.c_cflag &= ~PARENB; /* no parity */ -- ttyopt.c_cflag &= ~CSTOPB; /* one stop bit */ -- /* Input Modes */ -- ttyopt.c_iflag |= IGNPAR; /* ignore bytes with parity errors */ -- ttyopt.c_iflag &= ~ICRNL; /* do not map CR to NL on input*/ -- ttyopt.c_iflag &= ~IGNCR; /* do not ignore carriage return on input */ -- ttyopt.c_iflag &= ~IXON; /* disable Start/Stop output control */ -- ttyopt.c_iflag &= ~IXOFF; /* do not send Start/Stop characters */ -- /* Output Modes */ -- ttyopt.c_oflag = 0; /* disable everything on output as we only write binary */ -- /* Local Modes */ -- ttyopt.c_lflag &= ~ICANON; /* disable canonical input - cannot use with binary input */ -- ttyopt.c_lflag &= ~ISIG; /* disable check for INTR, QUIT, SUSP special characters */ -- ttyopt.c_lflag &= ~IEXTEN; /* disable any special control character */ -- ttyopt.c_lflag &= ~ECHO; /* do not echo back every character typed */ -- ttyopt.c_lflag &= ~ECHOE; /* does not erase the last character in current line */ -- ttyopt.c_lflag &= ~ECHOK; /* do not echo NL after KILL character */ -- -- /* settings for non-canonical mode -- read will block for until the lesser of VMIN or requested chars have been received */ -- ttyopt.c_cc[VMIN] = LGW_GPS_MIN_MSG_SIZE; -- ttyopt.c_cc[VTIME] = 0; -- -- /* set new serial ports parameters */ -- i = tcsetattr(gps_tty_dev, TCSANOW, &ttyopt); -- if (i != 0){ -- DEBUG_MSG("ERROR: IMPOSSIBLE TO UPDATE TTY PORT CONFIGURATION\n"); -- return LGW_GPS_ERROR; -- } -- tcflush(gps_tty_dev, TCIOFLUSH); -- -- /* Send UBX CFG NAV-TIMEGPS message to tell GPS module to output native GPS time */ -- /* This is a binary message, serial port has to be properly configured to handle this */ -- num_written = write (gps_tty_dev, ubx_cmd_timegps, UBX_MSG_NAVTIMEGPS_LEN); -- if (num_written != UBX_MSG_NAVTIMEGPS_LEN) { -- DEBUG_MSG("ERROR: Failed to write on serial port (written=%d)\n", (int) num_written); -- } -+ (void)gps_stream(gpsdata, flags, source->device); - - /* get timezone info */ - tzset(); -@@ -368,20 +282,13 @@ int lgw_gps_enable(char *tty_path, char *gps_family, speed_t target_brate, int * - - /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - --int lgw_gps_disable(int fd) { -+int lgw_gps_disable(struct gps_data_t *gpsdata) { - int i; - -- /* restore serial ports parameters */ -- i = tcsetattr(fd, TCSANOW, &ttyopt_restore); -- if (i != 0){ -- DEBUG_MSG("ERROR: IMPOSSIBLE TO RESTORE TTY PORT CONFIGURATION\n"); -- return LGW_GPS_ERROR; -- } -- tcflush(fd, TCIOFLUSH); -- -- i = close(fd); -- if (i <= 0) { -- DEBUG_MSG("ERROR: TTY PORT FAIL TO CLOSE\n"); -+ /* ends the session */ -+ i = gps_close(gpsdata); -+ if (i != 0) { -+ DEBUG_MSG("ERROR: GPSD FAILED TO CLOSE\n"); - return LGW_GPS_ERROR; - } - -@@ -457,7 +364,8 @@ enum gps_msg lgw_parse_ubx(const char *serial_buff, size_t buff_size, size_t *ms - gps_week = (uint8_t)serial_buff[14]; - gps_week |= (uint8_t)serial_buff[15] << 8; /* GPS week number */ - -- gps_time_ok = true; -+ -+ - #if 0 - /* For debug */ - { -@@ -472,11 +380,24 @@ enum gps_msg lgw_parse_ubx(const char *serial_buff, size_t buff_size, size_t *ms - printf(" GPS time = %02d:%02d:%02d\n", ubx_gps_hou, ubx_gps_min, ubx_gps_sec); - } - #endif -- } else { /* valid */ -+ if (gps_lock_ok) -+ gps_time_ok = true; -+ -+ return UBX_NAV_TIMEGPS; -+ } else { - gps_time_ok = false; -+ return INVALID; -+ } -+ } else if ((serial_buff[2] == 0x01) && (serial_buff[3] == 0x04)) { -+ if (serial_buff[10] == 0x0F && serial_buff[11] == 0x27 -+ && serial_buff[10] == 0x0F && serial_buff[11] == 0x27 -+ && serial_buff[10] == 0x0F && serial_buff[11] == 0x27 -+ && serial_buff[10] == 0x0F && serial_buff[11] == 0x27) { -+ gps_time_ok = false; -+ gps_lock_ok = false; - } - -- return UBX_NAV_TIMEGPS; -+ return UBX_NAV_TIMEUTC; - } else if ((serial_buff[2] == 0x05) && (serial_buff[3] == 0x00)) { - DEBUG_MSG("NOTE: UBX ACK-NAK received\n"); - return IGNORED; -@@ -526,7 +447,7 @@ enum gps_msg lgw_parse_nmea(const char *serial_buff, int buff_size) { - } else if (!validate_nmea_checksum(serial_buff, buff_size)) { - DEBUG_MSG("Warning: invalid NMEA sentence (bad checksum)\n"); - return INVALID; -- } else if (match_label(serial_buff, "$G?RMC", 6, '?')) { -+ } else if (match_label(serial_buff, "G?RMC", 5, '?')) { - /* - NMEA sentence format: $xxRMC,time,status,lat,NS,long,EW,spd,cog,date,mv,mvEW,posMode*cs<CR><LF> - Valid fix: $GPRMC,083559.34,A,4717.11437,N,00833.91522,E,0.004,77.52,091202,,,A*00 -@@ -535,33 +456,32 @@ enum gps_msg lgw_parse_nmea(const char *serial_buff, int buff_size) { - memcpy(parser_buf, serial_buff, buff_size); - parser_buf[buff_size] = '\0'; - nb_fields = str_chop(parser_buf, buff_size, ',', str_index, ARRAY_SIZE(str_index)); -- if (nb_fields != 13) { -+ if (nb_fields != 12) { - DEBUG_MSG("Warning: invalid RMC sentence (number of fields)\n"); - return IGNORED; - } - /* parse GPS status */ -- gps_mod = *(parser_buf + str_index[12]); /* get first character, no need to bother with sscanf */ -+ gps_mod = *(parser_buf + str_index[2]); /* get first character, no need to bother with sscanf */ - if ((gps_mod != 'N') && (gps_mod != 'A') && (gps_mod != 'D')) { - gps_mod = 'N'; - } - /* parse complete time */ - i = sscanf(parser_buf + str_index[1], "%2hd%2hd%2hd%4f", &gps_hou, &gps_min, &gps_sec, &gps_fra); - j = sscanf(parser_buf + str_index[9], "%2hd%2hd%2hd", &gps_day, &gps_mon, &gps_yea); -- if ((i == 4) && (j == 3)) { -+ if ((i == 3) && (j == 3)) { - if ((gps_mod == 'A') || (gps_mod == 'D')) { -- gps_time_ok = true; -+ gps_lock_ok = true; - DEBUG_MSG("Note: Valid RMC sentence, GPS locked, date: 20%02d-%02d-%02dT%02d:%02d:%06.3fZ\n", gps_yea, gps_mon, gps_day, gps_hou, gps_min, gps_fra + (float)gps_sec); - } else { -- gps_time_ok = false; -+ gps_lock_ok = false; - DEBUG_MSG("Note: Valid RMC sentence, no satellite fix, estimated date: 20%02d-%02d-%02dT%02d:%02d:%06.3fZ\n", gps_yea, gps_mon, gps_day, gps_hou, gps_min, gps_fra + (float)gps_sec); - } - } else { - /* could not get a valid hour AND date */ -- gps_time_ok = false; - DEBUG_MSG("Note: Valid RMC sentence, mode %c, no date\n", gps_mod); - } - return NMEA_RMC; -- } else if (match_label(serial_buff, "$G?GGA", 6, '?')) { -+ } else if (match_label(serial_buff, "G?GGA", 5, '?')) { - /* - NMEA sentence format: $xxGGA,time,lat,NS,long,EW,quality,numSV,HDOP,alt,M,sep,M,diffAge,diffStation*cs<CR><LF> - Valid fix: $GPGGA,092725.00,4717.11399,N,00833.91590,E,1,08,1.01,499.6,M,48.0,M,,*5B -@@ -587,6 +507,8 @@ enum gps_msg lgw_parse_nmea(const char *serial_buff, int buff_size) { - } else { - /* could not get a valid latitude, longitude AND altitude */ - gps_pos_ok = false; -+ gps_time_ok = false; -+ gps_lock_ok = false; - DEBUG_MSG("Note: Valid GGA sentence, %d sat, no coordinates\n", gps_sat); - } - return NMEA_GGA; -@@ -662,72 +580,60 @@ int lgw_gps_get(struct timespec *utc, struct timespec *gps_time, struct coord_s - /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - - int lgw_gps_sync(struct tref *ref, uint32_t count_us, struct timespec utc, struct timespec gps_time) { -+ bool update = false; - double cnt_diff; /* internal concentrator time difference (in seconds) */ - double utc_diff; /* UTC time difference (in seconds) */ -- double slope; /* time slope between new reference and old reference (for sanity check) */ -- -- bool aber_n0; /* is the update value for synchronization aberrant or not ? */ -- static bool aber_min1 = false; /* keep track of whether value at sync N-1 was aberrant or not */ -- static bool aber_min2 = false; /* keep track of whether value at sync N-2 was aberrant or not */ -+ double slope = 1.0; /* time slope between new reference and old reference (for sanity check) */ -+ static bool calibrating = true; - - CHECK_NULL(ref); - - /* calculate the slope */ - -- cnt_diff = (double)(count_us - ref->count_us) / (double)(TS_CPS); /* uncorrected by xtal_err */ -- utc_diff = (double)(utc.tv_sec - (ref->utc).tv_sec) + (1E-9 * (double)(utc.tv_nsec - (ref->utc).tv_nsec)); -+ if (ref->systime != 0) { -+ -+ cnt_diff = (double)(count_us - ref->count_us) / (double)(TS_CPS); /* uncorrected by xtal_err */ -+ utc_diff = (double)(utc.tv_sec - (ref->utc).tv_sec) + (1E-9 * (double)(utc.tv_nsec - (ref->utc).tv_nsec)); - -- /* detect aberrant points by measuring if slope limits are exceeded */ -- if (utc_diff != 0) { // prevent divide by zero -- slope = cnt_diff/utc_diff; -- if ((slope > PLUS_10PPM) || (slope < MINUS_10PPM)) { -- DEBUG_MSG("Warning: correction range exceeded\n"); -- aber_n0 = true; -+ if (cnt_diff != 0 && utc_diff != 0) { // prevent divide by zero -+ slope = cnt_diff/utc_diff; - } else { -- aber_n0 = false; -+ slope = 0.0; -+ } -+ -+ if (gps_lock_ok && gps_time_ok && cnt_diff > 1.5) { -+ update = true; -+ } -+ -+ update = (slope >= MINUS_10PPM && slope <= PLUS_10PPM); -+ -+ if (!calibrating && utc_diff < 10.0) { -+ return LGW_GPS_ERROR; - } -+ -+ if (calibrating && !update && utc_diff > 1.5) { -+ update = true; -+ } else if (update) { -+ calibrating = false; -+ } -+ - } else { -- DEBUG_MSG("Warning: aberrant UTC value for synchronization\n"); -- aber_n0 = true; -+ update = true; -+ slope = 0.0; - } - -- /* watch if the 3 latest sync point were aberrant or not */ -- if (aber_n0 == false) { -- /* value no aberrant -> sync with smoothed slope */ -- ref->systime = time(NULL); -+ if (update || calibrating) { -+ ref->systime = time(NULL); - ref->count_us = count_us; - ref->utc.tv_sec = utc.tv_sec; - ref->utc.tv_nsec = utc.tv_nsec; - ref->gps.tv_sec = gps_time.tv_sec; - ref->gps.tv_nsec = gps_time.tv_nsec; - ref->xtal_err = slope; -- aber_min2 = aber_min1; -- aber_min1 = aber_n0; - return LGW_GPS_SUCCESS; -- } else if (aber_n0 && aber_min1 && aber_min2) { -- /* 3 successive aberrant values -> sync reset (keep xtal_err) */ -- ref->systime = time(NULL); -- ref->count_us = count_us; -- ref->utc.tv_sec = utc.tv_sec; -- ref->utc.tv_nsec = utc.tv_nsec; -- ref->gps.tv_sec = gps_time.tv_sec; -- ref->gps.tv_nsec = gps_time.tv_nsec; -- /* reset xtal_err only if the present value is out of range */ -- if ((ref->xtal_err > PLUS_10PPM) || (ref->xtal_err < MINUS_10PPM)) { -- ref->xtal_err = 1.0; -- } -- DEBUG_MSG("Warning: 3 successive aberrant sync attempts, sync reset\n"); -- aber_min2 = aber_min1; -- aber_min1 = aber_n0; -- return LGW_GPS_SUCCESS; -- } else { -- /* only 1 or 2 successive aberrant values -> ignore and return an error */ -- aber_min2 = aber_min1; -- aber_min1 = aber_n0; -- return LGW_GPS_ERROR; - } - -- return LGW_GPS_SUCCESS; -+ return LGW_GPS_ERROR; - } - - /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -diff --git a/libloragw/tst/test_loragw_gps.c b/libloragw/tst/test_loragw_gps.c -index a4164a3..e4b1546 100644 ---- a/libloragw/tst/test_loragw_gps.c -+++ b/libloragw/tst/test_loragw_gps.c -@@ -31,6 +31,8 @@ Maintainer: Michael Coracin - #include <signal.h> /* sigaction */ - #include <stdlib.h> /* exit */ - #include <unistd.h> /* read */ -+#include <gps.h> -+#include <gpsd.h> - - #include "loragw_hal.h" - #include "loragw_gps.h" -@@ -41,7 +43,8 @@ Maintainer: Michael Coracin - - static int exit_sig = 0; /* 1 -> application terminates cleanly (shut down hardware, close open files, etc) */ - static int quit_sig = 0; /* 1 -> application terminates without shutting down the hardware */ -- -+static struct gps_data_t gpsdata; -+static struct fixsource_t source; - struct tref ppm_ref; - - /* -------------------------------------------------------------------------- */ -@@ -149,6 +152,10 @@ int main() - /* NMEA/UBX variables */ - enum gps_msg latest_msg; /* keep track of latest NMEA/UBX message parsed */ - -+ fd_set fds; -+ char delim[4] = "$"; -+ char *token[254]; -+ - /* configure signal handling */ - sigemptyset(&sigact.sa_mask); - sigact.sa_flags = 0; -@@ -162,7 +169,7 @@ int main() - printf("*** Library version information ***\n%s\n***\n", lgw_version_info()); - - /* Open and configure GPS */ -- i = lgw_gps_enable("/dev/ttyAMA0", "ubx7", 0, &gps_tty_dev); -+ i = lgw_gps_enable(&gpsdata, &source); - if (i != LGW_GPS_SUCCESS) { - printf("ERROR: IMPOSSIBLE TO ENABLE GPS\n"); - exit(EXIT_FAILURE); -@@ -192,92 +199,87 @@ int main() - - /* loop until user action */ - while ((quit_sig != 1) && (exit_sig != 1)) { -- size_t rd_idx = 0; -- size_t frame_end_idx = 0; -- -- /* blocking non-canonical read on serial port */ -- ssize_t nb_char = read(gps_tty_dev, serial_buff + wr_idx, LGW_GPS_MIN_MSG_SIZE); -- if (nb_char <= 0) { -- printf("WARNING: [gps] read() returned value %d\n", nb_char); -+ int r = 0; -+ struct timeval tv; -+ tv.tv_sec = 0; -+ tv.tv_usec = 100000; -+ FD_ZERO(&fds); -+ FD_SET(gpsdata.gps_fd, &fds); -+ errno = 0; -+ r = select(gpsdata.gps_fd+1, &fds, NULL, NULL, &tv); -+ if (r == -1 && errno != EINTR) { -+ printf("gpspipe: select error %s(%d)\n", strerror(errno), errno); -+ exit(EXIT_FAILURE); -+ } else if (r == 0) - continue; -- } -- wr_idx += (size_t)nb_char; - -- /******************************************* -- * Scan buffer for UBX/NMEA sync chars and * -- * attempt to decode frame if one is found * -- *******************************************/ -- while (rd_idx < wr_idx) { -+ /* reading directly from the socket avoids decode overhead */ -+ errno = 0; -+ r = (int)read(gpsdata.gps_fd, serial_buff, sizeof(serial_buff)); -+ if (r > 0) { -+ int i = 0; - size_t frame_size = 0; -- -- /* Scan buffer for UBX sync char */ -- if (serial_buff[rd_idx] == LGW_GPS_UBX_SYNC_CHAR) { -- -- /*********************** -- * Found UBX sync char * -- ***********************/ -- latest_msg = lgw_parse_ubx(&serial_buff[rd_idx], (wr_idx - rd_idx), &frame_size); -- -- if (frame_size > 0) { -- if (latest_msg == INCOMPLETE) { -- /* UBX header found but frame appears to be missing bytes */ -- frame_size = 0; -- } else if (latest_msg == INVALID) { -- /* message header received but message appears to be corrupted */ -- printf("WARNING: [gps] could not get a valid message from GPS (no time)\n"); -- frame_size = 0; -- } else if (latest_msg == UBX_NAV_TIMEGPS) { -- printf("\n~~ UBX NAV-TIMEGPS sentence, triggering synchronization attempt ~~\n"); -- gps_process_sync(); -+ for (i = 0; i < r; i++) { -+ if (serial_buff[i] == (char)LGW_GPS_UBX_SYNC_CHAR) { -+ /*********************** -+ * Found UBX sync char * -+ ***********************/ -+ size_t ubx_size = (uint8_t)serial_buff[i+4]; -+ ubx_size |= (uint8_t)serial_buff[i+5] << 8; -+ ubx_size += 8; -+ if (ubx_size < 27){ -+ latest_msg = lgw_parse_ubx(&serial_buff[i], ubx_size , &frame_size); - } -- } -- } else if(serial_buff[rd_idx] == LGW_GPS_NMEA_SYNC_CHAR) { -- /************************ -- * Found NMEA sync char * -- ************************/ -- /* scan for NMEA end marker (LF = 0x0a) */ -- char* nmea_end_ptr = memchr(&serial_buff[rd_idx],(int)0x0a, (wr_idx - rd_idx)); -- -- if (nmea_end_ptr) { -- /* found end marker */ -- frame_size = nmea_end_ptr - &serial_buff[rd_idx] + 1; -- latest_msg = lgw_parse_nmea(&serial_buff[rd_idx], frame_size); -- -- if(latest_msg == INVALID || latest_msg == UNKNOWN) { -- /* checksum failed */ -- frame_size = 0; -- } else if (latest_msg == NMEA_RMC) { /* Get location from RMC frames */ -- gps_process_coords(); -+ if (frame_size > 0) { -+ if(latest_msg == INVALID || latest_msg == UNKNOWN) { -+ /* checksum failed */ -+ frame_size = 0; -+ } else if (latest_msg == UBX_NAV_TIMEGPS) { -+ gps_process_sync(); -+ } -+ } -+ } else if((serial_buff[i] == LGW_GPS_NMEA_SYNC_CHAR) && (serial_buff[i+1] == 0x47) && (serial_buff[i+2] == 0x50)){ -+ /************************ -+ * Found NMEA sync char * -+ ************************/ -+ int k, l= 0; -+ token[0] = strtok(serial_buff, delim); -+ -+ while (token[l] != NULL) { -+ l++; -+ token[l] = strtok(NULL, delim); - } -+ for (k=0; k<=l-1; k++) { -+ if ((strlen(token[k]) > 66) && (strlen(token[k]) < 74)){ -+ lgw_parse_nmea(token[k], strlen(token[k])); -+ if(latest_msg == INVALID || latest_msg == UNKNOWN) { -+ /* checksum failed */ -+ frame_size = 0; -+ } else if (latest_msg == NMEA_RMC) { -+ /* Get location from RMC frames */ -+ gps_process_coords(); -+ } -+ } -+ } - } - } -- -- if (frame_size > 0) { -- /* At this point message is a checksum verified frame -- we're processed or ignored. Remove frame from buffer */ -- rd_idx += frame_size; -- frame_end_idx = rd_idx; -+ } else { -+ if (r == -1) { -+ if (errno == EAGAIN) -+ continue; -+ else { -+ printf(stderr, "gpspipe: read error %s(%d)\n", strerror(errno), errno); -+ exit(EXIT_FAILURE); -+ } - } else { -- rd_idx++; -+ exit(EXIT_SUCCESS); - } -- } /* ...for(rd_idx = 0... */ -- -- if (frame_end_idx) { -- /* Frames have been processed. Remove bytes to end of last processed frame */ -- memcpy(serial_buff,&serial_buff[frame_end_idx],wr_idx - frame_end_idx); -- wr_idx -= frame_end_idx; -- } /* ...for(rd_idx = 0... */ -- -- /* Prevent buffer overflow */ -- if ((sizeof(serial_buff) - wr_idx) < LGW_GPS_MIN_MSG_SIZE) { -- memcpy(serial_buff,&serial_buff[LGW_GPS_MIN_MSG_SIZE],wr_idx - LGW_GPS_MIN_MSG_SIZE); -- wr_idx -= LGW_GPS_MIN_MSG_SIZE; - } - } - - /* clean up before leaving */ - if (exit_sig == 1) { -- lgw_gps_disable(gps_tty_dev); -+ lgw_gps_disable(&gpsdata); - lgw_stop(); - } - diff --git a/recipes-connectivity/lora/lora-gateway/lora-gateway-semtech-sf12.patch b/recipes-connectivity/lora/lora-gateway/lora-gateway-semtech-sf12.patch deleted file mode 100644 index 7ea09d2..0000000 --- a/recipes-connectivity/lora/lora-gateway/lora-gateway-semtech-sf12.patch +++ /dev/null @@ -1,16 +0,0 @@ -t a/libloragw/src/loragw_hal.c b/libloragw/src/loragw_hal.c -index 7271eac..e5770df 100644 ---- a/libloragw/src/loragw_hal.c -+++ b/libloragw/src/loragw_hal.c -@@ -305,6 +305,11 @@ void lgw_constant_adjust(void) { - // lgw_reg_w(LGW_MBWSSF_TRACKING_INTEGRAL,0); /* default 0 */ - // lgw_reg_w(LGW_MBWSSF_AGC_FREEZE_ON_DETECT,1); /* default 1 */ - -+ /* Improvement of reference clock frequency error tolerance */ -+ lgw_reg_w(LGW_ADJUST_MODEM_START_OFFSET_RDX4, 1); /* default 0 */ -+ lgw_reg_w(LGW_ADJUST_MODEM_START_OFFSET_SF12_RDX4, 4094); /* default 4092 */ -+ lgw_reg_w(LGW_CORR_MAC_GAIN, 7); /* default 5 */ -+ - /* FSK datapath setup */ - lgw_reg_w(LGW_FSK_RX_INVERT,1); /* default 0 */ - lgw_reg_w(LGW_FSK_MODEM_INVERT_IQ,1); /* default 0 */ diff --git a/recipes-connectivity/lora/lora-gateway/lora-gateway-spectral-scan-skip-fpga-reset.patch b/recipes-connectivity/lora/lora-gateway/lora-gateway-spectral-scan-skip-fpga-reset.patch deleted file mode 100644 index 0b53fd0..0000000 --- a/recipes-connectivity/lora/lora-gateway/lora-gateway-spectral-scan-skip-fpga-reset.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/util_spectral_scan/src/util_spectral_scan.c b/util_spectral_scan/src/util_spectral_scan.c -index d2aecda..cbc8377 100644 ---- a/util_spectral_scan/src/util_spectral_scan.c -+++ b/util_spectral_scan/src/util_spectral_scan.c -@@ -30,6 +30,7 @@ Maintainer: Michael Coracin - #include <stdlib.h> /* EXIT atoi */ - #include <unistd.h> /* getopt */ - #include <string.h> -+#include <signal.h> - - #include "loragw_aux.h" - #include "loragw_reg.h" -@@ -66,11 +67,22 @@ Maintainer: Michael Coracin - /* -------------------------------------------------------------------------- */ - /* --- GLOBAL VARIABLES ----------------------------------------------------- */ - -+bool shutdown_signal_recv = false; -+ -+void signalHandler() { -+ shutdown_signal_recv = true; -+} -+ -+ - /* -------------------------------------------------------------------------- */ - /* --- MAIN FUNCTION -------------------------------------------------------- */ - - int main( int argc, char ** argv ) - { -+ -+ signal(SIGINT, signalHandler); -+ signal(SIGTERM, signalHandler); -+ - int i, j, k; /* loop and temporary variables */ - int x; /* return code for functions */ - int32_t reg_val; -@@ -200,6 +212,10 @@ int main( int argc, char ** argv ) - } - } - -+ if (shutdown_signal_recv) { -+ return 0; -+ } -+ - /* Start message */ - printf("+++ Start spectral scan of LoRa gateway channels +++\n"); - -@@ -264,7 +280,7 @@ int main( int argc, char ** argv ) - printf("ERROR: Failed to disconnect from FPGA\n"); - return EXIT_FAILURE; - } -- x = lgw_connect(false, LGW_DEFAULT_NOTCH_FREQ); /* FPGA reset/configure */ -+ x = lgw_connect(true, LGW_DEFAULT_NOTCH_FREQ); /* FPGA reset/configure */ - if(x != 0) { - printf("ERROR: Failed to connect to FPGA\n"); - return EXIT_FAILURE; -@@ -324,6 +340,9 @@ int main( int argc, char ** argv ) - do { - wait_ms(10); - lgw_fpga_reg_r(LGW_FPGA_STATUS, ®_val); -+ if (shutdown_signal_recv) { -+ break; -+ } - } - while((TAKE_N_BITS_FROM((uint8_t)reg_val, 0, 5)) != 1); /* Clear has started */ - -@@ -346,6 +365,9 @@ int main( int argc, char ** argv ) - do { - wait_ms(1000); - lgw_fpga_reg_r(LGW_FPGA_STATUS, ®_val); -+ if (shutdown_signal_recv) { -+ break; -+ } - } - while((TAKE_N_BITS_FROM((uint8_t)reg_val, 5, 1)) != 1); - -@@ -382,6 +404,10 @@ int main( int argc, char ** argv ) - } - fprintf(log_file, "\n"); - printf("\n"); -+ -+ if (shutdown_signal_recv) { -+ break; -+ } - } - fclose(log_file); - diff --git a/recipes-connectivity/lora/lora-gateway/lora-gateway-v28-skip-IQ-invert.patch b/recipes-connectivity/lora/lora-gateway/lora-gateway-v28-skip-IQ-invert.patch deleted file mode 100644 index 25065df..0000000 --- a/recipes-connectivity/lora/lora-gateway/lora-gateway-v28-skip-IQ-invert.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/libloragw/src/loragw_fpga.c b/libloragw/src/loragw_fpga.c -index fa83a2a..7e667e3 100644 ---- a/libloragw/src/loragw_fpga.c -+++ b/libloragw/src/loragw_fpga.c -@@ -144,11 +144,14 @@ int lgw_fpga_configure(uint32_t tx_notch_freq) { - return LGW_REG_ERROR; - } - -- /* Required for Semtech AP2 reference design */ -- x = lgw_fpga_reg_w(LGW_FPGA_CTRL_INVERT_IQ, 1); -- if (x != LGW_REG_SUCCESS) { -- DEBUG_MSG("ERROR: Failed to configure FPGA polarity\n"); -- return LGW_REG_ERROR; -+ -+ if (read_fpga_version() > 28) { -+ /* Required for Semtech AP2 reference design and AP1.5 > v28 */ -+ x = lgw_fpga_reg_w(LGW_FPGA_CTRL_INVERT_IQ, 1); -+ if (x != LGW_REG_SUCCESS) { -+ DEBUG_MSG("ERROR: Failed to configure FPGA polarity\n"); -+ return LGW_REG_ERROR; -+ } - } - - /* Configure TX notch filter */ diff --git a/recipes-connectivity/lora/lora-gateway_5.0.1.bb b/recipes-connectivity/lora/lora-gateway_5.0.1.bb deleted file mode 100644 index a86b23a..0000000 --- a/recipes-connectivity/lora/lora-gateway_5.0.1.bb +++ /dev/null @@ -1,68 +0,0 @@ -DESCRIPTION = "LoRa Gateway library" -HOMEPAGE = "https://github.com/Lora-net/lora_gateway" -PRIORITY = "optional" -SECTION = "console/utils" -# Semtech license is a modified BSD-style license -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a2bdef95625509f821ba00460e3ae0eb" -DEPENDS = "gpsd" -RDEPENDS_${PN} = "gpsd" - -PR = "r24" -SRCREV = "dea57d6f29246434173c33c56850708c51fc5b23" - -SRC_URI = "git://git@gitlab.multitech.net/lora_enterprise/lora_gateway_mtac_full.git;protocol=ssh;branch=master \ - file://library_4.0.cfg \ - file://ln-lora-spi-dev.sh \ - " - - -S = "${WORKDIR}/git" - -CFLAGS += "-Iinc -I. -idirafter ${STAGING_DIR_TARGET}/usr/include/gps" - -do_configure_append() { - # copy over custom library_4.0.cfg - cp ${WORKDIR}/library_4.0.cfg ${S}/libloragw/library.cfg -} - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}${includedir}/lora - install -d ${D}${libdir}/lora - install -m 0644 libloragw/libloragw.a ${D}${libdir}/lora - install -m 0644 libloragw/library.cfg ${D}${libdir}/lora - install -m 0644 libloragw/inc/* ${D}${includedir}/lora - install -m 0644 libloragw/readme.md ${D}${libdir}/lora/lora-gw-readme.md - - install -d ${D}/opt/lora/ - - install -d ${D}/opt/lora/gateway-utils - install -m 0755 libloragw/test_* ${D}/opt/lora/gateway-utils/ - install -m 0755 util_pkt_logger/util_pkt_logger ${D}/opt/lora/gateway-utils/ - install -m 0755 util_spectral_scan/util_spectral_scan ${D}/opt/lora/gateway-utils/ - install -m 0755 util_spi_stress/util_spi_stress ${D}/opt/lora/gateway-utils/ - install -m 0755 util_tx_test/util_tx_test ${D}/opt/lora/gateway-utils/ - install -m 0755 util_tx_continuous/util_tx_continuous ${D}/opt/lora/gateway-utils/ - install -m 0755 util_lbt_test/util_lbt_test ${D}/opt/lora/gateway-utils/ -} - -do_install_append_mtcdt() { - install -m 0755 ${WORKDIR}/ln-lora-spi-dev.sh ${D}/opt/lora/ -} - -PACKAGES += "${PN}-utils ${PN}-utils-dbg" - -FILES_${PN} = "${libdir}/lora/lora-gw-readme.md" -FILES_${PN}-utils = "/opt/lora/gateway-utils/* /opt/lora/ln-lora-spi-dev.sh" -FILES_${PN}-utils-dbg = "/opt/lora/gateway-utils/.debug /opt/lora/ln-lora-spi-dev.sh" -FILES_${PN}-dev = "${includedir}/lora ${libdir}/lora/library.cfg" -FILES_${PN}-staticdev = "${libdir}/lora/libloragw.a" - -# disable this on purpose for dev purposes -do_rm_work() { - echo "skipping" -} diff --git a/recipes-connectivity/lora/lora-logging.bb b/recipes-connectivity/lora/lora-logging.bb deleted file mode 100644 index 4691458..0000000 --- a/recipes-connectivity/lora/lora-logging.bb +++ /dev/null @@ -1,17 +0,0 @@ -DECRIPTION = "MultiTech LoRa Logging" -PRIORITY = "optional" -SECTION = "console/utils" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -DEPENDS = "" -PR = "r4" -RDEPENDS_${PN} += "logrotate bash" - -SRC_URI = "file://lora-logging.logrotate.conf \ - " - -do_install() { - install -d ${D}${sysconfdir}/logrotate.d - install -m 0644 ${WORKDIR}/lora-logging.logrotate.conf ${D}${sysconfdir}/logrotate.d/lora-logging.conf -} - diff --git a/recipes-connectivity/lora/lora-logging/LICENSE b/recipes-connectivity/lora/lora-logging/LICENSE deleted file mode 100644 index 6f3f3d7..0000000 --- a/recipes-connectivity/lora/lora-logging/LICENSE +++ /dev/null @@ -1,265 +0,0 @@ -IMPORTANT – READ BEFORE OPERATING OR INSTALLING THE MULTI-TECH PRODUCT OR SOFTWARE
-
-MULTI-TECH SYSTEMS, INC.
-END USER LICENSE AGREEMENT
-PLEASE READ THIS END USER LICENSE AGREEMENT (“AGREEMENT”) CAREFULLY BEFORE USING THE MULTI-TECH PRODUCT, INSTALLING OR ACCESSING THE SOFTWARE, OR DOWNLOADING ANY SOFTWARE UPDATES FOR USE WITH THE MULTI-TECH PRODUCT. BY USING THE MULTI-TECH PRODUCT, INSTALLING OR ACCESSING THE SOFTWARE OR DOWNLOADING SOFTWARE UPDATES FOR THE MULTI-TECH PRODUCT, YOU AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. IF YOU DO NOT AGREE TO THE TERMS OF THIS AGREEMENT, DO NOT USE THE MULTI-TECH PRODUCT, INSTALL OR ACCESS THE SOFTWARE, OR DOWNLOAD THE SOFTWARE UPDATES. INSTEAD, PLEASE CONTACT MULTI-TECH’S CUSTOMER SERVICE DEPARTMENT AT customerservice@multitech.com.
-
-1. DEFINITIONS. The following terms are defined as follows: (a) ”Documentation” means any user guides, data sheets, manuals, specifications, or other written description of the Software provided by Multi-Tech; (b) “Multi-Tech” means, collectively, Multi-Tech Systems, Inc., its directors, officers, employees, representatives, agents, licensors, and affiliated entities; (c) “Software” means, collectively, (i) the software provided by Multi-Tech, (ii) the software pre-installed on any Multi-Tech product, and (iii) any Documentation; and (d) “You” means you, an individual, if you are accessing the Software on your behalf, or if you are accessing the Software on behalf of your employer or a third party, “You” means the legal entity of the employer or third party as applicable.
-
-2. ACCEPTANCE. You accept the terms of this Agreement either by: (a) clicking “I Accept” when offered by Multi-Tech; or (b) using the Multi-Tech product, installing or accessing the Software or downloading Software updates. You acknowledge and agree that You have read and understood this Agreement, have had an opportunity to discuss this Agreement with Your legal and other advisors, and agree to be bound by the terms and conditions of this Agreement.
-
-3. LICENSE. The Software is licensed, and is not sold. Subject to the terms of this Agreement, You are granted a limited, non-transferable, non-exclusive license that permits You to use the Software with the Multi-Tech product for internal business or personal use. This License does not grant to You any rights to re-license or sublicense or otherwise resell or re-distribute the Software. This License does not grant to You any rights to obtain future Software updates (e.g., upgrades, fixes, etc.). If future Software updates are obtained by You, whether through a version release, Multi-Tech technical support, or another Multi-Tech authorized method, such Software updates are subject to the terms of this Agreement. If applicable, any previous version of the Software must be destroyed or returned to Multi-Tech within 90 days of receipt of the Software updates.
-
-4. RESTRICTIONS. This Agreement does not authorize You to: (a) sell, lease, copy, assign, license, sublicense, translate, distribute, or otherwise transfer, in whole or in part, the Software; (b) modify, distribute, copy, reproduce, or publish, in whole or in part, the Documentation; (c) use the Software on a timesharing basis to operate a service bureau facility or providing hosting of the Software for the benefit of third parties; (d) decompile, disassemble, reverse engineer or otherwise attempt to derive source code from the Software, except as, and then only to the extent, required by applicable law or an applicable open source license; (e) modify or create derivative works of the Software; or (f) create, develop, license, install, use or deploy any software or services to circumvent, enable, modify or provide access, permissions or rights which violate the technical restrictions in the Software. You acknowledge and agree that the Software and Documentation is subject to U.S. export control laws, including the U.S. Export Administration Act and its associated regulations, and may be subject to export or import regulations in other countries. You agree to strictly comply with all such regulations and acknowledge that You are responsible for obtaining any applicable licenses to export, re-export or import the Software and Documentation.
-
-5. OWNERSHIP; CONFIDENTIALITY. You agree that the Software contains trade secret information, copyrights, trademarks, and other intellectual property rights that are owned by Multi-Tech Systems, Inc. or its licensors. Multi-Tech retains all right, title and interest in and to the Software. All rights not expressly granted herein are reserved. You acknowledge and agree that the Software was developed at considerable time and expense by Multi-Tech and is confidential to and a trade secret of Multi-Tech. You agree to maintain the Software in strict confidence and not disclose the Software or provide access thereto to any other third party.
-
-6. THIRD PARTY SOFTWARE. The Software may contain software from sources other than Multi-Tech Systems, Inc., including without limitation, third party proprietary software and free and open source software. To the extent the Software includes free and open source software, it is subject to the applicable free and open source software license. Multi-Tech Systems, Inc. makes available information related to the free and open source software at www.multitech.com/licensing.go or upon written request.
-
-7. DISCLAIMER OF WARRANTY. EXCEPT AS SET FORTH IN THE MULTI-TECH STANDARD WARRANTY THAT ACCOMPANIES THE MULTI-TECH PRODUCT, ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES OF THE SOFTWARE, SUCH AS THE IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT, OR OTHERWISE ARISING FROM A COURSE OF DEALING, USAGE, OR TRADE PRACTICE, ARE HEREBY EXCLUDED TO THE EXTENT ALLOWED BY APPLICABLE LAW.
-
-8. LIMITATION OF LIABILITY. TO THE FULLEST EXTENT ALLOWABLE BY APPLICABLE LAW, Multi-Tech IS NOT LIABLE TO YOU FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE, OR CONSEQUENTIAL DAMAGES, INCLUDING WITHOUT LIMITATION, LOST PROFITS, LOST REVENUE AND BUSINESS INTERRUPTION, ARISING OUT OF THE SOFTWARE, WHETHER BASED ON CONTRACT, TORT, OR OTHER THEORY AND REGARDLESS OF WHETHER SUCH PERSON OR ENTITY SHALL BE ADVISED OR HAVE REASON TO KNOW OF THE POSSIBILITY OF SUCH DAMAGES. IF Multi-Tech IS EVER DEEMED LIABLE TO YOU, ITS AGGREGATE LIABILITY, WHETHER BASED IN TORT, CONTRACT, STATUTE OR OTHERWISE, IS LIMITED TO THE NET AMOUNT PAID BY YOU FOR THE Multi-Tech PRODUCT.
-
-9. TERMINATION. Multi-Tech may, upon written notice to You, immediately terminate this Agreement and the warranty period set forth in the Multi-Tech Standard Warranty if You breach the terms set forth in this Agreement.
-
-10. GENERAL. This Agreement: (a) contains the complete and exclusive agreement regarding its subject matter, (b) supersedes all prior or contemporaneous written or oral agreements, representations, promises, and understandings related thereto (except those previously referenced third party license agreements), (c) may be modified, supplemented or amended by Multi-Tech with or without notice (which modification, supplement or amendment may be made available with Software updates or future purchases of Multi-Tech products), (d) is between sophisticated parties, and so the rule of construing ambiguities against the drafter will not apply, (e) will be governed by Minnesota law, without regard to its choice of law provisions, and (f) is binding upon the parties and their successors, will not benefit or create any right or cause of action for any other person or entity other than the parties, except Multi-Tech’s third party licensors. No waiver of this Agreement is effective by Multi-Tech unless in writing signed by a duly authorized representative. If any provision of this Agreement is held to be invalid, it shall be interpreted so as to best advance the spirit of this Agreement and Multi-Tech’s intent. All disputes arising from this Agreement shall be heard in the exclusive jurisdiction of the state courts of Minnesota, U.S.A. and You agree to submit to the personal jurisdiction of such courts. You acknowledge that You are age thirteen or older, and by accepting this Agreement, You agree that You are fully authorized, able and competent to enter into this Agreement.
-
- Multi-Tech Systems, Inc.
- 2205 Woodale Drive
- Mounds View, Minnesota 55112
- customerservice@multitech.com
- 20130910
-
------------------------------------------------------------------------------------------
- Open Source Licenses
------------------------------------------------------------------------------------------
-
------------------------------------------
- crc64 implementation
------------------------------------------
-
-/* Redis uses the CRC64 variant with "Jones" coefficients and init value of 0.
- *
- * Specification of this CRC64 variant follows:
- * Name: crc-64-jones
- * Width: 64 bites
- * Poly: 0xad93d23594c935a9
- * Reflected In: True
- * Xor_In: 0xffffffffffffffff
- * Reflected_Out: True
- * Xor_Out: 0x0
- * Check("123456789"): 0xe9c6d914c4b8d9ca
- *
- * Copyright (c) 2012, Salvatore Sanfilippo <antirez at gmail dot com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Redis nor the names of its contributors may be used
- * to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE. */
-
------------------------------------------
- mosquitto implementation
------------------------------------------
-
-Copyright (c) 2010-2013 Roger Light <roger@atchoo.org>
-
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-and Eclipse Distribution License v1.0 which accompany this distribution.
-
-The Eclipse Public License is available at
- http://www.eclipse.org/legal/epl-v10.html
-and the Eclipse Distribution License is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
-
-Contributors:
- Roger Light - initial implementation and documentation.
-
------------------------------------------
- aes implementation
------------------------------------------
-
-/*
- ---------------------------------------------------------------------------
- Copyright (c) 1998-2008, Brian Gladman, Worcester, UK. All rights reserved.
-
- LICENSE TERMS
-
- The redistribution and use of this software (with or without changes)
- is allowed without the payment of fees or royalties provided that:
-
- 1. source code distributions include the above copyright notice, this
- list of conditions and the following disclaimer;
-
- 2. binary distributions include the above copyright notice, this list
- of conditions and the following disclaimer in their documentation;
-
- 3. the name of the copyright holder is not used to endorse products
- built using this software without specific written permission.
-
- DISCLAIMER
-
- This software is provided 'as is' with no explicit or implied warranties
- in respect of its properties, including, but not limited to, correctness
- and/or fitness for purpose.
- ---------------------------------------------------------------------------
- Issue 09/09/2006
-
- This is an AES implementation that uses only 8-bit byte operations on the
- cipher state (there are options to use 32-bit types if available).
-
- The combination of mix columns and byte substitution used here is based on
- that developed by Karl Malbrain. His contribution is acknowledged.
- */
-
------------------------------------------
- cmac implementation
------------------------------------------
-
-/**************************************************************************
- Copyright (C) 2009 Lander Casado, Philippas Tsigas
-
- All rights reserved.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files
- (the "Software"), to deal with the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimers. Redistributions in
- binary form must reproduce the above copyright notice, this list of
- conditions and the following disclaimers in the documentation and/or
- other materials provided with the distribution.
-
- In no event shall the authors or copyright holders be liable for any special,
- incidental, indirect or consequential damages of any kind, or any damages
- whatsoever resulting from loss of use, data or profits, whether or not
- advised of the possibility of damage, and on any theory of liability,
- arising out of or in connection with the use or performance of this software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS WITH THE SOFTWARE
-
- *****************************************************************************/
-
-
----------------------------------------------------
- picosha2 implementation
----------------------------------------------------
-
-MIT License
-
-Copyright (c) 2017 okdshin
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
------------------------------------------------------------------
-RapidJSON
------------------------------------------------------------------
-
-Tencent is pleased to support the open source community by making RapidJSON available.
-
-Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-
-If you have downloaded a copy of the RapidJSON binary from Tencent, please note that the RapidJSON binary is licensed under the MIT License.
-If you have downloaded a copy of the RapidJSON source code from Tencent, please note that RapidJSON source code is licensed under the MIT License, except for the third-party components listed below which are subject to different license terms. Your integration of RapidJSON into your own projects may require compliance with the MIT License, as well as the other licenses applicable to the third-party components included within RapidJSON. To avoid the problematic JSON license in your own projects, it's sufficient to exclude the bin/jsonchecker/ directory, as it's the only code under the JSON license.
-A copy of the MIT License is included in this file.
-
-Other dependencies and licenses:
-
-Open Source Software Licensed Under the BSD License:
---------------------------------------------------------------------
-
-The msinttypes r29
-Copyright (c) 2006-2013 Alexander Chemeris
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-* Neither the name of copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Open Source Software Licensed Under the JSON License:
---------------------------------------------------------------------
-
-json.org
-Copyright (c) 2002 JSON.org
-All Rights Reserved.
-
-JSON_checker
-Copyright (c) 2002 JSON.org
-All Rights Reserved.
-
-
-Terms of the JSON License:
----------------------------------------------------
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-Terms of the MIT License:
---------------------------------------------------------------------
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
diff --git a/recipes-connectivity/lora/lora-logging/lora-logging.logrotate.conf b/recipes-connectivity/lora/lora-logging/lora-logging.logrotate.conf deleted file mode 100644 index 6fc191c..0000000 --- a/recipes-connectivity/lora/lora-logging/lora-logging.logrotate.conf +++ /dev/null @@ -1,11 +0,0 @@ -/var/log/lora-*.log { - size 512k - rotate 4 - compress - copytruncate - missingok - postrotate - set -e; - /usr/bin/killall -HUP lora-network-server || true; - endscript -} diff --git a/recipes-connectivity/lora/lora-network-server/lora-network-server.default b/recipes-connectivity/lora/lora-network-server/lora-network-server.default deleted file mode 100644 index be7dcd5..0000000 --- a/recipes-connectivity/lora/lora-network-server/lora-network-server.default +++ /dev/null @@ -1,2 +0,0 @@ -# set to "yes" or "no" to control starting on boot -ENABLED="yes" diff --git a/recipes-connectivity/lora/lora-network-server/lora-network-server.init b/recipes-connectivity/lora/lora-network-server/lora-network-server.init deleted file mode 100755 index 3ec02a0..0000000 --- a/recipes-connectivity/lora/lora-network-server/lora-network-server.init +++ /dev/null @@ -1,287 +0,0 @@ -#!/bin/bash - - -NAME="lora-network-server" -LOCK="/var/lock/$NAME" -ENABLED="yes" - - -[ -f /etc/default/$NAME ] && source /etc/default/$NAME - - -run_dir=/var/run/lora -conf_dir=/var/config/lora -conf_file=$conf_dir/lora-network-server.conf - -net_server=/opt/lora/lora-network-server -net_server_log=/var/log/lora-network-server.log -net_server_pidfile=$run_dir/$NAME.pid - -pkt_fwd=$run_dir/1/lora_pkt_fwd -pkt_fwd_log=/var/log/lora-pkt-fwd-1.log -pkt_fwd_pidfile=$run_dir/lora-pkt-fwd-1.pid - -pkt_fwd_2=$run_dir/2/lora_pkt_fwd -pkt_fwd_2_log=/var/log/lora-pkt-fwd-2.log -pkt_fwd_2_pidfile=$run_dir/lora-pkt-fwd-2.pid - -port1=/sys/devices/platform/mts-io/ap1 -port2=/sys/devices/platform/mts-io/ap2 - -lora_1_0_hw="MTAC-LORA-1.0" -lora_1_5_h_hw="MTAC-LORA-1.5" -lora_2_1_hw="MTAC-LORA-2.1" - -lora_mtac_id="MTAC-LORA" - -lora_mtcap_id="MTCAP-LORA" -lora_mtcap_id868="MTCAP-LORA-868" -lora_mtcap_id915="MTCAP-LORA-915" - -lora_mtac_g_id="MTAC-LORA-G" -lora_mtac_g16_id868="MTAC-LORA-G16-868" -lora_mtac_g16_id915="MTAC-LORA-G16-915" -lora_mtac_g64_id868="MTAC-LORA-G64-868" -lora_mtac_g64_id915="MTAC-LORA-G64-915" - -pkt_fwd_options="" -dual_cards_installed=false -gps_path="/dev/gps0" - -read_lora_hw_info() { - # product-id of first lora card - lora_id=$(mts-io-sysfs show lora/product-id 2> /dev/null) - lora_eui=$(mts-io-sysfs show lora/eui 2> /dev/null) - # remove all colons - lora_eui_raw=${lora_eui//:} - lora_hw=$(mts-io-sysfs show lora/hw-version 2> /dev/null) - if [ -d $port2 ] && [[ $(cat $port2/hw-version) =~ "LORA-1.5" ]]; then - # product-id of first lora card - lora_2_id=$(mts-io-sysfs show lora-2/product-id 2> /dev/null) - lora_2_hw=$(mts-io-sysfs show lora-2/hw-version 2> /dev/null) - lora_2_eui=$(mts-io-sysfs show lora-2/eui 2> /dev/null) - # remove all colons - lora_2_eui_raw=${lora_2_eui//:} - fi - - if [ -d $port1 ] && [[ $(cat $port1/hw-version) =~ "LORA-1.5" ]] && [ -d $port2 ] && [[ $(cat $port2/hw-version) =~ "LORA-1.5" ]]; then - dual_cards_installed=true - fi -} - -hardware_found() { - if [[ "$lora_id" =~ "$lora_mtac_g_id" ]]; then - setup_mtcdt_2_1 - elif [[ "$lora_id" =~ "$lora_mtac_id" ]]; then - setup_mtcdt - elif [[ "$lora_id" =~ "$lora_mtcap_id" ]]; then - setup_mtcap - else - return 1 - fi -} - -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 - GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_US915 - elif [[ "$lora_id" = "$lora_mtac_g16_id868" ]]; then - GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_2_1_test_single_antenna_64ch_8x8_EU868 - elif [[ "$lora_id" = "$lora_mtac_g64_id915" ]]; then - GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_64ch_US915 - else - return 1 - fi - - set +e - diff $GLOBAL_CONF /opt/lora/global_conf.json 1>/dev/null - if [ $? -ne 0 ]; then - cp $GLOBAL_CONF /opt/lora/global_conf.json - fi - set -e - - ln -sf /opt/lora/pkt_forwarder $pkt_fwd - - pkt_fwd_options=" -g" -} - -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 - else - if [ "$lora_hw" = "$lora_1_5_h_hw" ]; then - GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_1_5 - fi - ln -sf /opt/lora/lora_pkt_fwd $pkt_fwd - ln -sf /opt/lora/lora_pkt_fwd $pkt_fwd_2 - fi - - # ignore error of diff command - set +e - diff $GLOBAL_CONF /opt/lora/global_conf.json 1>/dev/null - if [ $? -ne 0 ]; then - cp $GLOBAL_CONF /opt/lora/global_conf.json - fi - set -e - - return 0 -} - -setup_mtcap() { - hw=$(mts-io-sysfs show hw-version 2> /dev/null) - - if [ "$lora_id" = "$lora_mtcap_id868" ]; then - if [ "$hw" = "MTCAP-0.2" ]; then - GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP2_LORA_1_5.EU868 - else - GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP_LORA_1_5.EU868 - fi - elif [ "$lora_id" = "$lora_mtcap_id915" ]; then - if [ "$hw" = "MTCAP-0.2" ]; then - GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP2_LORA_1_5.US915 - else - GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP_LORA_1_5.US915 - fi - else - return 1 - fi - - ln -sf /opt/lora/lora_pkt_fwd $pkt_fwd - - set +e - diff $GLOBAL_CONF /opt/lora/global_conf.json 1>/dev/null - if [ $? -ne 0 ]; then - cp $GLOBAL_CONF /opt/lora/global_conf.json - fi - set -e - - return 0 -} - -do_start() { - # create run directory - mkdir -p $run_dir/1 - mkdir -p $run_dir/2 - - read_lora_hw_info - - if ! [ -f $conf_file ]; then - echo "$0: $conf_file missing" - exit 1 - fi - - if hardware_found; then - echo "Found $lora_id with $lora_hw hardware" - mts-io-sysfs store lora/reset 0 - if [ "$dual_cards_installed" == true ]; then - mts-io-sysfs store lora-2/reset 0 - fi - sleep 0.25 - mts-io-sysfs store lora/reset 1 - if [ "$dual_cards_installed" == true ]; then - mts-io-sysfs store lora-2/reset 1 - fi - sleep 0.25 - else - echo "$0: Lora hardware not detected" - # Use MAC Address for lora eui - lora_eui=$(mts-io-sysfs show mac-eth) - lora_eui=${lora_eui:0:8}":FF:FF"${lora_eui:8:16} - lora_hw=$lora_mtcap_id915 - lora_id=$lora_1_5_h_hw - no_lora_hw=true - fi - - if [ "$dual_cards_installed" == "true" ]; then - lora_2_args="--lora-hw-2 $lora_2_hw --lora-prod-2 $lora_2_id --lora-eui-2 $lora_2_eui" - fi - - echo -n "Starting $NAME: " - # start network server - start-stop-daemon --start --background --make-pidfile \ - --pidfile $net_server_pidfile --startas /bin/bash -- -c "exec $angel $net_server \ - -c $conf_file --lora-eui $lora_eui --lora-hw-1 $lora_hw --lora-prod-1 $lora_id $lora_2_args \ - --lora-path $run_dir \ - --noconsole 2>&1" - - if [ "$no_lora_hw" != "true" ]; then - # start packet forwarder - sleep 2 - /usr/sbin/start-stop-daemon --chdir $run_dir/1 --start --background --make-pidfile \ - --pidfile $pkt_fwd_pidfile --startas /bin/bash \ - -- -c "exec $angel $pkt_fwd $pkt_fwd_options 2>&1" - - if [ "$dual_cards_installed" == "true" ]; then - /usr/sbin/start-stop-daemon --chdir $run_dir/2 --start --background --make-pidfile \ - --pidfile $pkt_fwd_2_pidfile --startas /bin/bash \ - -- -c "exec $angel $pkt_fwd_2 $pkt_fwd_options 2>&1 >> $pkt_fwd_2_log" - fi - fi - - renice -n -20 -p $(pgrep lora-network-se) - renice -n -20 -p $(pgrep $(basename $pkt_fwd)) - - - echo "OK" -} - - -do_stop() { - echo -n "Stopping $NAME: " - start-stop-daemon --stop --quiet --oknodo --pidfile $net_server_pidfile --retry TERM/60/KILL/5 - start-stop-daemon --stop --quiet --oknodo --pidfile $pkt_fwd_pidfile --retry 5 - rm -f $net_server_pidfile $pkt_fwd_pidfile - echo "OK" -} - - -if [ "$ENABLED" != "yes" ]; then - echo "$NAME: disabled in /etc/default" - exit -fi - -force_stop() { - do_stop - rm -fr $LOCK -} - -function try_lock() { - if mkdir $LOCK; then - trap "rm -fr $LOCK" EXIT - else - echo "Lora Network Server lock not acquired, resource in use" - exit 1 - fi -} - -case "$1" in - "start") - try_lock - do_start - ;; - "stop") - force_stop - ;; - "restart") - ## Stop the service and regardless of whether it was - ## running or not, start it again. - try_lock - do_stop - do_start - ;; - *) - ## If no parameters are given, print which are avaiable. - echo "Usage: $0 {start|stop|restart}" - exit 1 - ;; -esac - diff --git a/recipes-connectivity/lora/lora-network-server_2.3.9.bb b/recipes-connectivity/lora/lora-network-server_2.3.9.bb deleted file mode 100644 index 7e63635..0000000 --- a/recipes-connectivity/lora/lora-network-server_2.3.9.bb +++ /dev/null @@ -1,48 +0,0 @@ -DESCRIPTION = "MultiTech LoRa Network Server" -PRIORITY = "optional" -SECTION = "console/utils" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2b9a30a3082ddccd2c695a4dbeeab80d" -DEPENDS = "jsoncpp libmts mosquitto sqlite3 curl gnutls" -RDEPENDS_${PN} += "lora-packet-forwarder logrotate bash lora-logging jsoncpp" -PR = "r0" -CONFFILES_${PN} += "${sysconfdir}/default/lora-network-server ${sysconfdir}/init.d/lora-network-server" - -SRC_URI = "http://multitech.net/downloads/lora-network-server_${PV}.tar.gz \ - file://lora-network-server.init \ - file://lora-network-server.default \ - " - -SRC_URI[md5sum] = "88110a6a04b7c8ed02ee30102ba31e49" -SRC_URI[sha256sum] = "a2f0305b0eb48d55a53b1dc358bde4618688ccf952c79f5d9d2e2d7474f28042" - -# binaries are already stripped, so suppress warning -INSANE_SKIP_${PN} = "already-stripped" - -S = "${WORKDIR}" - -LORA_DIR = "/opt/lora" - -do_compile() { -} - -inherit update-rc.d - -INITSCRIPT_NAME = "lora-network-server" -INITSCRIPT_PARAMS = "defaults 80 30" - -do_install() { - install -d ${D}${LORA_DIR} - install -m 0755 lora-network-server-arm926ejste-mlinux-5.2 ${D}${LORA_DIR}/lora-network-server - install -m 0755 lora-v21-keygen-arm926ejste-mlinux-5.2 ${D}${LORA_DIR}/lora-v21-keygen - install -m 0644 config/lora-network-server.conf.sample ${D}${LORA_DIR}/lora-network-server.conf.sample - install -m 0644 config/lora-network-server.conf.full ${D}${LORA_DIR}/lora-network-server.conf.full - - install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/lora-network-server.default ${D}${sysconfdir}/default/lora-network-server - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/lora-network-server.init ${D}${sysconfdir}/init.d/lora-network-server -} - -FILES_${PN} += "${LORA_DIR}" -FILES_${PN}-dbg += "${LORA_DIR}/.debug" diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_full_diversity_EU868 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_full_diversity_EU868 deleted file mode 100644 index 9b45d1d..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_full_diversity_EU868 +++ /dev/null @@ -1,152 +0,0 @@ -{ - "SX1301_array_conf":[ - { - "board_type": "MASTER", - "board_rx_freq": 866500000, /* radio RX central frequency in Hz */ - "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */ - "full_duplex": false, /* radio mode */ - "rf_chain_conf":[ - { - /* RX */ - "rx_enable": true, - "rssi_offset": -202.5, - "rssi_offset_coeff_a": 20, - "rssi_offset_coeff_b": 2925, - /* TX */ - "tx_enable": true, - "tx_freq_min": 863000000, - "tx_freq_max": 870000000, - "tx_lut":[ - { "rf_power": 2, "fpga_dig_gain": 4, "ad9361_atten": 125, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 5, "fpga_dig_gain": 4, "ad9361_atten": 112, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 7, "fpga_dig_gain": 4, "ad9361_atten": 105, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 9, "fpga_dig_gain": 4, "ad9361_atten": 98, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 }, - { "rf_power": 11, "fpga_dig_gain": 4, "ad9361_atten": 90, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 }, - { "rf_power": 12, "fpga_dig_gain": 4, "ad9361_atten": 86, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 }, - { "rf_power": 13, "fpga_dig_gain": 4, "ad9361_atten": 83, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 }, - { "rf_power": 14, "fpga_dig_gain": 4, "ad9361_atten": 77, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 }, - { "rf_power": 16, "fpga_dig_gain": 4, "ad9361_atten": 68, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 }, - { "rf_power": 18, "fpga_dig_gain": 4, "ad9361_atten": 59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 }, - { "rf_power": 20, "fpga_dig_gain": 4, "ad9361_atten": 51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 }, - { "rf_power": 22, "fpga_dig_gain": 4, "ad9361_atten": 44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 }, - { "rf_power": 24, "fpga_dig_gain": 4, "ad9361_atten": 34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 }, - { "rf_power": 25, "fpga_dig_gain": 4, "ad9361_atten": 30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 }, - { "rf_power": 26, "fpga_dig_gain": 4, "ad9361_atten": 24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 }, - { "rf_power": 27, "fpga_dig_gain": 4, "ad9361_atten": 20, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }] - },{ - /* RX */ - "rx_enable": true, - "rssi_offset": -202.5, - "rssi_offset_coeff_a": 20, - "rssi_offset_coeff_b": 2925, - /* TX */ - "tx_enable": true, - "tx_freq_min": 863000000, - "tx_freq_max": 870000000, - "tx_lut":[ - { "rf_power": 2, "fpga_dig_gain": 4, "ad9361_atten": 125, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 5, "fpga_dig_gain": 4, "ad9361_atten": 112, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 7, "fpga_dig_gain": 4, "ad9361_atten": 105, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 9, "fpga_dig_gain": 4, "ad9361_atten": 98, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 }, - { "rf_power": 11, "fpga_dig_gain": 4, "ad9361_atten": 90, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 }, - { "rf_power": 12, "fpga_dig_gain": 4, "ad9361_atten": 86, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 }, - { "rf_power": 13, "fpga_dig_gain": 4, "ad9361_atten": 83, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 }, - { "rf_power": 14, "fpga_dig_gain": 4, "ad9361_atten": 77, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 }, - { "rf_power": 16, "fpga_dig_gain": 4, "ad9361_atten": 68, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 }, - { "rf_power": 18, "fpga_dig_gain": 4, "ad9361_atten": 59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 }, - { "rf_power": 20, "fpga_dig_gain": 4, "ad9361_atten": 51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 }, - { "rf_power": 22, "fpga_dig_gain": 4, "ad9361_atten": 44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 }, - { "rf_power": 24, "fpga_dig_gain": 4, "ad9361_atten": 34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 }, - { "rf_power": 25, "fpga_dig_gain": 4, "ad9361_atten": 30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 }, - { "rf_power": 26, "fpga_dig_gain": 4, "ad9361_atten": 24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 }, - { "rf_power": 27, "fpga_dig_gain": 4, "ad9361_atten": 20, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }] - }], - "SX1301_conf":[ - { - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 1, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - }], - "lbt_conf":{ - "enable": false, - "rssi_target": -80, /* dBm */ - "rssi_shift": 142, - "chan_cfg":[ /* 16 channels maximum */ - { "freq_hz": 867100000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867300000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867500000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867700000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867900000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 868100000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 868300000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 868500000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 869525000, "scan_time_us": 5000, "transmit_time_ms": 4000 } - ] - }, - "FSK_sync": "C194C1", - "loramac_public": true, - "nb_dsp": 1, - "dsp_stat_interval": 10, - "aes_key": "ABCDEF0123456789ABCDEF0123456789", - "calibration_temperature_celsius_room": 22, - "calibration_temperature_code_ad9361": 77, - "fts_version": 1, - "fts_match_crc_error": false - }], - "gateway_conf": { - "gateway_ID": "00AEAEFFFE000000", - /* change with default server address/ports */ - "server_address": "127.0.0.1", - "serv_port_up": 1780, - "serv_port_down": 1782, - /* adjust the following parameters for your network */ - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - /* forward only valid packets */ - "forward_crc_valid": true, - "forward_crc_error": false, - "forward_crc_disabled": false, - /* link testing mote */ - "link_mote": "00CC01AF", - /* Beaconing parameters */ - "beacon_conf":{ - "period": 128, - "freq_hz": 869525000, - "datarate": 9, - "bw_hz": 125000, - "power": 14, - "infodesc": 0 - } - }, - "gps_conf": { - "gw_latitude": 0, - "gw_longitude": 0, - "gw_altitude": 0, - "fixed_altitude": false - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_full_diversity_JP920 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_full_diversity_JP920 deleted file mode 100644 index 2229cb9..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_full_diversity_JP920 +++ /dev/null @@ -1,151 +0,0 @@ -{ - "SX1301_array_conf":[ - { - "board_type": "MASTER", - "board_rx_freq": 921900000, /* radio RX central frequency in Hz */ - "board_rx_bw": 4000000, /* radio RX bandwidth in Hz */ - "full_duplex": false, /* radio mode */ - "rf_chain_conf":[ - { - /* RX */ - "rx_enable": true, - "rssi_offset": -202.5, - "rssi_offset_coeff_a": 20, - "rssi_offset_coeff_b": 2925, - /* TX */ - "tx_enable": true, - "tx_freq_min": 920800000, - "tx_freq_max": 923400000, - "tx_lut":[ - { "rf_power": 2, "fpga_dig_gain": 5, "ad9361_atten": 135, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 5, "fpga_dig_gain": 5, "ad9361_atten": 122, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 7, "fpga_dig_gain": 5, "ad9361_atten": 115, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 9, "fpga_dig_gain": 5, "ad9361_atten": 108, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 }, - { "rf_power": 11, "fpga_dig_gain": 5, "ad9361_atten": 100, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 }, - { "rf_power": 12, "fpga_dig_gain": 5, "ad9361_atten": 96, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 }, - { "rf_power": 13, "fpga_dig_gain": 5, "ad9361_atten": 93, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 }, - { "rf_power": 14, "fpga_dig_gain": 5, "ad9361_atten": 87, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 }, - { "rf_power": 16, "fpga_dig_gain": 5, "ad9361_atten": 78, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 }, - { "rf_power": 18, "fpga_dig_gain": 5, "ad9361_atten": 69, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 }, - { "rf_power": 20, "fpga_dig_gain": 5, "ad9361_atten": 61, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 }, - { "rf_power": 22, "fpga_dig_gain": 5, "ad9361_atten": 54, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 }, - { "rf_power": 24, "fpga_dig_gain": 5, "ad9361_atten": 44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 }, - { "rf_power": 25, "fpga_dig_gain": 5, "ad9361_atten": 40, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 }, - { "rf_power": 26, "fpga_dig_gain": 5, "ad9361_atten": 34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 }, - { "rf_power": 27, "fpga_dig_gain": 5, "ad9361_atten": 30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }] - },{ - /* RX */ - "rx_enable": true, - "rssi_offset": -202.5, - "rssi_offset_coeff_a": 20, - "rssi_offset_coeff_b": 2925, - /* TX */ - "tx_enable": true, - "tx_freq_min": 920800000, - "tx_freq_max": 923400000, - "tx_lut":[ - { "rf_power": 2, "fpga_dig_gain": 5, "ad9361_atten": 135, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 5, "fpga_dig_gain": 5, "ad9361_atten": 122, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 7, "fpga_dig_gain": 5, "ad9361_atten": 115, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 9, "fpga_dig_gain": 5, "ad9361_atten": 108, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 }, - { "rf_power": 11, "fpga_dig_gain": 5, "ad9361_atten": 100, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 }, - { "rf_power": 12, "fpga_dig_gain": 5, "ad9361_atten": 96, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 }, - { "rf_power": 13, "fpga_dig_gain": 5, "ad9361_atten": 93, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 }, - { "rf_power": 14, "fpga_dig_gain": 5, "ad9361_atten": 87, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 }, - { "rf_power": 16, "fpga_dig_gain": 5, "ad9361_atten": 78, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 }, - { "rf_power": 18, "fpga_dig_gain": 5, "ad9361_atten": 69, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 }, - { "rf_power": 20, "fpga_dig_gain": 5, "ad9361_atten": 61, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 }, - { "rf_power": 22, "fpga_dig_gain": 5, "ad9361_atten": 54, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 }, - { "rf_power": 24, "fpga_dig_gain": 5, "ad9361_atten": 44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 }, - { "rf_power": 25, "fpga_dig_gain": 5, "ad9361_atten": 40, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 }, - { "rf_power": 26, "fpga_dig_gain": 5, "ad9361_atten": 34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 }, - { "rf_power": 27, "fpga_dig_gain": 5, "ad9361_atten": 30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }] - }], - "SX1301_conf":[ - { - "chip_enable": true, - "chip_center_freq": 922700000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 922000000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 922200000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 922400000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 922600000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 922800000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 923000000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 923200000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 923400000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 923200000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 923700000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 922700000, - "chip_rf_chain": 1, - "chan_multiSF_0": { "chan_rx_freq": 922000000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 922200000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 922400000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 922600000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 922800000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 923000000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 923200000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 923400000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 923200000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 923700000, "bandwidth": 125000, "bit_rate": 50000 } - }], - "lbt_conf":{ - "enable": true, - "rssi_target": -80, /* dBm */ - "rssi_shift": 142, - "chan_cfg":[ /* 16 channels maximum */ - { "freq_hz": 920800000, "scan_time_us": 5000, "transmit_time_ms": 4000 }, - { "freq_hz": 921000000, "scan_time_us": 5000, "transmit_time_ms": 4000 }, - { "freq_hz": 921200000, "scan_time_us": 5000, "transmit_time_ms": 4000 }, - { "freq_hz": 921400000, "scan_time_us": 5000, "transmit_time_ms": 4000 }, - { "freq_hz": 921600000, "scan_time_us": 5000, "transmit_time_ms": 4000 }, - { "freq_hz": 921800000, "scan_time_us": 5000, "transmit_time_ms": 4000 }, - { "freq_hz": 923200000, "scan_time_us": 5000, "transmit_time_ms": 4000 }, - { "freq_hz": 923400000, "scan_time_us": 5000, "transmit_time_ms": 4000 } - ] - }, - "FSK_sync": "C194C1", - "loramac_public": true, - "nb_dsp": 1, - "dsp_stat_interval": 10, - "aes_key": "ABCDEF0123456789ABCDEF0123456789", - "calibration_temperature_celsius_room": 22, - "calibration_temperature_code_ad9361": 77, - "fts_version": 1, - "fts_match_crc_error": false - }], - "gateway_conf": { - "gateway_ID": "00AEAEFFFE000000", - /* change with default server address/ports */ - "server_address": "127.0.0.1", - "serv_port_up": 1780, - "serv_port_down": 1782, - /* adjust the following parameters for your network */ - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - /* forward only valid packets */ - "forward_crc_valid": true, - "forward_crc_error": false, - "forward_crc_disabled": false, - /* link testing mote */ - "link_mote": "00CC01AF", - /* Beaconing parameters */ - "beacon_conf":{ - "period": 128, - "freq_hz": 923400000, - "datarate": 9, - "bw_hz": 125000, - "power": 14, - "infodesc": 0 - } - }, - "gps_conf": { - "gw_latitude": 0, - "gw_longitude": 0, - "gw_altitude": 0, - "fixed_altitude": false - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_partial_diversity_EU868 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_partial_diversity_EU868 deleted file mode 100644 index d7ac24d..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_partial_diversity_EU868 +++ /dev/null @@ -1,152 +0,0 @@ -{ - "SX1301_array_conf":[ - { - "board_type": "MASTER", - "board_rx_freq": 866500000, /* radio RX central frequency in Hz */ - "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */ - "full_duplex": false, /* radio mode */ - "rf_chain_conf":[ - { - /* RX */ - "rx_enable": true, - "rssi_offset": -202.5, - "rssi_offset_coeff_a": 20, - "rssi_offset_coeff_b": 2925, - /* TX */ - "tx_enable": true, - "tx_freq_min": 863000000, - "tx_freq_max": 870000000, - "tx_lut":[ - { "rf_power": 2, "fpga_dig_gain": 4, "ad9361_atten": 125, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 5, "fpga_dig_gain": 4, "ad9361_atten": 112, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 7, "fpga_dig_gain": 4, "ad9361_atten": 105, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 9, "fpga_dig_gain": 4, "ad9361_atten": 98, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 }, - { "rf_power": 11, "fpga_dig_gain": 4, "ad9361_atten": 90, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 }, - { "rf_power": 12, "fpga_dig_gain": 4, "ad9361_atten": 86, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 }, - { "rf_power": 13, "fpga_dig_gain": 4, "ad9361_atten": 83, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 }, - { "rf_power": 14, "fpga_dig_gain": 4, "ad9361_atten": 77, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 }, - { "rf_power": 16, "fpga_dig_gain": 4, "ad9361_atten": 68, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 }, - { "rf_power": 18, "fpga_dig_gain": 4, "ad9361_atten": 59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 }, - { "rf_power": 20, "fpga_dig_gain": 4, "ad9361_atten": 51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 }, - { "rf_power": 22, "fpga_dig_gain": 4, "ad9361_atten": 44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 }, - { "rf_power": 24, "fpga_dig_gain": 4, "ad9361_atten": 34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 }, - { "rf_power": 25, "fpga_dig_gain": 4, "ad9361_atten": 30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 }, - { "rf_power": 26, "fpga_dig_gain": 4, "ad9361_atten": 24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 }, - { "rf_power": 27, "fpga_dig_gain": 4, "ad9361_atten": 20, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }] - },{ - /* RX */ - "rx_enable": true, - "rssi_offset": -202.5, - "rssi_offset_coeff_a": 20, - "rssi_offset_coeff_b": 2925, - /* TX */ - "tx_enable": true, - "tx_freq_min": 863000000, - "tx_freq_max": 870000000, - "tx_lut":[ - { "rf_power": 2, "fpga_dig_gain": 4, "ad9361_atten": 125, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 5, "fpga_dig_gain": 4, "ad9361_atten": 112, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 7, "fpga_dig_gain": 4, "ad9361_atten": 105, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 9, "fpga_dig_gain": 4, "ad9361_atten": 98, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 }, - { "rf_power": 11, "fpga_dig_gain": 4, "ad9361_atten": 90, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 }, - { "rf_power": 12, "fpga_dig_gain": 4, "ad9361_atten": 86, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 }, - { "rf_power": 13, "fpga_dig_gain": 4, "ad9361_atten": 83, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 }, - { "rf_power": 14, "fpga_dig_gain": 4, "ad9361_atten": 77, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 }, - { "rf_power": 16, "fpga_dig_gain": 4, "ad9361_atten": 68, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 }, - { "rf_power": 18, "fpga_dig_gain": 4, "ad9361_atten": 59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 }, - { "rf_power": 20, "fpga_dig_gain": 4, "ad9361_atten": 51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 }, - { "rf_power": 22, "fpga_dig_gain": 4, "ad9361_atten": 44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 }, - { "rf_power": 24, "fpga_dig_gain": 4, "ad9361_atten": 34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 }, - { "rf_power": 25, "fpga_dig_gain": 4, "ad9361_atten": 30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 }, - { "rf_power": 26, "fpga_dig_gain": 4, "ad9361_atten": 24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 }, - { "rf_power": 27, "fpga_dig_gain": 4, "ad9361_atten": 20, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }] - }], - "SX1301_conf":[ - { - "chip_enable": true, - "chip_center_freq": 867000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 866500000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 866700000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 866900000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 867300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 867800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 1, - "chan_multiSF_0": { "chan_rx_freq": 869100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 869300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868700000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - }], - "lbt_conf":{ - "enable": false, - "rssi_target": -80, /* dBm */ - "rssi_shift": 142, - "chan_cfg":[ /* 16 channels maximum */ - { "freq_hz": 867100000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867300000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867500000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867700000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867900000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 868100000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 868300000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 868500000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 869525000, "scan_time_us": 5000, "transmit_time_ms": 4000 } - ] - }, - "FSK_sync": "C194C1", - "loramac_public": true, - "nb_dsp": 1, - "dsp_stat_interval": 10, - "aes_key": "ABCDEF0123456789ABCDEF0123456789", - "calibration_temperature_celsius_room": 22, - "calibration_temperature_code_ad9361": 77, - "fts_version": 1, - "fts_match_crc_error": false - }], - "gateway_conf": { - "gateway_ID": "00AEAEFFFE000000", - /* change with default server address/ports */ - "server_address": "127.0.0.1", - "serv_port_up": 1780, - "serv_port_down": 1782, - /* adjust the following parameters for your network */ - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - /* forward only valid packets */ - "forward_crc_valid": true, - "forward_crc_error": false, - "forward_crc_disabled": false, - /* link testing mote */ - "link_mote": "00CC01AF", - /* Beaconing parameters */ - "beacon_conf":{ - "period": 128, - "freq_hz": 869525000, - "datarate": 9, - "bw_hz": 125000, - "power": 14, - "infodesc": 0 - } - }, - "gps_conf": { - "gw_latitude": 0, - "gw_longitude": 0, - "gw_altitude": 0, - "fixed_altitude": false - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_EU868 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_EU868 deleted file mode 100644 index 9c7f2b4..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_EU868 +++ /dev/null @@ -1,125 +0,0 @@ -{ - "SX1301_array_conf":[ - { - "board_type": "MASTER", - "board_rx_freq": 866500000, /* radio RX central frequency in Hz */ - "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */ - "full_duplex": false, /* radio mode */ - "rf_chain_conf":[ - { - /* RX */ - "rx_enable": true, - "rssi_offset": -202.5, - "rssi_offset_coeff_a": 20, - "rssi_offset_coeff_b": 2925, - /* TX */ - "tx_enable": true, - "tx_freq_min": 863000000, - "tx_freq_max": 870000000, - "tx_lut":[ - { "rf_power": 2, "fpga_dig_gain": 4, "ad9361_atten": 125, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 5, "fpga_dig_gain": 4, "ad9361_atten": 112, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 7, "fpga_dig_gain": 4, "ad9361_atten": 105, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 9, "fpga_dig_gain": 4, "ad9361_atten": 98, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 }, - { "rf_power": 11, "fpga_dig_gain": 4, "ad9361_atten": 90, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 }, - { "rf_power": 12, "fpga_dig_gain": 4, "ad9361_atten": 86, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 }, - { "rf_power": 13, "fpga_dig_gain": 4, "ad9361_atten": 83, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 }, - { "rf_power": 14, "fpga_dig_gain": 4, "ad9361_atten": 77, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 }, - { "rf_power": 16, "fpga_dig_gain": 4, "ad9361_atten": 68, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 }, - { "rf_power": 18, "fpga_dig_gain": 4, "ad9361_atten": 59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 }, - { "rf_power": 20, "fpga_dig_gain": 4, "ad9361_atten": 51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 }, - { "rf_power": 22, "fpga_dig_gain": 4, "ad9361_atten": 44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 }, - { "rf_power": 24, "fpga_dig_gain": 4, "ad9361_atten": 34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 }, - { "rf_power": 25, "fpga_dig_gain": 4, "ad9361_atten": 30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 }, - { "rf_power": 26, "fpga_dig_gain": 4, "ad9361_atten": 24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 }, - { "rf_power": 27, "fpga_dig_gain": 4, "ad9361_atten": 20, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }] - }], - "SX1301_conf":[ - { - "chip_enable": true, - "chip_center_freq": 865600000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 864900000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 865100000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 865300000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 865500000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 865700000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 865900000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 866100000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 866300000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 866100000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 866600000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868700000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868900000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 869100000, "bandwidth": 125000, "bit_rate": 50000 } - }], - "lbt_conf":{ - "enable": false, - "rssi_target": -80, /* dBm */ - "rssi_shift": 142, - "chan_cfg":[ /* 16 channels maximum */ - { "freq_hz": 867100000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867300000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867500000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867700000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867900000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 868100000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 868300000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 868500000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 869525000, "scan_time_us": 5000, "transmit_time_ms": 4000 } - ] - }, - "FSK_sync": "C194C1", - "loramac_public": true, - "nb_dsp": 1, - "dsp_stat_interval": 10, - "aes_key": "ABCDEF0123456789ABCDEF0123456789", - "calibration_temperature_celsius_room": 22, - "calibration_temperature_code_ad9361": 77, - "fts_version": 1, - "fts_match_crc_error": false - }], - "gateway_conf": { - "gateway_ID": "00AEAEFFFE000000", - /* change with default server address/ports */ - "server_address": "127.0.0.1", - "serv_port_up": 1780, - "serv_port_down": 1782, - /* adjust the following parameters for your network */ - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - /* forward only valid packets */ - "forward_crc_valid": true, - "forward_crc_error": false, - "forward_crc_disabled": false, - /* link testing mote */ - "link_mote": "00CC01AF", - /* Beaconing parameters */ - "beacon_conf":{ - "period": 128, - "freq_hz": 869525000, - "datarate": 9, - "bw_hz": 125000, - "power": 14, - "infodesc": 0 - } - }, - "gps_conf": { - "gw_latitude": 0, - "gw_longitude": 0, - "gw_altitude": 0, - "fixed_altitude": false - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_US915 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_US915 deleted file mode 100644 index d6f1123..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_US915 +++ /dev/null @@ -1,111 +0,0 @@ -{ - "SX1301_array_conf":[ - { - "board_type": "MASTER", - "board_rx_freq": 908600000, /* radio RX central frequency in Hz */ - "board_rx_bw": 13000000, /* radio RX bandwidth in Hz */ - "full_duplex": false, /* radio mode */ - "rf_chain_conf":[ - { - /* RX */ - "rx_enable": true, - "rssi_offset": -202.5, - "rssi_offset_coeff_a": 20, - "rssi_offset_coeff_b": 2925, - /* TX */ - "tx_enable": true, - "tx_freq_min": 923300000, - "tx_freq_max": 927500000, - "tx_lut":[ - { "rf_power": 9, "fpga_dig_gain": 5, "ad9361_atten": 104, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -23, "ad9361_tcomp_coeff_b": 3177 }, - { "rf_power": 11, "fpga_dig_gain": 5, "ad9361_atten": 96, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -21, "ad9361_tcomp_coeff_b": 2888 }, - { "rf_power": 12, "fpga_dig_gain": 5, "ad9361_atten": 93, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -20, "ad9361_tcomp_coeff_b": 2683 }, - { "rf_power": 13, "fpga_dig_gain": 5, "ad9361_atten": 88, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -20, "ad9361_tcomp_coeff_b": 2530 }, - { "rf_power": 14, "fpga_dig_gain": 5, "ad9361_atten": 84, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 2367 }, - { "rf_power": 16, "fpga_dig_gain": 5, "ad9361_atten": 75, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 1943 }, - { "rf_power": 18, "fpga_dig_gain": 5, "ad9361_atten": 67, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 1537 }, - { "rf_power": 20, "fpga_dig_gain": 5, "ad9361_atten": 59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 1135 }, - { "rf_power": 22, "fpga_dig_gain": 5, "ad9361_atten": 51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": 714 }, - { "rf_power": 24, "fpga_dig_gain": 5, "ad9361_atten": 42, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": 262 }, - { "rf_power": 25, "fpga_dig_gain": 5, "ad9361_atten": 38, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -6 }, - { "rf_power": 26, "fpga_dig_gain": 5, "ad9361_atten": 33, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -8, "ad9361_tcomp_coeff_b": -193 }, - { "rf_power": 27, "fpga_dig_gain": 5, "ad9361_atten": 29, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -356 }, - { "rf_power": 28, "fpga_dig_gain": 5, "ad9361_atten": 24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -6, "ad9361_tcomp_coeff_b": -470 }, - { "rf_power": 29, "fpga_dig_gain": 5, "ad9361_atten": 18, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -6, "ad9361_tcomp_coeff_b": -534 }, - { "rf_power": 30, "fpga_dig_gain": 5, "ad9361_atten": 11, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -4, "ad9361_tcomp_coeff_b": -589 }] - }], - "SX1301_conf":[ - { - "chip_enable": true, - "chip_center_freq": 907800000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 907100000 , "spread_factor": "7-10" }, - "chan_multiSF_1": { "chan_rx_freq": 907300000 , "spread_factor": "7-10" }, - "chan_multiSF_2": { "chan_rx_freq": 907500000 , "spread_factor": "7-10" }, - "chan_multiSF_3": { "chan_rx_freq": 907700000 , "spread_factor": "7-10" }, - "chan_multiSF_4": { "chan_rx_freq": 907900000 , "spread_factor": "7-10" }, - "chan_multiSF_5": { "chan_rx_freq": 908100000 , "spread_factor": "7-10" }, - "chan_multiSF_6": { "chan_rx_freq": 908300000 , "spread_factor": "7-10" }, - "chan_multiSF_7": { "chan_rx_freq": 908500000 , "spread_factor": "7-10" }, - "chan_LoRa_std" : { "chan_rx_freq": 907800000 , "bandwidth": 500000, "spread_factor": 8 }, - "chan_FSK" : { "chan_rx_freq": 907800000 , "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 909400000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 908700000 , "spread_factor": "7-10" }, - "chan_multiSF_1": { "chan_rx_freq": 908900000 , "spread_factor": "7-10" }, - "chan_multiSF_2": { "chan_rx_freq": 909100000 , "spread_factor": "7-10" }, - "chan_multiSF_3": { "chan_rx_freq": 909300000 , "spread_factor": "7-10" }, - "chan_multiSF_4": { "chan_rx_freq": 909500000 , "spread_factor": "7-10" }, - "chan_multiSF_5": { "chan_rx_freq": 909700000 , "spread_factor": "7-10" }, - "chan_multiSF_6": { "chan_rx_freq": 909900000 , "spread_factor": "7-10" }, - "chan_multiSF_7": { "chan_rx_freq": 910100000 , "spread_factor": "7-10" }, - "chan_LoRa_std" : { "chan_rx_freq": 909400000 , "bandwidth": 500000, "spread_factor": 8 }, - "chan_FSK" : { "chan_rx_freq": 909400000 , "bandwidth": 125000, "bit_rate": 50000 } - }], - "FSK_sync": "C194C1", - "loramac_public": true, - "nb_dsp": 1, - "dsp_stat_interval": 10, - "aes_key": "ABCDEF0123456789ABCDEF0123456789", - "calibration_temperature_celsius_room": 22, - "calibration_temperature_code_ad9361": 77, - "fts_version": 1, - "fts_match_crc_error": false - }], - "gateway_conf": { - "gateway_ID": "00AEAEFFFE000000", - /* change with default server address/ports */ - "server_address": "127.0.0.1", - "serv_port_up": 1780, - "serv_port_down": 1782, - /* adjust the following parameters for your network */ - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - /* forward only valid packets */ - "forward_crc_valid": true, - "forward_crc_error": false, - "forward_crc_disabled": false, - /* link testing mote */ - "link_mote": "00CC01AF", - /* Beaconing parameters */ - "beacon_conf":{ - "period": 128, - "freq_hz": 923300000, - "freq_nb": 8, - "freq_step": 600000, - "datarate": 12, - "bw_hz": 500000, - "power": 14, - "infodesc": 0 - } - }, - "gps_conf": { - "gw_latitude": 0, - "gw_longitude": 0, - "gw_altitude": 0, - "fixed_altitude": false - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_64ch_US915 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_64ch_US915 deleted file mode 100644 index 9133313..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_64ch_US915 +++ /dev/null @@ -1,211 +0,0 @@ -{ - "SX1301_array_conf":[ - { - "board_type": "MASTER", - "board_rx_freq": 908600000, /* radio RX central frequency in Hz */ - "board_rx_bw": 13000000, /* radio RX bandwidth in Hz */ - "full_duplex": false, /* radio mode */ - "rf_chain_conf":[ - { - /* RX */ - "rx_enable": true, - "rssi_offset": -202.5, - "rssi_offset_coeff_a": 20, - "rssi_offset_coeff_b": 2925, - /* TX */ - "tx_enable": true, - "tx_freq_min": 923300000, - "tx_freq_max": 927500000, - "tx_lut":[ - { "rf_power": 9, "fpga_dig_gain": 5, "ad9361_atten": 104, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -23, "ad9361_tcomp_coeff_b": 3177 }, - { "rf_power": 11, "fpga_dig_gain": 5, "ad9361_atten": 96, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -21, "ad9361_tcomp_coeff_b": 2888 }, - { "rf_power": 12, "fpga_dig_gain": 5, "ad9361_atten": 93, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -20, "ad9361_tcomp_coeff_b": 2683 }, - { "rf_power": 13, "fpga_dig_gain": 5, "ad9361_atten": 88, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -20, "ad9361_tcomp_coeff_b": 2530 }, - { "rf_power": 14, "fpga_dig_gain": 5, "ad9361_atten": 84, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 2367 }, - { "rf_power": 16, "fpga_dig_gain": 5, "ad9361_atten": 75, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 1943 }, - { "rf_power": 18, "fpga_dig_gain": 5, "ad9361_atten": 67, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 1537 }, - { "rf_power": 20, "fpga_dig_gain": 5, "ad9361_atten": 59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 1135 }, - { "rf_power": 22, "fpga_dig_gain": 5, "ad9361_atten": 51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": 714 }, - { "rf_power": 24, "fpga_dig_gain": 5, "ad9361_atten": 42, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": 262 }, - { "rf_power": 25, "fpga_dig_gain": 5, "ad9361_atten": 38, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -6 }, - { "rf_power": 26, "fpga_dig_gain": 5, "ad9361_atten": 33, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -8, "ad9361_tcomp_coeff_b": -193 }, - { "rf_power": 27, "fpga_dig_gain": 5, "ad9361_atten": 29, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -356 }, - { "rf_power": 28, "fpga_dig_gain": 5, "ad9361_atten": 24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -6, "ad9361_tcomp_coeff_b": -470 }, - { "rf_power": 29, "fpga_dig_gain": 5, "ad9361_atten": 18, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -6, "ad9361_tcomp_coeff_b": -534 }, - { "rf_power": 30, "fpga_dig_gain": 5, "ad9361_atten": 11, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -4, "ad9361_tcomp_coeff_b": -589 }] - }], - "SX1301_conf":[ - { - "chip_enable": true, - "chip_center_freq": 903000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 902300000, "spread_factor": "7-10" }, - "chan_multiSF_1": { "chan_rx_freq": 902500000, "spread_factor": "7-10" }, - "chan_multiSF_2": { "chan_rx_freq": 902700000, "spread_factor": "7-10" }, - "chan_multiSF_3": { "chan_rx_freq": 902900000, "spread_factor": "7-10" }, - "chan_multiSF_4": { "chan_rx_freq": 903100000, "spread_factor": "7-10" }, - "chan_multiSF_5": { "chan_rx_freq": 903300000, "spread_factor": "7-10" }, - "chan_multiSF_6": { "chan_rx_freq": 903500000, "spread_factor": "7-10" }, - "chan_multiSF_7": { "chan_rx_freq": 903700000, "spread_factor": "7-10" }, - "chan_LoRa_std" : { "chan_rx_freq": 903000000, "bandwidth": 500000, "spread_factor": 8 }, - "chan_FSK" : { "chan_rx_freq": 903000000, "bandwidth": 250000, "bit_rate": 100000 } - - },{ - "chip_enable": true, - "chip_center_freq": 904600000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 903900000, "spread_factor": "7-10" }, - "chan_multiSF_1": { "chan_rx_freq": 904100000, "spread_factor": "7-10" }, - "chan_multiSF_2": { "chan_rx_freq": 904300000, "spread_factor": "7-10" }, - "chan_multiSF_3": { "chan_rx_freq": 904500000, "spread_factor": "7-10" }, - "chan_multiSF_4": { "chan_rx_freq": 904700000, "spread_factor": "7-10" }, - "chan_multiSF_5": { "chan_rx_freq": 904900000, "spread_factor": "7-10" }, - "chan_multiSF_6": { "chan_rx_freq": 905100000, "spread_factor": "7-10" }, - "chan_multiSF_7": { "chan_rx_freq": 905300000, "spread_factor": "7-10" }, - "chan_LoRa_std" : { "chan_rx_freq": 904600000, "bandwidth": 500000, "spread_factor": 8 }, - "chan_FSK" : { "chan_rx_freq": 904600000, "bandwidth": 250000, "bit_rate": 100000 } - - }], - "FSK_sync": "C194C1", - "loramac_public": true, - "nb_dsp": 1, - "dsp_stat_interval": 10, - "aes_key": "ABCDEF0123456789ABCDEF0123456789", - "calibration_temperature_celsius_room": 22, - "calibration_temperature_code_ad9361": 77, - "fts_version": 1, - "fts_match_crc_error": false - }, - { - "board_type": "SLAVE", - "board_rx_freq": 908600000, /* radio RX central frequency in Hz */ - "board_rx_bw": 13000000, /* radio RX bandwidth in Hz */ - "SX1301_conf":[ - { - "chip_enable": true, - "chip_center_freq": 906200000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 905500000, "spread_factor": "7-10" }, - "chan_multiSF_1": { "chan_rx_freq": 905700000, "spread_factor": "7-10" }, - "chan_multiSF_2": { "chan_rx_freq": 905900000, "spread_factor": "7-10" }, - "chan_multiSF_3": { "chan_rx_freq": 906100000, "spread_factor": "7-10" }, - "chan_multiSF_4": { "chan_rx_freq": 906300000, "spread_factor": "7-10" }, - "chan_multiSF_5": { "chan_rx_freq": 906500000, "spread_factor": "7-10" }, - "chan_multiSF_6": { "chan_rx_freq": 906700000, "spread_factor": "7-10" }, - "chan_multiSF_7": { "chan_rx_freq": 906900000, "spread_factor": "7-10" }, - "chan_LoRa_std" : { "chan_rx_freq": 906200000, "bandwidth": 500000, "spread_factor": 8 }, - "chan_FSK" : { "chan_rx_freq": 906200000, "bandwidth": 250000, "bit_rate": 100000 } - - },{ - "chip_enable": true, - "chip_center_freq": 907800000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 907100000, "spread_factor": "7-10" }, - "chan_multiSF_1": { "chan_rx_freq": 907300000, "spread_factor": "7-10" }, - "chan_multiSF_2": { "chan_rx_freq": 907500000, "spread_factor": "7-10" }, - "chan_multiSF_3": { "chan_rx_freq": 907700000, "spread_factor": "7-10" }, - "chan_multiSF_4": { "chan_rx_freq": 907900000, "spread_factor": "7-10" }, - "chan_multiSF_5": { "chan_rx_freq": 908100000, "spread_factor": "7-10" }, - "chan_multiSF_6": { "chan_rx_freq": 908300000, "spread_factor": "7-10" }, - "chan_multiSF_7": { "chan_rx_freq": 908500000, "spread_factor": "7-10" }, - "chan_LoRa_std" : { "chan_rx_freq": 907800000, "bandwidth": 500000, "spread_factor": 8 }, - "chan_FSK" : { "chan_rx_freq": 907800000, "bandwidth": 250000, "bit_rate": 100000 } - - },{ - "chip_enable": true, - "chip_center_freq": 909400000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 908700000, "spread_factor": "7-10" }, - "chan_multiSF_1": { "chan_rx_freq": 908900000, "spread_factor": "7-10" }, - "chan_multiSF_2": { "chan_rx_freq": 909100000, "spread_factor": "7-10" }, - "chan_multiSF_3": { "chan_rx_freq": 909300000, "spread_factor": "7-10" }, - "chan_multiSF_4": { "chan_rx_freq": 909500000, "spread_factor": "7-10" }, - "chan_multiSF_5": { "chan_rx_freq": 909700000, "spread_factor": "7-10" }, - "chan_multiSF_6": { "chan_rx_freq": 909900000, "spread_factor": "7-10" }, - "chan_multiSF_7": { "chan_rx_freq": 910100000, "spread_factor": "7-10" }, - "chan_LoRa_std" : { "chan_rx_freq": 909400000, "bandwidth": 500000, "spread_factor": 8 }, - "chan_FSK" : { "chan_rx_freq": 909400000, "bandwidth": 250000, "bit_rate": 100000 } - },{ - "chip_enable": true, - "chip_center_freq": 911000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 910300000, "spread_factor": "7-10" }, - "chan_multiSF_1": { "chan_rx_freq": 910500000, "spread_factor": "7-10" }, - "chan_multiSF_2": { "chan_rx_freq": 910700000, "spread_factor": "7-10" }, - "chan_multiSF_3": { "chan_rx_freq": 910900000, "spread_factor": "7-10" }, - "chan_multiSF_4": { "chan_rx_freq": 911100000, "spread_factor": "7-10" }, - "chan_multiSF_5": { "chan_rx_freq": 911300000, "spread_factor": "7-10" }, - "chan_multiSF_6": { "chan_rx_freq": 911500000, "spread_factor": "7-10" }, - "chan_multiSF_7": { "chan_rx_freq": 911700000, "spread_factor": "7-10" }, - "chan_LoRa_std" : { "chan_rx_freq": 911000000, "bandwidth": 500000, "spread_factor": 8 }, - "chan_FSK" : { "chan_rx_freq": 911000000, "bandwidth": 250000, "bit_rate": 100000 } - },{ - "chip_enable": true, - "chip_center_freq": 912600000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 911900000, "spread_factor": "7-10" }, - "chan_multiSF_1": { "chan_rx_freq": 912100000, "spread_factor": "7-10" }, - "chan_multiSF_2": { "chan_rx_freq": 912300000, "spread_factor": "7-10" }, - "chan_multiSF_3": { "chan_rx_freq": 912500000, "spread_factor": "7-10" }, - "chan_multiSF_4": { "chan_rx_freq": 912700000, "spread_factor": "7-10" }, - "chan_multiSF_5": { "chan_rx_freq": 912900000, "spread_factor": "7-10" }, - "chan_multiSF_6": { "chan_rx_freq": 913100000, "spread_factor": "7-10" }, - "chan_multiSF_7": { "chan_rx_freq": 913300000, "spread_factor": "7-10" }, - "chan_LoRa_std" : { "chan_rx_freq": 912600000, "bandwidth": 500000, "spread_factor": 8 }, - "chan_FSK" : { "chan_rx_freq": 912600000, "bandwidth": 250000, "bit_rate": 100000 } - },{ - "chip_enable": true, - "chip_center_freq": 914200000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 913500000, "spread_factor": "7-10" }, - "chan_multiSF_1": { "chan_rx_freq": 913700000, "spread_factor": "7-10" }, - "chan_multiSF_2": { "chan_rx_freq": 913900000, "spread_factor": "7-10" }, - "chan_multiSF_3": { "chan_rx_freq": 914100000, "spread_factor": "7-10" }, - "chan_multiSF_4": { "chan_rx_freq": 914300000, "spread_factor": "7-10" }, - "chan_multiSF_5": { "chan_rx_freq": 914500000, "spread_factor": "7-10" }, - "chan_multiSF_6": { "chan_rx_freq": 914700000, "spread_factor": "7-10" }, - "chan_multiSF_7": { "chan_rx_freq": 914900000, "spread_factor": "7-10" }, - "chan_LoRa_std" : { "chan_rx_freq": 914200000, "bandwidth": 500000, "spread_factor": 8 }, - "chan_FSK" : { "chan_rx_freq": 914200000, "bandwidth": 250000, "bit_rate": 100000 } - }], - "FSK_sync": "C194C1", - "loramac_public": true, - "nb_dsp": 0, - "dsp_stat_interval": 10, - "aes_key": "ABCDEF0123456789ABCDEF0123456789" - }], - "gateway_conf": { - "gateway_ID": "00AEAEFFFE000000", - /* change with default server address/ports */ - "server_address": "127.0.0.1", - "serv_port_up": 1780, - "serv_port_down": 1782, - /* adjust the following parameters for your network */ - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - /* forward only valid packets */ - "forward_crc_valid": true, - "forward_crc_error": false, - "forward_crc_disabled": false, - /* link testing mote */ - "link_mote": "00CC01AF", - /* Beaconing parameters */ - "beacon_conf":{ - "period": 128, - "freq_hz": 923300000, - "freq_nb": 8, - "freq_step": 600000, - "datarate": 12, - "bw_hz": 500000, - "power": 14, - "infodesc": 0 - } - }, - "gps_conf": { - "gw_latitude": 0, - "gw_longitude": 0, - "gw_altitude": 0, - "fixed_altitude": false - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_full_duplex_64ch_US915 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_full_duplex_64ch_US915 deleted file mode 100644 index 0aaf4bf..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_full_duplex_64ch_US915 +++ /dev/null @@ -1,216 +0,0 @@ -{ - "SX1301_array_conf":[ - { - "board_type": "MASTER", - "board_rx_freq": 908600000, /* radio RX central frequency in Hz */ - "board_rx_bw": 13000000, /* radio RX bandwidth in Hz */ - "full_duplex": true, /* radio mode */ - "rf_chain_conf":[ - { - /* RX */ - "rx_enable": true, - "rssi_offset": -202.5, - "rssi_offset_coeff_a": 20, - "rssi_offset_coeff_b": 2925, - /* TX */ - "tx_enable": false - },{ - /* RX */ - "rx_enable": false, - /* TX */ - "tx_enable": true, - "tx_freq_min": 923300000, - "tx_freq_max": 927500000, - "tx_lut":[ - { "rf_power": 9, "fpga_dig_gain": 5, "ad9361_atten": 104, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -23, "ad9361_tcomp_coeff_b": 3177 }, - { "rf_power": 11, "fpga_dig_gain": 5, "ad9361_atten": 96, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -21, "ad9361_tcomp_coeff_b": 2888 }, - { "rf_power": 12, "fpga_dig_gain": 5, "ad9361_atten": 93, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -20, "ad9361_tcomp_coeff_b": 2683 }, - { "rf_power": 13, "fpga_dig_gain": 5, "ad9361_atten": 88, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -20, "ad9361_tcomp_coeff_b": 2530 }, - { "rf_power": 14, "fpga_dig_gain": 5, "ad9361_atten": 84, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 2367 }, - { "rf_power": 16, "fpga_dig_gain": 5, "ad9361_atten": 75, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 1943 }, - { "rf_power": 18, "fpga_dig_gain": 5, "ad9361_atten": 67, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 1537 }, - { "rf_power": 20, "fpga_dig_gain": 5, "ad9361_atten": 59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 1135 }, - { "rf_power": 22, "fpga_dig_gain": 5, "ad9361_atten": 51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": 714 }, - { "rf_power": 24, "fpga_dig_gain": 5, "ad9361_atten": 42, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": 262 }, - { "rf_power": 25, "fpga_dig_gain": 5, "ad9361_atten": 38, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -6 }, - { "rf_power": 26, "fpga_dig_gain": 5, "ad9361_atten": 33, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -8, "ad9361_tcomp_coeff_b": -193 }, - { "rf_power": 27, "fpga_dig_gain": 5, "ad9361_atten": 29, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -356 }, - { "rf_power": 28, "fpga_dig_gain": 5, "ad9361_atten": 24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -6, "ad9361_tcomp_coeff_b": -470 }, - { "rf_power": 29, "fpga_dig_gain": 5, "ad9361_atten": 18, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -6, "ad9361_tcomp_coeff_b": -534 }, - { "rf_power": 30, "fpga_dig_gain": 5, "ad9361_atten": 11, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -4, "ad9361_tcomp_coeff_b": -589 }] - }], - "SX1301_conf":[ - { - "chip_enable": true, - "chip_center_freq": 903000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 902300000, "spread_factor": "7-10" }, - "chan_multiSF_1": { "chan_rx_freq": 902500000, "spread_factor": "7-10" }, - "chan_multiSF_2": { "chan_rx_freq": 902700000, "spread_factor": "7-10" }, - "chan_multiSF_3": { "chan_rx_freq": 902900000, "spread_factor": "7-10" }, - "chan_multiSF_4": { "chan_rx_freq": 903100000, "spread_factor": "7-10" }, - "chan_multiSF_5": { "chan_rx_freq": 903300000, "spread_factor": "7-10" }, - "chan_multiSF_6": { "chan_rx_freq": 903500000, "spread_factor": "7-10" }, - "chan_multiSF_7": { "chan_rx_freq": 903700000, "spread_factor": "7-10" }, - "chan_LoRa_std" : { "chan_rx_freq": 903000000, "bandwidth": 500000, "spread_factor": 8 }, - "chan_FSK" : { "chan_rx_freq": 903000000, "bandwidth": 250000, "bit_rate": 100000 } - - },{ - "chip_enable": true, - "chip_center_freq": 904600000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 903900000, "spread_factor": "7-10" }, - "chan_multiSF_1": { "chan_rx_freq": 904100000, "spread_factor": "7-10" }, - "chan_multiSF_2": { "chan_rx_freq": 904300000, "spread_factor": "7-10" }, - "chan_multiSF_3": { "chan_rx_freq": 904500000, "spread_factor": "7-10" }, - "chan_multiSF_4": { "chan_rx_freq": 904700000, "spread_factor": "7-10" }, - "chan_multiSF_5": { "chan_rx_freq": 904900000, "spread_factor": "7-10" }, - "chan_multiSF_6": { "chan_rx_freq": 905100000, "spread_factor": "7-10" }, - "chan_multiSF_7": { "chan_rx_freq": 905300000, "spread_factor": "7-10" }, - "chan_LoRa_std" : { "chan_rx_freq": 904600000, "bandwidth": 500000, "spread_factor": 8 }, - "chan_FSK" : { "chan_rx_freq": 904600000, "bandwidth": 250000, "bit_rate": 100000 } - - }], - "FSK_sync": "C194C1", - "loramac_public": true, - "nb_dsp": 1, - "dsp_stat_interval": 10, - "aes_key": "ABCDEF0123456789ABCDEF0123456789", - "calibration_temperature_celsius_room": 22, - "calibration_temperature_code_ad9361": 77, - "fts_version": 1, - "fts_match_crc_error": false - }, - { - "board_type": "SLAVE", - "board_rx_freq": 908600000, /* radio RX central frequency in Hz */ - "board_rx_bw": 13000000, /* radio RX bandwidth in Hz */ - "SX1301_conf":[ - { - "chip_enable": true, - "chip_center_freq": 906200000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 905500000, "spread_factor": "7-10" }, - "chan_multiSF_1": { "chan_rx_freq": 905700000, "spread_factor": "7-10" }, - "chan_multiSF_2": { "chan_rx_freq": 905900000, "spread_factor": "7-10" }, - "chan_multiSF_3": { "chan_rx_freq": 906100000, "spread_factor": "7-10" }, - "chan_multiSF_4": { "chan_rx_freq": 906300000, "spread_factor": "7-10" }, - "chan_multiSF_5": { "chan_rx_freq": 906500000, "spread_factor": "7-10" }, - "chan_multiSF_6": { "chan_rx_freq": 906700000, "spread_factor": "7-10" }, - "chan_multiSF_7": { "chan_rx_freq": 906900000, "spread_factor": "7-10" }, - "chan_LoRa_std" : { "chan_rx_freq": 906200000, "bandwidth": 500000, "spread_factor": 8 }, - "chan_FSK" : { "chan_rx_freq": 906200000, "bandwidth": 250000, "bit_rate": 100000 } - - },{ - "chip_enable": true, - "chip_center_freq": 907800000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 907100000, "spread_factor": "7-10" }, - "chan_multiSF_1": { "chan_rx_freq": 907300000, "spread_factor": "7-10" }, - "chan_multiSF_2": { "chan_rx_freq": 907500000, "spread_factor": "7-10" }, - "chan_multiSF_3": { "chan_rx_freq": 907700000, "spread_factor": "7-10" }, - "chan_multiSF_4": { "chan_rx_freq": 907900000, "spread_factor": "7-10" }, - "chan_multiSF_5": { "chan_rx_freq": 908100000, "spread_factor": "7-10" }, - "chan_multiSF_6": { "chan_rx_freq": 908300000, "spread_factor": "7-10" }, - "chan_multiSF_7": { "chan_rx_freq": 908500000, "spread_factor": "7-10" }, - "chan_LoRa_std" : { "chan_rx_freq": 907800000, "bandwidth": 500000, "spread_factor": 8 }, - "chan_FSK" : { "chan_rx_freq": 907800000, "bandwidth": 250000, "bit_rate": 100000 } - - },{ - "chip_enable": true, - "chip_center_freq": 909400000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 908700000, "spread_factor": "7-10" }, - "chan_multiSF_1": { "chan_rx_freq": 908900000, "spread_factor": "7-10" }, - "chan_multiSF_2": { "chan_rx_freq": 909100000, "spread_factor": "7-10" }, - "chan_multiSF_3": { "chan_rx_freq": 909300000, "spread_factor": "7-10" }, - "chan_multiSF_4": { "chan_rx_freq": 909500000, "spread_factor": "7-10" }, - "chan_multiSF_5": { "chan_rx_freq": 909700000, "spread_factor": "7-10" }, - "chan_multiSF_6": { "chan_rx_freq": 909900000, "spread_factor": "7-10" }, - "chan_multiSF_7": { "chan_rx_freq": 910100000, "spread_factor": "7-10" }, - "chan_LoRa_std" : { "chan_rx_freq": 909400000, "bandwidth": 500000, "spread_factor": 8 }, - "chan_FSK" : { "chan_rx_freq": 909400000, "bandwidth": 250000, "bit_rate": 100000 } - },{ - "chip_enable": true, - "chip_center_freq": 911000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 910300000, "spread_factor": "7-10" }, - "chan_multiSF_1": { "chan_rx_freq": 910500000, "spread_factor": "7-10" }, - "chan_multiSF_2": { "chan_rx_freq": 910700000, "spread_factor": "7-10" }, - "chan_multiSF_3": { "chan_rx_freq": 910900000, "spread_factor": "7-10" }, - "chan_multiSF_4": { "chan_rx_freq": 911100000, "spread_factor": "7-10" }, - "chan_multiSF_5": { "chan_rx_freq": 911300000, "spread_factor": "7-10" }, - "chan_multiSF_6": { "chan_rx_freq": 911500000, "spread_factor": "7-10" }, - "chan_multiSF_7": { "chan_rx_freq": 911700000, "spread_factor": "7-10" }, - "chan_LoRa_std" : { "chan_rx_freq": 911000000, "bandwidth": 500000, "spread_factor": 8 }, - "chan_FSK" : { "chan_rx_freq": 911000000, "bandwidth": 250000, "bit_rate": 100000 } - },{ - "chip_enable": true, - "chip_center_freq": 912600000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 911900000, "spread_factor": "7-10" }, - "chan_multiSF_1": { "chan_rx_freq": 912100000, "spread_factor": "7-10" }, - "chan_multiSF_2": { "chan_rx_freq": 912300000, "spread_factor": "7-10" }, - "chan_multiSF_3": { "chan_rx_freq": 912500000, "spread_factor": "7-10" }, - "chan_multiSF_4": { "chan_rx_freq": 912700000, "spread_factor": "7-10" }, - "chan_multiSF_5": { "chan_rx_freq": 912900000, "spread_factor": "7-10" }, - "chan_multiSF_6": { "chan_rx_freq": 913100000, "spread_factor": "7-10" }, - "chan_multiSF_7": { "chan_rx_freq": 913300000, "spread_factor": "7-10" }, - "chan_LoRa_std" : { "chan_rx_freq": 912600000, "bandwidth": 500000, "spread_factor": 8 }, - "chan_FSK" : { "chan_rx_freq": 912600000, "bandwidth": 250000, "bit_rate": 100000 } - },{ - "chip_enable": true, - "chip_center_freq": 914200000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 913500000, "spread_factor": "7-10" }, - "chan_multiSF_1": { "chan_rx_freq": 913700000, "spread_factor": "7-10" }, - "chan_multiSF_2": { "chan_rx_freq": 913900000, "spread_factor": "7-10" }, - "chan_multiSF_3": { "chan_rx_freq": 914100000, "spread_factor": "7-10" }, - "chan_multiSF_4": { "chan_rx_freq": 914300000, "spread_factor": "7-10" }, - "chan_multiSF_5": { "chan_rx_freq": 914500000, "spread_factor": "7-10" }, - "chan_multiSF_6": { "chan_rx_freq": 914700000, "spread_factor": "7-10" }, - "chan_multiSF_7": { "chan_rx_freq": 914900000, "spread_factor": "7-10" }, - "chan_LoRa_std" : { "chan_rx_freq": 914200000, "bandwidth": 500000, "spread_factor": 8 }, - "chan_FSK" : { "chan_rx_freq": 914200000, "bandwidth": 250000, "bit_rate": 100000 } - }], - "FSK_sync": "C194C1", - "loramac_public": true, - "nb_dsp": 0, - "dsp_stat_interval": 10, - "aes_key": "ABCDEF0123456789ABCDEF0123456789" - }], - "gateway_conf": { - "gateway_ID": "00AEAEFFFE000000", - /* change with default server address/ports */ - "server_address": "127.0.0.1", - "serv_port_up": 1780, - "serv_port_down": 1782, - /* adjust the following parameters for your network */ - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - /* forward only valid packets */ - "forward_crc_valid": true, - "forward_crc_error": false, - "forward_crc_disabled": false, - /* link testing mote */ - "link_mote": "00CC01AF", - /* Beaconing parameters */ - "beacon_conf":{ - "period": 128, - "freq_hz": 923300000, - "freq_nb": 8, - "freq_step": 600000, - "datarate": 12, - "bw_hz": 500000, - "power": 14, - "infodesc": 0 - } - }, - "gps_conf": { - "gw_latitude": 0, - "gw_longitude": 0, - "gw_altitude": 0, - "fixed_altitude": false - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_dual_antenna_56ch_partial_diversity_EU868 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_dual_antenna_56ch_partial_diversity_EU868 deleted file mode 100644 index 1f4a589..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_dual_antenna_56ch_partial_diversity_EU868 +++ /dev/null @@ -1,237 +0,0 @@ -{ - "SX1301_array_conf":[ - { - "board_type": "MASTER", - "board_rx_freq": 866500000, /* radio RX central frequency in Hz */ - "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */ - "full_duplex": false, /* radio mode */ - "rf_chain_conf":[ - { - /* RX */ - "rx_enable": true, - "rssi_offset": -202.5, - "rssi_offset_coeff_a": 20, - "rssi_offset_coeff_b": 2925, - /* TX */ - "tx_enable": true, - "tx_freq_min": 863000000, - "tx_freq_max": 870000000, - "tx_lut":[ - { "rf_power": 2, "fpga_dig_gain": 4, "ad9361_atten": 125, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 5, "fpga_dig_gain": 4, "ad9361_atten": 112, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 7, "fpga_dig_gain": 4, "ad9361_atten": 105, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 9, "fpga_dig_gain": 4, "ad9361_atten": 98, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 }, - { "rf_power": 11, "fpga_dig_gain": 4, "ad9361_atten": 90, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 }, - { "rf_power": 12, "fpga_dig_gain": 4, "ad9361_atten": 86, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 }, - { "rf_power": 13, "fpga_dig_gain": 4, "ad9361_atten": 83, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 }, - { "rf_power": 14, "fpga_dig_gain": 4, "ad9361_atten": 77, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 }, - { "rf_power": 16, "fpga_dig_gain": 4, "ad9361_atten": 68, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 }, - { "rf_power": 18, "fpga_dig_gain": 4, "ad9361_atten": 59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 }, - { "rf_power": 20, "fpga_dig_gain": 4, "ad9361_atten": 51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 }, - { "rf_power": 22, "fpga_dig_gain": 4, "ad9361_atten": 44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 }, - { "rf_power": 24, "fpga_dig_gain": 4, "ad9361_atten": 34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 }, - { "rf_power": 25, "fpga_dig_gain": 4, "ad9361_atten": 30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 }, - { "rf_power": 26, "fpga_dig_gain": 4, "ad9361_atten": 24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 }, - { "rf_power": 27, "fpga_dig_gain": 4, "ad9361_atten": 20, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }] - },{ - /* RX */ - "rx_enable": true, - "rssi_offset": -202.5, - "rssi_offset_coeff_a": 20, - "rssi_offset_coeff_b": 2925, - /* TX */ - "tx_enable": true, - "tx_freq_min": 863000000, - "tx_freq_max": 870000000, - "tx_lut":[ - { "rf_power": 2, "fpga_dig_gain": 4, "ad9361_atten": 125, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 5, "fpga_dig_gain": 4, "ad9361_atten": 112, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 7, "fpga_dig_gain": 4, "ad9361_atten": 105, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 9, "fpga_dig_gain": 4, "ad9361_atten": 98, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 }, - { "rf_power": 11, "fpga_dig_gain": 4, "ad9361_atten": 90, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 }, - { "rf_power": 12, "fpga_dig_gain": 4, "ad9361_atten": 86, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 }, - { "rf_power": 13, "fpga_dig_gain": 4, "ad9361_atten": 83, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 }, - { "rf_power": 14, "fpga_dig_gain": 4, "ad9361_atten": 77, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 }, - { "rf_power": 16, "fpga_dig_gain": 4, "ad9361_atten": 68, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 }, - { "rf_power": 18, "fpga_dig_gain": 4, "ad9361_atten": 59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 }, - { "rf_power": 20, "fpga_dig_gain": 4, "ad9361_atten": 51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 }, - { "rf_power": 22, "fpga_dig_gain": 4, "ad9361_atten": 44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 }, - { "rf_power": 24, "fpga_dig_gain": 4, "ad9361_atten": 34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 }, - { "rf_power": 25, "fpga_dig_gain": 4, "ad9361_atten": 30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 }, - { "rf_power": 26, "fpga_dig_gain": 4, "ad9361_atten": 24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 }, - { "rf_power": 27, "fpga_dig_gain": 4, "ad9361_atten": 20, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }] - }], - "SX1301_conf":[ - { - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 1, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - }], - "lbt_conf":{ - "enable": false, - "rssi_target": -80, /* dBm */ - "rssi_shift": 142, - "chan_cfg":[ /* 16 channels maximum */ - { "freq_hz": 867100000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867300000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867500000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867700000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867900000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 868100000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 868300000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 868500000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 869525000, "scan_time_us": 5000, "transmit_time_ms": 4000 } - ] - }, - "FSK_sync": "C194C1", - "loramac_public": true, - "nb_dsp": 1, - "dsp_stat_interval": 10, - "aes_key": "ABCDEF0123456789ABCDEF0123456789", - "calibration_temperature_celsius_room": 22, - "calibration_temperature_code_ad9361": 77, - "fts_version": 1, - "fts_match_crc_error": false - }, - { - "board_type": "SLAVE", - "board_rx_freq": 866500000, /* radio RX central frequency in Hz */ - "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */ - "SX1301_conf":[ - { - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - }], - "FSK_sync": "C194C1", - "loramac_public": true, - "nb_dsp": 0, - "dsp_stat_interval": 10, - "aes_key": "ABCDEF0123456789ABCDEF0123456789" - }], - "gateway_conf": { - "gateway_ID": "00AEAEFFFE000000", - /* change with default server address/ports */ - "server_address": "127.0.0.1", - "serv_port_up": 1780, - "serv_port_down": 1782, - /* adjust the following parameters for your network */ - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - /* forward only valid packets */ - "forward_crc_valid": true, - "forward_crc_error": false, - "forward_crc_disabled": false, - /* link testing mote */ - "link_mote": "00CC01AF" - }, - "gps_conf": { - "fixed_altitude": false, - "gw_altitude": 0 - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_single_antenna_16ch_16x1_EU868 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_single_antenna_16ch_16x1_EU868 deleted file mode 100644 index 85ddc66..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_single_antenna_16ch_16x1_EU868 +++ /dev/null @@ -1,121 +0,0 @@ -{ - "SX1301_array_conf":[ - { - "board_type": "MASTER", - "board_rx_freq": 866500000, /* radio RX central frequency in Hz */ - "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */ - "full_duplex": false, /* radio mode */ - "rf_chain_conf":[ - { - /* RX */ - "rx_enable": true, - "rssi_offset": -202.5, - "rssi_offset_coeff_a": 20, - "rssi_offset_coeff_b": 2925, - /* TX */ - "tx_enable": true, - "tx_freq_min": 863000000, - "tx_freq_max": 870000000, - "tx_lut":[ - { "rf_power": 2, "fpga_dig_gain": 4, "ad9361_atten": 125, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 5, "fpga_dig_gain": 4, "ad9361_atten": 112, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 7, "fpga_dig_gain": 4, "ad9361_atten": 105, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 9, "fpga_dig_gain": 4, "ad9361_atten": 98, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 }, - { "rf_power": 11, "fpga_dig_gain": 4, "ad9361_atten": 90, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 }, - { "rf_power": 12, "fpga_dig_gain": 4, "ad9361_atten": 86, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 }, - { "rf_power": 13, "fpga_dig_gain": 4, "ad9361_atten": 83, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 }, - { "rf_power": 14, "fpga_dig_gain": 4, "ad9361_atten": 77, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 }, - { "rf_power": 16, "fpga_dig_gain": 4, "ad9361_atten": 68, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 }, - { "rf_power": 18, "fpga_dig_gain": 4, "ad9361_atten": 59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 }, - { "rf_power": 20, "fpga_dig_gain": 4, "ad9361_atten": 51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 }, - { "rf_power": 22, "fpga_dig_gain": 4, "ad9361_atten": 44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 }, - { "rf_power": 24, "fpga_dig_gain": 4, "ad9361_atten": 34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 }, - { "rf_power": 25, "fpga_dig_gain": 4, "ad9361_atten": 30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 }, - { "rf_power": 26, "fpga_dig_gain": 4, "ad9361_atten": 24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 }, - { "rf_power": 27, "fpga_dig_gain": 4, "ad9361_atten": 20, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }] - }], - "SX1301_conf":[ - { - "chip_enable": true, - "chip_center_freq": 866000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 866100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 866100000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 866100000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 866100000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 866100000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 866100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 866100000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 866100000, "spread_factor": "7-12" } - },{ - "chip_enable": true, - "chip_center_freq": 866000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 866100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 866100000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 866100000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 866100000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 866100000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 866100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 866100000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 866100000, "spread_factor": "7-12" } - }], - "lbt_conf":{ - "enable": false, - "rssi_target": -80, /* dBm */ - "rssi_shift": 142, - "chan_cfg":[ /* 16 channels maximum */ - { "freq_hz": 867100000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867300000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867500000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867700000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867900000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 868100000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 868300000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 868500000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 869525000, "scan_time_us": 5000, "transmit_time_ms": 4000 } - ] - }, - "FSK_sync": "C194C1", - "loramac_public": true, - "nb_dsp": 1, - "dsp_stat_interval": 10, - "aes_key": "ABCDEF0123456789ABCDEF0123456789", - "calibration_temperature_celsius_room": 22, - "calibration_temperature_code_ad9361": 77, - "fts_version": 1, - "fts_match_crc_error": false - }], - "gateway_conf": { - "gateway_ID": "00AEAEFFFE000000", - /* change with default server address/ports */ - "server_address": "127.0.0.1", - "serv_port_up": 1780, - "serv_port_down": 1782, - /* adjust the following parameters for your network */ - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - /* forward only valid packets */ - "forward_crc_valid": true, - "forward_crc_error": false, - "forward_crc_disabled": false, - /* link testing mote */ - "link_mote": "00CC01AF", - /* Beaconing parameters */ - "beacon_conf":{ - "period": 128, - "freq_hz": 869525000, - "datarate": 9, - "bw_hz": 125000, - "power": 14, - "infodesc": 0 - } - }, - "gps_conf": { - "gw_latitude": 0, - "gw_longitude": 0, - "gw_altitude": 0, - "fixed_altitude": false - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_single_antenna_64ch_64x1_EU868 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_single_antenna_64ch_64x1_EU868 deleted file mode 100644 index 9e83240..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_single_antenna_64ch_64x1_EU868 +++ /dev/null @@ -1,210 +0,0 @@ -{ - "SX1301_array_conf":[ - { - "board_type": "MASTER", - "board_rx_freq": 866500000, /* radio RX central frequency in Hz */ - "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */ - "full_duplex": false, /* radio mode */ - "rf_chain_conf":[ - { - /* RX */ - "rx_enable": true, - "rssi_offset": -202.5, - "rssi_offset_coeff_a": 20, - "rssi_offset_coeff_b": 2925, - /* TX */ - "tx_enable": true, - "tx_freq_min": 863000000, - "tx_freq_max": 870000000, - "tx_lut":[ - { "rf_power": 2, "fpga_dig_gain": 4, "ad9361_atten": 125, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 5, "fpga_dig_gain": 4, "ad9361_atten": 112, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 7, "fpga_dig_gain": 4, "ad9361_atten": 105, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 9, "fpga_dig_gain": 4, "ad9361_atten": 98, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 }, - { "rf_power": 11, "fpga_dig_gain": 4, "ad9361_atten": 90, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 }, - { "rf_power": 12, "fpga_dig_gain": 4, "ad9361_atten": 86, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 }, - { "rf_power": 13, "fpga_dig_gain": 4, "ad9361_atten": 83, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 }, - { "rf_power": 14, "fpga_dig_gain": 4, "ad9361_atten": 77, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 }, - { "rf_power": 16, "fpga_dig_gain": 4, "ad9361_atten": 68, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 }, - { "rf_power": 18, "fpga_dig_gain": 4, "ad9361_atten": 59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 }, - { "rf_power": 20, "fpga_dig_gain": 4, "ad9361_atten": 51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 }, - { "rf_power": 22, "fpga_dig_gain": 4, "ad9361_atten": 44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 }, - { "rf_power": 24, "fpga_dig_gain": 4, "ad9361_atten": 34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 }, - { "rf_power": 25, "fpga_dig_gain": 4, "ad9361_atten": 30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 }, - { "rf_power": 26, "fpga_dig_gain": 4, "ad9361_atten": 24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 }, - { "rf_power": 27, "fpga_dig_gain": 4, "ad9361_atten": 20, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }] - }], - "SX1301_conf":[ - { - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - }], - "lbt_conf":{ - "enable": false, - "rssi_target": -80, /* dBm */ - "rssi_shift": 142, - "chan_cfg":[ /* 16 channels maximum */ - { "freq_hz": 867100000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867300000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867500000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867700000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867900000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 868100000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 868300000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 868500000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 869525000, "scan_time_us": 5000, "transmit_time_ms": 4000 } - ] - }, - "FSK_sync": "C194C1", - "loramac_public": true, - "nb_dsp": 1, - "dsp_stat_interval": 10, - "aes_key": "55E7068263527C56B38E5977990CB0C2", - "calibration_temperature_celsius_room": 22, - "calibration_temperature_code_ad9361": 77, - "fts_version": 1, - "fts_match_crc_error": false - }, - { - "board_type": "SLAVE", - "board_rx_freq": 866500000, /* radio RX central frequency in Hz */ - "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */ - "SX1301_conf":[ - { - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - }], - "FSK_sync": "C194C1", - "loramac_public": true, - "nb_dsp": 3, - "dsp_stat_interval": 10, - "aes_key": "ABCDEF0123456789ABCDEF0123456789" - }], - "gateway_conf": { - "gateway_ID": "00AEAEFFFE000000", - /* change with default server address/ports */ - "server_address": "127.0.0.1", - "serv_port_up": 1780, - "serv_port_down": 1782, - /* adjust the following parameters for your network */ - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - /* forward only valid packets */ - "forward_crc_valid": true, - "forward_crc_error": false, - "forward_crc_disabled": false, - /* link testing mote */ - "link_mote": "00CC01AF" - }, - "gps_conf": { - "fixed_altitude": false, - "gw_altitude": 0 - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_single_antenna_64ch_8x8_EU868 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_single_antenna_64ch_8x8_EU868 deleted file mode 100644 index c3732eb..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_single_antenna_64ch_8x8_EU868 +++ /dev/null @@ -1,210 +0,0 @@ -{ - "SX1301_array_conf":[ - { - "board_type": "MASTER", - "board_rx_freq": 866500000, /* radio RX central frequency in Hz */ - "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */ - "full_duplex": false, /* radio mode */ - "rf_chain_conf":[ - { - /* RX */ - "rx_enable": true, - "rssi_offset": -202.5, - "rssi_offset_coeff_a": 20, - "rssi_offset_coeff_b": 2925, - /* TX */ - "tx_enable": true, - "tx_freq_min": 863000000, - "tx_freq_max": 870000000, - "tx_lut":[ - { "rf_power": 2, "fpga_dig_gain": 4, "ad9361_atten": 125, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 5, "fpga_dig_gain": 4, "ad9361_atten": 112, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 7, "fpga_dig_gain": 4, "ad9361_atten": 105, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 }, - { "rf_power": 9, "fpga_dig_gain": 4, "ad9361_atten": 98, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 }, - { "rf_power": 11, "fpga_dig_gain": 4, "ad9361_atten": 90, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 }, - { "rf_power": 12, "fpga_dig_gain": 4, "ad9361_atten": 86, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 }, - { "rf_power": 13, "fpga_dig_gain": 4, "ad9361_atten": 83, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 }, - { "rf_power": 14, "fpga_dig_gain": 4, "ad9361_atten": 77, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 }, - { "rf_power": 16, "fpga_dig_gain": 4, "ad9361_atten": 68, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 }, - { "rf_power": 18, "fpga_dig_gain": 4, "ad9361_atten": 59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 }, - { "rf_power": 20, "fpga_dig_gain": 4, "ad9361_atten": 51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 }, - { "rf_power": 22, "fpga_dig_gain": 4, "ad9361_atten": 44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 }, - { "rf_power": 24, "fpga_dig_gain": 4, "ad9361_atten": 34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 }, - { "rf_power": 25, "fpga_dig_gain": 4, "ad9361_atten": 30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 }, - { "rf_power": 26, "fpga_dig_gain": 4, "ad9361_atten": 24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 }, - { "rf_power": 27, "fpga_dig_gain": 4, "ad9361_atten": 20, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }] - }], - "SX1301_conf":[ - { - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - }], - "lbt_conf":{ - "enable": false, - "rssi_target": -80, /* dBm */ - "rssi_shift": 142, - "chan_cfg":[ /* 16 channels maximum */ - { "freq_hz": 867100000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867300000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867500000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867700000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 867900000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 868100000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 868300000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 868500000, "scan_time_us": 128, "transmit_time_ms": 400 }, - { "freq_hz": 869525000, "scan_time_us": 5000, "transmit_time_ms": 4000 } - ] - }, - "FSK_sync": "C194C1", - "loramac_public": true, - "nb_dsp": 1, - "dsp_stat_interval": 10, - "aes_key": "ABCDEF0123456789ABCDEF0123456789", - "calibration_temperature_celsius_room": 22, - "calibration_temperature_code_ad9361": 77, - "fts_version": 1, - "fts_match_crc_error": false - }, - { - "board_type": "SLAVE", - "board_rx_freq": 866500000, /* radio RX central frequency in Hz */ - "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */ - "SX1301_conf":[ - { - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - },{ - "chip_enable": true, - "chip_center_freq": 868000000, - "chip_rf_chain": 0, - "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" }, - "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" }, - "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" }, - "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" }, - "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" }, - "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" }, - "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" }, - "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" }, - "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK" : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 } - }], - "FSK_sync": "C194C1", - "loramac_public": true, - "nb_dsp": 3, - "dsp_stat_interval": 10, - "aes_key": "ABCDEF0123456789ABCDEF0123456789" - }], - "gateway_conf": { - "gateway_ID": "00AEAEFFFE000000", - /* change with default server address/ports */ - "server_address": "127.0.0.1", - "serv_port_up": 1780, - "serv_port_down": 1782, - /* adjust the following parameters for your network */ - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - /* forward only valid packets */ - "forward_crc_valid": true, - "forward_crc_error": false, - "forward_crc_disabled": false, - /* link testing mote */ - "link_mote": "00CC01AF" - }, - "gps_conf": { - "fixed_altitude": false, - "gw_altitude": 0 - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation_5.1.0.bb b/recipes-connectivity/lora/lora-packet-forwarder-geolocation_5.1.0.bb deleted file mode 100644 index b42bd31..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation_5.1.0.bb +++ /dev/null @@ -1,61 +0,0 @@ -DESCRIPTION = "LoRa Packet Forwarder Geolocation" -PRIORITY = "optional" -SECTION = "console/utils" -# Semtech license is a modified BSD-style license -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://mlinux4/LICENSE.TXT;md5=86776875df1423114abfcec938f3e565" -DEPENDS ?= "lora-gateway-geolocation logrotate lora-logging" -RDEPENDS_${PN} += "bash" -# Source revision -PSR = "r4" -# Recipe revision -PR = "r6" - -SRCREV = "v${PV}" - -SRC_URI = "http://multitech.net/downloads/lora-packet-forwarder-geolocation_arm926ejste_${PV}-${PSR}.tar.gz \ - file://global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_full_diversity_EU868 \ - file://global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_full_diversity_JP920 \ - file://global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_partial_diversity_EU868 \ - file://global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_EU868 \ - file://global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_US915 \ - file://global_conf.json.MTAC_LORA_2_1_loc_single_antenna_64ch_US915 \ - file://global_conf.json.MTAC_LORA_2_1_loc_single_antenna_full_duplex_64ch_US915 \ - file://global_conf.json.MTAC_LORA_2_1_test_dual_antenna_56ch_partial_diversity_EU868 \ - file://global_conf.json.MTAC_LORA_2_1_test_single_antenna_16ch_16x1_EU868 \ - file://global_conf.json.MTAC_LORA_2_1_test_single_antenna_64ch_64x1_EU868 \ - file://global_conf.json.MTAC_LORA_2_1_test_single_antenna_64ch_8x8_EU868 \ -" -SRC_URI[md5sum] = "542f02198a3258ca2ad4e549524e3ddc" -SRC_URI[sha256sum] = "8176f5f55f96b7a72946cfb51743a8ea4f88a4033e54009e7bcf8f03077d248e" - -S = "${WORKDIR}" -B = "${S}" - -LORA_DIR = "/opt/lora" - -export LGW_PATH = "${STAGING_LIBDIR}/lora" -export LGW_INC = "${STAGING_INCDIR}/lora" - -do_compile() { -} - -do_install() { -} - -do_install_append_mtcdt() { - install -d ${D}${LORA_DIR} - install -m 755 mlinux4/pkt_forwarder ${D}${LORA_DIR}/ - install -m 755 ${WORKDIR}/global_conf.json.MTAC_LORA_2_1* ${D}${LORA_DIR}/ - install -d ${D}${LORA_DIR}/forwarder-utils-geo - install -m 755 mlinux4/forwarder-utils-geo/* ${D}${LORA_DIR}/forwarder-utils-geo/ -} - - -FILES_${PN} += "${LORA_DIR}" -FILES_${PN}-dbg += "${LORA_DIR}/.debug ${LORA_DIR}/forwarder-utils-geo/.debug" - -# disable this on purpose for dev purposes -do_rm_work() { - echo "skipping" -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb/README.md b/recipes-connectivity/lora/lora-packet-forwarder-usb/README.md deleted file mode 100644 index c927c60..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder-usb/README.md +++ /dev/null @@ -1,38 +0,0 @@ - - -(c) Senet, Inc 2016 - - - -3rd Party Licenses ------------------- - -This software incorporates the lora_gateway software which requires the -following statement to be included in its distribution. - -Copyright (c) 2013, SEMTECH S.A. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the Semtech corporation nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL SEMTECH S.A. BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb/local_conf.json b/recipes-connectivity/lora/lora-packet-forwarder-usb/local_conf.json deleted file mode 100644 index 3c2af80..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder-usb/local_conf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "gateway_conf": { - "server_address": "localhost", - "serv_port_up": 1780, - "serv_port_down": 1782 - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-add-no-header-option.patch b/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-add-no-header-option.patch deleted file mode 100644 index fd2fa24..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-add-no-header-option.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 03c697f2bcf538407ca6a0821dbbb65ab7679aff Mon Sep 17 00:00:00 2001 -From: Jason Reiss <jreiss@multitech.com> -Date: Thu, 16 Jul 2015 13:31:20 -0500 -Subject: [PATCH] feature: add option to send packets with no header - ---- - basic_pkt_fwd/src/basic_pkt_fwd.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/basic_pkt_fwd/src/basic_pkt_fwd.c b/basic_pkt_fwd/src/basic_pkt_fwd.c -index e20dfc1..2223b4a 100644 ---- a/basic_pkt_fwd/src/basic_pkt_fwd.c -+++ b/basic_pkt_fwd/src/basic_pkt_fwd.c -@@ -1276,6 +1276,13 @@ void thread_down(void) { - if (val != NULL) { - txpkt.no_crc = (bool)json_value_get_boolean(val); - } -+ -+ /* Parse "No Header" flag (optional field) */ -+ val = json_object_get_value(txpk_obj,"nhdr"); -+ if (val != NULL) { -+ txpkt.no_header = (bool)json_value_get_boolean(val); -+ } -+ - - /* parse target frequency (mandatory) */ - val = json_object_get_value(txpk_obj,"freq"); - -diff --git a/gps_pkt_fwd/src/gps_pkt_fwd.c b/gps_pkt_fwd/src/gps_pkt_fwd.c -index 79f7584..d073540 100644 ---- a/gps_pkt_fwd/src/gps_pkt_fwd.c -+++ b/gps_pkt_fwd/src/gps_pkt_fwd.c -@@ -1534,6 +1534,12 @@ void thread_down(void) { - txpkt.no_crc = (bool)json_value_get_boolean(val); - } - -+ /* Parse "No Header" flag (optional field) */ -+ val = json_object_get_value(txpk_obj,"nhdr"); -+ if (val != NULL) { -+ txpkt.no_header = (bool)json_value_get_boolean(val); -+ } -+ - /* parse target frequency (mandatory) */ - val = json_object_get_value(txpk_obj,"freq"); - if (val == NULL) { diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-add-queue.patch b/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-add-queue.patch deleted file mode 100644 index cd9a727..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-add-queue.patch +++ /dev/null @@ -1,316 +0,0 @@ -From fdf5d6669d5132da9016840dfe2c1c99f525e4bc Mon Sep 17 00:00:00 2001 -From: Jason Reiss <jreiss@multitech.com> -Date: Tue, 29 Sep 2015 12:01:12 -0500 -Subject: [PATCH] add-queue to pkt-fwd - ---- - basic_pkt_fwd/src/basic_pkt_fwd.c | 93 +++++++++++++++++++++++++++++++++++-- - 1 file changed, 88 insertions(+), 5 deletions(-) - -diff --git a/basic_pkt_fwd/src/basic_pkt_fwd.c b/basic_pkt_fwd/src/basic_pkt_fwd.c -index e20dfc1..4d0bb35 100644 ---- a/basic_pkt_fwd/src/basic_pkt_fwd.c -+++ b/basic_pkt_fwd/src/basic_pkt_fwd.c -@@ -162,8 +162,19 @@ static int parse_gateway_configuration(const char * conf_file); - - static double difftimespec(struct timespec end, struct timespec beginning); - -+typedef struct tx_queue_s { -+ struct lgw_pkt_tx_s pkt; -+ struct tx_queue_s* next; -+} tx_queue_s; -+ -+ -+struct tx_queue_s* tx_queue = NULL; -+struct tx_queue_s* tx_queue_end = NULL; -+ -+ - /* threads */ - void thread_up(void); -+void thread_queue(void); - void thread_down(void); - - /* -------------------------------------------------------------------------- */ -@@ -479,6 +490,7 @@ int main(void) - - /* threads */ - pthread_t thrid_up; -+ pthread_t thrid_queue; - pthread_t thrid_down; - - /* network socket creation */ -@@ -649,6 +661,11 @@ int main(void) - MSG("ERROR: [main] impossible to create downstream thread\n"); - exit(EXIT_FAILURE); - } -+ i = pthread_create( &thrid_queue, NULL, (void * (*)(void *))thread_queue, NULL); -+ if (i != 0) { -+ MSG("ERROR: [main] impossible to create queue thread\n"); -+ exit(EXIT_FAILURE); -+ } - - /* configure signal handling */ - sigemptyset(&sigact.sa_mask); -@@ -744,6 +761,7 @@ int main(void) - - /* wait for upstream thread to finish (1 fetch cycle max) */ - pthread_join(thrid_up, NULL); -+ pthread_cancel(thrid_queue); - pthread_cancel(thrid_down); /* don't wait for downstream thread */ - - /* if an exit signal was received, try to quit properly */ -@@ -1121,9 +1139,9 @@ void thread_up(void) { - } - - /* -------------------------------------------------------------------------- */ --/* --- THREAD 2: POLLING SERVER AND EMITTING PACKETS ------------------------ */ -+/* --- THREAD 2: POLLING SERVER AND QUEUEING PACKETS ------------------------ */ - --void thread_down(void) { -+void thread_queue(void) { - int i; /* loop variables */ - - /* configuration and metadata for an outbound packet */ -@@ -1462,11 +1480,48 @@ void thread_down(void) { - meas_dw_dgram_rcv += 1; /* count only datagrams with no JSON errors */ - meas_dw_network_byte += msg_len; /* meas_dw_network_byte */ - meas_dw_payload_byte += txpkt.size; -+ pthread_mutex_unlock(&mx_meas_dw); -+ -+ pthread_mutex_lock(&mx_concent); /* may have to wait for a fetch to finish */ -+ if (tx_queue == NULL) { -+ tx_queue = malloc(sizeof(tx_queue_s)); -+ tx_queue_end = tx_queue; -+ tx_queue->pkt = txpkt; -+ tx_queue->next = NULL; -+ } else { -+ struct tx_queue_s* item = malloc(sizeof(tx_queue_s)); -+ item->next = NULL; -+ item->pkt = txpkt; -+ tx_queue_end->next = item; -+ tx_queue_end = item; -+ } -+ pthread_mutex_unlock(&mx_concent); -+ } -+ wait_ms(1); -+ } -+ MSG("\nINFO: End of queue thread\n"); -+} -+ -+/* -------------------------------------------------------------------------- */ -+/* --- THREAD 3: POLLING QUEUE AND EMITTING PACKETS ------------------------ */ -+ -+void thread_down(void) { -+ MSG("\nINFO: Start of downstream thread\n"); - -+ struct lgw_pkt_tx_s txpkt; -+ -+ while (!exit_sig && !quit_sig) { -+ pthread_mutex_lock(&mx_concent); /* may have to wait for a fetch to finish */ -+ if (tx_queue != NULL) { -+ struct tx_queue_s* del = tx_queue; -+ txpkt = tx_queue->pkt; -+ tx_queue = tx_queue->next; -+ free(del); - /* transfer data and metadata to the concentrator, and schedule TX */ -- pthread_mutex_lock(&mx_concent); /* may have to wait for a fetch to finish */ -- i = lgw_send(txpkt); -+ int i = lgw_send(txpkt); - pthread_mutex_unlock(&mx_concent); /* free concentrator ASAP */ -+ -+ pthread_mutex_lock(&mx_meas_dw); - if (i == LGW_HAL_ERROR) { - meas_nb_tx_fail += 1; - pthread_mutex_unlock(&mx_meas_dw); -@@ -1476,7 +1531,35 @@ void thread_down(void) { - meas_nb_tx_ok += 1; - pthread_mutex_unlock(&mx_meas_dw); - } -- } -+ -+ uint8_t tx_status_var = TX_STATUS_UNKNOWN; -+ // wait for 200 ms and ensure packet is transmitted -+ for (i=0; (i < 20) && (tx_status_var != TX_EMITTING); ++i) { -+ wait_ms(10); -+ pthread_mutex_lock(&mx_concent); -+ lgw_status(TX_STATUS, &tx_status_var); -+ pthread_mutex_unlock(&mx_concent); -+ } -+ if (tx_status_var != TX_EMITTING) { -+ MSG("WARNING: [down] packet was scheduled but failed to TX\n"); -+ } else { -+ // if packet is transmitting then wait for end of TX or timeout after 4 seconds -+ for (i=0; (i < 400) && (tx_status_var != TX_FREE); ++i) { -+ wait_ms(10); -+ pthread_mutex_lock(&mx_concent); -+ lgw_status(TX_STATUS, &tx_status_var); -+ pthread_mutex_unlock(&mx_concent); -+ } -+ -+ if (tx_status_var != TX_FREE) { -+ MSG("WARNING: [down] timedout waiting for end of TX\n"); -+ } -+ } -+ -+ } else { -+ pthread_mutex_unlock(&mx_concent); /* free concentrator ASAP */ -+ } -+ wait_ms(1); - } - MSG("\nINFO: End of downstream thread\n"); - } - -iff --git a/gps_pkt_fwd/src/gps_pkt_fwd.c b/gps_pkt_fwd/src/gps_pkt_fwd.c -index 79f7584..3d1cbf8 100644 ---- a/gps_pkt_fwd/src/gps_pkt_fwd.c -+++ b/gps_pkt_fwd/src/gps_pkt_fwd.c -@@ -192,8 +192,18 @@ static int parse_gateway_configuration(const char * conf_file); - - static double difftimespec(struct timespec end, struct timespec beginning); - -+typedef struct tx_queue_s { -+ struct lgw_pkt_tx_s pkt; -+ struct tx_queue_s* next; -+} tx_queue_s; -+ -+ -+struct tx_queue_s* tx_queue = NULL; -+struct tx_queue_s* tx_queue_end = NULL; -+ - /* threads */ - void thread_up(void); -+void thread_queue(void); - void thread_down(void); - void thread_gps(void); - void thread_valid(void); -@@ -546,6 +556,7 @@ int main(void) - - /* threads */ - pthread_t thrid_up; -+ pthread_t thrid_queue; - pthread_t thrid_down; - pthread_t thrid_gps; - pthread_t thrid_valid; -@@ -739,6 +750,12 @@ int main(void) - exit(EXIT_FAILURE); - } - -+ i = pthread_create( &thrid_queue, NULL, (void * (*)(void *))thread_queue, NULL); -+ if (i != 0) { -+ MSG("ERROR: [main] impossible to create queue thread\n"); -+ exit(EXIT_FAILURE); -+ } -+ - /* spawn thread to manage GPS */ - if (gps_enabled == true) { - i = pthread_create( &thrid_gps, NULL, (void * (*)(void *))thread_gps, NULL); -@@ -891,6 +908,7 @@ int main(void) - - /* wait for upstream thread to finish (1 fetch cycle max) */ - pthread_join(thrid_up, NULL); -+ pthread_cancel(thrid_queue); - pthread_cancel(thrid_down); /* don't wait for downstream thread */ - pthread_cancel(thrid_gps); /* don't wait for GPS thread */ - pthread_cancel(thrid_valid); /* don't wait for validation thread */ -@@ -1325,9 +1343,9 @@ void thread_up(void) { - } - - /* -------------------------------------------------------------------------- */ --/* --- THREAD 2: POLLING SERVER AND EMITTING PACKETS ------------------------ */ -+/* --- THREAD 2: POLLING SERVER AND QUEUE PACKETS ------------------------ */ - --void thread_down(void) { -+void thread_queue(void) { - int i; /* loop variables */ - - /* configuration and metadata for an outbound packet */ -@@ -1719,11 +1737,49 @@ void thread_down(void) { - meas_dw_dgram_rcv += 1; /* count only datagrams with no JSON errors */ - meas_dw_network_byte += msg_len; /* meas_dw_network_byte */ - meas_dw_payload_byte += txpkt.size; -+ pthread_mutex_unlock(&mx_meas_dw); -+ -+ pthread_mutex_lock(&mx_concent); /* may have to wait for a fetch to finish */ -+ if (tx_queue == NULL) { -+ tx_queue = malloc(sizeof(tx_queue_s)); -+ tx_queue_end = tx_queue; -+ tx_queue->pkt = txpkt; -+ tx_queue->next = NULL; -+ } else { -+ struct tx_queue_s* item = malloc(sizeof(tx_queue_s)); -+ item->next = NULL; -+ item->pkt = txpkt; -+ tx_queue_end->next = item; -+ tx_queue_end = item; -+ } -+ pthread_mutex_unlock(&mx_concent); -+ } -+ wait_ms(1); -+ } -+ MSG("\nINFO: End of queue thread\n"); -+} -+ -+/* -------------------------------------------------------------------------- */ -+/* --- THREAD 3: POLLING QUEUE AND EMITTING PACKETS ------------------------ */ -+ -+void thread_down(void) { -+ MSG("\nINFO: Start of downstream thread\n"); - -+ struct lgw_pkt_tx_s txpkt; -+ -+ while (!exit_sig && !quit_sig) { -+ pthread_mutex_lock(&mx_concent); /* may have to wait for a fetch to finish */ -+ if (tx_queue != NULL) { -+ struct tx_queue_s* del = tx_queue; -+ txpkt = tx_queue->pkt; -+ tx_queue = tx_queue->next; -+ free(del); -+ - /* transfer data and metadata to the concentrator, and schedule TX */ -- pthread_mutex_lock(&mx_concent); /* may have to wait for a fetch to finish */ -- i = lgw_send(txpkt); -+ int i = lgw_send(txpkt); - pthread_mutex_unlock(&mx_concent); /* free concentrator ASAP */ -+ -+ pthread_mutex_lock(&mx_meas_dw); - if (i == LGW_HAL_ERROR) { - meas_nb_tx_fail += 1; - pthread_mutex_unlock(&mx_meas_dw); -@@ -1733,7 +1789,35 @@ void thread_down(void) { - meas_nb_tx_ok += 1; - pthread_mutex_unlock(&mx_meas_dw); - } -- } -+ -+ uint8_t tx_status_var = TX_STATUS_UNKNOWN; -+ // wait for 200 ms and ensure packet is transmitted -+ for (i=0; (i < 20) && (tx_status_var != TX_EMITTING); ++i) { -+ wait_ms(10); -+ pthread_mutex_lock(&mx_concent); -+ lgw_status(TX_STATUS, &tx_status_var); -+ pthread_mutex_unlock(&mx_concent); -+ } -+ if (tx_status_var != TX_EMITTING) { -+ MSG("WARNING: [down] packet was scheduled but failed to TX\n"); -+ } else { -+ // if packet is transmitting then wait for end of TX or timeout after 4 seconds -+ for (i=0; (i < 400) && (tx_status_var != TX_FREE); ++i) { -+ wait_ms(10); -+ pthread_mutex_lock(&mx_concent); -+ lgw_status(TX_STATUS, &tx_status_var); -+ pthread_mutex_unlock(&mx_concent); -+ } -+ -+ if (tx_status_var != TX_FREE) { -+ MSG("WARNING: [down] timedout waiting for end of TX\n"); -+ } -+ } -+ -+ } else { -+ pthread_mutex_unlock(&mx_concent); /* free concentrator ASAP */ -+ } -+ wait_ms(1); - } - MSG("\nINFO: End of downstream thread\n"); - } - diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-fixb64.patch b/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-fixb64.patch deleted file mode 100644 index dc0df42..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-fixb64.patch +++ /dev/null @@ -1,66 +0,0 @@ -Index: git/basic_pkt_fwd/src/base64.c -=================================================================== ---- git.orig/basic_pkt_fwd/src/base64.c 2015-03-31 16:00:39.479058735 -0500 -+++ git/basic_pkt_fwd/src/base64.c 2015-03-31 16:02:18.529580540 -0500 -@@ -263,7 +263,7 @@ - DEBUG("ERROR: INVALID UNPADDED BASE64 STRING\n"); - return -1; - case 2: /* 2 chars in last block, must add 2 padding char */ -- if (max_len > (ret + 2 + 1)) { -+ if (max_len >= (ret + 2 + 1)) { - out[ret] = code_pad; - out[ret+1] = code_pad; - out[ret+2] = 0; -@@ -273,7 +273,7 @@ - return -1; - } - case 3: /* 3 chars in last block, must add 1 padding char */ -- if (max_len > (ret + 1 + 1)) { -+ if (max_len >= (ret + 1 + 1)) { - out[ret] = code_pad; - out[ret+1] = 0; - return ret+1; -Index: git/beacon_pkt_fwd/src/base64.c -=================================================================== ---- git.orig/beacon_pkt_fwd/src/base64.c 2015-03-31 16:00:39.479058735 -0500 -+++ git/beacon_pkt_fwd/src/base64.c 2015-03-31 16:03:26.040561508 -0500 -@@ -263,7 +263,7 @@ - DEBUG("ERROR: INVALID UNPADDED BASE64 STRING\n"); - return -1; - case 2: /* 2 chars in last block, must add 2 padding char */ -- if (max_len > (ret + 2 + 1)) { -+ if (max_len >= (ret + 2 + 1)) { - out[ret] = code_pad; - out[ret+1] = code_pad; - out[ret+2] = 0; -@@ -273,7 +273,7 @@ - return -1; - } - case 3: /* 3 chars in last block, must add 1 padding char */ -- if (max_len > (ret + 1 + 1)) { -+ if (max_len >= (ret + 1 + 1)) { - out[ret] = code_pad; - out[ret+1] = 0; - return ret+1; -Index: git/gps_pkt_fwd/src/base64.c -=================================================================== ---- git.orig/gps_pkt_fwd/src/base64.c 2015-03-31 16:02:59.344965478 -0500 -+++ git/gps_pkt_fwd/src/base64.c 2015-03-31 16:03:13.208755845 -0500 -@@ -263,7 +263,7 @@ - DEBUG("ERROR: INVALID UNPADDED BASE64 STRING\n"); - return -1; - case 2: /* 2 chars in last block, must add 2 padding char */ -- if (max_len > (ret + 2 + 1)) { -+ if (max_len >= (ret + 2 + 1)) { - out[ret] = code_pad; - out[ret+1] = code_pad; - out[ret+2] = 0; -@@ -273,7 +273,7 @@ - return -1; - } - case 3: /* 3 chars in last block, must add 1 padding char */ -- if (max_len > (ret + 1 + 1)) { -+ if (max_len >= (ret + 1 + 1)) { - out[ret] = code_pad; - out[ret+1] = 0; - return ret+1; diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-mts-enhancements.patch b/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-mts-enhancements.patch deleted file mode 100644 index e1da462..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-mts-enhancements.patch +++ /dev/null @@ -1,321 +0,0 @@ -Index: git/basic_pkt_fwd/src/basic_pkt_fwd.c -=================================================================== ---- git.orig/basic_pkt_fwd/src/basic_pkt_fwd.c 2015-04-01 15:14:12.192933389 -0500 -+++ git/basic_pkt_fwd/src/basic_pkt_fwd.c 2015-04-01 15:36:38.731731561 -0500 -@@ -42,6 +42,8 @@ - #include <netdb.h> /* gai_strerror */ - - #include <pthread.h> -+#include <getopt.h> -+#include <linux/limits.h> - - #include "parson.h" - #include "base64.h" -@@ -472,19 +474,65 @@ - return x; - } - -+void usage(char *proc_name) { -+ fprintf(stderr, "Usage: %s [-c config_dir] [-l logfile]\n", proc_name); -+ exit(1); -+} -+ -+ -+static char *short_options = "c:l:h"; -+static struct option long_options[] = { -+ {"config-dir", 1, 0, 'c'}, -+ {"logfile", 1, 0, 'l'}, -+ {"help", 0, 0, 'h'}, -+ {0, 0, 0, 0}, -+}; -+ - /* -------------------------------------------------------------------------- */ - /* --- MAIN FUNCTION -------------------------------------------------------- */ - --int main(void) -+int main(int argc, char *argv[]) - { - struct sigaction sigact; /* SIGQUIT&SIGINT&SIGTERM signal handling */ - int i; /* loop variable and temporary variable for return value */ - - /* configuration file related */ -- char *global_cfg_path= "global_conf.json"; /* contain global (typ. network-wide) configuration */ -- char *local_cfg_path = "local_conf.json"; /* contain node specific configuration, overwrite global parameters for parameters that are defined in both */ -- char *debug_cfg_path = "debug_conf.json"; /* if present, all other configuration files are ignored */ -- -+ char *global_cfg_name = "global_conf.json"; /* contain global (typ. network-wide) configuration */ -+ char *local_cfg_name = "local_conf.json"; /* contain node specific configuration, overwrite global parameters for parameters that are defined in both */ -+ char *debug_cfg_name = "debug_conf.json"; /* if present, all other configuration files are ignored */ -+ -+ int opt_ind = 0; -+ char cfg_dir[PATH_MAX] = {0}; -+ char global_cfg_path[PATH_MAX] = {0}; -+ char local_cfg_path[PATH_MAX] = {0}; -+ char debug_cfg_path[PATH_MAX] = {0}; -+ char *logfile_path = NULL; -+ char *proc_name = argv[0]; -+ -+ while((i = getopt_long(argc, argv, short_options, long_options, &opt_ind)) >= 0) { -+ switch(i) { -+ case 0: -+ break; -+ case 'c': -+ strncpy(cfg_dir, optarg, sizeof(cfg_dir)-2); -+ strcat(cfg_dir, "/"); -+ break; -+ case 'l': -+ logfile_path = optarg; -+ break; -+ case 'h': -+ usage(proc_name); -+ break; -+ default: -+ usage(proc_name); -+ break; -+ } -+ } -+ -+ snprintf(global_cfg_path, sizeof(global_cfg_path), "%s%s", cfg_dir, global_cfg_name); -+ snprintf(local_cfg_path, sizeof(local_cfg_path), "%s%s", cfg_dir, local_cfg_name); -+ snprintf(debug_cfg_path, sizeof(debug_cfg_path), "%s%s", cfg_dir, debug_cfg_name); -+ - /* threads */ - pthread_t thrid_up; - pthread_t thrid_down; -@@ -522,6 +570,22 @@ - float rx_nocrc_ratio; - float up_ack_ratio; - float dw_ack_ratio; -+ -+ /* redirect stdout, stderr to logfile if specified */ -+ int logfile_fd; -+ FILE *logfile = NULL; -+ if (logfile_path) { -+ logfile = fopen(logfile_path, "w"); -+ if (logfile) { -+ logfile_fd = fileno(logfile); -+ dup2(logfile_fd, STDOUT_FILENO); -+ dup2(logfile_fd, STDERR_FILENO); -+ } -+ else { -+ printf("Error opening log file %s\n", logfile_path); -+ exit(1); -+ } -+ } - - /* display version informations */ - MSG("*** Basic Packet Forwarder for Lora Gateway ***\nVersion: " VERSION_STRING "\n"); -diff --git a/gps_pkt_fwd/src/gps_pkt_fwd.c b/gps_pkt_fwd/src/gps_pkt_fwd.c -index 79f7584..3f2f91c 100644 ---- a/gps_pkt_fwd/src/gps_pkt_fwd.c -+++ b/gps_pkt_fwd/src/gps_pkt_fwd.c -@@ -44,6 +44,8 @@ Maintainer: Sylvain Miermont - #include <netdb.h> /* gai_strerror */ - - #include <pthread.h> -+#include <getopt.h> -+#include <linux/limits.h> - - #include "parson.h" - #include "base64.h" -@@ -531,19 +533,65 @@ static double difftimespec(struct timespec end, struct timespec beginning) { - return x; - } - -+void usage(char *proc_name) { -+ fprintf(stderr, "Usage: %s [-c config_dir] [-l logfile]\n", proc_name); -+ exit(1); -+} -+ -+ -+static char *short_options = "c:l:h"; -+static struct option long_options[] = { -+ {"config-dir", 1, 0, 'c'}, -+ {"logfile", 1, 0, 'l'}, -+ {"help", 0, 0, 'h'}, -+ {0, 0, 0, 0}, -+}; -+ - /* -------------------------------------------------------------------------- */ - /* --- MAIN FUNCTION -------------------------------------------------------- */ - --int main(void) -+int main(int argc, char *argv[]) - { - struct sigaction sigact; /* SIGQUIT&SIGINT&SIGTERM signal handling */ - int i; /* loop variable and temporary variable for return value */ - - /* configuration file related */ -- char *global_cfg_path= "global_conf.json"; /* contain global (typ. network-wide) configuration */ -- char *local_cfg_path = "local_conf.json"; /* contain node specific configuration, overwrite global parameters for parameters that are defined in both */ -- char *debug_cfg_path = "debug_conf.json"; /* if present, all other configuration files are ignored */ -- -+ char *global_cfg_name = "global_conf.json"; /* contain global (typ. network-wide) configuration */ -+ char *local_cfg_name = "local_conf.json"; /* contain node specific configuration, overwrite global parameters for parameters that are defined in both */ -+ char *debug_cfg_name = "debug_conf.json"; /* if present, all other configuration files are ignored */ -+ -+ int opt_ind = 0; -+ char cfg_dir[PATH_MAX] = {0}; -+ char global_cfg_path[PATH_MAX] = {0}; -+ char local_cfg_path[PATH_MAX] = {0}; -+ char debug_cfg_path[PATH_MAX] = {0}; -+ char *logfile_path = NULL; -+ char *proc_name = argv[0]; -+ -+ while((i = getopt_long(argc, argv, short_options, long_options, &opt_ind)) >= 0) { -+ switch(i) { -+ case 0: -+ break; -+ case 'c': -+ strncpy(cfg_dir, optarg, sizeof(cfg_dir)-2); -+ strcat(cfg_dir, "/"); -+ break; -+ case 'l': -+ logfile_path = optarg; -+ break; -+ case 'h': -+ usage(proc_name); -+ break; -+ default: -+ usage(proc_name); -+ break; -+ } -+ } -+ -+ snprintf(global_cfg_path, sizeof(global_cfg_path), "%s%s", cfg_dir, global_cfg_name); -+ snprintf(local_cfg_path, sizeof(local_cfg_path), "%s%s", cfg_dir, local_cfg_name); -+ snprintf(debug_cfg_path, sizeof(debug_cfg_path), "%s%s", cfg_dir, debug_cfg_name); -+ - /* threads */ - pthread_t thrid_up; - pthread_t thrid_down; -@@ -589,6 +637,22 @@ int main(void) - float up_ack_ratio; - float dw_ack_ratio; - -+ /* redirect stdout, stderr to logfile if specified */ -+ int logfile_fd; -+ FILE *logfile = NULL; -+ if (logfile_path) { -+ logfile = fopen(logfile_path, "w"); -+ if (logfile) { -+ logfile_fd = fileno(logfile); -+ dup2(logfile_fd, STDOUT_FILENO); -+ dup2(logfile_fd, STDERR_FILENO); -+ } -+ else { -+ printf("Error opening log file %s\n", logfile_path); -+ exit(1); -+ } -+ } -+ - /* display version informations */ - MSG("*** GPS Packet Forwarder for Lora Gateway ***\nVersion: " VERSION_STRING "\n"); - MSG("*** Lora concentrator HAL library version info ***\n%s\n***\n", lgw_version_info()); -Index: git/beacon_pkt_fwd/src/beacon_pkt_fwd.c -=================================================================== ---- git.orig/beacon_pkt_fwd/src/beacon_pkt_fwd.c 2015-04-01 15:14:12.156933956 -0500 -+++ git/beacon_pkt_fwd/src/beacon_pkt_fwd.c 2015-04-01 15:14:12.284931938 -0500 -@@ -45,6 +45,8 @@ - #include <netdb.h> /* gai_strerror */ - - #include <pthread.h> -+#include <getopt.h> -+#include <linux/limits.h> - - #include "parson.h" - #include "base64.h" -@@ -618,19 +620,65 @@ - return x; - } - -+void usage(char *proc_name) { -+ fprintf(stderr, "Usage: %s [-c config_dir] [-l logfile]\n", proc_name); -+ exit(1); -+} -+ -+ -+static char *short_options = "c:h"; -+static struct option long_options[] = { -+ {"config-dir", 1, 0, 'c'}, -+ {"logfile", 1, 0, 'l'}, -+ {"help", 0, 0, 'h'}, -+ {0, 0, 0, 0}, -+}; -+ - /* -------------------------------------------------------------------------- */ - /* --- MAIN FUNCTION -------------------------------------------------------- */ - --int main(void) -+int main(int argc, char *argv[]) - { - struct sigaction sigact; /* SIGQUIT&SIGINT&SIGTERM signal handling */ - int i; /* loop variable and temporary variable for return value */ - - /* configuration file related */ -- char *global_cfg_path= "global_conf.json"; /* contain global (typ. network-wide) configuration */ -- char *local_cfg_path = "local_conf.json"; /* contain node specific configuration, overwrite global parameters for parameters that are defined in both */ -- char *debug_cfg_path = "debug_conf.json"; /* if present, all other configuration files are ignored */ -- -+ char *global_cfg_name = "global_conf.json"; /* contain global (typ. network-wide) configuration */ -+ char *local_cfg_name = "local_conf.json"; /* contain node specific configuration, overwrite global parameters for parameters that are defined in both */ -+ char *debug_cfg_name = "debug_conf.json"; /* if present, all other configuration files are ignored */ -+ -+ int opt_ind = 0; -+ char cfg_dir[PATH_MAX] = {0}; -+ char global_cfg_path[PATH_MAX] = {0}; -+ char local_cfg_path[PATH_MAX] = {0}; -+ char debug_cfg_path[PATH_MAX] = {0}; -+ char *logfile_path = NULL; -+ char *proc_name = argv[0]; -+ -+ while((i = getopt_long(argc, argv, short_options, long_options, &opt_ind)) >= 0) { -+ switch(i) { -+ case 0: -+ break; -+ case 'c': -+ strncpy(cfg_dir, optarg, sizeof(cfg_dir)-2); -+ strcat(cfg_dir, "/"); -+ break; -+ case 'l': -+ logfile_path = optarg; -+ break; -+ case 'h': -+ usage(proc_name); -+ break; -+ default: -+ usage(proc_name); -+ break; -+ } -+ } -+ -+ snprintf(global_cfg_path, sizeof(global_cfg_path), "%s%s", cfg_dir, global_cfg_name); -+ snprintf(local_cfg_path, sizeof(local_cfg_path), "%s%s", cfg_dir, local_cfg_name); -+ snprintf(debug_cfg_path, sizeof(debug_cfg_path), "%s%s", cfg_dir, debug_cfg_name); -+ - /* threads */ - pthread_t thrid_up; - pthread_t thrid_down; -@@ -767,6 +715,22 @@ - float rx_nocrc_ratio; - float up_ack_ratio; - float dw_ack_ratio; -+ -+ /* redirect stdout, stderr to logfile if specified */ -+ int logfile_fd; -+ FILE *logfile = NULL; -+ if (logfile_path) { -+ logfile = fopen(logfile_path, "w"); -+ if (logfile) { -+ logfile_fd = fileno(logfile); -+ dup2(logfile_fd, STDOUT_FILENO); -+ dup2(logfile_fd, STDERR_FILENO); -+ } -+ else { -+ printf("Error opening log file %s\n", logfile_path); -+ exit(1); -+ } -+ } - - /* display version informations */ - MSG("*** Beacon Packet Forwarder for Lora Gateway ***\nVersion: " VERSION_STRING "\n"); diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-set-spi-path.patch b/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-set-spi-path.patch deleted file mode 100644 index 01ce509..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-set-spi-path.patch +++ /dev/null @@ -1,111 +0,0 @@ -Index: git/basic_pkt_fwd/src/basic_pkt_fwd.c -=================================================================== ---- git.orig/basic_pkt_fwd/src/basic_pkt_fwd.c 2015-01-07 14:38:10.016886785 -0600 -+++ git/basic_pkt_fwd/src/basic_pkt_fwd.c 2015-01-07 14:49:57.823412026 -0600 -@@ -106,6 +106,7 @@ - /* network configuration variables */ - static uint64_t lgwm = 0; /* Lora gateway MAC address */ - static char serv_addr[64] = STR(DEFAULT_SERVER); /* address of the server (host name or IPv4/IPv6) */ -+static char spi_device_path[64] = {0} ; /* custom SPI device path */ - static char serv_port_up[8] = STR(DEFAULT_PORT_UP); /* server port for upstream traffic */ - static char serv_port_down[8] = STR(DEFAULT_PORT_DW); /* server port for downstream traffic */ - static int keepalive_time = DEFAULT_KEEPALIVE; /* send a PULL_DATA request every X seconds, negative = disabled */ -@@ -393,6 +394,13 @@ - strncpy(serv_addr, str, sizeof serv_addr); - MSG("INFO: server hostname or IP address is configured to \"%s\"\n", serv_addr); - } -+ -+ /* spi device path (optional) */ -+ str = json_object_get_string(conf_obj, "spi_device"); -+ if (str != NULL) { -+ strncpy(spi_device_path, str, sizeof(spi_device_path)-1); -+ MSG("INFO: SPI device is configured to \"%s\"\n", spi_device_path); -+ } - - /* get up and down ports (optional) */ - val = json_object_get_value(conf_obj, "serv_port_up"); -@@ -629,6 +637,10 @@ - exit(EXIT_FAILURE); - } - freeaddrinfo(result); -+ -+ /* set custom SPI device path if configured */ -+ if (strlen(spi_device_path) > 0) -+ lgw_spi_set_path(spi_device_path); - - /* starting the concentrator */ - i = lgw_start(); -Index: git/beacon_pkt_fwd/src/beacon_pkt_fwd.c -=================================================================== ---- git.orig/beacon_pkt_fwd/src/beacon_pkt_fwd.c 2015-01-05 11:29:12.946020392 -0600 -+++ git/beacon_pkt_fwd/src/beacon_pkt_fwd.c 2015-01-07 14:57:00.338533303 -0600 -@@ -115,6 +115,7 @@ - /* network configuration variables */ - static uint64_t lgwm = 0; /* Lora gateway MAC address */ - static char serv_addr[64] = STR(DEFAULT_SERVER); /* address of the server (host name or IPv4/IPv6) */ -+static char spi_device_path[64] = {0} ; /* custom SPI device path */ - static char serv_port_up[8] = STR(DEFAULT_PORT_UP); /* server port for upstream traffic */ - static char serv_port_down[8] = STR(DEFAULT_PORT_DW); /* server port for downstream traffic */ - static int keepalive_time = DEFAULT_KEEPALIVE; /* send a PULL_DATA request every X seconds, negative = disabled */ -@@ -440,6 +441,13 @@ - strncpy(serv_addr, str, sizeof serv_addr); - MSG("INFO: server hostname or IP address is configured to \"%s\"\n", serv_addr); - } -+ -+ /* spi device path (optional) */ -+ str = json_object_get_string(conf_obj, "spi_device"); -+ if (str != NULL) { -+ strncpy(spi_device_path, str, sizeof(spi_device_path)-1); -+ MSG("INFO: SPI device is configured to \"%s\"\n", spi_device_path); -+ } - - /* get up and down ports (optional) */ - val = json_object_get_value(conf_obj, "serv_port_up"); -@@ -774,6 +782,10 @@ - exit(EXIT_FAILURE); - } - freeaddrinfo(result); -+ -+ /* set custom SPI device path if configured */ -+ if (strlen(spi_device_path) > 0) -+ lgw_spi_set_path(spi_device_path); - - /* starting the concentrator */ - i = lgw_start(); -Index: git/gps_pkt_fwd/src/gps_pkt_fwd.c -=================================================================== ---- git.orig/gps_pkt_fwd/src/gps_pkt_fwd.c 2015-01-05 11:29:12.946020392 -0600 -+++ git/gps_pkt_fwd/src/gps_pkt_fwd.c 2015-01-07 14:56:03.320278543 -0600 -@@ -110,6 +110,7 @@ - /* network configuration variables */ - static uint64_t lgwm = 0; /* Lora gateway MAC address */ - static char serv_addr[64] = STR(DEFAULT_SERVER); /* address of the server (host name or IPv4/IPv6) */ -+static char spi_device_path[64] = {0} ; /* custom SPI device path */ - static char serv_port_up[8] = STR(DEFAULT_PORT_UP); /* server port for upstream traffic */ - static char serv_port_down[8] = STR(DEFAULT_PORT_DW); /* server port for downstream traffic */ - static int keepalive_time = DEFAULT_KEEPALIVE; /* send a PULL_DATA request every X seconds, negative = disabled */ -@@ -424,6 +425,13 @@ - strncpy(serv_addr, str, sizeof serv_addr); - MSG("INFO: server hostname or IP address is configured to \"%s\"\n", serv_addr); - } -+ -+ /* spi device path (optional) */ -+ str = json_object_get_string(conf_obj, "spi_device"); -+ if (str != NULL) { -+ strncpy(spi_device_path, str, sizeof(spi_device_path)-1); -+ MSG("INFO: SPI device is configured to \"%s\"\n", spi_device_path); -+ } - - /* get up and down ports (optional) */ - val = json_object_get_value(conf_obj, "serv_port_up"); -@@ -717,6 +725,10 @@ - exit(EXIT_FAILURE); - } - freeaddrinfo(result); -+ -+ /* set custom SPI device path if configured */ -+ if (strlen(spi_device_path) > 0) -+ lgw_spi_set_path(spi_device_path); - - /* starting the concentrator */ - i = lgw_start(); diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-skip-bad-packets.patch b/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-skip-bad-packets.patch deleted file mode 100644 index eb9450f..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-skip-bad-packets.patch +++ /dev/null @@ -1,109 +0,0 @@ -Index: git/basic_pkt_fwd/src/basic_pkt_fwd.c -=================================================================== ---- git.orig/basic_pkt_fwd/src/basic_pkt_fwd.c 2014-12-16 17:03:32.891297739 -0600 -+++ git/basic_pkt_fwd/src/basic_pkt_fwd.c 2014-12-18 10:49:22.379916372 -0600 -@@ -928,7 +928,8 @@ - MSG("ERROR: [up] received packet with unknown status\n"); - memcpy((void *)(buff_up + buff_index), (void *)",\"stat\":?", 9); - buff_index += 9; -- exit(EXIT_FAILURE); -+ continue; // skip packet -+ //exit(EXIT_FAILURE); - } - - /* Packet modulation, 13-14 useful chars */ -@@ -966,7 +967,8 @@ - MSG("ERROR: [up] lora packet with unknown datarate\n"); - memcpy((void *)(buff_up + buff_index), (void *)",\"datr\":\"SF?", 12); - buff_index += 12; -- exit(EXIT_FAILURE); -+ continue; // skip packet -+ //exit(EXIT_FAILURE); - } - switch (p->bandwidth) { - case BW_125KHZ: -@@ -985,7 +987,8 @@ - MSG("ERROR: [up] lora packet with unknown bandwidth\n"); - memcpy((void *)(buff_up + buff_index), (void *)"BW?\"", 4); - buff_index += 4; -- exit(EXIT_FAILURE); -+ continue; // skip packet -+ //exit(EXIT_FAILURE); - } - - /* Packet ECC coding rate, 11-13 useful chars */ -@@ -1014,7 +1017,8 @@ - MSG("ERROR: [up] lora packet with unknown coderate\n"); - memcpy((void *)(buff_up + buff_index), (void *)",\"codr\":\"?\"", 11); - buff_index += 11; -- exit(EXIT_FAILURE); -+ continue; // skip packet -+ //exit(EXIT_FAILURE); - } - - /* Lora SNR, 11-13 useful chars */ -@@ -1039,7 +1043,8 @@ - } - } else { - MSG("ERROR: [up] received packet with unknown modulation\n"); -- exit(EXIT_FAILURE); -+ continue; // skip packet -+ //exit(EXIT_FAILURE); - } - - /* Packet RSSI, payload size, 18-23 useful chars */ - -diff --git a/gps_pkt_fwd/src/gps_pkt_fwd.c b/gps_pkt_fwd/src/gps_pkt_fwd.c -index 79f7584..933de29 100644 ---- a/gps_pkt_fwd/src/gps_pkt_fwd.c -+++ b/gps_pkt_fwd/src/gps_pkt_fwd.c -@@ -1107,7 +1107,8 @@ void thread_up(void) { - MSG("ERROR: [up] received packet with unknown status\n"); - memcpy((void *)(buff_up + buff_index), (void *)",\"stat\":?", 9); - buff_index += 9; -- exit(EXIT_FAILURE); -+ continue; // skip packet -+ //exit(EXIT_FAILURE); - } - - /* Packet modulation, 13-14 useful chars */ -@@ -1145,7 +1146,8 @@ void thread_up(void) { - MSG("ERROR: [up] lora packet with unknown datarate\n"); - memcpy((void *)(buff_up + buff_index), (void *)",\"datr\":\"SF?", 12); - buff_index += 12; -- exit(EXIT_FAILURE); -+ continue; // skip packet -+ //exit(EXIT_FAILURE); - } - switch (p->bandwidth) { - case BW_125KHZ: -@@ -1164,7 +1166,8 @@ void thread_up(void) { - MSG("ERROR: [up] lora packet with unknown bandwidth\n"); - memcpy((void *)(buff_up + buff_index), (void *)"BW?\"", 4); - buff_index += 4; -- exit(EXIT_FAILURE); -+ continue; // skip packet -+ //exit(EXIT_FAILURE); - } - - /* Packet ECC coding rate, 11-13 useful chars */ -@@ -1193,7 +1196,8 @@ void thread_up(void) { - MSG("ERROR: [up] lora packet with unknown coderate\n"); - memcpy((void *)(buff_up + buff_index), (void *)",\"codr\":\"?\"", 11); - buff_index += 11; -- exit(EXIT_FAILURE); -+ continue; // skip packet -+ //exit(EXIT_FAILURE); - } - - /* Lora SNR, 11-13 useful chars */ -@@ -1218,7 +1222,8 @@ void thread_up(void) { - } - } else { - MSG("ERROR: [up] received packet with unknown modulation\n"); -- exit(EXIT_FAILURE); -+ continue; // skip packet -+ //exit(EXIT_FAILURE); - } - - /* Packet RSSI, payload size, 18-23 useful chars */ diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-synch-word.patch b/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-synch-word.patch deleted file mode 100644 index 2f04eb1..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-synch-word.patch +++ /dev/null @@ -1,99 +0,0 @@ - -diff --git a/basic_pkt_fwd/src/basic_pkt_fwd.c b/basic_pkt_fwd/src/basic_pkt_fwd.c -index 2223b4a..2db6e26 100644 ---- a/basic_pkt_fwd/src/basic_pkt_fwd.c -+++ b/basic_pkt_fwd/src/basic_pkt_fwd.c -@@ -103,7 +104,8 @@ static bool fwd_error_pkt = false; /* packets with PAYLOAD CRC ERROR are NOT for - static bool fwd_nocrc_pkt = false; /* packets with NO PAYLOAD CRC are NOT forwarded */ - - /* network configuration variables */ -+static uint8_t synch_word = 0x12; - static uint64_t lgwm = 0; /* Lora gateway MAC address */ - static char serv_addr[64] = STR(DEFAULT_SERVER); /* address of the server (host name or IPv4/IPv6) */ - static char serv_port_up[8] = STR(DEFAULT_PORT_UP); /* server port for upstream traffic */ - static char serv_port_down[8] = STR(DEFAULT_PORT_DW); /* server port for downstream traffic */ -@@ -281,6 +282,11 @@ static int parse_SX1301_configuration(const char * conf_file) { - MSG("INFO: %s does contain a JSON object named %s, parsing SX1301 parameters\n", conf_file, conf_obj_name); - } - -+ val = json_object_get_value(conf_obj, "lorawan_public"); /* fetch value (if possible) */ -+ if (json_value_get_type(val) == JSONBoolean && (bool)json_value_get_boolean(val) == true) { -+ synch_word = 0x34; -+ } -+ - /* set configuration for RF chains */ - for (i = 0; i < LGW_RF_CHAIN_NB; ++i) { - memset(&rfconf, 0, sizeof rfconf); /* initialize configuration structure */ -@@ -404,7 +415,14 @@ static int parse_gateway_configuration(const char * conf_file) { - snprintf(serv_port_down, sizeof serv_port_down, "%u", (uint16_t)json_value_get_number(val)); - MSG("INFO: downstream port is configured to \"%s\"\n", serv_port_down); - } -- -+ -+ val = json_object_get_value(conf_obj, "synch_word"); -+ if (val != NULL) { -+ synch_word = (uint8_t)json_value_get_number(val); -+ MSG("INFO: synch word is configured to %02x\n", synch_word); -+ } -+ -+ - /* get keep-alive interval (in seconds) for downstream (optional) */ - val = json_object_get_value(conf_obj, "keepalive_interval"); - if (val != NULL) { -@@ -637,7 +721,9 @@ int main(void) - MSG("ERROR: [main] failed to start the concentrator\n"); - exit(EXIT_FAILURE); - } -- -+ -+ lgw_conf_lora_synch_word(synch_word); -+ - /* spawn threads to manage upstream and downstream */ - i = pthread_create( &thrid_up, NULL, (void * (*)(void *))thread_up, NULL); - if (i != 0) { -diff --git a/gps_pkt_fwd/src/gps_pkt_fwd.c b/gps_pkt_fwd/src/gps_pkt_fwd.c -index 79f7584..8addbc0 100644 ---- a/gps_pkt_fwd/src/gps_pkt_fwd.c -+++ b/gps_pkt_fwd/src/gps_pkt_fwd.c -@@ -108,6 +108,7 @@ static bool fwd_error_pkt = false; /* packets with PAYLOAD CRC ERROR are NOT for - static bool fwd_nocrc_pkt = false; /* packets with NO PAYLOAD CRC are NOT forwarded */ - - /* network configuration variables */ -+static uint8_t synch_word = 0x12; - static uint64_t lgwm = 0; /* Lora gateway MAC address */ - static char serv_addr[64] = STR(DEFAULT_SERVER); /* address of the server (host name or IPv4/IPv6) */ - static char serv_port_up[8] = STR(DEFAULT_PORT_UP); /* server port for upstream traffic */ -@@ -237,6 +238,11 @@ static int parse_SX1301_configuration(const char * conf_file) { - MSG("INFO: %s does contain a JSON object named %s, parsing SX1301 parameters\n", conf_file, conf_obj_name); - } - -+ val = json_object_get_value(conf_obj, "lorawan_public"); /* fetch value (if possible) */ -+ if (json_value_get_type(val) == JSONBoolean && (bool)json_value_get_boolean(val) == true) { -+ synch_word = 0x34; -+ } -+ - /* set configuration for RF chains */ - for (i = 0; i < LGW_RF_CHAIN_NB; ++i) { - memset(&rfconf, 0, sizeof rfconf); /* initialize configuration structure */ -@@ -437,6 +443,12 @@ static int parse_gateway_configuration(const char * conf_file) { - MSG("INFO: downstream port is configured to \"%s\"\n", serv_port_down); - } - -+ val = json_object_get_value(conf_obj, "synch_word"); -+ if (val != NULL) { -+ synch_word = (uint8_t)json_value_get_number(val); -+ MSG("INFO: synch word is configured to %02x\n", synch_word); -+ } -+ - /* get keep-alive interval (in seconds) for downstream (optional) */ - val = json_object_get_value(conf_obj, "keepalive_interval"); - if (val != NULL) { -@@ -727,6 +739,8 @@ int main(void) - exit(EXIT_FAILURE); - } - -+ lgw_conf_lora_synch_word(synch_word); -+ - /* spawn threads to manage upstream and downstream */ - i = pthread_create( &thrid_up, NULL, (void * (*)(void *))thread_up, NULL); - if (i != 0) { diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb b/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb deleted file mode 100644 index 5131a34..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb +++ /dev/null @@ -1,59 +0,0 @@ -DESCRIPTION = "LoRa Packet Forwarder" -HOMEPAGE = "https://github.com/Lora-net" -PRIORITY = "optional" -SECTION = "console/utils" -# Semtech license is a modified BSD-style license -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://LICENSE;md5=22af7693d7b76ef0fc76161c4be76c45" -DEPENDS = "lora-gateway-usb" -PR = "r12" - -EXTRA_OEMAKE = " -e" - -# tag v1.4.1 -SRCREV = "0011a60759a7d81656a5393e97089daab1ff1a81" - -SRC_URI = "git://github.com/Lora-net/packet_forwarder.git;protocol=git \ - file://lora-packet-forwarder-add-no-header-option.patch \ - file://lora-packet-forwarder-set-spi-path.patch \ - file://lora-packet-forwarder-fixb64.patch \ - file://lora-packet-forwarder-mts-enhancements.patch \ - file://lora-packet-forwarder-synch-word.patch \ - file://lora-packet-forwarder-add-queue.patch \ - file://README.md \ -" - -S = "${WORKDIR}/git" -B = "${S}" - -LORA_DIR = "/opt/lora" - -export LGW_PATH = "${STAGING_LIBDIR}/lora-usb" -export LGW_INC = "${STAGING_INCDIR}/lora-usb" - -CFLAGS += "-I${LGW_INC} -Iinc -I. -std=gnu11" - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}${LORA_DIR} - install -m 755 gps_pkt_fwd/gps_pkt_fwd ${D}${LORA_DIR}/gps_pkt_fwd-usb - install -m 755 basic_pkt_fwd/basic_pkt_fwd ${D}${LORA_DIR}/basic_pkt_fwd-usb - install -m 755 beacon_pkt_fwd/beacon_pkt_fwd ${D}${LORA_DIR}/beacon_pkt_fwd-usb - install -m 755 util_sink/util_sink ${D}${LORA_DIR}/util_sink-usb - install -m 755 util_ack/util_ack ${D}${LORA_DIR}/util_ack-usb - - -# skip util_tx_test since it conflicts with one in lora-gateway -# install -m 755 util_tx_test/util_tx_test ${D}${LORA_DIR}/ -} - -FILES_${PN} += "${LORA_DIR}" -FILES_${PN}-dbg += "${LORA_DIR}/.debug" - -# disable this on purpose for dev purposes -do_rm_work() { - echo "skipping" -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder/README.md b/recipes-connectivity/lora/lora-packet-forwarder/README.md deleted file mode 100644 index c927c60..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/README.md +++ /dev/null @@ -1,38 +0,0 @@ - - -(c) Senet, Inc 2016 - - - -3rd Party Licenses ------------------- - -This software incorporates the lora_gateway software which requires the -following statement to be included in its distribution. - -Copyright (c) 2013, SEMTECH S.A. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the Semtech corporation nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL SEMTECH S.A. BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 deleted file mode 100644 index f7c51d9..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 +++ /dev/null @@ -1,195 +0,0 @@ -{ - "SX1301_conf": { - "antenna_gain": 0, - "chan_FSK": { - "bandwidth": 125000, - "datarate": 50000, - "enable": true, - "if": 300000, - "radio": 1 - }, - "chan_Lora_std": { - "bandwidth": 250000, - "enable": true, - "if": -200000, - "radio": 1, - "spread_factor": 7 - }, - "chan_multiSF_0": { - "enable": true, - "if": -400000, - "radio": 1 - }, - "chan_multiSF_1": { - "enable": true, - "if": -200000, - "radio": 1 - }, - "chan_multiSF_2": { - "enable": true, - "if": 0, - "radio": 1 - }, - "chan_multiSF_3": { - "enable": true, - "if": -400000, - "radio": 0 - }, - "chan_multiSF_4": { - "enable": true, - "if": -200000, - "radio": 0 - }, - "chan_multiSF_5": { - "enable": true, - "if": 0, - "radio": 0 - }, - "chan_multiSF_6": { - "enable": true, - "if": 200000, - "radio": 0 - }, - "chan_multiSF_7": { - "enable": true, - "if": 400000, - "radio": 0 - }, - "clksrc": 0, - "lbt_cfg": { - "enable": false, - "nb_channel": 1, - "rssi_target": 160, - "scan_time_us": 5000, - "start_freq": 869525000, - "tx_delay_1ch_us": 4000000, - "tx_delay_2ch_us": 4000000 - }, - "lorawan_public": true, - "radio_0": { - "enable": true, - "freq": 867500000, - "rssi_offset": -165, - "tx_enable": true, - "tx_freq_max": 870000000, - "tx_freq_min": 863000000, - "type": "SX1257" - }, - "radio_1": { - "enable": true, - "freq": 868500000, - "rssi_offset": -165, - "tx_enable": false, - "type": "SX1257" - }, - "tx_lut_0": { - "dig_gain": 3, - "mix_gain": 8, - "pa_gain": 0, - "rf_power": -6 - }, - "tx_lut_1": { - "dig_gain": 3, - "mix_gain": 10, - "pa_gain": 0, - "rf_power": -3 - }, - "tx_lut_10": { - "dig_gain": 3, - "mix_gain": 11, - "pa_gain": 2, - "rf_power": 16 - }, - "tx_lut_11": { - "dig_gain": 3, - "mix_gain": 10, - "pa_gain": 3, - "rf_power": 20 - }, - "tx_lut_12": { - "dig_gain": 3, - "mix_gain": 11, - "pa_gain": 3, - "rf_power": 23 - }, - "tx_lut_13": { - "dig_gain": 3, - "mix_gain": 12, - "pa_gain": 3, - "rf_power": 24 - }, - "tx_lut_14": { - "dig_gain": 3, - "mix_gain": 13, - "pa_gain": 3, - "rf_power": 25 - }, - "tx_lut_15": { - "dig_gain": 3, - "mix_gain": 15, - "pa_gain": 3, - "rf_power": 26 - }, - "tx_lut_2": { - "dig_gain": 3, - "mix_gain": 12, - "pa_gain": 0, - "rf_power": 0 - }, - "tx_lut_3": { - "dig_gain": 3, - "mix_gain": 8, - "pa_gain": 1, - "rf_power": 3 - }, - "tx_lut_4": { - "dig_gain": 3, - "mix_gain": 10, - "pa_gain": 1, - "rf_power": 6 - }, - "tx_lut_5": { - "dig_gain": 3, - "mix_gain": 12, - "pa_gain": 1, - "rf_power": 10 - }, - "tx_lut_6": { - "dig_gain": 3, - "mix_gain": 12, - "pa_gain": 1, - "rf_power": 11 - }, - "tx_lut_7": { - "dig_gain": 3, - "mix_gain": 9, - "pa_gain": 2, - "rf_power": 12 - }, - "tx_lut_8": { - "dig_gain": 3, - "mix_gain": 15, - "pa_gain": 1, - "rf_power": 13 - }, - "tx_lut_9": { - "dig_gain": 3, - "mix_gain": 10, - "pa_gain": 2, - "rf_power": 14 - } - }, - "gateway_conf": { - "forward_crc_disabled": false, - "forward_crc_error": false, - "forward_crc_valid": true, - "gateway_ID": "<WILL-BE-REPLACED-WITH-LORA-EUI>", - "keepalive_interval": 10, - "push_timeout_ms": 100, - "serv_port_down": 1680, - "serv_port_up": 1680, - "server_address": "localhost", - "stat_interval": 30, - "autoquit_threshold": 60 - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0 deleted file mode 100644 index a690d3c..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0 +++ /dev/null @@ -1,193 +0,0 @@ -{ - "SX1301_conf": { - "lorawan_public": true, - "antenna_gain": 0, - "clksrc": 0, - "radio_0": { - "enable": true, - "freq": 902700000, - "rssi_offset": -165, - "tx_enable": true, - "tx_freq_max": 928000000, - "tx_freq_min": 902000000, - "type": "SX1257" - }, - "radio_1": { - "enable": true, - "freq": 903500000, - "rssi_offset": -165, - "tx_enable": false, - "type": "SX1257" - }, - "chan_FSK": { - "enable": false, - "radio": 0 - }, - "chan_Lora_std": { - "bandwidth": 500000, - "enable": true, - "if": 300000, - "radio": 0, - "spread_factor": 8 - }, - "chan_multiSF_0": { - "enable": true, - "if": -400000, - "radio": 0 - }, - "chan_multiSF_1": { - "enable": true, - "if": -200000, - "radio": 0 - }, - "chan_multiSF_2": { - "enable": true, - "if": 0, - "radio": 0 - }, - "chan_multiSF_3": { - "enable": true, - "if": 200000, - "radio": 0 - }, - "chan_multiSF_4": { - "enable": true, - "if": -400000, - "radio": 1 - }, - "chan_multiSF_5": { - "enable": true, - "if": -200000, - "radio": 1 - }, - "chan_multiSF_6": { - "enable": true, - "if": 0, - "radio": 1 - }, - "chan_multiSF_7": { - "enable": true, - "if": 200000, - "radio": 1 - }, - "lbt_cfg": { - "enable": false, - "nb_channel": 1, - "rssi_target": 160, - "scan_time_us": 5000, - "start_freq": 869525000, - "tx_delay_1ch_us": 4000000, - "tx_delay_2ch_us": 4000000 - }, - "tx_lut_0": { - "pa_gain": 0, - "mix_gain": 8, - "rf_power": -6, - "dig_gain": 3 - }, - "tx_lut_1": { - "pa_gain": 0, - "mix_gain": 10, - "rf_power": -3, - "dig_gain": 3 - }, - "tx_lut_2": { - "pa_gain": 0, - "mix_gain": 12, - "rf_power": 0, - "dig_gain": 3 - }, - "tx_lut_3": { - "pa_gain": 1, - "mix_gain": 8, - "rf_power": 3, - "dig_gain": 3 - }, - "tx_lut_4": { - "pa_gain": 1, - "mix_gain": 10, - "rf_power": 6, - "dig_gain": 3 - }, - "tx_lut_5": { - "pa_gain": 1, - "mix_gain": 12, - "rf_power": 10, - "dig_gain": 3 - }, - "tx_lut_6": { - "pa_gain": 1, - "mix_gain": 12, - "rf_power": 11, - "dig_gain": 3 - }, - "tx_lut_7": { - "pa_gain": 2, - "mix_gain": 9, - "rf_power": 12, - "dig_gain": 3 - }, - "tx_lut_8": { - "pa_gain": 1, - "mix_gain": 15, - "rf_power": 13, - "dig_gain": 3 - }, - "tx_lut_9": { - "pa_gain": 2, - "mix_gain": 10, - "rf_power": 14, - "dig_gain": 3 - }, - "tx_lut_10": { - "pa_gain": 2, - "mix_gain": 11, - "rf_power": 16, - "dig_gain": 3 - }, - "tx_lut_11": { - "pa_gain": 3, - "mix_gain": 10, - "rf_power": 20, - "dig_gain": 3 - }, - "tx_lut_12": { - "pa_gain": 3, - "mix_gain": 11, - "rf_power": 23, - "dig_gain": 3 - }, - "tx_lut_13": { - "pa_gain": 3, - "mix_gain": 12, - "rf_power": 24, - "dig_gain": 3 - }, - "tx_lut_14": { - "pa_gain": 3, - "mix_gain": 13, - "rf_power": 25, - "dig_gain": 3 - }, - "tx_lut_15": { - "pa_gain": 3, - "mix_gain": 15, - "rf_power": 26, - "dig_gain": 3 - } - }, - "gateway_conf": { - "forward_crc_disabled": false, - "forward_crc_error": false, - "forward_crc_valid": true, - "gateway_ID": "<WILL-BE-REPLACED-WITH-LORA-EUI>", - "keepalive_interval": 12, - "push_timeout_ms": 120, - "serv_port_down": 1780, - "serv_port_up": 1780, - "server_address": "us01-iot.semtech.com", - "stat_interval": 20, - "synch_word": 52, - "autoquit_threshold": 60 - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.AS923-LBT.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.AS923-LBT.basic.clksrc0 deleted file mode 100644 index 42ca846..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.AS923-LBT.basic.clksrc0 +++ /dev/null @@ -1,227 +0,0 @@ -{ - "SX1301_conf": { - "antenna_gain": 0, - "chan_FSK": { - "bandwidth": 125000, - "datarate": 50000, - "enable": true, - "freq_deviation": 25000, - "if": 300000, - "radio": 0 - }, - "chan_Lora_std": { - "bandwidth": 250000, - "enable": true, - "if": -200000, - "radio": 0, - "spread_factor": 7 - }, - "chan_multiSF_0": { - "enable": true, - "if": -400000, - "radio": 0 - }, - "chan_multiSF_1": { - "enable": true, - "if": -200000, - "radio": 0 - }, - "chan_multiSF_2": { - "enable": true, - "if": 0, - "radio": 0 - }, - "chan_multiSF_3": { - "enable": true, - "if": -400000, - "radio": 1 - }, - "chan_multiSF_4": { - "enable": true, - "if": -200000, - "radio": 1 - }, - "chan_multiSF_5": { - "enable": true, - "if": 0, - "radio": 1 - }, - "chan_multiSF_6": { - "enable": true, - "if": 200000, - "radio": 1 - }, - "chan_multiSF_7": { - "enable": true, - "if": 400000, - "radio": 1 - }, - "clksrc": 0, - "lbt_cfg": { - "chan_cfg": [ - { - "freq_hz": 923200000, - "scan_time_us": 5000 - }, - { - "freq_hz": 923400000, - "scan_time_us": 5000 - }, - { - "freq_hz": 923600000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922200000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922400000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922600000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922800000, - "scan_time_us": 5000 - }, - { - "freq_hz": 923000000, - "scan_time_us": 5000 - } - ], - "enable": true, - "rssi_target": -80, - "sx127x_rssi_offset": -4 - }, - "lorawan_public": true, - "radio_0": { - "enable": true, - "freq": 923600000, - "rssi_offset": -162, - "tx_enable": true, - "tx_freq_max": 928000000, - "tx_freq_min": 920000000, - "type": "SX1257" - }, - "radio_1": { - "enable": true, - "freq": 922600000, - "rssi_offset": -162, - "tx_enable": false, - "type": "SX1257" - }, - "tx_lut_0": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 0, - "rf_power": -6 - }, - "tx_lut_1": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 0, - "rf_power": -3 - }, - "tx_lut_2": { - "dig_gain": 0, - "mix_gain": 9, - "pa_gain": 1, - "rf_power": 0 - }, - "tx_lut_3": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 1, - "rf_power": 3 - }, - "tx_lut_4": { - "dig_gain": 0, - "mix_gain": 12, - "pa_gain": 1, - "rf_power": 6 - }, - "tx_lut_5": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 2, - "rf_power": 10 - }, - "tx_lut_6": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 2, - "rf_power": 11 - }, - "tx_lut_7": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 2, - "rf_power": 12 - }, - "tx_lut_8": { - "dig_gain": 2, - "mix_gain": 12, - "pa_gain": 2, - "rf_power": 13 - }, - "tx_lut_9": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 2, - "rf_power": 14 - }, - "tx_lut_10": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 2, - "rf_power": 16 - }, - "tx_lut_11": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 3, - "rf_power": 20 - }, - "tx_lut_12": { - "dig_gain": 0, - "mix_gain": 12, - "pa_gain": 3, - "rf_power": 23 - }, - "tx_lut_13": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 3, - "rf_power": 25 - }, - "tx_lut_14": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 3, - "rf_power": 26 - }, - "tx_lut_15": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 3, - "rf_power": 27 - } - }, - "gateway_conf": { - "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>", - "server_address": "52.3.215.147", - "serv_port_up": 20000, - "serv_port_down": 20000, - "forward_crc_disabled": false, - "forward_crc_error": true, - "forward_crc_valid": true, - "keepalive_interval": 10, - "push_timeout_ms": 120, - "stat_interval": 20, - "synch_word": 52, - "autoquit_threshold": 60 - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.AS923.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.AS923.basic.clksrc0 deleted file mode 100644 index ecb265b..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.AS923.basic.clksrc0 +++ /dev/null @@ -1,195 +0,0 @@ -{ - "SX1301_conf": { - "antenna_gain": 0, - "chan_FSK": { - "bandwidth": 125000, - "datarate": 50000, - "enable": true, - "freq_deviation": 25000, - "if": 300000, - "radio": 0 - }, - "chan_Lora_std": { - "bandwidth": 250000, - "enable": true, - "if": -200000, - "radio": 0, - "spread_factor": 7 - }, - "chan_multiSF_0": { - "enable": true, - "if": -400000, - "radio": 0 - }, - "chan_multiSF_1": { - "enable": true, - "if": -200000, - "radio": 0 - }, - "chan_multiSF_2": { - "enable": true, - "if": 0, - "radio": 0 - }, - "chan_multiSF_3": { - "enable": true, - "if": -400000, - "radio": 1 - }, - "chan_multiSF_4": { - "enable": true, - "if": -200000, - "radio": 1 - }, - "chan_multiSF_5": { - "enable": true, - "if": 0, - "radio": 1 - }, - "chan_multiSF_6": { - "enable": true, - "if": 200000, - "radio": 1 - }, - "chan_multiSF_7": { - "enable": true, - "if": 400000, - "radio": 1 - }, - "clksrc": 0, - "lbt_cfg": { - "chan_cfg": [ - ], - "enable": false, - "rssi_target": -80, - "sx127x_rssi_offset": -4 - }, - "lorawan_public": true, - "radio_0": { - "enable": true, - "freq": 923600000, - "rssi_offset": -162, - "tx_enable": true, - "tx_freq_max": 928000000, - "tx_freq_min": 920000000, - "type": "SX1257" - }, - "radio_1": { - "enable": true, - "freq": 922600000, - "rssi_offset": -162, - "tx_enable": false, - "type": "SX1257" - }, - "tx_lut_0": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 0, - "rf_power": -6 - }, - "tx_lut_1": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 0, - "rf_power": -3 - }, - "tx_lut_2": { - "dig_gain": 0, - "mix_gain": 9, - "pa_gain": 1, - "rf_power": 0 - }, - "tx_lut_3": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 1, - "rf_power": 3 - }, - "tx_lut_4": { - "dig_gain": 0, - "mix_gain": 12, - "pa_gain": 1, - "rf_power": 6 - }, - "tx_lut_5": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 2, - "rf_power": 10 - }, - "tx_lut_6": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 2, - "rf_power": 11 - }, - "tx_lut_7": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 2, - "rf_power": 12 - }, - "tx_lut_8": { - "dig_gain": 2, - "mix_gain": 12, - "pa_gain": 2, - "rf_power": 13 - }, - "tx_lut_9": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 2, - "rf_power": 14 - }, - "tx_lut_10": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 2, - "rf_power": 16 - }, - "tx_lut_11": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 3, - "rf_power": 20 - }, - "tx_lut_12": { - "dig_gain": 0, - "mix_gain": 12, - "pa_gain": 3, - "rf_power": 23 - }, - "tx_lut_13": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 3, - "rf_power": 25 - }, - "tx_lut_14": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 3, - "rf_power": 26 - }, - "tx_lut_15": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 3, - "rf_power": 27 - } - }, - "gateway_conf": { - "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>", - "server_address": "52.3.215.147", - "serv_port_up": 20000, - "serv_port_down": 20000, - "forward_crc_disabled": false, - "forward_crc_error": true, - "forward_crc_valid": true, - "keepalive_interval": 10, - "push_timeout_ms": 120, - "stat_interval": 20, - "synch_word": 52, - "autoquit_threshold": 60 - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.AU915.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.AU915.basic.clksrc0 deleted file mode 100644 index e759b96..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.AU915.basic.clksrc0 +++ /dev/null @@ -1,193 +0,0 @@ -{ - "SX1301_conf": { - "lorawan_public": true, - "antenna_gain": 0, - "clksrc": 0, - "radio_0": { - "enable": true, - "freq": 915600000, - "rssi_offset": -162, - "tx_enable": true, - "tx_freq_max": 928000000, - "tx_freq_min": 902000000, - "type": "SX1257" - }, - "radio_1": { - "enable": true, - "freq": 916400000, - "rssi_offset": -162, - "tx_enable": false, - "type": "SX1257" - }, - "chan_FSK": { - "enable": false, - "radio": 0 - }, - "chan_Lora_std": { - "bandwidth": 500000, - "enable": true, - "if": 300000, - "radio": 0, - "spread_factor": 8 - }, - "chan_multiSF_0": { - "enable": true, - "if": -400000, - "radio": 0 - }, - "chan_multiSF_1": { - "enable": true, - "if": -200000, - "radio": 0 - }, - "chan_multiSF_2": { - "enable": true, - "if": 0, - "radio": 0 - }, - "chan_multiSF_3": { - "enable": true, - "if": 200000, - "radio": 0 - }, - "chan_multiSF_4": { - "enable": true, - "if": -400000, - "radio": 1 - }, - "chan_multiSF_5": { - "enable": true, - "if": -200000, - "radio": 1 - }, - "chan_multiSF_6": { - "enable": true, - "if": 0, - "radio": 1 - }, - "chan_multiSF_7": { - "enable": true, - "if": 200000, - "radio": 1 - }, - "lbt_cfg": { - "enable": false, - "nb_channel": 1, - "rssi_target": 160, - "scan_time_us": 5000, - "start_freq": 869525000, - "tx_delay_1ch_us": 4000000, - "tx_delay_2ch_us": 4000000 - }, - "tx_lut_0": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 0, - "rf_power": -6 - }, - "tx_lut_1": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 0, - "rf_power": -3 - }, - "tx_lut_2": { - "dig_gain": 0, - "mix_gain": 9, - "pa_gain": 1, - "rf_power": 0 - }, - "tx_lut_3": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 1, - "rf_power": 3 - }, - "tx_lut_4": { - "dig_gain": 0, - "mix_gain": 12, - "pa_gain": 1, - "rf_power": 6 - }, - "tx_lut_5": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 2, - "rf_power": 10 - }, - "tx_lut_6": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 2, - "rf_power": 11 - }, - "tx_lut_7": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 2, - "rf_power": 12 - }, - "tx_lut_8": { - "dig_gain": 2, - "mix_gain": 12, - "pa_gain": 2, - "rf_power": 13 - }, - "tx_lut_9": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 2, - "rf_power": 14 - }, - "tx_lut_10": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 2, - "rf_power": 16 - }, - "tx_lut_11": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 3, - "rf_power": 20 - }, - "tx_lut_12": { - "dig_gain": 0, - "mix_gain": 12, - "pa_gain": 3, - "rf_power": 23 - }, - "tx_lut_13": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 3, - "rf_power": 25 - }, - "tx_lut_14": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 3, - "rf_power": 26 - }, - "tx_lut_15": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 3, - "rf_power": 27 - } - }, - "gateway_conf": { - "forward_crc_disabled": false, - "forward_crc_error": false, - "forward_crc_valid": true, - "gateway_ID": "<WILL-BE-REPLACED-WITH-LORA-EUI>", - "keepalive_interval": 12, - "push_timeout_ms": 120, - "serv_port_down": 20000, - "serv_port_up": 20000, - "server_address": "52.3.215.147", - "stat_interval": 20, - "synch_word": 52, - "autoquit_threshold": 60 - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 deleted file mode 100644 index 36554fa..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 +++ /dev/null @@ -1,190 +0,0 @@ -{ - "SX1301_conf": { - "antenna_gain": 0, - "chan_FSK": { - "bandwidth": 125000, - "datarate": 50000, - "enable": true, - "if": 300000, - "radio": 1 - }, - "chan_Lora_std": { - "bandwidth": 250000, - "enable": true, - "if": -200000, - "radio": 1, - "spread_factor": 7 - }, - "chan_multiSF_0": { - "enable": true, - "if": -400000, - "radio": 1 - }, - "chan_multiSF_1": { - "enable": true, - "if": -200000, - "radio": 1 - }, - "chan_multiSF_2": { - "enable": true, - "if": 0, - "radio": 1 - }, - "chan_multiSF_3": { - "enable": true, - "if": -400000, - "radio": 0 - }, - "chan_multiSF_4": { - "enable": true, - "if": -200000, - "radio": 0 - }, - "chan_multiSF_5": { - "enable": true, - "if": 0, - "radio": 0 - }, - "chan_multiSF_6": { - "enable": true, - "if": 200000, - "radio": 0 - }, - "chan_multiSF_7": { - "enable": true, - "if": 400000, - "radio": 0 - }, - "clksrc": 0, - "lbt_cfg": { - "enable": false, - "rssi_target": 160 - }, - "lorawan_public": true, - "radio_0": { - "enable": true, - "freq": 867500000, - "rssi_offset": -162, - "tx_enable": true, - "tx_freq_max": 870000000, - "tx_freq_min": 863000000, - "type": "SX1257" - }, - "radio_1": { - "enable": true, - "freq": 868500000, - "rssi_offset": -162, - "tx_enable": false, - "type": "SX1257" - }, - "tx_lut_0": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 0, - "rf_power": -6 - }, - "tx_lut_1": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 0, - "rf_power": -3 - }, - "tx_lut_2": { - "dig_gain": 0, - "mix_gain": 9, - "pa_gain": 1, - "rf_power": 0 - }, - "tx_lut_3": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 1, - "rf_power": 3 - }, - "tx_lut_4": { - "dig_gain": 0, - "mix_gain": 12, - "pa_gain": 1, - "rf_power": 6 - }, - "tx_lut_5": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 2, - "rf_power": 10 - }, - "tx_lut_6": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 2, - "rf_power": 11 - }, - "tx_lut_7": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 2, - "rf_power": 12 - }, - "tx_lut_8": { - "dig_gain": 2, - "mix_gain": 12, - "pa_gain": 2, - "rf_power": 13 - }, - "tx_lut_9": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 2, - "rf_power": 14 - }, - "tx_lut_10": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 2, - "rf_power": 16 - }, - "tx_lut_11": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 3, - "rf_power": 20 - }, - "tx_lut_12": { - "dig_gain": 0, - "mix_gain": 12, - "pa_gain": 3, - "rf_power": 23 - }, - "tx_lut_13": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 3, - "rf_power": 25 - }, - "tx_lut_14": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 3, - "rf_power": 26 - }, - "tx_lut_15": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 3, - "rf_power": 27 - } - }, - "gateway_conf": { - "forward_crc_disabled": false, - "forward_crc_error": true, - "forward_crc_valid": true, - "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>", - "keepalive_interval": 10, - "push_timeout_ms": 100, - "serv_port_down": 20000, - "serv_port_up": 20000, - "server_address": "52.3.215.147", - "stat_interval": 30, - "autoquit_threshold": 60 - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.IN865.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.IN865.basic.clksrc0 deleted file mode 100644 index cd4253f..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.IN865.basic.clksrc0 +++ /dev/null @@ -1,196 +0,0 @@ -{ - "SX1301_conf": { - "antenna_gain": 0, - "chan_FSK": { - "bandwidth": 125000, - "datarate": 50000, - "enable": true, - "freq_deviation": 25000, - "if": 300000, - "radio": 1 - }, - "chan_Lora_std": { - "bandwidth": 250000, - "enable": true, - "if": 0, - "radio": 0, - "spread_factor": 7 - }, - "chan_multiSF_": { - "radio": null - }, - "chan_multiSF_0": { - "enable": true, - "if": -137500, - "radio": 0 - }, - "chan_multiSF_1": { - "enable": true, - "if": 202500, - "radio": 0 - }, - "chan_multiSF_2": { - "enable": true, - "if": 32500, - "radio": 0 - }, - "chan_multiSF_3": { - "enable": true, - "if": -400000, - "radio": 1 - }, - "chan_multiSF_4": { - "enable": true, - "if": -200000, - "radio": 1 - }, - "chan_multiSF_5": { - "enable": true, - "if": 0, - "radio": 1 - }, - "chan_multiSF_6": { - "enable": true, - "if": 200000, - "radio": 1 - }, - "chan_multiSF_7": { - "enable": true, - "if": 400000, - "radio": 1 - }, - "clksrc": 0, - "lbt_cfg": { - "enable": false, - "rssi_target": 160 - }, - "lorawan_public": true, - "radio_0": { - "enable": true, - "freq": 865200000, - "rssi_offset": -162, - "tx_enable": true, - "tx_freq_max": 867000000, - "tx_freq_min": 865000000, - "tx_notch_freq": 129000, - "type": "SX1257" - }, - "radio_1": { - "enable": true, - "freq": 866385000, - "rssi_offset": -162, - "tx_enable": false, - "type": "SX1257" - }, - "tx_lut_0": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 0, - "rf_power": -6 - }, - "tx_lut_1": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 0, - "rf_power": -3 - }, - "tx_lut_2": { - "dig_gain": 0, - "mix_gain": 9, - "pa_gain": 1, - "rf_power": 0 - }, - "tx_lut_3": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 1, - "rf_power": 3 - }, - "tx_lut_4": { - "dig_gain": 0, - "mix_gain": 12, - "pa_gain": 1, - "rf_power": 6 - }, - "tx_lut_5": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 2, - "rf_power": 10 - }, - "tx_lut_6": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 2, - "rf_power": 11 - }, - "tx_lut_7": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 2, - "rf_power": 12 - }, - "tx_lut_8": { - "dig_gain": 2, - "mix_gain": 12, - "pa_gain": 2, - "rf_power": 13 - }, - "tx_lut_9": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 2, - "rf_power": 14 - }, - "tx_lut_10": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 2, - "rf_power": 16 - }, - "tx_lut_11": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 3, - "rf_power": 20 - }, - "tx_lut_12": { - "dig_gain": 0, - "mix_gain": 12, - "pa_gain": 3, - "rf_power": 23 - }, - "tx_lut_13": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 3, - "rf_power": 25 - }, - "tx_lut_14": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 3, - "rf_power": 26 - }, - "tx_lut_15": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 3, - "rf_power": 27 - } - }, - "gateway_conf": { - "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>", - "server_address": "52.3.215.147", - "serv_port_up": 20000, - "serv_port_down": 20000, - "forward_crc_disabled": false, - "forward_crc_error": true, - "forward_crc_valid": true, - "keepalive_interval": 10, - "push_timeout_ms": 120, - "stat_interval": 20, - "synch_word": 52, - "autoquit_threshold": 60 - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.KR920-LBT.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.KR920-LBT.basic.clksrc0 deleted file mode 100644 index d405a57..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.KR920-LBT.basic.clksrc0 +++ /dev/null @@ -1,226 +0,0 @@ -{ - "SX1301_conf": { - "antenna_gain": 0, - "chan_FSK": { - "bandwidth": 125000, - "datarate": 50000, - "enable": false, - "if": 300000, - "radio": 0 - }, - "chan_Lora_std": { - "bandwidth": 250000, - "enable": false, - "if": -200000, - "radio": 0, - "spread_factor": 7 - }, - "chan_multiSF_0": { - "enable": true, - "if": -400000, - "radio": 0 - }, - "chan_multiSF_1": { - "enable": true, - "if": -200000, - "radio": 0 - }, - "chan_multiSF_2": { - "enable": true, - "if": 0, - "radio": 0 - }, - "chan_multiSF_3": { - "enable": true, - "if": -400000, - "radio": 1 - }, - "chan_multiSF_4": { - "enable": true, - "if": -200000, - "radio": 1 - }, - "chan_multiSF_5": { - "enable": true, - "if": 0, - "radio": 1 - }, - "chan_multiSF_6": { - "enable": true, - "if": 200000, - "radio": 1 - }, - "chan_multiSF_7": { - "enable": true, - "if": 400000, - "radio": 1 - }, - "clksrc": 0, - "lbt_cfg": { - "chan_cfg": [ - { - "freq_hz": 922100000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922300000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922500000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922700000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922900000, - "scan_time_us": 5000 - }, - { - "freq_hz": 923100000, - "scan_time_us": 5000 - }, - { - "freq_hz": 923300000, - "scan_time_us": 5000 - }, - { - "freq_hz": 921900000, - "scan_time_us": 5000 - } - ], - "enable": true, - "rssi_target": -65, - "sx127x_rssi_offset": -4 - }, - "lorawan_public": true, - "radio_0": { - "enable": true, - "freq": 922500000, - "rssi_offset": -162, - "tx_enable": true, - "tx_freq_max": 923300000, - "tx_freq_min": 920900000, - "type": "SX1257" - }, - "radio_1": { - "enable": true, - "freq": 922900000, - "rssi_offset": -162, - "tx_enable": false, - "type": "SX1257" - }, - "tx_lut_0": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 0, - "rf_power": -6 - }, - "tx_lut_1": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 0, - "rf_power": -3 - }, - "tx_lut_2": { - "dig_gain": 0, - "mix_gain": 9, - "pa_gain": 1, - "rf_power": 0 - }, - "tx_lut_3": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 1, - "rf_power": 3 - }, - "tx_lut_4": { - "dig_gain": 0, - "mix_gain": 12, - "pa_gain": 1, - "rf_power": 6 - }, - "tx_lut_5": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 2, - "rf_power": 10 - }, - "tx_lut_6": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 2, - "rf_power": 11 - }, - "tx_lut_7": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 2, - "rf_power": 12 - }, - "tx_lut_8": { - "dig_gain": 2, - "mix_gain": 12, - "pa_gain": 2, - "rf_power": 13 - }, - "tx_lut_9": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 2, - "rf_power": 14 - }, - "tx_lut_10": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 2, - "rf_power": 16 - }, - "tx_lut_11": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 3, - "rf_power": 20 - }, - "tx_lut_12": { - "dig_gain": 0, - "mix_gain": 12, - "pa_gain": 3, - "rf_power": 23 - }, - "tx_lut_13": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 3, - "rf_power": 25 - }, - "tx_lut_14": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 3, - "rf_power": 26 - }, - "tx_lut_15": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 3, - "rf_power": 27 - } - }, - "gateway_conf": { - "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>", - "server_address": "52.3.215.147", - "serv_port_up": 20000, - "serv_port_down": 20000, - "forward_crc_disabled": false, - "forward_crc_error": true, - "forward_crc_valid": true, - "keepalive_interval": 10, - "push_timeout_ms": 120, - "stat_interval": 20, - "synch_word": 52, - "autoquit_threshold": 60 - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.RU864.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.RU864.basic.clksrc0 deleted file mode 100644 index eb8e06b..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.RU864.basic.clksrc0 +++ /dev/null @@ -1,191 +0,0 @@ -{ - "SX1301_conf": { - "antenna_gain": 0, - "chan_FSK": { - "bandwidth": 125000, - "datarate": 50000, - "freq_deviation": 25000, - "enable": true, - "if": 0, - "radio": 0 - }, - "chan_Lora_std": { - "bandwidth": 250000, - "enable": true, - "if": -200000, - "radio": 0, - "spread_factor": 7 - }, - "chan_multiSF_0": { - "enable": true, - "if": -400000, - "radio": 0 - }, - "chan_multiSF_1": { - "enable": true, - "if": -200000, - "radio": 0 - }, - "chan_multiSF_2": { - "enable": true, - "if": 0, - "radio": 0 - }, - "chan_multiSF_3": { - "enable": true, - "if": -400000, - "radio": 1 - }, - "chan_multiSF_4": { - "enable": true, - "if": -200000, - "radio": 1 - }, - "chan_multiSF_5": { - "enable": true, - "if": 0, - "radio": 1 - }, - "chan_multiSF_6": { - "enable": true, - "if": 200000, - "radio": 1 - }, - "chan_multiSF_7": { - "enable": false, - "if": 400000, - "radio": 0 - }, - "clksrc": 0, - "lbt_cfg": { - "enable": false, - "rssi_target": 160 - }, - "lorawan_public": true, - "radio_0": { - "enable": true, - "freq": 869100000, - "rssi_offset": -162, - "tx_enable": true, - "tx_freq_max": 870000000, - "tx_freq_min": 864000000, - "type": "SX1257" - }, - "radio_1": { - "enable": true, - "freq": 868100000, - "rssi_offset": -162, - "tx_enable": false, - "type": "SX1257" - }, - "tx_lut_0": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 0, - "rf_power": -6 - }, - "tx_lut_1": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 0, - "rf_power": -3 - }, - "tx_lut_2": { - "dig_gain": 0, - "mix_gain": 9, - "pa_gain": 1, - "rf_power": 0 - }, - "tx_lut_3": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 1, - "rf_power": 3 - }, - "tx_lut_4": { - "dig_gain": 0, - "mix_gain": 12, - "pa_gain": 1, - "rf_power": 6 - }, - "tx_lut_5": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 2, - "rf_power": 10 - }, - "tx_lut_6": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 2, - "rf_power": 11 - }, - "tx_lut_7": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 2, - "rf_power": 12 - }, - "tx_lut_8": { - "dig_gain": 2, - "mix_gain": 12, - "pa_gain": 2, - "rf_power": 13 - }, - "tx_lut_9": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 2, - "rf_power": 14 - }, - "tx_lut_10": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 2, - "rf_power": 16 - }, - "tx_lut_11": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 3, - "rf_power": 20 - }, - "tx_lut_12": { - "dig_gain": 0, - "mix_gain": 12, - "pa_gain": 3, - "rf_power": 23 - }, - "tx_lut_13": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 3, - "rf_power": 25 - }, - "tx_lut_14": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 3, - "rf_power": 26 - }, - "tx_lut_15": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 3, - "rf_power": 27 - } - }, - "gateway_conf": { - "forward_crc_disabled": false, - "forward_crc_error": true, - "forward_crc_valid": true, - "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>", - "keepalive_interval": 10, - "push_timeout_ms": 100, - "serv_port_down": 20000, - "serv_port_up": 20000, - "server_address": "52.3.215.147", - "stat_interval": 30, - "autoquit_threshold": 60 - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0 deleted file mode 100644 index 3d7b70f..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0 +++ /dev/null @@ -1,193 +0,0 @@ -{ - "SX1301_conf": { - "lorawan_public": true, - "antenna_gain": 0, - "clksrc": 0, - "radio_0": { - "enable": true, - "freq": 902700000, - "rssi_offset": -162, - "tx_enable": true, - "tx_freq_max": 928000000, - "tx_freq_min": 902000000, - "type": "SX1257" - }, - "radio_1": { - "enable": true, - "freq": 903500000, - "rssi_offset": -162, - "tx_enable": false, - "type": "SX1257" - }, - "chan_FSK": { - "enable": false, - "radio": 0 - }, - "chan_Lora_std": { - "bandwidth": 500000, - "enable": true, - "if": 300000, - "radio": 0, - "spread_factor": 8 - }, - "chan_multiSF_0": { - "enable": true, - "if": -400000, - "radio": 0 - }, - "chan_multiSF_1": { - "enable": true, - "if": -200000, - "radio": 0 - }, - "chan_multiSF_2": { - "enable": true, - "if": 0, - "radio": 0 - }, - "chan_multiSF_3": { - "enable": true, - "if": 200000, - "radio": 0 - }, - "chan_multiSF_4": { - "enable": true, - "if": -400000, - "radio": 1 - }, - "chan_multiSF_5": { - "enable": true, - "if": -200000, - "radio": 1 - }, - "chan_multiSF_6": { - "enable": true, - "if": 0, - "radio": 1 - }, - "chan_multiSF_7": { - "enable": true, - "if": 200000, - "radio": 1 - }, - "lbt_cfg": { - "enable": false, - "nb_channel": 1, - "rssi_target": 160, - "scan_time_us": 5000, - "start_freq": 869525000, - "tx_delay_1ch_us": 4000000, - "tx_delay_2ch_us": 4000000 - }, - "tx_lut_0": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 0, - "rf_power": -6 - }, - "tx_lut_1": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 0, - "rf_power": -3 - }, - "tx_lut_2": { - "dig_gain": 0, - "mix_gain": 9, - "pa_gain": 1, - "rf_power": 0 - }, - "tx_lut_3": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 1, - "rf_power": 3 - }, - "tx_lut_4": { - "dig_gain": 0, - "mix_gain": 12, - "pa_gain": 1, - "rf_power": 6 - }, - "tx_lut_5": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 2, - "rf_power": 10 - }, - "tx_lut_6": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 2, - "rf_power": 11 - }, - "tx_lut_7": { - "dig_gain": 0, - "mix_gain": 11, - "pa_gain": 2, - "rf_power": 12 - }, - "tx_lut_8": { - "dig_gain": 2, - "mix_gain": 12, - "pa_gain": 2, - "rf_power": 13 - }, - "tx_lut_9": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 2, - "rf_power": 14 - }, - "tx_lut_10": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 2, - "rf_power": 16 - }, - "tx_lut_11": { - "dig_gain": 0, - "mix_gain": 10, - "pa_gain": 3, - "rf_power": 20 - }, - "tx_lut_12": { - "dig_gain": 0, - "mix_gain": 12, - "pa_gain": 3, - "rf_power": 23 - }, - "tx_lut_13": { - "dig_gain": 0, - "mix_gain": 13, - "pa_gain": 3, - "rf_power": 25 - }, - "tx_lut_14": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 3, - "rf_power": 26 - }, - "tx_lut_15": { - "dig_gain": 0, - "mix_gain": 15, - "pa_gain": 3, - "rf_power": 27 - } - }, - "gateway_conf": { - "forward_crc_disabled": false, - "forward_crc_error": true, - "forward_crc_valid": true, - "gateway_ID": "<WILL-BE-REPLACED-WITH-LORA-EUI>", - "keepalive_interval": 12, - "push_timeout_ms": 120, - "serv_port_down": 20000, - "serv_port_up": 20000, - "server_address": "52.3.215.147", - "stat_interval": 20, - "synch_word": 52, - "autoquit_threshold": 60 - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E286.EU868.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E286.EU868.basic.clksrc0 deleted file mode 100644 index fc14309..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E286.EU868.basic.clksrc0 +++ /dev/null @@ -1,216 +0,0 @@ -{ - "SX1301_conf": { - "lorawan_public": true, - "clksrc": 0, /* radio_1 provides clock to concentrator */ - "antenna_gain": 0, /* antenna gain, in dBi */ - "radio_0": { - "enable": true, - "type": "SX1257", - "freq": 867500000, - "rssi_offset": -166.0, - "tx_enable": true, - "tx_freq_min": 863000000, - "tx_freq_max": 870000000 - }, - "radio_1": { - "enable": true, - "type": "SX1257", - "freq": 868500000, - "rssi_offset": -166.0, - "tx_enable": false - }, - "chan_multiSF_0": { - /* Lora MAC channel, 125kHz, all SF, 868.1 MHz */ - "enable": true, - "radio": 1, - "if": -400000 - }, - "chan_multiSF_1": { - /* Lora MAC channel, 125kHz, all SF, 868.3 MHz */ - "enable": true, - "radio": 1, - "if": -200000 - }, - "chan_multiSF_2": { - /* Lora MAC channel, 125kHz, all SF, 868.5 MHz */ - "enable": true, - "radio": 1, - "if": 0 - }, - "chan_multiSF_3": { - /* Lora MAC channel, 125kHz, all SF, 867.1 MHz */ - "enable": true, - "radio": 0, - "if": -400000 - }, - "chan_multiSF_4": { - /* Lora MAC channel, 125kHz, all SF, 867.3 MHz */ - "enable": true, - "radio": 0, - "if": -200000 - }, - "chan_multiSF_5": { - /* Lora MAC channel, 125kHz, all SF, 867.5 MHz */ - "enable": true, - "radio": 0, - "if": 0 - }, - "chan_multiSF_6": { - /* Lora MAC channel, 125kHz, all SF, 867.7 MHz */ - "enable": true, - "radio": 0, - "if": 200000 - }, - "chan_multiSF_7": { - /* Lora MAC channel, 125kHz, all SF, 867.9 MHz */ - "enable": true, - "radio": 0, - "if": 400000 - }, - "chan_Lora_std": { - /* Lora MAC channel, 250kHz, SF7, 868.3 MHz */ - "enable": true, - "radio": 1, - "if": -200000, - "bandwidth": 250000, - "spread_factor": 7 - }, - "chan_FSK": { - /* FSK 50kbps channel, 868.8 MHz */ - "enable": true, - "radio": 1, - "if": 300000, - "bandwidth": 125000, - "datarate": 50000 - }, - "tx_lut_0": { - /* TX gain table, index 0 */ - "pa_gain": 0, - "mix_gain": 8, - "rf_power": -6, - "dig_gain": 0 - }, - "tx_lut_1": { - /* TX gain table, index 1 */ - "pa_gain": 0, - "mix_gain": 10, - "rf_power": -3, - "dig_gain": 0 - }, - "tx_lut_2": { - /* TX gain table, index 2 */ - "pa_gain": 0, - "mix_gain": 12, - "rf_power": 0, - "dig_gain": 0 - }, - "tx_lut_3": { - /* TX gain table, index 3 */ - "pa_gain": 1, - "mix_gain": 8, - "rf_power": 3, - "dig_gain": 0 - }, - "tx_lut_4": { - /* TX gain table, index 4 */ - "pa_gain": 1, - "mix_gain": 10, - "rf_power": 6, - "dig_gain": 0 - }, - "tx_lut_5": { - /* TX gain table, index 5 */ - "pa_gain": 1, - "mix_gain": 12, - "rf_power": 10, - "dig_gain": 0 - }, - "tx_lut_6": { - /* TX gain table, index 6 */ - "pa_gain": 1, - "mix_gain": 13, - "rf_power": 11, - "dig_gain": 0 - }, - "tx_lut_7": { - /* TX gain table, index 7 */ - "pa_gain": 2, - "mix_gain": 9, - "rf_power": 12, - "dig_gain": 0 - }, - "tx_lut_8": { - /* TX gain table, index 8 */ - "pa_gain": 1, - "mix_gain": 15, - "rf_power": 13, - "dig_gain": 0 - }, - "tx_lut_9": { - /* TX gain table, index 9 */ - "pa_gain": 2, - "mix_gain": 10, - "rf_power": 14, - "dig_gain": 0 - }, - "tx_lut_10": { - /* TX gain table, index 10 */ - "pa_gain": 2, - "mix_gain": 11, - "rf_power": 16, - "dig_gain": 0 - }, - "tx_lut_11": { - /* TX gain table, index 11 */ - "pa_gain": 3, - "mix_gain": 9, - "rf_power": 20, - "dig_gain": 0 - }, - "tx_lut_12": { - /* TX gain table, index 12 */ - "pa_gain": 3, - "mix_gain": 10, - "rf_power": 23, - "dig_gain": 0 - }, - "tx_lut_13": { - /* TX gain table, index 13 */ - "pa_gain": 3, - "mix_gain": 11, - "rf_power": 25, - "dig_gain": 0 - }, - "tx_lut_14": { - /* TX gain table, index 14 */ - "pa_gain": 3, - "mix_gain": 12, - "rf_power": 26, - "dig_gain": 0 - }, - "tx_lut_15": { - /* TX gain table, index 15 */ - "pa_gain": 3, - "mix_gain": 14, - "rf_power": 27, - "dig_gain": 0 - } - }, - - "gateway_conf": { - "gateway_ID": "AA555A0000000000", - /* change with default server address/ports, or overwrite in local_conf.json */ - "server_address": "localhost", - "serv_port_up": 1680, - "serv_port_down": 1680, - /* adjust the following parameters for your network */ - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - /* forward only valid packets */ - "forward_crc_valid": true, - "forward_crc_error": false, - "forward_crc_disabled": false - } -} - diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E286.EU868.basic.clksrc1 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E286.EU868.basic.clksrc1 deleted file mode 100644 index e60f583..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E286.EU868.basic.clksrc1 +++ /dev/null @@ -1,216 +0,0 @@ -{ - "SX1301_conf": { - "lorawan_public": true, - "clksrc": 1, /* radio_1 provides clock to concentrator */ - "antenna_gain": 0, /* antenna gain, in dBi */ - "radio_0": { - "enable": true, - "type": "SX1257", - "freq": 867500000, - "rssi_offset": -166.0, - "tx_enable": true, - "tx_freq_min": 863000000, - "tx_freq_max": 870000000 - }, - "radio_1": { - "enable": true, - "type": "SX1257", - "freq": 868500000, - "rssi_offset": -166.0, - "tx_enable": false - }, - "chan_multiSF_0": { - /* Lora MAC channel, 125kHz, all SF, 868.1 MHz */ - "enable": true, - "radio": 1, - "if": -400000 - }, - "chan_multiSF_1": { - /* Lora MAC channel, 125kHz, all SF, 868.3 MHz */ - "enable": true, - "radio": 1, - "if": -200000 - }, - "chan_multiSF_2": { - /* Lora MAC channel, 125kHz, all SF, 868.5 MHz */ - "enable": true, - "radio": 1, - "if": 0 - }, - "chan_multiSF_3": { - /* Lora MAC channel, 125kHz, all SF, 867.1 MHz */ - "enable": true, - "radio": 0, - "if": -400000 - }, - "chan_multiSF_4": { - /* Lora MAC channel, 125kHz, all SF, 867.3 MHz */ - "enable": true, - "radio": 0, - "if": -200000 - }, - "chan_multiSF_5": { - /* Lora MAC channel, 125kHz, all SF, 867.5 MHz */ - "enable": true, - "radio": 0, - "if": 0 - }, - "chan_multiSF_6": { - /* Lora MAC channel, 125kHz, all SF, 867.7 MHz */ - "enable": true, - "radio": 0, - "if": 200000 - }, - "chan_multiSF_7": { - /* Lora MAC channel, 125kHz, all SF, 867.9 MHz */ - "enable": true, - "radio": 0, - "if": 400000 - }, - "chan_Lora_std": { - /* Lora MAC channel, 250kHz, SF7, 868.3 MHz */ - "enable": true, - "radio": 1, - "if": -200000, - "bandwidth": 250000, - "spread_factor": 7 - }, - "chan_FSK": { - /* FSK 50kbps channel, 868.8 MHz */ - "enable": true, - "radio": 1, - "if": 300000, - "bandwidth": 125000, - "datarate": 50000 - }, - "tx_lut_0": { - /* TX gain table, index 0 */ - "pa_gain": 0, - "mix_gain": 8, - "rf_power": -6, - "dig_gain": 0 - }, - "tx_lut_1": { - /* TX gain table, index 1 */ - "pa_gain": 0, - "mix_gain": 10, - "rf_power": -3, - "dig_gain": 0 - }, - "tx_lut_2": { - /* TX gain table, index 2 */ - "pa_gain": 0, - "mix_gain": 12, - "rf_power": 0, - "dig_gain": 0 - }, - "tx_lut_3": { - /* TX gain table, index 3 */ - "pa_gain": 1, - "mix_gain": 8, - "rf_power": 3, - "dig_gain": 0 - }, - "tx_lut_4": { - /* TX gain table, index 4 */ - "pa_gain": 1, - "mix_gain": 10, - "rf_power": 6, - "dig_gain": 0 - }, - "tx_lut_5": { - /* TX gain table, index 5 */ - "pa_gain": 1, - "mix_gain": 12, - "rf_power": 10, - "dig_gain": 0 - }, - "tx_lut_6": { - /* TX gain table, index 6 */ - "pa_gain": 1, - "mix_gain": 13, - "rf_power": 11, - "dig_gain": 0 - }, - "tx_lut_7": { - /* TX gain table, index 7 */ - "pa_gain": 2, - "mix_gain": 9, - "rf_power": 12, - "dig_gain": 0 - }, - "tx_lut_8": { - /* TX gain table, index 8 */ - "pa_gain": 1, - "mix_gain": 15, - "rf_power": 13, - "dig_gain": 0 - }, - "tx_lut_9": { - /* TX gain table, index 9 */ - "pa_gain": 2, - "mix_gain": 10, - "rf_power": 14, - "dig_gain": 0 - }, - "tx_lut_10": { - /* TX gain table, index 10 */ - "pa_gain": 2, - "mix_gain": 11, - "rf_power": 16, - "dig_gain": 0 - }, - "tx_lut_11": { - /* TX gain table, index 11 */ - "pa_gain": 3, - "mix_gain": 9, - "rf_power": 20, - "dig_gain": 0 - }, - "tx_lut_12": { - /* TX gain table, index 12 */ - "pa_gain": 3, - "mix_gain": 10, - "rf_power": 23, - "dig_gain": 0 - }, - "tx_lut_13": { - /* TX gain table, index 13 */ - "pa_gain": 3, - "mix_gain": 11, - "rf_power": 25, - "dig_gain": 0 - }, - "tx_lut_14": { - /* TX gain table, index 14 */ - "pa_gain": 3, - "mix_gain": 12, - "rf_power": 26, - "dig_gain": 0 - }, - "tx_lut_15": { - /* TX gain table, index 15 */ - "pa_gain": 3, - "mix_gain": 14, - "rf_power": 27, - "dig_gain": 0 - } - }, - - "gateway_conf": { - "gateway_ID": "AA555A0000000000", - /* change with default server address/ports, or overwrite in local_conf.json */ - "server_address": "localhost", - "serv_port_up": 1680, - "serv_port_down": 1680, - /* adjust the following parameters for your network */ - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - /* forward only valid packets */ - "forward_crc_valid": true, - "forward_crc_error": false, - "forward_crc_disabled": false - } -} - diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E336.EU868.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E336.EU868.basic.clksrc0 deleted file mode 100644 index fe81952..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E336.EU868.basic.clksrc0 +++ /dev/null @@ -1,225 +0,0 @@ -{ - "SX1301_conf": { - "lorawan_public": true, - "clksrc": 0, /* radio_1 provides clock to concentrator */ - "lbt_cfg": { - "enable": false, - "rssi_target": 160, /* rssi in dBm = -lbt_rssi_target/2 */ - "nb_channel": 1, - "start_freq": 869525000, - "scan_time_us": 5000, - "tx_delay_1ch_us": 4000000, - "tx_delay_2ch_us": 4000000 - }, - "antenna_gain": 0, /* antenna gain, in dBi */ - "radio_0": { - "enable": true, - "type": "SX1257", - "freq": 867500000, - "rssi_offset": -165.0, - "tx_enable": true, - "tx_freq_min": 863000000, - "tx_freq_max": 870000000 - }, - "radio_1": { - "enable": true, - "type": "SX1257", - "freq": 868500000, - "rssi_offset": -165.0, - "tx_enable": false - }, - "chan_multiSF_0": { - /* Lora MAC channel, 125kHz, all SF, 868.1 MHz */ - "enable": true, - "radio": 1, - "if": -400000 - }, - "chan_multiSF_1": { - /* Lora MAC channel, 125kHz, all SF, 868.3 MHz */ - "enable": true, - "radio": 1, - "if": -200000 - }, - "chan_multiSF_2": { - /* Lora MAC channel, 125kHz, all SF, 868.5 MHz */ - "enable": true, - "radio": 1, - "if": 0 - }, - "chan_multiSF_3": { - /* Lora MAC channel, 125kHz, all SF, 867.1 MHz */ - "enable": true, - "radio": 0, - "if": -400000 - }, - "chan_multiSF_4": { - /* Lora MAC channel, 125kHz, all SF, 867.3 MHz */ - "enable": true, - "radio": 0, - "if": -200000 - }, - "chan_multiSF_5": { - /* Lora MAC channel, 125kHz, all SF, 867.5 MHz */ - "enable": true, - "radio": 0, - "if": 0 - }, - "chan_multiSF_6": { - /* Lora MAC channel, 125kHz, all SF, 867.7 MHz */ - "enable": true, - "radio": 0, - "if": 200000 - }, - "chan_multiSF_7": { - /* Lora MAC channel, 125kHz, all SF, 867.9 MHz */ - "enable": true, - "radio": 0, - "if": 400000 - }, - "chan_Lora_std": { - /* Lora MAC channel, 250kHz, SF7, 868.3 MHz */ - "enable": true, - "radio": 1, - "if": -200000, - "bandwidth": 250000, - "spread_factor": 7 - }, - "chan_FSK": { - /* FSK 50kbps channel, 868.8 MHz */ - "enable": true, - "radio": 1, - "if": 300000, - "bandwidth": 125000, - "datarate": 50000 - }, - "tx_lut_0": { - /* TX gain table, index 0 */ - "pa_gain": 0, - "mix_gain": 8, - "rf_power": -6, - "dig_gain": 3 - }, - "tx_lut_1": { - /* TX gain table, index 1 */ - "pa_gain": 0, - "mix_gain": 10, - "rf_power": -3, - "dig_gain": 3 - }, - "tx_lut_2": { - /* TX gain table, index 2 */ - "pa_gain": 0, - "mix_gain": 10, - "rf_power": 0, - "dig_gain": 1 - }, - "tx_lut_3": { - /* TX gain table, index 3 */ - "pa_gain": 0, - "mix_gain": 14, - "rf_power": 3, - "dig_gain": 2 - }, - "tx_lut_4": { - /* TX gain table, index 4 */ - "pa_gain": 1, - "mix_gain": 10, - "rf_power": 6, - "dig_gain": 3 - }, - "tx_lut_5": { - /* TX gain table, index 5 */ - "pa_gain": 1, - "mix_gain": 12, - "rf_power": 10, - "dig_gain": 2 - }, - "tx_lut_6": { - /* TX gain table, index 6 */ - "pa_gain": 1, - "mix_gain": 12, - "rf_power": 11, - "dig_gain": 1 - }, - "tx_lut_7": { - /* TX gain table, index 7 */ - "pa_gain": 1, - "mix_gain": 12, - "rf_power": 12, - "dig_gain": 0 - }, - "tx_lut_8": { - /* TX gain table, index 8 */ - "pa_gain": 1, - "mix_gain": 14, - "rf_power": 13, - "dig_gain": 2 - }, - "tx_lut_9": { - /* TX gain table, index 9 */ - "pa_gain": 1, - "mix_gain": 13, - "rf_power": 14, - "dig_gain": 0 - }, - "tx_lut_10": { - /* TX gain table, index 10 */ - "pa_gain": 2, - "mix_gain": 9, - "rf_power": 16, - "dig_gain": 2 - }, - "tx_lut_11": { - /* TX gain table, index 11 */ - "pa_gain": 2, - "mix_gain": 11, - "rf_power": 20, - "dig_gain": 1 - }, - "tx_lut_12": { - /* TX gain table, index 12 */ - "pa_gain": 2, - "mix_gain": 13, - "rf_power": 23, - "dig_gain": 1 - }, - "tx_lut_13": { - /* TX gain table, index 13 */ - "pa_gain": 2, - "mix_gain": 15, - "rf_power": 25, - "dig_gain": 2 - }, - "tx_lut_14": { - /* TX gain table, index 14 */ - "pa_gain": 3, - "mix_gain": 10, - "rf_power": 26, - "dig_gain": 2 - }, - "tx_lut_15": { - /* TX gain table, index 15 */ - "pa_gain": 3, - "mix_gain": 10, - "rf_power": 27, - "dig_gain": 1 - } - }, - - "gateway_conf": { - "gateway_ID": "AA555A0000000000", - /* change with default server address/ports, or overwrite in local_conf.json */ - "server_address": "localhost", - "serv_port_up": 1680, - "serv_port_down": 1680, - /* adjust the following parameters for your network */ - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - /* forward only valid packets */ - "forward_crc_valid": true, - "forward_crc_error": false, - "forward_crc_disabled": false - } -} - diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E336.EU868.basic.clksrc1 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E336.EU868.basic.clksrc1 deleted file mode 100644 index a975861..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E336.EU868.basic.clksrc1 +++ /dev/null @@ -1,225 +0,0 @@ -{ - "SX1301_conf": { - "lorawan_public": true, - "clksrc": 1, /* radio_1 provides clock to concentrator */ - "lbt_cfg": { - "enable": false, - "rssi_target": 160, /* rssi in dBm = -lbt_rssi_target/2 */ - "nb_channel": 1, - "start_freq": 869525000, - "scan_time_us": 5000, - "tx_delay_1ch_us": 4000000, - "tx_delay_2ch_us": 4000000 - }, - "antenna_gain": 0, /* antenna gain, in dBi */ - "radio_0": { - "enable": true, - "type": "SX1257", - "freq": 867500000, - "rssi_offset": -165.0, - "tx_enable": true, - "tx_freq_min": 863000000, - "tx_freq_max": 870000000 - }, - "radio_1": { - "enable": true, - "type": "SX1257", - "freq": 868500000, - "rssi_offset": -165.0, - "tx_enable": false - }, - "chan_multiSF_0": { - /* Lora MAC channel, 125kHz, all SF, 868.1 MHz */ - "enable": true, - "radio": 1, - "if": -400000 - }, - "chan_multiSF_1": { - /* Lora MAC channel, 125kHz, all SF, 868.3 MHz */ - "enable": true, - "radio": 1, - "if": -200000 - }, - "chan_multiSF_2": { - /* Lora MAC channel, 125kHz, all SF, 868.5 MHz */ - "enable": true, - "radio": 1, - "if": 0 - }, - "chan_multiSF_3": { - /* Lora MAC channel, 125kHz, all SF, 867.1 MHz */ - "enable": true, - "radio": 0, - "if": -400000 - }, - "chan_multiSF_4": { - /* Lora MAC channel, 125kHz, all SF, 867.3 MHz */ - "enable": true, - "radio": 0, - "if": -200000 - }, - "chan_multiSF_5": { - /* Lora MAC channel, 125kHz, all SF, 867.5 MHz */ - "enable": true, - "radio": 0, - "if": 0 - }, - "chan_multiSF_6": { - /* Lora MAC channel, 125kHz, all SF, 867.7 MHz */ - "enable": true, - "radio": 0, - "if": 200000 - }, - "chan_multiSF_7": { - /* Lora MAC channel, 125kHz, all SF, 867.9 MHz */ - "enable": true, - "radio": 0, - "if": 400000 - }, - "chan_Lora_std": { - /* Lora MAC channel, 250kHz, SF7, 868.3 MHz */ - "enable": true, - "radio": 1, - "if": -200000, - "bandwidth": 250000, - "spread_factor": 7 - }, - "chan_FSK": { - /* FSK 50kbps channel, 868.8 MHz */ - "enable": true, - "radio": 1, - "if": 300000, - "bandwidth": 125000, - "datarate": 50000 - }, - "tx_lut_0": { - /* TX gain table, index 0 */ - "pa_gain": 0, - "mix_gain": 8, - "rf_power": -6, - "dig_gain": 3 - }, - "tx_lut_1": { - /* TX gain table, index 1 */ - "pa_gain": 0, - "mix_gain": 10, - "rf_power": -3, - "dig_gain": 3 - }, - "tx_lut_2": { - /* TX gain table, index 2 */ - "pa_gain": 0, - "mix_gain": 10, - "rf_power": 0, - "dig_gain": 1 - }, - "tx_lut_3": { - /* TX gain table, index 3 */ - "pa_gain": 0, - "mix_gain": 14, - "rf_power": 3, - "dig_gain": 2 - }, - "tx_lut_4": { - /* TX gain table, index 4 */ - "pa_gain": 1, - "mix_gain": 10, - "rf_power": 6, - "dig_gain": 3 - }, - "tx_lut_5": { - /* TX gain table, index 5 */ - "pa_gain": 1, - "mix_gain": 12, - "rf_power": 10, - "dig_gain": 2 - }, - "tx_lut_6": { - /* TX gain table, index 6 */ - "pa_gain": 1, - "mix_gain": 12, - "rf_power": 11, - "dig_gain": 1 - }, - "tx_lut_7": { - /* TX gain table, index 7 */ - "pa_gain": 1, - "mix_gain": 12, - "rf_power": 12, - "dig_gain": 0 - }, - "tx_lut_8": { - /* TX gain table, index 8 */ - "pa_gain": 1, - "mix_gain": 14, - "rf_power": 13, - "dig_gain": 2 - }, - "tx_lut_9": { - /* TX gain table, index 9 */ - "pa_gain": 1, - "mix_gain": 13, - "rf_power": 14, - "dig_gain": 0 - }, - "tx_lut_10": { - /* TX gain table, index 10 */ - "pa_gain": 2, - "mix_gain": 9, - "rf_power": 16, - "dig_gain": 2 - }, - "tx_lut_11": { - /* TX gain table, index 11 */ - "pa_gain": 2, - "mix_gain": 11, - "rf_power": 20, - "dig_gain": 1 - }, - "tx_lut_12": { - /* TX gain table, index 12 */ - "pa_gain": 2, - "mix_gain": 13, - "rf_power": 23, - "dig_gain": 1 - }, - "tx_lut_13": { - /* TX gain table, index 13 */ - "pa_gain": 2, - "mix_gain": 15, - "rf_power": 25, - "dig_gain": 2 - }, - "tx_lut_14": { - /* TX gain table, index 14 */ - "pa_gain": 3, - "mix_gain": 10, - "rf_power": 26, - "dig_gain": 2 - }, - "tx_lut_15": { - /* TX gain table, index 15 */ - "pa_gain": 3, - "mix_gain": 10, - "rf_power": 27, - "dig_gain": 1 - } - }, - - "gateway_conf": { - "gateway_ID": "AA555A0000000000", - /* change with default server address/ports, or overwrite in local_conf.json */ - "server_address": "localhost", - "serv_port_up": 1680, - "serv_port_down": 1680, - /* adjust the following parameters for your network */ - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - /* forward only valid packets */ - "forward_crc_valid": true, - "forward_crc_error": false, - "forward_crc_disabled": false - } -} - diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.US902.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.US902.basic deleted file mode 100644 index 3914956..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.US902.basic +++ /dev/null @@ -1,104 +0,0 @@ -{ - "SX1301_conf": { - "lorawan_public": true, - "clksrc": 1, /* radio_1 provides clock to concentrator */ - "antenna_gain": 0, /* antenna gain, in dBi */ - "radio_0": { - "enable": true, - "type": "SX1257", - "freq": 902700000, - "rssi_offset": -166.0, - "tx_enable": true, - "tx_freq_min": 902000000, - "tx_freq_max": 928000000 - }, - "radio_1": { - "enable": true, - "type": "SX1257", - "freq": 903400000, - "rssi_offset": -166.0, - "tx_enable": false - }, - "chan_multiSF_0": { - /* Lora MAC channel, 125kHz, all SF, 902.3 MHz */ - "enable": true, - "radio": 0, - "if": -400000 - }, - "chan_multiSF_1": { - /* Lora MAC channel, 125kHz, all SF, 902.5 MHz */ - "enable": true, - "radio": 0, - "if": -200000 - }, - "chan_multiSF_2": { - /* Lora MAC channel, 125kHz, all SF, 902.7 MHz */ - "enable": true, - "radio": 0, - "if": 0 - }, - "chan_multiSF_3": { - /* Lora MAC channel, 125kHz, all SF, 902.9 MHz */ - "enable": true, - "radio": 0, - "if": 200000 - }, - "chan_multiSF_4": { - /* Lora MAC channel, 125kHz, all SF, 903.1 MHz */ - "enable": true, - "radio": 1, - "if": -300000 - }, - "chan_multiSF_5": { - /* Lora MAC channel, 125kHz, all SF, 903.3 MHz */ - "enable": true, - "radio": 1, - "if": -100000 - }, - "chan_multiSF_6": { - /* Lora MAC channel, 125kHz, all SF, 903.5 MHz */ - "enable": true, - "radio": 1, - "if": 100000 - }, - "chan_multiSF_7": { - /* Lora MAC channel, 125kHz, all SF, 903.7 MHz */ - "enable": true, - "radio": 1, - "if": 300000 - }, - "chan_Lora_std": { - /* Lora MAC channel, 500kHz, SF8, 903.0 MHz */ - "enable": true, - "radio": 0, - "if": 300000, - "bandwidth": 500000, - "spread_factor": 8 - }, - "chan_FSK": { - /* FSK 100kbps channel, 903.0 MHz */ - "enable": false, - "radio": 0, - "if": 300000, - "bandwidth": 250000, - "datarate": 100000 - } - }, - - "gateway_conf": { - "gateway_ID": "AA555A0000000000", - /* change with default server address/ports, or overwrite in local_conf.json */ - "server_address": "localhost", - "serv_port_up": 1680, - "serv_port_down": 1680, - /* adjust the following parameters for your network */ - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - /* forward only valid packets */ - "forward_crc_valid": true, - "forward_crc_error": false, - "forward_crc_disabled": false - } -} - 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 deleted file mode 100644 index 6c14d3c..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923-LBT.basic +++ /dev/null @@ -1,147 +0,0 @@ -{ - "SX1301_conf": { - "antenna_gain": 0, - "chan_FSK": { - "bandwidth": 125000, - "datarate": 50000, - "enable": true, - "freq_deviation": 25000, - "if": 300000, - "radio": 0 - }, - "chan_Lora_std": { - "bandwidth": 250000, - "enable": true, - "if": -200000, - "radio": 0, - "spread_factor": 7 - }, - "chan_multiSF_0": { - "enable": true, - "if": -400000, - "radio": 0 - }, - "chan_multiSF_1": { - "enable": true, - "if": -200000, - "radio": 0 - }, - "chan_multiSF_2": { - "enable": true, - "if": 0, - "radio": 0 - }, - "chan_multiSF_3": { - "enable": true, - "if": -400000, - "radio": 1 - }, - "chan_multiSF_4": { - "enable": true, - "if": -200000, - "radio": 1 - }, - "chan_multiSF_5": { - "enable": true, - "if": 0, - "radio": 1 - }, - "chan_multiSF_6": { - "enable": true, - "if": 200000, - "radio": 1 - }, - "chan_multiSF_7": { - "enable": true, - "if": 400000, - "radio": 1 - }, - "clksrc": 0, - "lbt_cfg": { - "chan_cfg": [ - { - "freq_hz": 923200000, - "scan_time_us": 5000 - }, - { - "freq_hz": 923400000, - "scan_time_us": 5000 - }, - { - "freq_hz": 923600000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922200000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922400000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922600000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922800000, - "scan_time_us": 5000 - }, - { - "freq_hz": 923000000, - "scan_time_us": 5000 - } - ], - "enable": true, - "rssi_target": -80, - "sx127x_rssi_offset": -4 - }, - "lorawan_public": true, - "radio_0": { - "enable": true, - "freq": 923600000, - "rssi_offset": -162, - "tx_enable": true, - "tx_freq_max": 928000000, - "tx_freq_min": 920000000, - "type": "SX1257" - }, - "radio_1": { - "enable": true, - "freq": 922600000, - "rssi_offset": -162, - "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} - }, - "gateway_conf": { - "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>", - "server_address": "52.3.215.147", - "serv_port_up": 20000, - "serv_port_down": 20000, - "forward_crc_disabled": false, - "forward_crc_error": true, - "forward_crc_valid": true, - "keepalive_interval": 10, - "push_timeout_ms": 120, - "stat_interval": 20, - "synch_word": 52, - "autoquit_threshold": 60 - } -} 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 deleted file mode 100644 index 3731a2d..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923.basic +++ /dev/null @@ -1,115 +0,0 @@ -{ - "SX1301_conf": { - "antenna_gain": 0, - "chan_FSK": { - "bandwidth": 125000, - "datarate": 50000, - "enable": true, - "freq_deviation": 25000, - "if": 300000, - "radio": 0 - }, - "chan_Lora_std": { - "bandwidth": 250000, - "enable": true, - "if": -200000, - "radio": 0, - "spread_factor": 7 - }, - "chan_multiSF_0": { - "enable": true, - "if": -400000, - "radio": 0 - }, - "chan_multiSF_1": { - "enable": true, - "if": -200000, - "radio": 0 - }, - "chan_multiSF_2": { - "enable": true, - "if": 0, - "radio": 0 - }, - "chan_multiSF_3": { - "enable": true, - "if": -400000, - "radio": 1 - }, - "chan_multiSF_4": { - "enable": true, - "if": -200000, - "radio": 1 - }, - "chan_multiSF_5": { - "enable": true, - "if": 0, - "radio": 1 - }, - "chan_multiSF_6": { - "enable": true, - "if": 200000, - "radio": 1 - }, - "chan_multiSF_7": { - "enable": true, - "if": 400000, - "radio": 1 - }, - "clksrc": 0, - "lbt_cfg": { - "chan_cfg": [ - ], - "enable": false, - "rssi_target": -80, - "sx127x_rssi_offset": -4 - }, - "lorawan_public": true, - "radio_0": { - "enable": true, - "freq": 923600000, - "rssi_offset": -162, - "tx_enable": true, - "tx_freq_max": 928000000, - "tx_freq_min": 920000000, - "type": "SX1257" - }, - "radio_1": { - "enable": true, - "freq": 922600000, - "rssi_offset": -162, - "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} - }, - "gateway_conf": { - "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>", - "server_address": "52.3.215.147", - "serv_port_up": 20000, - "serv_port_down": 20000, - "forward_crc_disabled": false, - "forward_crc_error": true, - "forward_crc_valid": true, - "keepalive_interval": 10, - "push_timeout_ms": 120, - "stat_interval": 20, - "synch_word": 52, - "autoquit_threshold": 60 - } -} 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 deleted file mode 100644 index c2a284e..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AU915.basic +++ /dev/null @@ -1,113 +0,0 @@ -{ - "SX1301_conf": { - "lorawan_public": true, - "antenna_gain": 0, - "clksrc": 0, - "radio_0": { - "enable": true, - "freq": 915600000, - "rssi_offset": -162, - "tx_enable": true, - "tx_freq_max": 928000000, - "tx_freq_min": 902000000, - "type": "SX1257" - }, - "radio_1": { - "enable": true, - "freq": 916400000, - "rssi_offset": -162, - "tx_enable": false, - "type": "SX1257" - }, - "chan_FSK": { - "enable": false, - "radio": 0 - }, - "chan_Lora_std": { - "bandwidth": 500000, - "enable": true, - "if": 300000, - "radio": 0, - "spread_factor": 8 - }, - "chan_multiSF_0": { - "enable": true, - "if": -400000, - "radio": 0 - }, - "chan_multiSF_1": { - "enable": true, - "if": -200000, - "radio": 0 - }, - "chan_multiSF_2": { - "enable": true, - "if": 0, - "radio": 0 - }, - "chan_multiSF_3": { - "enable": true, - "if": 200000, - "radio": 0 - }, - "chan_multiSF_4": { - "enable": true, - "if": -400000, - "radio": 1 - }, - "chan_multiSF_5": { - "enable": true, - "if": -200000, - "radio": 1 - }, - "chan_multiSF_6": { - "enable": true, - "if": 0, - "radio": 1 - }, - "chan_multiSF_7": { - "enable": true, - "if": 200000, - "radio": 1 - }, - "lbt_cfg": { - "enable": false, - "nb_channel": 1, - "rssi_target": 160, - "scan_time_us": 5000, - "start_freq": 869525000, - "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} - }, - "gateway_conf": { - "forward_crc_disabled": false, - "forward_crc_error": true, - "forward_crc_valid": true, - "gateway_ID": "<WILL-BE-REPLACED-WITH-LORA-EUI>", - "keepalive_interval": 12, - "push_timeout_ms": 120, - "serv_port_down": 20000, - "serv_port_up": 20000, - "server_address": "52.3.215.147", - "stat_interval": 20, - "synch_word": 52, - "autoquit_threshold": 60 - } -} 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 deleted file mode 100644 index 710a228..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.EU868.basic +++ /dev/null @@ -1,117 +0,0 @@ -{ - "SX1301_conf": { - "lorawan_public": true, - "clksrc": 0, - "lbt_cfg": { - "enable": false, - "rssi_target": 160, - "nb_channel": 1, - "start_freq": 869525000, - "scan_time_us": 5000, - "tx_delay_1ch_us": 4000000, - "tx_delay_2ch_us": 4000000 - }, - "antenna_gain": 0, - "radio_0": { - "enable": true, - "type": "SX1257", - "freq": 867500000, - "rssi_offset": -162, - "tx_enable": true, - "tx_freq_min": 863000000, - "tx_freq_max": 870000000 - }, - "radio_1": { - "enable": true, - "type": "SX1257", - "freq": 868500000, - "rssi_offset": -162, - "tx_enable": false - }, - "chan_multiSF_0": { - "enable": true, - "radio": 1, - "if": -400000 - }, - "chan_multiSF_1": { - "enable": true, - "radio": 1, - "if": -200000 - }, - "chan_multiSF_2": { - "enable": true, - "radio": 1, - "if": 0 - }, - "chan_multiSF_3": { - "enable": true, - "radio": 0, - "if": -400000 - }, - "chan_multiSF_4": { - "enable": true, - "radio": 0, - "if": -200000 - }, - "chan_multiSF_5": { - "enable": true, - "radio": 0, - "if": 0 - }, - "chan_multiSF_6": { - "enable": true, - "radio": 0, - "if": 200000 - }, - "chan_multiSF_7": { - "enable": true, - "radio": 0, - "if": 400000 - }, - "chan_Lora_std": { - "enable": true, - "radio": 1, - "if": -200000, - "bandwidth": 250000, - "spread_factor": 7 - }, - "chan_FSK": { - "enable": true, - "radio": 1, - "if": 300000, - "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} - }, - "gateway_conf": { - "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>", - "server_address": "52.3.215.147", - "serv_port_up": 20000, - "serv_port_down": 20000, - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - "forward_crc_valid": true, - "forward_crc_error": true, - "forward_crc_disabled": false, - "synch_word": 52, - "autoquit_threshold": 60 - } -} - 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 deleted file mode 100644 index c45db75..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.IN865.basic +++ /dev/null @@ -1,117 +0,0 @@ -{ - "SX1301_conf": { - "antenna_gain": 0, - "chan_FSK": { - "bandwidth": 125000, - "datarate": 50000, - "enable": true, - "freq_deviation": 25000, - "if": 300000, - "radio": 1 - }, - "chan_Lora_std": { - "bandwidth": 250000, - "enable": true, - "if": 0, - "radio": 0, - "spread_factor": 7 - }, - "chan_multiSF_": { - "radio": null - }, - "chan_multiSF_0": { - "enable": true, - "if": -137500, - "radio": 0 - }, - "chan_multiSF_1": { - "enable": true, - "if": 202500, - "radio": 0 - }, - "chan_multiSF_2": { - "enable": true, - "if": 32500, - "radio": 0 - }, - "chan_multiSF_3": { - "enable": true, - "if": -400000, - "radio": 1 - }, - "chan_multiSF_4": { - "enable": true, - "if": -200000, - "radio": 1 - }, - "chan_multiSF_5": { - "enable": true, - "if": 0, - "radio": 1 - }, - "chan_multiSF_6": { - "enable": true, - "if": 200000, - "radio": 1 - }, - "chan_multiSF_7": { - "enable": true, - "if": 400000, - "radio": 1 - }, - "clksrc": 0, - "lbt_cfg": { - "enable": false, - "rssi_target": 160 - }, - "lorawan_public": true, - "radio_0": { - "enable": true, - "freq": 865200000, - "rssi_offset": -162, - "tx_enable": true, - "tx_freq_max": 867000000, - "tx_freq_min": 865000000, - "tx_notch_freq": 129000, - "type": "SX1257" - }, - "radio_1": { - "enable": true, - "freq": 866385000, - "rssi_offset": -162, - "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} - }, - "gateway_conf": { - "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>", - "server_address": "52.3.215.147", - "serv_port_up": 20000, - "serv_port_down": 20000, - "forward_crc_disabled": false, - "forward_crc_error": true, - "forward_crc_valid": true, - "keepalive_interval": 10, - "push_timeout_ms": 120, - "stat_interval": 20, - "synch_word": 52, - "autoquit_threshold": 60 - - } -} 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 deleted file mode 100644 index 9daa32e..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.KR920-LBT.basic +++ /dev/null @@ -1,147 +0,0 @@ -{ - "SX1301_conf": { - "antenna_gain": 0, - "chan_FSK": { - "bandwidth": 125000, - "datarate": 50000, - "enable": false, - "if": 300000, - "radio": 0 - }, - "chan_Lora_std": { - "bandwidth": 250000, - "enable": false, - "if": -200000, - "radio": 0, - "spread_factor": 7 - }, - "chan_multiSF_0": { - "enable": true, - "if": -400000, - "radio": 0 - }, - "chan_multiSF_1": { - "enable": true, - "if": -200000, - "radio": 0 - }, - "chan_multiSF_2": { - "enable": true, - "if": 0, - "radio": 0 - }, - "chan_multiSF_3": { - "enable": true, - "if": -400000, - "radio": 1 - }, - "chan_multiSF_4": { - "enable": true, - "if": -200000, - "radio": 1 - }, - "chan_multiSF_5": { - "enable": true, - "if": 0, - "radio": 1 - }, - "chan_multiSF_6": { - "enable": true, - "if": 200000, - "radio": 1 - }, - "chan_multiSF_7": { - "enable": true, - "if": 400000, - "radio": 1 - }, - "clksrc": 0, - "lbt_cfg": { - "chan_cfg": [ - { - "freq_hz": 922100000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922300000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922500000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922700000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922900000, - "scan_time_us": 5000 - }, - { - "freq_hz": 923100000, - "scan_time_us": 5000 - }, - { - "freq_hz": 923300000, - "scan_time_us": 5000 - }, - { - "freq_hz": 921900000, - "scan_time_us": 5000 - } - ], - "enable": true, - "rssi_target": -65, - "sx127x_rssi_offset": -4 - }, - "lorawan_public": true, - "radio_0": { - "enable": true, - "freq": 922500000, - "rssi_offset": -162, - "tx_enable": true, - "tx_freq_max": 923300000, - "tx_freq_min": 920900000, - "type": "SX1257" - }, - "radio_1": { - "enable": true, - "freq": 922900000, - "rssi_offset": -162, - "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} - }, - "gateway_conf": { - "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>", - "server_address": "52.3.215.147", - "serv_port_up": 20000, - "serv_port_down": 20000, - "forward_crc_disabled": false, - "forward_crc_error": true, - "forward_crc_valid": true, - "keepalive_interval": 10, - "push_timeout_ms": 120, - "stat_interval": 20, - "synch_word": 52, - "autoquit_threshold": 60 - - } -} 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 deleted file mode 100644 index d185858..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.RU864.basic +++ /dev/null @@ -1,117 +0,0 @@ -{ - "SX1301_conf": { - "lorawan_public": true, - "clksrc": 0, - "lbt_cfg": { - "enable": false, - "rssi_target": 160, - "nb_channel": 1, - "start_freq": 869525000, - "scan_time_us": 5000, - "tx_delay_1ch_us": 4000000, - "tx_delay_2ch_us": 4000000 - }, - "antenna_gain": 0, - "radio_0": { - "enable": true, - "type": "SX1257", - "freq": 869100000, - "rssi_offset": -162, - "tx_enable": true, - "tx_freq_min": 864000000, - "tx_freq_max": 870000000 - }, - "radio_1": { - "enable": true, - "type": "SX1257", - "freq": 868100000, - "rssi_offset": -162, - "tx_enable": false - }, - "chan_multiSF_0": { - "enable": true, - "radio": 0, - "if": -400000 - }, - "chan_multiSF_1": { - "enable": true, - "radio": 0, - "if": -200000 - }, - "chan_multiSF_2": { - "enable": true, - "radio": 0, - "if": 0 - }, - "chan_multiSF_3": { - "enable": true, - "radio": 1, - "if": -400000 - }, - "chan_multiSF_4": { - "enable": true, - "radio": 1, - "if": -200000 - }, - "chan_multiSF_5": { - "enable": true, - "radio": 1, - "if": 0 - }, - "chan_multiSF_6": { - "enable": true, - "radio": 1, - "if": 200000 - }, - "chan_multiSF_7": { - "enable": true, - "radio": 1, - "if": 400000 - }, - "chan_Lora_std": { - "enable": true, - "radio": 0, - "if": -200000, - "bandwidth": 250000, - "spread_factor": 7 - }, - "chan_FSK": { - "enable": true, - "radio": 1, - "if": 0, - "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} - }, - "gateway_conf": { - "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>", - "server_address": "52.3.215.147", - "serv_port_up": 20000, - "serv_port_down": 20000, - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - "forward_crc_valid": true, - "forward_crc_error": true, - "forward_crc_disabled": false, - "synch_word": 52, - "autoquit_threshold": 60 - } -} - 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 deleted file mode 100644 index dd39ac7..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic +++ /dev/null @@ -1,130 +0,0 @@ -{ - "SX1301_conf" : - { - "antenna_gain" : 0, - "chan_FSK" : - { - "bandwidth" : 125000, - "datarate" : 50000, - "enable" : false, - "if" : 300000, - "radio" : 0 - }, - "chan_Lora_std" : - { - "bandwidth" : 500000, - "enable" : true, - "if" : 300000, - "radio" : 0, - "spread_factor" : 8 - }, - "chan_multiSF_0" : - { - "enable" : true, - "if" : -400000, - "radio" : 0 - }, - "chan_multiSF_1" : - { - "enable" : true, - "if" : -200000, - "radio" : 0 - }, - "chan_multiSF_2" : - { - "enable" : true, - "if" : 0, - "radio" : 0 - }, - "chan_multiSF_3" : - { - "enable" : true, - "if" : 200000, - "radio" : 0 - }, - "chan_multiSF_4" : - { - "enable" : true, - "if" : -400000, - "radio" : 1 - }, - "chan_multiSF_5" : - { - "enable" : true, - "if" : -200000, - "radio" : 1 - }, - "chan_multiSF_6" : - { - "enable" : true, - "if" : 0, - "radio" : 1 - }, - "chan_multiSF_7" : - { - "enable" : true, - "if" : 200000, - "radio" : 1 - }, - "clksrc" : 0, - "lbt_cfg" : - { - "enable" : false, - "nb_channel" : 1, - "rssi_target" : 160, - "scan_time_us" : 5000, - "start_freq" : 869525000, - "tx_delay_1ch_us" : 4000000, - "tx_delay_2ch_us" : 4000000 - }, - "lorawan_public" : true, - "radio_0" : - { - "enable" : true, - "freq" : 902700000, - "rssi_offset" : -162, - "tx_enable" : true, - "tx_freq_max" : 928000000, - "tx_freq_min" : 902000000, - "type" : "SX1257" - }, - "radio_1" : - { - "enable" : true, - "freq" : 903500000, - "rssi_offset" : -162, - "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} - }, - "gateway_conf": { - "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>", - "server_address": "52.3.215.147", - "serv_port_up": 20000, - "serv_port_down": 20000, - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - "forward_crc_valid": true, - "forward_crc_error": true, - "forward_crc_disabled": false, - "autoquit_threshold": 60 - - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.AS923 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.AS923 deleted file mode 100644 index fd3800b..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.AS923 +++ /dev/null @@ -1,117 +0,0 @@ -{ - "SX1301_conf": { - "antenna_gain": 0, - "chan_FSK": { - "bandwidth": 125000, - "datarate": 50000, - "enable": true, - "freq_deviation": 25000, - "if": 300000, - "radio": 0 - }, - "chan_Lora_std": { - "bandwidth": 250000, - "enable": true, - "if": -200000, - "radio": 0, - "spread_factor": 7 - }, - "chan_multiSF_0": { - "enable": true, - "if": -400000, - "radio": 0 - }, - "chan_multiSF_1": { - "enable": true, - "if": -200000, - "radio": 0 - }, - "chan_multiSF_2": { - "enable": true, - "if": 0, - "radio": 0 - }, - "chan_multiSF_3": { - "enable": true, - "if": -400000, - "radio": 1 - }, - "chan_multiSF_4": { - "enable": true, - "if": -200000, - "radio": 1 - }, - "chan_multiSF_5": { - "enable": true, - "if": 0, - "radio": 1 - }, - "chan_multiSF_6": { - "enable": true, - "if": 200000, - "radio": 1 - }, - "chan_multiSF_7": { - "enable": true, - "if": 400000, - "radio": 1 - }, - "clksrc": 0, - "lbt_cfg": { - "chan_cfg": [ - ], - "enable": false, - "rssi_target": -80, - "sx127x_rssi_offset": -4 - }, - "lorawan_public": true, - "radio_0": { - "enable": true, - "freq": 923600000, - "rssi_offset": -162, - "tx_enable": true, - "tx_freq_max": 928000000, - "tx_freq_min": 920000000, - "type": "SX1257" - }, - "radio_1": { - "enable": true, - "freq": 922600000, - "rssi_offset": -162, - "tx_enable": false, - "type": "SX1257" - }, - "tx_lut_0":{"dig_gain":0,"mix_gain":12,"pa_gain":1,"rf_power":10}, - "tx_lut_1":{"dig_gain":3,"mix_gain":11,"pa_gain":2,"rf_power":11}, - "tx_lut_2":{"dig_gain":0,"mix_gain":14,"pa_gain":1,"rf_power":12}, - "tx_lut_3":{"dig_gain":0,"mix_gain":9,"pa_gain":2,"rf_power":13}, - "tx_lut_4":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":14}, - "tx_lut_5":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":15}, - "tx_lut_6":{"dig_gain":0,"mix_gain":11,"pa_gain":2,"rf_power":16}, - "tx_lut_7":{"dig_gain":3,"mix_gain":9,"pa_gain":3,"rf_power":17}, - "tx_lut_8":{"dig_gain":1,"mix_gain":8,"pa_gain":3,"rf_power":20}, - "tx_lut_9":{"dig_gain":0,"mix_gain":8,"pa_gain":3,"rf_power":21}, - "tx_lut_10":{"dig_gain":2,"mix_gain":10,"pa_gain":3,"rf_power":23}, - "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":24}, - "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":25}, - "tx_lut_13":{"dig_gain":2,"mix_gain":12,"pa_gain":3,"rf_power":26}, - "tx_lut_14":{"dig_gain":0,"mix_gain":13,"pa_gain":3,"rf_power":28}, - "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":29} - }, - "gateway_conf": { - "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>", - "server_address": "52.3.215.147", - "serv_port_up": 20000, - "serv_port_down": 20000, - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - "forward_crc_valid": true, - "forward_crc_error": true, - "forward_crc_disabled": false, - "synch_word": 52, - "autoquit_threshold": 60 - } -} - - diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.AS923-LBT b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.AS923-LBT deleted file mode 100644 index c5f9308..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.AS923-LBT +++ /dev/null @@ -1,149 +0,0 @@ -{ - "SX1301_conf": { -"antenna_gain": 0, - "chan_FSK": { - "bandwidth": 125000, - "datarate": 50000, - "enable": true, - "freq_deviation": 25000, - "if": 300000, - "radio": 0 - }, - "chan_Lora_std": { - "bandwidth": 250000, - "enable": true, - "if": -200000, - "radio": 0, - "spread_factor": 7 - }, - "chan_multiSF_0": { - "enable": true, - "if": -400000, - "radio": 0 - }, - "chan_multiSF_1": { - "enable": true, - "if": -200000, - "radio": 0 - }, - "chan_multiSF_2": { - "enable": true, - "if": 0, - "radio": 0 - }, - "chan_multiSF_3": { - "enable": true, - "if": -400000, - "radio": 1 - }, - "chan_multiSF_4": { - "enable": true, - "if": -200000, - "radio": 1 - }, - "chan_multiSF_5": { - "enable": true, - "if": 0, - "radio": 1 - }, - "chan_multiSF_6": { - "enable": true, - "if": 200000, - "radio": 1 - }, - "chan_multiSF_7": { - "enable": true, - "if": 400000, - "radio": 1 - }, - "clksrc": 0, - "lbt_cfg": { - "chan_cfg": [ - { - "freq_hz": 923200000, - "scan_time_us": 5000 - }, - { - "freq_hz": 923400000, - "scan_time_us": 5000 - }, - { - "freq_hz": 923600000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922200000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922400000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922600000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922800000, - "scan_time_us": 5000 - }, - { - "freq_hz": 923000000, - "scan_time_us": 5000 - } - ], - "enable": true, - "rssi_target": -80, - "sx127x_rssi_offset": -4 - }, - "lorawan_public": true, - "radio_0": { - "enable": true, - "freq": 923600000, - "rssi_offset": -162, - "tx_enable": true, - "tx_freq_max": 928000000, - "tx_freq_min": 920000000, - "type": "SX1257" - }, - "radio_1": { - "enable": true, - "freq": 922600000, - "rssi_offset": -162, - "tx_enable": false, - "type": "SX1257" - }, - "tx_lut_0":{"dig_gain":0,"mix_gain":12,"pa_gain":1,"rf_power":10}, - "tx_lut_1":{"dig_gain":3,"mix_gain":11,"pa_gain":2,"rf_power":11}, - "tx_lut_2":{"dig_gain":0,"mix_gain":14,"pa_gain":1,"rf_power":12}, - "tx_lut_3":{"dig_gain":0,"mix_gain":9,"pa_gain":2,"rf_power":13}, - "tx_lut_4":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":14}, - "tx_lut_5":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":15}, - "tx_lut_6":{"dig_gain":0,"mix_gain":11,"pa_gain":2,"rf_power":16}, - "tx_lut_7":{"dig_gain":3,"mix_gain":9,"pa_gain":3,"rf_power":17}, - "tx_lut_8":{"dig_gain":1,"mix_gain":8,"pa_gain":3,"rf_power":20}, - "tx_lut_9":{"dig_gain":0,"mix_gain":8,"pa_gain":3,"rf_power":21}, - "tx_lut_10":{"dig_gain":2,"mix_gain":10,"pa_gain":3,"rf_power":23}, - "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":24}, - "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":25}, - "tx_lut_13":{"dig_gain":2,"mix_gain":12,"pa_gain":3,"rf_power":26}, - "tx_lut_14":{"dig_gain":0,"mix_gain":13,"pa_gain":3,"rf_power":28}, - "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":29} - }, - "gateway_conf": { - "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>", - "server_address": "52.3.215.147", - "serv_port_up": 20000, - "serv_port_down": 20000, - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - "forward_crc_valid": true, - "forward_crc_error": true, - "forward_crc_disabled": false, - "synch_word": 52, - "autoquit_threshold": 60 - } -} - - diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.AU915 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.AU915 deleted file mode 100644 index ff8ec89..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.AU915 +++ /dev/null @@ -1,115 +0,0 @@ -{ - "SX1301_conf": { - "lorawan_public": true, - "antenna_gain": 0, - "clksrc": 0, - "radio_0": { - "enable": true, - "freq": 915600000, - "rssi_offset": -162, - "tx_enable": true, - "tx_freq_max": 928000000, - "tx_freq_min": 902000000, - "type": "SX1257" - }, - "radio_1": { - "enable": true, - "freq": 916400000, - "rssi_offset": -162, - "tx_enable": false, - "type": "SX1257" - }, - "chan_FSK": { - "enable": false, - "radio": 0 - }, - "chan_Lora_std": { - "bandwidth": 500000, - "enable": true, - "if": 300000, - "radio": 0, - "spread_factor": 8 - }, - "chan_multiSF_0": { - "enable": true, - "if": -400000, - "radio": 0 - }, - "chan_multiSF_1": { - "enable": true, - "if": -200000, - "radio": 0 - }, - "chan_multiSF_2": { - "enable": true, - "if": 0, - "radio": 0 - }, - "chan_multiSF_3": { - "enable": true, - "if": 200000, - "radio": 0 - }, - "chan_multiSF_4": { - "enable": true, - "if": -400000, - "radio": 1 - }, - "chan_multiSF_5": { - "enable": true, - "if": -200000, - "radio": 1 - }, - "chan_multiSF_6": { - "enable": true, - "if": 0, - "radio": 1 - }, - "chan_multiSF_7": { - "enable": true, - "if": 200000, - "radio": 1 - }, - "lbt_cfg": { - "enable": false, - "nb_channel": 1, - "rssi_target": 160, - "scan_time_us": 5000, - "start_freq": 869525000, - "tx_delay_1ch_us": 4000000, - "tx_delay_2ch_us": 4000000 - }, - "tx_lut_0":{"dig_gain":0,"mix_gain":12,"pa_gain":1,"rf_power":10}, - "tx_lut_1":{"dig_gain":3,"mix_gain":11,"pa_gain":2,"rf_power":11}, - "tx_lut_2":{"dig_gain":0,"mix_gain":14,"pa_gain":1,"rf_power":12}, - "tx_lut_3":{"dig_gain":0,"mix_gain":9,"pa_gain":2,"rf_power":13}, - "tx_lut_4":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":14}, - "tx_lut_5":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":15}, - "tx_lut_6":{"dig_gain":0,"mix_gain":11,"pa_gain":2,"rf_power":16}, - "tx_lut_7":{"dig_gain":3,"mix_gain":9,"pa_gain":3,"rf_power":17}, - "tx_lut_8":{"dig_gain":1,"mix_gain":8,"pa_gain":3,"rf_power":20}, - "tx_lut_9":{"dig_gain":0,"mix_gain":8,"pa_gain":3,"rf_power":21}, - "tx_lut_10":{"dig_gain":2,"mix_gain":10,"pa_gain":3,"rf_power":23}, - "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":24}, - "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":25}, - "tx_lut_13":{"dig_gain":2,"mix_gain":12,"pa_gain":3,"rf_power":26}, - "tx_lut_14":{"dig_gain":0,"mix_gain":13,"pa_gain":3,"rf_power":28}, - "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":29} - }, - "gateway_conf": { - "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>", - "server_address": "52.3.215.147", - "serv_port_up": 20000, - "serv_port_down": 20000, - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - "forward_crc_valid": true, - "forward_crc_error": true, - "forward_crc_disabled": false, - "synch_word": 52, - "autoquit_threshold": 60 - } -} - - diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.EU868 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.EU868 deleted file mode 100644 index ee56dd4..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.EU868 +++ /dev/null @@ -1,60 +0,0 @@ -{ - "SX1301_conf": { - "lorawan_public": true, - "clksrc": 0, - "lbt_cfg": { - "enable": false, - "rssi_target": 160, - "nb_channel": 1, - "start_freq": 869525000, - "scan_time_us": 5000, - "tx_delay_1ch_us": 4000000, - "tx_delay_2ch_us": 4000000 - }, - "antenna_gain": 0, - "radio_0": { "enable": true, "type": "SX1257", "freq": 867500000, "rssi_offset": -162, "tx_enable": true, "tx_freq_min": 863000000, "tx_freq_max": 870000000 }, - "radio_1": { "enable": true, "type": "SX1257", "freq": 868500000, "rssi_offset": -162, "tx_enable": false }, - "chan_multiSF_0": { "enable": true, "radio": 1, "if": -400000 }, - "chan_multiSF_1": { "enable": true, "radio": 1, "if": -200000 }, - "chan_multiSF_2": { "enable": true, "radio": 1, "if": 0 }, - "chan_multiSF_3": { "enable": true, "radio": 0, "if": -400000 }, - "chan_multiSF_4": { "enable": true, "radio": 0, "if": -200000 }, - "chan_multiSF_5": { "enable": true, "radio": 0, "if": 0 }, - "chan_multiSF_6": { "enable": true,"radio": 0, "if": 200000 }, - "chan_multiSF_7": { "enable": true, "radio": 0, "if": 400000 }, - "chan_Lora_std": { "enable": true, "radio": 1, "if": -200000, "bandwidth": 250000, "spread_factor": 7 }, - "chan_FSK": { "enable": true, "radio": 1, "if": 300000, "bandwidth": 125000, "datarate": 50000 }, - "tx_lut_0":{"dig_gain":0,"mix_gain":12,"pa_gain":1,"rf_power":10}, - "tx_lut_1":{"dig_gain":3,"mix_gain":11,"pa_gain":2,"rf_power":11}, - "tx_lut_2":{"dig_gain":0,"mix_gain":14,"pa_gain":1,"rf_power":12}, - "tx_lut_3":{"dig_gain":0,"mix_gain":9,"pa_gain":2,"rf_power":13}, - "tx_lut_4":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":14}, - "tx_lut_5":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":15}, - "tx_lut_6":{"dig_gain":0,"mix_gain":11,"pa_gain":2,"rf_power":16}, - "tx_lut_7":{"dig_gain":3,"mix_gain":9,"pa_gain":3,"rf_power":17}, - "tx_lut_8":{"dig_gain":1,"mix_gain":8,"pa_gain":3,"rf_power":20}, - "tx_lut_9":{"dig_gain":0,"mix_gain":8,"pa_gain":3,"rf_power":21}, - "tx_lut_10":{"dig_gain":2,"mix_gain":10,"pa_gain":3,"rf_power":23}, - "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":24}, - "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":25}, - "tx_lut_13":{"dig_gain":2,"mix_gain":12,"pa_gain":3,"rf_power":26}, - "tx_lut_14":{"dig_gain":0,"mix_gain":13,"pa_gain":3,"rf_power":28}, - "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":29} - }, - "gateway_conf": { - "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>", - "server_address": "52.3.215.147", - "serv_port_up": 20000, - "serv_port_down": 20000, - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - "forward_crc_valid": true, - "forward_crc_error": true, - "forward_crc_disabled": false, - "synch_word": 52, - "autoquit_threshold": 60 - } -} - - diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.IN865 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.IN865 deleted file mode 100644 index 4c91d78..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.IN865 +++ /dev/null @@ -1,118 +0,0 @@ -{ - "SX1301_conf": { - "antenna_gain": 0, - "chan_FSK": { - "bandwidth": 125000, - "datarate": 50000, - "enable": true, - "freq_deviation": 25000, - "if": 300000, - "radio": 1 - }, - "chan_Lora_std": { - "bandwidth": 250000, - "enable": true, - "if": 0, - "radio": 0, - "spread_factor": 7 - }, - "chan_multiSF_": { - "radio": null - }, - "chan_multiSF_0": { - "enable": true, - "if": -137500, - "radio": 0 - }, - "chan_multiSF_1": { - "enable": true, - "if": 202500, - "radio": 0 - }, - "chan_multiSF_2": { - "enable": true, - "if": 32500, - "radio": 0 - }, - "chan_multiSF_3": { - "enable": true, - "if": -400000, - "radio": 1 - }, - "chan_multiSF_4": { - "enable": true, - "if": -200000, - "radio": 1 - }, - "chan_multiSF_5": { - "enable": true, - "if": 0, - "radio": 1 - }, - "chan_multiSF_6": { - "enable": true, - "if": 200000, - "radio": 1 - }, - "chan_multiSF_7": { - "enable": true, - "if": 400000, - "radio": 1 - }, - "clksrc": 0, - "lbt_cfg": { - "enable": false, - "rssi_target": 160 - }, - "lorawan_public": true, - "radio_0": { - "enable": true, - "freq": 865200000, - "rssi_offset": -162, - "tx_enable": true, - "tx_freq_max": 867000000, - "tx_freq_min": 865000000, - "tx_notch_freq": 129000, - "type": "SX1257" - }, - "radio_1": { - "enable": true, - "freq": 866385000, - "rssi_offset": -162, - "tx_enable": false, - "type": "SX1257" - }, - "tx_lut_0":{"dig_gain":0,"mix_gain":12,"pa_gain":1,"rf_power":10}, - "tx_lut_1":{"dig_gain":3,"mix_gain":11,"pa_gain":2,"rf_power":11}, - "tx_lut_2":{"dig_gain":0,"mix_gain":14,"pa_gain":1,"rf_power":12}, - "tx_lut_3":{"dig_gain":0,"mix_gain":9,"pa_gain":2,"rf_power":13}, - "tx_lut_4":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":14}, - "tx_lut_5":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":15}, - "tx_lut_6":{"dig_gain":0,"mix_gain":11,"pa_gain":2,"rf_power":16}, - "tx_lut_7":{"dig_gain":3,"mix_gain":9,"pa_gain":3,"rf_power":17}, - "tx_lut_8":{"dig_gain":1,"mix_gain":8,"pa_gain":3,"rf_power":20}, - "tx_lut_9":{"dig_gain":0,"mix_gain":8,"pa_gain":3,"rf_power":21}, - "tx_lut_10":{"dig_gain":2,"mix_gain":10,"pa_gain":3,"rf_power":23}, - "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":24}, - "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":25}, - "tx_lut_13":{"dig_gain":2,"mix_gain":12,"pa_gain":3,"rf_power":26}, - "tx_lut_14":{"dig_gain":0,"mix_gain":13,"pa_gain":3,"rf_power":28}, - "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":29} - }, - "gateway_conf": { - "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>", - "server_address": "52.3.215.147", - "serv_port_up": 20000, - "serv_port_down": 20000, - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - "forward_crc_valid": true, - "forward_crc_error": true, - "forward_crc_disabled": false, - "synch_word": 52, - "autoquit_threshold": 60 - } -} - - diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.KR920-LBT b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.KR920-LBT deleted file mode 100644 index 397f7f7..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.KR920-LBT +++ /dev/null @@ -1,148 +0,0 @@ -{ - "SX1301_conf": { - "antenna_gain": 0, - "chan_FSK": { - "bandwidth": 125000, - "datarate": 50000, - "enable": false, - "if": 300000, - "radio": 0 - }, - "chan_Lora_std": { - "bandwidth": 250000, - "enable": false, - "if": -200000, - "radio": 0, - "spread_factor": 7 - }, - "chan_multiSF_0": { - "enable": true, - "if": -400000, - "radio": 0 - }, - "chan_multiSF_1": { - "enable": true, - "if": -200000, - "radio": 0 - }, - "chan_multiSF_2": { - "enable": true, - "if": 0, - "radio": 0 - }, - "chan_multiSF_3": { - "enable": true, - "if": -400000, - "radio": 1 - }, - "chan_multiSF_4": { - "enable": true, - "if": -200000, - "radio": 1 - }, - "chan_multiSF_5": { - "enable": true, - "if": 0, - "radio": 1 - }, - "chan_multiSF_6": { - "enable": true, - "if": 200000, - "radio": 1 - }, - "chan_multiSF_7": { - "enable": true, - "if": 400000, - "radio": 1 - }, - "clksrc": 0, - "lbt_cfg": { - "chan_cfg": [ - { - "freq_hz": 922100000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922300000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922500000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922700000, - "scan_time_us": 5000 - }, - { - "freq_hz": 922900000, - "scan_time_us": 5000 - }, - { - "freq_hz": 923100000, - "scan_time_us": 5000 - }, - { - "freq_hz": 923300000, - "scan_time_us": 5000 - }, - { - "freq_hz": 921900000, - "scan_time_us": 5000 - } - ], - "enable": true, - "rssi_target": -65, - "sx127x_rssi_offset": -4 - }, - "lorawan_public": true, - "radio_0": { - "enable": true, - "freq": 922500000, - "rssi_offset": -162, - "tx_enable": true, - "tx_freq_max": 923300000, - "tx_freq_min": 920900000, - "type": "SX1257" - }, - "radio_1": { - "enable": true, - "freq": 922900000, - "rssi_offset": -162, - "tx_enable": false, - "type": "SX1257" - }, - "tx_lut_0":{"dig_gain":0,"mix_gain":12,"pa_gain":1,"rf_power":10}, - "tx_lut_1":{"dig_gain":3,"mix_gain":11,"pa_gain":2,"rf_power":11}, - "tx_lut_2":{"dig_gain":0,"mix_gain":14,"pa_gain":1,"rf_power":12}, - "tx_lut_3":{"dig_gain":0,"mix_gain":9,"pa_gain":2,"rf_power":13}, - "tx_lut_4":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":14}, - "tx_lut_5":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":15}, - "tx_lut_6":{"dig_gain":0,"mix_gain":11,"pa_gain":2,"rf_power":16}, - "tx_lut_7":{"dig_gain":3,"mix_gain":9,"pa_gain":3,"rf_power":17}, - "tx_lut_8":{"dig_gain":1,"mix_gain":8,"pa_gain":3,"rf_power":20}, - "tx_lut_9":{"dig_gain":0,"mix_gain":8,"pa_gain":3,"rf_power":21}, - "tx_lut_10":{"dig_gain":2,"mix_gain":10,"pa_gain":3,"rf_power":23}, - "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":24}, - "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":25}, - "tx_lut_13":{"dig_gain":2,"mix_gain":12,"pa_gain":3,"rf_power":26}, - "tx_lut_14":{"dig_gain":0,"mix_gain":13,"pa_gain":3,"rf_power":28}, - "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":29} - }, - "gateway_conf": { - "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>", - "server_address": "52.3.215.147", - "serv_port_up": 20000, - "serv_port_down": 20000, - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - "forward_crc_valid": true, - "forward_crc_error": true, - "forward_crc_disabled": false, - "synch_word": 52, - "autoquit_threshold": 60 - } -} - - diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.RU864 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.RU864 deleted file mode 100644 index 0bdf557..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.RU864 +++ /dev/null @@ -1,118 +0,0 @@ -{ - "SX1301_conf": { - "lorawan_public": true, - "clksrc": 0, - "lbt_cfg": { - "enable": false, - "rssi_target": 160, - "nb_channel": 1, - "start_freq": 869525000, - "scan_time_us": 5000, - "tx_delay_1ch_us": 4000000, - "tx_delay_2ch_us": 4000000 - }, - "antenna_gain": 0, - "radio_0": { - "enable": true, - "type": "SX1257", - "freq": 869100000, - "rssi_offset": -162, - "tx_enable": true, - "tx_freq_min": 864000000, - "tx_freq_max": 870000000 - }, - "radio_1": { - "enable": true, - "type": "SX1257", - "freq": 868100000, - "rssi_offset": -162, - "tx_enable": false - }, - "chan_multiSF_0": { - "enable": true, - "radio": 0, - "if": -400000 - }, - "chan_multiSF_1": { - "enable": true, - "radio": 0, - "if": -200000 - }, - "chan_multiSF_2": { - "enable": true, - "radio": 0, - "if": 0 - }, - "chan_multiSF_3": { - "enable": true, - "radio": 1, - "if": -400000 - }, - "chan_multiSF_4": { - "enable": true, - "radio": 1, - "if": -200000 - }, - "chan_multiSF_5": { - "enable": true, - "radio": 1, - "if": 0 - }, - "chan_multiSF_6": { - "enable": true, - "radio": 1, - "if": 200000 - }, - "chan_multiSF_7": { - "enable": true, - "radio": 1, - "if": 400000 - }, - "chan_Lora_std": { - "enable": true, - "radio": 0, - "if": -200000, - "bandwidth": 250000, - "spread_factor": 7 - }, - "chan_FSK": { - "enable": true, - "radio": 1, - "if": 0, - "bandwidth": 125000, - "datarate": 50000 - }, - "tx_lut_0":{"dig_gain":0,"mix_gain":12,"pa_gain":1,"rf_power":10}, - "tx_lut_1":{"dig_gain":3,"mix_gain":11,"pa_gain":2,"rf_power":11}, - "tx_lut_2":{"dig_gain":0,"mix_gain":14,"pa_gain":1,"rf_power":12}, - "tx_lut_3":{"dig_gain":0,"mix_gain":9,"pa_gain":2,"rf_power":13}, - "tx_lut_4":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":14}, - "tx_lut_5":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":15}, - "tx_lut_6":{"dig_gain":0,"mix_gain":11,"pa_gain":2,"rf_power":16}, - "tx_lut_7":{"dig_gain":3,"mix_gain":9,"pa_gain":3,"rf_power":17}, - "tx_lut_8":{"dig_gain":1,"mix_gain":8,"pa_gain":3,"rf_power":20}, - "tx_lut_9":{"dig_gain":0,"mix_gain":8,"pa_gain":3,"rf_power":21}, - "tx_lut_10":{"dig_gain":2,"mix_gain":10,"pa_gain":3,"rf_power":23}, - "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":24}, - "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":25}, - "tx_lut_13":{"dig_gain":2,"mix_gain":12,"pa_gain":3,"rf_power":26}, - "tx_lut_14":{"dig_gain":0,"mix_gain":13,"pa_gain":3,"rf_power":28}, - "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":29} - }, - "gateway_conf": { - "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>", - "server_address": "52.3.215.147", - "serv_port_up": 20000, - "serv_port_down": 20000, - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - "forward_crc_valid": true, - "forward_crc_error": true, - "forward_crc_disabled": false, - "synch_word": 52, - "autoquit_threshold": 60 - } -} - - diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.US915 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.US915 deleted file mode 100644 index 223cc64..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.US915 +++ /dev/null @@ -1,131 +0,0 @@ -{ - "SX1301_conf": { -"antenna_gain" : 0, - "chan_FSK" : - { - "bandwidth" : 125000, - "datarate" : 50000, - "enable" : false, - "if" : 300000, - "radio" : 0 - }, - "chan_Lora_std" : - { - "bandwidth" : 500000, - "enable" : true, - "if" : 300000, - "radio" : 0, - "spread_factor" : 8 - }, - "chan_multiSF_0" : - { - "enable" : true, - "if" : -400000, - "radio" : 0 - }, - "chan_multiSF_1" : - { - "enable" : true, - "if" : -200000, - "radio" : 0 - }, - "chan_multiSF_2" : - { - "enable" : true, - "if" : 0, - "radio" : 0 - }, - "chan_multiSF_3" : - { - "enable" : true, - "if" : 200000, - "radio" : 0 - }, - "chan_multiSF_4" : - { - "enable" : true, - "if" : -400000, - "radio" : 1 - }, - "chan_multiSF_5" : - { - "enable" : true, - "if" : -200000, - "radio" : 1 - }, - "chan_multiSF_6" : - { - "enable" : true, - "if" : 0, - "radio" : 1 - }, - "chan_multiSF_7" : - { - "enable" : true, - "if" : 200000, - "radio" : 1 - }, - "clksrc" : 0, - "lbt_cfg" : - { - "enable" : false, - "nb_channel" : 1, - "rssi_target" : 160, - "scan_time_us" : 5000, - "start_freq" : 869525000, - "tx_delay_1ch_us" : 4000000, - "tx_delay_2ch_us" : 4000000 - }, - "lorawan_public" : true, - "radio_0" : - { - "enable" : true, - "freq" : 902700000, - "rssi_offset" : -162, - "tx_enable" : true, - "tx_freq_max" : 928000000, - "tx_freq_min" : 902000000, - "type" : "SX1257" - }, - "radio_1" : - { - "enable" : true, - "freq" : 903500000, - "rssi_offset" : -162, - "tx_enable" : false, - "type" : "SX1257" - }, - "tx_lut_0":{"dig_gain":0,"mix_gain":12,"pa_gain":1,"rf_power":10}, - "tx_lut_1":{"dig_gain":3,"mix_gain":11,"pa_gain":2,"rf_power":11}, - "tx_lut_2":{"dig_gain":0,"mix_gain":14,"pa_gain":1,"rf_power":12}, - "tx_lut_3":{"dig_gain":0,"mix_gain":9,"pa_gain":2,"rf_power":13}, - "tx_lut_4":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":14}, - "tx_lut_5":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":15}, - "tx_lut_6":{"dig_gain":0,"mix_gain":11,"pa_gain":2,"rf_power":16}, - "tx_lut_7":{"dig_gain":3,"mix_gain":9,"pa_gain":3,"rf_power":17}, - "tx_lut_8":{"dig_gain":1,"mix_gain":8,"pa_gain":3,"rf_power":20}, - "tx_lut_9":{"dig_gain":0,"mix_gain":8,"pa_gain":3,"rf_power":21}, - "tx_lut_10":{"dig_gain":2,"mix_gain":10,"pa_gain":3,"rf_power":23}, - "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":24}, - "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":25}, - "tx_lut_13":{"dig_gain":2,"mix_gain":12,"pa_gain":3,"rf_power":26}, - "tx_lut_14":{"dig_gain":0,"mix_gain":13,"pa_gain":3,"rf_power":28}, - "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":29} - }, - "gateway_conf": { - "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>", - "server_address": "52.3.215.147", - "serv_port_up": 20000, - "serv_port_down": 20000, - "keepalive_interval": 10, - "stat_interval": 30, - "push_timeout_ms": 100, - "forward_crc_valid": true, - "forward_crc_error": true, - "forward_crc_disabled": false, - "synch_word": 52, - "autoquit_threshold": 60 - } -} - - diff --git a/recipes-connectivity/lora/lora-packet-forwarder/local_conf.json b/recipes-connectivity/lora/lora-packet-forwarder/local_conf.json deleted file mode 100644 index 6576072..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/local_conf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "gateway_conf": { - "server_address": "iot.semtech.com", - "serv_port_up": 1680, - "serv_port_down": 1680 - } -} diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-no-header-option.patch b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-no-header-option.patch deleted file mode 100644 index 7f9851f..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-no-header-option.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/lora_pkt_fwd/src/lora_pkt_fwd.c b/lora_pkt_fwd/src/lora_pkt_fwd.c -index 31a3743..c15b191 100644 ---- a/lora_pkt_fwd/src/lora_pkt_fwd.c -+++ b/lora_pkt_fwd/src/lora_pkt_fwd.c -@@ -2143,6 +2143,12 @@ void thread_down(void) { - txpkt.no_crc = (bool)json_value_get_boolean(val); - } - -+ /* Parse "No Header" flag (optional field) */ -+ val = json_object_get_value(txpk_obj,"nhdr"); -+ if (val != NULL) { -+ txpkt.no_header = (bool)json_value_get_boolean(val); -+ } -+ - /* parse target frequency (mandatory) */ - val = json_object_get_value(txpk_obj,"freq"); - if (val == NULL) { diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-spi-dev-path.patch b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-spi-dev-path.patch deleted file mode 100644 index 820bd4f..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-spi-dev-path.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/lora_pkt_fwd/src/lora_pkt_fwd.c b/lora_pkt_fwd/src/lora_pkt_fwd.c -index 31a3743..a8c8f01 100644 ---- a/lora_pkt_fwd/src/lora_pkt_fwd.c -+++ b/lora_pkt_fwd/src/lora_pkt_fwd.c -@@ -119,6 +119,7 @@ static bool fwd_nocrc_pkt = false; /* packets with NO PAYLOAD CRC are NOT forwar - /* network configuration variables */ - static uint64_t lgwm = 0; /* Lora gateway MAC address */ - static char serv_addr[64] = STR(DEFAULT_SERVER); /* address of the server (host name or IPv4/IPv6) */ -+static char spi_device_path[64] = {0} ; /* custom SPI device path */ - static char serv_port_up[8] = STR(DEFAULT_PORT_UP); /* server port for upstream traffic */ - static char serv_port_down[8] = STR(DEFAULT_PORT_DW); /* server port for downstream traffic */ - static int keepalive_time = DEFAULT_KEEPALIVE; /* send a PULL_DATA request every X seconds, negative = disabled */ -@@ -645,6 +646,13 @@ static int parse_gateway_configuration(const char * conf_file) { - MSG("INFO: server hostname or IP address is configured to \"%s\"\n", serv_addr); - } - -+ /* spi device path (optional) */ -+ str = json_object_get_string(conf_obj, "spi_device"); -+ if (str != NULL) { -+ strncpy(spi_device_path, str, sizeof(spi_device_path)-1); -+ MSG("INFO: SPI device is configured to \"%s\"\n", spi_device_path); -+ } -+ - /* get up and down ports (optional) */ - val = json_object_get_value(conf_obj, "serv_port_up"); - if (val != NULL) { -@@ -1092,6 +1100,11 @@ int main(void) - } - freeaddrinfo(result); - -+ /* set custom SPI device path if configured */ -+ if (strlen(spi_device_path) > 0) -+ lgw_spi_set_path(spi_device_path); -+ -+ - /* starting the concentrator */ - i = lgw_start(); - if (i == LGW_HAL_SUCCESS) { diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-beacon-rfu-fix.patch b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-beacon-rfu-fix.patch deleted file mode 100644 index 80a7ae1..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-beacon-rfu-fix.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/lora_pkt_fwd/src/lora_pkt_fwd.c b/lora_pkt_fwd/src/lora_pkt_fwd.c -index 801f28d..2772a8e 100644 ---- a/lora_pkt_fwd/src/lora_pkt_fwd.c -+++ b/lora_pkt_fwd/src/lora_pkt_fwd.c -@@ -233,6 +233,8 @@ static struct lgw_tx_gain_lut_s txlut; /* TX gain table */ - static uint32_t tx_freq_min[LGW_RF_CHAIN_NB]; /* lowest frequency supported by TX chain */ - static uint32_t tx_freq_max[LGW_RF_CHAIN_NB]; /* highest frequency supported by TX chain */ - -+static uint32_t rx_rf_freq[LGW_RF_CHAIN_NB]; /* center frequency of the radio in Hz */ -+ - /* -------------------------------------------------------------------------- */ - /* --- PRIVATE FUNCTIONS DECLARATION ---------------------------------------- */ - -@@ -494,7 +496,7 @@ static int parse_SX1301_configuration(const char * conf_file) { - MSG("INFO: radio %i disabled\n", i); - } else { /* radio enabled, will parse the other parameters */ - snprintf(param_name, sizeof param_name, "radio_%i.freq", i); -- rfconf.freq_hz = (uint32_t)json_object_dotget_number(conf_obj, param_name); -+ rfconf.freq_hz = rx_rf_freq[i] = (uint32_t)json_object_dotget_number(conf_obj, param_name); - snprintf(param_name, sizeof param_name, "radio_%i.rssi_offset", i); - rfconf.rssi_offset = (float)json_object_dotget_number(conf_obj, param_name); - snprintf(param_name, sizeof param_name, "radio_%i.type", i); -@@ -1995,8 +1997,15 @@ void thread_down(void) { - break; - case 12: - beacon_pkt.datarate = DR_LORA_SF12; -- beacon_RFU1_size = 5; -- beacon_RFU2_size = 3; -+ -+ /* Check radio 0 center frequency to determine if US or AU region */ -+ if (rx_rf_freq[0] > 914900000U ) { -+ beacon_RFU1_size = 3; -+ beacon_RFU2_size = 1; -+ } else { -+ beacon_RFU1_size = 5; -+ beacon_RFU2_size = 3; -+ } - break; - default: - /* should not happen */ diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-dedup-rx.patch b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-dedup-rx.patch deleted file mode 100644 index c368033..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-dedup-rx.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/lora_pkt_fwd/src/lora_pkt_fwd.c b/lora_pkt_fwd/src/lora_pkt_fwd.c -index 801f28d..c35c64f 100644 ---- a/lora_pkt_fwd/src/lora_pkt_fwd.c -+++ b/lora_pkt_fwd/src/lora_pkt_fwd.c -@@ -126,8 +126,9 @@ volatile bool quit_sig = false; /* 1 -> application terminates without shutting - static bool fwd_valid_pkt = true; /* packets with PAYLOAD CRC OK are forwarded */ - static bool fwd_error_pkt = false; /* packets with PAYLOAD CRC ERROR are NOT forwarded */ - static bool fwd_nocrc_pkt = false; /* packets with NO PAYLOAD CRC are NOT forwarded */ -+static bool fwd_best_pkt = true; /* duplicate packets with low SNR are NOT forwarded */ - - /* network configuration variables */ - static uint64_t lgwm = 0; /* Lora gateway MAC address */ - static char serv_addr[64] = STR(DEFAULT_SERVER); /* address of the server (host name or IPv4/IPv6) */ - static char serv_port_up[8] = STR(DEFAULT_PORT_UP); /* server port for upstream traffic */ -@@ -731,6 +742,12 @@ static int parse_gateway_configuration(const char * conf_file) { - } - - /* packet filtering parameters */ -+ val = json_object_get_value(conf_obj, "best_packet_filter"); -+ if (json_value_get_type(val) == JSONBoolean) { -+ fwd_best_pkt = (bool)json_value_get_boolean(val); -+ } -+ MSG("INFO: duplicate packets received with low SNR will%s be forwarded\n", (!fwd_best_pkt ? "" : " NOT")); -+ - val = json_object_get_value(conf_obj, "forward_crc_valid"); - if (json_value_get_type(val) == JSONBoolean) { - fwd_valid_pkt = (bool)json_value_get_boolean(val); -@@ -1536,6 +1562,38 @@ void thread_up(void) { - memcpy((void *)(buff_up + buff_index), (void *)"{\"rxpk\":[", 9); - buff_index += 9; - -+ if (fwd_best_pkt && nb_pkt > 1) { -+ uint32_t check_addr = 0; -+ uint32_t check_mic = 0; -+ uint16_t check_fcnt = 0; -+ float check_snr = -30.0; -+ -+ for (i=0; i < nb_pkt; ++i) { -+ p = &rxpkt[i]; -+ if (p->size < 12) -+ continue; -+ -+ memcpy(&check_addr, p->payload + 1, 4); -+ memcpy(&check_fcnt, p->payload + 6, 2); -+ memcpy(&check_mic, p->payload + p->size - 4, 4); -+ -+ check_snr = p->snr; -+ -+ for (j=0; j < nb_pkt; ++j) { -+ p = &rxpkt[j]; -+ -+ if (p->size >= 12 -+ && memcmp(&check_addr, p->payload + 1, 4) == 0 -+ && memcmp(&check_fcnt, p->payload + 6, 2) == 0 -+ && memcmp(&check_mic, p->payload + p->size - 4, 4) == 0 -+ && p->snr < check_snr) { -+ // set status of duplicate packets rx'd on wrong channel -+ p->status = 1; -+ } -+ } -+ } -+ } -+ - /* serialize Lora packets metadata and payload */ - pkt_in_dgram = 0; - for (i=0; i < nb_pkt; ++i) { diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-duty-cycle.patch b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-duty-cycle.patch deleted file mode 100644 index b1790e7..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-duty-cycle.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/lora_pkt_fwd/src/lora_pkt_fwd.c b/lora_pkt_fwd/src/lora_pkt_fwd.c -index 801f28d..7b63b8f 100644 ---- a/lora_pkt_fwd/src/lora_pkt_fwd.c -+++ b/lora_pkt_fwd/src/lora_pkt_fwd.c -@@ -134,6 +134,12 @@ static char serv_port_up[8] = STR(DEFAULT_PORT_UP); /* server port for upstream traffic */ - static char serv_port_down[8] = STR(DEFAULT_PORT_DW); /* server port for downstream traffic */ - static int keepalive_time = DEFAULT_KEEPALIVE; /* send a PULL_DATA request every X seconds, negative = disabled */ - -+static bool duty_cycle_enabled = true; -+static uint32_t duty_cycle_time_avail = 0; -+static uint32_t duty_cycle_period = 3600; // seconds in one hour -+static double duty_cycle_ratio = 0.10; // 10% -+static uint32_t duty_cycle_time_max = 3600 * 0.10 * 1000u; // max time-on-air in window -+ - /* statistics collection configuration variables */ - static unsigned stat_interval = DEFAULT_STAT; /* time interval (in sec) at which statistics are collected and displayed */ - -@@ -729,8 +746,32 @@ static int parse_gateway_configuration(const char * conf_file) { - push_timeout_half.tv_usec = 500 * (long int)json_value_get_number(val); - MSG("INFO: upstream PUSH_DATA time-out is configured to %u ms\n", (unsigned)(push_timeout_half.tv_usec / 500)); - } -+ -+ /* duty-cycle limiting */ -+ val = json_object_get_value(conf_obj, "duty_cycle_enabled"); -+ if (json_value_get_type(val) == JSONBoolean) { -+ duty_cycle_enabled = (bool)json_value_get_boolean(val); -+ } -+ MSG("INFO: duty cycle will%s be enforced\n", (duty_cycle_enabled ? "" : " NOT")); -+ -+ if (duty_cycle_enabled) { -+ val = json_object_get_value(conf_obj, "duty_cycle_period"); -+ if (val != NULL) { -+ duty_cycle_period = (unsigned)json_value_get_number(val); -+ } -+ MSG("INFO: duty cycle period %u s\n", (duty_cycle_period)); -+ -+ val = json_object_get_value(conf_obj, "duty_cycle_ratio"); -+ if (val != NULL) { -+ duty_cycle_ratio = (double)json_value_get_number(val); -+ } -+ MSG("INFO: duty cycle %f %%\n", (duty_cycle_ratio * 100)); -+ -+ duty_cycle_time_max = duty_cycle_period * 1000u * duty_cycle_ratio; -+ } -+ - - /* packet filtering parameters */ - val = json_object_get_value(conf_obj, "best_packet_filter"); - if (json_value_get_type(val) == JSONBoolean) { - fwd_best_pkt = (bool)json_value_get_boolean(val); -@@ -1349,6 +1406,8 @@ int main(void) - printf("# PUSH_DATA datagrams sent: %u (%u bytes)\n", cp_up_dgram_sent, cp_up_network_byte); - printf("# PUSH_DATA acknowledged: %.2f%%\n", 100.0 * up_ack_ratio); - printf("### [DOWNSTREAM] ###\n"); -+ if (duty_cycle_enabled) -+ printf("# TIME ON AIR available: %u ms\n", duty_cycle_time_avail); - printf("# PULL_DATA sent: %u (%.2f%% acknowledged)\n", cp_dw_pull_sent, 100.0 * dw_ack_ratio); - printf("# PULL_RESP(onse) datagrams received: %u (%u bytes)\n", cp_dw_dgram_rcv, cp_dw_network_byte); - printf("# RF packets sent to concentrator: %u (%u bytes)\n", (cp_nb_tx_ok+cp_nb_tx_fail), cp_dw_payload_byte); - -@@ -2833,6 +2921,25 @@ void thread_valid(void) { - while (!exit_sig && !quit_sig) { - wait_ms(1000); - -+ if (duty_cycle_enabled) { -+ static struct timespec last = { 0, 0 }; -+ struct timespec now; -+ clock_gettime(CLOCK_MONOTONIC, &now); -+ -+ if (last.tv_sec != 0) { -+ // uint64(now.tv_sec) * 1000 + now.tv_nsec / 1000000 -+ -+ duty_cycle_time_avail += difftimespec(now, last) * 1000u * duty_cycle_ratio; -+ -+ if (duty_cycle_time_avail > duty_cycle_time_max) { -+ duty_cycle_time_avail = duty_cycle_time_max; -+ } -+ } -+ -+ last = now; -+ } -+ -+ - /* calculate when the time reference was last updated */ - pthread_mutex_lock(&mx_timeref); - gps_ref_age = (long)difftime(time(NULL), time_reference_gps.systime); diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-gpsd.patch b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-gpsd.patch deleted file mode 100644 index 02bef12..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-gpsd.patch +++ /dev/null @@ -1,302 +0,0 @@ -diff --git a/lora_pkt_fwd/Makefile b/lora_pkt_fwd/Makefile -index 1330d62..dda589e 100644 ---- a/lora_pkt_fwd/Makefile -+++ b/lora_pkt_fwd/Makefile -@@ -22,7 +22,7 @@ RELEASE_VERSION := `cat ../VERSION` - CC := $(CROSS_COMPILE)gcc - AR := $(CROSS_COMPILE)ar - --CFLAGS := -O2 -Wall -Wextra -std=c99 -Iinc -I. -+MORECFLAGS := -Wall -Wextra -std=c99 -Iinc -I. -isystem =/usr/include/gps - VFLAG := -D VERSION_STRING="\"$(RELEASE_VERSION)\"" - - ### Constants for Lora concentrator HAL library -@@ -38,7 +38,7 @@ LGW_INC += $(LGW_PATH)/inc/loragw_gps.h - - ### Linking options - --LIBS := -lloragw -lrt -lpthread -lm -+LIBS := -lloragw -lrt -lpthread -lm -lgps - - ### General build targets - -@@ -54,12 +54,14 @@ $(OBJDIR): - mkdir -p $(OBJDIR) - - $(OBJDIR)/%.o: src/%.c $(INCLUDES) | $(OBJDIR) -- $(CC) -c $(CFLAGS) -I$(LGW_PATH)/inc $< -o $@ -+ @echo compile $@ -+ $(CC) -c $(CFLAGS) $(MORECFLAGS) -I$(LGW_PATH)/inc $< -o $@ - - ### Main program compilation and assembly - - $(OBJDIR)/$(APP_NAME).o: src/$(APP_NAME).c $(LGW_INC) $(INCLUDES) | $(OBJDIR) -- $(CC) -c $(CFLAGS) $(VFLAG) -I$(LGW_PATH)/inc $< -o $@ -+ @echo compile $@ -+ $(CC) -c $(CFLAGS) $(MORECFLAGS) $(VFLAG) -I$(LGW_PATH)/inc $< -o $@ - - $(APP_NAME): $(OBJDIR)/$(APP_NAME).o $(LGW_PATH)/libloragw.a $(OBJDIR)/parson.o $(OBJDIR)/base64.o $(OBJDIR)/jitqueue.o $(OBJDIR)/timersync.o - $(CC) -L$(LGW_PATH) $< $(OBJDIR)/parson.o $(OBJDIR)/base64.o $(OBJDIR)/jitqueue.o $(OBJDIR)/timersync.o -o $@ $(LIBS) -diff --git a/lora_pkt_fwd/src/lora_pkt_fwd.c b/lora_pkt_fwd/src/lora_pkt_fwd.c -index 801f28d..6bca482 100644 ---- a/lora_pkt_fwd/src/lora_pkt_fwd.c -+++ b/lora_pkt_fwd/src/lora_pkt_fwd.c -@@ -156,10 +156,10 @@ static bool xtal_correct_ok = false; /* set true when XTAL correction is stable - static double xtal_correct = 1.0; - - /* GPS configuration and synchronization */ --static char gps_tty_path[64] = "\0"; /* path of the TTY port GPS is connected on */ --static int gps_tty_fd = -1; /* file descriptor of the GPS TTY port */ -+static bool use_gps = false; /* Use the GPSD stream */ - static bool gps_enabled = false; /* is GPS enabled on that gateway ? */ -- -+static struct gps_data_t gpsdata; -+static struct fixsource_t source; - /* GPS time reference */ - static pthread_mutex_t mx_timeref = PTHREAD_MUTEX_INITIALIZER; /* control access to GPS time reference */ - static bool gps_ref_valid; /* is GPS reference acceptable (ie. not too old) */ -@@ -747,13 +747,6 @@ static int parse_gateway_configuration(const char * conf_file) { - } - MSG("INFO: packets received with no CRC will%s be forwarded\n", (fwd_nocrc_pkt ? "" : " NOT")); - -- /* GPS module TTY path (optional) */ -- str = json_object_get_string(conf_obj, "gps_tty_path"); -- if (str != NULL) { -- strncpy(gps_tty_path, str, sizeof gps_tty_path); -- MSG("INFO: GPS serial port path is configured to \"%s\"\n", gps_tty_path); -- } -- - /* get reference coordinates */ - val = json_object_get_value(conf_obj, "ref_latitude"); - if (val != NULL) { -@@ -772,6 +765,17 @@ static int parse_gateway_configuration(const char * conf_file) { - } - - /* Gateway GPS coordinates hardcoding (aka. faking) option */ -+ val = json_object_get_value(conf_obj, "gps"); -+ if (json_value_get_type(val) == JSONBoolean) { -+ use_gps = (bool)json_value_get_boolean(val); -+ if (use_gps == true) { -+ MSG("INFO: GPS is enabled\n"); -+ } else { -+ MSG("INFO: GPS is disabled\n"); -+ } -+ } -+ -+ /* Gateway GPS coordinates hardcoding (aka. faking) option */ - val = json_object_get_value(conf_obj, "fake_gps"); - if (json_value_get_type(val) == JSONBoolean) { - gps_fake_enable = (bool)json_value_get_boolean(val); -@@ -1098,14 +1102,14 @@ int main(void) - } - - /* Start GPS a.s.a.p., to allow it to lock */ -- if (gps_tty_path[0] != '\0') { /* do not try to open GPS device if no path set */ -- i = lgw_gps_enable(gps_tty_path, "ubx7", 0, &gps_tty_fd); /* HAL only supports u-blox 7 for now */ -+ if (use_gps == true) { -+ int i = lgw_gps_enable(&gpsdata, &source); - if (i != LGW_GPS_SUCCESS) { -- printf("WARNING: [main] impossible to open %s for GPS sync (check permissions)\n", gps_tty_path); -+ printf("WARNING: [main] impossible to open for GPS sync (Check GPSD)\n"); - gps_enabled = false; - gps_ref_valid = false; - } else { -- printf("INFO: [main] TTY port %s open for GPS synchronization\n", gps_tty_path); -+ printf("INFO: [main] GPSD polling open for GPS synchronization\n"); - gps_enabled = true; - gps_ref_valid = false; - } -@@ -1413,7 +1417,7 @@ int main(void) - pthread_cancel(thrid_gps); /* don't wait for GPS thread */ - pthread_cancel(thrid_valid); /* don't wait for validation thread */ - -- i = lgw_gps_disable(gps_tty_fd); -+ i = lgw_gps_disable(&gpsdata); - if (i == LGW_HAL_SUCCESS) { - MSG("INFO: GPS closed successfully\n"); - } else { -@@ -2683,7 +2731,7 @@ static void gps_process_sync(void) { - i = lgw_gps_sync(&time_reference_gps, trig_tstamp, utc, gps_time); - pthread_mutex_unlock(&mx_timeref); - if (i != LGW_GPS_SUCCESS) { -- MSG("WARNING: [gps] GPS out of sync, keeping previous time reference\n"); -+// MSG("WARNING: [gps] GPS out of sync, keeping previous time reference\n"); - } - } - -@@ -2691,7 +2695,7 @@ static void gps_process_coords(void) { - /* position variable */ - struct coord_s coord; - struct coord_s gpserr; -- int i = lgw_gps_get(NULL, NULL, &coord, &gpserr); -+ int i = lgw_gps_get(NULL, NULL, &coord, &gpserr); - - /* update gateway coordinates */ - pthread_mutex_lock(&mx_meas_gps); -@@ -2707,96 +2711,88 @@ static void gps_process_coords(void) { - } - - void thread_gps(void) { -- /* serial variables */ - char serial_buff[128]; /* buffer to receive GPS data */ -- size_t wr_idx = 0; /* pointer to end of chars in buffer */ -- -- /* variables for PPM pulse GPS synchronization */ - enum gps_msg latest_msg; /* keep track of latest NMEA message parsed */ -- -- /* initialize some variables before loop */ -- memset(serial_buff, 0, sizeof serial_buff); -- -+ memset(serial_buff, 0, sizeof serial_buff); /* initialize some variables before loop */ -+ fd_set fds; -+ char delim[4] = "$"; -+ char *token[254]; - while (!exit_sig && !quit_sig) { -- size_t rd_idx = 0; -- size_t frame_end_idx = 0; -- -- /* blocking non-canonical read on serial port */ -- ssize_t nb_char = read(gps_tty_fd, serial_buff + wr_idx, LGW_GPS_MIN_MSG_SIZE); -- if (nb_char <= 0) { -- MSG("WARNING: [gps] read() returned value %d\n", nb_char); -+ int r = 0; -+ struct timeval tv; -+ tv.tv_sec = 0; -+ tv.tv_usec = 100000; -+ FD_ZERO(&fds); -+ FD_SET(gpsdata.gps_fd, &fds); -+ errno = 0; -+ r = select(gpsdata.gps_fd+1, &fds, NULL, NULL, &tv); -+ if (r == -1 && errno != EINTR) { -+ MSG("gpspipe: select error %s(%d)\n", strerror(errno), errno); -+ exit(EXIT_FAILURE); -+ } else if (r == 0) - continue; -- } -- wr_idx += (size_t)nb_char; - -- /******************************************* -- * Scan buffer for UBX/NMEA sync chars and * -- * attempt to decode frame if one is found * -- *******************************************/ -- while(rd_idx < wr_idx) { -+ /* reading directly from the socket avoids decode overhead */ -+ errno = 0; -+ r = (int)read(gpsdata.gps_fd, serial_buff, sizeof(serial_buff)); -+ if (r > 0) { -+ int i = 0; - size_t frame_size = 0; -- -- /* Scan buffer for UBX sync char */ -- if(serial_buff[rd_idx] == (char)LGW_GPS_UBX_SYNC_CHAR) { -- -- /*********************** -- * Found UBX sync char * -- ***********************/ -- latest_msg = lgw_parse_ubx(&serial_buff[rd_idx], (wr_idx - rd_idx), &frame_size); -- -- if (frame_size > 0) { -- if (latest_msg == INCOMPLETE) { -- /* UBX header found but frame appears to be missing bytes */ -- frame_size = 0; -- } else if (latest_msg == INVALID) { -- /* message header received but message appears to be corrupted */ -- MSG("WARNING: [gps] could not get a valid message from GPS (no time)\n"); -- frame_size = 0; -- } else if (latest_msg == UBX_NAV_TIMEGPS) { -- gps_process_sync(); -+ for (i = 0; i < r; i++) { -+ if (serial_buff[i] == (char)LGW_GPS_UBX_SYNC_CHAR) { -+ /*********************** -+ * Found UBX sync char * -+ ***********************/ -+ size_t ubx_size = (uint8_t)serial_buff[i+4]; -+ ubx_size |= (uint8_t)serial_buff[i+5] << 8; -+ ubx_size += 8; -+ if (ubx_size < 27){ -+ latest_msg = lgw_parse_ubx(&serial_buff[i], ubx_size , &frame_size); - } -- } -- } else if(serial_buff[rd_idx] == LGW_GPS_NMEA_SYNC_CHAR) { -- /************************ -- * Found NMEA sync char * -- ************************/ -- /* scan for NMEA end marker (LF = 0x0a) */ -- char* nmea_end_ptr = memchr(&serial_buff[rd_idx],(int)0x0a, (wr_idx - rd_idx)); -- -- if(nmea_end_ptr) { -- /* found end marker */ -- frame_size = nmea_end_ptr - &serial_buff[rd_idx] + 1; -- latest_msg = lgw_parse_nmea(&serial_buff[rd_idx], frame_size); -- -- if(latest_msg == INVALID || latest_msg == UNKNOWN) { -- /* checksum failed */ -- frame_size = 0; -- } else if (latest_msg == NMEA_RMC) { /* Get location from RMC frames */ -- gps_process_coords(); -+ if (frame_size > 0) { -+ if(latest_msg == INVALID || latest_msg == UNKNOWN) { -+ /* checksum failed */ -+ frame_size = 0; -+ } else if (latest_msg == UBX_NAV_TIMEGPS) { -+ gps_process_sync(); -+ } -+ } -+ } else if((serial_buff[i] == LGW_GPS_NMEA_SYNC_CHAR) && (serial_buff[i+1] == 0x47) && (serial_buff[i+2] == 0x50)){ -+ /************************ -+ * Found NMEA sync char * -+ ************************/ -+ int k, l= 0; -+ token[0] = strtok(serial_buff, delim); -+ -+ while (token[l] != NULL) { -+ l++; -+ token[l] = strtok(NULL, delim); -+ } -+ for (k=0; k<=l-1; k++) { -+ if ((strlen(token[k]) > 66) && (strlen(token[k]) < 74)){ -+ latest_msg = lgw_parse_nmea(token[k], strlen(token[k])); -+ if(latest_msg == INVALID || latest_msg == UNKNOWN) { -+ /* checksum failed */ -+ frame_size = 0; -+ } else if (latest_msg == NMEA_RMC) { -+ /* Get location from RMC frames */ -+ gps_process_coords(); -+ } -+ } - } - } - } -- -- if(frame_size > 0) { -- /* At this point message is a checksum verified frame -- we're processed or ignored. Remove frame from buffer */ -- rd_idx += frame_size; -- frame_end_idx = rd_idx; -+ } else { -+ if (r == -1) { -+ if (errno == EAGAIN) -+ continue; -+ else { -+ MSG(stderr, "gpspipe: read error %s(%d)\n", strerror(errno), errno); -+ exit(EXIT_FAILURE); -+ } - } else { -- rd_idx++; -+ exit(EXIT_SUCCESS); - } -- } /* ...for(rd_idx = 0... */ -- -- if(frame_end_idx) { -- /* Frames have been processed. Remove bytes to end of last processed frame */ -- memcpy(serial_buff, &serial_buff[frame_end_idx], wr_idx - frame_end_idx); -- wr_idx -= frame_end_idx; -- } /* ...for(rd_idx = 0... */ -- -- /* Prevent buffer overflow */ -- if((sizeof(serial_buff) - wr_idx) < LGW_GPS_MIN_MSG_SIZE) { -- memcpy(serial_buff, &serial_buff[LGW_GPS_MIN_MSG_SIZE], wr_idx - LGW_GPS_MIN_MSG_SIZE); -- wr_idx -= LGW_GPS_MIN_MSG_SIZE; - } - } - MSG("\nINFO: End of GPS thread\n"); diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-jit-queue-increase-peek-and-remove-sort-from-dequeue.patch b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-jit-queue-increase-peek-and-remove-sort-from-dequeue.patch deleted file mode 100644 index 2b0aaf4..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-jit-queue-increase-peek-and-remove-sort-from-dequeue.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/lora_pkt_fwd/src/jitqueue.c b/lora_pkt_fwd/src/jitqueue.c -index dbde8d2..f1b547b 100644 ---- a/lora_pkt_fwd/src/jitqueue.c -+++ b/lora_pkt_fwd/src/jitqueue.c -@@ -37,6 +37,7 @@ Maintainer: Michael Coracin - #define TX_MARGIN_DELAY 1000 /* Packet overlap margin in microseconds */ - /* TODO: How much margin should we take? */ - #define TX_JIT_DELAY 30000 /* Pre-delay to program packet for TX in microseconds */ -+#define TX_PEEK_DELAY 60000 /* Look ahead time for TX in microseconds */ - #define TX_MAX_ADVANCE_DELAY ((JIT_NUM_BEACON_IN_QUEUE + 1) * 128 * 1E6) /* Maximum advance delay accepted for a TX packet, compared to current time */ - - #define BEACON_GUARD 3000000 /* Interval where no ping slot can be placed, -@@ -352,12 +353,12 @@ enum jit_error_e jit_dequeue(struct jit_queue_s *queue, int index, struct lgw_pk - memset(&(queue->nodes[queue->num_pkt]), 0, sizeof(struct jit_node_s)); - - /* Sort queue in ascending order of packet timestamp */ -- jit_sort_queue(queue); -+ // jit_sort_queue(queue); - - /* Done */ - pthread_mutex_unlock(&mx_jit_queue); - -- jit_print_queue(queue, false, DEBUG_JIT); -+ // jit_print_queue(queue, false, DEBUG_JIT); - - MSG_DEBUG(DEBUG_JIT, "dequeued packet with count_us=%u from index %d\n", packet->count_us, index); - -@@ -427,7 +428,7 @@ enum jit_error_e jit_peek(struct jit_queue_s *queue, struct timeval *time, int * - * Warning: unsigned arithmetic (handle roll-over) - * t_packet < t_current + TX_JIT_DELAY - */ -- if ((queue->nodes[idx_highest_priority].pkt.count_us - time_us) < TX_JIT_DELAY) { -+ if ((queue->nodes[idx_highest_priority].pkt.count_us - time_us) < TX_PEEK_DELAY) { - *pkt_idx = idx_highest_priority; - MSG_DEBUG(DEBUG_JIT, "peek packet with count_us=%u at index %d\n", - queue->nodes[idx_highest_priority].pkt.count_us, idx_highest_priority); diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-parse-config-params-when-radio-disabled.patch b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-parse-config-params-when-radio-disabled.patch deleted file mode 100644 index 0e7ded9..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-parse-config-params-when-radio-disabled.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/lora_pkt_fwd/src/lora_pkt_fwd.c b/lora_pkt_fwd/src/lora_pkt_fwd.c -index 1c54d57..92f25e3 100644 ---- a/lora_pkt_fwd/src/lora_pkt_fwd.c -+++ b/lora_pkt_fwd/src/lora_pkt_fwd.c -@@ -471,7 +471,8 @@ static int parse_SX1301_configuration(const char * conf_file) { - } - if (rfconf.enable == false) { /* radio disabled, nothing else to parse */ - MSG("INFO: radio %i disabled\n", i); -- } else { /* radio enabled, will parse the other parameters */ -+ } -+// } else { /* radio enabled, will parse the other parameters */ - snprintf(param_name, sizeof param_name, "radio_%i.freq", i); - rfconf.freq_hz = (uint32_t)json_object_dotget_number(conf_obj, param_name); - snprintf(param_name, sizeof param_name, "radio_%i.rssi_offset", i); -@@ -505,8 +506,8 @@ static int parse_SX1301_configuration(const char * conf_file) { - } else { - rfconf.tx_enable = false; - } -- MSG("INFO: radio %i enabled (type %s), center frequency %u, RSSI offset %f, tx enabled %d, tx_notch_freq %u\n", i, str, rfconf.freq_hz, rfconf.rssi_offset, rfconf.tx_enable, rfconf.tx_notch_freq); -- } -+ MSG("INFO: radio %i %sabled (type %s), center frequency %u, RSSI offset %f, tx enabled %d, tx_notch_freq %u\n", i, (rfconf.enable?"en":"dis"), str, rfconf.freq_hz, rfconf.rssi_offset, rfconf.tx_enable, rfconf.tx_notch_freq); -+// } - /* all parameters parsed, submitting configuration to the HAL */ - if (lgw_rxrf_setconf(i, rfconf) != LGW_HAL_SUCCESS) { - MSG("ERROR: invalid configuration for radio %i\n", i); diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-remove-jit-power-check.patch b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-remove-jit-power-check.patch deleted file mode 100644 index cbb226b..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-remove-jit-power-check.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/lora_pkt_fwd/src/lora_pkt_fwd.c b/lora_pkt_fwd/src/lora_pkt_fwd.c -index 1c54d57..1e74d7f 100644 ---- a/lora_pkt_fwd/src/lora_pkt_fwd.c -+++ b/lora_pkt_fwd/src/lora_pkt_fwd.c -@@ -2360,19 +2360,6 @@ void thread_down(void) { - jit_result = JIT_ERROR_TX_FREQ; - MSG("ERROR: Packet REJECTED, unsupported frequency - %u (min:%u,max:%u)\n", txpkt.freq_hz, tx_freq_min[txpkt.rf_chain], tx_freq_max[txpkt.rf_chain]); - } -- if (jit_result == JIT_ERROR_OK) { -- for (i=0; i<txlut.size; i++) { -- if (txlut.lut[i].rf_power == txpkt.rf_power) { -- /* this RF power is supported, we can continue */ -- break; -- } -- } -- if (i == txlut.size) { -- /* this RF power is not supported */ -- jit_result = JIT_ERROR_TX_POWER; -- MSG("ERROR: Packet REJECTED, unsupported RF power for TX - %d\n", txpkt.rf_power); -- } -- } - - /* insert packet to be sent into JIT queue */ - if (jit_result == JIT_ERROR_OK) { diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init deleted file mode 100755 index bcb2a66..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init +++ /dev/null @@ -1,248 +0,0 @@ -#!/bin/bash - - -NAME="lora-packet-forwarder" -ENABLED="yes" - - -[ -f /etc/default/$NAME ] && source /etc/default/$NAME - -run_dir=/var/run/lora -opt_conf_dir=/opt/lora -conf_dir=/var/config/lora -conf_file=$conf_dir/global_conf.json -conf_file_local=$conf_dir/local_conf.json - -pkt_fwd=$run_dir/1/lora_pkt_fwd -pkt_fwd_log=/var/log/lora-pkt-fwd-1.log -pkt_fwd_pidfile=$run_dir/lora-pkt-fwd-1.pid - -port1=/sys/devices/platform/mts-io/ap1 -port2=/sys/devices/platform/mts-io/ap2 - -lora_mtac_id="MTAC-LORA" -lora_1_0_hw="MTAC-LORA-1.0" -lora_1_5_h_hw="MTAC-LORA-1.5" -lora_2_1_hw="MTAC-LORA-2.1" - -lora_mtac_id="MTAC-LORA" -lora_mtac_id915="MTAC-LORA-915" -lora_mtac_id868="MTAC-LORA-868" -lora_mtac_h_id915="MTAC-LORA-H-915" -lora_mtac_h_id868="MTAC-LORA-H-868" - -lora_mtcap_id="MTCAP-LORA" -lora_mtcap_id868="MTCAP-LORA-868" -lora_mtcap_id915="MTCAP-LORA-915" - -lora_mtac_g_id="MTAC-LORA-G" -lora_mtac_g16_id868="MTAC-LORA-G16-868" -lora_mtac_g16_id915="MTAC-LORA-G16-915" -lora_mtac_g64_id868="MTAC-LORA-G64-868" -lora_mtac_g64_id915="MTAC-LORA-G64-915" - -pkt_fwd_options="" - -gps_path="/dev/gps0" - -read_lora_hw_info() { - lora_id=$(mts-io-sysfs show lora/product-id 2> /dev/null) - lora_hw=$(mts-io-sysfs show lora/hw-version 2> /dev/null) - lora_eui=$(mts-io-sysfs show lora/eui 2> /dev/null) - lora_eui_raw=${lora_eui//:/} -} - -hardware_found() { - if [[ "$lora_id" =~ "$lora_mtac_g_id" ]]; then - setup_mtcdt_2_1 - elif [[ "$lora_id" =~ "$lora_mtcap_id" ]]; then - setup_mtcap - elif [[ "$lora_id" =~ "$lora_mtac_id" ]]; then - setup_mtcdt - else - return 1 - fi - return 0 -} - -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 - - if [ "$lora_hw" = "$lora_1_0_hw" ] && [[ ! "$lora_id" =~ .*-SPI ]]; then - if [ "$lora_id" = "$lora_mtac_id868" ]; then - GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_1_0.EU868 - elif [ "$lora_id" = "$lora_mtac_id915" ]; then - GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_1_0.US915 - else - echo "No valid configuration found for mtcdt exiting." - exit 1 - fi - ln -sf /opt/lora/basic_pkt_fwd-usb $pkt_fwd - else - if [ "$lora_id" = "$lora_mtac_h_id868" ]; then - GLOBAL_CONF=/opt/lora/global_conf.json.MTCDT_LORA_1_5.EU868 - elif [ "$lora_id" = "$lora_mtac_h_id915" ]; then - GLOBAL_CONF=/opt/lora/global_conf.json.MTCDT_LORA_1_5.US915 - else - echo "No valid configuration found for mtcdt exiting." - exit 1 - fi - ln -sf /opt/lora/lora_pkt_fwd $pkt_fwd - fi - - opt_conf_file=$opt_conf_dir/global_conf.json - opt_conf_file_local=$opt_conf_dir/local_conf.json - - cp $GLOBAL_CONF $opt_conf_file - - if ! [ -f $conf_file ]; then - mkdir -p /var/config/lora/ - cp $opt_conf_file $conf_file - cp $opt_conf_file_local $conf_file_local - fi -} - -setup_mtcap() { - hw=$(mts-io-sysfs show hw-version 2> /dev/null) - - if [ "$lora_id" = "$lora_mtcap_id868" ]; then - if [ "$hw" = "MTCAP-0.2" ]; then - GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP2_LORA_1_5.EU868 - else - GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP_LORA_1_5.EU868 - fi - elif [ "$lora_id" = "$lora_mtcap_id915" ]; then - if [ "$hw" = "MTCAP-0.2" ]; then - GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP2_LORA_1_5.US915 - else - GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP_LORA_1_5.US915 - fi - else - return 1 - fi - - opt_conf_file=$opt_conf_dir/global_conf.json - opt_conf_file_local=$opt_conf_dir/local_conf.json - - cp $GLOBAL_CONF $opt_conf_file - - if ! [ -f $conf_file ]; then - mkdir -p /var/config/lora/ - cp $opt_conf_file $conf_file - cp $opt_conf_file_local $conf_file_local - fi - - ln -sf /opt/lora/lora_pkt_fwd $pkt_fwd -} - -setup_mtcdt_2_1() { - 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 - GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_US915 - elif [[ "$lora_id" = "$lora_mtac_g64_id868" ]]; then - GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_2_1_test_single_antenna_64ch_8x8_EU868 - elif [[ "$lora_id" = "$lora_mtac_g64_id915" ]]; then - GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_64ch_US915 - else - return 1 - fi - - opt_conf_file=$opt_conf_dir/global_conf.json - - cp $GLOBAL_CONF $opt_conf_file - - if ! [ -f $conf_file ]; then - mkdir -p /var/config/lora/ - cp $opt_conf_file $conf_file - fi - - ln -sf /opt/lora/pkt_forwarder $pkt_fwd - - if [ -f $gps_path ]; then - pkt_fwd_options=" -g" - fi -} - -do_start() { - - mkdir -p $run_dir/1 - rm -rf $run_dir/1/* - - read_lora_hw_info - - if hardware_found; then - echo "Found $lora_id with $lora_hw hardware. Configuring" - else - echo "$0: LORA card not detected" - exit 1 - fi - - if ! [ -f $conf_file ]; then - echo "$0: $conf_file missing" - exit 1 - fi - - # - # copy conf files to the run directory - # - cp $conf_file $run_dir/1/ - if [ -f $conf_file_local ]; then - cp $conf_file_local $run_dir/1/ - sed -i.bak "s/\(.*gateway_ID\"\s*\:\s*\"\)<.*>[^\"]*\(.*\)/\1${lora_eui_raw}\2/g" /var/run/lora/1/local_conf.json - fi - - sed -i.bak "s/\(.*gateway_ID\"\s*\:\s*\"\)<.*>[^\"]*\(.*\)/\1${lora_eui_raw}\2/g" /var/run/lora/1/global_conf.json - - # - # start packet forwarder - # - echo -n "Starting $NAME: " - - /usr/sbin/start-stop-daemon --chdir $run_dir/1 --background --start --make-pidfile \ - --pidfile $pkt_fwd_pidfile --startas /bin/bash -- -c "exec $pkt_fwd $pkt_fwd_options" - - renice -n -20 -p $(pgrep $(basename $pkt_fwd)) - - echo "OK" -} - - -do_stop() { - echo -n "Stopping $NAME: " - start-stop-daemon --stop --quiet --oknodo --pidfile $pkt_fwd_pidfile --retry 5 - rm -f $pkt_fwd_pidfile - echo "OK" -} - - -if [ "$ENABLED" != "yes" ]; then - echo "$NAME: disabled in /etc/default" - exit -fi - - -case "$1" in - "start") - do_start - ;; - "stop") - do_stop - ;; - "restart") - ## Stop the service and regardless of whether it was - ## running or not, start it again. - do_stop - do_start - ;; - *) - ## If no parameters are given, print which are avaiable. - echo "Usage: $0 {start|stop|restart}" - exit 1 - ;; -esac - diff --git a/recipes-connectivity/lora/lora-packet-forwarder/mtcap/lora-packet-forwarder.default b/recipes-connectivity/lora/lora-packet-forwarder/mtcap/lora-packet-forwarder.default deleted file mode 100644 index be7dcd5..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/mtcap/lora-packet-forwarder.default +++ /dev/null @@ -1,2 +0,0 @@ -# set to "yes" or "no" to control starting on boot -ENABLED="yes" diff --git a/recipes-connectivity/lora/lora-packet-forwarder/mtcdt-2.1/lora-packet-forwarder.default b/recipes-connectivity/lora/lora-packet-forwarder/mtcdt-2.1/lora-packet-forwarder.default deleted file mode 100644 index 0f92640..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/mtcdt-2.1/lora-packet-forwarder.default +++ /dev/null @@ -1,2 +0,0 @@ -# set to "yes" or "no" to control starting on boot -ENABLED="no" diff --git a/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.default b/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.default deleted file mode 100644 index 0f92640..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.default +++ /dev/null @@ -1,2 +0,0 @@ -# set to "yes" or "no" to control starting on boot -ENABLED="no" diff --git a/recipes-connectivity/lora/lora-packet-forwarder_4.0.1.bb b/recipes-connectivity/lora/lora-packet-forwarder_4.0.1.bb deleted file mode 100644 index 7ff7050..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder_4.0.1.bb +++ /dev/null @@ -1,126 +0,0 @@ -DESCRIPTION = "LoRa Packet Forwarder" -HOMEPAGE = "https://github.com/Lora-net/packet_forwarder" -PRIORITY = "optional" -SECTION = "console/utils" -# Semtech license is a modified BSD-style license -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://LICENSE;md5=22af7693d7b76ef0fc76161c4be76c45" -DEPENDS = "lora-gateway logrotate lora-logging gpsd" -RDEPENDS_${PN} += "bash" - -PR = "r23" -SRCREV = "28b9dff2eb06fb88421cf32771d380a178079fce" - - -SRC_URI = "git://git@gitlab.multitech.net/lora_enterprise/packet_forwarder_mtac_full.git;protocol=ssh;branch=master \ - file://README.md \ - file://lora-packet-forwarder.init \ - file://lora-packet-forwarder.default \ - file://global_conf.json.3.0.0.PCB_E336.EU868.basic.clksrc0 \ - file://global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 \ - file://global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0 \ - file://global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 \ - file://global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0 \ - file://global_conf.json.3.0.0.MTAC_LORA_1_5.AS923.basic.clksrc0 \ - file://global_conf.json.3.0.0.MTAC_LORA_1_5.AS923-LBT.basic.clksrc0 \ - file://global_conf.json.3.0.0.MTAC_LORA_1_5.KR920-LBT.basic.clksrc0 \ - file://global_conf.json.3.0.0.MTAC_LORA_1_5.IN865.basic.clksrc0 \ - file://global_conf.json.3.0.0.MTAC_LORA_1_5.AU915.basic.clksrc0 \ - file://global_conf.json.3.0.0.MTAC_LORA_1_5.RU864.basic.clksrc0 \ - file://global_conf.json.3.1.0.MTCAP-LORA-1-5.EU868.basic \ - file://global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic \ - file://global_conf.json.3.1.0.MTCAP-LORA-1-5.AU915.basic \ - file://global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923.basic \ - file://global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923-LBT.basic \ - file://global_conf.json.3.1.0.MTCAP-LORA-1-5.IN865.basic \ - file://global_conf.json.3.1.0.MTCAP-LORA-1-5.KR920-LBT.basic \ - file://global_conf.json.3.1.0.MTCAP-LORA-1-5.RU864.basic \ - file://global_conf.json.MTCAP2-LORA-1.5.AS923 \ - file://global_conf.json.MTCAP2-LORA-1.5.AS923-LBT \ - file://global_conf.json.MTCAP2-LORA-1.5.AU915 \ - file://global_conf.json.MTCAP2-LORA-1.5.EU868 \ - file://global_conf.json.MTCAP2-LORA-1.5.IN865 \ - 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://local_conf.json \ -" - - -S = "${WORKDIR}/git" -B = "${S}" -TARGET_CC_ARCH += "${LDFLAGS}" - - -LORA_DIR = "/opt/lora" - -export LGW_PATH = "${STAGING_LIBDIR}/lora" -export LGW_INC = "${STAGING_INCDIR}/lora" - -CFLAGS += "-I${LGW_INC} -Iinc -I. -std=gnu11" - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}${LORA_DIR} - install -m 755 lora_pkt_fwd/lora_pkt_fwd ${D}${LORA_DIR}/ - install -m 755 ${WORKDIR}/local_conf.json ${D}${LORA_DIR}/ - - install -d ${D}${LORA_DIR}/forwarder-utils - install -m 755 util_sink/util_sink ${D}${LORA_DIR}/forwarder-utils/ - install -m 755 util_ack/util_ack ${D}${LORA_DIR}/forwarder-utils/ - install -m 755 util_tx_test/util_tx_test ${D}${LORA_DIR}/forwarder-utils/ - install -m 755 ${WORKDIR}/README.md ${D}${LORA_DIR}/ - - install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/lora-packet-forwarder.default ${D}${sysconfdir}/default/lora-packet-forwarder - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/lora-packet-forwarder.init ${D}${sysconfdir}/init.d/lora-packet-forwarder -} - -do_install_append_mtcdt() { - install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json - install -m 755 ${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 755 ${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 755 ${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 755 ${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 755 ${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 755 ${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 755 ${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 755 ${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 755 ${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 755 ${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 755 ${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 755 ${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_mtcap() { - install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTCAP-LORA-1-5.EU868.basic ${D}${LORA_DIR}/global_conf.json.MTCAP_LORA_1_5.EU868 - install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTCAP-LORA-1-5.RU864.basic ${D}${LORA_DIR}/global_conf.json.MTCAP_LORA_1_5.RU864 - install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic ${D}${LORA_DIR}/global_conf.json.MTCAP_LORA_1_5.US915 - install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTCAP-LORA-1-5.AU915.basic ${D}${LORA_DIR}/global_conf.json.MTCAP_LORA_1_5.AU915 - install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923.basic ${D}${LORA_DIR}/global_conf.json.MTCAP_LORA_1_5.AS923 - install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923-LBT.basic ${D}${LORA_DIR}/global_conf.json.MTCAP_LORA_1_5.AS923-LBT - install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTCAP-LORA-1-5.KR920-LBT.basic ${D}${LORA_DIR}/global_conf.json.MTCAP_LORA_1_5.KR920-LBT - install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTCAP-LORA-1-5.IN865.basic ${D}${LORA_DIR}/global_conf.json.MTCAP_LORA_1_5.IN865 - - install -m 755 ${WORKDIR}/global_conf.json.MTCAP2-LORA-1.5.EU868 ${D}${LORA_DIR}/global_conf.json.MTCAP2_LORA_1_5.EU868 - install -m 755 ${WORKDIR}/global_conf.json.MTCAP2-LORA-1.5.RU864 ${D}${LORA_DIR}/global_conf.json.MTCAP2_LORA_1_5.RU864 - install -m 755 ${WORKDIR}/global_conf.json.MTCAP2-LORA-1.5.US915 ${D}${LORA_DIR}/global_conf.json.MTCAP2_LORA_1_5.US915 - install -m 755 ${WORKDIR}/global_conf.json.MTCAP2-LORA-1.5.AU915 ${D}${LORA_DIR}/global_conf.json.MTCAP2_LORA_1_5.AU915 - install -m 755 ${WORKDIR}/global_conf.json.MTCAP2-LORA-1.5.AS923 ${D}${LORA_DIR}/global_conf.json.MTCAP2_LORA_1_5.AS923 - install -m 755 ${WORKDIR}/global_conf.json.MTCAP2-LORA-1.5.AS923-LBT ${D}${LORA_DIR}/global_conf.json.MTCAP2_LORA_1_5.AS923-LBT - install -m 755 ${WORKDIR}/global_conf.json.MTCAP2-LORA-1.5.KR920-LBT ${D}${LORA_DIR}/global_conf.json.MTCAP2_LORA_1_5.KR920-LBT - install -m 755 ${WORKDIR}/global_conf.json.MTCAP2-LORA-1.5.IN865 ${D}${LORA_DIR}/global_conf.json.MTCAP2_LORA_1_5.IN865 -} - - -FILES_${PN} += "${LORA_DIR}" -FILES_${PN}-dbg += "${LORA_DIR}/.debug ${LORA_DIR}/forwarder-utils/.debug" - -# disable this on purpose for dev purposes -do_rm_work() { - echo "skipping" -} diff --git a/recipes-connectivity/lora/lora-query/Makefile b/recipes-connectivity/lora/lora-query/Makefile deleted file mode 100644 index 2079a0d..0000000 --- a/recipes-connectivity/lora/lora-query/Makefile +++ /dev/null @@ -1,75 +0,0 @@ - -includedir ?= /usr/include -libdir ?= /usr/lib - -CFLAGS += - -LIBS := -lmts -ljsoncpp -lpthread - -OBJS += \ -Version.o \ -main.o - -CPP_DEPS += \ -Version.d \ -main.d - - -all: postbuild - -prebuild: - @echo PRE-BUILD - @echo 'Removing previous version components started' - -$(RM) Version.o - -$(RM) Version.d - -$(RM) Version.cpp - @echo 'Removing previous version components complete' - @echo ' ' - -postbuild: mainbuild - @echo POST-BUILD - @echo ' ' - -mainbuild: prebuild - @echo MAIN-BUILD - @$(MAKE) --no-print-directory target - -target: $(OBJS) - @echo 'Building target: $@' - $(CXX) $(CFLAGS) $(LDFLAGS) -o lora-query $(OBJS) $(LIBS) - @echo 'Finished building target: $@' - @echo ' ' - -Version.o: Version.cpp - @echo 'Building file: $<' - $(CXX) $(CFLAGS) -Iinclude -Wall -c -std=c++0x -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" - @echo 'Finished building: $<' - @echo ' ' - -Version.cpp: - @echo 'Creating file: Version.cpp' - /bin/echo -e "//Pre-Build Auto-Generated Source\n#include \"Version.h\"\n\nconst std::string Version::version(\"$(shell git describe)\");" > Version.cpp - @echo 'Finished creating: Version.cpp' - @echo ' ' - -main.o: main.cpp - @echo 'Building file: $<' - $(CXX) $(CFLAGS) -I=$(includedir)/jsoncpp -Wall -c -std=c++0x -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" - @echo 'Finished building: $<' - @echo ' ' - -install: - install -d $(DESTDIR)/usr/bin - install -m 0755 lora-query $(DESTDIR)/usr/bin - -strip: - $(STRIP) lora-query - -clean: - -$(RM) $(OBJS) $(CPP_DEPS) lora-query - -@echo ' ' - -.PHONY: all clean dependents install strip target -.SECONDARY: - - diff --git a/recipes-connectivity/lora/lora-query_1.0.4.bb b/recipes-connectivity/lora/lora-query_1.0.4.bb deleted file mode 100644 index 60bcc42..0000000 --- a/recipes-connectivity/lora/lora-query_1.0.4.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "LoRa network server query tool" -HOMEPAGE = "http://www.multitech.net/" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "jsoncpp libmts" -RDEPENDS_${PN} += "jsoncpp" -PR = "r2" - -SRCREV = "${PV}" - -SRC_URI = "git://git.multitech.net/lora-query;branch=master" - -S = "${WORKDIR}/git" - -do_compile() { - oe_runmake -} - -do_install() { - oe_runmake install DESTDIR=${D} -} - |