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

#268 fixed incorrect info print on extra wireless modem connection

Browse Source
This commit is contained in:
Mikayla Fischler 2023-07-11 21:06:47 -04:00
parent 4ed6ec1c63
commit 084a153a79
7 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
coordinator/startup.lua
View File

@ -22,7 +22,7 @@ local sounder = require("coordinator.sounder")
local apisessions = require("coordinator.session.apisessions") local apisessions = require("coordinator.session.apisessions")
local COORDINATOR_VERSION = "v0.20.1" local COORDINATOR_VERSION = "v0.20.2"
local println = util.println local println = util.println
local println_ts = util.println_ts local println_ts = util.println_ts
@ -271,6 +271,8 @@ local function main()
log_sys("comms modem reconnected") log_sys("comms modem reconnected")
nic.connect(device) nic.connect(device)
iocontrol.fp_has_modem(true) iocontrol.fp_has_modem(true)
elseif device.isWireless() then
log.info("unused wireless modem reconnected")
else else
log_sys("wired modem reconnected") log_sys("wired modem reconnected")
end end

2
install_manifest.json
View File

File diff suppressed because one or more lines are too long

2
reactor-plc/startup.lua
View File

@ -19,7 +19,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.5.3" local R_PLC_VERSION = "v1.5.4"
local println = util.println local println = util.println
local println_ts = util.println_ts local println_ts = util.println_ts

2
reactor-plc/threads.lua
View File

@ -249,6 +249,8 @@ function threads.thread__main(smem, init)
if not plc_state.no_reactor then if not plc_state.no_reactor then
plc_state.degraded = false plc_state.degraded = false
end end
elseif device.isWireless() then
log.info("unused wireless modem reconnected")
else else
log.info("wired modem reconnected") log.info("wired modem reconnected")
end end

2
rtu/startup.lua
View File

@ -30,7 +30,7 @@ local sna_rtu = require("rtu.dev.sna_rtu")
local sps_rtu = require("rtu.dev.sps_rtu") local sps_rtu = require("rtu.dev.sps_rtu")
local turbinev_rtu = require("rtu.dev.turbinev_rtu") local turbinev_rtu = require("rtu.dev.turbinev_rtu")
local RTU_VERSION = "v1.5.1" local RTU_VERSION = "v1.5.2"
local RTU_UNIT_TYPE = types.RTU_UNIT_TYPE local RTU_UNIT_TYPE = types.RTU_UNIT_TYPE
local RTU_UNIT_HW_STATE = databus.RTU_UNIT_HW_STATE local RTU_UNIT_HW_STATE = databus.RTU_UNIT_HW_STATE

2
rtu/threads.lua
View File

@ -142,6 +142,8 @@ function threads.thread__main(smem)
log.info("comms modem reconnected") log.info("comms modem reconnected")
databus.tx_hw_modem(true) databus.tx_hw_modem(true)
elseif device.isWireless() then
log.info("unused wireless modem reconnected")
else else
log.info("wired modem reconnected") log.info("wired modem reconnected")
end end

4
supervisor/startup.lua
View File

@ -21,7 +21,7 @@ local supervisor = require("supervisor.supervisor")
local svsessions = require("supervisor.session.svsessions") local svsessions = require("supervisor.session.svsessions")
local SUPERVISOR_VERSION = "v0.19.3" local SUPERVISOR_VERSION = "v0.19.4"
local println = util.println local println = util.println
local println_ts = util.println_ts local println_ts = util.println_ts
@ -178,6 +178,8 @@ local function main()
log.info("comms modem reconnected") log.info("comms modem reconnected")
databus.tx_hw_modem(true) databus.tx_hw_modem(true)
elseif device.isWireless() then
log.info("unused wireless modem reconnected")
else else
log.info("wired modem reconnected") log.info("wired modem reconnected")
end end