Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GPS - Use distance the server received. #1627

Open
wants to merge 5 commits into
base: mc-1.20.x
Choose a base branch
from
Open

GPS - Use distance the server received. #1627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b121189
Include distance in GPS host response.
fatboychummy Nov 11, 2023
4ced842
Make gps.locate use distance received instead of modem distance.
fatboychummy Nov 11, 2023
7a69b6a
Allow clients to fallback to default GPS usage for 'old' hosts.
fatboychummy Nov 11, 2023
bb4d1ca
Woops, this would need to be removed as well to fallback.
fatboychummy Nov 11, 2023
135a756
It's nearly 3am, can you tell?
fatboychummy Nov 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions projects/core/src/main/resources/data/computercraft/lua/rom/apis/gps.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ function locate(_nTimeout, _bDebug)
local sSide, sChannel, sReplyChannel, tMessage, nDistance = p1, p2, p3, p4, p5
if sSide == sModemSide and sChannel == CHANNEL_GPS and sReplyChannel == CHANNEL_GPS and nDistance then
-- Received the correct message from the correct modem: use it to determine position
if type(tMessage) == "table" and #tMessage == 3 and tonumber(tMessage[1]) and tonumber(tMessage[2]) and tonumber(tMessage[3]) then
local tFix = { vPosition = vector.new(tMessage[1], tMessage[2], tMessage[3]), nDistance = nDistance }
if type(tMessage) == "table" and (#tMessage == 3 or #tMessage == 4 and tonumber(tMessage[4])) and tonumber(tMessage[1]) and tonumber(tMessage[2]) and tonumber(tMessage[3]) then
local tFix = { vPosition = vector.new(tMessage[1], tMessage[2], tMessage[3]), nDistance = tonumber(tMessage[4]) or nDistance }
if _bDebug then
print(tFix.nDistance .. " metres from " .. tostring(tFix.vPosition))
end
Expand Down
2 changes: 1 addition & 1 deletion projects/core/src/main/resources/data/computercraft/lua/rom/programs/gps.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ elseif sCommand == "host" then
local sSide, sChannel, sReplyChannel, sMessage, nDistance = p1, p2, p3, p4, p5
if sSide == sModemSide and sChannel == gps.CHANNEL_GPS and sMessage == "PING" and nDistance then
-- We received a ping message on the GPS channel, send a response
modem.transmit(sReplyChannel, gps.CHANNEL_GPS, { x, y, z })
modem.transmit(sReplyChannel, gps.CHANNEL_GPS, { x, y, z, nDistance })

-- Print the number of requests handled
nServed = nServed + 1
Expand Down
Loading