Merge branch 'master' into fix/provision-reset

Author: johanstokking

src/TheThingsNetwork.cpp

@@ -287,11 +287,17 @@ TheThingsNetwork::TheThingsNetwork(Stream &modemStream, Stream &debugStream, ttn
 {
   this->debugStream = &debugStream;
   this->modemStream = &modemStream;
+  this->modemStream->setTimeout(10000);
   this->fp = fp;
   this->sf = sf;
   this->fsb = fsb;
 }
 
+size_t TheThingsNetwork::getAppEui(char *buffer, size_t size)
+{
+  return readResponse(MAC_TABLE, MAC_GET_SET_TABLE, MAC_APPEUI, buffer, size);
+}
+
 size_t TheThingsNetwork::getHardwareEui(char *buffer, size_t size)
 {
   return readResponse(SYS_TABLE, SYS_TABLE, SYS_GET_HWEUI, buffer, size);
@@ -369,8 +375,37 @@ size_t TheThingsNetwork::readResponse(uint8_t prefixTable, uint8_t indexTable, u
   return readLine(buffer, size);
 }
 
+void TheThingsNetwork::autoBaud()
+{
+  // Courtesy of @jpmeijers
+  modemStream->setTimeout(2000);
+  uint8_t attempts = 10;
+  size_t length = 0;
+  while (attempts-- && length == 0)
+  {
+    delay(100);
+    modemStream->write((byte)0x00);
+    modemStream->write(0x55);
+    modemStream->write(SEND_MSG);
+    sendCommand(SYS_TABLE, 0, true, false);
+    sendCommand(SYS_TABLE, SYS_GET, true, false);
+    sendCommand(SYS_TABLE, SYS_GET_VER, false, false);
+    modemStream->write(SEND_MSG);
+    length = modemStream->readBytesUntil('\n', buffer, sizeof(buffer));
+  }
+  delay(100);
+  clearReadBuffer();
+  modemStream->setTimeout(10000);
+  baudDetermined = true;
+}
+
 void TheThingsNetwork::reset(bool adr)
 {
+  if (!baudDetermined)
+  {
+    autoBaud();
+  }
+
   size_t length = readResponse(SYS_TABLE, SYS_RESET, buffer, sizeof(buffer));
 
   // buffer contains "RN2xx3 1.x.x ...", splitting model from version

src/TheThingsNetwork.h

@@ -42,6 +42,7 @@ class TheThingsNetwork
   uint8_t sf;
   uint8_t fsb;
   char buffer[512];
+  bool baudDetermined = false;
   void (*messageCallback)(const uint8_t *payload, size_t size, port_t port);
 
   void clearReadBuffer();
@@ -52,6 +53,7 @@ class TheThingsNetwork
   void debugPrintIndex(uint8_t index, const char *value = NULL);
   void debugPrintMessage(uint8_t type, uint8_t index, const char *value = NULL);
 
+  void autoBaud();
   void configureEU868(uint8_t sf);
   void configureUS915(uint8_t sf, uint8_t fsb);
   void configureChannels(uint8_t sf, uint8_t fsb);
@@ -69,6 +71,7 @@ class TheThingsNetwork
   void reset(bool adr = true);
   void showStatus();
   size_t getHardwareEui(char *buffer, size_t size);
+  size_t getAppEui(char *buffer, size_t size);
   void onMessage(void (*cb)(const uint8_t *payload, size_t size, port_t port));
   bool provision(const char *appEui, const char *appKey);
   bool join(const char *appEui, const char *appKey, int8_t retries = -1, uint32_t retryDelay = 10000);