Commit Graph

444 Commits

Author SHA1 Message Date
HuangRui 0b01f28c62 Merge branch 'dev' of https://github.com/nodemcu/nodemcu-firmware
Conflicts:
	app/include/user_modules.h
	app/include/user_version.h
2015-03-16 01:13:03 +08:00
HuangRui 6c6d0d0e2e Merge branch 'dev' of https://github.com/nodemcu/nodemcu-firmware 2015-03-16 01:08:22 +08:00
HuangRui 4e7473bc00 Fixed flash automatic detection bug. Support 128MBit flash. 2015-03-16 01:05:06 +08:00
HuangRui dfce182622 Paste new version, make it can get correct flash size. 2015-03-16 00:51:47 +08:00
HuangRui ed87cbd96f Try to fix flash auto detection bug. 2015-03-16 00:48:28 +08:00
funshine 9818c5063b Merge branch 'master' into dev 2015-03-15 20:51:38 +08:00
zeroday 6c8cace9c0 Merge pull request #222 from sza2/master
Fix for negative values, Thanks @sza2
2015-03-15 20:46:50 +08:00
funshine 0b95ae08a2 default build with coap, reduce coap module mem usage 2015-03-15 20:12:29 +08:00
Vowstar e3c31d0629 Merge pull request #280 from nodemcu/master
Merge master to dev096.
2015-03-15 20:04:55 +08:00
funshine 394cced84b fix #273 2015-03-15 16:06:35 +08:00
funshine f510e658d5 merge master solve conflicts 2015-03-15 15:01:07 +08:00
zeroday a1be293f15 Merge pull request #279 from Erant/master
Fix getFSF to abide by the function contract, Thanks @Erant
2015-03-15 14:55:17 +08:00
funshine c46000069d reduce coap module memory usage 2015-03-15 13:44:50 +08:00
Erant 0a4049767a Fix getFSF to abide by the function contract 2015-03-14 09:00:25 -07:00
funshine a816622839 update readme 2015-03-12 14:25:54 +08:00
funshine 8638863ac8 update readme 2015-03-12 14:20:40 +08:00
funshine 9f006acd8a update readme 2015-03-12 14:05:47 +08:00
zeroday 4cb8d95f15 Merge pull request #275 from gitter-badger/gitter-badge
Add a Gitter chat badge to README.md
2015-03-12 14:00:12 +08:00
The Gitter Badger 400572318c Added Gitter badge 2015-03-12 05:54:57 +00:00
funshine d28a2c9eda add interger version release, fix #234, #252, #246 2015-03-11 13:21:19 +08:00
funshine 113db6f43e fix travis.yml 2015-03-11 11:10:43 +08:00
funshine f9afd20238 modify travis file to support build integer 2015-03-11 11:02:07 +08:00
funshine 24411d34c1 fix tmr.time() 2015-03-11 08:59:00 +08:00
funshine e9035e75de minimal fix to readme 2015-03-10 23:19:30 +08:00
funshine 27c0620912 fix bugs for spiffs from pellepl/spiffs 2015-03-10 23:07:47 +08:00
funshine 43594cf501 update readme 2015-03-10 01:39:25 +08:00
funshine 81ea8d9597 add math, add file.fsinfo(), update spiffs. 2015-03-10 01:12:36 +08:00
zeroday b489838017 Merge pull request #271 from ftruzzi/master
DRDYn pin support added.
2015-03-08 10:12:15 +08:00
Francesco Truzzi c96c8d570a Update README.md 2015-03-07 15:04:42 +01:00
ftruzzi 1c54cca234 Added DRDYn pin support. 2015-03-07 15:01:20 +01:00
Francesco Truzzi 8c2880d718 Delete README.md 2015-03-07 14:57:08 +01:00
Vowstar acf0df3aad Merge pull request #269 from ftruzzi/master
New module: HDC1000 temperature and humidity sensor.
2015-03-07 11:03:37 +08:00
Francesco Truzzi be93fe5e14 Update README.md 2015-03-07 03:14:52 +01:00
ftruzzi 9f7a2554f5 First release of HDC1000 module.
A module for the HDC1000 temperature and humidity sensor.
2015-03-07 03:11:17 +01:00
funshine 8369f74bd0 comment out math.fmod to reduce code size 2015-03-06 17:00:37 +08:00
funshine 9d0c733073 Merge branch 'dev' into dev096 2015-03-06 16:46:37 +08:00
funshine feeeeef0b8 fix readme 2015-03-06 16:38:28 +08:00
funshine 1f66e65ce4 update readme 2015-03-06 16:34:24 +08:00
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