MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
773 Commits 9 Branches 33 Tags 144 MiB
Commit Graph

220 Commits

Author SHA1 Message Date
HuangRui 3cd5a6a1ed Merge branch 'master' of https://github.com/bruceme/nodemcu-firmware into dev 
Conflicts:
	app/modules/net.c
 2015-06-04 15:04:12 +08:00
Johny Mattsson 2d1e69151e Extended Lua crypto module with hash & hmac. 2015-06-02 18:17:30 +10:00
dnc40085 353209fb4e Change comments for wifi.sta.getap 2015-05-31 22:45:43 -07:00
dnc40085 a5fe3d0146 Added option to wifi.sta.getap to allow changing output format between 
new style and old style
 2015-05-31 21:43:03 -07:00
Vowstar d8a8746b9e Merge pull request #447 from creationix/dev 
Add crypto module.
 2015-05-29 15:05:37 +08:00
= 2128c42f02 Add headers for discovered rom functions 2015-05-28 15:10:12 -05:00
= 59df376a3a Rename base64Encode to toBase64 and hexEncode to toHex 2015-05-28 09:00:13 -05:00
= c8145434c3 Add crypto.hexEncode and crypto.mask 2015-05-28 07:47:09 -05:00
= ca78b9ea2c Add crypto module initially containing sha1 and base64_encode. 2015-05-28 07:46:57 -05:00
makefu c29edf7a22 app/modules/ws2812.c: re-add ws2812.write() 
Add the original ws2812.write() function which does not scramble the
buffer while preserving the 'new' ws2812.writergb.

With this everybody should be happy again
 2015-05-26 23:12:38 +02:00
Vowstar f7a6183853 Merge pull request #437 from dnc40085/dev096_adc.vdd33_fix 
Added fix to adc.readvdd33() to prevent crashing in station mode
 2015-05-24 07:23:16 +08:00
Vowstar 2d0689142c Merge pull request #438 from dnc40085/dev096_wifi.getchannel 
added wifi.getchannel
 2015-05-24 07:23:07 +08:00
dnc40085 6477f5f389 added wifi.getchannel 2015-05-22 19:42:21 -07:00
dnc40085 dd00e31027 Added fix to adc.readvdd33() to prevent crashing in station mode while 
connected
 2015-05-22 18:01:05 -07:00
dnc40085 7244d51b38 Fixed bug in wifi_scan_done 2015-05-20 02:21:46 -07:00
HuangRui fc8fa2cc91 Fixed readvdd33 bug. 2015-05-19 20:11:15 +08:00
HuangRui 0f3ade36d8 Merge branch 'dev' of https://github.com/nodemcu/nodemcu-firmware 
Conflicts:
	app/modules/net.c
 2015-05-19 20:06:03 +08:00
dnc40085 546bca00c1 changed wifi_setip() to allow setting SoftAP gateway to 0.0.0.0 2015-05-17 19:29:26 -07:00
Jorge Mesquita 70580dc4ae added net.dns.setdnsserver('ip',[index]), net.dns.getdnsserver([index]), net.dns.resolve('domain.com', function cb('ip' or nil if fail) ) 
modified:   app/modules/net.c
 2015-05-16 20:53:31 -04:00
Vowstar 61f65fb02a Merge pull request #420 from devsaurus/dev 
Add missing functions for u8g
 2015-05-16 20:26:50 +08:00
devsaurus 5b588b7bd3 implement getStrWidth() and setFontLineSpacingFactor() 2015-05-15 21:32:28 +02:00
devsaurus de56cb084e sort member functions 2015-05-15 21:13:59 +02:00
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
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
dnc40085 700ba55d26 Fix for memory leak in function wifi.sta.getap() 2015-05-07 05:02:59 -07: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 a333d6a9b9 Merge pull request #333 from wbartnick/dev 
wifi submodule enhancements, thanks to @wbartnick
 2015-04-05 23:09:33 +08: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 d5731dd9bd merge from dev 2015-03-20 20:15:38 +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
zeroday a01bda03dd Merge pull request #294 from nodemcu/json 
Json branch merged to master
 2015-03-18 13:11:11 +08: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 54004a4beb fix cjson bugs and reduce mem usage 2015-03-16 23:59:57 +08:00
funshine d425dd7127 under develop 2015-03-16 17:09:43 +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 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 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
funshine c46000069d reduce coap module memory usage 2015-03-15 13:44:50 +08: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
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 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 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