From f4a46426cc4825079dd884333eae3fdeaca7a9a2 Mon Sep 17 00:00:00 2001 From: John Klug Date: Tue, 22 Jun 2021 08:45:55 -0500 Subject: LPF Geo 5.1.0 r7 --- ....json.MTAC_LORA_2_1_loc_dual_antenna_16ch_US915 | 139 +++++++++++++++++++++ .../lora-packet-forwarder-geolocation_5.1.0.bb | 3 +- 2 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_16ch_US915 diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_16ch_US915 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_16ch_US915 new file mode 100644 index 0000000..01e71e3 --- /dev/null +++ b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_16ch_US915 @@ -0,0 +1,139 @@ +{ + "SX1301_array_conf":[ + { + "board_type": "MASTER", + "board_rx_freq": 908600000, /* radio RX central frequency in Hz */ + "board_rx_bw": 13000000, /* radio RX bandwidth in Hz */ + "full_duplex": false, /* radio mode */ + "rf_chain_conf":[ + { + /* RX */ + "rx_enable": true, + "rssi_offset": -202.5, + "rssi_offset_coeff_a": 20, + "rssi_offset_coeff_b": 2925, + /* TX */ + "tx_enable": true, + "tx_freq_min": 923300000, + "tx_freq_max": 927500000, + "tx_lut":[ + { "rf_power": 9, "fpga_dig_gain": 5, "ad9361_atten": 111, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 }, + { "rf_power": 11, "fpga_dig_gain": 5, "ad9361_atten": 104, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 }, + { "rf_power": 12, "fpga_dig_gain": 5, "ad9361_atten": 101, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 }, + { "rf_power": 13, "fpga_dig_gain": 5, "ad9361_atten": 91, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -3, "ad9361_tcomp_coeff_b": -508 }, + { "rf_power": 14, "fpga_dig_gain": 5, "ad9361_atten": 87, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -3, "ad9361_tcomp_coeff_b": -508 }, + { "rf_power": 16, "fpga_dig_gain": 5, "ad9361_atten": 79, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -2, "ad9361_tcomp_coeff_b": -610 }, + { "rf_power": 18, "fpga_dig_gain": 5, "ad9361_atten": 71, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -1, "ad9361_tcomp_coeff_b": -1247 }, + { "rf_power": 20, "fpga_dig_gain": 5, "ad9361_atten": 63, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": 0, "ad9361_tcomp_coeff_b": -1417 }, + { "rf_power": 22, "fpga_dig_gain": 5, "ad9361_atten": 55, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": 0, "ad9361_tcomp_coeff_b": -1417 }, + { "rf_power": 24, "fpga_dig_gain": 5, "ad9361_atten": 47, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": 0, "ad9361_tcomp_coeff_b": -1555 }, + { "rf_power": 25, "fpga_dig_gain": 5, "ad9361_atten": 43, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": 0, "ad9361_tcomp_coeff_b": -1785 }, + { "rf_power": 26, "fpga_dig_gain": 5, "ad9361_atten": 39, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": 0, "ad9361_tcomp_coeff_b": -1785 }, + { "rf_power": 27, "fpga_dig_gain": 5, "ad9361_atten": 35, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": 0, "ad9361_tcomp_coeff_b": -1785 }, + { "rf_power": 28, "fpga_dig_gain": 5, "ad9361_atten": 30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -1, "ad9361_tcomp_coeff_b": -1755 }, + { "rf_power": 29, "fpga_dig_gain": 5, "ad9361_atten": 26, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -1, "ad9361_tcomp_coeff_b": -1755 }, + { "rf_power": 30, "fpga_dig_gain": 5, "ad9361_atten": 22, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -3, "ad9361_tcomp_coeff_b": -1183 }] + }, + { + /* RX */ + "rx_enable": true, + "rssi_offset": -202.5, + "rssi_offset_coeff_a": 20, + "rssi_offset_coeff_b": 2925, + /* TX */ + "tx_enable": true, + "tx_freq_min": 923300000, + "tx_freq_max": 927500000, + "tx_lut":[ + { "rf_power": 9, "fpga_dig_gain": 5, "ad9361_atten": 111, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 }, + { "rf_power": 11, "fpga_dig_gain": 5, "ad9361_atten": 104, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 }, + { "rf_power": 12, "fpga_dig_gain": 5, "ad9361_atten": 101, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 }, + { "rf_power": 13, "fpga_dig_gain": 5, "ad9361_atten": 91, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -3, "ad9361_tcomp_coeff_b": -508 }, + { "rf_power": 14, "fpga_dig_gain": 5, "ad9361_atten": 87, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -3, "ad9361_tcomp_coeff_b": -508 }, + { "rf_power": 16, "fpga_dig_gain": 5, "ad9361_atten": 79, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -2, "ad9361_tcomp_coeff_b": -610 }, + { "rf_power": 18, "fpga_dig_gain": 5, "ad9361_atten": 71, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -1, "ad9361_tcomp_coeff_b": -1247 }, + { "rf_power": 20, "fpga_dig_gain": 5, "ad9361_atten": 63, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": 0, "ad9361_tcomp_coeff_b": -1417 }, + { "rf_power": 22, "fpga_dig_gain": 5, "ad9361_atten": 55, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": 0, "ad9361_tcomp_coeff_b": -1417 }, + { "rf_power": 24, "fpga_dig_gain": 5, "ad9361_atten": 47, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": 0, "ad9361_tcomp_coeff_b": -1555 }, + { "rf_power": 25, "fpga_dig_gain": 5, "ad9361_atten": 43, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": 0, "ad9361_tcomp_coeff_b": -1785 }, + { "rf_power": 26, "fpga_dig_gain": 5, "ad9361_atten": 39, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": 0, "ad9361_tcomp_coeff_b": -1785 }, + { "rf_power": 27, "fpga_dig_gain": 5, "ad9361_atten": 35, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": 0, "ad9361_tcomp_coeff_b": -1785 }, + { "rf_power": 28, "fpga_dig_gain": 5, "ad9361_atten": 30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -1, "ad9361_tcomp_coeff_b": -1755 }, + { "rf_power": 29, "fpga_dig_gain": 5, "ad9361_atten": 26, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -1, "ad9361_tcomp_coeff_b": -1755 }, + { "rf_power": 30, "fpga_dig_gain": 5, "ad9361_atten": 22, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -3, "ad9361_tcomp_coeff_b": -1183 }] + }], + "SX1301_conf":[ + { + "chip_enable": true, + "chip_center_freq": 907800000, + "chip_rf_chain": 0, + "chan_multiSF_0": { "chan_rx_freq": 907100000 , "spread_factor": "7-10" }, + "chan_multiSF_1": { "chan_rx_freq": 907300000 , "spread_factor": "7-10" }, + "chan_multiSF_2": { "chan_rx_freq": 907500000 , "spread_factor": "7-10" }, + "chan_multiSF_3": { "chan_rx_freq": 907700000 , "spread_factor": "7-10" }, + "chan_multiSF_4": { "chan_rx_freq": 907900000 , "spread_factor": "7-10" }, + "chan_multiSF_5": { "chan_rx_freq": 908100000 , "spread_factor": "7-10" }, + "chan_multiSF_6": { "chan_rx_freq": 908300000 , "spread_factor": "7-10" }, + "chan_multiSF_7": { "chan_rx_freq": 908500000 , "spread_factor": "7-10" }, + "chan_LoRa_std" : { "chan_rx_freq": 907800000 , "bandwidth": 500000, "spread_factor": 8 }, + "chan_FSK" : { "chan_rx_freq": 907800000 , "bandwidth": 125000, "bit_rate": 50000 } + },{ + "chip_enable": true, + "chip_center_freq": 909400000, + "chip_rf_chain": 0, + "chan_multiSF_0": { "chan_rx_freq": 908700000 , "spread_factor": "7-10" }, + "chan_multiSF_1": { "chan_rx_freq": 908900000 , "spread_factor": "7-10" }, + "chan_multiSF_2": { "chan_rx_freq": 909100000 , "spread_factor": "7-10" }, + "chan_multiSF_3": { "chan_rx_freq": 909300000 , "spread_factor": "7-10" }, + "chan_multiSF_4": { "chan_rx_freq": 909500000 , "spread_factor": "7-10" }, + "chan_multiSF_5": { "chan_rx_freq": 909700000 , "spread_factor": "7-10" }, + "chan_multiSF_6": { "chan_rx_freq": 909900000 , "spread_factor": "7-10" }, + "chan_multiSF_7": { "chan_rx_freq": 910100000 , "spread_factor": "7-10" }, + "chan_LoRa_std" : { "chan_rx_freq": 909400000 , "bandwidth": 500000, "spread_factor": 8 }, + "chan_FSK" : { "chan_rx_freq": 909400000 , "bandwidth": 125000, "bit_rate": 50000 } + }], + "FSK_sync": "C194C1", + "loramac_public": true, + "nb_dsp": 1, + "dsp_stat_interval": 10, + "aes_key": "ABCDEF0123456789ABCDEF0123456789", + "calibration_temperature_celsius_room": 22, + "calibration_temperature_code_ad9361": 77, + "fts_version": 1, + "fts_match_crc_error": false + }], + "gateway_conf": { + "gateway_ID": "00AEAEFFFE000000", + /* change with default server address/ports */ + "server_address": "127.0.0.1", + "serv_port_up": 1780, + "serv_port_down": 1782, + /* 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, + /* link testing mote */ + "link_mote": "00CC01AF", + /* Beaconing parameters */ + "beacon_conf":{ + "period": 128, + "freq_hz": 923300000, + "freq_nb": 8, + "freq_step": 600000, + "datarate": 12, + "bw_hz": 500000, + "power": 14, + "infodesc": 0 + } + }, + "gps_conf": { + "gw_latitude": 0, + "gw_longitude": 0, + "gw_altitude": 0, + "fixed_altitude": false + } +} diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation_5.1.0.bb b/recipes-connectivity/lora/lora-packet-forwarder-geolocation_5.1.0.bb index b42bd31..ace77f7 100644 --- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation_5.1.0.bb +++ b/recipes-connectivity/lora/lora-packet-forwarder-geolocation_5.1.0.bb @@ -9,7 +9,7 @@ RDEPENDS_${PN} += "bash" # Source revision PSR = "r4" # Recipe revision -PR = "r6" +PR = "r7" SRCREV = "v${PV}" @@ -19,6 +19,7 @@ SRC_URI = "http://multitech.net/downloads/lora-packet-forwarder-geolocation_arm9 file://global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_partial_diversity_EU868 \ file://global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_EU868 \ file://global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_US915 \ + file://global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_16ch_US915 \ file://global_conf.json.MTAC_LORA_2_1_loc_single_antenna_64ch_US915 \ file://global_conf.json.MTAC_LORA_2_1_loc_single_antenna_full_duplex_64ch_US915 \ file://global_conf.json.MTAC_LORA_2_1_test_dual_antenna_56ch_partial_diversity_EU868 \ -- cgit v1.2.3