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

#83 additional reactor structure fields, bugfix to rps alarm on sv, removed spam-prone rps error messages

Browse Source
This commit is contained in:
Mikayla Fischler 2022-09-30 17:33:35 -04:00
parent 7a90ea7e4e
commit 1b553ad495
4 changed files with 61 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
reactor-plc/plc.lua
View File

@ -22,6 +22,16 @@ local println_ts = util.println_ts
-- I wish they didn't change it to error on SCRAM calls if the reactor was already inactive -- I wish they didn't change it to error on SCRAM calls if the reactor was already inactive
local PCALL_SCRAM_MSG = "pcall: Scram requires the reactor to be active." local PCALL_SCRAM_MSG = "pcall: Scram requires the reactor to be active."
-- RPS SAFETY CONSTANTS
local MAX_DAMAGE_PERCENT = 90
local MAX_DAMAGE_TEMPERATURE = 1200
local MIN_COOLANT_FILL = 0.02
local MAX_WASTE_FILL = 0.8
local MAX_HEATED_COLLANT_FILL = 0.95
-- END RPS SAFETY CONSTANTS
--- RPS: Reactor Protection System --- RPS: Reactor Protection System
--- ---
--- identifies dangerous states and SCRAMs reactor if warranted --- identifies dangerous states and SCRAMs reactor if warranted
@ -70,11 +80,10 @@ function plc.rps_init(reactor)
local damage_percent = self.reactor.getDamagePercent() local damage_percent = self.reactor.getDamagePercent()
if damage_percent == ppm.ACCESS_FAULT then if damage_percent == ppm.ACCESS_FAULT then
-- lost the peripheral or terminated, handled later -- lost the peripheral or terminated, handled later
log.error("RPS: failed to check reactor damage")
_set_fault() _set_fault()
self.state[state_keys.dmg_crit] = false self.state[state_keys.dmg_crit] = false
else else
self.state[state_keys.dmg_crit] = damage_percent >= 100 self.state[state_keys.dmg_crit] = damage_percent >= MAX_DAMAGE_PERCENT
end end
end end
@ -84,11 +93,10 @@ function plc.rps_init(reactor)
local temp = self.reactor.getTemperature() local temp = self.reactor.getTemperature()
if temp == ppm.ACCESS_FAULT then if temp == ppm.ACCESS_FAULT then
-- lost the peripheral or terminated, handled later -- lost the peripheral or terminated, handled later
log.error("RPS: failed to check reactor temperature")
_set_fault() _set_fault()
self.state[state_keys.high_temp] = false self.state[state_keys.high_temp] = false
else else
self.state[state_keys.high_temp] = temp >= 1200 self.state[state_keys.high_temp] = temp >= MAX_DAMAGE_TEMPERATURE
end end
end end
@ -97,11 +105,10 @@ function plc.rps_init(reactor)
local coolant_filled = self.reactor.getCoolantFilledPercentage() local coolant_filled = self.reactor.getCoolantFilledPercentage()
if coolant_filled == ppm.ACCESS_FAULT then if coolant_filled == ppm.ACCESS_FAULT then
-- lost the peripheral or terminated, handled later -- lost the peripheral or terminated, handled later
log.error("RPS: failed to check reactor coolant level")
_set_fault() _set_fault()
self.state[state_keys.no_coolant] = false self.state[state_keys.no_coolant] = false
else else
self.state[state_keys.no_coolant] = coolant_filled < 0.02 self.state[state_keys.no_coolant] = coolant_filled < MIN_COOLANT_FILL
end end
end end
@ -110,11 +117,10 @@ function plc.rps_init(reactor)
local w_filled = self.reactor.getWasteFilledPercentage() local w_filled = self.reactor.getWasteFilledPercentage()
if w_filled == ppm.ACCESS_FAULT then if w_filled == ppm.ACCESS_FAULT then
-- lost the peripheral or terminated, handled later -- lost the peripheral or terminated, handled later
log.error("RPS: failed to check reactor waste level")
_set_fault() _set_fault()
self.state[state_keys.ex_waste] = false self.state[state_keys.ex_waste] = false
else else
self.state[state_keys.ex_waste] = w_filled > 0.8 self.state[state_keys.ex_waste] = w_filled > MAX_WASTE_FILL
end end
end end
@ -123,11 +129,10 @@ function plc.rps_init(reactor)
local hc_filled = self.reactor.getHeatedCoolantFilledPercentage() local hc_filled = self.reactor.getHeatedCoolantFilledPercentage()
if hc_filled == ppm.ACCESS_FAULT then if hc_filled == ppm.ACCESS_FAULT then
-- lost the peripheral or terminated, handled later -- lost the peripheral or terminated, handled later
log.error("RPS: failed to check reactor heated coolant level")
_set_fault() _set_fault()
self.state[state_keys.ex_hcoolant] = false self.state[state_keys.ex_hcoolant] = false
else else
self.state[state_keys.ex_hcoolant] = hc_filled > 0.95 self.state[state_keys.ex_hcoolant] = hc_filled > MAX_HEATED_COLLANT_FILL
end end
end end
@ -136,7 +141,6 @@ function plc.rps_init(reactor)
local fuel = self.reactor.getFuel() local fuel = self.reactor.getFuel()
if fuel == ppm.ACCESS_FAULT then if fuel == ppm.ACCESS_FAULT then
-- lost the peripheral or terminated, handled later -- lost the peripheral or terminated, handled later
log.error("RPS: failed to check reactor fuel")
_set_fault() _set_fault()
self.state[state_keys.no_fuel] = false self.state[state_keys.no_fuel] = false
else else
@ -364,9 +368,9 @@ function plc.comms(id, version, modem, local_port, server_port, reactor, rps, co
0, -- getDamagePercent 0, -- getDamagePercent
0, -- getBoilEfficiency 0, -- getBoilEfficiency
0, -- getEnvironmentalLoss 0, -- getEnvironmentalLoss
0, -- getFuel 0, -- fuel_amnt
0, -- getFuelFilledPercentage 0, -- getFuelFilledPercentage
0, -- getWaste 0, -- waste_amnt
0, -- getWasteFilledPercentage 0, -- getWasteFilledPercentage
"", -- coolant_name "", -- coolant_name
0, -- coolant_amnt 0, -- coolant_amnt
@ -396,16 +400,12 @@ function plc.comms(id, version, modem, local_port, server_port, reactor, rps, co
parallel.waitForAll(table.unpack(tasks)) parallel.waitForAll(table.unpack(tasks))
if type(fuel) == "table" then if fuel ~= nil then
data_table[8] = fuel.amount data_table[8] = fuel.amount
elseif type(fuel) == "number" then
data_table[8] = fuel
end end
if type(waste) == "table" then if waste ~= nil then
data_table[10] = waste.amount data_table[10] = waste.amount
elseif type(waste) == "number" then
data_table[10] = waste
end end
if coolant ~= nil then if coolant ~= nil then
@ -462,17 +462,26 @@ function plc.comms(id, version, modem, local_port, server_port, reactor, rps, co
-- send structure properties (these should not change, server will cache these) -- send structure properties (these should not change, server will cache these)
local function _send_struct() local function _send_struct()
local mek_data = { 0, 0, 0, 0, 0, 0, 0, 0 } local min_pos = { x = 0, y = 0, z = 0 }
local max_pos = { x = 0, y = 0, z = 0 }
local mek_data = { false, 0, 0, 0, min_pos, max_pos, 0, 0, 0, 0, 0, 0, 0, 0 }
local tasks = { local tasks = {
function () mek_data[1] = self.reactor.getHeatCapacity() end, function () mek_data[1] = self.reactor.isFormed() end,
function () mek_data[2] = self.reactor.getFuelAssemblies() end, function () mek_data[2] = self.reactor.getLength() end,
function () mek_data[3] = self.reactor.getFuelSurfaceArea() end, function () mek_data[3] = self.reactor.getWidth() end,
function () mek_data[4] = self.reactor.getFuelCapacity() end, function () mek_data[4] = self.reactor.getHeight() end,
function () mek_data[5] = self.reactor.getWasteCapacity() end, function () mek_data[5] = self.reactor.getMinPos() end,
function () mek_data[6] = self.reactor.getCoolantCapacity() end, function () mek_data[6] = self.reactor.getMaxPos() end,
function () mek_data[7] = self.reactor.getHeatedCoolantCapacity() end, function () mek_data[7] = self.reactor.getHeatCapacity() end,
function () mek_data[8] = self.reactor.getMaxBurnRate() end function () mek_data[8] = self.reactor.getFuelAssemblies() end,
function () mek_data[9] = self.reactor.getFuelSurfaceArea() end,
function () mek_data[10] = self.reactor.getFuelCapacity() end,
function () mek_data[11] = self.reactor.getWasteCapacity() end,
function () mek_data[12] = self.reactor.getCoolantCapacity() end,
function () mek_data[13] = self.reactor.getHeatedCoolantCapacity() end,
function () mek_data[14] = self.reactor.getMaxBurnRate() end
} }
parallel.waitForAll(table.unpack(tasks)) parallel.waitForAll(table.unpack(tasks))

2
reactor-plc/startup.lua
View File

@ -13,7 +13,7 @@ local config = require("reactor-plc.config")
local plc = require("reactor-plc.plc") local plc = require("reactor-plc.plc")
local threads = require("reactor-plc.threads") local threads = require("reactor-plc.threads")
local R_PLC_VERSION = "beta-v0.8.6" local R_PLC_VERSION = "beta-v0.8.7"
local print = util.print local print = util.print
local println = util.println local println = util.println

32
supervisor/session/plc.lua
View File

@ -130,6 +130,12 @@ function plc.new_session(id, for_reactor, in_queue, out_queue)
}, },
---@class mek_struct ---@class mek_struct
mek_struct = { mek_struct = {
formed = false,
length = 0,
width = 0,
height = 0,
min_pos = { x = 0, y = 0, z = 0 }, ---@type coordinate
max_pos = { x = 0, y = 0, z = 0 }, ---@type coordinate
heat_cap = 0, heat_cap = 0,
fuel_asm = 0, fuel_asm = 0,
fuel_sa = 0, fuel_sa = 0,
@ -195,14 +201,20 @@ function plc.new_session(id, for_reactor, in_queue, out_queue)
-- copy in the reactor structure -- copy in the reactor structure
---@param mek_data table ---@param mek_data table
local function _copy_struct(mek_data) local function _copy_struct(mek_data)
self.sDB.mek_struct.heat_cap = mek_data[1] self.sDB.mek_struct.formed = mek_data[1]
self.sDB.mek_struct.fuel_asm = mek_data[2] self.sDB.mek_struct.length = mek_data[2]
self.sDB.mek_struct.fuel_sa = mek_data[3] self.sDB.mek_struct.width = mek_data[3]
self.sDB.mek_struct.fuel_cap = mek_data[4] self.sDB.mek_struct.height = mek_data[4]
self.sDB.mek_struct.waste_cap = mek_data[5] self.sDB.mek_struct.min_pos = mek_data[5]
self.sDB.mek_struct.ccool_cap = mek_data[6] self.sDB.mek_struct.max_pos = mek_data[6]
self.sDB.mek_struct.hcool_cap = mek_data[7] self.sDB.mek_struct.heat_cap = mek_data[7]
self.sDB.mek_struct.max_burn = mek_data[8] self.sDB.mek_struct.fuel_asm = mek_data[8]
self.sDB.mek_struct.fuel_sa = mek_data[9]
self.sDB.mek_struct.fuel_cap = mek_data[10]
self.sDB.mek_struct.waste_cap = mek_data[11]
self.sDB.mek_struct.ccool_cap = mek_data[12]
self.sDB.mek_struct.hcool_cap = mek_data[13]
self.sDB.mek_struct.max_burn = mek_data[14]
end end
-- mark this PLC session as closed, stop watchdog -- mark this PLC session as closed, stop watchdog
@ -301,7 +313,7 @@ function plc.new_session(id, for_reactor, in_queue, out_queue)
end end
elseif pkt.type == RPLC_TYPES.MEK_STRUCT then elseif pkt.type == RPLC_TYPES.MEK_STRUCT then
-- received reactor structure, record it -- received reactor structure, record it
if pkt.length == 8 then if pkt.length == 14 then
local status = pcall(_copy_struct, pkt.data) local status = pcall(_copy_struct, pkt.data)
if status then if status then
-- copied in structure data OK -- copied in structure data OK
@ -357,7 +369,7 @@ function plc.new_session(id, for_reactor, in_queue, out_queue)
if pkt.length == 10 then if pkt.length == 10 then
self.sDB.rps_tripped = true self.sDB.rps_tripped = true
self.sDB.rps_trip_cause = pkt.data[1] self.sDB.rps_trip_cause = pkt.data[1]
local status = pcall(_copy_rps_status, { table.unpack(pkt.data, 2, #pkt.length) }) local status = pcall(_copy_rps_status, { table.unpack(pkt.data, 2, pkt.length) })
if status then if status then
-- copied in RPS status data OK -- copied in RPS status data OK
else else

2
supervisor/startup.lua
View File

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