Ollo/Wordclock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Increased webserver delay

Browse Source
This commit is contained in:
ollo 2019-04-18 20:44:18 +02:00
parent f67f53d223
commit e4c8118731
1 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
webserver.lua
View File

@ -68,7 +68,6 @@ function sendPage(conn, nameOfFile, replaceMap)
conn:send(buf) conn:send(buf)
print("Sent rest") print("Sent rest")
end end
end end
function fillDynamicMap() function fillDynamicMap()
@ -151,38 +150,28 @@ function startWebServer()
print("HTTP sending... be patient!") print("HTTP sending... be patient!")
return return
end end
if (payload:find("GET /") ~= nil) then if (payload:find("GET /") ~= nil) then
httpSending=true httpSending=true
--here is code for handling http request from a web-browser
collectgarbage()
stopWordclock() stopWordclock()
ws2812.write(string.char(0,0,0):rep(56) .. color:rep(2) .. string.char(0,0,0):rep(4) .. color:rep(2) .. string.char(0,0,0):rep(48)) ws2812.write(string.char(0,0,0):rep(56) .. color:rep(2) .. string.char(0,0,0):rep(4) .. color:rep(2) .. string.char(0,0,0):rep(48))
-- Start Time after 1 minute -- Start Time after 3 minute
tmr.alarm(5, 60000, 0 ,function() tmr.alarm(5, 180000, 0 ,function()
dependModules = { "timecore" , "wordclock", "displayword" } dependModules = { "timecore" , "wordclock", "displayword" }
for _,mod in pairs(dependModules) do for _,mod in pairs(dependModules) do
print("Loading " .. mod) print("Loading " .. mod)
mydofile(mod) mydofile(mod)
end end
-- Start the time Thread -- Start the time Thread again
displayTime()
-- Start the time Thread
tmr.alarm(1, 20000, 1 ,function() tmr.alarm(1, 20000, 1 ,function()
displayTime() displayTime()
end) end)
end) end)
-- send response after 100ms if (sendPage ~= nil) then
tmr.alarm(4, 100, 0 ,function() print("Sending webpage.html (" .. tostring(node.heap()) .. "B free) ...")
if (sendPage ~= nil) then -- Load the sendPagewebcontent
print("Sending webpage.html (" .. tostring(node.heap()) .. "B free) ...") replaceMap=fillDynamicMap()
-- Load the sendPagewebcontent sendPage(conn, "webpage.html", replaceMap)
replaceMap=fillDynamicMap() end
sendPage(conn, "webpage.html", replaceMap)
end
end)
else if (payload:find("POST /") ~=nil) then else if (payload:find("POST /") ~=nil) then
--code for handling the POST-request (updating settings) --code for handling the POST-request (updating settings)
_, postdatastart = payload:find("\r\n\r\n") _, postdatastart = payload:find("\r\n\r\n")
@ -327,11 +316,9 @@ function startWebServer()
global_c=nil global_c=nil
end) end)
print("Welcome to Word Clock") print("Welcome to Word Clock")
end end
end end
end) end)
conn:on("disconnection", function(c) conn:on("disconnection", function(c)
print("Goodbye") print("Goodbye")
node.output(nil) -- un-register the redirect output function, output goes to serial node.output(nil) -- un-register the redirect output function, output goes to serial