Publish heartbeats every 20 seconds

Rather than 60.  Move to using tmr, rather than cron.
As per https://github.com/cmukgb/ctfws-timer-iot/issues/7

diff --git a/init3.lua b/init3.lua
index 35a0930bb98b7387136effaf8ccb094213321cdd..3c6805bd05c559dae3ec2b85ec8ec23810b39f99 100644 (file)
--- a/init3.lua
+++ b/init3.lua
@@ -45,12 +45,10 @@ local function mqtt_reconn()
   OVL.nwfmqtt().connect(mqc,"nwfmqtt.conf")
 end
 
-local mqtt_beat_cronentry
-local function mqtt_beat()
-  mqtt_beat_cronentry = cron.schedule("* * * * *", function(e)
+local mqtt_beat_tmr = tmr.create()
+mqtt_beat_tmr:register(20000, tmr.ALARM_AUTO, function(t)
     mqc:publish(mqttBootTopic,string.format("beat %d %s",rtctime.get(),myBSSID),1,1)
   end)
-end
 
 local function ctfws_lcd_draw_all()
     ctfws_lcd:reset()
@@ -137,12 +135,12 @@ end
 nwfnet.onnet["init"] = function(e,c)
   dprint("NET", e)
   if     e == "mqttdscn" and c == mqc then
-    if mqtt_beat_cronentry then mqtt_beat_cronentry:unschedule() mqtt_beat_cronentry = nil end
+    mqtt_beat_tmr:stop()
     if not mqtt_reconn_cronentry then mqtt_reconn() end
     ctfws_lcd:drawFlagsMessage("MQTT Disconnected")
   elseif e == "mqttconn" and c == mqc then
     if mqtt_reconn_cronentry then mqtt_reconn_cronentry:unschedule() mqtt_reconn_cronentry = nil end
-    if not mqtt_beat_cronentry then mqtt_beat() end
+    mqtt_beat_tmr:start()
     mqc:publish(mqttBootTopic,"alive",1,1)
     mqc:subscribe({
       ["ctfws/game/config"] = 2,