From 2ea1a64b0043e425e9048c4ec405271b1c12d5bb Mon Sep 17 00:00:00 2001 From: Brandon Bayer Date: Thu, 27 Oct 2016 17:21:24 -0500 Subject: feat: add lora utils: util_tx_continuous & util_lbt_test --- recipes-connectivity/lora/lora-gateway_4.0.1.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'recipes-connectivity') diff --git a/recipes-connectivity/lora/lora-gateway_4.0.1.bb b/recipes-connectivity/lora/lora-gateway_4.0.1.bb index b2c52cf..25f0f03 100644 --- a/recipes-connectivity/lora/lora-gateway_4.0.1.bb +++ b/recipes-connectivity/lora/lora-gateway_4.0.1.bb @@ -45,6 +45,8 @@ do_install() { 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/ } PACKAGES += "${PN}-utils ${PN}-utils-dbg" -- cgit v1.2.3 From 05db091dfcd1499a24087752806f994b3ba6b3c3 Mon Sep 17 00:00:00 2001 From: Brandon Bayer Date: Fri, 28 Oct 2016 09:31:40 -0500 Subject: bump lora-gateway recipe revision --- recipes-connectivity/lora/lora-gateway_4.0.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-connectivity') diff --git a/recipes-connectivity/lora/lora-gateway_4.0.1.bb b/recipes-connectivity/lora/lora-gateway_4.0.1.bb index 25f0f03..9f1fa07 100644 --- a/recipes-connectivity/lora/lora-gateway_4.0.1.bb +++ b/recipes-connectivity/lora/lora-gateway_4.0.1.bb @@ -6,7 +6,7 @@ SECTION = "console/utils" LICENSE = "SEMTECH" LIC_FILES_CHKSUM = "file://LICENSE;md5=a2bdef95625509f821ba00460e3ae0eb" DEPENDS = "" -PR = "r4" +PR = "r5" SRCREV = "v${PV}" SRC_URI = "git://github.com/Lora-net/lora_gateway.git;protocol=git \ -- cgit v1.2.3 From 8bfdc8e9ed02f5c11ce9f98aeb0b24ca44431ac5 Mon Sep 17 00:00:00 2001 From: Brandon Bayer Date: Tue, 1 Nov 2016 10:08:03 -0500 Subject: mtp: set lora antenna gain to 0 --- .../lora/lora-network-server-mtp/lora-network-server.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'recipes-connectivity') diff --git a/recipes-connectivity/lora/lora-network-server-mtp/lora-network-server.conf b/recipes-connectivity/lora/lora-network-server-mtp/lora-network-server.conf index b018478..71c12c1 100644 --- a/recipes-connectivity/lora/lora-network-server-mtp/lora-network-server.conf +++ b/recipes-connectivity/lora/lora-network-server-mtp/lora-network-server.conf @@ -4,8 +4,9 @@ "frequencyBand": "868", /* US="915", EU="868" */ "rx1DatarateOffset": 0, /* Datarate offset for mote rx window 1 sent in join response (0-3) */ "rx2Datarate": 12, /* Datarate for mote rx window 2 sent in join response (7-12) */ - "maxTxPower": 14, /* Max Tx power (dBm), -6 to 26 */ - "frequencyEU": 867500000 /* center freq for extra EU channels (Hz) */ + "maxTxPower": 26, /* Max Tx power (dBm), -6 to 26 */ + "frequencyEU": 867500000, /* center freq for extra EU channels (Hz) */ + "antennaGain": 0 }, "udp": { "appPortUp": 1784, /* port for user-developed application use */ -- cgit v1.2.3 From 2e60f2c0e343f90ea7dc1701091b2aecc84e59ce Mon Sep 17 00:00:00 2001 From: Brandon Bayer Date: Tue, 1 Nov 2016 10:17:46 -0500 Subject: mtp:style: fix lora-network-server.conf whitespace --- .../lora-network-server.conf | 66 +++++++++++----------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'recipes-connectivity') diff --git a/recipes-connectivity/lora/lora-network-server-mtp/lora-network-server.conf b/recipes-connectivity/lora/lora-network-server-mtp/lora-network-server.conf index 71c12c1..448b3db 100644 --- a/recipes-connectivity/lora/lora-network-server-mtp/lora-network-server.conf +++ b/recipes-connectivity/lora/lora-network-server-mtp/lora-network-server.conf @@ -1,36 +1,36 @@ { - "lora": { - "netID": "010203", /* netID for beacon packets */ - "frequencyBand": "868", /* US="915", EU="868" */ - "rx1DatarateOffset": 0, /* Datarate offset for mote rx window 1 sent in join response (0-3) */ - "rx2Datarate": 12, /* Datarate for mote rx window 2 sent in join response (7-12) */ - "maxTxPower": 26, /* Max Tx power (dBm), -6 to 26 */ - "frequencyEU": 867500000, /* center freq for extra EU channels (Hz) */ + "lora": { + "netID": "010203", /* netID for beacon packets */ + "frequencyBand": "868", /* US="915", EU="868" */ + "rx1DatarateOffset": 0, /* Datarate offset for mote rx window 1 sent in join response (0-3) */ + "rx2Datarate": 12, /* Datarate for mote rx window 2 sent in join response (7-12) */ + "maxTxPower": 26, /* Max Tx power (dBm), -6 to 26 */ + "frequencyEU": 867500000, /* center freq for extra EU channels (Hz) */ "antennaGain": 0 - }, - "udp": { - "appPortUp": 1784, /* port for user-developed application use */ - "appPortDown": 1786, /* port for user-developed application use */ - "upstreamPort": 1780, /* ports for LoRa network communication */ - "downstreamPort": 1782 /* ports for LoRa network communication */ - }, - "addressRange": { - "start": "00:00:00:01", /* address range used for mDots */ - "end": "FF:FF:FF:FE" - }, - "network": { - "public": true, /* set to false for private LoRa network with mDots + Conduit */ - "leasetime": 0, /* time until mDot join expires (minutes) or 0 for no expiration */ - "name": "YOUR-NETWORK-NAME", /* configure network security */ - "passphrase": "YOUR-NETWORK-PASSPHRASE" - }, - "log" : { - "console" : true, - "syslog" : false, - "level" : 30, /* error=10, warn=20, info=30, debug=50, trace=60, max=100 */ - "path": "/var/log/lora-network-server.log" - }, - "mqtt": { - "enabled": true - } + }, + "udp": { + "appPortUp": 1784, /* port for user-developed application use */ + "appPortDown": 1786, /* port for user-developed application use */ + "upstreamPort": 1780, /* ports for LoRa network communication */ + "downstreamPort": 1782 /* ports for LoRa network communication */ + }, + "addressRange": { + "start": "00:00:00:01", /* address range used for mDots */ + "end": "FF:FF:FF:FE" + }, + "network": { + "public": true, /* set to false for private LoRa network with mDots + Conduit */ + "leasetime": 0, /* time until mDot join expires (minutes) or 0 for no expiration */ + "name": "YOUR-NETWORK-NAME", /* configure network security */ + "passphrase": "YOUR-NETWORK-PASSPHRASE" + }, + "log" : { + "console" : true, + "syslog" : false, + "level" : 30, /* error=10, warn=20, info=30, debug=50, trace=60, max=100 */ + "path": "/var/log/lora-network-server.log" + }, + "mqtt": { + "enabled": true + } } -- cgit v1.2.3 From 961165c078505e47405a974bd771032557072776 Mon Sep 17 00:00:00 2001 From: Brandon Bayer Date: Tue, 1 Nov 2016 16:05:17 -0500 Subject: mtcap: rename machine type mtp to mtcap --- .../lora/lora-network-server-mtcap/local_conf.json | 7 ++ .../lora-network-server.conf | 36 ++++++++++ .../lora-network-server.default | 2 + .../lora-network-server.init | 80 ++++++++++++++++++++++ .../lora-network-server.logrotate.conf | 7 ++ .../lora/lora-network-server-mtcap_1.0.14.bb | 49 +++++++++++++ .../lora/lora-network-server-mtp/local_conf.json | 7 -- .../lora-network-server.conf | 36 ---------- .../lora-network-server.default | 2 - .../lora-network-server.init | 80 ---------------------- .../lora-network-server.logrotate.conf | 7 -- .../lora/lora-network-server-mtp_1.0.14.bb | 49 ------------- .../lora/lora-packet-forwarder_3.0.0.bb | 2 +- .../usb-gadget-mode/usb-gadget-mode.bb | 6 +- 14 files changed, 185 insertions(+), 185 deletions(-) create mode 100644 recipes-connectivity/lora/lora-network-server-mtcap/local_conf.json create mode 100644 recipes-connectivity/lora/lora-network-server-mtcap/lora-network-server.conf create mode 100644 recipes-connectivity/lora/lora-network-server-mtcap/lora-network-server.default create mode 100755 recipes-connectivity/lora/lora-network-server-mtcap/lora-network-server.init create mode 100644 recipes-connectivity/lora/lora-network-server-mtcap/lora-network-server.logrotate.conf create mode 100644 recipes-connectivity/lora/lora-network-server-mtcap_1.0.14.bb delete mode 100644 recipes-connectivity/lora/lora-network-server-mtp/local_conf.json delete mode 100644 recipes-connectivity/lora/lora-network-server-mtp/lora-network-server.conf delete mode 100644 recipes-connectivity/lora/lora-network-server-mtp/lora-network-server.default delete mode 100755 recipes-connectivity/lora/lora-network-server-mtp/lora-network-server.init delete mode 100644 recipes-connectivity/lora/lora-network-server-mtp/lora-network-server.logrotate.conf delete mode 100644 recipes-connectivity/lora/lora-network-server-mtp_1.0.14.bb (limited to 'recipes-connectivity') diff --git a/recipes-connectivity/lora/lora-network-server-mtcap/local_conf.json b/recipes-connectivity/lora/lora-network-server-mtcap/local_conf.json new file mode 100644 index 0000000..3c2af80 --- /dev/null +++ b/recipes-connectivity/lora/lora-network-server-mtcap/local_conf.json @@ -0,0 +1,7 @@ +{ + "gateway_conf": { + "server_address": "localhost", + "serv_port_up": 1780, + "serv_port_down": 1782 + } +} diff --git a/recipes-connectivity/lora/lora-network-server-mtcap/lora-network-server.conf b/recipes-connectivity/lora/lora-network-server-mtcap/lora-network-server.conf new file mode 100644 index 0000000..448b3db --- /dev/null +++ b/recipes-connectivity/lora/lora-network-server-mtcap/lora-network-server.conf @@ -0,0 +1,36 @@ +{ + "lora": { + "netID": "010203", /* netID for beacon packets */ + "frequencyBand": "868", /* US="915", EU="868" */ + "rx1DatarateOffset": 0, /* Datarate offset for mote rx window 1 sent in join response (0-3) */ + "rx2Datarate": 12, /* Datarate for mote rx window 2 sent in join response (7-12) */ + "maxTxPower": 26, /* Max Tx power (dBm), -6 to 26 */ + "frequencyEU": 867500000, /* center freq for extra EU channels (Hz) */ + "antennaGain": 0 + }, + "udp": { + "appPortUp": 1784, /* port for user-developed application use */ + "appPortDown": 1786, /* port for user-developed application use */ + "upstreamPort": 1780, /* ports for LoRa network communication */ + "downstreamPort": 1782 /* ports for LoRa network communication */ + }, + "addressRange": { + "start": "00:00:00:01", /* address range used for mDots */ + "end": "FF:FF:FF:FE" + }, + "network": { + "public": true, /* set to false for private LoRa network with mDots + Conduit */ + "leasetime": 0, /* time until mDot join expires (minutes) or 0 for no expiration */ + "name": "YOUR-NETWORK-NAME", /* configure network security */ + "passphrase": "YOUR-NETWORK-PASSPHRASE" + }, + "log" : { + "console" : true, + "syslog" : false, + "level" : 30, /* error=10, warn=20, info=30, debug=50, trace=60, max=100 */ + "path": "/var/log/lora-network-server.log" + }, + "mqtt": { + "enabled": true + } +} diff --git a/recipes-connectivity/lora/lora-network-server-mtcap/lora-network-server.default b/recipes-connectivity/lora/lora-network-server-mtcap/lora-network-server.default new file mode 100644 index 0000000..be7dcd5 --- /dev/null +++ b/recipes-connectivity/lora/lora-network-server-mtcap/lora-network-server.default @@ -0,0 +1,2 @@ +# set to "yes" or "no" to control starting on boot +ENABLED="yes" diff --git a/recipes-connectivity/lora/lora-network-server-mtcap/lora-network-server.init b/recipes-connectivity/lora/lora-network-server-mtcap/lora-network-server.init new file mode 100755 index 0000000..86d731b --- /dev/null +++ b/recipes-connectivity/lora/lora-network-server-mtcap/lora-network-server.init @@ -0,0 +1,80 @@ +#!/bin/bash + +NAME="lora-network-server" +ENABLED="yes" + +START_STOP_DAEMON="/usr/sbin/start-stop-daemon" + +[ -f /etc/default/$NAME ] && source /etc/default/$NAME + +run_dir=/var/run/lora +conf_dir=/var/config/lora +conf_file=/opt/lora/lora-network-server.conf +conf_db=$conf_dir/lora-network-server.db + +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=/opt/lora/lora_pkt_fwd +pkt_fwd_pidfile=$run_dir/lora-pkt-fwd-1.pid + +do_start() { + if ! [ -f $conf_file ]; then + echo "$0: $conf_file missing" + exit 1 + fi + + echo -n "Starting $NAME: " + mkdir -p $run_dir/1 + # start network server + $START_STOP_DAEMON --start --background --make-pidfile \ + --pidfile $net_server_pidfile --startas /bin/bash \ + --chdir "/opt/lora" -- -c "exec $net_server \ + -c $conf_file --lora-path $run_dir --db $conf_db \ + --noconsole -l $net_server_log >> $net_server_log 2>&1" + sleep 2 + # start packet forwarder + $START_STOP_DAEMON --start --background --make-pidfile \ + --pidfile $pkt_fwd_pidfile --exec $pkt_fwd --chdir "/opt/lora/" + + 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 15 + $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 + +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-network-server-mtcap/lora-network-server.logrotate.conf b/recipes-connectivity/lora/lora-network-server-mtcap/lora-network-server.logrotate.conf new file mode 100644 index 0000000..d2b6c9a --- /dev/null +++ b/recipes-connectivity/lora/lora-network-server-mtcap/lora-network-server.logrotate.conf @@ -0,0 +1,7 @@ +/var/log/lora-pkt-fwd*.log /var/log/lora-network-server.log { + size 512k + rotate 4 + compress + copytruncate + missingok +} diff --git a/recipes-connectivity/lora/lora-network-server-mtcap_1.0.14.bb b/recipes-connectivity/lora/lora-network-server-mtcap_1.0.14.bb new file mode 100644 index 0000000..8b81b74 --- /dev/null +++ b/recipes-connectivity/lora/lora-network-server-mtcap_1.0.14.bb @@ -0,0 +1,49 @@ +# THIS RECIPE FOR PICOCELL USES PATCHED LORA NETWORK SERVER THAT SUPPORTS +# MTCAP HARDWARE AND V2 PACKET FORWARDER PROTOCOL +DESCRIPTION = "MultiTech LoRa Network Server" +PRIORITY = "optional" +SECTION = "console/utils" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7ffae4666a986c4ccf45e99e464f8402" +DEPENDS = "jsoncpp libmts mosquitto sqlite3" +RDEPENDS_${PN} += "lora-packet-forwarder logrotate" +PR = "r1" + +SRC_URI = "http://multitech.net/downloads/lora-network-server_${TUNE_PKGARCH}_${PV}.tar.gz \ + file://lora-network-server.conf \ + file://lora-network-server.init \ + file://lora-network-server.default \ + file://lora-network-server.logrotate.conf \ + file://local_conf.json \ + " + +SRC_URI[md5sum] = "6cbae4e82503c5b5078b4ffadcda05a0" +SRC_URI[sha256sum] = "707e919b02f1f7d3ef8ed66f26b7e8749f4d0db55288062f1aa4c04e5ceccf34" + +# binaries are already stripped, so suppress warning +INSANE_SKIP_${PN} = "already-stripped" + +S = "${WORKDIR}" + +LORA_DIR = "/opt/lora" + +do_compile() { +} + +do_install() { + install -d ${D}${LORA_DIR} + install -m 0755 lora-network-server ${D}${LORA_DIR}/ + install -m 0644 ${WORKDIR}/lora-network-server.conf ${D}${LORA_DIR}/ + install -m 0755 ${WORKDIR}/local_conf.json ${D}${LORA_DIR}/ + + 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 + install -d ${D}${sysconfdir}/logrotate.d + install -m 0644 ${WORKDIR}/lora-network-server.logrotate.conf ${D}${sysconfdir}/logrotate.d/lora-network-server.conf +} + +CONFFILES_${PN} = "${sysconfdir}/default/lora-network-server" +FILES_${PN} += "${LORA_DIR}" +FILES_${PN}-dbg += "${LORA_DIR}/.debug" diff --git a/recipes-connectivity/lora/lora-network-server-mtp/local_conf.json b/recipes-connectivity/lora/lora-network-server-mtp/local_conf.json deleted file mode 100644 index 3c2af80..0000000 --- a/recipes-connectivity/lora/lora-network-server-mtp/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-network-server-mtp/lora-network-server.conf b/recipes-connectivity/lora/lora-network-server-mtp/lora-network-server.conf deleted file mode 100644 index 448b3db..0000000 --- a/recipes-connectivity/lora/lora-network-server-mtp/lora-network-server.conf +++ /dev/null @@ -1,36 +0,0 @@ -{ - "lora": { - "netID": "010203", /* netID for beacon packets */ - "frequencyBand": "868", /* US="915", EU="868" */ - "rx1DatarateOffset": 0, /* Datarate offset for mote rx window 1 sent in join response (0-3) */ - "rx2Datarate": 12, /* Datarate for mote rx window 2 sent in join response (7-12) */ - "maxTxPower": 26, /* Max Tx power (dBm), -6 to 26 */ - "frequencyEU": 867500000, /* center freq for extra EU channels (Hz) */ - "antennaGain": 0 - }, - "udp": { - "appPortUp": 1784, /* port for user-developed application use */ - "appPortDown": 1786, /* port for user-developed application use */ - "upstreamPort": 1780, /* ports for LoRa network communication */ - "downstreamPort": 1782 /* ports for LoRa network communication */ - }, - "addressRange": { - "start": "00:00:00:01", /* address range used for mDots */ - "end": "FF:FF:FF:FE" - }, - "network": { - "public": true, /* set to false for private LoRa network with mDots + Conduit */ - "leasetime": 0, /* time until mDot join expires (minutes) or 0 for no expiration */ - "name": "YOUR-NETWORK-NAME", /* configure network security */ - "passphrase": "YOUR-NETWORK-PASSPHRASE" - }, - "log" : { - "console" : true, - "syslog" : false, - "level" : 30, /* error=10, warn=20, info=30, debug=50, trace=60, max=100 */ - "path": "/var/log/lora-network-server.log" - }, - "mqtt": { - "enabled": true - } -} diff --git a/recipes-connectivity/lora/lora-network-server-mtp/lora-network-server.default b/recipes-connectivity/lora/lora-network-server-mtp/lora-network-server.default deleted file mode 100644 index be7dcd5..0000000 --- a/recipes-connectivity/lora/lora-network-server-mtp/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-mtp/lora-network-server.init b/recipes-connectivity/lora/lora-network-server-mtp/lora-network-server.init deleted file mode 100755 index 86d731b..0000000 --- a/recipes-connectivity/lora/lora-network-server-mtp/lora-network-server.init +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -NAME="lora-network-server" -ENABLED="yes" - -START_STOP_DAEMON="/usr/sbin/start-stop-daemon" - -[ -f /etc/default/$NAME ] && source /etc/default/$NAME - -run_dir=/var/run/lora -conf_dir=/var/config/lora -conf_file=/opt/lora/lora-network-server.conf -conf_db=$conf_dir/lora-network-server.db - -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=/opt/lora/lora_pkt_fwd -pkt_fwd_pidfile=$run_dir/lora-pkt-fwd-1.pid - -do_start() { - if ! [ -f $conf_file ]; then - echo "$0: $conf_file missing" - exit 1 - fi - - echo -n "Starting $NAME: " - mkdir -p $run_dir/1 - # start network server - $START_STOP_DAEMON --start --background --make-pidfile \ - --pidfile $net_server_pidfile --startas /bin/bash \ - --chdir "/opt/lora" -- -c "exec $net_server \ - -c $conf_file --lora-path $run_dir --db $conf_db \ - --noconsole -l $net_server_log >> $net_server_log 2>&1" - sleep 2 - # start packet forwarder - $START_STOP_DAEMON --start --background --make-pidfile \ - --pidfile $pkt_fwd_pidfile --exec $pkt_fwd --chdir "/opt/lora/" - - 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 15 - $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 - -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-network-server-mtp/lora-network-server.logrotate.conf b/recipes-connectivity/lora/lora-network-server-mtp/lora-network-server.logrotate.conf deleted file mode 100644 index d2b6c9a..0000000 --- a/recipes-connectivity/lora/lora-network-server-mtp/lora-network-server.logrotate.conf +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/lora-pkt-fwd*.log /var/log/lora-network-server.log { - size 512k - rotate 4 - compress - copytruncate - missingok -} diff --git a/recipes-connectivity/lora/lora-network-server-mtp_1.0.14.bb b/recipes-connectivity/lora/lora-network-server-mtp_1.0.14.bb deleted file mode 100644 index 2f5e0bf..0000000 --- a/recipes-connectivity/lora/lora-network-server-mtp_1.0.14.bb +++ /dev/null @@ -1,49 +0,0 @@ -# THIS RECIPE FOR PICOCELL USES PATCHED LORA NETWORK SERVER THAT SUPPORTS -# MTP HARDWARE AND V2 PACKET FORWARDER PROTOCOL -DESCRIPTION = "MultiTech LoRa Network Server" -PRIORITY = "optional" -SECTION = "console/utils" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7ffae4666a986c4ccf45e99e464f8402" -DEPENDS = "jsoncpp libmts mosquitto sqlite3" -RDEPENDS_${PN} += "lora-packet-forwarder logrotate" -PR = "r1" - -SRC_URI = "http://multitech.net/downloads/lora-network-server_${TUNE_PKGARCH}_${PV}.tar.gz \ - file://lora-network-server.conf \ - file://lora-network-server.init \ - file://lora-network-server.default \ - file://lora-network-server.logrotate.conf \ - file://local_conf.json \ - " - -SRC_URI[md5sum] = "6cbae4e82503c5b5078b4ffadcda05a0" -SRC_URI[sha256sum] = "707e919b02f1f7d3ef8ed66f26b7e8749f4d0db55288062f1aa4c04e5ceccf34" - -# binaries are already stripped, so suppress warning -INSANE_SKIP_${PN} = "already-stripped" - -S = "${WORKDIR}" - -LORA_DIR = "/opt/lora" - -do_compile() { -} - -do_install() { - install -d ${D}${LORA_DIR} - install -m 0755 lora-network-server ${D}${LORA_DIR}/ - install -m 0644 ${WORKDIR}/lora-network-server.conf ${D}${LORA_DIR}/ - install -m 0755 ${WORKDIR}/local_conf.json ${D}${LORA_DIR}/ - - 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 - install -d ${D}${sysconfdir}/logrotate.d - install -m 0644 ${WORKDIR}/lora-network-server.logrotate.conf ${D}${sysconfdir}/logrotate.d/lora-network-server.conf -} - -CONFFILES_${PN} = "${sysconfdir}/default/lora-network-server" -FILES_${PN} += "${LORA_DIR}" -FILES_${PN}-dbg += "${LORA_DIR}/.debug" diff --git a/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb b/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb index 8042d50..c5c9f64 100644 --- a/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb +++ b/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb @@ -44,7 +44,7 @@ do_install() { install -m 755 ${WORKDIR}/README.md ${D}${LORA_DIR}/ } -do_install_append_mtp() { +do_install_append_mtcap() { 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 diff --git a/recipes-connectivity/usb-gadget-mode/usb-gadget-mode.bb b/recipes-connectivity/usb-gadget-mode/usb-gadget-mode.bb index 6887089..32f3fdf 100644 --- a/recipes-connectivity/usb-gadget-mode/usb-gadget-mode.bb +++ b/recipes-connectivity/usb-gadget-mode/usb-gadget-mode.bb @@ -1,5 +1,5 @@ # Copyright Matthias Hentges (c) 2007 -# License: MIT (see http://www.opensource.org/licenses/mit-license.php +# License: MIT (see http://www.opensource.org/licenses/mit-license.php # for a copy of the license) # # Filename: usb-gadget-mode.bb @@ -29,8 +29,8 @@ do_install() { install -m 0755 ${WORKDIR}/usb-gadget ${D}${bindir} } -# disbale usb-gadget for mtp hardware -do_install_append_mtp() { +# disbale usb-gadget for mtcap hardware +do_install_append_mtcap() { sed -i 's/ENABLED="yes"/ENABLED="no"/g' ${D}${sysconfdir}/default/usb-gadget } -- cgit v1.2.3 From e3376e7c8bb110735b9fbdf0325f75dcaeaa7b36 Mon Sep 17 00:00:00 2001 From: Brandon Bayer Date: Mon, 7 Nov 2016 17:02:49 -0600 Subject: mtcap:fix: use lora eui in eeprom for global_conf.json --- .../lora/lora-packet-forwarder/lora-packet-forwarder.init | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'recipes-connectivity') diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init index 259243e..8c0894a 100755 --- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init +++ b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init @@ -13,7 +13,13 @@ pkt_fwd_pidfile=$run_dir/lora-pkt-fwd-1.pid log_file=/var/log/lora-pkt-fwd.log do_start() { - echo -n "Starting $NAME: " + echo "Starting $NAME: " + + eui=$(mts-io-sysfs show lora/eui) + # Remove colons + clean_eui="${eui//:/}" + echo "Setting gateway_id in global_conf.json to $clean_eui" + sed -i "s/\"gateway_ID\": \".*\"/\"gateway_ID\": \"$clean_eui\"/" global_conf.json mkdir -p $run_dir -- cgit v1.2.3 From 5964212dc0249408e2cf944f17b489fe814bd52f Mon Sep 17 00:00:00 2001 From: Jason Reiss Date: Fri, 4 Nov 2016 08:29:07 -0500 Subject: lora-gateway: add patch for util_tx_continuous to use clksrc 0 --- .../lora-gateway-change-util-tx-continuous-clksrc.patch | 13 +++++++++++++ recipes-connectivity/lora/lora-gateway_4.0.1.bb | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 recipes-connectivity/lora/lora-gateway/lora-gateway-change-util-tx-continuous-clksrc.patch (limited to 'recipes-connectivity') 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 new file mode 100644 index 0000000..bdc05ad --- /dev/null +++ b/recipes-connectivity/lora/lora-gateway/lora-gateway-change-util-tx-continuous-clksrc.patch @@ -0,0 +1,13 @@ +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_4.0.1.bb b/recipes-connectivity/lora/lora-gateway_4.0.1.bb index 9f1fa07..ce6dd89 100644 --- a/recipes-connectivity/lora/lora-gateway_4.0.1.bb +++ b/recipes-connectivity/lora/lora-gateway_4.0.1.bb @@ -6,13 +6,14 @@ SECTION = "console/utils" LICENSE = "SEMTECH" LIC_FILES_CHKSUM = "file://LICENSE;md5=a2bdef95625509f821ba00460e3ae0eb" DEPENDS = "" -PR = "r5" +PR = "r6" SRCREV = "v${PV}" SRC_URI = "git://github.com/Lora-net/lora_gateway.git;protocol=git \ file://lora-gateway-add-fpga-version-28.patch \ file://library_4.0.cfg \ file://lora-gateway-add-spi-path-function.patch \ + file://lora-gateway-change-util-tx-continuous-clksrc.patch \ " SRC_URI[md5sum] = "9e06a3733a9fea39a3d61f77b412badf" -- cgit v1.2.3 From f11702ca3ca8fc875ee85763710ab178cf7be364 Mon Sep 17 00:00:00 2001 From: Brandon Bayer Date: Wed, 9 Nov 2016 12:04:31 -0600 Subject: mtcap:feat: upgrade lora-network-server --- .../lora/lora-network-server-mtcap_1.0.14.bb | 49 ---------------------- .../lora/lora-network-server-mtcap_1.0.15.bb | 49 ++++++++++++++++++++++ 2 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 recipes-connectivity/lora/lora-network-server-mtcap_1.0.14.bb create mode 100644 recipes-connectivity/lora/lora-network-server-mtcap_1.0.15.bb (limited to 'recipes-connectivity') diff --git a/recipes-connectivity/lora/lora-network-server-mtcap_1.0.14.bb b/recipes-connectivity/lora/lora-network-server-mtcap_1.0.14.bb deleted file mode 100644 index 8b81b74..0000000 --- a/recipes-connectivity/lora/lora-network-server-mtcap_1.0.14.bb +++ /dev/null @@ -1,49 +0,0 @@ -# THIS RECIPE FOR PICOCELL USES PATCHED LORA NETWORK SERVER THAT SUPPORTS -# MTCAP HARDWARE AND V2 PACKET FORWARDER PROTOCOL -DESCRIPTION = "MultiTech LoRa Network Server" -PRIORITY = "optional" -SECTION = "console/utils" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7ffae4666a986c4ccf45e99e464f8402" -DEPENDS = "jsoncpp libmts mosquitto sqlite3" -RDEPENDS_${PN} += "lora-packet-forwarder logrotate" -PR = "r1" - -SRC_URI = "http://multitech.net/downloads/lora-network-server_${TUNE_PKGARCH}_${PV}.tar.gz \ - file://lora-network-server.conf \ - file://lora-network-server.init \ - file://lora-network-server.default \ - file://lora-network-server.logrotate.conf \ - file://local_conf.json \ - " - -SRC_URI[md5sum] = "6cbae4e82503c5b5078b4ffadcda05a0" -SRC_URI[sha256sum] = "707e919b02f1f7d3ef8ed66f26b7e8749f4d0db55288062f1aa4c04e5ceccf34" - -# binaries are already stripped, so suppress warning -INSANE_SKIP_${PN} = "already-stripped" - -S = "${WORKDIR}" - -LORA_DIR = "/opt/lora" - -do_compile() { -} - -do_install() { - install -d ${D}${LORA_DIR} - install -m 0755 lora-network-server ${D}${LORA_DIR}/ - install -m 0644 ${WORKDIR}/lora-network-server.conf ${D}${LORA_DIR}/ - install -m 0755 ${WORKDIR}/local_conf.json ${D}${LORA_DIR}/ - - 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 - install -d ${D}${sysconfdir}/logrotate.d - install -m 0644 ${WORKDIR}/lora-network-server.logrotate.conf ${D}${sysconfdir}/logrotate.d/lora-network-server.conf -} - -CONFFILES_${PN} = "${sysconfdir}/default/lora-network-server" -FILES_${PN} += "${LORA_DIR}" -FILES_${PN}-dbg += "${LORA_DIR}/.debug" diff --git a/recipes-connectivity/lora/lora-network-server-mtcap_1.0.15.bb b/recipes-connectivity/lora/lora-network-server-mtcap_1.0.15.bb new file mode 100644 index 0000000..3eae827 --- /dev/null +++ b/recipes-connectivity/lora/lora-network-server-mtcap_1.0.15.bb @@ -0,0 +1,49 @@ +# THIS RECIPE FOR PICOCELL USES PATCHED LORA NETWORK SERVER THAT SUPPORTS +# MTCAP HARDWARE AND V2 PACKET FORWARDER PROTOCOL +DESCRIPTION = "MultiTech LoRa Network Server" +PRIORITY = "optional" +SECTION = "console/utils" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7ffae4666a986c4ccf45e99e464f8402" +DEPENDS = "jsoncpp libmts mosquitto sqlite3" +RDEPENDS_${PN} += "lora-packet-forwarder logrotate" +PR = "r2" + +SRC_URI = "http://multitech.net/downloads/lora-network-server_arm926ejste_1.0.15-2-g642a748.tar.gz \ + file://lora-network-server.conf \ + file://lora-network-server.init \ + file://lora-network-server.default \ + file://lora-network-server.logrotate.conf \ + file://local_conf.json \ + " + +SRC_URI[md5sum] = "6cbae4e82503c5b5078b4ffadcda05a0" +SRC_URI[sha256sum] = "707e919b02f1f7d3ef8ed66f26b7e8749f4d0db55288062f1aa4c04e5ceccf34" + +# binaries are already stripped, so suppress warning +INSANE_SKIP_${PN} = "already-stripped" + +S = "${WORKDIR}" + +LORA_DIR = "/opt/lora" + +do_compile() { +} + +do_install() { + install -d ${D}${LORA_DIR} + install -m 0755 lora-network-server ${D}${LORA_DIR}/ + install -m 0644 ${WORKDIR}/lora-network-server.conf ${D}${LORA_DIR}/ + install -m 0755 ${WORKDIR}/local_conf.json ${D}${LORA_DIR}/ + + 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 + install -d ${D}${sysconfdir}/logrotate.d + install -m 0644 ${WORKDIR}/lora-network-server.logrotate.conf ${D}${sysconfdir}/logrotate.d/lora-network-server.conf +} + +CONFFILES_${PN} = "${sysconfdir}/default/lora-network-server" +FILES_${PN} += "${LORA_DIR}" +FILES_${PN}-dbg += "${LORA_DIR}/.debug" -- cgit v1.2.3 From ed42d0818b12bc61e37fb274357e1b07c5fb50ce Mon Sep 17 00:00:00 2001 From: Brandon Bayer Date: Wed, 9 Nov 2016 12:07:12 -0600 Subject: mtcap:fix: lora network server checksums --- recipes-connectivity/lora/lora-network-server-mtcap_1.0.15.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes-connectivity') diff --git a/recipes-connectivity/lora/lora-network-server-mtcap_1.0.15.bb b/recipes-connectivity/lora/lora-network-server-mtcap_1.0.15.bb index 3eae827..56fda88 100644 --- a/recipes-connectivity/lora/lora-network-server-mtcap_1.0.15.bb +++ b/recipes-connectivity/lora/lora-network-server-mtcap_1.0.15.bb @@ -17,8 +17,8 @@ SRC_URI = "http://multitech.net/downloads/lora-network-server_arm926ejste_1.0.15 file://local_conf.json \ " -SRC_URI[md5sum] = "6cbae4e82503c5b5078b4ffadcda05a0" -SRC_URI[sha256sum] = "707e919b02f1f7d3ef8ed66f26b7e8749f4d0db55288062f1aa4c04e5ceccf34" +SRC_URI[md5sum] = "28db13a45497d678e071a6062a1cc486" +SRC_URI[sha256sum] = "7558391a635f5c47723d6bd56831d3aa9420169572914b0c8fa6f01aa1730677" # binaries are already stripped, so suppress warning INSANE_SKIP_${PN} = "already-stripped" -- cgit v1.2.3