From 1dc2530d3860fd6d3fc31408ef619a1dead69f84 Mon Sep 17 00:00:00 2001 From: ollo Date: Sun, 19 Jun 2016 17:04:30 +0200 Subject: [PATCH] Moved the custom dofile-logic into the init fmodule --- init.lua | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ main.lua | 10 +--------- 2 files changed, 50 insertions(+), 9 deletions(-) create mode 100644 init.lua diff --git a/init.lua b/init.lua new file mode 100644 index 0000000..5a445d3 --- /dev/null +++ b/init.lua @@ -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) diff --git a/main.lua b/main.lua index 8789e73..fd00507 100644 --- a/main.lua +++ b/main.lua @@ -1,13 +1,5 @@ -- Main Module -function mydofile(mod) - if (file.open(mod .. ".lua")) then - dofile( mod .. ".lua") - else - dofile(mod .. ".lc") - end -end - function startSetupMode() tmr.stop(0) tmr.stop(1) @@ -116,4 +108,4 @@ if ( file.open("config.lua") ) then else -- Logic for inital setup startSetupMode() -end \ No newline at end of file +end