diff --git a/supervisor/session/svsessions.lua b/supervisor/session/svsessions.lua index 409753c..02bf70b 100644 --- a/supervisor/session/svsessions.lua +++ b/supervisor/session/svsessions.lua @@ -35,7 +35,7 @@ local self = { ---@param sessions table local function _iterate(sessions) for i = 1, #sessions do - local session = sessions[i] ---@type plc_session_struct + local session = sessions[i] ---@type plc_session_struct|rtu_session_struct if session.open then local ok = session.instance.iterate() if ok then diff --git a/supervisor/startup.lua b/supervisor/startup.lua index d23436d..307b8e6 100644 --- a/supervisor/startup.lua +++ b/supervisor/startup.lua @@ -13,7 +13,7 @@ local svsessions = require("supervisor.session.svsessions") local config = require("supervisor.config") local supervisor = require("supervisor.supervisor") -local SUPERVISOR_VERSION = "alpha-v0.3.10" +local SUPERVISOR_VERSION = "alpha-v0.4.0" local print = util.print local println = util.println @@ -44,6 +44,9 @@ local superv_comms = supervisor.comms(SUPERVISOR_VERSION, config.NUM_REACTORS, m local MAIN_CLOCK = 0.15 local loop_clock = util.new_clock(MAIN_CLOCK) +-- start clock +loop_clock.start() + -- event loop while true do ---@diagnostic disable-next-line: undefined-field diff --git a/supervisor/supervisor.lua b/supervisor/supervisor.lua index 5236e0e..ba07d31 100644 --- a/supervisor/supervisor.lua +++ b/supervisor/supervisor.lua @@ -191,7 +191,7 @@ supervisor.comms = function (version, num_reactors, modem, dev_listen, coord_lis _send_plc_linking(next_seq_id, r_port, { RPLC_LINKING.COLLISION }) else -- got an ID; assigned to a reactor successfully - println("connected to reactor " .. packet.data[1] .. " PLC (" .. packet.data[2] .. ") [port " .. r_port .. "]") + println("connected to reactor " .. packet.data[1] .. " PLC (" .. packet.data[2] .. ") [:" .. r_port .. "]") log.debug("PLC_LNK: allowed for device at " .. r_port) _send_plc_linking(next_seq_id, r_port, { RPLC_LINKING.ALLOW }) end @@ -215,7 +215,7 @@ supervisor.comms = function (version, num_reactors, modem, dev_listen, coord_lis elseif packet.type == SCADA_MGMT_TYPES.RTU_ADVERT then if packet.length >= 1 then -- this is an RTU advertisement for a new session - println("connected to RTU (" .. packet.data[1] .. ") [port " .. r_port .. "]") + println("connected to RTU (" .. packet.data[1] .. ") [:" .. r_port .. "]") svsessions.establish_rtu_session(l_port, r_port, packet.data)