riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/lora : Move 'LORA_CR_DEFAULT' to 'CONFIG_'

Browse Source 
Added choices and moved 'LORA_CR_DEFAULT' to 'CONFIG_' namespace
This commit is contained in:
Akshai M 2020-09-08 19:16:03 +05:30
parent aaeed98277
commit a161476041
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/sx127x/sx127x.c
View File

@ -173,7 +173,7 @@ void sx127x_init_radio_settings(sx127x_t *dev)
sx127x_set_tx_power(dev, SX127X_RADIO_TX_POWER); sx127x_set_tx_power(dev, SX127X_RADIO_TX_POWER);
sx127x_set_bandwidth(dev, CONFIG_LORA_BW_DEFAULT); sx127x_set_bandwidth(dev, CONFIG_LORA_BW_DEFAULT);
sx127x_set_spreading_factor(dev, CONFIG_LORA_SF_DEFAULT); sx127x_set_spreading_factor(dev, CONFIG_LORA_SF_DEFAULT);
sx127x_set_coding_rate(dev, LORA_CR_DEFAULT); sx127x_set_coding_rate(dev, CONFIG_LORA_CR_DEFAULT);
sx127x_set_crc(dev, LORA_PAYLOAD_CRC_ON_DEFAULT); sx127x_set_crc(dev, LORA_PAYLOAD_CRC_ON_DEFAULT);
sx127x_set_freq_hop(dev, LORA_FREQUENCY_HOPPING_DEFAULT); sx127x_set_freq_hop(dev, LORA_FREQUENCY_HOPPING_DEFAULT);
sx127x_set_hop_period(dev, LORA_FREQUENCY_HOPPING_PERIOD_DEFAULT); sx127x_set_hop_period(dev, LORA_FREQUENCY_HOPPING_PERIOD_DEFAULT);

14
sys/include/net/lora.h
View File

@ -84,9 +84,19 @@ extern "C" {
#define CONFIG_LORA_SF_DEFAULT (LORA_SF12) #define CONFIG_LORA_SF_DEFAULT (LORA_SF12)
#endif #endif
#if IS_ACTIVE(CONFIG_LORA_CR_DEFAULT_CR_4_5)
#define CONFIG_LORA_CR_DEFAULT (LORA_CR_4_5)
#elif IS_ACTIVE(CONFIG_LORA_CR_DEFAULT_CR_4_6)
#define CONFIG_LORA_CR_DEFAULT (LORA_CR_4_6)
#elif IS_ACTIVE(CONFIG_LORA_CR_DEFAULT_CR_4_7)
#define CONFIG_LORA_CR_DEFAULT (LORA_CR_4_7)
#elif IS_ACTIVE(CONFIG_LORA_CR_DEFAULT_CR_4_8)
#define CONFIG_LORA_CR_DEFAULT (LORA_CR_4_8)
#endif
/** @brief Set default coding rate to 8 */ /** @brief Set default coding rate to 8 */
#ifndef LORA_CR_DEFAULT #ifndef CONFIG_LORA_CR_DEFAULT
#define LORA_CR_DEFAULT (LORA_CR_4_8) #define CONFIG_LORA_CR_DEFAULT (LORA_CR_4_8)
#endif #endif
/** @brief Set fixed payload length on */ /** @brief Set fixed payload length on */