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

3 files changed, 11 insertions, 46 deletions

diff --git a/recipes-connectivity/lora/lora-network-server_1.0.18.bb b/recipes-connectivity/lora/lora-network-server_1.0.21.bb
index 1a7aab6..5091b9d 100644
--- a/recipes-connectivity/lora/lora-network-server_1.0.18.bb
+++ b/recipes-connectivity/lora/lora-network-server_1.0.21.bb
@@ -13,8 +13,8 @@ SRC_URI = "http://multitech.net/downloads/lora-network-server_${TUNE_PKGARCH}_${
            file://lora-network-server.logrotate.conf \
           "
 
-SRC_URI[md5sum] = "9e83c88149fc9b9c969034edcc6371f8"
-SRC_URI[sha256sum] = "1e94620eed249c0c431987ac64850e329f7506ddd2d3c2ff6de0a554cb76ed52"
+SRC_URI[md5sum] = "5d8e6f207fa95c53844c8992a999a014"
+SRC_URI[sha256sum] = "af454f942c8b441580b014087d4c707affc5016451a12ff493e63b4530ad10d9"
 
 # 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.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
index 8f8d93d..e29b1f1 100644
--- 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
@@ -1,17 +1,17 @@
 {
     "SX1301_conf": {
         "lorawan_public": true,
-        "clksrc": 0, /* radio_0 provides clock to concentrator */
+        "clksrc": 0,
         "lbt_cfg": {
             "enable": false,
-            "rssi_target": 160, /* rssi in dBm = -lbt_rssi_target/2 */
+            "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": 1.4, /* antenna gain, in dBi */
+        "antenna_gain": 1.4,
         "radio_0": {
             "enable": true,
             "type": "SX1257",
@@ -29,55 +29,46 @@
             "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,
@@ -85,7 +76,6 @@
             "spread_factor": 7
         },
         "chan_FSK": {
-            /* FSK 50kbps channel, 868.8 MHz */
             "enable": true,
             "radio": 1,
             "if": 300000,
@@ -93,130 +83,110 @@
             "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 */
+        "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
         "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 ada0493..e9ff489 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb
+++ b/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb
@@ -47,26 +47,21 @@ do_install() {
   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 -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_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
-  install -m 0755 ${WORKDIR}/lora-packet-forwarder.init ${D}${sysconfdir}/init.d/lora-packet-forwarder
 }
 
 FILES_${PN} += "${LORA_DIR}"