ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7816 from kivaisan/option_to_disabled_join_duty_cycle 

Lora: Refactor duty-cycle configuration and introduce config for JOIN request
pull/7873/head
Cruz Monrreal 2018-08-23 10:05:44 -05:00 committed by GitHub
parent cb8d09a88a 2f15dae400
commit f7a731544c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
features/lorawan/lorastack/mac/LoRaMac.cpp
View File

@ -1070,11 +1070,16 @@ lorawan_status_t LoRaMac::schedule_tx()
_params.timers.aggregated_timeoff = 0;
}
if (MBED_CONF_LORA_DUTY_CYCLE_ON && _lora_phy->verify_duty_cycle(true)) {
_params.is_dutycycle_on = true;
} else {
_params.is_dutycycle_on = false;
}
calculate_backOff(_params.last_channel_idx);
next_channel.aggregate_timeoff = _params.timers.aggregated_timeoff;
next_channel.current_datarate = _params.sys_params.channel_data_rate;
_params.is_dutycycle_on = MBED_CONF_LORA_DUTY_CYCLE_ON;
next_channel.dc_enabled = _params.is_dutycycle_on;
next_channel.joined = _is_nwk_joined;
next_channel.last_aggregate_tx_time = _params.timers.aggregated_last_tx_time;
@ -1158,9 +1163,6 @@ lorawan_status_t LoRaMac::schedule_tx()
void LoRaMac::calculate_backOff(uint8_t channel)
{
lorawan_time_t elapsed_time = _lora_time.get_elapsed_time(_params.timers.mac_init_time);
_params.is_dutycycle_on = MBED_CONF_LORA_DUTY_CYCLE_ON;
_lora_phy->calculate_backoff(_is_nwk_joined, _params.is_last_tx_join_request, _params.is_dutycycle_on,
channel, elapsed_time, _params.timers.tx_toa);

10
features/lorawan/lorastack/phy/LoRaPHY.cpp
View File

@ -270,8 +270,7 @@ lorawan_time_t LoRaPHY::update_band_timeoff(bool joined, bool duty_cycle,
// Update bands Time OFF
for (uint8_t i = 0; i < nb_bands; i++) {
if (joined == false) {
if (MBED_CONF_LORA_DUTY_CYCLE_ON_JOIN && joined == false) {
uint32_t txDoneTime = MAX(_lora_time->get_elapsed_time(bands[i].last_join_tx_time),
(duty_cycle == true) ?
_lora_time->get_elapsed_time(bands[i].last_tx_time) : 0);
@ -283,7 +282,6 @@ lorawan_time_t LoRaPHY::update_band_timeoff(bool joined, bool duty_cycle,
if (bands[i].off_time != 0) {
next_tx_delay = MIN(bands[i].off_time - txDoneTime, next_tx_delay);
}
} else {
// if network has been joined
if (duty_cycle == true) {
@ -451,7 +449,7 @@ uint8_t LoRaPHY::get_bandwidth(uint8_t dr)
}
}
uint8_t LoRaPHY::enabled_channel_count(bool joined, uint8_t datarate,
uint8_t LoRaPHY::enabled_channel_count(uint8_t datarate,
const uint16_t *channel_mask,
uint8_t *channel_indices,
uint8_t *delayTx)
@ -1182,7 +1180,7 @@ void LoRaPHY::calculate_backoff(bool joined, bool last_tx_was_join_req, bool dc_
// Reset time-off to initial value.
band_table[band_idx].off_time = 0;
if (joined == false) {
if (MBED_CONF_LORA_DUTY_CYCLE_ON_JOIN && joined == false) {
// Get the join duty cycle
if (elapsed_time < 3600000) {
join_duty_cycle = BACKOFF_DC_1_HOUR;
@ -1245,7 +1243,7 @@ lorawan_status_t LoRaPHY::set_next_channel(channel_selection_params_t *params,
band_table, phy_params.bands.size);
// Search how many channels are enabled
channel_count = enabled_channel_count(params->joined, params->current_datarate,
channel_count = enabled_channel_count(params->current_datarate,
phy_params.channels.mask,
enabled_channels, &delay_tx);
} else {

2
features/lorawan/lorastack/phy/LoRaPHY.h
View File

@ -632,7 +632,7 @@ protected:
*/
uint8_t get_bandwidth(uint8_t dr_index);
uint8_t enabled_channel_count(bool joined, uint8_t datarate,
uint8_t enabled_channel_count(uint8_t datarate,
const uint16_t *mask, uint8_t* enabledChannels,
uint8_t* delayTx);

3
features/lorawan/lorastack/phy/LoRaPHYAS923.cpp
View File

@ -361,8 +361,7 @@ lorawan_status_t LoRaPHYAS923::set_next_channel(channel_selection_params_t* next
bands, AS923_MAX_NB_BANDS);
// Search how many channels are enabled
nb_enabled_channels = enabled_channel_count(next_channel_prams->joined,
next_channel_prams->current_datarate,
nb_enabled_channels = enabled_channel_count(next_channel_prams->current_datarate,
channel_mask,
enabled_channels, &delay_tx);
} else {

7
features/lorawan/lorastack/phy/LoRaPHYAU915.cpp
View File

@ -593,10 +593,9 @@ lorawan_status_t LoRaPHYAU915::set_next_channel(channel_selection_params_t* next
bands, AU915_MAX_NB_BANDS);
// Search how many channels are enabled
nb_enabled_channels = enabled_channel_count(next_chan_params->joined,
next_chan_params->current_datarate,
current_channel_mask,
enabled_channels, &delay_tx);
nb_enabled_channels = enabled_channel_count(next_chan_params->current_datarate,
current_channel_mask,
enabled_channels, &delay_tx);
} else {
delay_tx++;
next_tx_delay = next_chan_params->aggregate_timeoff - _lora_time->get_elapsed_time(next_chan_params->last_aggregate_tx_time);

6
features/lorawan/lorastack/phy/LoRaPHYKR920.cpp
View File

@ -430,9 +430,9 @@ lorawan_status_t LoRaPHYKR920::set_next_channel(channel_selection_params_t* para
bands, KR920_MAX_NB_BANDS);
// Search how many channels are enabled
nb_enabled_channels = enabled_channel_count(params->joined, params->current_datarate,
channel_mask,
enabled_channels, &delay_tx);
nb_enabled_channels = enabled_channel_count(params->current_datarate,
channel_mask,
enabled_channels, &delay_tx);
} else {
delay_tx++;
nextTxDelay = params->aggregate_timeoff - _lora_time->get_elapsed_time(params->last_aggregate_tx_time);

3
features/lorawan/lorastack/phy/LoRaPHYUS915.cpp
View File

@ -631,8 +631,7 @@ lorawan_status_t LoRaPHYUS915::set_next_channel(channel_selection_params_t* para
next_tx_delay = update_band_timeoff(params->joined, params->dc_enabled, bands, US915_MAX_NB_BANDS);
// Search how many channels are enabled
nb_enabled_channels = enabled_channel_count(params->joined,
params->current_datarate,
nb_enabled_channels = enabled_channel_count(params->current_datarate,
current_channel_mask,
enabled_channels, &delay_tx);
} else {

3
features/lorawan/lorastack/phy/LoRaPHYUS915Hybrid.cpp
View File

@ -631,8 +631,7 @@ lorawan_status_t LoRaPHYUS915Hybrid::set_next_channel(channel_selection_params_t
US915_HYBRID_MAX_NB_BANDS);
// Search how many channels are enabled
nb_enabled_channels = enabled_channel_count(params->joined,
params->current_datarate,
nb_enabled_channels = enabled_channel_count(params->current_datarate,
current_channel_mask,
enabled_channels, &delay_tx);
} else {

4
features/lorawan/mbed_lib.json
View File

@ -57,6 +57,10 @@
"help": "Enables/disables duty cycling. NOTE: Disable only for testing. Mandatory in many regions.",
"value": true
},
"duty-cycle-on-join": {
"help": "Enables/disables duty cycling for JOIN requests (disabling requires duty-cycle-on to be disabled). NOTE: Disable only for testing!",
"value": true
},
"lbt-on": {
"help": "Enables/disables LBT. NOTE: [This feature is not yet integrated].",
"value": false