diff options
author | Harsh Sharma <harsh.sharma@multitech.com> | 2016-12-07 10:42:46 -0600 |
---|---|---|
committer | Harsh Sharma <harsh.sharma@multitech.com> | 2016-12-07 10:42:46 -0600 |
commit | 6ac2f21046447316af977fa22624a2f8d7baba11 (patch) | |
tree | 0c64c45c8dfa45c7916f8ba36300087603ee0a2e /recipes-connectivity | |
parent | daf919ea0ab8ed52382dda882843f59571e4fd00 (diff) | |
download | meta-mlinux-6ac2f21046447316af977fa22624a2f8d7baba11.tar.gz meta-mlinux-6ac2f21046447316af977fa22624a2f8d7baba11.tar.bz2 meta-mlinux-6ac2f21046447316af977fa22624a2f8d7baba11.zip |
Revert "lora: add MTAC-LORA 1.5 global_conf files with LORA and CW calibration info"
This reverts commit 5a80e25f8fe510c38634163adb32ba18e4be2880.
Diffstat (limited to 'recipes-connectivity')
3 files changed, 0 insertions, 436 deletions
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTAC_LORA_1_5_CW b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTAC_LORA_1_5_CW deleted file mode 100644 index 043e92c..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTAC_LORA_1_5_CW +++ /dev/null @@ -1,216 +0,0 @@ -{ - "SX1301_conf": { - "lorawan_public": true, - "clksrc": 0, /* radio_1 provides clock to concentrator */ - "antenna_gain": 0, /* antenna gain, in dBi */ - "radio_0": { - "enable": true, - "type": "SX1257", - "freq": 867500000, - "rssi_offset": -166.0, - "tx_enable": true, - "tx_freq_min": 863000000, - "tx_freq_max": 870000000 - }, - "radio_1": { - "enable": true, - "type": "SX1257", - "freq": 868500000, - "rssi_offset": -166.0, - "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, - "bandwidth": 250000, - "spread_factor": 7 - }, - "chan_FSK": { - /* FSK 50kbps channel, 868.8 MHz */ - "enable": true, - "radio": 1, - "if": 300000, - "bandwidth": 125000, - "datarate": 50000 - }, - "tx_lut_0": { - /* TX gain table, index 0 */ - "pa_gain": 0, - "mix_gain": 9, - "rf_power": -6, - "dig_gain": 0 - }, - "tx_lut_1": { - /* TX gain table, index 1 */ - "pa_gain": 0, - "mix_gain": 12, - "rf_power": -3, - "dig_gain": 0 - }, - "tx_lut_2": { - /* TX gain table, index 2 */ - "pa_gain": 0, - "mix_gain": 15, - "rf_power": 0, - "dig_gain": 0 - }, - "tx_lut_3": { - /* TX gain table, index 3 */ - "pa_gain": 1, - "mix_gain": 8, - "rf_power": 3, - "dig_gain": 0 - }, - "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": 8, - "rf_power": 10, - "dig_gain": 0 - }, - "tx_lut_6": { - /* TX gain table, index 6 */ - "pa_gain": 2, - "mix_gain": 9, - "rf_power": 11, - "dig_gain": 0 - }, - "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": 10, - "rf_power": 13, - "dig_gain": 0 - }, - "tx_lut_9": { - /* TX gain table, index 9 */ - "pa_gain": 2, - "mix_gain": 11, - "rf_power": 14, - "dig_gain": 0 - }, - "tx_lut_10": { - /* TX gain table, index 10 */ - "pa_gain": 2, - "mix_gain": 14, - "rf_power": 16, - "dig_gain": 0 - }, - "tx_lut_11": { - /* TX gain table, index 11 */ - "pa_gain": 3, - "mix_gain": 8, - "rf_power": 20, - "dig_gain": 0 - }, - "tx_lut_12": { - /* TX gain table, index 12 */ - "pa_gain": 3, - "mix_gain": 10, - "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": 0 - }, - "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 */ - "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/global_conf.json.MTAC_LORA_1_5_LORA b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTAC_LORA_1_5_LORA deleted file mode 100644 index 545fc49..0000000 --- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTAC_LORA_1_5_LORA +++ /dev/null @@ -1,216 +0,0 @@ -{ - "SX1301_conf": { - "lorawan_public": true, - "clksrc": 0, /* radio_1 provides clock to concentrator */ - "antenna_gain": 0, /* antenna gain, in dBi */ - "radio_0": { - "enable": true, - "type": "SX1257", - "freq": 867500000, - "rssi_offset": -166.0, - "tx_enable": true, - "tx_freq_min": 863000000, - "tx_freq_max": 870000000 - }, - "radio_1": { - "enable": true, - "type": "SX1257", - "freq": 868500000, - "rssi_offset": -166.0, - "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, - "bandwidth": 250000, - "spread_factor": 7 - }, - "chan_FSK": { - /* FSK 50kbps channel, 868.8 MHz */ - "enable": true, - "radio": 1, - "if": 300000, - "bandwidth": 125000, - "datarate": 50000 - }, - "tx_lut_0": { - /* TX gain table, index 0 */ - "pa_gain": 0, - "mix_gain": 11, - "rf_power": -6, - "dig_gain": 0 - }, - "tx_lut_1": { - /* TX gain table, index 1 */ - "pa_gain": 0, - "mix_gain": 13, - "rf_power": -3, - "dig_gain": 0 - }, - "tx_lut_2": { - /* TX gain table, index 2 */ - "pa_gain": 1, - "mix_gain": 9, - "rf_power": 0, - "dig_gain": 0 - }, - "tx_lut_3": { - /* TX gain table, index 3 */ - "pa_gain": 1, - "mix_gain": 10, - "rf_power": 3, - "dig_gain": 0 - }, - "tx_lut_4": { - /* TX gain table, index 4 */ - "pa_gain": 1, - "mix_gain": 12, - "rf_power": 6, - "dig_gain": 0 - }, - "tx_lut_5": { - /* TX gain table, index 5 */ - "pa_gain": 2, - "mix_gain": 10, - "rf_power": 10, - "dig_gain": 0 - }, - "tx_lut_6": { - /* TX gain table, index 6 */ - "pa_gain": 2, - "mix_gain": 11, - "rf_power": 11, - "dig_gain": 0 - }, - "tx_lut_7": { - /* TX gain table, index 7 */ - "pa_gain": 2, - "mix_gain": 11, - "rf_power": 12, - "dig_gain": 0 - }, - "tx_lut_8": { - /* TX gain table, index 8 */ - "pa_gain": 2, - "mix_gain": 12, - "rf_power": 13, - "dig_gain": 0 - }, - "tx_lut_9": { - /* TX gain table, index 9 */ - "pa_gain": 2, - "mix_gain": 13, - "rf_power": 14, - "dig_gain": 0 - }, - "tx_lut_10": { - /* TX gain table, index 10 */ - "pa_gain": 2, - "mix_gain": 15, - "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": 0 - }, - "tx_lut_12": { - /* TX gain table, index 12 */ - "pa_gain": 3, - "mix_gain": 12, - "rf_power": 23, - "dig_gain": 0 - }, - "tx_lut_13": { - /* TX gain table, index 13 */ - "pa_gain": 3, - "mix_gain": 13, - "rf_power": 25, - "dig_gain": 0 - }, - "tx_lut_14": { - /* TX gain table, index 14 */ - "pa_gain": 3, - "mix_gain": 15, - "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 */ - "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 3c0dc8f..85fb8e3 100644 --- a/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb +++ b/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb @@ -18,8 +18,6 @@ SRC_URI = "git://github.com/Lora-net/packet_forwarder.git;protocol=git \ file://global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 \ file://global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 \ file://global_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic \ - file://global_conf.json.MTAC_LORA_1_5_CW \ - file://global_conf.json.MTAC_LORA_1_5_LORA \ file://local_conf.json \ file://lora-packet-forwarder-add-spi-dev-path.patch \ file://lora-packet-forwarder-remove-jit-power-check.patch \ @@ -54,8 +52,6 @@ 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 -m 755 ${WORKDIR}/global_conf.json.MTAC_LORA_1_5_CW ${D}${LORA_DIR}/ - install -m 755 ${WORKDIR}/global_conf.json.MTAC_LORA_1_5_LORA ${D}${LORA_DIR}/ } do_install_append_mtcap() { |