MayaTheShy/opus-apps
1
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

more gpsServer tweaks

Browse Source 
Highlight change in position
Added distance from turtle
This commit is contained in:
xAnavrins
2019-07-14 02:38:53 -04:00
parent f51b286f2b
commit b16c6ec4d3
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gps/gpsServer.lua
View File

@@ -28,14 +28,19 @@ local page = UI.Page {
sortColumn = 'id', sortColumn = 'id',
autospace = true, autospace = true,
columns = { columns = {
{ heading = 'ID', key = 'id', align = 'right', width = 5 }, { heading = 'ID', key = 'id', align = 'right', width = 5, },
{ heading = 'X', key = 'x' }, { heading = 'X', key = 'x', align = 'right', },
{ heading = 'Y', key = 'y' }, { heading = 'Y', key = 'y', align = 'right', width = 4, },
{ heading = 'Z', key = 'z' }, { heading = 'Z', key = 'z', },
{ heading = 'Dist', key = 'dist', align = 'right', },
}, },
} }
} }
function page.grid:getRowTextColor(row, selected)
return ((row.x ~= row.lastPos.x) or (row.y ~= row.lastPos.y) or (row.z ~= row.lastPos.z)) and colors.yellow or colors.white
end
local function build() local function build()
if not turtle.has(WIRED_MODEM, 5) or if not turtle.has(WIRED_MODEM, 5) or
not turtle.has(CABLE, 8) or not turtle.has(CABLE, 8) or
@@ -167,8 +172,17 @@ local function server()
if #computer == 4 then if #computer == 4 then
local pt = GPS.trilaterate(computer) local pt = GPS.trilaterate(computer)
if pt then if pt then
pt.id = computerId if not positions[computerId] then
positions[computerId] = pt positions[computerId] = { lastPos = {} }
end
positions[computerId].lastPos.x = positions[computerId].x or 0
positions[computerId].lastPos.y = positions[computerId].y or 0
positions[computerId].lastPos.z = positions[computerId].z or 0
positions[computerId].x = pt.x
positions[computerId].y = pt.y
positions[computerId].z = pt.z
positions[computerId].id = computerId
positions[computerId].dist = Util.round((vector.new(config.x, config.y, config.z) - vector.new(positions[computerId].x, positions[computerId].y, positions[computerId].z)):length())
end end
computers[computerId] = nil computers[computerId] = nil
page.grid.values = positions page.grid.values = positions