Skip to content

Fix channel selection for AU915-928 US902-928 #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix channel selection for AU915-928 US902-928 #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/ldl_mac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ static uint8_t requiredRate(uint8_t desired, uint8_t min, uint8_t max);
static void selectJoinChannelAndRate(struct ldl_mac *self, struct ldl_mac_tx *tx);
static void registerTime(struct ldl_mac *self, const struct ldl_mac_tx *tx);
static bool getChannel(const struct ldl_mac *self, uint8_t chIndex, uint32_t *freq, uint8_t *minRate, uint8_t *maxRate);
static bool isAvailable(const struct ldl_mac *self, uint8_t chIndex, uint32_t limit);
static bool isAvailable(const struct ldl_mac *self, uint8_t chIndex, uint32_t limit, uint8_t desired_rate);
static void initSession(struct ldl_mac *self, enum ldl_region region);
static void forgetNetwork(struct ldl_mac *self);
static bool setChannel(struct ldl_mac *self, uint8_t chIndex, uint32_t freq, uint8_t minRate, uint8_t maxRate);
Expand Down Expand Up @@ -2618,7 +2618,7 @@ static bool selectChannel(const struct ldl_mac *self, uint8_t desired_rate, uint
/* count number of available channels for this rate */
for(i=0; i < LDL_Region_numChannels(self->ctx.region); i++){

if(isAvailable(self, i, limit)){
if(isAvailable(self, i, limit, desired_rate)){

if(i == self->tx.chIndex){

Expand Down Expand Up @@ -2674,7 +2674,7 @@ static bool selectChannel(const struct ldl_mac *self, uint8_t desired_rate, uint
return retval;
}

static bool isAvailable(const struct ldl_mac *self, uint8_t chIndex, uint32_t limit)
static bool isAvailable(const struct ldl_mac *self, uint8_t chIndex, uint32_t limit, uint8_t desired_rate)
{
bool retval = false;
uint32_t freq;
Expand All @@ -2686,7 +2686,7 @@ static bool isAvailable(const struct ldl_mac *self, uint8_t chIndex, uint32_t li

if(getChannel(self, chIndex, &freq, &minRate, &maxRate)){

if(freq > 0U){
if((freq > 0U) && (desired_rate >= minRate && desired_rate <= maxRate)){

if(LDL_Region_getBand(self->ctx.region, freq, &band)){

Expand Down