Merge branch 'master' of gitlab.multitech.net:mirrors/meta-mlinux

3 files changed, 240 insertions, 6 deletions

diff --git a/recipes-connectivity/lora/lora-gateway_4.0.1.bb b/recipes-connectivity/lora/lora-gateway_4.0.1.bb
index 5e269e1..6204e33 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 = "r8"
+PR = "r9"
 SRCREV = "v${PV}"
 
 SRC_URI = "git://github.com/Lora-net/lora_gateway.git;protocol=git \
@@ -42,7 +42,6 @@ do_install() {
 	install -m 0644 libloragw/readme.md ${D}${libdir}/lora/lora-gw-readme.md
 
 	install -d ${D}/opt/lora/
-	install -m 0755 ${WORKDIR}/ln-lora-spi-dev.sh ${D}/opt/lora/
 
 	install -d ${D}/opt/lora/gateway-utils
 	install -m 0755 libloragw/test_* ${D}/opt/lora/gateway-utils/
@@ -54,6 +53,10 @@ do_install() {
 	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"
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic
new file mode 100644
index 0000000..49c0edd
--- /dev/null
+++ b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic
@@ -0,0 +1,225 @@
+{

+    "SX1301_conf": {

+        "lorawan_public": true,

+        "clksrc": 0, /* radio_0 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": 9,

+            "rf_power": -6,

+            "dig_gain": 1

+        },

+        "tx_lut_1": {

+            /* TX gain table, index 1 */

+            "pa_gain": 0,

+            "mix_gain": 12,

+            "rf_power": -3,

+            "dig_gain": 1

+        },

+        "tx_lut_2": {

+            /* TX gain table, index 2 */

+            "pa_gain": 1,

+            "mix_gain": 8,

+            "rf_power": 0,

+            "dig_gain": 2

+        },

+        "tx_lut_3": {

+            /* TX gain table, index 3 */

+            "pa_gain": 1,

+            "mix_gain": 11,

+            "rf_power": 3,

+            "dig_gain": 3

+        },

+        "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": 2,

+            "mix_gain": 11,

+            "rf_power": 10,

+            "dig_gain": 3

+        },

+        "tx_lut_6": {

+            /* TX gain table, index 6 */

+            "pa_gain": 2,

+            "mix_gain": 9,

+            "rf_power": 11,

+            "dig_gain": 1

+        },

+        "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": 2,

+            "mix_gain": 11,

+            "rf_power": 13,

+            "dig_gain": 2

+        },

+        "tx_lut_9": {

+            /* TX gain table, index 9 */

+            "pa_gain": 2,

+            "mix_gain": 11,

+            "rf_power": 14,

+            "dig_gain": 1

+        },

+        "tx_lut_10": {

+            /* TX gain table, index 10 */

+            "pa_gain": 2,

+            "mix_gain": 12,

+            "rf_power": 16,

+            "dig_gain": 0

+        },

+        "tx_lut_11": {

+            /* TX gain table, index 11 */

+            "pa_gain": 3,

+            "mix_gain": 10,

+            "rf_power": 20,

+            "dig_gain": 3

+        },

+        "tx_lut_12": {

+            /* TX gain table, index 12 */

+            "pa_gain": 3,

+            "mix_gain": 9,

+            "rf_power": 23,

+            "dig_gain": 0

+        },

+        "tx_lut_13": {

+            /* TX gain table, index 13 */

+            "pa_gain": 3,

+            "mix_gain": 12,

+            "rf_power": 25,

+            "dig_gain": 2

+        },

+        "tx_lut_14": {

+            /* TX gain table, index 14 */

+            "pa_gain": 3,

+            "mix_gain": 13,

+            "rf_power": 26,

+            "dig_gain": 0

+        },

+        "tx_lut_15": {

+            /* TX gain table, index 15 */

+            "pa_gain": 3,

+            "mix_gain": 15,

+            "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_3.0.0.bb b/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb
index 07ba4a8..834ff6c 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb
+++ b/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb
@@ -6,7 +6,7 @@ SECTION = "console/utils"
 LICENSE = "SEMTECH"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=22af7693d7b76ef0fc76161c4be76c45"
 DEPENDS = "lora-gateway"
-PR = "r5"
+PR = "r7"
 
 SRCREV = "v${PV}"
 
@@ -17,6 +17,7 @@ SRC_URI = "git://github.com/Lora-net/packet_forwarder.git;protocol=git \
            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_5.EU868.basic.clksrc0 \
+           file://global_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic \
            file://local_conf.json \
            file://lora-packet-forwarder-add-spi-dev-path.patch \
 "
@@ -37,9 +38,6 @@ do_compile() {
 do_install() {
 	install -d ${D}${LORA_DIR}
 	install -m 755 lora_pkt_fwd/lora_pkt_fwd ${D}${LORA_DIR}/
-	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}/local_conf.json ${D}${LORA_DIR}/
 
     install -d ${D}${LORA_DIR}/forwarder-utils
@@ -49,7 +47,15 @@ do_install() {
 	install -m 755 ${WORKDIR}/README.md  ${D}${LORA_DIR}/
 }
 
+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
+}
+
 do_install_append_mtcap() {
+	install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic ${D}${LORA_DIR}/global_conf.json
+
     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