Merge remote-tracking branch 'origin/6' into mpower-6.3.0

17 files changed, 2380 insertions, 362 deletions

diff --git a/recipes-connectivity/bluez5/bluez5.inc b/recipes-connectivity/bluez5/bluez5.inc
index d178544..63cb92f 100644
--- a/recipes-connectivity/bluez5/bluez5.inc
+++ b/recipes-connectivity/bluez5/bluez5.inc
@@ -57,7 +57,7 @@ OLD_SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
            "
 
 # Use GIT for blueZ source
-SRC_URI = "git://git@gitlab.multitech.net/mlinux/bluez.git;protocol=ssh \
+SRC_URI = "git://git.kernel.org/pub/scm/bluetooth/bluez.git;branch=master;protocol=https \
            file://init \
            file://run-ptest \
            ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \
diff --git a/recipes-connectivity/lora/lora-basic-station-sx1303_2.0.6-11.bb b/recipes-connectivity/lora/lora-basic-station-sx1303_2.0.6-16.bb
index 4e48df3..4e48df3 100644
--- a/recipes-connectivity/lora/lora-basic-station-sx1303_2.0.6-11.bb
+++ b/recipes-connectivity/lora/lora-basic-station-sx1303_2.0.6-16.bb
diff --git a/recipes-connectivity/lora/lora-basic-station_2.0.6-11.bb b/recipes-connectivity/lora/lora-basic-station_2.0.6-16.bb
index 7568330..7568330 100644
--- a/recipes-connectivity/lora/lora-basic-station_2.0.6-11.bb
+++ b/recipes-connectivity/lora/lora-basic-station_2.0.6-16.bb
diff --git a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.AS923 b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.AS923
new file mode 100644
index 0000000..482bb1a
--- /dev/null
+++ b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.AS923
@@ -0,0 +1,261 @@
+{
+	"SX130x_conf" : 
+	{
+		"antenna_gain" : 3,
+		"chan_FSK" : 
+		{
+			"bandwidth" : 125000,
+			"datarate" : 50000,
+			"enable" : true,
+			"freq_deviation" : 25000,
+			"if" : -200000,
+			"radio" : 0
+		},
+		"chan_Lora_std" : 
+		{
+			"bandwidth" : 250000,
+			"enable" : true,
+			"if" : 0,
+			"implicit_coderate" : 1,
+			"implicit_crc_en" : false,
+			"implicit_hdr" : false,
+			"implicit_payload_length" : 17,
+			"radio" : 0,
+			"spread_factor" : 7
+		},
+		"chan_multiSF_0" : 
+		{
+			"enable" : true,
+			"if" : -400000,
+			"radio" : 0
+		},
+		"chan_multiSF_1" : 
+		{
+			"enable" : true,
+			"if" : -200000,
+			"radio" : 0
+		},
+		"chan_multiSF_2" : 
+		{
+			"enable" : true,
+			"if" : 0,
+			"radio" : 0
+		},
+		"chan_multiSF_3" : 
+		{
+			"enable" : true,
+			"if" : -400000,
+			"radio" : 1
+		},
+		"chan_multiSF_4" : 
+		{
+			"enable" : true,
+			"if" : -200000,
+			"radio" : 1
+		},
+		"chan_multiSF_5" : 
+		{
+			"enable" : true,
+			"if" : 0,
+			"radio" : 1
+		},
+		"chan_multiSF_6" : 
+		{
+			"enable" : true,
+			"if" : 200000,
+			"radio" : 1
+		},
+		"chan_multiSF_7" : 
+		{
+			"enable" : true,
+			"if" : 400000,
+			"radio" : 1
+		},
+		"chan_multiSF_All" : 
+		{
+			"spreading_factor_enable" : 
+			[
+				5,
+				6,
+				7,
+				8,
+				9,
+				10,
+				11,
+				12
+			]
+		},
+		"clksrc" : 0,
+		"com_type" : "SPI",
+		"fine_timestamp" : 
+		{
+			"enable" : false,
+			"mode" : "all_sf"
+		},
+		"full_duplex" : false,
+		"lorawan_public" : true,
+		"radio_0" : 
+		{
+			"enable" : true,
+			"freq" : 923600000,
+			"rssi_offset" : -215,
+			"rssi_tcomp" : 
+			{
+				"coeff_a" : 0,
+				"coeff_b" : 0,
+				"coeff_c" : 20.41,
+				"coeff_d" : 2162.5599999999999,
+				"coeff_e" : 0
+			},
+			"tx_enable" : true,
+			"tx_freq_max" : 928000000,
+			"tx_freq_min" : 915000000,
+			"tx_gain_lut" : 
+			[
+				{
+					"pa_gain" : 0,
+					"pwr_idx" : 14,
+					"rf_power" : 11
+				},
+				{
+					"pa_gain" : 0,
+					"pwr_idx" : 15,
+					"rf_power" : 12
+				},
+				{
+					"pa_gain" : 0,
+					"pwr_idx" : 16,
+					"rf_power" : 13
+				},
+				{
+					"pa_gain" : 0,
+					"pwr_idx" : 17,
+					"rf_power" : 15
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 0,
+					"rf_power" : 16
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 1,
+					"rf_power" : 17
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 2,
+					"rf_power" : 18
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 3,
+					"rf_power" : 19
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 4,
+					"rf_power" : 20
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 5,
+					"rf_power" : 21
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 6,
+					"rf_power" : 22
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 7,
+					"rf_power" : 23
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 8,
+					"rf_power" : 24
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 10,
+					"rf_power" : 25
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 12,
+					"rf_power" : 26
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 15,
+					"rf_power" : 27
+				}
+			],
+			"type" : "SX1250"
+		},
+		"radio_1" : 
+		{
+			"enable" : true,
+			"freq" : 922600000,
+			"rssi_offset" : -215,
+			"rssi_tcomp" : 
+			{
+				"coeff_a" : 0,
+				"coeff_b" : 0,
+				"coeff_c" : 20.41,
+				"coeff_d" : 2162.5599999999999,
+				"coeff_e" : 0
+			},
+			"tx_enable" : false,
+			"type" : "SX1250"
+		},
+		"sx1261_conf" : 
+		{
+			"lbt" : 
+			{
+				"channels" : [],
+				"enable" : false,
+				"rssi_target" : -80
+			},
+			"rssi_offset" : 30,
+			"spectral_scan" : 
+			{
+				"enable" : false,
+				"freq_start" : 903900000,
+				"nb_chan" : 8,
+				"nb_scan" : 2000,
+				"pace_s" : 10
+			}
+		}
+	},
+	"gateway_conf" : 
+	{
+		"autoquit_threshold" : 0,
+		"beacon_bw_hz" : 125000,
+		"beacon_datarate" : 9,
+		"beacon_freq_hz" : 869525000,
+		"beacon_infodesc" : 0,
+		"beacon_period" : 0,
+		"beacon_power" : 14,
+		"duty_cycle_enabled" : false,
+		"forward_crc_disabled" : false,
+		"forward_crc_error" : false,
+		"forward_crc_valid" : true,
+		"gateway_ID" : "aa555a0000000000",
+		"gps" : true,
+		"gps_tty_path" : "/dev/gpspipe",
+		"keepalive_interval" : 10,
+		"max_tx_power" : 16,
+		"push_timeout_ms" : 100,
+		"ref_altitude" : 0,
+		"ref_latitude" : 0.0,
+		"ref_longitude" : 0.0,
+		"serv_port_down" : 1782,
+		"serv_port_up" : 1780,
+		"server_address" : "127.0.0.1",
+		"stat_interval" : 30,
+		"synch_word" : 52
+	}
+}
\ No newline at end of file
diff --git a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.AS923-LBT b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.AS923-LBT
new file mode 100644
index 0000000..2659f47
--- /dev/null
+++ b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.AS923-LBT
@@ -0,0 +1,311 @@
+{
+	"SX130x_conf" : 
+	{
+		"antenna_gain" : 3,
+		"chan_FSK" : 
+		{
+			"bandwidth" : 125000,
+			"datarate" : 50000,
+			"enable" : true,
+			"freq_deviation" : 25000,
+			"if" : -200000,
+			"radio" : 0
+		},
+		"chan_Lora_std" : 
+		{
+			"bandwidth" : 250000,
+			"enable" : true,
+			"if" : 0,
+			"implicit_coderate" : 1,
+			"implicit_crc_en" : false,
+			"implicit_hdr" : false,
+			"implicit_payload_length" : 17,
+			"radio" : 0,
+			"spread_factor" : 7
+		},
+		"chan_multiSF_0" : 
+		{
+			"enable" : true,
+			"if" : -400000,
+			"radio" : 0
+		},
+		"chan_multiSF_1" : 
+		{
+			"enable" : true,
+			"if" : -200000,
+			"radio" : 0
+		},
+		"chan_multiSF_2" : 
+		{
+			"enable" : true,
+			"if" : 0,
+			"radio" : 0
+		},
+		"chan_multiSF_3" : 
+		{
+			"enable" : true,
+			"if" : -400000,
+			"radio" : 1
+		},
+		"chan_multiSF_4" : 
+		{
+			"enable" : true,
+			"if" : -200000,
+			"radio" : 1
+		},
+		"chan_multiSF_5" : 
+		{
+			"enable" : true,
+			"if" : 0,
+			"radio" : 1
+		},
+		"chan_multiSF_6" : 
+		{
+			"enable" : true,
+			"if" : 200000,
+			"radio" : 1
+		},
+		"chan_multiSF_7" : 
+		{
+			"enable" : true,
+			"if" : 400000,
+			"radio" : 1
+		},
+		"chan_multiSF_All" : 
+		{
+			"spreading_factor_enable" : 
+			[
+				5,
+				6,
+				7,
+				8,
+				9,
+				10,
+				11,
+				12
+			]
+		},
+		"clksrc" : 0,
+		"com_type" : "SPI",
+		"fine_timestamp" : 
+		{
+			"enable" : false,
+			"mode" : "all_sf"
+		},
+		"full_duplex" : false,
+		"lorawan_public" : true,
+		"radio_0" : 
+		{
+			"enable" : true,
+			"freq" : 923600000,
+			"rssi_offset" : -215,
+			"rssi_tcomp" : 
+			{
+				"coeff_a" : 0,
+				"coeff_b" : 0,
+				"coeff_c" : 20.41,
+				"coeff_d" : 2162.5599999999999,
+				"coeff_e" : 0
+			},
+			"tx_enable" : true,
+			"tx_freq_max" : 928000000,
+			"tx_freq_min" : 915000000,
+			"tx_gain_lut" : 
+			[
+				{
+					"pa_gain" : 0,
+					"pwr_idx" : 14,
+					"rf_power" : 11
+				},
+				{
+					"pa_gain" : 0,
+					"pwr_idx" : 15,
+					"rf_power" : 12
+				},
+				{
+					"pa_gain" : 0,
+					"pwr_idx" : 16,
+					"rf_power" : 13
+				},
+				{
+					"pa_gain" : 0,
+					"pwr_idx" : 17,
+					"rf_power" : 15
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 0,
+					"rf_power" : 16
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 1,
+					"rf_power" : 17
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 2,
+					"rf_power" : 18
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 3,
+					"rf_power" : 19
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 4,
+					"rf_power" : 20
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 5,
+					"rf_power" : 21
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 6,
+					"rf_power" : 22
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 7,
+					"rf_power" : 23
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 8,
+					"rf_power" : 24
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 10,
+					"rf_power" : 25
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 12,
+					"rf_power" : 26
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 15,
+					"rf_power" : 27
+				}
+			],
+			"type" : "SX1250"
+		},
+		"radio_1" : 
+		{
+			"enable" : true,
+			"freq" : 922600000,
+			"rssi_offset" : -215,
+			"rssi_tcomp" : 
+			{
+				"coeff_a" : 0,
+				"coeff_b" : 0,
+				"coeff_c" : 20.41,
+				"coeff_d" : 2162.5599999999999,
+				"coeff_e" : 0
+			},
+			"tx_enable" : false,
+			"type" : "SX1250"
+		},
+		"sx1261_conf" : 
+		{
+			"lbt" : 
+			{
+				"channels" : 
+				[
+					{
+						"bandwidth" : 125000,
+						"freq_hz" : 923200000,
+						"scan_time_us" : 5000,
+						"transmit_time_ms" : 4000
+					},
+					{
+						"bandwidth" : 125000,
+						"freq_hz" : 923400000,
+						"scan_time_us" : 5000,
+						"transmit_time_ms" : 4000
+					},
+					{
+						"bandwidth" : 125000,
+						"freq_hz" : 923600000,
+						"scan_time_us" : 5000,
+						"transmit_time_ms" : 4000
+					},
+					{
+						"bandwidth" : 125000,
+						"freq_hz" : 922200000,
+						"scan_time_us" : 5000,
+						"transmit_time_ms" : 4000
+					},
+					{
+						"bandwidth" : 125000,
+						"freq_hz" : 922400000,
+						"scan_time_us" : 5000,
+						"transmit_time_ms" : 4000
+					},
+					{
+						"bandwidth" : 125000,
+						"freq_hz" : 922600000,
+						"scan_time_us" : 5000,
+						"transmit_time_ms" : 4000
+					},
+					{
+						"bandwidth" : 125000,
+						"freq_hz" : 922800000,
+						"scan_time_us" : 5000,
+						"transmit_time_ms" : 4000
+					},
+					{
+						"bandwidth" : 125000,
+						"freq_hz" : 923000000,
+						"scan_time_us" : 5000,
+						"transmit_time_ms" : 4000
+					}
+				],
+				"enable" : true,
+				"rssi_target" : -80
+			},
+			"rssi_offset" : 30,
+			"spectral_scan" : 
+			{
+				"enable" : false,
+				"freq_start" : 903900000,
+				"nb_chan" : 8,
+				"nb_scan" : 2000,
+				"pace_s" : 10
+			}
+		}
+	},
+	"gateway_conf" : 
+	{
+		"autoquit_threshold" : 0,
+		"beacon_bw_hz" : 125000,
+		"beacon_datarate" : 9,
+		"beacon_freq_hz" : 869525000,
+		"beacon_infodesc" : 0,
+		"beacon_period" : 0,
+		"beacon_power" : 14,
+		"duty_cycle_enabled" : false,
+		"forward_crc_disabled" : false,
+		"forward_crc_error" : false,
+		"forward_crc_valid" : true,
+		"gateway_ID" : "aa555a0000000000",
+		"gps" : true,
+		"gps_tty_path" : "/dev/gpspipe",
+		"keepalive_interval" : 10,
+		"max_tx_power" : 16,
+		"push_timeout_ms" : 100,
+		"ref_altitude" : 0,
+		"ref_latitude" : 0.0,
+		"ref_longitude" : 0.0,
+		"serv_port_down" : 1782,
+		"serv_port_up" : 1780,
+		"server_address" : "127.0.0.1",
+		"stat_interval" : 30,
+		"synch_word" : 52
+	}
+}
\ No newline at end of file
diff --git a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.AU915 b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.AU915
new file mode 100644
index 0000000..784feb7
--- /dev/null
+++ b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.AU915
@@ -0,0 +1,259 @@
+{
+	"SX130x_conf" : 
+	{
+		"antenna_gain" : 3,
+		"chan_FSK" : 
+		{
+			"bandwidth" : 125000,
+			"datarate" : 50000,
+			"enable" : false,
+			"if" : 0,
+			"radio" : 0
+		},
+		"chan_Lora_std" : 
+		{
+			"bandwidth" : 500000,
+			"enable" : true,
+			"if" : 300000,
+			"implicit_coderate" : 1,
+			"implicit_crc_en" : false,
+			"implicit_hdr" : false,
+			"implicit_payload_length" : 17,
+			"radio" : 0,
+			"spread_factor" : 8
+		},
+		"chan_multiSF_0" : 
+		{
+			"enable" : true,
+			"if" : -400000,
+			"radio" : 0
+		},
+		"chan_multiSF_1" : 
+		{
+			"enable" : true,
+			"if" : -200000,
+			"radio" : 0
+		},
+		"chan_multiSF_2" : 
+		{
+			"enable" : true,
+			"if" : 0,
+			"radio" : 0
+		},
+		"chan_multiSF_3" : 
+		{
+			"enable" : true,
+			"if" : 200000,
+			"radio" : 0
+		},
+		"chan_multiSF_4" : 
+		{
+			"enable" : true,
+			"if" : -400000,
+			"radio" : 1
+		},
+		"chan_multiSF_5" : 
+		{
+			"enable" : true,
+			"if" : -200000,
+			"radio" : 1
+		},
+		"chan_multiSF_6" : 
+		{
+			"enable" : true,
+			"if" : 0,
+			"radio" : 1
+		},
+		"chan_multiSF_7" : 
+		{
+			"enable" : true,
+			"if" : 200000,
+			"radio" : 1
+		},
+		"chan_multiSF_All" : 
+		{
+			"spreading_factor_enable" : 
+			[
+				5,
+				6,
+				7,
+				8,
+				9,
+				10,
+				11,
+				12
+			]
+		},
+		"clksrc" : 0,
+		"com_type" : "SPI",
+		"fine_timestamp" : 
+		{
+			"enable" : false,
+			"mode" : "all_sf"
+		},
+		"full_duplex" : false,
+		"lorawan_public" : true,
+		"radio_0" : 
+		{
+			"enable" : true,
+			"freq" : 917200000,
+			"rssi_offset" : -215,
+			"rssi_tcomp" : 
+			{
+				"coeff_a" : 0,
+				"coeff_b" : 0,
+				"coeff_c" : 20.41,
+				"coeff_d" : 2162.5599999999999,
+				"coeff_e" : 0
+			},
+			"tx_enable" : true,
+			"tx_freq_max" : 928000000,
+			"tx_freq_min" : 915000000,
+			"tx_gain_lut" : 
+			[
+				{
+					"pa_gain" : 0,
+					"pwr_idx" : 14,
+					"rf_power" : 11
+				},
+				{
+					"pa_gain" : 0,
+					"pwr_idx" : 15,
+					"rf_power" : 12
+				},
+				{
+					"pa_gain" : 0,
+					"pwr_idx" : 16,
+					"rf_power" : 13
+				},
+				{
+					"pa_gain" : 0,
+					"pwr_idx" : 17,
+					"rf_power" : 15
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 0,
+					"rf_power" : 16
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 1,
+					"rf_power" : 17
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 2,
+					"rf_power" : 18
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 3,
+					"rf_power" : 19
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 4,
+					"rf_power" : 20
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 5,
+					"rf_power" : 21
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 6,
+					"rf_power" : 22
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 7,
+					"rf_power" : 23
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 8,
+					"rf_power" : 24
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 10,
+					"rf_power" : 25
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 12,
+					"rf_power" : 26
+				},
+				{
+					"pa_gain" : 1,
+					"pwr_idx" : 15,
+					"rf_power" : 27
+				}
+			],
+			"type" : "SX1250"
+		},
+		"radio_1" : 
+		{
+			"enable" : true,
+			"freq" : 918000000,
+			"rssi_offset" : -215,
+			"rssi_tcomp" : 
+			{
+				"coeff_a" : 0,
+				"coeff_b" : 0,
+				"coeff_c" : 20.41,
+				"coeff_d" : 2162.5599999999999,
+				"coeff_e" : 0
+			},
+			"tx_enable" : false,
+			"type" : "SX1250"
+		},
+		"sx1261_conf" : 
+		{
+			"lbt" : 
+			{
+				"channels" : [],
+				"enable" : false,
+				"rssi_target" : -80
+			},
+			"rssi_offset" : 30,
+			"spectral_scan" : 
+			{
+				"enable" : false,
+				"freq_start" : 903900000,
+				"nb_chan" : 8,
+				"nb_scan" : 2000,
+				"pace_s" : 10
+			}
+		}
+	},
+	"gateway_conf" : 
+	{
+		"autoquit_threshold" : 60,
+		"beacon_bw_hz" : 125000,
+		"beacon_datarate" : 9,
+		"beacon_freq_hz" : 869525000,
+		"beacon_infodesc" : 0,
+		"beacon_period" : 0,
+		"beacon_power" : 14,
+		"duty_cycle_enabled" : false,
+        "forward_crc_valid": true,
+        "forward_crc_error": false,
+        "forward_crc_disabled": false,
+		"gateway_ID" : "AA555A0000000000",
+		"gps" : true,
+		"gps_tty_path" : "/dev/gpspipe",
+		"keepalive_interval" : 10,
+		"push_timeout_ms" : 100,
+		"ref_altitude" : 0,
+		"ref_latitude" : 0.0,
+		"ref_longitude" : 0.0,
+		"serv_port_down" : 1782,
+		"serv_port_up" : 1780,
+		"server_address" : "127.0.0.1",
+		"stat_interval" : 20,
+		"synch_word" : 52
+	}
+}
\ No newline at end of file
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 593813b..3ccef94 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
@@ -1,120 +1,261 @@
 {
-    "SX130x_conf": {
-        "com_type": "SPI",
-        "com_path": "/dev/spidev0.0",
-        "tmp102": 72,
-        "lorawan_public": true,
-        "clksrc": 0,
-        "antenna_gain": 0, /* antenna gain, in dBi */
-        "full_duplex": false,
-        "fine_timestamp": {
-            "enable": false,
-            "mode": "all_sf" /* high_capacity or all_sf */
-        },
-        "sx1261_conf": {
-            "spi_path": "/dev/spidev0.1",
-            "rssi_offset": 0, /* dB */
-            "spectral_scan": {
-                "enable": false,
-                "freq_start": 867100000,
-                "nb_chan": 8,
-                "nb_scan": 2000,
-                "pace_s": 10
-            },
-            "lbt": {
-                "enable": false,
-                "rssi_target": -70, /* dBm */
-                "channels":[ /* 16 channels maximum */
-                    { "freq_hz": 867100000, "bandwidth": 125000, "scan_time_us": 128,  "transmit_time_ms": 400 },
-                    { "freq_hz": 867300000, "bandwidth": 125000, "scan_time_us": 128,  "transmit_time_ms": 400 },
-                    { "freq_hz": 867500000, "bandwidth": 125000, "scan_time_us": 128,  "transmit_time_ms": 400 },
-                    { "freq_hz": 867700000, "bandwidth": 125000, "scan_time_us": 128,  "transmit_time_ms": 400 },
-                    { "freq_hz": 867900000, "bandwidth": 125000, "scan_time_us": 128,  "transmit_time_ms": 400 },
-                    { "freq_hz": 868100000, "bandwidth": 125000, "scan_time_us": 128,  "transmit_time_ms": 400 },
-                    { "freq_hz": 868300000, "bandwidth": 125000, "scan_time_us": 128,  "transmit_time_ms": 400 },
-                    { "freq_hz": 868500000, "bandwidth": 125000, "scan_time_us": 128,  "transmit_time_ms": 400 },
-                    { "freq_hz": 869525000, "bandwidth": 125000, "scan_time_us": 5000, "transmit_time_ms": 4000 },
-                    { "freq_hz": 868300000, "bandwidth": 250000, "scan_time_us": 128,  "transmit_time_ms": 400 }
-                ]
-            }
-        },
-        "radio_0": {
-            "enable": true,
-            "type": "SX1250",
-            "freq": 867500000,
-            "rssi_offset": -215.4,
-            "rssi_tcomp": {"coeff_a": 0, "coeff_b": 0, "coeff_c": 20.41, "coeff_d": 2162.56, "coeff_e": 0},
-            "tx_enable": true,
-            "tx_freq_min": 863000000,
-            "tx_freq_max": 870000000,
-            "tx_gain_lut":[
-                {"rf_power": 12, "pa_gain": 0, "pwr_idx": 15},
-                {"rf_power": 13, "pa_gain": 0, "pwr_idx": 16},
-                {"rf_power": 14, "pa_gain": 0, "pwr_idx": 17},
-                {"rf_power": 15, "pa_gain": 0, "pwr_idx": 19},
-                {"rf_power": 16, "pa_gain": 0, "pwr_idx": 20},
-                {"rf_power": 17, "pa_gain": 0, "pwr_idx": 22},
-                {"rf_power": 18, "pa_gain": 1, "pwr_idx": 1},
-                {"rf_power": 19, "pa_gain": 1, "pwr_idx": 2},
-                {"rf_power": 20, "pa_gain": 1, "pwr_idx": 3},
-                {"rf_power": 21, "pa_gain": 1, "pwr_idx": 4},
-                {"rf_power": 22, "pa_gain": 1, "pwr_idx": 5},
-                {"rf_power": 23, "pa_gain": 1, "pwr_idx": 6},
-                {"rf_power": 24, "pa_gain": 1, "pwr_idx": 7},
-                {"rf_power": 25, "pa_gain": 1, "pwr_idx": 9},
-                {"rf_power": 26, "pa_gain": 1, "pwr_idx": 11},
-                {"rf_power": 27, "pa_gain": 1, "pwr_idx": 14}
-            ]
-        },
-        "radio_1": {
-            "enable": true,
-            "type": "SX1250",
-            "freq": 868500000,
-            "rssi_offset": -215.4,
-            "rssi_tcomp": {"coeff_a": 0, "coeff_b": 0, "coeff_c": 20.41, "coeff_d": 2162.56, "coeff_e": 0},
-            "tx_enable": false
-        },
-        "chan_multiSF_All": {"spreading_factor_enable": [ 5, 6, 7, 8, 9, 10, 11, 12 ]},
-        "chan_multiSF_0": {"enable": true, "radio": 1, "if": -400000},
-        "chan_multiSF_1": {"enable": true, "radio": 1, "if": -200000},
-        "chan_multiSF_2": {"enable": true, "radio": 1, "if":  0},
-        "chan_multiSF_3": {"enable": true, "radio": 0, "if": -400000},
-        "chan_multiSF_4": {"enable": true, "radio": 0, "if": -200000},
-        "chan_multiSF_5": {"enable": true, "radio": 0, "if":  0},
-        "chan_multiSF_6": {"enable": true, "radio": 0, "if":  200000},
-        "chan_multiSF_7": {"enable": true, "radio": 0, "if":  400000},
-        "chan_Lora_std":  {"enable": true, "radio": 1, "if": -200000, "bandwidth": 250000, "spread_factor": 7,
-                           "implicit_hdr": false, "implicit_payload_length": 17, "implicit_crc_en": false, "implicit_coderate": 1},
-        "chan_FSK":       {"enable": true, "radio": 1, "if":  300000, "bandwidth": 125000, "datarate": 50000}
-    },
-
-    "gateway_conf": {
-        "gateway_ID": "AA555A0000000000",
-        /* change with default server address/ports */
-        "server_address": "localhost",
-        "serv_port_up": 1730,
-        "serv_port_down": 1730,
-        /* 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,
-        /* GPS configuration */
-        "gps" : true,
-        "gps_tty_path": "/dev/gps0",
-        /* GPS reference coordinates */
-        "ref_latitude": 0.0,
-        "ref_longitude": 0.0,
-        "ref_altitude": 0,
-        /* Beaconing parameters */
-        "beacon_period": 0,
-        "beacon_freq_hz": 869525000,
-        "beacon_datarate": 9,
-        "beacon_bw_hz": 125000,
-        "beacon_power": 14,
-        "beacon_infodesc": 0
-    }
-}
+	"SX130x_conf" : 
+	{
+		"antenna_gain" : 3,
+		"chan_FSK" : 
+		{
+			"bandwidth" : 125000,
+			"datarate" : 50000,
+			"enable" : false,
+			"freq_deviation" : 25000,
+			"if" : 300000,
+			"radio" : 0
+		},
+		"chan_Lora_std" : 
+		{
+			"bandwidth" : 250000,
+			"enable" : true,
+			"if" : -200000,
+			"implicit_coderate" : 1,
+			"implicit_crc_en" : false,
+			"implicit_hdr" : false,
+			"implicit_payload_length" : 17,
+			"radio" : 0,
+			"spread_factor" : 7
+		},
+		"chan_multiSF_0" : 
+		{
+			"enable" : true,
+			"if" : -400000,
+			"radio" : 0
+		},
+		"chan_multiSF_1" : 
+		{
+			"enable" : true,
+			"if" : -200000,
+			"radio" : 0
+		},
+		"chan_multiSF_2" : 
+		{
+			"enable" : true,
+			"if" : 0,
+			"radio" : 0
+		},
+		"chan_multiSF_3" : 
+		{
+			"enable" : true,
+			"if" : -400000,
+			"radio" : 1
+		},
+		"chan_multiSF_4" : 
+		{
+			"enable" : true,
+			"if" : -200000,
+			"radio" : 1
+		},
+		"chan_multiSF_5" : 
+		{
+			"enable" : true,
+			"if" : 0,
+			"radio" : 1
+		},
+		"chan_multiSF_6" : 
+		{
+			"enable" : true,
+			"if" : 200000,
+			"radio" : 1
+		},
+		"chan_multiSF_7" : 
+		{
+			"enable" : true,
+			"if" : 400000,
+			"radio" : 1
+		},
+		"chan_multiSF_All" : 
+		{
+			"spreading_factor_enable" : 
+			[
+				5,
+				6,
+				7,
+				8,
+				9,
+				10,
+				11,
+				12
+			]
+		},
+		"clksrc" : 0,
+		"com_type" : "SPI",
+		"fine_timestamp" : 
+		{
+			"enable" : false,
+			"mode" : "all_sf"
+		},
+		"full_duplex" : false,
+		"lorawan_public" : true,
+		"radio_0" : 
+		{
+			"enable" : true,