Commit Graph

295 Commits

Author SHA1 Message Date
dnc40085 e9081a81a5 Remove conflict 2015-05-11 20:03:02 -07:00
dnc40085 3941977550 Removed commented lines from previous commit 2015-05-11 18:45:27 -07:00
dnc40085 78cb215bb2 Changed output format of table that is output by wifi_scan_done 2015-05-11 18:26:16 -07:00
dnc40085 f31671044d Fixed error in wifi_station_listap 2015-05-11 17:59:51 -07:00
dnc40085 aca2b7724b Added description to wifi_station_listap 2015-05-11 05:38:23 -07:00
dnc40085 cf54f85549 Added ability to set scan configuration to wifi.sta.getap 2015-05-11 05:12:34 -07:00
dnc40085 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
dnc40085 c6c8bd84a0 minor change to wifi.sta.config() 2015-05-11 00:05:28 -07:00
dnc40085 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
dnc40085 f9e0e0cc61 Added examples to description of wifi.sta.config() 2015-05-09 04:17:35 -07:00
dnc40085 e667b2029d Added function wifi.sta.getconfig()
Added more parameters to wifi.sta.config()
2015-05-09 01:50:35 -07:00
trilader bc7b9f86c4 Allow connecting to unsecured WiFi networks 2015-05-07 15:12:57 +02:00
dnc40085 700ba55d26 Fix for memory leak in function wifi.sta.getap() 2015-05-07 05:02:59 -07:00
Vowstar 749e71d9cb Fixed strange SPI flash API error. Added word_of_aligned_array. 2015-05-05 23:59:30 +08:00
vowstar 32e9ac204a Fix PWM init bug, set all initial duty to 0. 2015-05-01 18:35:30 +08:00
Vowstar 1923280572 Merge pull request #365 from nodemcu/master
Add ICMP ping to net module
2015-05-01 14:57:50 +08:00
dnc40085 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
dnc40085 900c43d520 Add setphymode and getphymode to wifi module 2015-04-26 20:03:44 -07:00
Kevin Uhlir 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
zeroday 81d9f8893a fix #353 2015-04-12 23:34:11 +08:00
Kirill f19e24c7ac Update tmr.c
According to NodeMCU team recommendations.
2015-04-10 14:56:17 +05:00
Vowstar 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
zeroday 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
zeroday a333d6a9b9 Merge pull request #333 from wbartnick/dev
wifi submodule enhancements, thanks to @wbartnick
2015-04-05 23:09:33 +08:00
cal 06193090e6 LUAL_BUFFERSIZE back to 1K and warning notice added 2015-04-05 16:14:52 +02:00
Wolfram Ladurner 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
Wayne Bartnick 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
funshine bcbde08bf7 fix mqtt keepalive ping, add a example for mqtt in lua_examples. 2015-04-05 02:22:51 +08:00
funshine 8558641190 add gpio.serout() api to help serialize bit out 2015-04-03 16:05:14 +08:00
funshine 1c2ee75a00 fix mqtt, do a format when wrong flash size is detected 2015-04-03 00:51:02 +08:00
funshine 32e062f523 polish mqtt module 2015-03-31 23:38:28 +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
HuangRui 3dd1ac3739 Move node.readvdd33 to adc.readvdd33, fix #162. 2015-03-27 00:52:55 +08:00
funshine e1f8b604a0 fix init_data detect flash api 2015-03-24 23:21:40 +08:00
funshine 52ca40b8ea add init.lua examples 2015-03-22 21:09:37 +08:00
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
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
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
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
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
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
funshine c0d690ce7e under development 2015-03-16 17:11:48 +08:00
funshine d425dd7127 under develop 2015-03-16 17:09:43 +08: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 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 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 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
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
devsaurus 3b37f0920c res optional 2015-03-13 22:22:57 +01:00
devsaurus 429bf57d67 add pcd8544 2015-03-12 23:09:41 +01:00
devsaurus b387ba93ec introduce u8g_config.h 2015-03-12 21:50:57 +01:00
devsaurus 7b160da1a3 Merge remote-tracking branch 'upstream/dev' into dev 2015-03-12 21:16:39 +01: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
devsaurus 4f55ee4e34 validate SPI comm interface with ssd1306_128x64_spi 2015-03-11 21:53:45 +01:00
funshine d28a2c9eda add interger version release, fix #234, #252, #246 2015-03-11 13:21:19 +08:00
funshine 24411d34c1 fix tmr.time() 2015-03-11 08:59:00 +08:00
funshine 27c0620912 fix bugs for spiffs from pellepl/spiffs 2015-03-10 23:07:47 +08:00
funshine 81ea8d9597 add math, add file.fsinfo(), update spiffs. 2015-03-10 01:12:36 +08:00
devsaurus 76a499313f Merge remote-tracking branch 'upstream/dev' into dev 2015-03-07 21:54:37 +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 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
funshine bbef457e50 seperate user_config.h to speed-up compile when modules disabled/enabled 2015-03-06 11:59:04 +08:00
devsaurus 315d1a1696 Merge remote-tracking branch 'upstream/dev' into dev 2015-03-04 22:18:26 +01: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
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
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
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
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
devsaurus 2cfb86b5b5 improve device and page buffer initialization 2015-02-20 21:15:38 +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