From bee08a0bb4803bd7cf4d930de94e6dd3e1ba17c3 Mon Sep 17 00:00:00 2001 From: andrekir Date: Wed, 8 Mar 2023 08:07:47 -0300 Subject: [PATCH] fix: use MeshPacketQueue --- app/src/main/java/com/geeksville/mesh/service/MeshService.kt | 5 +---- 1 file changed, 1 insertion(+), 4 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 e1e9f8a30..3262123bb 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt @@ -799,8 +799,6 @@ class MeshService : Service(), Logging { sendToRadio(ToRadio.newBuilder().apply { this.packet = packet }) - // FIXME remove when MeshPacketQueue is fixed - if (!packet.wantAck) future.complete(true) } catch (ex: Exception) { errormsg("sendToRadio error:", ex) future.complete(false) @@ -1202,8 +1200,7 @@ class MeshService : Service(), Logging { private fun handleQueueStatus(queueStatus: MeshProtos.QueueStatus) { debug("queueStatus ${queueStatus.toOneLineString()}") val (success, isFull, requestId) = with(queueStatus) { - // FIXME use "free == 0" when MeshPacketQueue is fixed - Triple(res == 0, free <= 16, meshPacketId) + Triple(res == 0, free == 0, meshPacketId) } if (success && isFull) return // Queue is full, wait for free != 0 if (requestId != 0) queueResponse.remove(requestId)?.complete(success)