From 042456d68526886047e365de87e0097fadf60b30 Mon Sep 17 00:00:00 2001 From: Nathaniel Wesley Filardo Date: Sat, 29 Jun 2019 16:49:33 +0100 Subject: [PATCH] init3: properly known as "main", I think --- ctfws-lfs-strings.lua | 2 +- init2.lua | 2 +- init3.lua => main.lua | 4 ++-- pushall.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename init3.lua => main.lua (98%) diff --git a/ctfws-lfs-strings.lua b/ctfws-lfs-strings.lua index 82b9652..6746c10 100644 --- a/ctfws-lfs-strings.lua +++ b/ctfws-lfs-strings.lua @@ -32,7 +32,7 @@ local lcdpreload = "JB# %2d/%2d :", "R", "Y" -local init3load = +local mainload = "flg_tmr", "lastMsgTime", "mqttUser", "msg_tmr", "fla_tmr", "dprint", "mqc", "publish", "nwfmqtt.conf", diff --git a/init2.lua b/init2.lua index ec0d9dc..4b1c298 100644 --- a/init2.lua +++ b/init2.lua @@ -37,4 +37,4 @@ i2c.setup(0,2,1,i2c.SLOW) -- init i2c on GPIO4 and GPIO5 lcd = OVL.lcd1602()(ctfwshw.lcd or 0x27) -- give the LCD time to initialize properly -tmr.create():alarm(125, tmr.ALARM_SINGLE, function() print("INIT2", "go3") OVL.init3() end) +tmr.create():alarm(125, tmr.ALARM_SINGLE, function() print("INIT2", "go3") OVL.main() end) diff --git a/init3.lua b/main.lua similarity index 98% rename from init3.lua rename to main.lua index d2f0149..a0f79bc 100644 --- a/init3.lua +++ b/main.lua @@ -1,6 +1,6 @@ -- logging for debugging --- dprint = function(...) end -- OFF -dprint = function(...) print(...) end -- ON +-- local dprint = function(...) end -- OFF +local dprint = function(...) print(...) end -- ON -- common module initialization cron.schedule("*/5 * * * *", function(e) OVL["nwfnet-sntp"]().dosntp(nil) end) diff --git a/pushall.sh b/pushall.sh index 5720b14..0e76274 100755 --- a/pushall.sh +++ b/pushall.sh @@ -7,7 +7,7 @@ set -e -u pushsrc() { dopushlua ctfws.lua dopushlua ctfws-lcd.lua - dopushlua init3.lua + dopushlua main.lua dopushcompile init2.lua } -- 2.50.1