Skip to content
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

Jump to bottom

Honor the channel mask while trying to join the network. #45

Closed
wants to merge 1 commit into from
Closed

Honor the channel mask while trying to join the network. #45

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
18 changes: 15 additions & 3 deletions src/lmic/lmic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,14 +880,26 @@ static void initJoinLoop (void) {
static ostime_t nextJoinState (void) {
// Try the following:
// SF7/8/9/10 on a random channel 0..63
// SF8C on a random channel 64..71
// (honoring enable mask)
// SF8C on a random 500 kHz channel 64..71
// (always determined by
// previously selected
// 125 kHz channel)
//
u1_t failed = 0;
if( LMIC.datarate != DR_SF8C ) {
LMIC.txChnl = 64+(LMIC.txChnl&7);
// assume that 500 kHz equiv of last 125 kHz channel
// is also enabled, and use it next.
LMIC.txChnl = 64+(LMIC.txChnl>>3);
setDrJoin(DRCHG_SET, DR_SF8C);
} else {
LMIC.txChnl = os_getRndU1() & 0x3F;
u1_t chnl;

// honor enabled-channel list while joining.
do {
LMIC.txChnl = chnl = os_getRndU1() & 0x3F;
} while ((LMIC.channelMap[(chnl >> 4)] & (1<<(chnl & 0xF))) == 0);

s1_t dr = DR_SF7 - ++LMIC.txCnt;
if( dr < DR_SF10 ) {
dr = DR_SF10;
Expand Down