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
43d06459a6
Merge pull request #409 from dnc40085/dev096-wifi_scan_done
...
Change format of table that is output by wifi_scan_done function
2015-05-15 07:54:48 +08:00
60e1e8ba7d
Merge pull request #408 from dnc40085/dev096-wifi.ap.config
...
Additions and changes to wifi module
2015-05-15 07:54:42 +08:00
55cff23f64
Merge pull request #405 from dnc40085/dev096-wifi.setmac_fix
...
Fix for inability to use standard formatted MAC address with wifi.setmac()
2015-05-15 07:54:34 +08:00
d30fea9bd0
Merge pull request #413 from dnc40085/dev096-tmr.alarm_memory_leak_fix
...
Fix for issue #382
2015-05-15 07:49:49 +08:00
a5d96f4719
Merge pull request #404 from dnc40085/dev096-wifi.sta.getconfig
...
Add function wifi.sta.getconfig() and more parameters to wifi.sta.config()
2015-05-15 07:45:56 +08:00
4c2ad0f545
Add -Os flag to release and debug builds
...
To fit the build on boards with 512K of flash, build using -Os flag.
2015-05-14 11:27:43 -04:00
894fcc4799
minor change
2015-05-14 04:59:55 -07:00
4f097cf063
Fixed memory leak in tmr.alarm()
2015-05-14 04:40:57 -07:00
cf32376467
Minor change to wifi.sta.getap()
2015-05-11 21:02:46 -07:00
e9081a81a5
Remove conflict
2015-05-11 20:03:02 -07:00
3941977550
Removed commented lines from previous commit
2015-05-11 18:45:27 -07:00
78cb215bb2
Changed output format of table that is output by wifi_scan_done
2015-05-11 18:26:16 -07:00
f31671044d
Fixed error in wifi_station_listap
2015-05-11 17:59:51 -07:00
aca2b7724b
Added description to wifi_station_listap
2015-05-11 05:38:23 -07:00
cf54f85549
Added ability to set scan configuration to wifi.sta.getap
2015-05-11 05:12:34 -07:00
5b375cfe50
Copied changes from dev branch, commit f13c5c6 from Wayne Bartnick
...
wifi.sta.config (wifi_station_config):
- range checking password length (8~64)
wifi.ap.config (wifi_ap_config):
- range checking ssid length (1~32)
- range checking pwd length (8~64)
- new params:
- auth: wifi.OPEN, wifi.WPA_PSK, wifi.WPA2_PSK, wifi.WPA_WPA2_PSK
- default WITH pwd: wifi.WPA_WPA2_PSK
- default WITHOUT pwd: wifi.OPEN
- channel: 1~13 (default: 6)
- hidden: 0/1 (default: 0)
- max: 1~4 (default: 4)
- beacon: 100~60000ms (default: 100)
wifi.ap.getclient (wifi_ap_listclient):
- returns table(mac,ip) of all connected clients
wifi.ap.dhcp:
- new submodule
- config (wifi_ap_dhcp_config), returns start/end ips
- params:
- start (e.g., "192.168.1.100")
- end ip calculated from wifi.ap.config.max
- start (wifi_ap_dhcp_start), returns boolean
- stop (wifi_ap_dhcp_stop), returns boolean
2015-05-11 05:06:48 -07:00
c6c8bd84a0
minor change to wifi.sta.config()
2015-05-11 00:05:28 -07:00
7533a6afba
Fix for inability to use standard formatted MAC address with
...
wifi.setmac() also changed wifi.getmac() to use macro
2015-05-09 04:29:18 -07:00
f9e0e0cc61
Added examples to description of wifi.sta.config()
2015-05-09 04:17:35 -07:00
e667b2029d
Added function wifi.sta.getconfig()
...
Added more parameters to wifi.sta.config()
2015-05-09 01:50:35 -07:00
bc7b9f86c4
Allow connecting to unsecured WiFi networks
2015-05-07 15:12:57 +02:00
700ba55d26
Fix for memory leak in function wifi.sta.getap()
2015-05-07 05:02:59 -07:00
749e71d9cb
Fixed strange SPI flash API error. Added word_of_aligned_array.
2015-05-05 23:59:30 +08:00
32e9ac204a
Fix PWM init bug, set all initial duty to 0.
2015-05-01 18:35:30 +08:00
1923280572
Merge pull request #365 from nodemcu/master
...
Add ICMP ping to net module
2015-05-01 14:57:50 +08:00
f4a9de4886
Added comments for setphymode and getphymode functions in wifi module
...
Added constants PHYMODE_B, PHYMODE_G, PHYMODE_N to wifi module
2015-04-29 00:06:06 -07:00
900c43d520
Add setphymode and getphymode to wifi module
2015-04-26 20:03:44 -07:00
f68d41608e
Add multicastJoin and multicastLeave to net module
...
net.multicastJoin(if_ip, multicast_ip)
net.multicastLeave(if_ip, multicast_ip)
if_ip is a string containing the interface ip to join/leave the
multicast group. multicast_ip is the multicast ip of the group to
join/leave. if_ip can be "" or "any" to affect all interfaces.
2015-04-15 03:41:13 -05:00
81d9f8893a
fix #353
2015-04-12 23:34:11 +08:00
f19e24c7ac
Update tmr.c
...
According to NodeMCU team recommendations.
2015-04-10 14:56:17 +05:00
e61ad9d7ba
Merge pull request #339 from wladurner/issue_321
...
fixes issue #321 "ws2812.writergb scrambles buffer" reported by makefu.
2015-04-06 21:26:04 +08:00
68607e3d2e
Merge pull request #334 from model101/buf1kdev
...
LUAL_BUFFERSIZE back to 1K and warning notice added
2015-04-06 00:01:12 +08:00
a333d6a9b9
Merge pull request #333 from wbartnick/dev
...
wifi submodule enhancements, thanks to @wbartnick
2015-04-05 23:09:33 +08:00
06193090e6
LUAL_BUFFERSIZE back to 1K and warning notice added
2015-04-05 16:14:52 +02:00
ff85cf4371
fixes issue #321 "ws2812.writergb scrambles buffer" reported by makefu.
...
Don't modify Lua-internal lstring - use a copy instead.
2015-04-05 15:49:32 +02:00
f13c5c61e6
wifi.sta.config (wifi_station_config):
...
- range checking password length (8~64)
wifi.ap.config (wifi_ap_config):
- range checking ssid length (1~32)
- range checking pwd length (8~64)
- new params:
- auth: wifi.OPEN, wifi.WPA_PSK, wifi.WPA2_PSK, wifi.WPA_WPA2_PSK
- default WITH pwd: wifi.WPA_WPA2_PSK
- default WITHOUT pwd: wifi.OPEN
- channel: 1~13 (default: 6)
- hidden: 0/1 (default: 0)
- max: 1~4 (default: 4)
- beacon: 100~60000ms (default: 100)
wifi.ap.getclient (wifi_ap_listclient):
- returns table(mac,ip) of all connected clients
wifi.ap.dhcp:
- new submodule
- config (wifi_ap_dhcp_config), returns start/end ips
- params:
- start (e.g., "192.168.1.100")
- end ip calculated from wifi.ap.config.max
- start (wifi_ap_dhcp_start), returns boolean
- stop (wifi_ap_dhcp_stop), returns boolean
2015-04-05 09:21:16 -04:00
bcbde08bf7
fix mqtt keepalive ping, add a example for mqtt in lua_examples.
2015-04-05 02:22:51 +08:00
8558641190
add gpio.serout() api to help serialize bit out
2015-04-03 16:05:14 +08:00
1c2ee75a00
fix mqtt, do a format when wrong flash size is detected
2015-04-03 00:51:02 +08:00
32e062f523
polish mqtt module
2015-03-31 23:38:28 +08:00
dcb6e53af7
add auto-reconnect option to mqtt:connect api
2015-03-31 00:36:44 +08:00
09750b5653
add queue to mqtt module
2015-03-30 00:24:09 +08:00
3dd1ac3739
Move node.readvdd33 to adc.readvdd33, fix #162 .
2015-03-27 00:52:55 +08:00
e1f8b604a0
fix init_data detect flash api
2015-03-24 23:21:40 +08:00
52ca40b8ea
add init.lua examples
2015-03-22 21:09:37 +08:00
d5731dd9bd
merge from dev
2015-03-20 20:15:38 +08:00
4332b21ef3
minor fix
2015-03-20 19:42:10 +08:00
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
2d254bd47c
use correct function for stop in U8G_COM_MSG_WRITE_BYTE
2015-03-18 22:33:16 +01:00
3d14530b80
fix cjson.encode() when in integer version
2015-03-18 19:37:47 +08:00
3aead6d230
try to fix cjson.encode in integer only version
2015-03-18 17:01:01 +08:00
a70709268b
merge cjson and dev to master, make a stable release
2015-03-18 14:22:17 +08:00
a01bda03dd
Merge pull request #294 from nodemcu/json
...
Json branch merged to master
2015-03-18 13:11:11 +08:00
09b650be41
disable untested pcd8544 driver for the moment
2015-03-17 20:52:47 +01:00
87598c5dfe
Merge remote-tracking branch 'upstream/dev' into dev
2015-03-17 20:35:39 +01:00
808a359eb8
quick fix when wide charactor issue
2015-03-17 22:42:22 +08:00
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
45e7f270cc
Merge branch 'dev' into json
2015-03-17 00:13:15 +08:00
4d3c1a930f
code clean up for cjson
2015-03-17 00:12:25 +08:00
54004a4beb
fix cjson bugs and reduce mem usage
2015-03-16 23:59:57 +08:00
c0d690ce7e
under development
2015-03-16 17:11:48 +08:00
d425dd7127
under develop
2015-03-16 17:09:43 +08:00
83f53c23c1
json port from cjson. not work yet, add cjson folder
2015-03-16 09:19:06 +08:00
c9912f1d82
json port from cjson. not work yet, delete folder
2015-03-16 09:17:21 +08:00
9c0c960e84
json port from cjson. not work yet
2015-03-16 09:00:33 +08:00
4d5242e1b7
Merge pull request #284 from nodemcu/dev
...
Sync from dev to dev096.
2015-03-16 05:44:51 +08:00
5c84359b5c
ROM flash size can changed with detected size, fixed #283 .
2015-03-16 05:40:43 +08:00
3124bcf357
Merge remote-tracking branch 'upstream/dev' into dev
2015-03-15 22:06:30 +01:00
f7eed2b53b
Changed e9 to magic_e9.
2015-03-16 01:44:54 +08:00
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
4e7473bc00
Fixed flash automatic detection bug. Support 128MBit flash.
2015-03-16 01:05:06 +08:00
dfce182622
Paste new version, make it can get correct flash size.
2015-03-16 00:51:47 +08:00
ed87cbd96f
Try to fix flash auto detection bug.
2015-03-16 00:48:28 +08:00
0b95ae08a2
default build with coap, reduce coap module mem usage
2015-03-15 20:12:29 +08:00
e3c31d0629
Merge pull request #280 from nodemcu/master
...
Merge master to dev096.
2015-03-15 20:04:55 +08:00
394cced84b
fix #273
2015-03-15 16:06:35 +08:00
f510e658d5
merge master solve conflicts
2015-03-15 15:01:07 +08:00
c46000069d
reduce coap module memory usage
2015-03-15 13:44:50 +08:00
0a4049767a
Fix getFSF to abide by the function contract
2015-03-14 09:00:25 -07:00
3b37f0920c
res optional
2015-03-13 22:22:57 +01:00
429bf57d67
add pcd8544
2015-03-12 23:09:41 +01:00
b387ba93ec
introduce u8g_config.h
2015-03-12 21:50:57 +01:00
7b160da1a3
Merge remote-tracking branch 'upstream/dev' into dev
2015-03-12 21:16:39 +01:00
8638863ac8
update readme
2015-03-12 14:20:40 +08:00
9f006acd8a
update readme
2015-03-12 14:05:47 +08:00
4f55ee4e34
validate SPI comm interface with ssd1306_128x64_spi
2015-03-11 21:53:45 +01:00
d28a2c9eda
add interger version release, fix #234 , #252 , #246
2015-03-11 13:21:19 +08:00
24411d34c1
fix tmr.time()
2015-03-11 08:59:00 +08:00
27c0620912
fix bugs for spiffs from pellepl/spiffs
2015-03-10 23:07:47 +08:00
81ea8d9597
add math, add file.fsinfo(), update spiffs.
2015-03-10 01:12:36 +08:00
76a499313f
Merge remote-tracking branch 'upstream/dev' into dev
2015-03-07 21:54:37 +01:00
8369f74bd0
comment out math.fmod to reduce code size
2015-03-06 17:00:37 +08:00
9d0c733073
Merge branch 'dev' into dev096
2015-03-06 16:46:37 +08:00
45f6abd448
merge coap
2015-03-06 16:24:55 +08:00
13b08cdacf
add macro to control built-in lib for lua, add libm.a
2015-03-06 15:55:24 +08:00
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
bbef457e50
seperate user_config.h to speed-up compile when modules disabled/enabled
2015-03-06 11:59:04 +08:00
315d1a1696
Merge remote-tracking branch 'upstream/dev' into dev
2015-03-04 22:18:26 +01:00
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
HuangRui
Vowstar
robertfoss
dnc40085
trilader
Kevin Uhlir
zeroday
Kirill
cal
Wolfram Ladurner
Wayne Bartnick
funshine
devsaurus
Markus Gritsch
Erant