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

#634 removed checking wireless on disconnect due to peripheral already being gone, changed to checking if it belonged to the wireless nic

Browse Source
This commit is contained in:
Mikayla Fischler
2025-11-09 00:20:34 -05:00
parent b020dde122
commit 21c36c70be
4 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
coordinator/backplane.lua
View File

@@ -372,9 +372,7 @@ function backplane.detach(type, device, iface)
if type == "modem" then if type == "modem" then
---@cast device Modem ---@cast device Modem
local m_is_wl = device.isWireless() log.info(util.c("BKPLN: PHY_DETACH ", iface))
log.info(util.c("BKPLN: ", util.trinary(m_is_wl, "WIRELESS", "WIRED"), " PHY_DETACH ", iface))
if wd_nic and wd_nic.is_modem(device) then if wd_nic and wd_nic.is_modem(device) then
wd_nic.disconnect() wd_nic.disconnect()
@@ -428,7 +426,11 @@ function backplane.detach(type, device, iface)
else else
-- wired active disconnected, wireless unavailable -- wired active disconnected, wireless unavailable
end end
elseif _bp.wl_nic and m_is_wl then elseif wd_nic and wd_nic.is_modem(device) then
-- wired, but not active
log_sys("standby wired modem disconnected")
log.info("BKPLN: standby wired modem disconnected")
elseif wl_nic and wl_nic.is_modem(device) then
-- wireless, but not active -- wireless, but not active
log_sys("standby wireless modem disconnected") log_sys("standby wireless modem disconnected")
log.info("BKPLN: standby wireless modem disconnected") log.info("BKPLN: standby wireless modem disconnected")

12
reactor-plc/backplane.lua
View File

@@ -249,9 +249,7 @@ function backplane.detach(iface, type, device, print_no_fp)
elseif _bp.smem.networked and type == "modem" then elseif _bp.smem.networked and type == "modem" then
---@cast device Modem ---@cast device Modem
local m_is_wl = device.isWireless() log.info(util.c("BKPLN: PHY_DETACH ", iface))
log.info(util.c("BKPLN: ", util.trinary(m_is_wl, "WIRELESS", "WIRED"), " PHY_DETACH ", iface))
if wd_nic and wd_nic.is_modem(device) then if wd_nic and wd_nic.is_modem(device) then
wd_nic.disconnect() wd_nic.disconnect()
@@ -304,14 +302,14 @@ function backplane.detach(iface, type, device, print_no_fp)
state.degraded = true state.degraded = true
_bp.smem.q.mq_rps.push_command(MQ__RPS_CMD.DEGRADED_SCRAM) _bp.smem.q.mq_rps.push_command(MQ__RPS_CMD.DEGRADED_SCRAM)
end end
elseif wl_nic and m_is_wl then
-- wireless, but not active
print_no_fp("standby wireless modem disconnected")
log.info("BKPLN: standby wireless modem disconnected")
elseif wd_nic and wd_nic.is_modem(device) then elseif wd_nic and wd_nic.is_modem(device) then
-- wired, but not active -- wired, but not active
print_no_fp("standby wired modem disconnected") print_no_fp("standby wired modem disconnected")
log.info("BKPLN: standby wired modem disconnected") log.info("BKPLN: standby wired modem disconnected")
elseif wl_nic and wl_nic.is_modem(device) then
-- wireless, but not active
print_no_fp("standby wireless modem disconnected")
log.info("BKPLN: standby wireless modem disconnected")
else else
print_no_fp("unassigned modem disconnected") print_no_fp("unassigned modem disconnected")
log.warning("BKPLN: unassigned modem disconnected") log.warning("BKPLN: unassigned modem disconnected")

12
rtu/backplane.lua
View File

@@ -190,9 +190,7 @@ function backplane.detach(type, device, iface, print_no_fp)
if type == "modem" then if type == "modem" then
---@cast device Modem ---@cast device Modem
local m_is_wl = device.isWireless() log.info(util.c("BKPLN: PHY_DETACH ", iface))
log.info(util.c("BKPLN: ", util.trinary(m_is_wl, "WIRELESS", "WIRED"), " PHY_DETACH ", iface))
if wd_nic and wd_nic.is_modem(device) then if wd_nic and wd_nic.is_modem(device) then
wd_nic.disconnect() wd_nic.disconnect()
@@ -239,14 +237,14 @@ function backplane.detach(type, device, iface, print_no_fp)
else else
-- wired active disconnected, wireless unavailable -- wired active disconnected, wireless unavailable
end end
elseif _bp.wl_nic and m_is_wl then
-- wireless, but not active
print_no_fp("standby wireless modem disconnected")
log.info("BKPLN: standby wireless modem disconnected")
elseif wd_nic and wd_nic.is_modem(device) then elseif wd_nic and wd_nic.is_modem(device) then
-- wired, but not active -- wired, but not active
print_no_fp("standby wired modem disconnected") print_no_fp("standby wired modem disconnected")
log.info("BKPLN: standby wired modem disconnected") log.info("BKPLN: standby wired modem disconnected")
elseif wl_nic and wl_nic.is_modem(device) then
-- wireless, but not active
print_no_fp("standby wireless modem disconnected")
log.info("BKPLN: standby wireless modem disconnected")
else else
print_no_fp("unassigned modem disconnected") print_no_fp("unassigned modem disconnected")
log.warning("BKPLN: unassigned modem disconnected") log.warning("BKPLN: unassigned modem disconnected")

8
supervisor/backplane.lua
View File

@@ -129,9 +129,7 @@ function backplane.detach(iface, type, device, print_no_fp)
if type == "modem" then if type == "modem" then
---@cast device Modem ---@cast device Modem
local m_is_wl = device.isWireless() log.info(util.c("BKPLN: PHY_DETACH ", iface))
log.info(util.c("BKPLN: ", util.trinary(m_is_wl, "WIRELESS", "WIRED"), " PHY_DETACH ", iface))
_bp.nic_map[iface] = nil _bp.nic_map[iface] = nil
@@ -159,10 +157,6 @@ function backplane.detach(iface, type, device, print_no_fp)
else else
databus.tx_hw_wl_modem(false) databus.tx_hw_wl_modem(false)
end end
elseif _bp.wl_nic and m_is_wl then
-- wireless, but not active
print_no_fp("standby wireless modem disconnected")
log.info("BKPLN: standby wireless modem disconnected")
else else
print_no_fp("unassigned modem disconnected") print_no_fp("unassigned modem disconnected")
log.warning("BKPLN: unassigned modem disconnected") log.warning("BKPLN: unassigned modem disconnected")