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

ppm function renames, edited log messages, and changed protected calls to return true if function has no return

Browse Source
This commit is contained in:
Mikayla Fischler 2022-03-10 14:21:03 -05:00
parent a0b2c1f3e2
commit 5cff346cb5
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scada-common/ppm.lua
View File

@ -16,10 +16,15 @@ local peri_init = function (device)
local status, result = pcall(func, ...)
if status then
-- assume nil is only for functions with no return, so return status
if result == nil then
return true
else
return result
end
else
-- function failed
log._error("protected " .. key .. "() -> " .. result)
log._error("PPM: protected " .. key .. "() -> " .. result)
return nil
end
end
@ -37,6 +42,10 @@ function mount_all()
peri_init(pm_dev)
self.mounts[ifaces[i]] = { peripheral.getType(ifaces[i]), pm_dev }
end
if #ifaces == 0 then
log._warning("PPM: mount_all() -> no devices found")
end
end
-- mount a particular device
@ -61,12 +70,12 @@ function mount(name)
end
-- handle peripheral_detach event
function unmount_handler(iface)
function handle_unmount(iface)
-- what got disconnected?
local lost_dev = self.mounts[iface]
local type = lost_dev.type
log._warning("PMGR: lost device " .. type .. " mounted to " .. iface)
log._warning("PPM: lost device " .. type .. " mounted to " .. iface)
return self.mounts[iface]
end