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

Revert "Update init.lua"

Browse Source 
This reverts commit 4989410f7b82a45de910b2f98a1a2d630090ad3b.

Conflicts:
	init.lua
This commit is contained in:
Artem Pastukhov 2015-04-02 14:57:14 +03:00
parent 92a44592d5
commit 5301792d16
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
init.lua
View File

@ -5,6 +5,7 @@ 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
local joincounter = 0 local joincounter = 0
@ -13,6 +14,9 @@ cfg.ssid="ESP-"..node.chipid()
cfg.pwd="ESP-"..node.chipid() cfg.pwd="ESP-"..node.chipid()
wifi.ap.config(cfg) wifi.ap.config(cfg)
cfg = nil cfg = nil
=======
wifi.sta.config("Kirsch Extreme","1151511515")
>>>>>>> parent of 4989410... Update init.lua
-- Compile server code and remove original .lua files. -- Compile server code and remove original .lua files.
-- This only happens the first time afer the .lua files are uploaded. -- This only happens the first time afer the .lua files are uploaded.