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

#381 fixed plc main thread crash on modem connect after boot with no modem

Browse Source
This commit is contained in:
Mikayla Fischler 2023-12-17 20:28:26 -05:00
parent 1b20218445
commit bc66ea6ecb
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reactor-plc/startup.lua
View File

@ -18,7 +18,7 @@ local plc = require("reactor-plc.plc")
local renderer = require("reactor-plc.renderer") local renderer = require("reactor-plc.renderer")
local threads = require("reactor-plc.threads") local threads = require("reactor-plc.threads")
local R_PLC_VERSION = "v1.6.6" local R_PLC_VERSION = "v1.6.7"
local println = util.println local println = util.println
local println_ts = util.println_ts local println_ts = util.println_ts

8
reactor-plc/threads.lua
View File

@ -173,7 +173,8 @@ function threads.thread__main(smem, init)
plc_state.degraded = true plc_state.degraded = true
elseif networked and type == "modem" then elseif networked and type == "modem" then
-- we only care if this is our wireless modem -- we only care if this is our wireless modem
if nic.is_modem(device) then -- note, check init_ok first since nic will be nil if it is false
if plc_state.init_ok and nic.is_modem(device) then
nic.disconnect() nic.disconnect()
println_ts("comms modem disconnected!") println_ts("comms modem disconnected!")
@ -193,7 +194,7 @@ function threads.thread__main(smem, init)
end end
end end
else else
log.warning("non-comms modem disconnected") log.warning("a modem was disconnected")
end end
end end
end end
@ -235,7 +236,8 @@ function threads.thread__main(smem, init)
rps.reset() rps.reset()
end end
elseif networked and type == "modem" then elseif networked and type == "modem" then
if device.isWireless() and not nic.is_connected() then -- note, check init_ok first since nic will be nil if it is false
if device.isWireless() and not (plc_state.init_ok and nic.is_connected()) then
-- reconnected modem -- reconnected modem
plc_dev.modem = device plc_dev.modem = device
plc_state.no_modem = false plc_state.no_modem = false