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

Yes, more gpsServer stuff...

Browse Source 
Heartbeat monitor
Gray out inactive nodes after 60 seconds
This commit is contained in:
xAnavrins
2019-07-19 00:57:27 -04:00
parent b4f51df463
commit 7b91ddefe9
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gps/gpsServer.lua
View File

@@ -29,7 +29,9 @@ local page = UI.Page {
grid = UI.ScrollingGrid { grid = UI.ScrollingGrid {
sortColumn = 'id', sortColumn = 'id',
autospace = true, autospace = true,
focusIndicator = ' ',
columns = { columns = {
{ key = 'hbeat', width = 1, textColor = colors.red },
{ heading = 'ID', key = 'id', align = 'right', width = 5, textColor = colors.pink }, { heading = 'ID', key = 'id', align = 'right', width = 5, textColor = colors.pink },
{ heading = 'X', key = 'x', align = 'right', width = 6 }, { heading = 'X', key = 'x', align = 'right', width = 6 },
{ heading = 'Y', key = 'y', align = 'right', width = 4 }, { heading = 'Y', key = 'y', align = 'right', width = 4 },
@@ -42,6 +44,7 @@ local page = UI.Page {
function page.grid:getDisplayValues(row) function page.grid:getDisplayValues(row)
row = Util.shallowCopy(row) row = Util.shallowCopy(row)
row.dist = Util.toBytes(Util.round(row.dist, 2)) row.dist = Util.toBytes(Util.round(row.dist, 2))
row.hbeat = row.hbeat and "\3" or "\183"
return row return row
end end
@@ -49,7 +52,7 @@ function page.grid:getRowTextColor(row, selected)
return ((row.x ~= row.lastPos.x) or return ((row.x ~= row.lastPos.x) or
(row.y ~= row.lastPos.y) or (row.y ~= row.lastPos.y) or
(row.z ~= row.lastPos.z)) and (row.z ~= row.lastPos.z)) and
colors.yellow or UI.Grid.getRowTextColor(self, row, selected) colors.yellow or not row.alive and colors.lightGray or UI.Grid.getRowTextColor(self, row, selected)
end end
local function build() local function build()
@@ -196,10 +199,12 @@ local function server(mode)
positions[computerId].y = pt.y positions[computerId].y = pt.y
positions[computerId].z = pt.z positions[computerId].z = pt.z
positions[computerId].id = computerId positions[computerId].id = computerId
positions[computerId].hbeat = not positions[computerId].hbeat
positions[computerId].alive = true
positions[computerId].timestamp = os.clock()
local dist = (vector.new(config.x, config.y, config.z) - vector.new(positions[computerId].x, positions[computerId].y, positions[computerId].z)):length() local dist = (vector.new(config.x, config.y, config.z) - vector.new(positions[computerId].x, positions[computerId].y, positions[computerId].z)):length()
if positions[computerId].dist ~= dist then if positions[computerId].dist ~= dist then
positions[computerId].needUpdate = true positions[computerId].needUpdate = true
positions[computerId].timestamp = os.clock()
end end
positions[computerId].dist = dist positions[computerId].dist = dist
end end
@@ -232,13 +237,18 @@ local function server(mode)
Event.onInterval(1, function() Event.onInterval(1, function()
local resync = false local resync = false
for id, detail in pairs(positions) do for id, detail in pairs(positions) do
if os.clock() - detail.timestamp > 15 and detail.needUpdate then local elapsed = os.clock() - detail.timestamp
if elapsed > 15 and detail.needUpdate then
detail.lastPos.x = detail.x detail.lastPos.x = detail.x
detail.lastPos.y = detail.y detail.lastPos.y = detail.y
detail.lastPos.z = detail.z detail.lastPos.z = detail.z
detail.timestamp = os.clock() detail.timestamp = os.clock()
detail.needUpdate = false detail.needUpdate = false
resync = true resync = true
elseif elapsed > 60 and detail.alive then
detail.alive = false
detail.hbeat = false
resync = true
end end
end end
if resync then if resync then