godzil/nodemcu-httpserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some fixes

Browse Source
This commit is contained in:
Artem Pastukhov 2015-04-02 15:40:57 +03:00
parent a4a61c8329
commit 278ee10a7c
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
init.lua
View File

@ -1,16 +1,13 @@
-- Tel--l the chip to connect to the access point
--wifi.setmode(wifi.STATIONAP)
wifi.setmode(wifi.STATION) wifi.setmode(wifi.STATION)
print('set (mode='..wifi.getmode()..')') print('set (mode='..wifi.getmode()..')')
print('MAC: ',wifi.sta.getmac()) print('MAC: ',wifi.sta.getmac())
print('chip: ',node.chipid()) print('chip: ',node.chipid())
print('heap: ',node.heap()) print('heap: ',node.heap())
<<<<<<< HEAD
wifi.sta.config("BT_WiFi", "PlacNinObOj9") wifi.sta.config("BT_WiFi", "PlacNinObOj9")
=======
>>>>>>> 11d1f96351cea860acc3dc025d0ea72aa7e9c7ee
cfg={} cfg={}
cfg.ssid="ESP-"..node.chipid() cfg.ssid="ESP-"..node.chipid()
cfg.pwd="ESP-"..node.chipid() cfg.pwd="ESP-"..node.chipid()
@ -36,15 +33,9 @@ serverFiles = nil
-- Connect to the WiFi access point. Once the device is connected, -- Connect to the WiFi access point. Once the device is connected,
-- you may start the HTTP server. -- you may start the HTTP server.
<<<<<<< HEAD
local joincounter = 0 local joincounter = 0
=======
local joincounter = 0
>>>>>>> 11d1f96351cea860acc3dc025d0ea72aa7e9c7ee
tmr.alarm(0, 3000, 1, function() tmr.alarm(0, 3000, 1, function()
if wifi.sta.getip() == nil and joincounter < 5 then if wifi.sta.getip() == nil and joincounter < 5 then