Skip to content

Fix infinite join retry #207

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

Merged
johanstokking merged 3 commits into from
Jun 7, 2017
Merged

Fix infinite join retry #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0e4616
Fix infinite join retry
jpmeijers Jun 7, 2017
e5365c4
Introduce attempts variable
jpmeijers Jun 7, 2017
fa757ac
Version bump
jpmeijers Jun 7, 2017
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
2 changes: 1 addition & 1 deletion library.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=TheThingsNetwork
version=2.5.2
version=2.5.3
author=The Things Network
maintainer=Johan Stokking <johan@thethingsnetwork.org>
sentence=The Things Network Arduino Library.
Expand Down
4 changes: 3 additions & 1 deletion src/TheThingsNetwork.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,10 +499,12 @@ bool TheThingsNetwork::provision(const char *appEui, const char *appKey)

bool TheThingsNetwork::join(int8_t retries, uint32_t retryDelay)
{
int8_t attempts = 0;
configureChannels(fsb);
setSF(sf);
while (retries == -1 || retries-- >= 0)
while (retries == -1 || attempts <= retries)
{
attempts++;
if (!sendJoinSet(MAC_JOIN_MODE_OTAA))
{
debugPrintMessage(ERR_MESSAGE, ERR_JOIN_FAILED);
Expand Down