Commit Graph

592 Commits

Author SHA1 Message Date
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
Vowstar 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
Vowstar 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
Vowstar 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
Vowstar 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
Vowstar 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
Vowstar a14971fa5b Merge pull request #402 from trilader/dev
Allow connecting to unsecured WiFi networks
2015-05-15 07:41:01 +08:00
dnc40085 894fcc4799 minor change 2015-05-14 04:59:55 -07:00
dnc40085 4f097cf063 Fixed memory leak in tmr.alarm() 2015-05-14 04:40:57 -07:00
dnc40085 cf32376467 Minor change to wifi.sta.getap() 2015-05-11 21:02:46 -07:00
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
Vowstar 608d5f6be0 Merge pull request #401 from dnc40085/dev096-wifi-sta-getap_fix
Fix for memory leak in function wifi.sta.getap()
2015-05-07 20:56:54 +08: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
Orgmar 4b4f600038 Merge branch 'dev' of https://github.com/nodemcu/nodemcu-firmware 2015-05-01 18:27:48 +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
Vowstar 8637661e11 Merge pull request #390 from dnc40085/dev096-phymode
Add setphymode and getphymode to wifi module
2015-05-01 14:56:05 +08:00
Vowstar 0f40adf49a Merge pull request #377 from MarsTechHAN/patch-4
Update the Yeelink lib, add example
2015-05-01 14:54:59 +08:00
Vowstar 6c080c9d15 Merge pull request #383 from devsaurus/dev
Doc update for u8g
2015-05-01 14:54:43 +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
devsaurus 897c8cd169 further reduce memory for u8g graphics test 2015-04-24 21:57:27 +02:00
devsaurus 4cd2b554ec Merge remote-tracking branch 'upstream/dev' into dev 2015-04-24 20:34:35 +02:00
Martin Han effb57247c Add Example to yeelink lib 2015-04-22 13:16:37 +08:00
Martin Han a60f28cf9c Ver 0.1.2 r1 Add init ok callback function 2015-04-22 13:10:06 +08:00
Martin Han 5bda87845f Update to Ver0.1.2, fix logic bug
Detail:
When require lib before connect to ap, program will return nil but the table.
2015-04-22 12:50:02 +08:00
devsaurus fc19725fef make variables local to save heap 2015-04-21 21:48:12 +02:00
zeroday 92c98c52d6 Merge pull request #361 from n0bel/master
Add multicastJoin and multicastLeave to net module
2015-04-20 22:12:28 +08:00
zeroday 6eb5b9c874 Merge pull request #375 from MarsTechHAN/patch-3
Reduce RAM Usage
2015-04-20 22:10:16 +08:00
Martin Han 0f203f32c3 Resuce RAM Usage 2015-04-20 19:43:24 +08: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
Vowstar 399e85f9b9 Merge pull request #358 from MarsTechHAN/patch-2
Add Yeelink Modules
2015-04-14 20:58:23 +08:00
Martin Han a3b72906d5 Yeelink Modules 2015-04-14 20:42:16 +08:00
zeroday 81d9f8893a fix #353 2015-04-12 23:34:11 +08:00
zeroday 1ce5deff98 Merge pull request #349 from klukonin/patch-3
Update tmr.c
2015-04-12 23:30:13 +08:00
Vowstar 7c759a6113 Merge pull request #352 from electronic-dudeness/master
fixed floating point problem in bcd conversions
2015-04-11 23:12:29 +08:00
Sander Boele 4437c46825 fixed floating point problem in bcd conversions 2015-04-11 11:26:44 +02:00
Kirill f19e24c7ac Update tmr.c
According to NodeMCU team recommendations.
2015-04-10 14:56:17 +05:00