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

#31 PPM cannot assume that we will get a fault on failure, apparently sometimes we will only get a nil return so the system can no longer check ACCESS_OK, now each device has its own fault tracking

Browse Source
This commit is contained in:
Mikayla Fischler
2022-04-24 12:04:31 -04:00
parent 416255f41a
commit 86b0d155fa
6 changed files with 81 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
reactor-plc/plc.lua
View File

@@ -131,7 +131,8 @@ function iss_init(reactor)
log._warning("ISS: reactor SCRAM")
self.tripped = true
self.trip_cause = status
if self.reactor.scram() == ppm.ACCESS_FAULT then
self.reactor.scram()
if self.reactor.__p_is_faulted() then
log._error("ISS: failed reactor SCRAM")
end
end
@@ -420,12 +421,14 @@ function comms_init(id, modem, local_port, server_port, reactor, iss)
-- disable the reactor
self.scrammed = true
plc_state.scram = true
_send_ack(packet.type, self.reactor.scram() == ppm.ACCESS_OK)
self.reactor.scram()
_send_ack(packet.type, self.reactor.__p_is_ok())
elseif packet.type == RPLC_TYPES.MEK_ENABLE then
-- enable the reactor
self.scrammed = false
plc_state.scram = false
_send_ack(packet.type, self.reactor.activate() == ppm.ACCESS_OK)
self.reactor.activate()
_send_ack(packet.type, self.reactor.__p_is_ok())
elseif packet.type == RPLC_TYPES.MEK_BURN_RATE then
-- set the burn rate
local success = false
@@ -441,11 +444,12 @@ function comms_init(id, modem, local_port, server_port, reactor, iss)
-- if we know our max burn rate, update current burn rate if in range
if max_burn_rate ~= ppm.ACCESS_FAULT then
if burn_rate > 0 and burn_rate <= max_burn_rate then
success = self.reactor.setBurnRate(burn_rate)
self.reactor.setBurnRate(burn_rate)
success = self.reactor.__p_is_ok()
end
end
_send_ack(packet.type, success == ppm.ACCESS_OK)
_send_ack(packet.type, success)
elseif packet.type == RPLC_TYPES.ISS_CLEAR then
-- clear the ISS status
iss.reset()

5
reactor-plc/startup.lua
View File

@@ -10,7 +10,7 @@ os.loadAPI("scada-common/comms.lua")
os.loadAPI("config.lua")
os.loadAPI("plc.lua")
local R_PLC_VERSION = "alpha-v0.2.5"
local R_PLC_VERSION = "alpha-v0.2.6"
local print = util.print
local println = util.println
@@ -281,7 +281,8 @@ while true do
log._warning("terminate requested, exiting...")
if plc_state.init_ok then
plc_state.scram = true
if reactor.scram() ~= ppm.ACCESS_FAULT then
reactor.scram()
if reactor.__p_is_ok() then
println_ts("reactor disabled")
else
-- send an alarm: plc_comms.send_alarm(ALARMS.PLC_LOST_CONTROL) ?