RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

net/lorawan : Move 'LORAMAC_DEFAULT_RX1_DELAY' to 'CONFIG_'

Browse Source
This commit is contained in:
Akshai M 2020-11-23 17:36:46 +01:00
parent ca4acbff12
commit d48cee7c2a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/rn2xx3/rn2xx3.c
View File

@ -256,7 +256,7 @@ int rn2xx3_mac_init(rn2xx3_t *dev)
rn2xx3_mac_set_adr(dev, IS_ACTIVE(CONFIG_LORAMAC_DEFAULT_ADR));
rn2xx3_mac_set_retx(dev, CONFIG_LORAMAC_DEFAULT_RETX);
rn2xx3_mac_set_linkchk_interval(dev, CONFIG_LORAMAC_DEFAULT_LINKCHK);
rn2xx3_mac_set_rx1_delay(dev, LORAMAC_DEFAULT_RX1_DELAY);
rn2xx3_mac_set_rx1_delay(dev, CONFIG_LORAMAC_DEFAULT_RX1_DELAY);
rn2xx3_mac_set_ar(dev, IS_ACTIVE(CONFIG_RN2XX3_DEFAULT_AR));
rn2xx3_mac_set_rx2_dr(dev, LORAMAC_DEFAULT_RX2_DR);
rn2xx3_mac_set_rx2_freq(dev, LORAMAC_DEFAULT_RX2_FREQ);

6
sys/include/net/loramac.h
View File

@ -282,14 +282,14 @@ extern "C" {
/**
* @brief Default first RX window delay (in ms)
*/
#ifndef LORAMAC_DEFAULT_RX1_DELAY
#define LORAMAC_DEFAULT_RX1_DELAY (1000U)
#ifndef CONFIG_LORAMAC_DEFAULT_RX1_DELAY
#define CONFIG_LORAMAC_DEFAULT_RX1_DELAY (1000U)
#endif
/**
* @brief Default second RX window delay (in ms)
*/
#define LORAMAC_DEFAULT_RX2_DELAY (1000U + LORAMAC_DEFAULT_RX1_DELAY)
#define LORAMAC_DEFAULT_RX2_DELAY (1000U + CONFIG_LORAMAC_DEFAULT_RX1_DELAY)
/**
* @brief Default second RX window datarate index

2
sys/net/gnrc/link_layer/lorawan/gnrc_lorawan.c
View File

@ -46,7 +46,7 @@ static inline void gnrc_lorawan_mlme_reset(gnrc_lorawan_t *mac)
{
mac->mlme.activation = MLME_ACTIVATION_NONE;
mac->mlme.pending_mlme_opts = 0;
mac->rx_delay = (LORAMAC_DEFAULT_RX1_DELAY / MS_PER_SEC);
mac->rx_delay = (CONFIG_LORAMAC_DEFAULT_RX1_DELAY / MS_PER_SEC);
mac->mlme.nid = CONFIG_LORAMAC_DEFAULT_NETID;
}