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

clear status cache when connection is lost/reset, allow requesting of full status

Browse Source
This commit is contained in:
Mikayla Fischler 2022-05-03 17:10:42 -04:00
parent 665b33fa05
commit 25c6b311f5
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
reactor-plc/plc.lua
View File

@ -374,13 +374,14 @@ function comms_init(id, modem, local_port, server_port, reactor, iss)
-- reconnect a newly connected reactor -- reconnect a newly connected reactor
local reconnect_reactor = function (reactor) local reconnect_reactor = function (reactor)
self.reactor = reactor self.reactor = reactor
_update_status_cache() self.status_cache = nil
end end
-- unlink from the server -- unlink from the server
local unlink = function () local unlink = function ()
self.linked = false self.linked = false
self.r_seq_num = nil self.r_seq_num = nil
self.status_cache = nil
end end
-- close the connection to the server -- close the connection to the server
@ -512,6 +513,7 @@ function comms_init(id, modem, local_port, server_port, reactor, iss)
local link_ack = packet.data[1] local link_ack = packet.data[1]
if link_ack == RPLC_LINKING.ALLOW then if link_ack == RPLC_LINKING.ALLOW then
self.status_cache = nil
_send_struct() _send_struct()
send_status(plc_state.degraded) send_status(plc_state.degraded)
log._debug("re-sent initial status data") log._debug("re-sent initial status data")
@ -530,6 +532,10 @@ function comms_init(id, modem, local_port, server_port, reactor, iss)
else else
log._debug("RPLC link req packet length mismatch") log._debug("RPLC link req packet length mismatch")
end end
elseif packet.type == RPLC_TYPES.STATUS then
-- request of full status, clear cache first
self.status_cache = nil
send_status(plc_state.degraded)
elseif packet.type == RPLC_TYPES.MEK_STRUCT then elseif packet.type == RPLC_TYPES.MEK_STRUCT then
-- request for physical structure -- request for physical structure
_send_struct() _send_struct()
@ -587,8 +593,9 @@ function comms_init(id, modem, local_port, server_port, reactor, iss)
println_ts("linked!") println_ts("linked!")
log._debug("RPLC link request approved") log._debug("RPLC link request approved")
-- reset remote sequence number -- reset remote sequence number and cache
self.r_seq_num = nil self.r_seq_num = nil
self.status_cache = nil
_send_struct() _send_struct()
send_status(plc_state.degraded) send_status(plc_state.degraded)

2
reactor-plc/startup.lua
View File

@ -13,7 +13,7 @@ os.loadAPI("config.lua")
os.loadAPI("plc.lua") os.loadAPI("plc.lua")
os.loadAPI("threads.lua") os.loadAPI("threads.lua")
local R_PLC_VERSION = "alpha-v0.5.0" local R_PLC_VERSION = "alpha-v0.5.1"
local print = util.print local print = util.print
local println = util.println local println = util.println