Merge pull request #2 from witnessmenow/master

Merge from source

Author: rusboard

.gitignore

@@ -26,3 +26,7 @@
 *.exe
 *.out
 *.app
+.pioenvs
+.piolibdeps
+.clang_complete
+.gcc-flags.json

.travis.yml

@@ -0,0 +1,30 @@
+language: python
+python:
+    - "2.7"
+
+# Cache PlatformIO packages using Travis CI container-based infrastructure
+sudo: false
+cache:
+    directories:
+        - "~/.platformio"
+
+env:
+    - SCRIPT=platformioSingle EXAMPLE=EchoBot BOARDTYPE=ESP8266 BOARD=d1_mini
+    - SCRIPT=platformioSingle EXAMPLE=CustomKeyboard BOARDTYPE=ESP8266 BOARD=d1_mini
+    - SCRIPT=platformioSingle EXAMPLE=FlashledBot BOARDTYPE=ESP8266 BOARD=d1_mini
+    - SCRIPT=platformioSingle EXAMPLE=UsingWiFiManager BOARDTYPE=ESP8266 BOARD=d1_mini
+    - SCRIPT=platformioSingle EXAMPLE=BulkMessages BOARDTYPE=ESP8266 BOARD=d1_mini
+
+    # This will run all the ESP8266 examples
+    #- SCRIPT=platformioEsp8266 BOARD=d1_mini
+
+install:
+    - pip install -U platformio
+    #
+    # Libraries from PlatformIO Library Registry:
+    #
+    # http://platformio.org/lib/show/64/ArduinoJson
+    - platformio lib -g install 64
+    # http://platformio.org/lib/show/567/WifiManager
+    - platformio lib -g install 567
+script: scripts/travis/$SCRIPT.sh

examples/101/FlashledBot/FlashledBot.ino

@@ -54,7 +54,7 @@ void handleNewMessages(int numNewMessages) {
       }
     }
     if (text == "/start") {
-      String from_name = message.from_name;
+      String from_name = bot.messages[i].from_name;
       if (from_name == "") from_name = "Anonymous";
 
       String welcome = "Welcome, " + from_name + ", from FlashLedBot, your personal Bot on Arduino 101\n";

examples/ESP8266/FlashledBot/FlashledBot.ino

@@ -54,7 +54,7 @@ void handleNewMessages(int numNewMessages) {
       }
     }
     if (text == "/start") {
-      String from_name = message.from_name;
+      String from_name = bot.messages[i].from_name;
       if (from_name == "") from_name = "Anonymous";
 
       String welcome = "Welcome, " + from_name + ", from FlashLedBot, your personal Bot on ESP8266\n";

lib/readme.txt

@@ -0,0 +1,36 @@
+
+This directory is intended for the project specific (private) libraries.
+PlatformIO will compile them to static libraries and link to executable file.
+
+The source code of each library should be placed in separate directory, like
+"lib/private_lib/[here are source files]".
+
+For example, see how can be organized `Foo` and `Bar` libraries:
+
+|--lib
+|  |--Bar
+|  |  |--docs
+|  |  |--examples
+|  |  |--src
+|  |     |- Bar.c
+|  |     |- Bar.h
+|  |--Foo
+|  |  |- Foo.c
+|  |  |- Foo.h
+|  |- readme.txt --> THIS FILE
+|- platformio.ini
+|--src
+   |- main.c
+
+Then in `src/main.c` you should use:
+
+#include <Foo.h>
+#include <Bar.h>
+
+// rest H/C/CPP code
+
+PlatformIO will find your libraries automatically, configure preprocessor's
+include paths and build them.
+
+More information about PlatformIO Library Dependency Finder
+- http://docs.platformio.org/page/librarymanager/ldf.html

platformio.ini

@@ -0,0 +1,17 @@
+; PlatformIO Project Configuration File
+;
+;   Build options: build flags, source filter
+;   Upload options: custom upload port, speed and extra flags
+;   Library options: dependencies, extra library storages
+;   Advanced options: extra scripting
+;
+; Please visit documentation for the other options and examples
+; http://docs.platformio.org/page/projectconf.html
+[common]
+lib_deps_external = ArduinoJson
+
+[env:d1_mini]
+platform = espressif8266
+board = d1_mini
+framework = arduino
+lib_deps = WifiManager, ${common.lib_deps_external}

scripts/travis/platformioEsp8266.sh

@@ -0,0 +1,6 @@
+#!/bin/sh -eux
+
+for EXAMPLE in $PWD/examples/ESP8266/*/*.ino;
+do
+	platformio ci $EXAMPLE -l '.' -b $BOARD
+done

scripts/travis/platformioSingle.sh

@@ -0,0 +1,3 @@
+#!/bin/sh -eux
+
+platformio ci $PWD/examples/$BOARDTYPE/$EXAMPLE/$EXAMPLE.ino -l '.' -b $BOARD