Merge branch '3' of ssh://gitlab.multitech.net/mirrors/meta-mlinux into 33.3.14

5 files changed, 28 insertions, 28 deletions

diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf
index 5e30697..b6091ec 100644
--- a/conf/distro/mlinux.conf
+++ b/conf/distro/mlinux.conf
@@ -1,7 +1,7 @@
 DISTRO = "mlinux"
 DISTRO_NAME = "mLinux"
 DISTRO_BASE_VERSION = "3.3"
-DISTRO_VERSION = "${DISTRO_BASE_VERSION}.13"
+DISTRO_VERSION = "${DISTRO_BASE_VERSION}.14"
 DISTRO_CODENAME = ""
 SDK_VENDOR = "-mlinux"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0
index ab3597e..3c58252 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0
+++ b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0
@@ -5,16 +5,16 @@
 		"clksrc": 0,
 		"radio_0": {
 			"enable": true,
-			"freq": 902600000,
+			"freq": 902700000,
 			"rssi_offset": -165,
 			"tx_enable": true,
-			"tx_freq_max": 902000000,
-			"tx_freq_min": 928000000,
+			"tx_freq_max": 928000000,
+			"tx_freq_min": 902000000,
 			"type": "SX1257"
 		},
 		"radio_1": {
 			"enable": true,
-			"freq": 903400000,
+			"freq": 903500000,
 			"rssi_offset": -165,
 			"tx_enable": false,
 			"type": "SX1257"
@@ -26,48 +26,48 @@
 		"chan_Lora_std": {
 			"bandwidth": 500000,
 			"enable": true,
-			"if": 400000,
+			"if": 300000,
 			"radio": 0,
 			"spread_factor": 8
 		},
 		"chan_multiSF_0": {
 			"enable": true,
-			"if": -300000,
+			"if": -400000,
 			"radio": 0
 		},
 		"chan_multiSF_1": {
 			"enable": true,
-			"if": -100000,
+			"if": -200000,
 			"radio": 0
 		},
 		"chan_multiSF_2": {
 			"enable": true,
-			"if": 100000,
+			"if": 0,
 			"radio": 0
 		},
 		"chan_multiSF_3": {
 			"enable": true,
-			"if": 300000,
+			"if": 200000,
 			"radio": 0
 		},
 		"chan_multiSF_4": {
 			"enable": true,
-			"if": -300000,
+			"if": -400000,
 			"radio": 1
 		},
 		"chan_multiSF_5": {
 			"enable": true,
-			"if": -100000,
+			"if": -200000,
 			"radio": 1
 		},
 		"chan_multiSF_6": {
 			"enable": true,
-			"if": 100000,
+			"if": 0,
 			"radio": 1
 		},
 		"chan_multiSF_7": {
 			"enable": true,
-			"if": 300000,
+			"if": 200000,
 			"radio": 1
 		},
 		"lbt_cfg": {
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0
index 4c388a4..02a2a70 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0
+++ b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0
@@ -153,7 +153,7 @@
             "pa_gain": 2,
             "mix_gain": 12,
             "rf_power": 13,
-            "dig_gain": 0
+            "dig_gain": 2 
         },
         "tx_lut_9": {
             /* TX gain table, index 9 */
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0
index 2b3f8d2..29831e8 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0
+++ b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0
@@ -5,7 +5,7 @@
 		"clksrc": 0,
 		"radio_0": {
 			"enable": true,
-			"freq": 902600000,
+			"freq": 902700000,
 			"rssi_offset": -165,
 			"tx_enable": true,
 			"tx_freq_max": 902000000,
@@ -14,7 +14,7 @@
 		},
 		"radio_1": {
 			"enable": true,
-			"freq": 903400000,
+			"freq": 903500000,
 			"rssi_offset": -165,
 			"tx_enable": false,
 			"type": "SX1257"
@@ -26,48 +26,48 @@
 		"chan_Lora_std": {
 			"bandwidth": 500000,
 			"enable": true,
-			"if": 400000,
+			"if": 300000,
 			"radio": 0,
 			"spread_factor": 8
 		},
 		"chan_multiSF_0": {
 			"enable": true,
-			"if": -300000,
+			"if": -400000,
 			"radio": 0
 		},
 		"chan_multiSF_1": {
 			"enable": true,
-			"if": -100000,
+			"if": -200000,
 			"radio": 0
 		},
 		"chan_multiSF_2": {
 			"enable": true,
-			"if": 100000,
+			"if": 0,
 			"radio": 0
 		},
 		"chan_multiSF_3": {
 			"enable": true,
-			"if": 300000,
+			"if": 200000,
 			"radio": 0
 		},
 		"chan_multiSF_4": {
 			"enable": true,
-			"if": -300000,
+			"if": -400000,
 			"radio": 1
 		},
 		"chan_multiSF_5": {
 			"enable": true,
-			"if": -100000,
+			"if": -200000,
 			"radio": 1
 		},
 		"chan_multiSF_6": {
 			"enable": true,
-			"if": 100000,
+			"if": 0,
 			"radio": 1
 		},
 		"chan_multiSF_7": {
 			"enable": true,
-			"if": 300000,
+			"if": 200000,
 			"radio": 1
 		},
 		"lbt_cfg": {
@@ -128,7 +128,7 @@
 			"rf_power": 12
 		},
 		"tx_lut_8": {
-			"dig_gain": 0,
+			"dig_gain": 2,
 			"mix_gain": 12,
 			"pa_gain": 2,
 			"rf_power": 13
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 ceda0b5..eefd0e5 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
+++ b/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
@@ -7,7 +7,7 @@ LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=22af7693d7b76ef0fc76161c4be76c45"
 DEPENDS = "lora-gateway"
 RDEPENDS_${PN} += "bash"
-PR = "r9"
+PR = "r10"
 
 SRCREV = "v${PV}"