Commit Graph

1455 Commits

Author SHA1 Message Date
funshine d5731dd9bd merge from dev 2015-03-20 20:15:38 +08:00
funshine 4332b21ef3 minor fix 2015-03-20 19:42:10 +08:00
Vowstar 1562215905 Merge pull request #301 from devsaurus/dev
Use correct function for stop in U8G_COM_MSG_WRITE_BYTE
2015-03-19 12:17:11 +08:00
devsaurus 2d254bd47c use correct function for stop in U8G_COM_MSG_WRITE_BYTE 2015-03-18 22:33:16 +01:00
zeroday 1bd3f56693 Merge pull request #297 from nodemcu/dev
Dev
2015-03-18 19:39:03 +08:00
funshine 3d14530b80 fix cjson.encode() when in integer version 2015-03-18 19:37:47 +08:00
funshine 3aead6d230 try to fix cjson.encode in integer only version 2015-03-18 17:01:01 +08:00
zeroday a61cbfb238 Merge pull request #295 from nodemcu/master
merge from master
2015-03-18 16:43:12 +08:00
funshine a70709268b merge cjson and dev to master, make a stable release 2015-03-18 14:22:17 +08:00
zeroday a01bda03dd Merge pull request #294 from nodemcu/json
Json branch merged to master
2015-03-18 13:11:11 +08:00
zeroday fa7cf87832 Merge pull request #287 from nodemcu/dev
Dev merge to master
2015-03-18 12:57:59 +08:00
zeroday 1652df50cf Merge pull request #293 from devsaurus/dev
Update u8glib integration, thanks to @devsaurus
2015-03-18 12:46:49 +08:00
devsaurus b34a8b46fe use RES pin for examples 2015-03-17 21:03:15 +01:00
devsaurus 09b650be41 disable untested pcd8544 driver for the moment 2015-03-17 20:52:47 +01:00
devsaurus 87598c5dfe Merge remote-tracking branch 'upstream/dev' into dev 2015-03-17 20:35:39 +01:00
funshine 808a359eb8 quick fix when wide charactor issue 2015-03-17 22:42:22 +08:00
zeroday 51881158ec Merge pull request #289 from markusgritsch/dev
Added node.setcpufreq(mhz) function. thanks @markusgritsch,
should use with caution, when bitbang
2015-03-17 21:03:48 +08:00
Markus Gritsch b648e9a8db Added node.setcpufreq(mhz) function.
This function allows setting the CPU frequency to node.CPU80MHZ or
node.CPU160MHZ.
2015-03-17 10:23:45 +01:00
markusgritsch abfdb58d40 Merge pull request #4 from nodemcu/dev
Dev
2015-03-17 09:15:45 +01:00
funshine e19e026d49 update readme 2015-03-17 00:24:30 +08:00
funshine 45e7f270cc Merge branch 'dev' into json 2015-03-17 00:13:15 +08:00
funshine 4d3c1a930f code clean up for cjson 2015-03-17 00:12:25 +08:00
funshine 54004a4beb fix cjson bugs and reduce mem usage 2015-03-16 23:59:57 +08:00
Vowstar d8c8d257ce Merge pull request #285 from AllAboutEE/dev
Read and Send Email Examples
2015-03-16 18:28:43 +08:00
AllAboutEE eef53a532f Merge remote-tracking branch 'upstream/dev' into dev 2015-03-16 04:22:07 -05:00
AllAboutEE 6c092e42ed Fixed bug where email text after CR and LF would not be read. Added example links, Fixed bug where send function could not be called more than once due to count variable. 2015-03-16 04:17:19 -05:00
funshine c0d690ce7e under development 2015-03-16 17:11:48 +08:00
funshine d425dd7127 under develop 2015-03-16 17:09:43 +08:00
AllAboutEE 0144e40cf0 Added comments and links to learn more about SMTP. 2015-03-16 00:39:29 -05:00
funshine 83f53c23c1 json port from cjson. not work yet, add cjson folder 2015-03-16 09:19:06 +08:00
funshine c9912f1d82 json port from cjson. not work yet, delete folder 2015-03-16 09:17:21 +08:00
funshine 9c0c960e84 json port from cjson. not work yet 2015-03-16 09:00:33 +08:00
Vowstar 4d5242e1b7 Merge pull request #284 from nodemcu/dev
Sync from dev to dev096.
2015-03-16 05:44:51 +08:00
HuangRui 5c84359b5c ROM flash size can changed with detected size, fixed #283. 2015-03-16 05:40:43 +08:00
devsaurus 8e7e531022 update readme 2015-03-15 22:08:35 +01:00
devsaurus 3124bcf357 Merge remote-tracking branch 'upstream/dev' into dev 2015-03-15 22:06:30 +01:00
HuangRui f7eed2b53b Changed e9 to magic_e9. 2015-03-16 01:44:54 +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
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