lora: update network server to 2.0.14, sync packet forwarder recipe with 3 branch

4 files changed, 204 insertions, 9 deletions

diff --git a/recipes-connectivity/lora/lora-network-server-mtcap_1.0.16.bb b/recipes-connectivity/lora/lora-network-server-mtcap_2.0.14.bb
index d23d823..9a6eda7 100644
--- a/recipes-connectivity/lora/lora-network-server-mtcap_1.0.16.bb
+++ b/recipes-connectivity/lora/lora-network-server-mtcap_2.0.14.bb
@@ -5,8 +5,8 @@ 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"
+DEPENDS = "jsoncpp libmts mosquitto sqlite3 curl gnutls"
+RDEPENDS_${PN} += "lora-packet-forwarder logrotate bash"
 PR = "r3"
 
 SRC_URI = "http://multitech.net/downloads/lora-network-server_${TUNE_PKGARCH}_${PV}.tar.gz \
@@ -17,8 +17,8 @@ SRC_URI = "http://multitech.net/downloads/lora-network-server_${TUNE_PKGARCH}_${
            file://local_conf.json \
           "
 
-SRC_URI[md5sum] = "3169970ea9b96656847d7472a2cf1f0f"
-SRC_URI[sha256sum] = "81b3c348911464fccbb70e3ff0c60dbcf77af69c2205aec3591fc2ceff7a5c52"
+SRC_URI[md5sum] = "17894d4d40374bf68052bcce38d1310c"
+SRC_URI[sha256sum] = "4baae18fdaef48278a004abfb16b5e0a20d9990c252d0bb9d8a592ffca9ff6d7"
 
 # binaries are already stripped, so suppress warning
 INSANE_SKIP_${PN} = "already-stripped"
diff --git a/recipes-connectivity/lora/lora-network-server_2.0.9.bb b/recipes-connectivity/lora/lora-network-server_2.0.14.bb
index ca2eea8..90acbb8 100644
--- a/recipes-connectivity/lora/lora-network-server_2.0.9.bb
+++ b/recipes-connectivity/lora/lora-network-server_2.0.14.bb
@@ -14,8 +14,8 @@ SRC_URI = "http://multitech.net/downloads/lora-network-server_${TUNE_PKGARCH}_${
            file://lora-network-server.logrotate.conf \
           "
 
-SRC_URI[md5sum] = "1ff17152fec87a38d21edf6f0a037deb"
-SRC_URI[sha256sum] = "ba21d1afab6882341abf245d899631a6ba752fbd055a731f9cc195796b2f4e48"
+SRC_URI[md5sum] = "17894d4d40374bf68052bcce38d1310c"
+SRC_URI[sha256sum] = "4baae18fdaef48278a004abfb16b5e0a20d9990c252d0bb9d8a592ffca9ff6d7"
 
 # binaries are already stripped, so suppress warning
 INSANE_SKIP_${PN} = "already-stripped"
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
new file mode 100644
index 0000000..0046e6f
--- /dev/null
+++ b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0
@@ -0,0 +1,195 @@
+{
+	"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": "AA555A0000000000",
+		"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_3.1.0.bb b/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
index 21849bf..37fe694 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
+++ b/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
@@ -16,7 +16,7 @@ SRC_URI = "git://github.com/Lora-net/packet_forwarder.git;protocol=git \
            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.1.0.MTAC_LORA_1_0.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 \
@@ -71,9 +71,9 @@ do_install() {
 
 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.1.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_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.1.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_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_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