mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-03-24 08:43:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

update to latest protobufs

Browse Source
This commit is contained in:
geeksville
2020-02-02 18:38:01 -08:00
parent afe4133631
commit d57a86abcd
3 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
app/src/main/java/com/geeksville/mesh/MeshService.kt
View File

@@ -223,10 +223,8 @@ class MeshService : Service(), Logging {
destId: String,
initFn: MeshProtos.SubPacket.Builder.() -> Unit
): MeshPacket = newMeshPacketTo(destId).apply {
payload = MeshProtos.MeshPayload.newBuilder().apply {
addSubPackets(MeshProtos.SubPacket.newBuilder().also {
initFn(it)
}.build())
payload = MeshProtos.SubPacket.newBuilder().also {
initFn(it)
}.build()
}.build()
@@ -280,36 +278,34 @@ class MeshService : Service(), Logging {
// decided to pass through to us (except for broadcast packets)
val toNum = packet.to
val payload = packet.payload
payload.subPacketsList.forEach { p ->
when (p.variantCase.number) {
MeshProtos.SubPacket.POSITION_FIELD_NUMBER ->
updateNodeInfo(fromNum) {
it.position = Position(
p.position.latitude,
p.position.longitude,
p.position.altitude
)
}
MeshProtos.SubPacket.TIME_FIELD_NUMBER ->
updateNodeInfo(fromNum) {
it.lastSeen = p.time.msecs
}
MeshProtos.SubPacket.DATA_FIELD_NUMBER ->
handleReceivedData(fromNum, p.data)
val p = packet.payload
when (p.variantCase.number) {
MeshProtos.SubPacket.POSITION_FIELD_NUMBER ->
updateNodeInfo(fromNum) {
it.position = Position(
p.position.latitude,
p.position.longitude,
p.position.altitude
)
}
MeshProtos.SubPacket.TIME_FIELD_NUMBER ->
updateNodeInfo(fromNum) {
it.lastSeen = p.time.msecs
}
MeshProtos.SubPacket.DATA_FIELD_NUMBER ->
handleReceivedData(fromNum, p.data)
MeshProtos.SubPacket.USER_FIELD_NUMBER ->
handleReceivedUser(fromNum, p.user)
MeshProtos.SubPacket.WANT_NODE_FIELD_NUMBER -> {
// This is managed by the radio on its own
debug("Ignoring WANT_NODE from $fromNum")
}
MeshProtos.SubPacket.DENY_NODE_FIELD_NUMBER -> {
// This is managed by the radio on its own
debug("Ignoring DENY_NODE from $fromNum to $toNum")
}
else -> TODO("Unexpected SubPacket variant")
MeshProtos.SubPacket.USER_FIELD_NUMBER ->
handleReceivedUser(fromNum, p.user)
MeshProtos.SubPacket.WANT_NODE_FIELD_NUMBER -> {
// This is managed by the radio on its own
debug("Ignoring WANT_NODE from $fromNum")
}
MeshProtos.SubPacket.DENY_NODE_FIELD_NUMBER -> {
// This is managed by the radio on its own
debug("Ignoring DENY_NODE from $fromNum to $toNum")
}
else -> TODO("Unexpected SubPacket variant")
}
}