GitHub/cc-scada
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#86 work on supervisor/coordinator comms

Browse Source
This commit is contained in:
Mikayla Fischler
2022-09-03 10:50:14 -04:00
parent d38e5ca5ec
commit c3f7407689
7 changed files with 148 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
supervisor/session/plc.lua
View File

@@ -443,12 +443,12 @@ function plc.new_session(id, for_reactor, in_queue, out_queue)
-- get the general status information
function public.get_general_status()
return {
last_status_update = self.sDB.last_status_update,
control_state = self.sDB.control_state,
overridden = self.sDB.overridden,
degraded = self.sDB.degraded,
rps_tripped = self.sDB.rps_tripped,
rps_trip_cause = self.sDB.rps_trip_cause
self.sDB.last_status_update,
self.sDB.control_state,
self.sDB.overridden,
self.sDB.degraded,
self.sDB.rps_tripped,
self.sDB.rps_trip_cause
}
end

10
supervisor/session/unit.lua
View File

@@ -404,13 +404,13 @@ function unit.new(for_reactor, num_boilers, num_turbines)
build.boilers = {}
for i = 1, #self.boilers do
local boiler = self.boilers[i] ---@type unit_session
build.boilers[boiler.get_device_idx()] = { boiler.get_db().formed, boiler.get_db().build }
build.boilers[boiler.get_device_idx()] = { boiler.get_db().build, boiler.get_db().formed }
end
build.turbines = {}
for i = 1, #self.turbines do
local turbine = self.turbines[i] ---@type unit_session
build.turbines[turbine.get_device_idx()] = { turbine.get_db().formed, turbine.get_db().build }
build.turbines[turbine.get_device_idx()] = { turbine.get_db().build, turbine.get_db().formed }
end
return build
@@ -422,9 +422,7 @@ function unit.new(for_reactor, num_boilers, num_turbines)
if self.plc_s ~= nil then
local reactor = self.plc_s
status.mek = reactor.get_status()
status.rps = reactor.get_rps()
status.general = reactor.get_general_status()
status = { reactor.get_status(), reactor.get_rps(), reactor.get_general_status() }
end
return status
@@ -448,6 +446,8 @@ function unit.new(for_reactor, num_boilers, num_turbines)
status.turbines[turbine.get_device_idx()] = { turbine.get_db().state, turbine.get_db().tanks }
end
---@todo other RTU statuses
return status
end

2
supervisor/startup.lua
View File

@@ -13,7 +13,7 @@ local svsessions = require("supervisor.session.svsessions")
local config = require("supervisor.config")
local supervisor = require("supervisor.supervisor")
local SUPERVISOR_VERSION = "beta-v0.5.6"
local SUPERVISOR_VERSION = "beta-v0.5.7"
local print = util.print
local println = util.println