From 83dc1064f7950f182272911251af628d553fbeb6 Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Sat, 4 Mar 2023 22:19:53 -0500 Subject: [PATCH] #188 refactored RPS no_cool to low_cool --- coordinator/startup.lua | 2 +- coordinator/ui/components/unit_detail.lua | 6 +++--- install_manifest.json | 2 +- reactor-plc/plc.lua | 18 +++++++++--------- reactor-plc/startup.lua | 2 +- rtu/startup.lua | 2 +- scada-common/rsio.lua | 8 ++++---- scada-common/types.lua | 4 ++-- supervisor/session/plc.lua | 4 ++-- supervisor/startup.lua | 2 +- supervisor/unit.lua | 4 ++-- supervisor/unitlogic.lua | 8 ++++---- 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/coordinator/startup.lua b/coordinator/startup.lua index 985afae..e954710 100644 --- a/coordinator/startup.lua +++ b/coordinator/startup.lua @@ -19,7 +19,7 @@ local iocontrol = require("coordinator.iocontrol") local renderer = require("coordinator.renderer") local sounder = require("coordinator.sounder") -local COORDINATOR_VERSION = "v0.11.12" +local COORDINATOR_VERSION = "v0.11.13" local print = util.print local println = util.println diff --git a/coordinator/ui/components/unit_detail.lua b/coordinator/ui/components/unit_detail.lua index f4f633e..87f86de 100644 --- a/coordinator/ui/components/unit_detail.lua +++ b/coordinator/ui/components/unit_detail.lua @@ -210,12 +210,12 @@ local function init(parent, id) local rps_annunc = Div{parent=rps,width=31,height=10,x=2,y=1} local rps_trp = IndicatorLight{parent=rps_annunc,label="RPS Trip",colors=cpair(colors.red,colors.gray),flash=true,period=period.BLINK_250_MS} - local rps_dmg = IndicatorLight{parent=rps_annunc,label="Damage High",colors=cpair(colors.red,colors.gray),flash=true,period=period.BLINK_250_MS} + local rps_dmg = IndicatorLight{parent=rps_annunc,label="Damage Level High",colors=cpair(colors.red,colors.gray),flash=true,period=period.BLINK_250_MS} local rps_exh = IndicatorLight{parent=rps_annunc,label="Excess Heated Coolant",colors=cpair(colors.yellow,colors.gray)} local rps_exw = IndicatorLight{parent=rps_annunc,label="Excess Waste",colors=cpair(colors.yellow,colors.gray)} local rps_tmp = IndicatorLight{parent=rps_annunc,label="Core Temperature High",colors=cpair(colors.red,colors.gray),flash=true,period=period.BLINK_250_MS} local rps_nof = IndicatorLight{parent=rps_annunc,label="No Fuel",colors=cpair(colors.yellow,colors.gray)} - local rps_noc = IndicatorLight{parent=rps_annunc,label="Coolant Level Low Low",colors=cpair(colors.yellow,colors.gray)} + local rps_loc = IndicatorLight{parent=rps_annunc,label="Coolant Level Low Low",colors=cpair(colors.yellow,colors.gray)} local rps_flt = IndicatorLight{parent=rps_annunc,label="PPM Fault",colors=cpair(colors.yellow,colors.gray),flash=true,period=period.BLINK_500_MS} local rps_tmo = IndicatorLight{parent=rps_annunc,label="Connection Timeout",colors=cpair(colors.yellow,colors.gray),flash=true,period=period.BLINK_500_MS} local rps_sfl = IndicatorLight{parent=rps_annunc,label="System Failure",colors=cpair(colors.orange,colors.gray),flash=true,period=period.BLINK_500_MS} @@ -226,7 +226,7 @@ local function init(parent, id) u_ps.subscribe("ex_waste", rps_exw.update) u_ps.subscribe("high_temp", rps_tmp.update) u_ps.subscribe("no_fuel", rps_nof.update) - u_ps.subscribe("no_cool", rps_noc.update) + u_ps.subscribe("low_cool", rps_loc.update) u_ps.subscribe("fault", rps_flt.update) u_ps.subscribe("timeout", rps_tmo.update) u_ps.subscribe("sys_fail", rps_sfl.update) diff --git a/install_manifest.json b/install_manifest.json index 793d9c9..694ae3b 100644 --- a/install_manifest.json +++ b/install_manifest.json @@ -1 +1 @@ -{"versions": {"installer": "v0.9m", "bootloader": "0.2", "comms": "1.4.0", "reactor-plc": "v0.12.4", "rtu": "v0.12.5", "supervisor": "v0.13.13", "coordinator": "v0.11.12", "pocket": "alpha-v0.0.0"}, "files": {"system": ["initenv.lua", "startup.lua"], "common": ["scada-common/crypto.lua", "scada-common/ppm.lua", "scada-common/comms.lua", "scada-common/psil.lua", "scada-common/tcallbackdsp.lua", "scada-common/rsio.lua", "scada-common/constants.lua", "scada-common/mqueue.lua", "scada-common/crash.lua", "scada-common/log.lua", "scada-common/types.lua", "scada-common/util.lua"], "graphics": ["graphics/element.lua", "graphics/flasher.lua", "graphics/core.lua", "graphics/elements/textbox.lua", "graphics/elements/displaybox.lua", "graphics/elements/pipenet.lua", "graphics/elements/rectangle.lua", "graphics/elements/div.lua", "graphics/elements/tiling.lua", "graphics/elements/colormap.lua", "graphics/elements/indicators/alight.lua", "graphics/elements/indicators/icon.lua", "graphics/elements/indicators/power.lua", "graphics/elements/indicators/rad.lua", "graphics/elements/indicators/state.lua", "graphics/elements/indicators/light.lua", "graphics/elements/indicators/vbar.lua", "graphics/elements/indicators/coremap.lua", "graphics/elements/indicators/data.lua", "graphics/elements/indicators/hbar.lua", "graphics/elements/indicators/trilight.lua", "graphics/elements/controls/switch_button.lua", "graphics/elements/controls/spinbox_numeric.lua", "graphics/elements/controls/hazard_button.lua", "graphics/elements/controls/push_button.lua", "graphics/elements/controls/radio_button.lua", "graphics/elements/controls/multi_button.lua", "graphics/elements/animations/waiting.lua"], "lockbox": ["lockbox/init.lua", "lockbox/LICENSE", "lockbox/kdf/pbkdf2.lua", "lockbox/util/bit.lua", "lockbox/util/array.lua", "lockbox/util/stream.lua", "lockbox/util/queue.lua", "lockbox/digest/sha2_224.lua", "lockbox/digest/sha1.lua", "lockbox/digest/sha2_256.lua", "lockbox/cipher/aes128.lua", "lockbox/cipher/aes256.lua", "lockbox/cipher/aes192.lua", "lockbox/cipher/mode/ofb.lua", "lockbox/cipher/mode/cbc.lua", "lockbox/cipher/mode/ctr.lua", "lockbox/cipher/mode/cfb.lua", "lockbox/mac/hmac.lua", "lockbox/padding/ansix923.lua", "lockbox/padding/pkcs7.lua", "lockbox/padding/zero.lua", "lockbox/padding/isoiec7816.lua"], "reactor-plc": ["reactor-plc/threads.lua", "reactor-plc/plc.lua", "reactor-plc/config.lua", "reactor-plc/startup.lua"], "rtu": ["rtu/threads.lua", "rtu/rtu.lua", "rtu/modbus.lua", "rtu/config.lua", "rtu/startup.lua", "rtu/dev/sps_rtu.lua", "rtu/dev/envd_rtu.lua", "rtu/dev/boilerv_rtu.lua", "rtu/dev/redstone_rtu.lua", "rtu/dev/sna_rtu.lua", "rtu/dev/imatrix_rtu.lua", "rtu/dev/turbinev_rtu.lua"], "supervisor": ["supervisor/supervisor.lua", "supervisor/unit.lua", "supervisor/config.lua", "supervisor/startup.lua", "supervisor/unitlogic.lua", "supervisor/facility.lua", "supervisor/session/coordinator.lua", "supervisor/session/svqtypes.lua", "supervisor/session/svsessions.lua", "supervisor/session/rtu.lua", "supervisor/session/plc.lua", "supervisor/session/rsctl.lua", "supervisor/session/rtu/boilerv.lua", "supervisor/session/rtu/txnctrl.lua", "supervisor/session/rtu/unit_session.lua", "supervisor/session/rtu/turbinev.lua", "supervisor/session/rtu/envd.lua", "supervisor/session/rtu/imatrix.lua", "supervisor/session/rtu/sps.lua", "supervisor/session/rtu/qtypes.lua", "supervisor/session/rtu/sna.lua", "supervisor/session/rtu/redstone.lua"], "coordinator": ["coordinator/coordinator.lua", "coordinator/renderer.lua", "coordinator/iocontrol.lua", "coordinator/sounder.lua", "coordinator/config.lua", "coordinator/startup.lua", "coordinator/apisessions.lua", "coordinator/process.lua", "coordinator/ui/dialog.lua", "coordinator/ui/style.lua", "coordinator/ui/layout/main_view.lua", "coordinator/ui/layout/unit_view.lua", "coordinator/ui/components/reactor.lua", "coordinator/ui/components/processctl.lua", "coordinator/ui/components/unit_overview.lua", "coordinator/ui/components/boiler.lua", "coordinator/ui/components/unit_detail.lua", "coordinator/ui/components/imatrix.lua", "coordinator/ui/components/unit_waiting.lua", "coordinator/ui/components/turbine.lua"], "pocket": ["pocket/config.lua", "pocket/startup.lua"]}, "depends": {"reactor-plc": ["system", "common"], "rtu": ["system", "common"], "supervisor": ["system", "common"], "coordinator": ["system", "common", "graphics"], "pocket": ["system", "common", "graphics"]}, "sizes": {"manifest": 4650, "system": 1982, "common": 91071, "graphics": 99858, "lockbox": 100797, "reactor-plc": 75535, "rtu": 83729, "supervisor": 274484, "coordinator": 179960, "pocket": 335}} \ No newline at end of file +{"versions": {"installer": "v0.9m", "bootloader": "0.2", "comms": "1.4.0", "reactor-plc": "v0.12.5", "rtu": "v0.12.6", "supervisor": "v0.13.14", "coordinator": "v0.11.13", "pocket": "alpha-v0.0.0"}, "files": {"system": ["initenv.lua", "startup.lua"], "common": ["scada-common/crypto.lua", "scada-common/ppm.lua", "scada-common/comms.lua", "scada-common/psil.lua", "scada-common/tcallbackdsp.lua", "scada-common/rsio.lua", "scada-common/constants.lua", "scada-common/mqueue.lua", "scada-common/crash.lua", "scada-common/log.lua", "scada-common/types.lua", "scada-common/util.lua"], "graphics": ["graphics/element.lua", "graphics/flasher.lua", "graphics/core.lua", "graphics/elements/textbox.lua", "graphics/elements/displaybox.lua", "graphics/elements/pipenet.lua", "graphics/elements/rectangle.lua", "graphics/elements/div.lua", "graphics/elements/tiling.lua", "graphics/elements/colormap.lua", "graphics/elements/indicators/alight.lua", "graphics/elements/indicators/icon.lua", "graphics/elements/indicators/power.lua", "graphics/elements/indicators/rad.lua", "graphics/elements/indicators/state.lua", "graphics/elements/indicators/light.lua", "graphics/elements/indicators/vbar.lua", "graphics/elements/indicators/coremap.lua", "graphics/elements/indicators/data.lua", "graphics/elements/indicators/hbar.lua", "graphics/elements/indicators/trilight.lua", "graphics/elements/controls/switch_button.lua", "graphics/elements/controls/spinbox_numeric.lua", "graphics/elements/controls/hazard_button.lua", "graphics/elements/controls/push_button.lua", "graphics/elements/controls/radio_button.lua", "graphics/elements/controls/multi_button.lua", "graphics/elements/animations/waiting.lua"], "lockbox": ["lockbox/init.lua", "lockbox/LICENSE", "lockbox/kdf/pbkdf2.lua", "lockbox/util/bit.lua", "lockbox/util/array.lua", "lockbox/util/stream.lua", "lockbox/util/queue.lua", "lockbox/digest/sha2_224.lua", "lockbox/digest/sha1.lua", "lockbox/digest/sha2_256.lua", "lockbox/cipher/aes128.lua", "lockbox/cipher/aes256.lua", "lockbox/cipher/aes192.lua", "lockbox/cipher/mode/ofb.lua", "lockbox/cipher/mode/cbc.lua", "lockbox/cipher/mode/ctr.lua", "lockbox/cipher/mode/cfb.lua", "lockbox/mac/hmac.lua", "lockbox/padding/ansix923.lua", "lockbox/padding/pkcs7.lua", "lockbox/padding/zero.lua", "lockbox/padding/isoiec7816.lua"], "reactor-plc": ["reactor-plc/threads.lua", "reactor-plc/plc.lua", "reactor-plc/config.lua", "reactor-plc/startup.lua"], "rtu": ["rtu/threads.lua", "rtu/rtu.lua", "rtu/modbus.lua", "rtu/config.lua", "rtu/startup.lua", "rtu/dev/sps_rtu.lua", "rtu/dev/envd_rtu.lua", "rtu/dev/boilerv_rtu.lua", "rtu/dev/redstone_rtu.lua", "rtu/dev/sna_rtu.lua", "rtu/dev/imatrix_rtu.lua", "rtu/dev/turbinev_rtu.lua"], "supervisor": ["supervisor/supervisor.lua", "supervisor/unit.lua", "supervisor/config.lua", "supervisor/startup.lua", "supervisor/unitlogic.lua", "supervisor/facility.lua", "supervisor/session/coordinator.lua", "supervisor/session/svqtypes.lua", "supervisor/session/svsessions.lua", "supervisor/session/rtu.lua", "supervisor/session/plc.lua", "supervisor/session/rsctl.lua", "supervisor/session/rtu/boilerv.lua", "supervisor/session/rtu/txnctrl.lua", "supervisor/session/rtu/unit_session.lua", "supervisor/session/rtu/turbinev.lua", "supervisor/session/rtu/envd.lua", "supervisor/session/rtu/imatrix.lua", "supervisor/session/rtu/sps.lua", "supervisor/session/rtu/qtypes.lua", "supervisor/session/rtu/sna.lua", "supervisor/session/rtu/redstone.lua"], "coordinator": ["coordinator/coordinator.lua", "coordinator/renderer.lua", "coordinator/iocontrol.lua", "coordinator/sounder.lua", "coordinator/config.lua", "coordinator/startup.lua", "coordinator/apisessions.lua", "coordinator/process.lua", "coordinator/ui/dialog.lua", "coordinator/ui/style.lua", "coordinator/ui/layout/main_view.lua", "coordinator/ui/layout/unit_view.lua", "coordinator/ui/components/reactor.lua", "coordinator/ui/components/processctl.lua", "coordinator/ui/components/unit_overview.lua", "coordinator/ui/components/boiler.lua", "coordinator/ui/components/unit_detail.lua", "coordinator/ui/components/imatrix.lua", "coordinator/ui/components/unit_waiting.lua", "coordinator/ui/components/turbine.lua"], "pocket": ["pocket/config.lua", "pocket/startup.lua"]}, "depends": {"reactor-plc": ["system", "common"], "rtu": ["system", "common"], "supervisor": ["system", "common"], "coordinator": ["system", "common", "graphics"], "pocket": ["system", "common", "graphics"]}, "sizes": {"manifest": 4650, "system": 1982, "common": 91083, "graphics": 99858, "lockbox": 100797, "reactor-plc": 75536, "rtu": 83729, "supervisor": 274492, "coordinator": 179967, "pocket": 335}} \ No newline at end of file diff --git a/reactor-plc/plc.lua b/reactor-plc/plc.lua index 0f82522..b100407 100644 --- a/reactor-plc/plc.lua +++ b/reactor-plc/plc.lua @@ -38,7 +38,7 @@ function plc.rps_init(reactor, is_formed) local state_keys = { dmg_high = 1, high_temp = 2, - no_coolant = 3, + low_coolant = 3, ex_waste = 4, ex_hcoolant = 5, no_fuel = 6, @@ -127,14 +127,14 @@ function plc.rps_init(reactor, is_formed) end end - -- check if there is no coolant (<2% filled) - local function _no_coolant() + -- check if there is very low coolant + local function _low_coolant() local coolant_filled = reactor.getCoolantFilledPercentage() if coolant_filled == ppm.ACCESS_FAULT then -- lost the peripheral or terminated, handled later _set_fault() - elseif not self.state[state_keys.no_coolant] then - self.state[state_keys.no_coolant] = coolant_filled < RPS_LIMITS.MIN_COOLANT_FILL + elseif not self.state[state_keys.low_coolant] then + self.state[state_keys.low_coolant] = coolant_filled < RPS_LIMITS.MIN_COOLANT_FILL end end @@ -275,7 +275,7 @@ function plc.rps_init(reactor, is_formed) _is_force_disabled, _damage_high, _high_temp, - _no_coolant, + _low_coolant, _excess_waste, _excess_heated_coolant, _insufficient_fuel @@ -300,9 +300,9 @@ function plc.rps_init(reactor, is_formed) elseif self.state[state_keys.high_temp] then log.warning("RPS: high temperature") status = RPS_TRIP_CAUSE.HIGH_TEMP - elseif self.state[state_keys.no_coolant] then - log.warning("RPS: no coolant") - status = RPS_TRIP_CAUSE.NO_COOLANT + elseif self.state[state_keys.low_coolant] then + log.warning("RPS: low coolant") + status = RPS_TRIP_CAUSE.LOW_COOLANT elseif self.state[state_keys.ex_waste] then log.warning("RPS: full waste") status = RPS_TRIP_CAUSE.EX_WASTE diff --git a/reactor-plc/startup.lua b/reactor-plc/startup.lua index 332ffd3..03474eb 100644 --- a/reactor-plc/startup.lua +++ b/reactor-plc/startup.lua @@ -14,7 +14,7 @@ local config = require("reactor-plc.config") local plc = require("reactor-plc.plc") local threads = require("reactor-plc.threads") -local R_PLC_VERSION = "v0.12.4" +local R_PLC_VERSION = "v0.12.5" local print = util.print local println = util.println diff --git a/rtu/startup.lua b/rtu/startup.lua index 4248fc2..7f3be68 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.12.5" +local RTU_VERSION = "v0.12.6" local RTU_UNIT_TYPE = types.RTU_UNIT_TYPE diff --git a/scada-common/rsio.lua b/scada-common/rsio.lua index f8f484c..6698836 100644 --- a/scada-common/rsio.lua +++ b/scada-common/rsio.lua @@ -67,7 +67,7 @@ local IO_PORT = { R_AUTO_SCRAM = 15, -- active high, if the reactor was automatically scrammed R_DMG_HIGH = 16, -- active high, if the reactor damage is high R_HIGH_TEMP = 17, -- active high, if the reactor is at a high temperature - R_NO_COOLANT = 18, -- active high, if the reactor has no coolant + R_LOW_COOLANT = 18, -- active high, if the reactor has very low coolant R_EXCESS_HC = 19, -- active high, if the reactor has excess heated coolant R_EXCESS_WS = 20, -- active high, if the reactor has excess waste R_INSUFF_FUEL = 21, -- active high, if the reactor has insufficent fuel @@ -110,7 +110,7 @@ function rsio.to_string(port) "R_AUTO_SCRAM", "R_DMG_HIGH", "R_HIGH_TEMP", - "R_NO_COOLANT", + "R_LOW_COOLANT", "R_EXCESS_HC", "R_EXCESS_WS", "R_INSUFF_FUEL", @@ -175,7 +175,7 @@ local RS_DIO_MAP = { { _in = _I_ACTIVE_HIGH, _out = _O_ACTIVE_HIGH, mode = IO_DIR.OUT }, -- R_HIGH_TEMP { _in = _I_ACTIVE_HIGH, _out = _O_ACTIVE_HIGH, mode = IO_DIR.OUT }, - -- R_NO_COOLANT + -- R_LOW_COOLANT { _in = _I_ACTIVE_HIGH, _out = _O_ACTIVE_HIGH, mode = IO_DIR.OUT }, -- R_EXCESS_HC { _in = _I_ACTIVE_HIGH, _out = _O_ACTIVE_HIGH, mode = IO_DIR.OUT }, @@ -217,7 +217,7 @@ function rsio.get_io_mode(port) IO_MODE.DIGITAL_OUT, -- R_AUTO_SCRAM IO_MODE.DIGITAL_OUT, -- R_DMG_HIGH IO_MODE.DIGITAL_OUT, -- R_HIGH_TEMP - IO_MODE.DIGITAL_OUT, -- R_NO_COOLANT + IO_MODE.DIGITAL_OUT, -- R_LOW_COOLANT IO_MODE.DIGITAL_OUT, -- R_EXCESS_HC IO_MODE.DIGITAL_OUT, -- R_EXCESS_WS IO_MODE.DIGITAL_OUT, -- R_INSUFF_FUEL diff --git a/scada-common/types.lua b/scada-common/types.lua index 1194e1d..02e8d32 100644 --- a/scada-common/types.lua +++ b/scada-common/types.lua @@ -275,7 +275,7 @@ types.FLUID = { ---| "ok" ---| "dmg_high" ---| "high_temp" ----| "no_coolant" +---| "low_coolant" ---| "ex_waste" ---| "ex_heated_coolant" ---| "no_fuel" @@ -290,7 +290,7 @@ types.RPS_TRIP_CAUSE = { OK = "ok", DMG_HIGH = "dmg_high", HIGH_TEMP = "high_temp", - NO_COOLANT = "no_coolant", + LOW_COOLANT = "low_coolant", EX_WASTE = "ex_waste", EX_HCOOLANT = "ex_heated_coolant", NO_FUEL = "no_fuel", diff --git a/supervisor/session/plc.lua b/supervisor/session/plc.lua index 1a1f665..8a4d255 100644 --- a/supervisor/session/plc.lua +++ b/supervisor/session/plc.lua @@ -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] diff --git a/supervisor/startup.lua b/supervisor/startup.lua index 169b87e..21c9059 100644 --- a/supervisor/startup.lua +++ b/supervisor/startup.lua @@ -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 diff --git a/supervisor/unit.lua b/supervisor/unit.lua index b6f82ec..f218aeb 100644 --- a/supervisor/unit.lua +++ b/supervisor/unit.lua @@ -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, diff --git a/supervisor/unitlogic.lua b/supervisor/unitlogic.lua index 8dd51a8..969f2e0 100644 --- a/supervisor/unitlogic.lua +++ b/supervisor/unitlogic.lua @@ -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