summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Reiss <jreiss@multitech.com>2018-02-22 14:06:16 -0600
committerJason Reiss <jreiss@multitech.com>2018-02-22 14:06:16 -0600
commit405147cbb51f85ab50fac961e06abd3c769e65c7 (patch)
treede1e3ce14edc9ed4c5a25b5fcf324405b5472708
parentb64835f5861f9ba3770d3a4b69256b628b6f2410 (diff)
downloadmeta-mlinux-405147cbb51f85ab50fac961e06abd3c769e65c7.tar.gz
meta-mlinux-405147cbb51f85ab50fac961e06abd3c769e65c7.tar.bz2
meta-mlinux-405147cbb51f85ab50fac961e06abd3c769e65c7.zip
lora: update network-server log rotate, remove unused global_conf.json files
-rw-r--r--recipes-connectivity/lora/lora-network-server/lora-network-server.logrotate.conf2
-rw-r--r--recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_0.EU868.basic.clksrc0195
-rw-r--r--recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_0.US915.basic.clksrc0192
-rw-r--r--recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_5.EU868.basic.clksrc0190
-rw-r--r--recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_5.US915.basic.clksrc0192
5 files changed, 1 insertions, 770 deletions
diff --git a/recipes-connectivity/lora/lora-network-server/lora-network-server.logrotate.conf b/recipes-connectivity/lora/lora-network-server/lora-network-server.logrotate.conf
index d2b6c9a..01a1cc0 100644
--- a/recipes-connectivity/lora/lora-network-server/lora-network-server.logrotate.conf
+++ b/recipes-connectivity/lora/lora-network-server/lora-network-server.logrotate.conf
@@ -1,4 +1,4 @@
-/var/log/lora-pkt-fwd*.log /var/log/lora-network-server.log {
+/var/log/lora-*.log {
size 512k
rotate 4
compress
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_0.EU868.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_0.EU868.basic.clksrc0
deleted file mode 100644
index 0046e6f..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_0.EU868.basic.clksrc0
+++ /dev/null
@@ -1,195 +0,0 @@
-{
- "SX1301_conf": {
- "antenna_gain": 0,
- "chan_FSK": {
- "bandwidth": 125000,
- "datarate": 50000,
- "enable": true,
- "if": 300000,
- "radio": 1
- },
- "chan_Lora_std": {
- "bandwidth": 250000,
- "enable": true,
- "if": -200000,
- "radio": 1,
- "spread_factor": 7
- },
- "chan_multiSF_0": {
- "enable": true,
- "if": -400000,
- "radio": 1
- },
- "chan_multiSF_1": {
- "enable": true,
- "if": -200000,
- "radio": 1
- },
- "chan_multiSF_2": {
- "enable": true,
- "if": 0,
- "radio": 1
- },
- "chan_multiSF_3": {
- "enable": true,
- "if": -400000,
- "radio": 0
- },
- "chan_multiSF_4": {
- "enable": true,
- "if": -200000,
- "radio": 0
- },
- "chan_multiSF_5": {
- "enable": true,
- "if": 0,
- "radio": 0
- },
- "chan_multiSF_6": {
- "enable": true,
- "if": 200000,
- "radio": 0
- },
- "chan_multiSF_7": {
- "enable": true,
- "if": 400000,
- "radio": 0
- },
- "clksrc": 0,
- "lbt_cfg": {
- "enable": false,
- "nb_channel": 1,
- "rssi_target": 160,
- "scan_time_us": 5000,
- "start_freq": 869525000,
- "tx_delay_1ch_us": 4000000,
- "tx_delay_2ch_us": 4000000
- },
- "lorawan_public": true,
- "radio_0": {
- "enable": true,
- "freq": 867500000,
- "rssi_offset": -165,
- "tx_enable": true,
- "tx_freq_max": 870000000,
- "tx_freq_min": 863000000,
- "type": "SX1257"
- },
- "radio_1": {
- "enable": true,
- "freq": 868500000,
- "rssi_offset": -165,
- "tx_enable": false,
- "type": "SX1257"
- },
- "tx_lut_0": {
- "dig_gain": 3,
- "mix_gain": 8,
- "pa_gain": 0,
- "rf_power": -6
- },
- "tx_lut_1": {
- "dig_gain": 3,
- "mix_gain": 10,
- "pa_gain": 0,
- "rf_power": -3
- },
- "tx_lut_10": {
- "dig_gain": 3,
- "mix_gain": 11,
- "pa_gain": 2,
- "rf_power": 16
- },
- "tx_lut_11": {
- "dig_gain": 3,
- "mix_gain": 10,
- "pa_gain": 3,
- "rf_power": 20
- },
- "tx_lut_12": {
- "dig_gain": 3,
- "mix_gain": 11,
- "pa_gain": 3,
- "rf_power": 23
- },
- "tx_lut_13": {
- "dig_gain": 3,
- "mix_gain": 12,
- "pa_gain": 3,
- "rf_power": 24
- },
- "tx_lut_14": {
- "dig_gain": 3,
- "mix_gain": 13,
- "pa_gain": 3,
- "rf_power": 25
- },
- "tx_lut_15": {
- "dig_gain": 3,
- "mix_gain": 15,
- "pa_gain": 3,
- "rf_power": 26
- },
- "tx_lut_2": {
- "dig_gain": 3,
- "mix_gain": 12,
- "pa_gain": 0,
- "rf_power": 0
- },
- "tx_lut_3": {
- "dig_gain": 3,
- "mix_gain": 8,
- "pa_gain": 1,
- "rf_power": 3
- },
- "tx_lut_4": {
- "dig_gain": 3,
- "mix_gain": 10,
- "pa_gain": 1,
- "rf_power": 6
- },
- "tx_lut_5": {
- "dig_gain": 3,
- "mix_gain": 12,
- "pa_gain": 1,
- "rf_power": 10
- },
- "tx_lut_6": {
- "dig_gain": 3,
- "mix_gain": 12,
- "pa_gain": 1,
- "rf_power": 11
- },
- "tx_lut_7": {
- "dig_gain": 3,
- "mix_gain": 9,
- "pa_gain": 2,
- "rf_power": 12
- },
- "tx_lut_8": {
- "dig_gain": 3,
- "mix_gain": 15,
- "pa_gain": 1,
- "rf_power": 13
- },
- "tx_lut_9": {
- "dig_gain": 3,
- "mix_gain": 10,
- "pa_gain": 2,
- "rf_power": 14
- }
- },
- "gateway_conf": {
- "forward_crc_disabled": false,
- "forward_crc_error": false,
- "forward_crc_valid": true,
- "gateway_ID": "AA555A0000000000",
- "keepalive_interval": 10,
- "push_timeout_ms": 100,
- "serv_port_down": 1680,
- "serv_port_up": 1680,
- "server_address": "localhost",
- "stat_interval": 30,
- "autoquit_threshold": 60
- }
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_0.US915.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_0.US915.basic.clksrc0
deleted file mode 100644
index e70b8ba..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_0.US915.basic.clksrc0
+++ /dev/null
@@ -1,192 +0,0 @@
-{
- "SX1301_conf": {
- "lorawan_public": true,
- "antenna_gain": 0,
- "clksrc": 0,
- "radio_0": {
- "enable": true,
- "freq": 902700000,
- "rssi_offset": -165,
- "tx_enable": true,
- "tx_freq_max": 928000000,
- "tx_freq_min": 902000000,
- "type": "SX1257"
- },
- "radio_1": {
- "enable": true,
- "freq": 903500000,
- "rssi_offset": -165,
- "tx_enable": false,
- "type": "SX1257"
- },
- "chan_FSK": {
- "enable": false,
- "radio": 0
- },
- "chan_Lora_std": {
- "bandwidth": 500000,
- "enable": true,
- "if": 300000,
- "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
- },
- "lbt_cfg": {
- "enable": false,
- "nb_channel": 1,
- "rssi_target": 160,
- "scan_time_us": 5000,
- "start_freq": 869525000,
- "tx_delay_1ch_us": 4000000,
- "tx_delay_2ch_us": 4000000
- },
- "tx_lut_0": {
- "pa_gain": 0,
- "mix_gain": 8,
- "rf_power": -6,
- "dig_gain": 3
- },
- "tx_lut_1": {
- "pa_gain": 0,
- "mix_gain": 10,
- "rf_power": -3,
- "dig_gain": 3
- },
- "tx_lut_2": {
- "pa_gain": 0,
- "mix_gain": 12,
- "rf_power": 0,
- "dig_gain": 3
- },
- "tx_lut_3": {
- "pa_gain": 1,
- "mix_gain": 8,
- "rf_power": 3,
- "dig_gain": 3
- },
- "tx_lut_4": {
- "pa_gain": 1,
- "mix_gain": 10,
- "rf_power": 6,
- "dig_gain": 3
- },
- "tx_lut_5": {
- "pa_gain": 1,
- "mix_gain": 12,
- "rf_power": 10,
- "dig_gain": 3
- },
- "tx_lut_6": {
- "pa_gain": 1,
- "mix_gain": 12,
- "rf_power": 11,
- "dig_gain": 3
- },
- "tx_lut_7": {
- "pa_gain": 2,
- "mix_gain": 9,
- "rf_power": 12,
- "dig_gain": 3
- },
- "tx_lut_8": {
- "pa_gain": 1,
- "mix_gain": 15,
- "rf_power": 13,
- "dig_gain": 3
- },
- "tx_lut_9": {
- "pa_gain": 2,
- "mix_gain": 10,
- "rf_power": 14,
- "dig_gain": 3
- },
- "tx_lut_10": {
- "pa_gain": 2,
- "mix_gain": 11,
- "rf_power": 16,
- "dig_gain": 3
- },
- "tx_lut_11": {
- "pa_gain": 3,
- "mix_gain": 10,
- "rf_power": 20,
- "dig_gain": 3
- },
- "tx_lut_12": {
- "pa_gain": 3,
- "mix_gain": 11,
- "rf_power": 23,
- "dig_gain": 3
- },
- "tx_lut_13": {
- "pa_gain": 3,
- "mix_gain": 12,
- "rf_power": 24,
- "dig_gain": 3
- },
- "tx_lut_14": {
- "pa_gain": 3,
- "mix_gain": 13,
- "rf_power": 25,
- "dig_gain": 3
- },
- "tx_lut_15": {
- "pa_gain": 3,
- "mix_gain": 15,
- "rf_power": 26,
- "dig_gain": 3
- }
- },
- "gateway_conf": {
- "forward_crc_disabled": false,
- "forward_crc_error": false,
- "forward_crc_valid": true,
- "gateway_ID": "<WILL-BE-REPLACED-WITH-LORA-EUI>",
- "keepalive_interval": 12,
- "push_timeout_ms": 120,
- "serv_port_down": 1780,
- "serv_port_up": 1780,
- "server_address": "us01-iot.semtech.com",
- "stat_interval": 20,
- "synch_word": 52
- }
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_5.EU868.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_5.EU868.basic.clksrc0
deleted file mode 100644
index a777d51..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_5.EU868.basic.clksrc0
+++ /dev/null
@@ -1,190 +0,0 @@
-{
- "SX1301_conf": {
- "antenna_gain": 0,
- "chan_FSK": {
- "bandwidth": 125000,
- "datarate": 50000,
- "enable": true,
- "if": 300000,
- "radio": 1
- },
- "chan_Lora_std": {
- "bandwidth": 250000,
- "enable": true,
- "if": -200000,
- "radio": 1,
- "spread_factor": 7
- },
- "chan_multiSF_0": {
- "enable": true,
- "if": -400000,
- "radio": 1
- },
- "chan_multiSF_1": {
- "enable": true,
- "if": -200000,
- "radio": 1
- },
- "chan_multiSF_2": {
- "enable": true,
- "if": 0,
- "radio": 1
- },
- "chan_multiSF_3": {
- "enable": true,
- "if": -400000,
- "radio": 0
- },
- "chan_multiSF_4": {
- "enable": true,
- "if": -200000,
- "radio": 0
- },
- "chan_multiSF_5": {
- "enable": true,
- "if": 0,
- "radio": 0
- },
- "chan_multiSF_6": {
- "enable": true,
- "if": 200000,
- "radio": 0
- },
- "chan_multiSF_7": {
- "enable": true,
- "if": 400000,
- "radio": 0
- },
- "clksrc": 0,
- "lbt_cfg": {
- "enable": false,
- "rssi_target": 160
- },
- "lorawan_public": true,
- "radio_0": {
- "enable": true,
- "freq": 867500000,
- "rssi_offset": -162,
- "tx_enable": true,
- "tx_freq_max": 870000000,
- "tx_freq_min": 863000000,
- "type": "SX1257"
- },
- "radio_1": {
- "enable": true,
- "freq": 868500000,
- "rssi_offset": -162,
- "tx_enable": false,
- "type": "SX1257"
- },
- "tx_lut_0": {
- "dig_gain": 0,
- "mix_gain": 11,
- "pa_gain": 0,
- "rf_power": -6
- },
- "tx_lut_1": {
- "dig_gain": 0,
- "mix_gain": 13,
- "pa_gain": 0,
- "rf_power": -3
- },
- "tx_lut_10": {
- "dig_gain": 0,
- "mix_gain": 15,
- "pa_gain": 2,
- "rf_power": 16
- },
- "tx_lut_11": {
- "dig_gain": 0,
- "mix_gain": 10,
- "pa_gain": 3,
- "rf_power": 20
- },
- "tx_lut_12": {
- "dig_gain": 0,
- "mix_gain": 12,
- "pa_gain": 3,
- "rf_power": 23
- },
- "tx_lut_13": {
- "dig_gain": 0,
- "mix_gain": 13,
- "pa_gain": 3,
- "rf_power": 25
- },
- "tx_lut_14": {
- "dig_gain": 0,
- "mix_gain": 15,
- "pa_gain": 3,
- "rf_power": 26
- },
- "tx_lut_15": {
- "dig_gain": 0,
- "mix_gain": 15,
- "pa_gain": 3,
- "rf_power": 27
- },
- "tx_lut_2": {
- "dig_gain": 0,
- "mix_gain": 9,
- "pa_gain": 1,
- "rf_power": 0
- },
- "tx_lut_3": {
- "dig_gain": 0,
- "mix_gain": 10,
- "pa_gain": 1,
- "rf_power": 3
- },
- "tx_lut_4": {
- "dig_gain": 0,
- "mix_gain": 12,
- "pa_gain": 1,
- "rf_power": 6
- },
- "tx_lut_5": {
- "dig_gain": 0,
- "mix_gain": 10,
- "pa_gain": 2,
- "rf_power": 10
- },
- "tx_lut_6": {
- "dig_gain": 0,
- "mix_gain": 11,
- "pa_gain": 2,
- "rf_power": 11
- },
- "tx_lut_7": {
- "dig_gain": 0,
- "mix_gain": 11,
- "pa_gain": 2,
- "rf_power": 12
- },
- "tx_lut_8": {
- "dig_gain": 2,
- "mix_gain": 12,
- "pa_gain": 2,
- "rf_power": 13
- },
- "tx_lut_9": {
- "dig_gain": 0,
- "mix_gain": 13,
- "pa_gain": 2,
- "rf_power": 14
- }
- },
- "gateway_conf": {
- "forward_crc_disabled": false,
- "forward_crc_error": true,
- "forward_crc_valid": true,
- "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
- "keepalive_interval": 10,
- "push_timeout_ms": 100,
- "serv_port_down": 20000,
- "serv_port_up": 20000,
- "server_address": "52.3.215.147",
- "stat_interval": 30
- }
-}
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_5.US915.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_5.US915.basic.clksrc0
deleted file mode 100644
index 72b3cf0..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_5.US915.basic.clksrc0
+++ /dev/null
@@ -1,192 +0,0 @@
-{
- "SX1301_conf": {
- "lorawan_public": true,
- "antenna_gain": 0,
- "clksrc": 0,
- "radio_0": {
- "enable": true,
- "freq": 902700000,
- "rssi_offset": -162,
- "tx_enable": true,
- "tx_freq_max": 928000000,
- "tx_freq_min": 902000000,
- "type": "SX1257"
- },
- "radio_1": {
- "enable": true,
- "freq": 903500000,
- "rssi_offset": -162,
- "tx_enable": false,
- "type": "SX1257"
- },
- "chan_FSK": {
- "enable": false,
- "radio": 0
- },
- "chan_Lora_std": {
- "bandwidth": 500000,
- "enable": true,
- "if": 300000,
- "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
- },
- "lbt_cfg": {
- "enable": false,
- "nb_channel": 1,
- "rssi_target": 160,
- "scan_time_us": 5000,
- "start_freq": 869525000,
- "tx_delay_1ch_us": 4000000,
- "tx_delay_2ch_us": 4000000
- },
- "tx_lut_0": {
- "dig_gain": 0,
- "mix_gain": 11,
- "pa_gain": 0,
- "rf_power": -6
- },
- "tx_lut_1": {
- "dig_gain": 0,
- "mix_gain": 13,
- "pa_gain": 0,
- "rf_power": -3
- },
- "tx_lut_2": {
- "dig_gain": 0,
- "mix_gain": 9,
- "pa_gain": 1,
- "rf_power": 0
- },
- "tx_lut_3": {
- "dig_gain": 0,
- "mix_gain": 10,
- "pa_gain": 1,
- "rf_power": 3
- },
- "tx_lut_4": {
- "dig_gain": 0,
- "mix_gain": 12,
- "pa_gain": 1,
- "rf_power": 6
- },
- "tx_lut_5": {
- "dig_gain": 0,
- "mix_gain": 10,
- "pa_gain": 2,
- "rf_power": 10
- },
- "tx_lut_6": {
- "dig_gain": 0,
- "mix_gain": 11,
- "pa_gain": 2,
- "rf_power": 11
- },
- "tx_lut_7": {
- "dig_gain": 0,
- "mix_gain": 11,
- "pa_gain": 2,
- "rf_power": 12
- },
- "tx_lut_8": {
- "dig_gain": 0,
- "mix_gain": 12,
- "pa_gain": 2,
- "rf_power": 13
- },
- "tx_lut_9": {
- "dig_gain": 0,
- "mix_gain": 13,
- "pa_gain": 2,
- "rf_power": 14
- },
- "tx_lut_10": {
- "dig_gain": 0,
- "mix_gain": 15,
- "pa_gain": 2,
- "rf_power": 16
- },
- "tx_lut_11": {
- "dig_gain": 0,
- "mix_gain": 10,
- "pa_gain": 3,
- "rf_power": 20
- },
- "tx_lut_12": {
- "dig_gain": 0,
- "mix_gain": 12,
- "pa_gain": 3,
- "rf_power": 23
- },
- "tx_lut_13": {
- "dig_gain": 0,
- "mix_gain": 13,
- "pa_gain": 3,
- "rf_power": 25
- },
- "tx_lut_14": {
- "dig_gain": 0,
- "mix_gain": 15,
- "pa_gain": 3,
- "rf_power": 26
- },
- "tx_lut_15": {
- "dig_gain": 0,
- "mix_gain": 15,
- "pa_gain": 3,
- "rf_power": 27
- }
- },
- "gateway_conf": {
- "forward_crc_disabled": false,
- "forward_crc_error": true,
- "forward_crc_valid": true,
- "gateway_ID": "<WILL-BE-REPLACED-WITH-LORA-EUI>",
- "keepalive_interval": 12,
- "push_timeout_ms": 120,
- "serv_port_down": 20000,
- "serv_port_up": 20000,
- "server_address": "52.3.215.147",
- "stat_interval": 20,
- "synch_word": 52
- }
-}