diff --git a/coordinator/coordinator.lua b/coordinator/coordinator.lua index d7e58f7..55c6356 100644 --- a/coordinator/coordinator.lua +++ b/coordinator/coordinator.lua @@ -335,12 +335,13 @@ function coordinator.comms(version, modem, sv_port, sv_listen, api_listen, range tick_dmesg_waiting(math.max(0, timeout_s - (util.time_s() - start))) _send_establish() clock.start() + elseif event == "timer" then + -- keep checking watchdog timers + apisessions.check_all_watchdogs(p1) elseif event == "modem_message" then -- handle message local packet = public.parse_packet(p1, p2, p3, p4, p5) - if packet ~= nil and packet.type == SCADA_MGMT_TYPE.ESTABLISH then - public.handle_packet(packet) - end + public.handle_packet(packet) elseif event == "terminate" then terminated = true break diff --git a/coordinator/session/api.lua b/coordinator/session/api.lua index 8f21483..4ba7383 100644 --- a/coordinator/session/api.lua +++ b/coordinator/session/api.lua @@ -117,8 +117,6 @@ function api.new_session(id, in_queue, out_queue, timeout) -- process packet if pkt.scada_frame.protocol() == PROTOCOL.COORD_API then ---@cast pkt capi_frame - -- feed watchdog - self.conn_watchdog.feed() -- handle packet by type if pkt.type == nil then diff --git a/coordinator/startup.lua b/coordinator/startup.lua index a95b30c..4a08166 100644 --- a/coordinator/startup.lua +++ b/coordinator/startup.lua @@ -20,7 +20,7 @@ local sounder = require("coordinator.sounder") local apisessions = require("coordinator.session.apisessions") -local COORDINATOR_VERSION = "v0.15.7" +local COORDINATOR_VERSION = "v0.15.8" local println = util.println local println_ts = util.println_ts