Merge remote-tracking branch 'origin/6' into mpower-dev-nxp

12 files changed, 138 insertions, 50 deletions

diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf
index bae3c17..7f5c172 100644
--- a/conf/distro/mlinux.conf
+++ b/conf/distro/mlinux.conf
@@ -1,7 +1,7 @@
 DISTRO = "mlinux"
 DISTRO_NAME = "mLinux"
 DISTRO_BASE_VERSION = "6.0"
-DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0"
+DISTRO_VERSION = "${DISTRO_BASE_VERSION}.1"
 DISTRO_CODENAME = ""
 SDK_VENDOR = "-mlinux"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
diff --git a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.EU868 b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.EU868
index 40fb874..593813b 100644
--- a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.EU868
+++ b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.EU868
@@ -116,13 +116,5 @@
         "beacon_bw_hz": 125000,
         "beacon_power": 14,
         "beacon_infodesc": 0
-    },
-
-    "debug_conf": {
-        "ref_payload":[
-            {"id": "0xCAFE1234"},
-            {"id": "0xCAFE2345"}
-        ],
-        "log_file": "loragw_hal.log"
     }
 }
diff --git a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.US915 b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.US915
index ba40dca..3be6a33 100644
--- a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.US915
+++ b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.US915
@@ -103,13 +103,5 @@
         "beacon_bw_hz": 125000,
         "beacon_power": 14,
         "beacon_infodesc": 0
-    },
-
-    "debug_conf": {
-        "ref_payload":[
-            {"id": "0xCAFE1234"},
-            {"id": "0xCAFE2345"}
-        ],
-        "log_file": "loragw_hal.log"
     }
 }
diff --git a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.EU868 b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.EU868
index 57d92e8..3ce12b9 100644
--- a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.EU868
+++ b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.EU868
@@ -116,13 +116,5 @@
         "beacon_bw_hz": 125000,
         "beacon_power": 14,
         "beacon_infodesc": 0
-    },
-
-    "debug_conf": {
-        "ref_payload":[
-            {"id": "0xCAFE1234"},
-            {"id": "0xCAFE2345"}
-        ],
-        "log_file": "loragw_hal.log"
     }
 }
diff --git a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.US915 b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.US915
index df8b854..463c8f0 100644
--- a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.US915
+++ b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.US915
@@ -103,13 +103,5 @@
         "beacon_bw_hz": 125000,
         "beacon_power": 14,
         "beacon_infodesc": 0
-    },
-
-    "debug_conf": {
-        "ref_payload":[
-            {"id": "0xCAFE1234"},
-            {"id": "0xCAFE2345"}
-        ],
-        "log_file": "loragw_hal.log"
     }
 }
diff --git a/recipes-connectivity/lora/lora-gateway-sx1303_2.0.20.bb b/recipes-connectivity/lora/lora-gateway-sx1303_2.0.27.bb
index 312eda4..3193c0b 100644
--- a/recipes-connectivity/lora/lora-gateway-sx1303_2.0.20.bb
+++ b/recipes-connectivity/lora/lora-gateway-sx1303_2.0.27.bb
@@ -5,7 +5,7 @@ SECTION = "console/utils"
 # Semtech license is a modified BSD-style license
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=d2119120bd616e725f4580070bd9ee19"
-DEPENDS = "logrotate"
+DEPENDS = "logrotate gpsd"
 RDEPENDS_${PN} += "bash"
 
 PR = "r6"
@@ -29,7 +29,7 @@ B = "${S}"
 LORA_DIR = "/opt/lora"
 
 
-CFLAGS += "-DNODEBUG -I${S}/packet_forwarder/inc -I${S}/libloragw/inc -I${S}/libtools/inc -I${S}/inc -I. -std=gnu11"
+CFLAGS += "-DNODEBUG -I${S}/packet_forwarder/inc -I${S}/libloragw/inc -I${S}/libtools/inc -I${S}/inc -I. -idirafter ${STAGING_DIR_TARGET}/usr/include/gps -std=gnu11"
 
 do_compile() {
   oe_runmake packet_forwarder LDFLAGS=${LDFLAGS}
diff --git a/recipes-connectivity/lora/lora-gateway_5.0.12.bb b/recipes-connectivity/lora/lora-gateway_5.0.14.bb
index 90f3f51..90f3f51 100644
--- a/recipes-connectivity/lora/lora-gateway_5.0.12.bb
+++ b/recipes-connectivity/lora/lora-gateway_5.0.14.bb
diff --git a/recipes-connectivity/lora/lora-network-server/lora-network-server.init b/recipes-connectivity/lora/lora-network-server/lora-network-server.init
index eb13720..d89c06d 100755
--- a/recipes-connectivity/lora/lora-network-server/lora-network-server.init
+++ b/recipes-connectivity/lora/lora-network-server/lora-network-server.init
@@ -33,6 +33,9 @@ lora_1_5_h_hw="MTAC-LORA-1.5"
 lora_2_1_hw="MTAC-LORA-2.1"
 
 lora_mtac_id="MTAC-LORA"
+lora_mtac_003_id="MTAC-003"
+lora_mtac_003_id868="MTAC-003E00"
+lora_mtac_003_id915="MTAC-003U00"
 
 lora_mtcap_id="MTCAP-LORA"
 lora_mtcap_id868="MTCAP-LORA-868"
@@ -43,6 +46,9 @@ lora_mtcdt3_id="MTCDT3-LORA"
 lora_mtcdt3_id868="MTCDT3-LORA-868"
 lora_mtcdt3_id915="MTCDT3-LORA-915"
 
+lora_mtcap3_id="MTCAP3"
+lora_mtcap3_id868="MTCAP3-003E00"
+lora_mtcap3_id915="MTCAP3-003U00"
 
 lora_mtac_g_id="MTAC-LORA-G"
 lora_mtac_g16_id868="MTAC-LORA-G16-868"
@@ -63,7 +69,14 @@ read_lora_hw_info() {
     # 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
+
+    if [ -d $port1 ] && [[ $(cat $port1/hw-version) =~ "LORA-1.5" ]] && [ -d $port2 ] && [[ $(cat $port2/hw-version) =~ "LORA-1.5" ]]; then
+        dual_cards_installed=true
+    elif [ -d $port1 ] && [[ $(cat $port1/hw-version) =~ "MTAC-003" ]] && [ -d $port2 ] && [[ $(cat $port2/hw-version) =~ "MTAC-003" ]]; then
+        dual_cards_installed=true
+    fi
+
+    if [[ "$dual_cards_installed" = "true" ]] && [ -d $port2 ] && [[ $(cat $port2/hw-version) =~ "LORA-1.5" || $(cat $port2/hw-version) =~ "LORA-2G4" || $(cat $port2/hw-version) =~ "MTAC-003" ]]; 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)
@@ -72,9 +85,6 @@ read_lora_hw_info() {
         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
 }
 
 setup_mtcdt3() {
@@ -94,8 +104,12 @@ hardware_found() {
         setup_mtcdt3
     elif [[ "$lora_id" =~ "$lora_mtac_g_id" ]]; then
         setup_mtcdt_2_1
+    elif [[ "$lora_id" =~ "$lora_mtac_003_id" ]]; then
+        setup_mtcdt003
     elif [[ "$lora_id" =~ "$lora_mtac_id" ]]; then
         setup_mtcdt
+    elif [[ "$lora_id" =~ "$lora_mtcap3_id" ]]; then
+        setup_mtcap3
     elif [[ "$lora_id" =~ "$lora_mtcap_id" ]]; then
         setup_mtcap
     else
@@ -130,6 +144,51 @@ setup_mtcdt_2_1() {
     pkt_fwd_options=" -g"
 }
 
+setup_mtcdt003() {
+    if [[ "$lora_id" =~ "$lora_mtac_003_id868" ]]; then
+        GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_003_0_0.EU868
+    elif [[ "$lora_id" =~ "$lora_mtac_003_id915" ]]; then
+        GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_003_0_0.US915
+    else
+        return 1
+    fi
+
+    ln -sf /opt/lora/lora_pkt_fwd_sx1303 $pkt_fwd
+    ln -sf /opt/lora/lora_pkt_fwd_sx1303 $pkt_fwd_2
+
+    # 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_mtcap3() {
+    if [[ "$lora_id" = "$lora_mtcap3_id868" ]]; then
+        GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP3.EU868
+    elif [[ "$lora_id" = "$lora_mtcap3_id915" ]]; then
+        GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP3.US915
+    else
+        return 1
+    fi
+
+    ln -sf /opt/lora/lora_pkt_fwd_sx1303 $pkt_fwd
+
+    # 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_mtcdt() {
     if [ -d $port1 ] && [[ $(cat $port1/hw-version) = $lora_hw ]]; then
         ln -sf /dev/spidev32766.2 /dev/spidev0.0
@@ -221,7 +280,7 @@ do_start() {
             echo Resetting 2.1 LoRa
             /usr/sbin/mts-util-lora2-reset -g -f >/dev/null 2>&1
             sleep 0.25
-        else
+        elif [[ ! "$lora_id" =~ "$lora_mtcap3_id" ]] && [[ ! "$lora_id" =~ "$lora_mtac_003_id" ]]; then
             mts-io-sysfs store lora/reset 0
             if [ "$dual_cards_installed" == true ]; then
                 mts-io-sysfs store lora-2/reset 0
diff --git a/recipes-connectivity/lora/lora-network-server_2.5.47.bb b/recipes-connectivity/lora/lora-network-server_2.6.2.bb
index 80f44d2..de3b950 100644
--- a/recipes-connectivity/lora/lora-network-server_2.5.47.bb
+++ b/recipes-connectivity/lora/lora-network-server_2.6.2.bb
@@ -13,8 +13,8 @@ SRC_URI = "https://multitech.net/downloads/lora-network-server_${PV}.tar.gz \
            file://lora-network-server.default \
           "
 
-SRC_URI[md5sum] = "b6d9f84be49bb12971a75db13a31404c"
-SRC_URI[sha256sum] = "ec53129b04d8ed5da97c8a710491e038b4e96d1470d8b9d38baf65e37f266784"
+SRC_URI[md5sum] = "279c3c52cd05d2894946c0a458d6a391"
+SRC_URI[sha256sum] = "19a2d07afbc580c7c202a29b68b969951929de8eea099fd9918c1435883bf82a"
 
 # binaries are already stripped, so suppress warning
 INSANE_SKIP_${PN} = "already-stripped"
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 e475204..092e0a5 100755
--- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init
+++ b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init
@@ -41,10 +41,18 @@ mtac_spi_device_2="spidev32765.2"
 
 # spidev32765.2  spidev32766.2
 
+lora_mtac_003_id="MTAC-003"
+lora_mtac_003_id868="MTAC-003E00"
+lora_mtac_003_id915="MTAC-003U00"
+
 lora_mtcap_id="MTCAP-LORA"
 lora_mtcap_id868="MTCAP-LORA-868"
 lora_mtcap_id915="MTCAP-LORA-915"
 
+lora_mtcap3_id="MTCAP3"
+lora_mtcap3_id868="MTCAP3-003E00"
+lora_mtcap3_id915="MTCAP3-003U00"
+
 mtcdt3_id="MTCDT3"
 lora_mtcdt3_id="MTCDT3-LORA"
 lora_mtcdt3_id868="MTCDT3-LORA-868"
@@ -72,7 +80,14 @@ read_lora_hw_info() {
     # 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
+
+    if [ -d $port1 ] && [[ $(cat $port1/hw-version) =~ "LORA-1.5" ]] && [ -d $port2 ] && [[ $(cat $port2/hw-version) =~ "LORA-1.5" ]]; then
+        dual_cards_installed=true
+    elif [ -d $port1 ] && [[ $(cat $port1/hw-version) =~ "MTAC-003" ]] && [ -d $port2 ] && [[ $(cat $port2/hw-version) =~ "MTAC-003" ]]; then
+        dual_cards_installed=true
+    fi
+
+    if [[ "$dual_cards_installed" = "true" ]] && [ -d $port2 ] && [[ $(cat $port2/hw-version) =~ "LORA-1.5" || $(cat $port2/hw-version) =~ "LORA-2G4" || $(cat $port2/hw-version) =~ "MTAC-003" ]]; 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)
@@ -81,9 +96,6 @@ read_lora_hw_info() {
         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() {
@@ -91,10 +103,14 @@ hardware_found() {
         setup_mtcdt3
     elif [[ "$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_003_id" ]]; then
+        setup_mtcdt003
     elif [[ "$lora_id" =~ "$lora_mtac_id" ]]; then
         setup_mtcdt
+    elif [[ "$lora_id" =~ "$lora_mtcap3_id" ]]; then
+        setup_mtcap3
+    elif [[ "$lora_id" =~ "$lora_mtcap_id" ]]; then
+        setup_mtcap
     else
         return 1
     fi
@@ -140,6 +156,51 @@ setup_mtcdt3() {
     fi
 }
 
+setup_mtcdt003() {
+    if [[ "$lora_id" =~ "$lora_mtac_003_id868" ]]; then
+        GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_003_0_0.EU868
+    elif [[ "$lora_id" =~ "$lora_mtac_003_id915" ]]; then
+        GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_003_0_0.US915
+    else
+        return 1
+    fi
+
+    ln -sf /opt/lora/lora_pkt_fwd_sx1303 $pkt_fwd
+    ln -sf /opt/lora/lora_pkt_fwd_sx1303 $pkt_fwd_2
+
+    # 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_mtcap3() {
+    if [[ "$lora_id" = "$lora_mtcap3_id868" ]]; then
+        GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP3.EU868
+    elif [[ "$lora_id" = "$lora_mtcap3_id915" ]]; then
+        GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP3.US915
+    else
+        return 1
+    fi
+
+    ln -sf /opt/lora/lora_pkt_fwd_sx1303 $pkt_fwd
+
+    # 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_mtcdt() {
     if [ -d $port1 ] && [[ $(cat $port1/hw-version) = $lora_hw ]]; then
         ln -sf /dev/spidev32766.2 /dev/spidev0.0
@@ -275,8 +336,8 @@ do_start() {
         elif [[ "$lora_id" =~ "$lora_mtac_g_id" ]]; then
             echo Resetting 2.1 LoRa
             /usr/sbin/mts-util-lora2-reset -g -f >/dev/null 2>&1
-            sleep 0.25 
-        else
+            sleep 0.25
+        elif [[ ! "$lora_id" =~ "$lora_mtcap3_id" ]] && [[ ! "$lora_id" =~ "$lora_mtac_003_id" ]]; then
             mts-io-sysfs store lora/reset 0
             if [ "$dual_cards_installed" == true ]; then
                 mts-io-sysfs store lora-2/reset 0
diff --git a/recipes-connectivity/lora/lora-packet-forwarder_4.0.18.bb b/recipes-connectivity/lora/lora-packet-forwarder_4.0.22.bb
index 3eaa70a..3eaa70a 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder_4.0.18.bb
+++ b/recipes-connectivity/lora/lora-packet-forwarder_4.0.22.bb
diff --git a/recipes-extended/multitech/sms-utils_1.0.6.bb b/recipes-extended/multitech/sms-utils_1.0.7.bb
index f796b24..f796b24 100644
--- a/recipes-extended/multitech/sms-utils_1.0.6.bb
+++ b/recipes-extended/multitech/sms-utils_1.0.7.bb