meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

update protos

Browse source
This commit is contained in:
geeksville 2020-02-12 14:15:59 -08:00
parent 4f8163c4a8
commit 55d4d769f8
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/geeksville/mesh/NodeInfo.kt
View file

@ -70,13 +70,13 @@ data class NodeInfo(
val num: Int, // This is immutable, and used as a key
var user: MeshUser? = null,
var position: Position? = null,
var lastSeen: Long? = null
var lastSeen: Int? = null
) : Parcelable {
constructor(parcel: Parcel) : this(
parcel.readInt(),
parcel.readParcelable(MeshUser::class.java.classLoader),
parcel.readParcelable(Position::class.java.classLoader),
parcel.readValue(Long::class.java.classLoader) as? Long
parcel.readValue(Int::class.java.classLoader) as? Int
) {
}

4
app/src/main/java/com/geeksville/mesh/service/MeshService.kt
View file

@ -377,7 +377,7 @@ class MeshService : Service(), Logging {
val p = packet.payload
// Update our last seen based on any valid timestamps
if (packet.rxTime != 0L) {
if (packet.rxTime != 0) {
updateNodeInfo(fromNum) {
it.lastSeen = packet.rxTime
}
@ -542,7 +542,7 @@ class MeshService : Service(), Logging {
}
override fun getRadioConfig(): ByteArray = toRemoteExceptions {
return connectedRadio.readRadioConfig()
connectedRadio.readRadioConfig()
}
override fun setRadioConfig(payload: ByteArray) = toRemoteExceptions {

4
app/src/main/proto/mesh.proto
View file

@ -139,10 +139,10 @@ message MeshPacket {
// MeshPayload payloads = 4;
SubPacket payload = 3;
/// The time this message was received by the esp32 (msecs since 1970). Note: this field is _never_ sent on the radio link itself (to save space)
/// The time this message was received by the esp32 (secs since 1970). Note: this field is _never_ sent on the radio link itself (to save space)
/// Times are typically not sent over the mesh, but they will be added to any Packet (chain of SubPacket)
/// sent to the phone (so the phone can know exact time of reception)
uint64 rx_time = 4;
uint32 rx_time = 4;
}
/// Shared constants between device and phone