From a843c8eb79d73d97c8cea63188d2c6b9277088a9 Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Wed, 19 Apr 2023 23:00:27 -0400 Subject: [PATCH] fixes and cleanup --- coordinator/coordinator.lua | 1 + coordinator/session/api.lua | 8 ++++---- coordinator/startup.lua | 2 +- pocket/renderer.lua | 2 +- reactor-plc/startup.lua | 2 +- rtu/startup.lua | 2 +- scada-common/comms.lua | 2 +- supervisor/startup.lua | 2 +- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/coordinator/coordinator.lua b/coordinator/coordinator.lua index 94c1ec1..b13134a 100644 --- a/coordinator/coordinator.lua +++ b/coordinator/coordinator.lua @@ -300,6 +300,7 @@ function coordinator.comms(version, modem, sv_port, sv_listen, api_listen, range ---@param new_modem table function public.reconnect_modem(new_modem) modem = new_modem + apisessions.relink_modem(new_modem) _conf_channels() end diff --git a/coordinator/session/api.lua b/coordinator/session/api.lua index 2db28fd..7ed5a07 100644 --- a/coordinator/session/api.lua +++ b/coordinator/session/api.lua @@ -1,7 +1,7 @@ -local comms = require("scada-common.comms") -local log = require("scada-common.log") -local mqueue = require("scada-common.mqueue") -local util = require("scada-common.util") +local comms = require("scada-common.comms") +local log = require("scada-common.log") +local mqueue = require("scada-common.mqueue") +local util = require("scada-common.util") local api = {} diff --git a/coordinator/startup.lua b/coordinator/startup.lua index 7c369d6..f232587 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.13.2" +local COORDINATOR_VERSION = "v0.13.3" local println = util.println local println_ts = util.println_ts diff --git a/pocket/renderer.lua b/pocket/renderer.lua index bd3f66e..4be1ec6 100644 --- a/pocket/renderer.lua +++ b/pocket/renderer.lua @@ -13,7 +13,7 @@ local ui = { view = nil } --- start the coordinator GUI +-- start the pocket GUI function renderer.start_ui() if ui.view == nil then -- reset screen diff --git a/reactor-plc/startup.lua b/reactor-plc/startup.lua index 17be32a..624b78b 100644 --- a/reactor-plc/startup.lua +++ b/reactor-plc/startup.lua @@ -18,7 +18,7 @@ local plc = require("reactor-plc.plc") local renderer = require("reactor-plc.renderer") local threads = require("reactor-plc.threads") -local R_PLC_VERSION = "v1.1.8" +local R_PLC_VERSION = "v1.1.10" local println = util.println local println_ts = util.println_ts diff --git a/rtu/startup.lua b/rtu/startup.lua index 10fc24e..4551a24 100644 --- a/rtu/startup.lua +++ b/rtu/startup.lua @@ -25,7 +25,7 @@ local sna_rtu = require("rtu.dev.sna_rtu") local sps_rtu = require("rtu.dev.sps_rtu") local turbinev_rtu = require("rtu.dev.turbinev_rtu") -local RTU_VERSION = "v0.13.4" +local RTU_VERSION = "v0.13.5" local RTU_UNIT_TYPE = types.RTU_UNIT_TYPE diff --git a/scada-common/comms.lua b/scada-common/comms.lua index b266a1a..fb54101 100644 --- a/scada-common/comms.lua +++ b/scada-common/comms.lua @@ -11,7 +11,7 @@ local insert = table.insert local max_distance = nil -comms.version = "1.4.0" +comms.version = "1.4.1" ---@enum PROTOCOL local PROTOCOL = { diff --git a/supervisor/startup.lua b/supervisor/startup.lua index 21d7e2c..c111794 100644 --- a/supervisor/startup.lua +++ b/supervisor/startup.lua @@ -14,7 +14,7 @@ local supervisor = require("supervisor.supervisor") local svsessions = require("supervisor.session.svsessions") -local SUPERVISOR_VERSION = "v0.15.2" +local SUPERVISOR_VERSION = "v0.15.3" local println = util.println local println_ts = util.println_ts