Merge pull request #188 from TheThingsNetwork/fix/provision-reset

Reset on provision

Author: johanstokking

src/TheThingsNetwork.cpp

@@ -472,6 +472,7 @@ bool TheThingsNetwork::personalize()
 
 bool TheThingsNetwork::provision(const char *appEui, const char *appKey)
 {
+  reset();
   if (strlen(appEui) != 16 || strlen(appKey) != 32)
   {
     debugPrintMessage(ERR_MESSAGE, ERR_KEY_LENGTH);
@@ -515,7 +516,6 @@ bool TheThingsNetwork::join(int8_t retries, uint32_t retryDelay)
 
 bool TheThingsNetwork::join(const char *appEui, const char *appKey, int8_t retries, uint32_t retryDelay)
 {
-  reset();
   return provision(appEui, appKey) && join(retries, retryDelay);
 }
 

src/TheThingsNetwork.h

@@ -53,7 +53,6 @@ class TheThingsNetwork
   void debugPrintIndex(uint8_t index, const char *value = NULL);
   void debugPrintMessage(uint8_t type, uint8_t index, const char *value = NULL);
 
-  void reset(bool adr = true);
   void autoBaud();
   void configureEU868(uint8_t sf);
   void configureUS915(uint8_t sf, uint8_t fsb);
@@ -69,6 +68,7 @@ class TheThingsNetwork
 
 public:
   TheThingsNetwork(Stream &modemStream, Stream &debugStream, ttn_fp_t fp, uint8_t sf = TTN_DEFAULT_SF, uint8_t fsb = TTN_DEFAULT_FSB);
+  void reset(bool adr = true);
   void showStatus();
   size_t getHardwareEui(char *buffer, size_t size);
   size_t getAppEui(char *buffer, size_t size);