init3: properly known as "main", I think

diff --git a/ctfws-lfs-strings.lua b/ctfws-lfs-strings.lua
index 82b965212a2b031d96e2fbc4f0119c7564717256..6746c102e6847989fccdf9d229b13c74175587f5 100644 (file)
--- 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 ec0d9dc058320bbec4a1d18db8a147437b1a707d..4b1c2988f797a4a4c06ddcd2912edc33c0937ec4 100644 (file)
--- 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 d2f014914751b608f9f67bfd203c88e4fc89dcd4..a0f79bc42c8b8ef976f5d78d7cd9c27bca6af1d9 100644 (file)
--- 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 5720b14c25e8687f5bbfd15bdfdf65b1d1ebae61..0e762742f77c3082b0d02ca3d895709cca7daa41 100755 (executable)
--- 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
 }