From 0187bc4c72fab52a03e773b24e2ff2ce6bc11bec Mon Sep 17 00:00:00 2001 From: andrekir Date: Sun, 21 Apr 2024 08:49:09 -0300 Subject: [PATCH] refactor: simplify position requests --- .../main/java/com/geeksville/mesh/service/MeshService.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt index 0b74e178..8c8e288c 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt @@ -1894,7 +1894,13 @@ class MeshService : Service(), Logging { override fun requestPosition(destNum: Int, position: Position) = toRemoteExceptions { if (destNum != myNodeNum) { // request position - sendPosition(destNum = destNum, wantResponse = true) + sendToRadio(newMeshPacketTo(destNum).buildMeshPacket( + channel = nodeDBbyNodeNum[destNum]?.channel ?: 0, + priority = MeshPacket.Priority.BACKGROUND, + ) { + portnumValue = Portnums.PortNum.POSITION_APP_VALUE + wantResponse = true + }) } else { // send fixed position (local only/no remote method, so we force destNum to null) val (lat, lon, alt) = position @@ -1924,7 +1930,6 @@ class MeshService : Service(), Logging { channel = nodeDBbyNodeNum[destNum]?.channel ?: 0, ) { portnumValue = Portnums.PortNum.TRACEROUTE_APP_VALUE - payload = routeDiscovery {}.toByteString() wantResponse = true }) }