Merge branch 'master' into dev

.travis.yml

@@ -0,0 +1,21 @@
+language: cpp
+before_install:
+- sudo apt-get install -y python-serial srecord
+install:
+- wget https://github.com/GeorgeHahn/nodemcu-firmware/raw/travis/tools/esp-open-sdk.tar.gz -O tools/esp-open-sdk.tar.gz
+- tar -zxvf tools/esp-open-sdk.tar.gz
+- export PATH=$PATH:$PWD/esp-open-sdk/sdk:$PWD/esp-open-sdk/xtensa-lx106-elf/bin
+script:
+- make all
+- cd bin/
+- file_name="nodemcu-firmware_v${TRAVIS_TAG}.${TRAVIS_BUILD_NUMBER}.bin"
+- srec_cat -output ${file_name} -binary 0x00000.bin -binary -fill 0xff 0x00000 0x10000 0x10000.bin -binary -offset 0x10000
+deploy:
+  provider: releases
+  api_key:
+    secure: Swecz5lWvsuSbchSbVQ1rmCPN9nQIN5p/HlZNIEdEgAgnoLcJxRV4P8poVTB37jiA8Pck+8x2nWXpg74Rqik0i3KlPNvDfg5o4rIazWLNs4bc1Tbcpt44XAzFKKLYnDnWQUGcqjk7BcAXuNAF2X/fPBCVhFbHVg3Z7cDb32RsNw=
+  file: "$TRAVIS_BUILD_DIR/bin/${file_name}"
+  skip_cleanup: true
+  on:
+    tags: true
+    repo: nodemcu/nodemcu-firmware

README.md

@@ -1,5 +1,8 @@
 # **NodeMcu** #
 version 0.9.5
+
+[![Build Status](https://travis-ci.org/nodemcu/nodemcu-firmware.svg)](https://travis-ci.org/nodemcu/nodemcu-firmware)
+
 ###A lua based firmware for wifi-soc esp8266
 Build on [ESP8266 sdk 0.9.5](http://bbs.espressif.com/viewtopic.php?f=5&t=154)<br />
 Lua core based on [eLua project](http://www.eluaproject.net/)<br />