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

merge fixes

Browse Source
This commit is contained in:
Mikayla Fischler 2025-10-26 17:22:07 -04:00
parent deeeb612b1
commit a48c8c1efe
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reactor-plc/configure.lua
View File

@ -83,7 +83,7 @@ local tmp_cfg = {
ConnTimeout = nil, ---@type number ConnTimeout = nil, ---@type number
WiredModem = false, ---@type string|false WiredModem = false, ---@type string|false
TrustedRange = nil, ---@type number TrustedRange = nil, ---@type number
AuthKey = "", ---@type string AuthKey = nil, ---@type string|nil
LogMode = 0, ---@type LOG_MODE LogMode = 0, ---@type LOG_MODE
LogPath = "", LogPath = "",
LogDebug = false, LogDebug = false,

4
scada-common/ppm.lua
View File

@ -453,7 +453,7 @@ function ppm.get_fission_reactor() return ppm.get_device("fissionReactorLogicAda
---@return Modem|nil modem function table ---@return Modem|nil modem function table
function ppm.get_modem(iface) function ppm.get_modem(iface)
local modem = nil local modem = nil
local device = ppm_sys.mounts[iface] local device = _ppm.mounts[iface]
if device and device.type == "modem" then modem = device.dev end if device and device.type == "modem" then modem = device.dev end
@ -485,7 +485,7 @@ end
function ppm.get_wired_modem_list() function ppm.get_wired_modem_list()
local list = {} local list = {}
for iface, device in pairs(ppm_sys.mounts) do for iface, device in pairs(_ppm.mounts) do
if device.type == "modem" and not device.dev.isWireless() then list[iface] = device end if device.type == "modem" and not device.dev.isWireless() then list[iface] = device end
end end