Fix some typos

Add ability to start httpserver with wifi.ap mode
Add http/updateaplist.lua that create http/aplist.json with list of access points
This commit is contained in:
Artem Pastukhov 2015-03-31 09:53:24 +03:00
parent 4989410f7b
commit 71058e6b44
2 changed files with 50 additions and 0 deletions

36
Makefile Normal file
View File

@ -0,0 +1,36 @@
######################################################################
# User configuration
######################################################################
# Path to nodemcu-uploader (https://github.com/kmpm/nodemcu-uploader)
NODEMCU-UPLOADER=nodemcu-uploader.py
# Serial port
PORT=/dev/ttyUSB0
SPEED=460800
######################################################################
# End of user config
######################################################################
HTTP_FILES := $(wildcard http/*)
LUA_FILES := init.lua httpserver.lua httpserver-request.lua httpserver-static.lua httpserver-error.lua
# Print usage
usage:
@echo "make upload_http to upload files to be served"
@echo "make upload_server to upload the server code and init.lua"
@echo "make upload to upload all"
# Upload HTTP files only
upload_http: $(HTTP_FILES)
@$(NODEMCU-UPLOADER) -b $(SPEED) -p $(PORT) upload $(foreach f, $^, $(f))
# Upload httpserver lua files (init and server module)
upload_server: $(LUA_FILES)
@$(NODEMCU-UPLOADER) -b $(SPEED) -p $(PORT) upload $(foreach f, $^, $(f))
# Upload all
upload: $(LUA_FILES) $(HTTP_FILES)
@$(NODEMCU-UPLOADER) -b $(SPEED) -p $(PORT) upload $(foreach f, $^, $(f))
#test
test: $(LUA_FILES) $(HTTP_FILES)
echo -b $(SPEED) -p $(PORT) upload $(foreach f, $^, -f $(f) -d $(f))

14
http/updateaplist.lua Normal file
View File

@ -0,0 +1,14 @@
local function storelist(t)
-- connection:send(cjson.encode(t))
-- print(cjson.encode(t))
file.remove("http/aplist.json")
file.open("http/aplist.json","w+")
file.writeline(cjson.encode(t))
file.close()
end
return function(connection,args)
wifi.sta.getap(storelist)
connection:send("HTTP/1.0 200 OK\r\nContent-Type: application/json\r\nCache-Control: private, no-store\r\n\r\n")
connection:send('{"error":0, "message":"OK"}')
end