From 85727485cfc8b42c57b18f8a400635eaba0c5145 Mon Sep 17 00:00:00 2001 From: robcazzaro Date: Mon, 16 Feb 2015 19:17:23 +0000 Subject: [PATCH 1/8] Update dht22.lua Addresses issue #225, slower loop timing due to the use of floats. Should be safe to use with integer-only builds, since on integer-only builds I could never see "3" as a valid value for either low or high --- lua_modules/dht22/dht22.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua_modules/dht22/dht22.lua b/lua_modules/dht22/dht22.lua index b7b04092..a80a1bd6 100644 --- a/lua_modules/dht22/dht22.lua +++ b/lua_modules/dht22/dht22.lua @@ -62,17 +62,17 @@ function M.read(pin) --DHT data acquired, process. for i = 1, 16, 1 do - if (bitStream[i] > 4) then + if (bitStream[i] > 3) then humidity = humidity + 2 ^ (16 - i) end end for i = 1, 16, 1 do - if (bitStream[i + 16] > 4) then + if (bitStream[i + 16] > 3) then temperature = temperature + 2 ^ (16 - i) end end for i = 1, 8, 1 do - if (bitStream[i + 32] > 4) then + if (bitStream[i + 32] > 3) then checksum = checksum + 2 ^ (8 - i) end end From 888fbdf338cd2e48aa8ca79fc5ff8916a05955cb Mon Sep 17 00:00:00 2001 From: Damian Date: Fri, 20 Feb 2015 20:24:00 +0100 Subject: [PATCH 2/8] ver 0.9.5 reports error in tmr.alarm() There was no alarm ID. --- lua_examples/telnet.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua_examples/telnet.lua b/lua_examples/telnet.lua index 18645187..22610445 100644 --- a/lua_examples/telnet.lua +++ b/lua_examples/telnet.lua @@ -29,11 +29,11 @@ function startServer() print("===Now, logon and input LUA.====") end -tmr.alarm(1000, 1, function() +tmr.alarm(1, 1000, 1, function() if wifi.sta.getip()=="0.0.0.0" then print("Connect AP, Waiting...") else startServer() - tmr.stop() + tmr.stop(1) end end) From 2b5ee453a80bedbc26a96d951bc755c001e06836 Mon Sep 17 00:00:00 2001 From: George Hahn Date: Thu, 26 Feb 2015 20:13:27 -0500 Subject: [PATCH 3/8] Move contributing guidelines to repository Moves guidelines for contribution from issue #176 to a file in the repository. Github will show a message with this file to contributors, increasing its visibility. Closes #176 --- CONTRIBUTING.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..42be531f --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,7 @@ +## Contributing + +Thank you everyone for contributing to this project. + +Pull requests for new features and major fixes should be opened against the `dev` branch. + +*Note that the `pre_build` bin in the dev branch is never up-to-date.* From 194ee39629f121bcea3c70381439a3cd1df962e6 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Fri, 27 Feb 2015 22:55:20 +0100 Subject: [PATCH 4/8] Fix Pinout HTML table layout when trying to copy the layout into html, the output breaks due to a missing closing backet --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d4f88930..dbf3cace 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ build pre_build bin. 6GPIO12 - 7GPIO13 + 7GPIO13 #### [*] D0(GPIO16) can only be used as gpio read/write. no interrupt supported. no pwm/i2c/ow supported. From 1a390faef1bc1cfc3ae1d8c36d7c34de72e2f050 Mon Sep 17 00:00:00 2001 From: George Hahn Date: Wed, 4 Mar 2015 20:22:02 -0500 Subject: [PATCH 5/8] Add TravisCI build status --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index dbf3cace..75a21312 100644 --- a/README.md +++ b/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)
Lua core based on [eLua project](http://www.eluaproject.net/)
From fbf42d5472afd5447cea133ceaae866054d6d984 Mon Sep 17 00:00:00 2001 From: George Hahn Date: Wed, 4 Mar 2015 21:15:27 -0500 Subject: [PATCH 6/8] Add basic .travis.yml --- .travis.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..2f5eedfc --- /dev/null +++ b/.travis.yml @@ -0,0 +1,22 @@ +language: cpp +before_install: +- sudo apt-get install -y python-serial srecord +install: +- wget https://github.com/GeorgeHahn/nodemcu-firmware/blob/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: "${GITHUB_OAUTH}" +# file: "$TRAVIS_BUILD_DIR/bin/${file_name}" +# skip_cleanup: true +# on: +# tags: true +#env: +# global: +# - secure: OVFK1zFj8VFVITWIGR2UlinVoTFNjlcQZeFt4xpn+B0wLz1mAWnR//F49qLkAcZt2ca8ogbQwEyDenFfkcSKOkUpvivyDatkHEt4WAhdXeg2y3zdHjX7NntscQBpTUmwjhV/0OA0qV9sNLK5r1t45oDh2NVcpfEQTJP5oYKfe6I= From 86a408d3e092967ac4ac00b9da44da2018647903 Mon Sep 17 00:00:00 2001 From: George Hahn Date: Wed, 4 Mar 2015 21:19:54 -0500 Subject: [PATCH 7/8] Fix toolchain URL --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2f5eedfc..67e4771b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: cpp before_install: - sudo apt-get install -y python-serial srecord install: -- wget https://github.com/GeorgeHahn/nodemcu-firmware/blob/travis/tools/esp-open-sdk.tar.gz -O tools/esp-open-sdk.tar.gz +- 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: From 6986d9e5aa2de1b90840bb182aef716c4dbe18f8 Mon Sep 17 00:00:00 2001 From: funshine Date: Thu, 5 Mar 2015 11:36:37 +0800 Subject: [PATCH 8/8] update travis.yml --- .travis.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 67e4771b..45aedeab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,13 +10,12 @@ script: - 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: "${GITHUB_OAUTH}" -# file: "$TRAVIS_BUILD_DIR/bin/${file_name}" -# skip_cleanup: true -# on: -# tags: true -#env: -# global: -# - secure: OVFK1zFj8VFVITWIGR2UlinVoTFNjlcQZeFt4xpn+B0wLz1mAWnR//F49qLkAcZt2ca8ogbQwEyDenFfkcSKOkUpvivyDatkHEt4WAhdXeg2y3zdHjX7NntscQBpTUmwjhV/0OA0qV9sNLK5r1t45oDh2NVcpfEQTJP5oYKfe6I= +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