From a79470b018c83201db26b3069e66a7992e0bdf9e Mon Sep 17 00:00:00 2001 From: andrekir Date: Sat, 26 Mar 2022 17:44:59 -0300 Subject: [PATCH] remove batteryLevel from Position --- .../main/java/com/geeksville/mesh/model/NodeDB.kt | 12 +++--------- .../com/geeksville/mesh/service/MockInterface.kt | 1 - 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/model/NodeDB.kt b/app/src/main/java/com/geeksville/mesh/model/NodeDB.kt index 01ac4e18c..fee2dfa67 100644 --- a/app/src/main/java/com/geeksville/mesh/model/NodeDB.kt +++ b/app/src/main/java/com/geeksville/mesh/model/NodeDB.kt @@ -10,15 +10,9 @@ import com.geeksville.mesh.Position /// NodeDB lives inside the UIViewModel, but it needs a backpointer to reach the service class NodeDB(private val ui: UIViewModel) { private val testPositions = arrayOf( - Position(32.776665, -96.796989, 35, 123, 40), // dallas - Position(32.960758, -96.733521, 35, 456, 50), // richardson - Position( - 32.912901, - -96.781776, - 35, - 789, - 60 - ) // north dallas + Position(32.776665, -96.796989, 35, 123), // dallas + Position(32.960758, -96.733521, 35, 456), // richardson + Position(32.912901, -96.781776, 35, 789) // north dallas ) val testNodeNoPosition = NodeInfo( diff --git a/app/src/main/java/com/geeksville/mesh/service/MockInterface.kt b/app/src/main/java/com/geeksville/mesh/service/MockInterface.kt index 9075bf157..93aba7077 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MockInterface.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MockInterface.kt @@ -159,7 +159,6 @@ class MockInterface(private val service: RadioInterfaceService) : Logging, IRadi position = MeshProtos.Position.newBuilder().apply { latitudeI = Position.degI(lat) longitudeI = Position.degI(lon) - batteryLevel = 42 altitude = 35 time = (System.currentTimeMillis() / 1000).toInt() }.build()