Minecraft/cc-mek-scada
1
0
Fork 0
mirror of https://github.com/MikaylaFischler/cc-mek-scada.git synced 2024-08-30 18:22:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

some supervisor bugfixes

Browse Source
This commit is contained in:
Mikayla Fischler 2022-04-24 13:22:45 -04:00
parent 74168707c6
commit 074f6448e1
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
supervisor/session/plc.lua
View File

@ -348,7 +348,7 @@ function new_session(id, for_reactor, in_queue, out_queue)
local elapsed = os.clock() - self.periodics.last_update local elapsed = os.clock() - self.periodics.last_update
self.periodics.keep_alive += elapsed self.periodics.keep_alive = self.periodics.keep_alive + elapsed
if self.periodics.keep_alive >= PERIODICS.KEEP_ALIVE then if self.periodics.keep_alive >= PERIODICS.KEEP_ALIVE then
_send(RPLC_TYPES.KEEP_ALIVE, { os.epoch() }) _send(RPLC_TYPES.KEEP_ALIVE, { os.epoch() })

2
supervisor/session/svsessions.lua
View File

@ -10,7 +10,7 @@ SESSION_TYPE = {
} }
local self = { local self = {
modem = nil modem = nil,
num_reactors = 0, num_reactors = 0,
rtu_sessions = {}, rtu_sessions = {},
plc_sessions = {}, plc_sessions = {},

7
supervisor/startup.lua
View File

@ -10,14 +10,15 @@ os.loadAPI("scada-common/modbus.lua")
os.loadAPI("config.lua") os.loadAPI("config.lua")
os.loadAPI("mqueue.lua") os.loadAPI("mqueue.lua")
os.loadAPI("supervisor.lua")
os.loadAPI("session/rtu.lua") os.loadAPI("session/rtu.lua")
os.loadAPI("session/plc.lua") os.loadAPI("session/plc.lua")
os.loadAPI("session/coordinator.lua") os.loadAPI("session/coordinator.lua")
os.loadAPI("session/svsessions.lua") os.loadAPI("session/svsessions.lua")
local SUPERVISOR_VERSION = "alpha-v0.1.3" os.loadAPI("supervisor.lua")
local SUPERVISOR_VERSION = "alpha-v0.1.4"
local print = util.print local print = util.print
local println = util.println local println = util.println
@ -40,7 +41,7 @@ if modem == nil then
end end
-- start comms, open all channels -- start comms, open all channels
local comms = supervisor.superv_comms(config.NUM_REACTORS, modem, config.SCADA_DEV_LISTEN, config.SCADA_SV_LISTEN) local superv_comms = supervisor.superv_comms(config.NUM_REACTORS, modem, config.SCADA_DEV_LISTEN, config.SCADA_SV_LISTEN)
-- base loop clock (4Hz, 5 ticks) -- base loop clock (4Hz, 5 ticks)
local loop_clock = os.startTimer(0.25) local loop_clock = os.startTimer(0.25)

3
supervisor/supervisor.lua
View File

@ -11,9 +11,8 @@ local RTU_ADVERT_TYPES = comms.RTU_ADVERT_TYPES
local SESSION_TYPE = svsessions.SESSION_TYPE local SESSION_TYPE = svsessions.SESSION_TYPE
-- supervisory controller communications -- supervisory controller communications
function superv_comms(mode, num_reactors, modem, dev_listen, coord_listen) function superv_comms(num_reactors, modem, dev_listen, coord_listen)
local self = { local self = {
mode = mode,
ln_seq_num = 0, ln_seq_num = 0,
num_reactors = num_reactors, num_reactors = num_reactors,
modem = modem, modem = modem,