Moved the custom dofile-logic into the init fmodule

This commit is contained in:
ollo 2016-06-19 17:04:30 +02:00
parent d9f8d04f55
commit 1dc2530d38
2 changed files with 50 additions and 9 deletions

49
init.lua Normal file
View File

@ -0,0 +1,49 @@
print("Autostart in 10 seconds...")
ledPin=4
counter1=0
ws2812.write(ledPin, string.char(0,0,0):rep(114))
tmr.alarm(2, 85, 1, function()
counter1=counter1+1
ws2812.write(ledPin, string.char(128,0,0):rep(counter1))
end)
local blacklistfile="init.lua config.lua"
function recompileAll()
-- 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
print("Compiling and deleting " .. k)
node.compile(k)
-- remove the lua file
file.remove(k)
end
end
end
function mydofile(mod)
if (file.open(mod .. ".lua")) then
dofile( mod .. ".lua")
else
dofile(mod .. ".lc")
end
end
tmr.alarm(1, 10000, 0, function()
tmr.stop(2)
if (file.open("main.lua")) then
recompileAll()
print("Rebooting ...")
-- reboot repairs everything
node.restart()
elseif (file.open("main.lc")) then
print("Starting main")
dofile("main.lc")
else
print("No Main file found")
end
end)

View File

@ -1,13 +1,5 @@
-- Main Module -- Main Module
function mydofile(mod)
if (file.open(mod .. ".lua")) then
dofile( mod .. ".lua")
else
dofile(mod .. ".lc")
end
end
function startSetupMode() function startSetupMode()
tmr.stop(0) tmr.stop(0)
tmr.stop(1) tmr.stop(1)
@ -116,4 +108,4 @@ if ( file.open("config.lua") ) then
else else
-- Logic for inital setup -- Logic for inital setup
startSetupMode() startSetupMode()
end end