diff --git a/TODO.md b/TODO.md index 3a4dd8e8..5b50b05d 100644 --- a/TODO.md +++ b/TODO.md @@ -2,7 +2,6 @@ Work items for soon alpha builds * run services in sim mode on emulator -* track radio brands/regions as a user property (include no-radio as an option) * show offline nodes as greyed out * show time since last contact on the node info card * show pointer arrow on the outside of the user icons, always pointing towoards them @@ -209,4 +208,5 @@ Setting idle framerate Transition powerFSM transition=Screen-on timeout, from=ON to=DARK NOTE: no debug messages on device, though we see in radio interface service we are repeatedly reading FromRadio and getting -the same seven bytes. It sure seems like the old service is still sort of alive... \ No newline at end of file +the same seven bytes. It sure seems like the old service is still sort of alive... +* track radio brands/regions as a user property (include no-radio as an option) diff --git a/app/src/main/java/com/geeksville/mesh/service/SimRadio.disabled b/app/src/main/java/com/geeksville/mesh/service/SimRadio.kt similarity index 93% rename from app/src/main/java/com/geeksville/mesh/service/SimRadio.disabled rename to app/src/main/java/com/geeksville/mesh/service/SimRadio.kt index 96822be0..88330844 100644 --- a/app/src/main/java/com/geeksville/mesh/service/SimRadio.disabled +++ b/app/src/main/java/com/geeksville/mesh/service/SimRadio.kt @@ -1,10 +1,9 @@ package com.geeksville.mesh import android.content.Context -import com.google.protobuf.util.JsonFormat +import com.geeksville.mesh.service.RadioInterfaceService class SimRadio(private val context: Context) { - private val jsonParser = JsonFormat.parser() /** * When simulating we parse these MeshPackets as if they arrived at startup @@ -42,7 +41,7 @@ class SimRadio(private val context: Context) { simInitPackets.forEach { json -> val fromRadio = MeshProtos.FromRadio.newBuilder().apply { packet = MeshProtos.MeshPacket.newBuilder().apply { - jsonParser.merge(json, this) + // jsonParser.merge(json, this) }.build() }.build()