Merge pull request #197 from TheThingsNetwork/fix/adr-reset

Fix reset of ADR

Author: johanstokking

src/TheThingsNetwork.cpp

@@ -424,6 +424,7 @@ void TheThingsNetwork::reset(bool adr)
   {
     sendMacSet(MAC_ADR, "off");
   }
+  this->adr = adr;
 }
 
 void TheThingsNetwork::saveState()
@@ -442,7 +443,7 @@ void TheThingsNetwork::onMessage(void (*cb)(const uint8_t *payload, size_t size,
 
 bool TheThingsNetwork::personalize(const char *devAddr, const char *nwkSKey, const char *appSKey)
 {
-  reset();
+  reset(adr);
   if (strlen(devAddr) != 8 || strlen(appSKey) != 32 || strlen(nwkSKey) != 32)
   {
     debugPrintMessage(ERR_MESSAGE, ERR_KEY_LENGTH);
@@ -473,7 +474,7 @@ bool TheThingsNetwork::personalize()
 
 bool TheThingsNetwork::provision(const char *appEui, const char *appKey)
 {
-  reset();
+  reset(adr);
   if (strlen(appEui) != 16 || strlen(appKey) != 32)
   {
     debugPrintMessage(ERR_MESSAGE, ERR_KEY_LENGTH);
@@ -661,7 +662,7 @@ void TheThingsNetwork::configureUS915(uint8_t sf, uint8_t fsb)
 
 void TheThingsNetwork::configureAS920_923(uint8_t sf)
 {
-  sendMacSet(MAC_ADR, "off");  // TODO: remove when ADR is implemented for this plan
+  sendMacSet(MAC_ADR, "off"); // TODO: remove when ADR is implemented for this plan
   sendMacSet(MAC_RX2, "2 923200000");
 
   char buf[10];

src/TheThingsNetwork.h

@@ -14,7 +14,7 @@
 
 #define TTN_PWRIDX_EU868 "1"
 #define TTN_PWRIDX_US915 "5"
-#define TTN_PWRIDX_AS920_923 "1"  // TODO: should be 0, but the current RN2903AS firmware doesn't accept that value (probably still using EU868: 1=14dBm)
+#define TTN_PWRIDX_AS920_923 "1" // TODO: should be 0, but the current RN2903AS firmware doesn't accept that value (probably still using EU868: 1=14dBm)
 
 #define TTN_BUFFER_SIZE 300
 
@@ -43,6 +43,7 @@ class TheThingsNetwork
   ttn_fp_t fp;
   uint8_t sf;
   uint8_t fsb;
+  bool adr;
   char buffer[512];
   bool baudDetermined = false;
   void (*messageCallback)(const uint8_t *payload, size_t size, port_t port);