Add init() to run once, fixes #114 (#116)

FokkeZB · web-flow · commit 398016e799af · 2016-10-27T10:39:28.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,18 @@
-language: c
+language: python
+python:
+    - "2.7"
+
+# Cache PlatformIO packages using Travis CI container-based infrastructure
 sudo: false
-before_install:
-  - source <(curl -SLs https://raw.githubusercontent.com/adafruit/travis-ci-arduino/master/install.sh)
+cache:
+    directories:
+        - "~/.platformio"
+
+env:
+    - PLATFORMIO_CI_SRC=test
+
+install:
+    - pip install -U platformio
+
 script:
-  - build_main_platforms
-  - build_platform trinket
+    - platformio ci --lib=src --board=leonardo --board=sparkfun_promicro8
diff --git a/AUTHORS b/AUTHORS
@@ -1,2 +1,2 @@
 Johan Stokking <johan@thethingsnetwork.org>
-Fokke Zandbergen <mail@fokkezb.nl>
+Fokke Zandbergen <mail@fokkezb.nl>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -3,4 +3,4 @@
 We'd ❤️ to welcome your contribution. Please make sure you:
 
 1.  Keep [keywords.txt](../keywords.txt) up to date with your changes.
-2.  Keep [API.md](../API.md) up to date with your changes.
+2.  Keep [API.md](../API.md) up to date with your changes.
diff --git a/LICENSE b/LICENSE
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 # The Things Network Arduino Library
+[![Build Status](https://travis-ci.org/TheThingsNetwork/arduino-device-lib.svg?branch=master)](https://travis-ci.org/TheThingsNetwork/arduino-device-lib)
 
 This is an [Arduino Library](https://www.arduino.cc/en/Guide/Libraries) for Arduino-compatible devices like [The Things Uno](https://shop.thethingsnetwork.com/index.php/product/the-things-uno/) and [Node](https://shop.thethingsnetwork.com/index.php/product/the-things-node/) to communicate via [The Things Network](https://www.thethingsnetwork.org).
 
diff --git a/examples/ABP/ABP.ino b/examples/ABP/ABP.ino
@@ -35,4 +35,4 @@ void loop() {
   ttn.sendBytes(payload, sizeof(payload));
 
   delay(10000);
-}
+}
diff --git a/examples/PassThrough/PassThrough.ino b/examples/PassThrough/PassThrough.ino
@@ -27,4 +27,4 @@ void loop() {
   while (loraSerial.available()) {
     debugSerial.write(loraSerial.read());
   }
-}
+}
diff --git a/examples/QuickStart/Converter.js b/examples/QuickStart/Converter.js
@@ -12,4 +12,4 @@ function Converter(decoded) {
   }
     
   return converted;
-}
+}
diff --git a/examples/QuickStart/Decoder.js b/examples/QuickStart/Decoder.js
@@ -6,4 +6,4 @@ function Decoder(bytes) {
   decoded.led = bytes[0];
     
   return decoded;
-}
+}
diff --git a/examples/QuickStart/Encoder.js b/examples/QuickStart/Encoder.js
@@ -6,4 +6,4 @@ function Encoder(object) {
   bytes[0] = object.led ? 1 : 0;
     
   return bytes;
-}
+}
diff --git a/examples/QuickStart/QuickStart.ino b/examples/QuickStart/QuickStart.ino
@@ -55,4 +55,4 @@ void message(const byte* payload, size_t length, port_t port) {
     debugSerial.println("LED: on");
     digitalWrite(LED_BUILTIN, HIGH);
   }
-}
+}
diff --git a/examples/QuickStart/Validator.js b/examples/QuickStart/Validator.js
@@ -7,4 +7,4 @@ function Validator(converted) {
   }
     
   return true;
-}
+}
diff --git a/examples/Receive/Receive.ino b/examples/Receive/Receive.ino
@@ -44,4 +44,4 @@ void message(const byte* payload, size_t length, port_t port) {
   }
 
   debugSerial.println();
-}
+}
diff --git a/examples/Send/Send.ino b/examples/Send/Send.ino
@@ -34,4 +34,4 @@ void loop() {
   ttn.sendBytes(payload, sizeof(payload));
 
   delay(10000);
-}
+}
diff --git a/library.properties b/library.properties
@@ -7,4 +7,4 @@ paragraph=Compatible with any Microchip RN2483 and RN2903 device.
 category=Communication
 url=https://github.com/TheThingsNetwork/arduino-device-lib
 architectures=*
-includes=TheThingsNetwork.h
+includes=TheThingsNetwork.h
diff --git a/src/TheThingsNetwork.cpp b/src/TheThingsNetwork.cpp
@@ -10,6 +10,29 @@
 #define TTN_HEX_CHAR_TO_NIBBLE(c) ((c >= 'A') ? (c - 'A' + 0x0A) : (c - '0'))
 #define TTN_HEX_PAIR_TO_BYTE(h, l) ((TTN_HEX_CHAR_TO_NIBBLE(h) << 4) + TTN_HEX_CHAR_TO_NIBBLE(l))
 
+TheThingsNetwork::TheThingsNetwork(Stream& modemStream, Stream& debugStream, ttn_fp_t fp, uint8_t sf, uint8_t fsb) {
+  this->debugStream = &debugStream;
+  this->modemStream = &modemStream;
+  this->fp = fp;
+  this->sf = sf;
+  this->fsb = fsb;
+}
+
+void TheThingsNetwork::init() {
+  static bool done = false;
+
+  if (done) {
+    return;
+  }
+
+  // trigger auto-baud detection to fix
+  // https://github.com/TheThingsNetwork/arduino-device-lib/issues/114
+  modemStream->write(0x55);
+  delay(200);
+
+  done = true;
+}
+
 String TheThingsNetwork::readLine() {
   while (true) {
     String line = modemStream->readStringUntil('\n');
@@ -20,6 +43,8 @@ String TheThingsNetwork::readLine() {
 }
 
 String TheThingsNetwork::readValue(String cmd) {
+  init();
+
   while(modemStream->available()) {
     modemStream->read();
   }
@@ -394,7 +419,7 @@ void TheThingsNetwork::configureUS915(uint8_t sf, uint8_t fsb) {
     str = "";
     str.concat(F("mac set ch status "));
     str.concat(ch);
-    if (ch == ch500 || ch <= chHigh && ch >= chLow) {
+    if (ch == ch500 || (ch <= chHigh && ch >= chLow)) {
       str.concat(F(" on"));
       sendCommand(str);
       if (ch < 63) {
@@ -453,11 +478,3 @@ void TheThingsNetwork::configureChannels(uint8_t sf, uint8_t fsb) {
   retries.concat(TTN_RETX);
   sendCommand(retries);
 }
-
-TheThingsNetwork::TheThingsNetwork(Stream& modemStream, Stream& debugStream, ttn_fp_t fp, uint8_t sf, uint8_t fsb) {
-  this->debugStream = &debugStream;
-  this->modemStream = &modemStream;
-  this->fp = fp;
-  this->sf = sf;
-  this->fsb = fsb;
-}
diff --git a/src/TheThingsNetwork.h b/src/TheThingsNetwork.h
@@ -52,6 +52,7 @@ class TheThingsNetwork
     bool sendCommand(String cmd);
     bool sendCommand(String cmd, String value);
     bool sendCommand(String cmd, const byte *buf, size_t length);
+    void init();
     void reset(bool adr = true);
     void configureEU868(uint8_t sf);
     void configureUS915(uint8_t sf, uint8_t fsb);
diff --git a/test/TheThingsNetwork.ino b/test/TheThingsNetwork.ino
@@ -0,0 +1,61 @@
+#include <TheThingsNetwork.h>
+
+const char *appEui = "0000000000000000";
+const char *appKey = "00000000000000000000000000000000";
+
+const char *devAddr = "00000000";
+const char *nwkSKey = "00000000000000000000000000000000";
+const char *appSKey = "00000000000000000000000000000000";
+
+#define loraSerial Serial1
+#define debugSerial Serial
+
+TheThingsNetwork ttn(loraSerial, debugSerial, TTN_FP_EU868);
+
+TheThingsNetwork ttn2(loraSerial, debugSerial, TTN_FP_EU868, 10);
+
+TheThingsNetwork ttn3(loraSerial, debugSerial, TTN_FP_EU868, 10, 4);
+
+void setup() {
+  loraSerial.begin(57600);
+  debugSerial.begin(9600);
+
+  ttn.provision(appEui, appKey);
+
+  ttn.join(appEui, appKey);
+
+  ttn.join(appEui, appKey, 3);
+
+  ttn.join(appEui, appKey, 3, 60000);
+
+  ttn.join();
+
+  ttn.join(3);
+
+  ttn.join(3, 60000);
+
+  ttn.personalize(devAddr, nwkSKey, appSKey);
+
+  ttn.personalize();
+
+  ttn.showStatus();
+
+  ttn.onMessage(message);
+}
+
+void loop() {
+  byte payload[1] = { 0x00 };
+  ttn.sendBytes(payload, sizeof(payload));
+
+  ttn.sendBytes(payload, sizeof(payload), 2);
+
+  ttn.sendBytes(payload, sizeof(payload), 2, true);
+
+  ttn.poll();
+
+  ttn.poll(2);
+
+  ttn.poll(2, true);
+}
+
+void message(const byte* payload, size_t length, port_t port) {}

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`Johan Stokking <johan@thethingsnetwork.org>`
`2`		`-Fokke Zandbergen <mail@fokkezb.nl>`
	`2`	`+Fokke Zandbergen <mail@fokkezb.nl>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# The Things Network Arduino Library`
	`2`	`+[![Build Status](https://travis-ci.org/TheThingsNetwork/arduino-device-lib.svg?branch=master)](https://travis-ci.org/TheThingsNetwork/arduino-device-lib)`
`2`	`3`
`3`	`4`	`This is an [Arduino Library](https://www.arduino.cc/en/Guide/Libraries) for Arduino-compatible devices like [The Things Uno](https://shop.thethingsnetwork.com/index.php/product/the-things-uno/) and [Node](https://shop.thethingsnetwork.com/index.php/product/the-things-node/) to communicate via [The Things Network](https://www.thethingsnetwork.org).`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,4 @@ void loop() {`
`27`	`27`	`while (loraSerial.available()) {`
`28`	`28`	`debugSerial.write(loraSerial.read());`
`29`	`29`	`}`
`30`		`-}`
	`30`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,4 @@ function Converter(decoded) {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`return converted;`
`15`		`-}`
	`15`	`+}`