HuangRui
|
71469dd70f
|
Merge branch 'dev' of https://github.com/nodemcu/nodemcu-firmware
Conflicts:
app/include/user_version.h
app/modules/node.c
app/modules/wifi.c
|
2015-05-15 08:13:46 +08:00 |
funshine
|
bcbde08bf7
|
fix mqtt keepalive ping, add a example for mqtt in lua_examples.
|
2015-04-05 02:22:51 +08:00 |
funshine
|
1c2ee75a00
|
fix mqtt, do a format when wrong flash size is detected
|
2015-04-03 00:51:02 +08:00 |
funshine
|
dcb6e53af7
|
add auto-reconnect option to mqtt:connect api
|
2015-03-31 00:36:44 +08:00 |
funshine
|
09750b5653
|
add queue to mqtt module
|
2015-03-30 00:24:09 +08:00 |
funshine
|
d5731dd9bd
|
merge from dev
|
2015-03-20 20:15:38 +08:00 |
funshine
|
a70709268b
|
merge cjson and dev to master, make a stable release
|
2015-03-18 14:22:17 +08:00 |
funshine
|
808a359eb8
|
quick fix when wide charactor issue
|
2015-03-17 22:42:22 +08:00 |
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 |
funshine
|
0b95ae08a2
|
default build with coap, reduce coap module mem usage
|
2015-03-15 20:12:29 +08:00 |
funshine
|
d28a2c9eda
|
add interger version release, fix #234, #252, #246
|
2015-03-11 13:21:19 +08:00 |
funshine
|
81ea8d9597
|
add math, add file.fsinfo(), update spiffs.
|
2015-03-10 01:12:36 +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 |
funshine
|
bbef457e50
|
seperate user_config.h to speed-up compile when modules disabled/enabled
|
2015-03-06 11:59:04 +08:00 |