mirrors/opus
1
0
Fork 0
mirror of https://github.com/kepler155c/opus synced 2025-12-20 23:28:07 +00:00
Code Issues Releases Wiki Activity

peripheral overhaul

Browse Source
This commit is contained in:
kepler155c@gmail.com
2018-01-06 22:25:33 -05:00
parent 911fec9118
commit 13ec8ea04f
7 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sys/apis/peripheral.lua
View File

@@ -92,8 +92,8 @@ function Peripheral.get(args)
args = { type = args }
end
if args.device then
return _G.device[args.device]
if args.name then
return _G.device[args.name]
end
if args.type then
@@ -157,7 +157,9 @@ local function getProxy(pi)
if not queue then
queue = { }
Event.onTimeout(0, function()
socket:write({ fn = 'fastBlit', args = { queue } })
if not socket:write({ fn = 'fastBlit', args = { queue } }) then
error("Timed out communicating with peripheral: " .. pi.uri)
end
queue = nil
socket:read()
end)
@@ -192,26 +194,26 @@ end
Parse a uri into it's components
Examples:
monitor = { device = 'monitor' }
side/top = { side = 'top' }
method/list = { method = 'list' }
12://device/monitor = { host = 12, device = 'monitor' }
monitor = { name = 'monitor' }
side/top = { side = 'top' }
method/list = { method = 'list' }
12://name/monitor = { host = 12, name = 'monitor' }
]]--
local function parse(uri)
local pi = Util.split(uri:gsub('^%d*://', ''), '(.-)/')
if #pi == 1 then
pi = {
'device',
'name',
pi[1],
}
end
return {
host = uri:match('^(%d*)%:'), -- 12
uri = uri, -- 12://device/monitor
path = uri:gsub('^%d*://', ''), -- device/monitor
[ pi[1] ] = pi[2], -- device = 'monitor'
uri = uri, -- 12://name/monitor
path = uri:gsub('^%d*://', ''), -- name/monitor
[ pi[1] ] = pi[2], -- name = 'monitor'
}
end