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

#188 refactored RPS no_cool to low_cool

Browse Source
This commit is contained in:
Mikayla Fischler
2023-03-04 22:19:53 -05:00
parent c9f1bddb36
commit 83dc1064f7
12 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
supervisor/session/plc.lua
View File

@@ -104,7 +104,7 @@ function plc.new_session(id, reactor_id, in_queue, out_queue, timeout)
rps_status = {
dmg_high = false,
high_temp = false,
no_cool = false,
low_cool = false,
ex_waste = false,
ex_hcool = false,
no_fuel = false,
@@ -171,7 +171,7 @@ function plc.new_session(id, reactor_id, in_queue, out_queue, timeout)
self.sDB.rps_trip_cause = rps_status[2]
self.sDB.rps_status.dmg_high = rps_status[3]
self.sDB.rps_status.high_temp = rps_status[4]
self.sDB.rps_status.no_cool = rps_status[5]
self.sDB.rps_status.low_cool = rps_status[5]
self.sDB.rps_status.ex_waste = rps_status[6]
self.sDB.rps_status.ex_hcool = rps_status[7]
self.sDB.rps_status.no_fuel = rps_status[8]

2
supervisor/startup.lua
View File

@@ -14,7 +14,7 @@ local svsessions = require("supervisor.session.svsessions")
local config = require("supervisor.config")
local supervisor = require("supervisor.supervisor")
local SUPERVISOR_VERSION = "v0.13.13"
local SUPERVISOR_VERSION = "v0.13.14"
local print = util.print
local println = util.println

4
supervisor/unit.lua
View File

@@ -98,7 +98,7 @@ function unit.new(reactor_id, num_boilers, num_turbines)
last_rps_trips = {
dmg_high = false,
high_temp = false,
no_cool = false,
low_cool = false,
ex_waste = false,
ex_hcool = false,
no_fuel = false,
@@ -117,7 +117,7 @@ function unit.new(reactor_id, num_boilers, num_turbines)
rps_status = {
dmg_high = false,
high_temp = false,
no_cool = false,
low_cool = false,
ex_waste = false,
ex_hcool = false,
no_fuel = false,

8
supervisor/unitlogic.lua
View File

@@ -118,7 +118,7 @@ function logic.update_annunciator(self)
self.db.annunciator.ReactorSCRAM = plc_db.rps_tripped
self.db.annunciator.ManualReactorSCRAM = plc_db.rps_trip_cause == types.RPS_TRIP_CAUSE.MANUAL
self.db.annunciator.AutoReactorSCRAM = plc_db.rps_trip_cause == types.RPS_TRIP_CAUSE.AUTOMATIC
self.db.annunciator.RCPTrip = plc_db.rps_tripped and (plc_db.rps_status.ex_hcool or plc_db.rps_status.no_cool)
self.db.annunciator.RCPTrip = plc_db.rps_tripped and (plc_db.rps_status.ex_hcool or plc_db.rps_status.low_cool)
self.db.annunciator.RCSFlowLow = _get_dt(DT_KEYS.ReactorCCool) < flow_low
self.db.annunciator.CoolantLevelLow = plc_db.mek_status.ccool_fill < ANNUNC_LIMS.CoolantLevelLow
self.db.annunciator.ReactorTempHigh = plc_db.mek_status.temp > ANNUNC_LIMS.ReactorTempHigh
@@ -680,7 +680,7 @@ function logic.update_status_text(self)
cause = "core damage high"
elseif plc_db.rps_trip_cause == RPS_TRIP_CAUSE.HIGH_TEMP then
cause = "core temperature high"
elseif plc_db.rps_trip_cause == RPS_TRIP_CAUSE.NO_COOLANT then
elseif plc_db.rps_trip_cause == RPS_TRIP_CAUSE.LOW_COOLANT then
cause = "insufficient coolant"
elseif plc_db.rps_trip_cause == RPS_TRIP_CAUSE.EX_WASTE then
cause = "excess waste"
@@ -774,7 +774,7 @@ function logic.handle_redstone(self)
self.io_ctl.digital_write(IO.R_AUTO_SCRAM, self.plc_cache.rps_status.automatic)
self.io_ctl.digital_write(IO.R_DMG_HIGH, self.plc_cache.rps_status.dmg_high)
self.io_ctl.digital_write(IO.R_HIGH_TEMP, self.plc_cache.rps_status.high_temp)
self.io_ctl.digital_write(IO.R_NO_COOLANT, self.plc_cache.rps_status.no_cool)
self.io_ctl.digital_write(IO.R_LOW_COOLANT, self.plc_cache.rps_status.low_cool)
self.io_ctl.digital_write(IO.R_EXCESS_HC, self.plc_cache.rps_status.ex_hcool)
self.io_ctl.digital_write(IO.R_EXCESS_WS, self.plc_cache.rps_status.ex_waste)
self.io_ctl.digital_write(IO.R_INSUFF_FUEL, self.plc_cache.rps_status.no_fuel)
@@ -797,7 +797,7 @@ function logic.handle_redstone(self)
-- Emergency Coolant --
-----------------------
local enable_emer_cool = self.plc_cache.rps_status.no_cool or
local enable_emer_cool = self.plc_cache.rps_status.low_cool or
(self.auto_engaged and self.db.annunciator.CoolantLevelLow and is_active(self.alarms.ReactorOverTemp))
if not self.plc_cache.rps_trip then