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

GPS overhaul

Browse Source
This commit is contained in:
Anavrins
2019-12-27 01:18:09 -05:00
parent 79c8c4beae
commit 3f19c94e0f
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gps/gpsServer.lua
View File

@@ -6,7 +6,6 @@ local Event = require('opus.event')
local colors = _G.colors local colors = _G.colors
local fs = _G.fs local fs = _G.fs
local gps = _G.gps
local os = _G.os local os = _G.os
local peripheral = _G.peripheral local peripheral = _G.peripheral
local read = _G.read local read = _G.read
@@ -200,7 +199,7 @@ local function server(mode)
error('Modem is not activated or connected: ' .. k) error('Modem is not activated or connected: ' .. k)
end end
if mode == 'gps' then if mode == 'gps' then
modem.open(gps.CHANNEL_GPS) modem.open(GPS.CHANNEL_GPS)
elseif mode == 'snmp' then elseif mode == 'snmp' then
modem.open(999) modem.open(999)
end end
@@ -254,9 +253,9 @@ local function server(mode)
Event.on('modem_message', function(_, side, channel, computerId, message, distance) Event.on('modem_message', function(_, side, channel, computerId, message, distance)
if distance and modems[side] then if distance and modems[side] then
if mode == 'gps' and channel == gps.CHANNEL_GPS and message == "PING" then if mode == 'gps' and channel == GPS.CHANNEL_GPS and message == "PING" then
for _, modem in pairs(modems) do for _, modem in pairs(modems) do
modem.transmit(computerId, gps.CHANNEL_GPS, { modem.x, modem.y, modem.z }) modem.transmit(computerId, GPS.CHANNEL_GPS, { modem.x, modem.y, modem.z })
end end
getPosition(computerId, modems[side], distance) getPosition(computerId, modems[side], distance)
end end

11
neural/ores.lua
View File

@@ -6,8 +6,8 @@
-- Updated to use new(ish) canvas3d -- Updated to use new(ish) canvas3d
local Config = require('opus.config') local Config = require('opus.config')
local GPS = require("opus.gps")
local gps = _G.gps
local keys = _G.keys local keys = _G.keys
local os = _G.os local os = _G.os
local parallel = _G.parallel local parallel = _G.parallel
@@ -35,14 +35,7 @@ end
local BLOCK_SIZE = .5 local BLOCK_SIZE = .5
local function getPoint() local function getPoint()
local pt = { gps.locate() } return GPS.locate()
if pt[1] then
return {
x = pt[1],
y = pt[2],
z = pt[3],
}
end
end end
local targets = Config.load('ores', { local targets = Config.load('ores', {