Commit Graph

2166 Commits

Author SHA1 Message Date
funshine 45f6abd448 merge coap 2015-03-06 16:24:55 +08:00
funshine 13b08cdacf add macro to control built-in lib for lua, add libm.a 2015-03-06 15:55:24 +08:00
HuangRui 6ea3d6390c Merge branch 'dev' of https://github.com/nodemcu/nodemcu-firmware
Conflicts:
	app/include/user_config.h
	ld/eagle.app.v6.ld
2015-03-06 14:02:58 +08:00
HuangRui f51b47258d Merge branch 'dev096' of https://github.com/nodemcu/nodemcu-firmware 2015-03-06 13:54:34 +08:00
funshine 1d1f085707 Merge branch 'master' into dev 2015-03-06 13:33:50 +08:00
funshine bbef457e50 seperate user_config.h to speed-up compile when modules disabled/enabled 2015-03-06 11:59:04 +08:00
funshine 6986d9e5aa update travis.yml 2015-03-05 11:36:37 +08:00
zeroday 6d49d0acbd Merge pull request #265 from GeorgeHahn/patch-2
Add TravisCI integration
2015-03-05 10:24:53 +08:00
George Hahn 86a408d3e0 Fix toolchain URL 2015-03-04 21:19:54 -05:00
George Hahn fbf42d5472 Add basic .travis.yml 2015-03-04 21:15:27 -05:00
zeroday 20e9cece41 Merge pull request #264 from GeorgeHahn/patch-1
Add TravisCI build status
2015-03-05 10:08:56 +08:00
George Hahn 1a390faef1 Add TravisCI build status 2015-03-04 20:22:02 -05:00
devsaurus 315d1a1696 Merge remote-tracking branch 'upstream/dev' into dev 2015-03-04 22:18:26 +01:00
zeroday c309ae4ce8 Merge pull request #263 from markusgritsch/dev
Accidentally removed ROM_MODULES_U8G
2015-03-04 10:34:58 +08:00
Markus Gritsch ab1eb0b93b Accidentally removed ROM_MODULES_U8G
I am sorry, I made an error in my last pull request and accidentally
removed ROM_MODULES_U8G.  Here is it back again.
2015-03-03 20:51:16 +01:00
zeroday fae802dae5 Merge pull request #260 from markusgritsch/dev
Changed the ws2812 byte order from GRB to RGB
2015-03-03 21:59:34 +08:00
Markus Gritsch 484dbf2683 Changed the ws2812 byte order from GRB to RGB
There seems to be interest in using the more intuitive RGB byte order to
specify the LED color. Also fixed the documentation.
2015-03-03 14:51:49 +01:00
markusgritsch 711a537c6f Merge pull request #1 from nodemcu/dev
Dev
2015-03-03 11:39:34 +01:00
Markus Gritsch 8432e8c8be Changed the ws2812 byte order from GRB to RGB
There seems to be interest in using the more intuitive RGB byte order to
specify the LED color. Also fixed the documentation.
2015-03-03 10:20:02 +01:00
funshine 0f6046d8a2 Merge branch 'master' into dev 2015-03-03 14:46:08 +08:00
zeroday c374b7df44 Merge pull request #247 from Ezekiel-DA/dev
Fix file.seek() return value (@Ezekiel-DA)
2015-03-03 10:39:33 +08:00
zeroday 9add31e2c7 Merge pull request #258 from AllAboutEE/dev
I2C Driver Module For the MCP23008 I/O Expander (@AllAboutEE)
2015-03-03 10:31:46 +08:00
Miguel Alvarez 92f9c8c1a5 Merge pull request #1 from AllAboutEE/mcp23008
Added I/O expander MCP23008 module and two examples: digital output with...
2015-03-02 13:23:18 -06:00
AllAboutEE 34d0b773d9 Added I/O expander MCP23008 module and two examples: digital output with LEDS, and digital input with buttons. 2015-03-02 13:21:26 -06:00
devsaurus 5f1d324059 remove caching 2015-03-01 23:45:25 +01:00
devsaurus 32774d428c handle font data as light userdata 2015-03-01 23:11:24 +01:00
Vowstar 2e6b5af607 Merge pull request #256 from GeorgeHahn/GeorgeHahn-Add-Contributing-Doc
Move contributing guidelines to repository
2015-03-01 18:38:33 +08:00
Vowstar 84a9ab35a8 Merge pull request #251 from makefu/patch-1
Fix Pinout HTML table layout
2015-02-28 09:50:16 +08:00
Felix Richter 194ee39629 Fix Pinout HTML table layout
when trying to copy the layout into html, the output breaks due to a missing closing backet
2015-02-27 22:55:20 +01:00
George Hahn 2b5ee453a8 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
2015-02-26 20:13:27 -05:00
devsaurus 7ae293d566 set free'd pointer to NULL 2015-02-25 23:17:08 +01:00
Ezekiel-DA c869eddb8a Update file.c
Made file.seek() return nil on error / EOF, as specified in documentation, instead of returning true.
2015-02-25 14:34:07 -05:00
HuangRui 7c820b4e8f Update header of flash binary definition. 2015-02-25 23:08:08 +08:00
Tamas Szabo 67ab2d018e Update ds18b20.lua 2015-02-21 17:05:16 +01:00
Vowstar e60e4f1f5d Merge pull request #236 from dMbski/patch-1
ver 0.9.5 reports error in tmr.alarm()
2015-02-21 10:43:25 +08:00
devsaurus 2cfb86b5b5 improve device and page buffer initialization 2015-02-20 21:15:38 +01:00
Damian 888fbdf338 ver 0.9.5 reports error in tmr.alarm()
There was no alarm ID.
2015-02-20 20:24:00 +01:00
devsaurus e3ed4fc0da fix typo 2015-02-20 18:24:53 +01:00
devsaurus 6c0adbf980 SPI comm function, untested 2015-02-20 11:07:52 +01:00
devsaurus 81be529d68 preparation for adding more display devices: allocate and construct page buffer
dynamically to save heap for unused device types
2015-02-19 16:47:41 +01:00
devsaurus 8e42631a81 implement drawBitmap 2015-02-19 12:12:14 +01:00
devsaurus a287020096 implement drawXBM 2015-02-18 23:57:34 +01:00
HuangRui 37d2c9f6c1 Revert and remove EGC in user_config.h 2015-02-17 23:44:05 +08:00
Vowstar 94aa3bef17 Merge pull request #227 from robcazzaro/patch-1
Update dht22.lua to address issue #225
2015-02-17 17:22:35 +08:00
Vowstar 9b3ea24198 Merge pull request #226 from devsaurus/dev
Include u8glib
2015-02-17 17:20:29 +08:00
robcazzaro 85727485cf 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
2015-02-16 19:17:23 +00:00
HuangRui c05fc843f4 Enable EGC. 2015-02-17 02:25:05 +08:00
HuangRui cb9828e357 Add newline at the file end of dummy.c 2015-02-16 22:14:37 +08:00
HuangRui 0d02ade0ab Rebuild the pre_build. 2015-02-16 21:52:03 +08:00
HuangRui bb0a5b1d7c Re enabled open-source LWIP using dummy.c
Fixed the RAM issue.
2015-02-16 21:50:08 +08:00