Webserver is running without compiling anything

This commit is contained in:
Ollo 2021-02-08 19:18:55 +01:00
parent 08f310c149
commit 404bb708db

View File

@ -16,37 +16,9 @@ bootledtimer:register(500, tmr.ALARM_AUTO, function (t)
end) end)
bootledtimer:start() bootledtimer:start()
local blacklistfile="init.lua config.lua config.lua.new webpage.html"
function recompileAll()
-- 3, discard Local, Upvalue and line-number debug info
node.stripdebug(3)
-- compile all files
l = file.list();
for k,_ in pairs(l) do
if (string.find(k, ".lc", -3)) then
print ("Skipping " .. k)
elseif (string.find(blacklistfile, k) == nil) then
-- Only look at lua files
if (string.find(k, ".lua") ~= nil) then
print("Compiling and deleting " .. k)
node.compile(k)
-- remove the lua file
file.remove(k)
node.restart()
else
print("No code: " .. k)
end
end
end
end
function mydofile(mod) function mydofile(mod)
if (file.open(mod .. ".lua")) then if (file.open(mod .. ".lua")) then
dofile( mod .. ".lua") dofile( mod .. ".lua")
elseif (file.open(mod .. ".lc")) then
dofile(mod .. ".lc")
elseif (file.open(mod .. "_diet.lc")) then
dofile(mod .. "_diet.lc")
elseif (file.open(mod .. "_diet.lua")) then elseif (file.open(mod .. "_diet.lua")) then
dofile(mod .. "_diet.lua") dofile(mod .. "_diet.lua")
elseif (file.open(mod)) then elseif (file.open(mod)) then
@ -62,36 +34,16 @@ initTimer:register(5000, tmr.ALARM_SINGLE, function (t)
t:unregister() t:unregister()
initTimer=nil initTimer=nil
bootledtimer=nil bootledtimer=nil
collectgarbage() if ( file.open("config.lua") ) then
if ( --- Normal operation
(file.open("main.lua")) or print("Starting main")
(file.open("timecore.lua")) or mydofile("main")
(file.open("wordclock.lua")) or wifi.setmode(wifi.STATION)
(file.open("displayword.lua")) or dofile("config.lua")
(file.open("webserver.lua")) or normalOperation()
(file.open("mqtt.lua")) or
(file.open("ds18b20.lua")) or
(file.open("telnet.lua"))
) then
c = string.char(0,128,0)
w = string.char(0,0,0)
ws2812.write(w:rep(4) .. c .. w:rep(15) .. c .. w:rep(9) .. c .. w:rep(30) .. c .. w:rep(41) .. c )
recompileAll()
print("Rebooting ...")
-- reboot repairs everything
node.restart()
else else
if ( file.open("config.lua") ) then -- Logic for inital setup
--- Normal operation mydofile("webserver")
print("Starting main")
dofile("main.lc")
wifi.setmode(wifi.STATION)
dofile("config.lua")
normalOperation()
else
-- Logic for inital setup
mydofile("webserver")
end
end end
end) end)
initTimer:start() initTimer:start()