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

PLC state code cleanup and bugfixes

Browse Source
This commit is contained in:
Mikayla Fischler
2022-04-05 09:41:06 -04:00
parent 02763c9cb3
commit 13b0fcf65f
2 changed files with 48 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
reactor-plc/plc.lua
View File

@@ -495,9 +495,8 @@ function comms_init(id, modem, local_port, server_port, reactor, iss)
end
-- send live status information
-- control_state : acknowledged control state from supervisor
-- overridden : if ISS force disabled reactor
local send_status = function (control_state, overridden)
-- overridden : if ISS force disabled reactor
local send_status = function (overridden)
local mek_data = nil
if _update_status_cache() then
@@ -508,7 +507,7 @@ function comms_init(id, modem, local_port, server_port, reactor, iss)
id = self.id,
type = RPLC_TYPES.STATUS,
timestamp = os.time(),
control_state = control_state,
control_state = ~self.scrammed,
overridden = overridden,
heating_rate = self.reactor.getHeatingRate(),
mek_data = mek_data